Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

839 files changed, 61427 insertions, 21601 deletions

diff --git a/.hgignore b/.hgignore
index d882633e0..9cae9ff14 100644
--- a/.hgignore
+++ b/.hgignore
@@ -4,9 +4,14 @@ syntax: glob
 *.log
 *~
 \#*\#
-src/
-pkg/
+src/*
+pkg/*
 *.pkg.tar.*
 *.src.tar.*
 *.log
 *.gz
+*.tar.*
+*/src-libre/*
+*/pkg-libre/*
+*.orig
+*.bck
\ No newline at end of file
diff --git a/cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD b/cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD
index 6f4b12fef..91084085d 100644
--- a/cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD
+++ b/cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 165111 2012-08-11 08:21:11Z allan $
+# $Id: PKGBUILD 180857 2013-03-27 11:11:40Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
@@ -8,40 +8,46 @@ _target=mips64el-unknown-linux-gnu
 _sysroot="/usr/${_target}"
 
 pkgname=${_target}-linux-libre-api-headers
-_basekernel=3.5
-_sublevel=1
+_basekernel=3.10
+_sublevel=9
 pkgver=${_basekernel}.${_sublevel}
-pkgrel=1.1
+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}" "${_target}-kernel-headers=${pkgver}")
-conflicts=("${_target}-linux-api-headers" "${_target}-kernel-headers")
-replaces=("${_target}-linux-api-headers" "${_target}-kernel-headers")
+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=('2407fc9563a74acaf38aa0c06516eb1c'
-         '67b650dd355fbca16035510df063420b')
+sha1sums=('22abb16dc6175bab805f2098c5a276ff700424cf'
+          '10f907e7127f14e1a7f524d1d39852d98622793f')
+sha256sums=('abee814b92422cfa3df90b62ad9ba888697fcc03a713adc2c7f68e0d0c23c329'
+            'd5bc5369b102dae74f0cbaeba19a6db1d0d919645672a16208b06a71aab1de1b')
 
-build() {
+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 headers_check
+  make ARCH=${ARCH} headers_check
 }
 
 package() {
   cd ${srcdir}/linux-${_basekernel}
-  make ARCH=${ARCH} INSTALL_HDR_PATH=${pkgdir}${_sysroot}/usr headers_install
+  make ARCH=${ARCH} INSTALL_HDR_PATH=${pkgdir}${_sysroot} headers_install
 
   # use headers from libdrm
-  rm -rf ${pkgdir}/usr/include/drm
-  
+  rm -r ${pkgdir}${_sysroot}/include/drm
+
   # clean-up unnecessary files generated during install
-  find ${pkgdir} -name .install -or -name ..install.cmd -print0 | xargs -0 rm -f
+  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
new file mode 100644
index 000000000..072e5e50d
--- /dev/null
+++ b/cross/xtensa-unknown-elf-binutils/PKGBUILD
@@ -0,0 +1,73 @@
+# $Id: PKGBUILD 182407 2013-04-10 07:34:20Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): 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
new file mode 100644
index 000000000..38dc19fb0
--- /dev/null
+++ b/cross/xtensa-unknown-elf-binutils/binutils-2.23.2-texinfo-5.0.patch
@@ -0,0 +1,162 @@
+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
new file mode 100644
index 000000000..9de0533ee
--- /dev/null
+++ b/cross/xtensa-unknown-elf-binutils/xtensa-unknown-elf-binutils.install
@@ -0,0 +1,17 @@
+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
new file mode 100644
index 000000000..76328723c
--- /dev/null
+++ b/cross/xtensa-unknown-elf-gcc/PKGBUILD
@@ -0,0 +1,94 @@
+# $Id: PKGBUILD 186915 2013-05-31 23:25:14Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# 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
new file mode 100644
index 000000000..3407a5e1f
--- /dev/null
+++ b/cross/xtensa-unknown-elf-gcc/xtensa-unknown-elf-gcc.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.info)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/cross/xtensa-unknown-elf-linux-libre-api-headers/PKGBUILD b/cross/xtensa-unknown-elf-linux-libre-api-headers/PKGBUILD
new file mode 100644
index 000000000..5885001c0
--- /dev/null
+++ b/cross/xtensa-unknown-elf-linux-libre-api-headers/PKGBUILD
@@ -0,0 +1,47 @@
+# $Id: PKGBUILD 180857 2013-03-27 11:11:40Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+# 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/java-ugly/junit/PKGBUILD b/java-ugly/junit/PKGBUILD
deleted file mode 100644
index 7204cd5c9..000000000
--- a/java-ugly/junit/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Maintainer (Arch): Guillaume ALAUX <Guillaume at Arch Linux dot org>
-
-pkgname=junit
-pkgver=4.10
-pkgrel=1
-pkgdesc="Automated testing framework for Java"
-arch=('any')
-url="http://www.junit.org/"
-license=('CPL')
-depends=('java-runtime')
-makedepends=('apache-ant' 'jh')
-source=("$pkgname::git://github.com/KentBeck/junit.git#tag=r$pkgver")
-
-mksource() {
-  cd "${srcdir}/${pkgname}"
-  #find . -name '*.jar' -delete
-
-  # Shut up some warnings from javac 1.7
-  sed -ri 's|target="([0-9.]+)"|\0 source="\1"|' build.xml
-}
-
-build() {
-  mksource
-  cd "${srcdir}/${pkgname}"
-
-  # Shut up some warnings from javac 1.7
-  sed -ri 's|target="([0-9.]+)"$|\0 source="\1"|' build.xml
-  
-  ant jars
-  for pkg in junit junit-dep; do
-    sed \
-      -e "s|@artifactID@|$pkg|" \
-      -e "s|@version@|$pkgver|" \
-      < build/maven/pom-template.xml > $pkgname$pkgver/$pkg-$pkgver.pom
-  done
-}
-
-package() {
-  cd "${srcdir}/${pkgname}"
-  install -Dm644 cpl-v10.html "$pkgdir/usr/share/licenses/junit/cpl-v10.html"
-
-  cd "${srcdir}/${pkgname}/${pkgname}${pkgver}"
-
-  export DESTDIR="$pkgdir"
-  jh mvn-install $pkgname junit     $pkgver junit-$pkgver.{jar,pom}
-  jh mvn-install $pkgname junit-dep $pkgver junit-dep-$pkgver.{jar,pom}
-  install -d "${pkgdir}/usr/share/java/${pkgname}"
-  ln -s `jh mvn-basename $pkgname junit     $pkgver`.jar "${pkgdir}/usr/share/java/${pkgname}"
-  ln -s `jh mvn-basename $pkgname junit-dep $pkgver`.jar "${pkgdir}/usr/share/java/${pkgname}"
-  ln -s ${pkgname}/${pkgname}-${pkgver}.jar     ${pkgdir}/usr/share/java/${pkgname}.jar
-  ln -s ${pkgname}/${pkgname}-dep-${pkgver}.jar ${pkgdir}/usr/share/java/${pkgname}-dep.jar
-}
-
-md5sums=('SKIP')
diff --git a/java/antlr2/PKGBUILD b/java/antlr2/PKGBUILD
index 4269d30c7..6fdf7dd29 100644
--- a/java/antlr2/PKGBUILD
+++ b/java/antlr2/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 167380 2012-10-01 19:24:15Z guillaume $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# 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 (formerly PCCTS)"
 url="http://www.antlr2.org/"
 license=('custom:Public Domain')
 
-pkgrel=3
+pkgrel=3.2
 arch=('i686' 'x86_64')
 makedepends=('java-environment' 'python2' 'sh' 'nant' 'jh')
 source=("http://www.antlr2.org/download/antlr-${pkgver}.tar.gz"
@@ -35,7 +36,6 @@ _install_license() {
 }
 
 package_antlr2() {
-  pkgdesc="ANother Tool for Language Recognition (formerly PCCTS)"
   depends=('sh' 'antlr2-java')
 
   install -Dm755 "$srcdir"/runantlr2.sh "$pkgdir"/usr/bin/runantlr2
@@ -43,7 +43,7 @@ package_antlr2() {
 }
 
 package_antlr2-java() {
-  pkgdesc="ANother Tool for Language Recognition (formerly PCCTS) (Java version)"
+  pkgdesc+=" (Java version)"
   depends=('java-runtime')
 
   provides=("java-antlr2=$pkgver")
@@ -51,16 +51,16 @@ package_antlr2-java() {
   replaces=("java-antlr2")
 
   DESTDIR="$pkgdir" jh mvn-install antlr antlr $pkgver \
-	  "$srcdir"/antlr-${pkgver}.pom \
-	  "$srcdir"/antlr-${pkgver}/antlr/antlr.jar \
-	  antlr2.jar
+    "$srcdir"/antlr-${pkgver}.pom \
+    "$srcdir"/antlr-${pkgver}/antlr/antlr.jar \
+    antlr2.jar
 
   _install_license
 }
 
 package_antlr2-python2() {
-  pkgdesc="ANother Tool for Language Recognition (formerly PCCTS) (Python version)"
-  depends=('antlr2' 'python2')
+  pkgdesc+=" (Python version)"
+  depends=('python2')
 
   provides=("python2-antlr2=$pkgver")
   conflicts=("python2-antlr2")
@@ -73,8 +73,7 @@ package_antlr2-python2() {
 }
 
 package_antlr2-cxx() {
-  pkgdesc="ANother Tool for Language Recognition (formerly PCCTS) (C++ version)"
-  depends=('java-runtime')
+  pkgdesc+=" (C++ version)"
 
   cd "$srcdir"/antlr-${pkgver}/lib/cpp
   make -j1 prefix="${pkgdir}/usr" install
@@ -83,8 +82,8 @@ package_antlr2-cxx() {
 }
 
 package_antlr2-sharp() {
-  pkgdesc="ANother Tool for Language Recognition (formerly PCCTS) (C Sharp version)"
-  depends=('antlr2' 'mono')
+  pkgdesc+=" (C Sharp version)"
+  depends=('mono')
 
   cd "$srcdir"/antlr-${pkgver}/lib/csharp
   install -d "$pkgdir"/usr/share
diff --git a/java/apache-ant/PKGBUILD b/java/apache-ant/PKGBUILD
index 77e0dfe94..dfda3c28d 100644
--- a/java/apache-ant/PKGBUILD
+++ b/java/apache-ant/PKGBUILD
@@ -3,52 +3,55 @@
 # Contributor: Andrew Wright <andreww@photism.org>
 
 pkgname=apache-ant
-pkgver=1.8.4
+pkgver=1.9.1
+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=1.1
-pkgdesc="A Java-based build tool"
+pkgrel=3
 arch=('any')
-license=('Apache')
-url="http://ant.apache.org/"
+depends=('java-environment')
+makedepends=('jh')
+
 _mirror=http://archive.apache.org/dist
 source=($_mirror/ant/source/${pkgname}-${pkgver}-src.tar.bz2
         ${pkgname}.sh ${pkgname}.csh)
-depends=('java-environment')
 
 # This list is adapted from https://ant.apache.org/manual/install.html#librarydependencies
 declare -A _opts
 _opts[junit]='to have JUnit on the classpath in javac tasks;/usr/share/java/junit.jar'
 _opts[xalan-java]='<junitreport> task;/usr/share/java/xalan.jar'
-_opts[antlr2]='<antlr> task;/usr/share/java/antlr2.jar::antlr.jar'
-#_opts[java-bsf]='<script> task;/usr/share/java/bsf.jar'
+_opts[java-antlr2]='<antlr> task;/usr/share/java/antlr2.jar::antlr.jar'
+_opts[java-commons-bsf2]='<script> task;/usr/share/java/bsf2.jar::bsf.jar'
 #_opts[groovy]='Groovy with <script> and <scriptdef> tasks;/usr/share/java/groovy.jar'
 _opts[java-asm2]='Groovy with <script> and <scriptdef> tasks;/usr/share/java/asm-2.jar::asm.jar /usr/share/java/asm-util-2.jar::asm-util.jar'
 #_opts[netrexx]='<netrexx> task, Rexx with <script> task;/usr/share/java/netrexx.jar'
-_opts[rhino]='Javascript with <script> task;/usr/share/java/js.jar'
+_opts[java-rhino]='Javascript with <script> task;/usr/share/java/js.jar'
 _opts[jython]='Python with <script> task;/opt/jython/jython.jar'
 #_opts[jacl]='TCL with <script> task;/usr/share/java/jacl.jar'
 #_opts[tcljava]='TCL with <script> task;/usr/share/java/tcljava.jar'
 _opts[beanshell>=1.3]='BeanShell with <script> task;/usr/share/java/bsh.jar::beanshell.jar'
-#_opts[jruby]='Ruby with <script> task;/usr/share/java/jruby.jar'
+_opts[jruby]='Ruby with <script> task;/opt/jruby/lib/jruby.jar'
 #_opts[judo]='Judoscript with <script> task;/usr/share/java/judo.jar'
 _opts[java-commons-logging]='CommonsLoggingListener;/usr/share/java/commons-logging/commons-logging.jar'
 #_opts[java-log4j]='Log4jListener;/usr/share/java/log4j.jar'
-#_opts[java-commons-net>=1.4.0]='<ftp>, <rexec> and <telnet> tasks;/usr/share/java/commons-net.jar'
-#_opts[java-bcel]="'classfileset' data type, JavaClassHelper for ClassConstants filter reader;/usr/share/java/bcel.jar"
+_opts[java-commons-net1>=1.4.0]='<ftp>, <rexec> and <telnet> tasks;/usr/share/java/commons-net.jar'
+_opts[java-bcel]="'classfileset' data type, JavaClassHelper for ClassConstants filter reader;/usr/share/java/bcel.jar"
 #_opts[java-mail]='<mimemail> task, mime encoding with <mail>;/usr/share/java/mail.jar'
-#_opts[java-activation]='<mimemail> task, mime encoding with <mail>;/usr/share/java/activation.jar'
-#_opts[jdepend]='<jdepend> task;/usr/share/java/jdepend.jar'
+_opts[java-activation-gnu]='<mimemail> task, mime encoding with <mail>;/usr/share/java/activation.jar'
+_opts[java-jdepend]='<jdepend> task;/usr/share/java/jdepend.jar'
 #_opts[java-xmlcommons-resolver>=1.1beta]="external files for 'xmlcatalog' datatype;/usr/share/java/resolver.jar"
-#_opts[java-jsch>=0.1.42]='<sshexec> and <scp> tasks;/usr/share/java/jsch.jar'
+_opts[java-jsch>=0.1.42]='<sshexec> and <scp> tasks;/usr/share/java/jsch.jar'
 #_opts[java-advanced-imaging]='<image> task/usr/share/java/jai/*.jar'
 
 for pkg in "${!_opts[@]}"; do
   optdepends+=("$pkg: ${_opts[$pkg]%;*}")
   makedepends+=("$pkg")
+  _jars+="${_opts[$pkg]#*;} "
 done
 
 build() {
@@ -59,9 +62,9 @@ build() {
   mkdir -p "${srcdir}"/${pkgname}-${pkgver}-bin
 
   cd "${srcdir}"/${pkgname}-${pkgver}
-  # Symlink to external optional libraries
-  for jar in ${_opts[@]#*;}; do
-    ln -sf ${jar%::*} lib/optional/`basename ${jar/*::}`
+  # Symlink to external optional libraries/
+  for jar in $_jars; do
+    ln -sfv ${jar%::*} lib/optional/`basename ${jar#*::}`
   done
   # Build
   source "/etc/profile.d/jdk.sh"   # Get the JAVA_HOME env var
@@ -87,8 +90,8 @@ package() {
   # Fix python2 path
   sed -i 's|/usr/bin/python|/usr/bin/python2|' "${pkgdir}"/${ANT_HOME}/bin/runant.py
   # Symlink to external optional libraries
-  for jar in ${_opts[@]#*;}; do
-    ln -sf ${jar%::*} "${pkgdir}"/${ANT_HOME}/lib/`basename ${jar/*::}`
+  for jar in $_jars; do
+    ln -sf ${jar%::*} "${pkgdir}"/${ANT_HOME}/lib/`basename ${jar#*::}`
   done
 
   ## Symlink the /opt distribution to the normal places
@@ -96,15 +99,24 @@ package() {
   install -d "${pkgdir}"/usr/share/doc/${pkgname}
   install -d "${pkgdir}"/usr/share/licenses/${pkgname}
 
+  cd "${pkgdir}"/${ANT_HOME}/lib
+  for pom in *.pom; do
+    a=${pom%.pom}
+    base=$(jh mvn-basename org.apache.ant $a $pkgver)
+    install -d "${pkgdir}${base%/*}"
+    ln -sf ${ANT_HOME}/lib/$a.pom "${pkgdir}${base}".pom
+    ln -sf ${ANT_HOME}/lib/$a.jar "${pkgdir}${base}".jar
+  done
+
   cd "${pkgdir}"/${ANT_HOME}
   for prog in bin/*; do
-      ln -sf ${ANT_HOME}/$prog "${pkgdir}"/usr/bin
+    ln -sf ${ANT_HOME}/$prog "${pkgdir}"/usr/bin
   done
   ln -sf ${ANT_HOME}/{README,WHATSNEW} "${pkgdir}"/usr/share/doc/${pkgname}
   ln -sf ${ANT_HOME}/docs "${pkgdir}"/usr/share/doc/${pkgname}/html
   ln -sf ${ANT_HOME}/{LICENSE,NOTICE} "${pkgdir}"/usr/share/licenses/${pkgname}
 }
 
-md5sums=('c474fa9d0c35a24037c23b6e476862c1'
+md5sums=('39771fd8b4ba87cd77ff6f27001cce4e'
          'bd63c881be406f515fc4d22635e8326a'
          'aaa615512cbe1ed7f3b62c1ff46802f8')
diff --git a/java/beanshell/PKGBUILD b/java/beanshell/PKGBUILD
new file mode 100644
index 000000000..95b14d379
--- /dev/null
+++ b/java/beanshell/PKGBUILD
@@ -0,0 +1,45 @@
+# 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
new file mode 100644
index 000000000..25d5d60ad
--- /dev/null
+++ b/java/closure-compiler/PKGBUILD
@@ -0,0 +1,67 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+pkgname=closure-compiler
+pkgver=20130603
+pkgdesc="A JavaScript optimizing compiler."
+url="https://code.google.com/closure/compiler/"
+license=('Apache2')
+
+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
+  'jh')
+
+source=("libre://$pkgname-$pkgver.tar.gz" 'closure-compiler.sh')
+
+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
+}
+
+md5sums=('00b89084401b9550166a1f1294f9ba39'
+         'd4ead4585fcc7039d3c32eb5c4491bb9')
diff --git a/java/closure-compiler/closure-compiler.sh b/java/closure-compiler/closure-compiler.sh
new file mode 100644
index 000000000..e06590db2
--- /dev/null
+++ b/java/closure-compiler/closure-compiler.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+java -jar /usr/share/java/closure-compiler.jar "$@"
diff --git a/java/jakarta-oro/PKGBUILD b/java/jakarta-oro/PKGBUILD
new file mode 100644
index 000000000..9bc3e11b9
--- /dev/null
+++ b/java/jakarta-oro/PKGBUILD
@@ -0,0 +1,30 @@
+# Maintainer: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
+
+pkgname=jakarta-oro
+pkgver=2.0.8
+pkgrel=1
+pkgdesc="Full regular expressions API"
+arch=('any')
+url="http://jakarta.apache.org/oro"
+license=('Apache')
+makedepends=('apache-ant')
+source=("http://archive.apache.org/dist/jakarta/oro/jakarta-oro-${pkgver}.tar.gz")
+sha512sums=('a7f6eb6a088765f273df18ccc823f918737f18ec8772275054839a87f8370f1848e795d481f226c712651104d7598ab86c7d90a991fb039df6581f42f1447920')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  find . -name '*.jar' -o -name '*.class' -delete
+
+  ant jar
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  install -dm755 "${pkgdir}/usr/share/java/"
+  install -m644 ${pkgname}-${pkgver}.jar \
+    "${pkgdir}/usr/share/java/${pkgname}.jar"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/java/java-asm2/PKGBUILD b/java/java-asm2/PKGBUILD
index 71bc0f303..8860ef86f 100644
--- a/java/java-asm2/PKGBUILD
+++ b/java/java-asm2/PKGBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 
 pkgver=2.2.3
-. common.sh
+. PKGBUILD.common.sh
 
 ####
 
-pkgrel=6
+pkgrel=7
 
 mksource() {
   cd "$srcdir/$_pkgname-$pkgver"
diff --git a/java/java-asm2/common.sh b/java/java-asm2/PKGBUILD.common.sh
index ef4547696..ef4547696 100644
--- a/java/java-asm2/common.sh
+++ b/java/java-asm2/PKGBUILD.common.sh
diff --git a/java/java-asm3/PKGBUILD b/java/java-asm3/PKGBUILD
index 345c83edf..9c9928766 100644
--- a/java/java-asm3/PKGBUILD
+++ b/java/java-asm3/PKGBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 
 pkgver=3.3.1
-. ../java-asm2/common.sh
+. PKGBUILD.common.sh
 
 ####
 
-pkgrel=6
+pkgrel=7
 
 mksource() {
   cd "$srcdir/$_pkgname-$pkgver"
diff --git a/java/java-asm3/PKGBUILD.common.sh b/java/java-asm3/PKGBUILD.common.sh
new file mode 120000
index 000000000..e76a92ae0
--- /dev/null
+++ b/java/java-asm3/PKGBUILD.common.sh
@@ -0,0 +1 @@
+../java-asm2/PKGBUILD.common.sh
\ No newline at end of file
diff --git a/java/java-commons-bsf2/PKGBUILD b/java/java-commons-bsf2/PKGBUILD
new file mode 100644
index 000000000..57a9dfc1a
--- /dev/null
+++ b/java/java-commons-bsf2/PKGBUILD
@@ -0,0 +1,59 @@
+# 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
index 8d1d1120b..c78d5539e 100644
--- a/java/java-jarjar/PKGBUILD
+++ b/java/java-jarjar/PKGBUILD
@@ -9,30 +9,28 @@ 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=('Apache2')
+license=('Apache')
 
-pkgrel=1
+pkgrel=2
 arch=('any')
 depends=('java-runtime')
-makedepends=('apache-ant' 'java-asm3' 'junit' 'maven' 'jh')
-source=("svn+http://jarjar.googlecode.com/svn/trunk/jarjar#revision=$_pkgrev")
+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"
-  rm -f src/test/*.{class,jar}
+  cd "$srcdir/$_pkgname-$pkgver"
   rm -f lib/*.jar
 }
 
 build() {
-  cd "$srcdir/$_pkgname"
-  eval `jh mksource`
+  cd "$srcdir/$_pkgname-$pkgver"
 
-  ln -s /usr/share/java/asm-3.jar             lib/asm-3.3.1.jar
-  ln -s /usr/share/java/asm-commons-3.jar     lib/asm-commons-3.3.1.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
-
-  ln -s /opt/apache-ant/lib/ant.jar lib/
+  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
@@ -40,10 +38,11 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$_pkgname"
+  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"
 }
 
-md5sums=('SKIP')
+mkmd5sums=('SKIP')
+md5sums=('cc2698a58f93cdb22c51f039a1b8a56e')
diff --git a/java/java-json-android/PKGBUILD b/java/java-json-android/PKGBUILD
new file mode 100644
index 000000000..a5ec08c9f
--- /dev/null
+++ b/java/java-json-android/PKGBUILD
@@ -0,0 +1,50 @@
+# 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=2
+arch=(any)
+
+depends=(java-runtime)
+makedepends=(java-environment junit)
+
+source=("libre://android-libcore-$_pkgver.tar.gz")
+md5sums=('367769bb9d7fe571ff4e1e82b99e99ed')
+
+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-rxtx/PKGBUILD b/java/java-rxtx/PKGBUILD
index 4fcabe2a4..ceb0d9bab 100644
--- a/java/java-rxtx/PKGBUILD
+++ b/java/java-rxtx/PKGBUILD
@@ -10,16 +10,18 @@ pkgver=${_pkgver//-/.}
 pkgdesc="A native library providing serial and parallel communication for Java"
 license=(LGPL2.1)
 
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 depends=('java-runtime')
-makedepends=('java-environment' 'pacman>4.0.3')
+makedepends=('java-environment')
 
 case "$_pkgver" in
     *arduino*)
 	url="https://github.com/arduino/RXTX"
-	source=("git://github.com/arduino/RXTX.git#${_gitver}")
-	md5sums=('SKIP')
+	source=("libre://RXTX-$pkgver.tar.gz")
+	md5sums=('a71156587dc8d28d1ff4ece376bc0140')
+	mksource=("git://github.com/arduino/RXTX.git#${_gitver}")
+	mkmd5sums=('SKIP')
 	_dirname=RXTX
 	;;
     *)
diff --git a/java/java-sonatype-oss-parent/PKGBUILD b/java/java-sonatype-oss-parent/PKGBUILD
index f42f6adc5..b62c971ac 100644
--- a/java/java-sonatype-oss-parent/PKGBUILD
+++ b/java/java-sonatype-oss-parent/PKGBUILD
@@ -5,23 +5,17 @@ pkgver=7
 pkgdesc="Metadata file for Maven-based build systems to inherit from"
 license='Apache2'
 
-_groupId=org/sonatype/oss
+_groupId=org.sonatype.oss
 _artifactId=oss-parent
 
 pkgrel=1
 arch=('any')
-depends=('maven')
-makedepends=('java-sonatype-oss-parent=7' 'jh')
+makedepends=('jh')
 source=("http://search.maven.org/remotecontent?filepath=$_groupId/$_artifactId/$pkgver/$_artifactId-$pkgver.pom")
 
-build() {
-  :
-}
-
 package() {
   cd "$srcdir"
-  install -Dm644 $_artifactId-$pkgver.pom \
-      "$pkgdir/`jh mvn-basename $_groupId $_artifactId $pkgver`".pom
+  DESTDIR=$pkgdir jh mvn-install $_groupId $_artifactId $pkgver $_artifactId-$pkgver.pom
 }
 
 md5sums=('3e418cf7f2607bf359e6c514a992cb38')
diff --git a/java/javacc/PKGBUILD b/java/javacc/PKGBUILD
new file mode 100644
index 000000000..032fd7b25
--- /dev/null
+++ b/java/javacc/PKGBUILD
@@ -0,0 +1,47 @@
+# 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
index 4c1dee6f3..5638adbce 100644
--- a/java/jh/PKGBUILD
+++ b/java/jh/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 
 pkgname=jh
-pkgver=0.5
+pkgver=0.5.1
 pkgdesc="Java helpers for PKGBUILDs"
 url="https://projects.parabolagnulinux.org/packages/jh.git/"
 license=('custom:WTFPL')
@@ -24,4 +24,4 @@ package() {
   install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 
-md5sums=('5fe2279fbada213eb8df38875450c4d2')
+md5sums=('051d39c5dac14e86b755bab9ec1d0d5d')
diff --git a/java/junit/PKGBUILD b/java/junit/PKGBUILD
new file mode 100644
index 000000000..5e466a029
--- /dev/null
+++ b/java/junit/PKGBUILD
@@ -0,0 +1,53 @@
+# 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.1
+arch=('any')
+depends=('java-runtime' 'java-hamcrest')
+makedepends=('apache-ant' 'jakarta-oro' 'jh')
+
+source=("libre://$pkgname-$pkgver.tar.gz")
+md5sums=('47c8879e05effb2ab98461c43243cc65')
+
+mksource=("$pkgname::git://github.com/junit-team/junit.git#tag=r$pkgver")
+mkmd5sums=('SKIP')
+mksource() {
+  cd "${srcdir}"p
+  if [[ -d $pkgname ]]; then
+    rm -rf "$pkgname"-*
+    mv "$pkgname" "$pkgname-$pkgver"
+  fi
+
+  cd "${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-ugly/maven/PKGBUILD b/java/maven/PKGBUILD
index 3f8e5071d..3f8e5071d 100644
--- a/java-ugly/maven/PKGBUILD
+++ b/java/maven/PKGBUILD
diff --git a/java-ugly/maven/maven.csh b/java/maven/maven.csh
index f5750cfc8..f5750cfc8 100644
--- a/java-ugly/maven/maven.csh
+++ b/java/maven/maven.csh
diff --git a/java-ugly/maven/maven.sh b/java/maven/maven.sh
index b6655cc22..b6655cc22 100644
--- a/java-ugly/maven/maven.sh
+++ b/java/maven/maven.sh
diff --git a/java/nant/PKGBUILD b/java/nant/PKGBUILD
index 02d9908a6..f57c8519f 100644
--- a/java/nant/PKGBUILD
+++ b/java/nant/PKGBUILD
@@ -1,19 +1,25 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 
 pkgname=nant
 pkgver=0.92
-pkgrel=1
+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")
+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')
+md5sums=('d680b47f9b2ce197cec0fac7d7d60950'
+         '06fcf641b6f232c5890ad25c73b2459f')
diff --git a/java/nant/mono3.patch b/java/nant/mono3.patch
new file mode 100644
index 000000000..94518d6cd
--- /dev/null
+++ b/java/nant/mono3.patch
@@ -0,0 +1,2645 @@
+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/closure-compiler/PKGBUILD b/java/not-working/closure-compiler/PKGBUILD
deleted file mode 100644
index 8318379a2..000000000
--- a/java/not-working/closure-compiler/PKGBUILD
+++ /dev/null
@@ -1,73 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-pkgname=closure-compiler
-pkgver=20120917
-_pkgrev=2180
-pkgdesc="A JavaScript optimizing compiler."
-url="https://code.google.com/closure/compiler/"
-license=('Apache')
-
-pkgrel=1
-arch=('any')
-depends=('java-runtime')
-makedepends=(
-  'apache-ant'
-  'java-args4j' # does not exist
-  'google-caja' # does not exist
-  'java-guava' # does not build
-  'java-jarjar'
-  'java-json' # does not exist
-  'java-jsr305' # does not exist
-  'junit'
-  'java-protobuf' # does not build
-  # maven-ant-tasks
-  'jh')
-source=("compiler-$pkgver::svn+http://closure-compiler.googlecode.com/svn/trunk/#revision=$_pkgrev")
-
-# For some reason, `file` detects this as a Fortran binary
-_funny_js=(
-  lib/rhino/testsrc/benchmarks/sunspider-0.9.1/bitops-3bit-bits-in-byte.js
-)
-
-mksource() {
-  cd "$srcdir/compiler-$pkgver"
-  rm lib/ant.jar
-  rm lib/ant-launcher.jar
-  rm lib/args4j.jar
-  rm lib/caja-r4314.jar
-  rm lib/guava.jar
-  rm lib/jarjar.jar
-  rm lib/json.jar
-  rm lib/jsr305.jar
-  rm lib/junit.jar
-  rm lib/protobuf-java.jar
-  rm lib/rhino/testsrc/org/mozilla/javascript/tests/commonjs/module/modules.jar
-  rm tools/maven-ant-tasks-2.1.3.jar
-}
-
-build() {
-  cd "$srcdir/compiler-$pkgver"
-  eval `jh mksource ${_funny_js[@]}`
-
-  ln -s /opt/apache-ant/lib/ant.jar          lib/ant.jar
-  ln -s /opt/apache-ant/lib/ant-launcher.jar lib/ant-launcher.jar
-  ln -s /usr/share/java/...                  lib/args4j.jar
-  ln -s /usr/share/java/...                  lib/caja-r4314.jar
-  ln -s /usr/share/java/...                  lib/guava.jar
-  ln -s /usr/share/java/jarjar.jar           lib/jarjar.jar
-  ln -s /usr/share/java/...                  lib/json.jar
-  ln -s /usr/share/java/...                  lib/jsr305.jar
-  ln -s /usr/share/java/junit.jar            lib/junit.jar
-  ln -s /usr/share/java/protobuf.jar         lib/protobuf-java.jar
-  # I think lib/rhino/.../module.jar autogenerates
-  ln -s /...                                 tools/maven-ant-tasks-2.1.3.jar
-
-  ant jar
-}
-
-package() {
-  cd "$srcdir/$pkgname"
-  :
-}
-
-md5sums=('SKIP')
diff --git a/java/not-working/closure-compiler/TODO b/java/not-working/closure-compiler/TODO
deleted file mode 100644
index 8527a4898..000000000
--- a/java/not-working/closure-compiler/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-* Has plenty of missing dependencies (most of the 'not-working' folder)
-* package() has not been written
diff --git a/java/not-working/java-bnd/PKGBUILD b/java/not-working/java-bnd/PKGBUILD
new file mode 100644
index 000000000..86820469a
--- /dev/null
+++ b/java/not-working/java-bnd/PKGBUILD
@@ -0,0 +1,24 @@
+# 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/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD
index ca6fbb0fa..2ca4cb45f 100644
--- a/kernels/linux-libre-pae/PKGBUILD
+++ b/kernels/linux-libre-pae/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 186437 2013-05-26 15:22:24Z tpowa $
+# $Id: PKGBUILD 194378 2013-09-15 09:16:34Z tpowa $
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgbase=linux-libre-pae     # Build stock -LIBRE-PAE kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
-_basekernel=3.9
-pkgver=${_basekernel}.4
+_basekernel=3.11
+pkgver=${_basekernel}.1
 pkgrel=1
 arch=('i686')
 url="http://linux-libre.fsfla.org/"
@@ -20,13 +20,15 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         # standard config files for mkinitcpio ramdisk
         "${pkgbase}.preset"
         'boot-logo.patch'
-        'change-default-console-loglevel.patch')
-md5sums=('120df29f88622dabf7015a22c7cc8e25'
-         'ae8a4997bfa4a6b9acfd0cefbb6e9aa0'
-         '7985f1e2cdb6838cf89bd85c0229db6a'
+        'change-default-console-loglevel.patch'
+        'criu-no-expert.patch')
+md5sums=('7ec84223c7adcf01a5287eb7af96b7e7'
+         '7b051faf375c76d4763a24048c52600b'
+         'bef7b3ced683c4dc9361f8739ec9f566'
          'f302c931bd85309da9d9792b4cc96467'
-         '04b21c79df0a952c22d681dd4f4562df'
-         'f3def2cefdcbb954c21d8505d23cc83c')
+         '36e90334b12b2e9d53fd92129ee98f5b'
+         '98beb36f9b8cf16e58de2483ea9985e3'
+         'd50c1ac47394e9aec637002ef3392bd1')
 
 _kernelname=${pkgbase#linux-libre}
 _localversionname=-LIBRE-PAE
@@ -38,7 +40,7 @@ prepare() {
     patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu"
   fi
 
-  # Add freedo as boot logo
+  # 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)
@@ -46,6 +48,10 @@ prepare() {
   # (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"
+
   cat "${srcdir}/config" > ./.config # simpler
 
   if [ "${_kernelname}" != "" ]; then
@@ -91,7 +97,7 @@ build() {
 }
 
 _package() {
-  pkgdesc="The ${pkgbase} kernel and modules with PAE support (HIGHMEM64G)"
+  pkgdesc="The ${pkgbase^} kernel and modules with PAE support (HIGHMEM64G)"
   [ "${pkgbase}" = "linux-libre" ] && groups=('base')
   depends=('coreutils' 'linux-libre-firmware' 'kmod' 'mkinitcpio>=0.7')
   optdepends=('crda: to set the correct wireless channels of your country')
@@ -117,14 +123,16 @@ _package() {
   # add vmlinux
   install -D -m644 vmlinux "${pkgdir}/usr/src/linux-${_kernver}/vmlinux"
 
-  # install fallback mkinitcpio.conf file and preset file for kernel
-  install -D -m644 "${srcdir}/${pkgbase}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
-
   # 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}/${pkgbase}.install"
+    -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}\"|" \
@@ -152,7 +160,7 @@ _package() {
 }
 
 _package-headers() {
-  pkgdesc="Header files and scripts for building modules for ${pkgbase} kernel"
+  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")
@@ -288,7 +296,7 @@ _package-headers() {
   done
 
   # remove unneeded architectures
-  rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arc,arm,arm26,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,metag,mips,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa}
+  rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arc,arm,arm26,arm64,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,metag,mips,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa}
 }
 
 pkgname=("${pkgbase}" "${pkgbase}-headers")
diff --git a/kernels/linux-libre-pae/boot-logo.patch b/kernels/linux-libre-pae/boot-logo.patch
index c392928a5..cbd52ea22 100644
--- a/kernels/linux-libre-pae/boot-logo.patch
+++ b/kernels/linux-libre-pae/boot-logo.patch
@@ -1,1612 +1,891 @@
-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 @@
+diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
+index 285d552..c9d8373 100644
+--- a/drivers/video/logo/logo_linux_clut224.ppm
++++ b/drivers/video/logo/logo_linux_clut224.ppm
+@@ -1,883 +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 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 11 15 17 33 49 54 59 85 92 73 97 106 
+-83 116 129 105 131 142 115 114 122 74 88 93 20 29 31 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 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 2 3 3 17 23 26 50 67 72 73 97 106 59 85 92 73 97 106 
+-105 131 142 124 127 131 105 131 142 105 131 142 53 75 83 6 8 8 0 0 0 0 0 0 
+-0 0 0 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 1 1 1 1 1 1 0 0 0 
+-0 0 0 1 1 1 26 35 39 59 85 92 59 85 92 59 85 92 29 43 47 53 75 83 
+-108 122 132 132 98 104 108 122 132 105 131 142 101 101 101 43 45 48 6 8 8 0 0 0 
+-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 1 1 1 0 0 0 0 0 0 0 0 0 
+-11 15 17 27 40 45 59 85 92 59 85 92 27 40 45 31 45 49 73 97 106 93 121 133 
+-108 122 132 108 122 132 105 131 142 108 122 132 105 131 142 73 97 106 26 35 39 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 1 1 1 7 12 13 21 31 35 42 59 64 
+-53 75 83 53 75 83 50 67 72 42 59 64 32 40 45 42 59 64 73 97 106 116 116 116 
+-132 98 104 116 116 116 108 122 132 117 104 110 105 131 142 83 116 129 50 67 72 7 12 13 
+-1 1 1 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 1 1 1 6 8 8 15 22 25 26 35 39 36 54 60 53 75 83 59 85 92 
+-59 85 92 48 63 69 15 22 25 12 17 20 52 67 79 94 94 94 132 98 104 132 98 104 
+-117 104 110 108 122 132 108 122 132 115 114 122 105 131 142 77 105 114 59 85 92 36 54 60 
+-7 12 13 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 15 22 25 29 43 47 36 54 60 42 59 64 42 59 64 48 63 69 21 31 35 
+-6 8 8 29 43 47 36 50 56 43 45 48 79 78 84 132 98 104 165 78 79 132 98 104 
+-108 122 132 117 104 110 117 104 110 108 122 132 77 105 114 73 97 106 95 131 149 78 102 129 
+-36 50 56 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 
+-
+-27 40 45 53 75 83 48 63 69 24 31 37 6 8 12 0 0 0 18 25 28 26 35 39 
+-12 17 20 26 35 39 65 78 84 112 81 86 152 81 83 137 83 86 132 98 104 117 104 110 
+-117 104 110 132 98 104 132 98 104 115 114 122 73 97 106 53 75 83 95 131 149 93 124 152 
+-68 78 128 15 22 25 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 
+-
+-36 50 56 21 30 33 4 7 7 0 0 0 1 1 1 17 12 12 69 31 31 68 59 64 
+-57 59 63 21 31 35 32 40 45 86 73 69 152 81 83 152 81 83 117 104 110 132 98 104 
+-152 81 83 132 98 104 108 122 132 77 105 114 77 105 114 93 121 133 95 131 149 93 124 152 
+-95 131 149 53 75 83 11 15 17 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 
+-
+-17 23 26 2 3 3 0 0 0 17 12 12 69 31 31 123 55 55 123 55 55 152 81 83 
+-86 73 69 17 23 26 7 12 13 45 54 57 101 101 101 137 83 86 132 98 104 132 98 104 
+-137 83 86 117 104 110 77 105 114 42 59 64 50 67 72 78 102 129 91 117 157 91 117 157 
+-95 131 149 83 116 129 40 48 73 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 
+-
+-1 1 1 1 2 2 2 3 3 28 12 12 123 55 55 174 79 79 174 79 79 174 79 79 
+-152 81 83 68 59 64 26 35 39 27 40 45 79 78 84 137 83 86 165 78 79 137 83 86 
+-94 94 94 48 63 69 36 50 56 50 67 72 73 97 106 93 121 133 93 124 152 93 124 152 
+-95 131 149 91 118 149 78 102 129 27 40 45 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 
+-
+-4 5 3 24 53 24 19 31 15 8 7 3 90 61 47 165 78 79 174 79 79 174 79 79 
+-174 79 79 137 83 86 60 52 57 7 12 13 17 23 26 70 70 70 132 98 104 112 81 86 
+-79 78 84 31 45 49 15 22 25 53 75 83 91 118 149 86 106 160 91 117 157 93 124 152 
+-91 117 157 93 124 152 95 131 149 53 75 83 50 50 50 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 
+-
+-19 31 15 34 76 34 34 76 34 19 31 15 28 12 12 123 55 55 174 79 79 174 79 79 
+-174 79 79 165 78 79 112 81 86 32 40 45 15 22 25 38 53 58 65 78 84 29 31 32 
+-21 30 33 42 59 64 60 80 103 78 102 129 87 112 149 84 96 162 91 117 157 93 124 152 
+-91 117 157 93 124 152 93 121 133 59 85 92 57 68 71 82 85 86 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 
+-
+-34 76 34 40 89 40 40 89 40 34 76 34 8 15 6 48 26 18 123 55 55 174 79 79 
+-174 79 79 174 79 79 137 83 86 68 59 64 32 40 45 21 30 33 31 45 49 21 31 35 
+-12 17 20 48 63 69 78 102 129 81 88 166 84 96 162 91 117 157 93 124 152 91 117 157 
+-93 124 152 95 131 149 83 116 129 59 85 92 57 68 71 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 
+-
+-40 89 40 40 89 40 40 89 40 40 89 40 24 53 24 6 6 6 69 31 31 123 55 55 
+-123 55 55 90 61 47 69 31 31 36 32 33 21 31 35 7 12 13 18 25 28 48 63 69 
+-60 80 103 68 78 128 84 101 153 84 96 162 84 96 162 91 117 157 91 117 157 84 96 162 
+-91 117 157 73 97 106 48 63 69 50 67 72 57 59 63 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 124 131 137 170 170 170 151 151 151 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 
+-
+-34 76 34 40 89 40 40 89 40 40 89 40 34 76 34 19 31 15 17 12 12 48 26 18 
+-48 26 18 8 7 3 10 10 22 23 29 47 51 61 92 42 59 64 21 30 33 34 45 54 
+-68 78 128 81 88 166 81 82 173 86 106 160 86 106 160 84 96 162 86 106 160 87 112 149 
+-91 118 149 77 105 114 52 67 79 32 40 45 50 50 50 86 86 86 2 2 6 14 14 14 
+-124 131 137 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 124 131 137 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 
+-
+-19 31 15 34 76 34 40 89 40 40 89 40 40 89 40 24 53 24 8 7 3 0 0 0 
+-6 8 12 28 32 52 51 61 92 54 54 122 74 77 160 68 78 128 26 35 39 6 8 8 
+-34 45 54 68 78 128 84 96 162 86 106 160 86 106 160 81 88 166 84 96 162 87 112 149 
+-73 97 106 36 50 56 33 49 54 18 18 18 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 170 170 170 124 127 131 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 
+-
+-4 5 3 24 53 24 40 89 40 40 89 40 34 76 34 12 22 15 4 5 3 4 5 3 
+-13 17 26 54 54 122 78 78 174 78 78 174 78 78 174 74 77 160 51 61 92 21 31 35 
+-26 35 39 53 75 83 84 101 153 81 82 173 81 88 166 84 101 153 60 80 103 60 80 103 
+-53 75 83 38 53 58 42 59 64 22 22 22 46 46 46 82 82 82 2 2 6 106 106 106 
+-170 170 170 26 26 26 86 86 86 226 226 226 124 127 131 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 151 151 151 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 
+-
+-1 2 2 8 15 6 24 53 24 34 76 34 19 31 15 8 15 6 63 55 20 63 55 20 
+-18 18 18 40 48 73 74 77 160 78 78 174 78 78 174 81 82 173 74 77 160 52 67 79 
+-17 23 26 21 31 35 60 80 103 81 88 166 74 77 160 78 102 129 36 54 60 12 17 20 
+-42 59 64 48 63 69 21 31 35 18 18 18 42 42 42 86 86 86 6 6 6 116 116 116 
+-106 106 106 6 6 6 70 70 70 151 151 151 124 127 131 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 
+-
+-11 15 17 0 0 0 12 22 15 19 31 15 8 15 6 63 55 20 149 139 69 149 139 69 
+-63 55 20 10 10 22 54 54 122 78 78 174 78 78 174 78 78 174 81 82 173 68 78 128 
+-24 31 37 6 6 6 36 50 56 60 80 103 51 61 92 42 59 64 36 50 56 31 45 49 
+-29 43 47 27 40 45 6 8 8 14 14 14 42 42 42 94 94 94 14 14 14 101 101 101 
+-124 127 131 2 2 6 18 18 18 116 116 116 106 107 48 121 92 8 121 92 8 98 70 6 
+-170 170 170 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 
+-
+-26 35 39 3 5 6 1 1 1 2 3 3 35 31 12 133 118 54 175 176 80 175 176 80 
+-133 118 54 35 31 12 23 29 47 54 54 122 78 78 174 78 78 174 74 77 160 68 78 128 
+-51 61 92 31 45 49 26 35 39 36 50 56 29 43 47 7 12 13 21 30 33 42 59 64 
+-18 25 28 7 12 13 1 1 1 10 10 10 38 38 38 90 90 90 14 14 14 58 58 58 
+-210 210 210 26 26 26 62 42 6 154 114 10 226 170 11 237 188 10 220 174 15 184 138 11 
+-220 174 15 174 140 55 35 31 12 2 2 6 70 70 70 246 246 246 124 131 137 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 
+-
+-27 40 45 17 23 26 2 3 3 1 1 1 56 77 35 165 152 80 175 176 80 175 176 80 
+-175 176 80 106 107 48 22 22 22 28 32 52 54 54 122 54 54 122 51 61 92 28 32 52 
+-20 27 34 31 45 49 11 15 17 7 12 13 36 50 56 31 45 49 29 43 47 36 50 56 
+-6 8 8 0 0 0 0 0 0 10 10 10 38 38 38 86 86 86 14 14 14 10 10 10 
+-195 195 195 198 179 130 192 133 9 220 174 15 239 182 13 237 188 10 232 195 16 239 207 25 
+-237 201 50 241 208 19 232 195 16 184 138 11 198 179 130 208 206 196 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 
+-
+-15 22 25 26 35 39 15 22 25 0 0 0 35 31 12 133 118 54 175 176 80 175 176 80 
+-175 176 80 165 152 80 56 77 35 6 8 12 23 29 47 13 17 26 2 2 6 0 0 0 
+-1 2 2 26 35 39 26 35 39 26 35 39 42 59 64 42 59 64 20 29 31 6 8 8 
+-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 92 8 192 133 9 219 162 10 239 182 13 237 188 10 232 195 16 241 208 19 237 201 50 
+-237 201 50 239 207 25 241 208 19 241 208 19 241 208 19 230 187 11 121 92 8 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 
+-
+-1 2 2 15 22 25 31 45 49 6 8 12 4 5 3 63 55 20 149 139 69 175 176 80 
+-175 176 80 175 176 80 106 107 48 20 16 6 1 1 1 0 0 0 2 3 3 11 15 17 
+-21 30 33 36 50 56 36 50 56 24 31 37 15 22 25 6 8 8 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 62 42 6 
+-180 123 7 206 145 10 230 174 11 239 182 13 237 188 10 238 202 15 241 208 19 237 201 50 
+-239 207 25 241 208 19 241 208 19 241 208 19 230 187 11 220 174 15 184 138 11 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 1 2 2 29 43 47 26 35 39 3 5 6 8 7 3 106 107 48 165 152 80 
+-175 176 80 149 139 69 63 55 20 4 5 3 2 3 3 12 17 20 26 35 39 26 35 39 
+-17 23 26 7 12 13 6 8 8 3 5 6 1 2 2 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 237 188 10 232 195 16 241 208 19 237 201 50 237 201 50 
+-241 208 19 241 208 19 241 208 19 204 160 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 12 17 20 27 40 45 18 25 28 1 1 1 35 31 12 106 107 48 
+-149 139 69 56 77 35 8 7 3 1 2 2 12 17 20 26 35 39 21 31 35 11 15 17 
+-3 5 6 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 10 10 10 30 30 30 78 78 78 46 46 46 22 22 22 
+-137 92 6 204 160 10 239 182 13 237 188 10 238 202 15 241 208 19 241 208 19 241 208 19 
+-241 208 19 204 160 10 184 138 11 210 150 10 216 158 10 210 150 10 98 70 6 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 1 1 1 15 22 25 33 49 54 12 17 20 2 3 3 35 31 12 
+-56 77 35 20 16 6 1 1 1 18 25 28 21 31 35 11 15 17 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 0 0 0 0 0 0 10 10 10 34 34 34 78 78 78 50 50 50 6 6 6 
+-88 55 22 139 102 15 190 146 13 230 187 11 239 207 25 232 195 16 220 174 15 190 146 13 
+-171 120 8 192 133 9 210 150 10 213 154 11 185 146 40 165 152 80 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 1 1 1 27 40 45 29 43 47 3 5 6 2 3 3 
+-8 7 3 1 1 1 17 23 26 31 45 49 15 22 25 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 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 
+-124 127 131 168 158 138 156 107 11 171 120 8 204 160 10 184 138 11 197 138 11 200 144 11 
+-206 145 10 206 145 10 197 138 11 198 179 130 195 195 195 198 198 198 170 170 170 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 11 15 17 31 45 49 26 35 39 3 5 6 
+-0 0 0 7 12 13 27 40 45 18 25 28 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 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 
+-124 131 137 190 190 190 168 158 138 156 107 11 197 138 11 200 144 11 197 138 11 192 133 9 
+-180 123 7 185 146 40 198 179 130 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 1 1 1 15 22 25 36 54 60 18 25 28 
+-0 0 0 21 30 33 27 40 45 2 3 3 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 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 
+-151 151 151 198 198 198 190 190 190 168 158 138 148 132 55 156 107 11 156 107 11 169 125 40 
+-168 158 138 187 187 187 190 190 190 210 210 210 246 246 246 253 253 253 253 253 253 180 180 180 
+-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 1 1 1 27 40 45 35 52 58 
+-18 25 28 35 52 58 17 23 26 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 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 7 12 13 33 49 54 
+-52 72 81 36 54 60 6 8 8 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-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 180 180 180 
+-253 253 253 246 246 246 202 202 202 190 190 190 190 190 190 190 190 190 190 190 190 190 190 190 
+-202 202 202 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 12 17 20 
+-36 54 60 29 43 47 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 
+-21 30 33 35 52 58 6 8 12 0 0 0 0 0 0 0 0 0 0 0 0 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 180 180 180 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 
+-12 17 20 36 54 60 29 43 47 0 0 0 0 0 0 0 0 0 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 106 106 106 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 21 30 33 35 52 58 6 8 12 0 0 0 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 12 17 20 36 54 60 29 43 47 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 21 30 33 35 52 58 6 8 12 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 202 202 202 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 202 202 202 202 202 202 202 202 202 
+-198 198 198 202 202 202 180 180 180 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 12 17 20 36 54 60 29 43 47 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 180 180 180 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 151 151 151 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 21 30 33 35 52 58 6 8 12 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 170 170 170 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 202 202 202 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 6 8 8 33 49 54 29 43 47 6 8 12 
+-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 12 17 20 33 49 54 17 23 26 
+-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 15 22 25 36 54 60 
+-0 0 0 0 0 0 0 0 0 18 18 18 54 54 54 82 82 82 2 2 6 26 26 26 
+-22 22 22 2 2 6 124 127 131 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 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 21 30 33 
+-36 54 60 0 0 0 0 0 0 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 
+-36 54 60 0 0 0 0 0 0 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 36 54 60 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 151 151 151 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 36 54 60 21 30 33 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 180 180 180 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 36 54 60 82 82 82 2 2 6 22 22 22 18 18 18 2 2 6 
+-151 151 151 253 253 253 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 202 202 202 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 36 54 60 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 202 202 202 2 2 6 
+-22 22 22 34 34 34 20 16 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 63 55 20 184 138 11 204 160 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 151 151 151 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 138 132 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 214 187 87 214 187 87 185 146 40 35 31 12 
+-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 185 146 40 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 237 201 50 241 196 14 241 208 19 232 195 16 35 31 12 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 6 6 6 30 30 30 26 26 26 
+-204 160 10 165 152 80 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 124 127 131 
+-174 140 55 210 150 10 234 174 13 246 186 14 246 190 14 246 190 14 246 190 14 237 188 10 
+-98 70 6 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 214 187 87 242 186 14 241 196 14 204 160 10 20 16 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 148 132 55 185 146 40 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 
+-220 174 15 35 31 12 2 2 6 22 22 22 151 151 151 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 214 187 87 239 182 13 237 188 10 213 154 11 35 31 12 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 62 42 6 220 174 15 
+-237 188 10 237 188 10 113 101 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 6 6 6 
+-22 22 22 54 54 54 148 132 55 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 138 11 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 213 164 39 236 178 12 236 178 12 210 150 10 137 92 6 
+-20 16 6 2 2 6 2 2 6 2 2 6 6 6 6 62 42 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 169 125 40 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 202 202 202 198 198 198 213 164 39 230 174 11 230 174 11 216 158 10 192 133 9 
+-163 110 8 120 80 7 98 70 6 120 80 7 167 114 7 197 138 11 226 170 11 239 182 13 
+-242 186 14 242 186 14 165 152 80 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 185 146 40 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 204 160 10 20 16 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 202 202 202 198 198 198 213 164 39 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 220 174 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 140 55 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 185 146 40 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 213 164 39 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 140 55 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 230 187 11 62 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 169 125 40 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 213 164 39 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 149 139 69 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 20 16 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 220 174 15 149 139 69 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 149 139 69 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 20 16 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 149 139 69 
+-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 149 139 69 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 220 174 15 198 179 130 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 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 20 16 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 185 146 40 
+-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 169 125 40 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 35 31 12 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 149 139 69 
+-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 113 101 86 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 230 187 11 204 160 10 133 118 54 
+-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 62 42 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 148 132 55 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 148 132 55 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 204 160 10 163 110 8 
+-62 42 6 124 131 137 218 218 218 250 250 250 253 253 253 253 253 253 253 253 253 250 250 250 
+-242 242 242 210 210 210 151 151 151 66 66 66 6 6 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 62 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 185 146 40 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 169 125 40 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 171 120 8 
+-85 57 6 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 85 57 6 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 140 55 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 169 125 40 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 85 57 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 
+-169 125 40 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 133 118 54 169 125 40 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 184 138 11 152 99 6 
+-104 69 6 20 16 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 85 57 6 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 148 132 55 
+-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 133 118 54 156 107 11 
+-163 110 8 167 114 7 171 120 8 180 123 7 184 138 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 134 84 6 
+-85 57 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 62 42 6 137 92 6 171 120 8 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 113 101 86 133 118 54 121 92 8 137 92 6 152 99 6 163 110 8 180 123 7 
+-184 138 11 197 138 11 206 145 10 200 144 11 180 123 7 156 107 11 134 84 6 104 69 6 
+-62 42 6 54 54 54 106 106 106 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 90 61 47 120 80 7 156 107 11 180 123 7 192 133 9 200 144 11 
+-206 145 10 200 144 11 192 133 9 171 120 8 139 102 15 113 101 86 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 113 101 86 121 92 8 120 80 7 
+-137 92 6 152 99 6 152 99 6 152 99 6 134 84 6 120 80 7 98 70 6 88 55 22 
+-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 71 85 57 6 134 84 6 156 107 11 167 114 7 171 120 8 
+-171 120 8 167 114 7 152 99 6 121 92 8 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 
+-94 86 71 98 70 6 104 69 6 104 69 6 104 69 6 85 57 6 88 55 22 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 94 86 71 85 57 6 104 69 6 120 80 7 137 92 6 
+-134 84 6 120 80 7 94 86 71 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 71 94 86 71 94 86 71 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 94 86 71 94 86 71 94 86 71 
+-94 86 71 94 86 71 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 
@@ -2464,10 +1743,11 @@ diff -Nur linux-2.6.39.1/drivers/video/logo/logo_linux_clut224.ppm linux-2.6.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 
-+
-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
+ 
+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
@@ -2831,16 +2111,15 @@ diff -Nur linux-2.6.39.1/drivers/video/logo/logo_linux_mono.pbm linux-2.6.39-LIB
 +0 0 0 0 0 0 0 0 0 0 
 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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
+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
-+# CREATOR: GIMP PNM Filter Version 1.1
-+80 78
- 255
+-255
 -  0   0   0   0   0   0   0   0   0   0   0   0
 -  0   0   0   0   0   0   0   0   0   0   0   0
 -  0   0   0   0   0   0   0   0   0   0   0   0
@@ -4441,6 +3720,9 @@ diff -Nur linux-2.6.39.1/drivers/video/logo/logo_linux_vga16.ppm linux-2.6.39-LI
 -  0   0   0   0   0   0   0   0   0   0   0   0
 -  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
diff --git a/kernels/linux-libre-pae/change-default-console-loglevel.patch b/kernels/linux-libre-pae/change-default-console-loglevel.patch
index 2685d4d23..22cd69a09 100644
--- a/kernels/linux-libre-pae/change-default-console-loglevel.patch
+++ b/kernels/linux-libre-pae/change-default-console-loglevel.patch
@@ -1,6 +1,6 @@
 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
+--- 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.. */
diff --git a/kernels/linux-libre-pae/config b/kernels/linux-libre-pae/config
index dd3549ac6..e001d16eb 100644
--- a/kernels/linux-libre-pae/config
+++ b/kernels/linux-libre-pae/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.9.3-1 Kernel Configuration
+# Linux/x86 3.11.0-1 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -17,12 +17,10 @@ CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_GPIO=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_DEFAULT_IDLE=y
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
 CONFIG_ARCH_HAS_CPU_AUTOPROBE=y
 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
@@ -30,6 +28,8 @@ 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
@@ -49,6 +49,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
 #
 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
@@ -56,11 +57,13 @@ 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
@@ -98,6 +101,9 @@ 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
 
@@ -126,6 +132,9 @@ 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
@@ -169,22 +178,22 @@ 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_EXPERT is not set
 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_SYSCTL_EXCEPTION_TRACE=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
-CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_PCSPKR_PLATFORM=y
-CONFIG_HAVE_PCSPKR_PLATFORM=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
@@ -193,6 +202,7 @@ 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
 
@@ -202,11 +212,11 @@ CONFIG_HAVE_PERF_EVENTS=y
 CONFIG_PERF_EVENTS=y
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_PCI_QUIRKS=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
@@ -250,6 +260,7 @@ 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
@@ -283,6 +294,7 @@ CONFIG_BLK_DEV_THROTTLING=y
 #
 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
@@ -326,21 +338,20 @@ 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_PARAVIRT_GUEST=y
-CONFIG_PARAVIRT_TIME_ACCOUNTING=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_LGUEST_GUEST=y
-CONFIG_PARAVIRT=y
-# CONFIG_PARAVIRT_SPINLOCKS is not set
+CONFIG_PARAVIRT_TIME_ACCOUNTING=y
 CONFIG_PARAVIRT_CLOCK=y
-# CONFIG_PARAVIRT_DEBUG is not set
 CONFIG_NO_BOOTMEM=y
 # CONFIG_MEMTEST is not set
 # CONFIG_M486 is not set
@@ -407,12 +418,9 @@ CONFIG_TOSHIBA=m
 CONFIG_I8K=m
 CONFIG_X86_REBOOTFIXUPS=y
 CONFIG_MICROCODE=m
-CONFIG_MICROCODE_INTEL=y
-CONFIG_MICROCODE_AMD=y
+# CONFIG_MICROCODE_INTEL is not set
+# CONFIG_MICROCODE_AMD is not set
 CONFIG_MICROCODE_OLD_INTERFACE=y
-CONFIG_MICROCODE_INTEL_LIB=y
-CONFIG_MICROCODE_INTEL_EARLY=y
-CONFIG_MICROCODE_EARLY=y
 CONFIG_X86_MSR=m
 CONFIG_X86_CPUID=m
 # CONFIG_NOHIGHMEM is not set
@@ -456,6 +464,8 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
 CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CLEANCACHE=y
 CONFIG_FRONTSWAP=y
+CONFIG_ZBUD=y
+CONFIG_ZSWAP=y
 # CONFIG_HIGHPTE is not set
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
@@ -515,6 +525,7 @@ CONFIG_PM_ADVANCED_DEBUG=y
 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
@@ -588,6 +599,7 @@ 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
@@ -625,7 +637,7 @@ CONFIG_PCI_MMCONFIG=y
 CONFIG_PCI_OLPC=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=m
+CONFIG_HOTPLUG_PCI_PCIE=y
 CONFIG_PCIEAER=y
 # CONFIG_PCIE_ECRC is not set
 # CONFIG_PCIEAER_INJECT is not set
@@ -647,6 +659,10 @@ 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
@@ -680,11 +696,11 @@ CONFIG_I82365=m
 CONFIG_TCIC=m
 CONFIG_PCMCIA_PROBE=y
 CONFIG_PCCARD_NONSTATIC=y
-CONFIG_HOTPLUG_PCI=m
+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=m
+CONFIG_HOTPLUG_PCI_ACPI=y
 CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 CONFIG_HOTPLUG_PCI_CPCI=y
 CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
@@ -696,11 +712,15 @@ 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_RAPIDIO_TSI500=y
 
 #
 # Executable file formats / Emulations
@@ -708,6 +728,7 @@ CONFIG_RAPIDIO_TSI500=y
 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
@@ -743,6 +764,7 @@ 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
@@ -761,8 +783,8 @@ 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=y
-CONFIG_INET_TCP_DIAG=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
@@ -1092,7 +1114,6 @@ CONFIG_IP_DCCP_TFRC_LIB=y
 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
@@ -1139,7 +1160,6 @@ CONFIG_COPS_DAYNA=y
 CONFIG_COPS_TANGENT=y
 CONFIG_IPDDP=m
 CONFIG_IPDDP_ENCAP=y
-CONFIG_IPDDP_DECAP=y
 # CONFIG_X25 is not set
 # CONFIG_LAPB is not set
 CONFIG_PHONET=m
@@ -1208,15 +1228,22 @@ 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_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
@@ -1389,17 +1416,21 @@ CONFIG_CEPH_LIB=m
 # 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
-# CONFIG_NFC_LLCP 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
@@ -1416,7 +1447,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_FW_LOADER_USER_HELPER is not set
+CONFIG_FW_LOADER_USER_HELPER=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
@@ -1446,7 +1477,6 @@ CONFIG_MTD_AR7_PARTS=m
 #
 # User Modules And Translation Layers
 #
-CONFIG_MTD_CHAR=m
 CONFIG_MTD_BLKDEVS=m
 CONFIG_MTD_BLOCK=m
 CONFIG_MTD_BLOCK_RO=m
@@ -1528,9 +1558,6 @@ CONFIG_MTD_BLOCK2MTD=m
 #
 # Disk-On-Chip Device Drivers
 #
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
 CONFIG_MTD_DOCG3=m
 CONFIG_BCH_CONST_M=14
 CONFIG_BCH_CONST_T=4
@@ -1539,7 +1566,6 @@ CONFIG_MTD_NAND_ECC_SMC=y
 CONFIG_MTD_NAND=m
 # CONFIG_MTD_NAND_ECC_BCH is not set
 CONFIG_MTD_SM_COMMON=m
-# CONFIG_MTD_NAND_MUSEUM_IDS is not set
 # CONFIG_MTD_NAND_DENALI is not set
 CONFIG_MTD_NAND_IDS=m
 CONFIG_MTD_NAND_RICOH=m
@@ -1575,7 +1601,6 @@ CONFIG_PROC_DEVICETREE=y
 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
@@ -1585,8 +1610,8 @@ CONFIG_OF_MTD=y
 CONFIG_PARPORT=m
 CONFIG_PARPORT_PC=m
 CONFIG_PARPORT_SERIAL=m
-CONFIG_PARPORT_PC_FIFO=y
-CONFIG_PARPORT_PC_SUPERIO=y
+# 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
@@ -1640,9 +1665,9 @@ 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
@@ -1670,6 +1695,7 @@ CONFIG_BMP085_I2C=m
 # 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
 
@@ -1697,7 +1723,7 @@ CONFIG_SENSORS_LIS3_I2C=m
 #
 CONFIG_ALTERA_STAPL=m
 CONFIG_INTEL_MEI=m
-CONFIG_INTEL_MEI_ME=y
+CONFIG_INTEL_MEI_ME=m
 CONFIG_VMWARE_VMCI=m
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
@@ -1795,6 +1821,7 @@ 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
@@ -1906,6 +1933,7 @@ 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
@@ -1985,6 +2013,10 @@ 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
@@ -2008,6 +2040,7 @@ 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
@@ -2045,16 +2078,17 @@ 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_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
@@ -2071,6 +2105,7 @@ 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
@@ -2111,6 +2146,11 @@ 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
@@ -2140,11 +2180,14 @@ 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
@@ -2227,6 +2270,7 @@ 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
@@ -2259,6 +2303,7 @@ 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
@@ -2270,6 +2315,7 @@ 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
@@ -2286,6 +2332,8 @@ 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
@@ -2293,8 +2341,6 @@ CONFIG_STMMAC_ETH=m
 CONFIG_STMMAC_PCI=y
 # CONFIG_STMMAC_DEBUG_FS is not set
 # CONFIG_STMMAC_DA is not set
-CONFIG_STMMAC_RING=y
-# CONFIG_STMMAC_CHAINED is not set
 CONFIG_NET_VENDOR_SUN=y
 CONFIG_HAPPYMEAL=m
 CONFIG_SUNGEM=m
@@ -2341,7 +2387,8 @@ CONFIG_NATIONAL_PHY=m
 CONFIG_STE10XP=m
 CONFIG_LSI_ET1011C_PHY=m
 CONFIG_MICREL_PHY=m
-# CONFIG_MDIO_BITBANG is not set
+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
@@ -2372,6 +2419,7 @@ 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
@@ -2439,7 +2487,7 @@ CONFIG_ATH9K=m
 CONFIG_ATH9K_PCI=y
 CONFIG_ATH9K_AHB=y
 # CONFIG_ATH9K_DEBUGFS is not set
-CONFIG_ATH9K_RATE_CONTROL=y
+# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set
 CONFIG_ATH9K_HTC=m
 # CONFIG_ATH9K_HTC_DEBUGFS is not set
 CONFIG_CARL9170=m
@@ -2450,12 +2498,18 @@ 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_BCMA_EXTRA is not set
 CONFIG_B43_SSB=y
 CONFIG_B43_PCI_AUTOSELECT=y
 CONFIG_B43_PCICORE_AUTOSELECT=y
@@ -2484,7 +2538,6 @@ CONFIG_BRCMUTIL=m
 CONFIG_BRCMSMAC=m
 CONFIG_BRCMFMAC=m
 CONFIG_BRCMFMAC_SDIO=y
-# CONFIG_BRCMFMAC_SDIO_OOB is not set
 CONFIG_BRCMFMAC_USB=y
 # CONFIG_BRCM_TRACING is not set
 # CONFIG_BRCMDBG is not set
@@ -2494,20 +2547,12 @@ CONFIG_HOSTAP_FIRMWARE=y
 CONFIG_HOSTAP_PLX=m
 CONFIG_HOSTAP_PCI=m
 CONFIG_HOSTAP_CS=m
-CONFIG_IPW2100=m
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2100_DEBUG is not set
-CONFIG_IPW2200=m
-CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW2200_RADIOTAP=y
-CONFIG_IPW2200_PROMISCUOUS=y
-CONFIG_IPW2200_QOS=y
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_LIBIPW=m
-# CONFIG_LIBIPW_DEBUG is not set
+# 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
@@ -2560,6 +2605,7 @@ 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
@@ -2570,13 +2616,17 @@ 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_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
@@ -2594,6 +2644,9 @@ 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
@@ -2876,6 +2929,9 @@ 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
@@ -2955,11 +3011,12 @@ 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_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
 
@@ -2977,6 +3034,8 @@ 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
@@ -3012,7 +3071,6 @@ CONFIG_N_GSM=m
 CONFIG_TRACE_ROUTER=m
 CONFIG_TRACE_SINK=m
 # CONFIG_DEVKMEM is not set
-# CONFIG_STALDRV is not set
 
 #
 # Serial drivers
@@ -3053,6 +3111,7 @@ 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_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
 CONFIG_PPDEV=m
@@ -3149,7 +3208,6 @@ 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
@@ -3188,6 +3246,7 @@ 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_SPI is not set
 # CONFIG_SPI_OC_TINY is not set
 # CONFIG_SPI_PXA2XX is not set
 # CONFIG_SPI_PXA2XX_PCI is not set
@@ -3246,6 +3305,7 @@ 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:
@@ -3333,6 +3393,8 @@ 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
@@ -3352,6 +3414,7 @@ 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
@@ -3379,6 +3442,7 @@ 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
@@ -3391,6 +3455,7 @@ 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
@@ -3459,10 +3524,15 @@ CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 # 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_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
@@ -3510,6 +3580,7 @@ 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
@@ -3564,47 +3635,52 @@ CONFIG_BCMA_DRIVER_GPIO=y
 # 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_MFD_RTSX_PCI=m
+CONFIG_ABX500_CORE=y
+# CONFIG_MFD_STMPE is not set
+# CONFIG_MFD_SYSCON is not set
 CONFIG_MFD_TI_AM335X_TSCADC=m
-CONFIG_HTC_PASIC3=m
-CONFIG_UCB1400_CORE=m
-CONFIG_MFD_LM3533=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_STMPE 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_DA9052_SPI 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_MFD_PCF50633=m
-CONFIG_PCF50633_ADC=m
-CONFIG_PCF50633_GPIO=m
-CONFIG_MFD_MC13783=m
-CONFIG_MFD_MC13XXX=m
-# CONFIG_MFD_MC13XXX_SPI is not set
-CONFIG_MFD_MC13XXX_I2C=m
-CONFIG_ABX500_CORE=y
-# CONFIG_EZX_PCAP is not set
-CONFIG_MFD_CS5535=m
-# CONFIG_MFD_TIMBERDALE is not set
-CONFIG_LPC_SCH=m
-CONFIG_LPC_ICH=m
-CONFIG_MFD_RDC321X=m
-# CONFIG_MFD_JANZ_CMODIO is not set
-CONFIG_MFD_VX855=m
-CONFIG_MFD_WL1273_CORE=m
-# CONFIG_MFD_SYSCON is not set
-CONFIG_MFD_VIPERBOARD=m
-CONFIG_MFD_RETU=m
 # CONFIG_REGULATOR is not set
 CONFIG_MEDIA_SUPPORT=m
 
@@ -3632,6 +3708,7 @@ 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
@@ -3732,6 +3809,7 @@ CONFIG_USB_ZR364XX=m
 CONFIG_USB_STKWEBCAM=m
 CONFIG_USB_S2255=m
 CONFIG_USB_SN9C102=m
+CONFIG_VIDEO_USBTV=m
 
 #
 # Analog TV USB devices
@@ -3790,7 +3868,6 @@ CONFIG_DVB_USB_FRIIO=m
 CONFIG_DVB_USB_AZ6027=m
 CONFIG_DVB_USB_TECHNISAT_USB2=m
 CONFIG_DVB_USB_V2=m
-CONFIG_DVB_USB_CYPRESS_FIRMWARE=m
 CONFIG_DVB_USB_AF9015=m
 CONFIG_DVB_USB_AF9035=m
 CONFIG_DVB_USB_ANYSEE=m
@@ -3936,16 +4013,19 @@ CONFIG_MEDIA_COMMON_OPTIONS=y
 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
 
 #
@@ -3959,9 +4039,11 @@ 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
@@ -3978,6 +4060,9 @@ 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
 
 #
@@ -3997,6 +4082,7 @@ CONFIG_VIDEO_ADV7175=m
 #
 # Camera sensor devices
 #
+CONFIG_VIDEO_OV7640=m
 CONFIG_VIDEO_MT9V011=m
 
 #
@@ -4017,7 +4103,6 @@ CONFIG_VIDEO_M52790=m
 #
 # Sensors used on soc_camera driver
 #
-CONFIG_MEDIA_ATTACH=y
 CONFIG_MEDIA_TUNER=m
 CONFIG_MEDIA_TUNER_SIMPLE=m
 CONFIG_MEDIA_TUNER_TDA8290=m
@@ -4047,6 +4132,8 @@ 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
@@ -4228,10 +4315,9 @@ 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_OF_DISPLAY_TIMING is not set
-# CONFIG_OF_VIDEOMODE is not set
 CONFIG_HDMI=y
 CONFIG_FB=y
 CONFIG_FIRMWARE_EDID=y
@@ -4246,7 +4332,6 @@ CONFIG_FB_SYS_COPYAREA=m
 CONFIG_FB_SYS_IMAGEBLIT=m
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 CONFIG_FB_SYS_FOPS=m
-# CONFIG_FB_WMT_GE_ROPS is not set
 CONFIG_FB_DEFERRED_IO=y
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
@@ -4291,7 +4376,7 @@ CONFIG_FB_VIA_X_COMPATIBILITY=y
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_3DFX is not set
 CONFIG_FB_VOODOO1=m
-# CONFIG_FB_VT8623 is not set
+CONFIG_FB_VT8623=m
 # CONFIG_FB_TRIDENT is not set
 # CONFIG_FB_ARK is not set
 # CONFIG_FB_PM3 is not set
@@ -4307,12 +4392,15 @@ CONFIG_FB_VIRTUAL=m
 # 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
@@ -4325,7 +4413,7 @@ CONFIG_LCD_PLATFORM=m
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_GENERIC is not set
 CONFIG_BACKLIGHT_LM3533=m
-CONFIG_BACKLIGHT_PWM=m
+# CONFIG_BACKLIGHT_PWM is not set
 CONFIG_BACKLIGHT_APPLE=m
 # CONFIG_BACKLIGHT_SAHARA is not set
 # CONFIG_BACKLIGHT_ADP8860 is not set
@@ -4347,18 +4435,6 @@ 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
@@ -4380,6 +4456,7 @@ 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
@@ -4511,6 +4588,7 @@ 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
@@ -4555,6 +4633,7 @@ 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
@@ -4582,6 +4661,7 @@ 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
@@ -4592,9 +4672,11 @@ 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
@@ -4627,7 +4709,6 @@ 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
@@ -4647,7 +4728,6 @@ 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
@@ -4664,9 +4744,6 @@ 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
@@ -4677,10 +4754,9 @@ CONFIG_USB=m
 #
 # Miscellaneous USB options
 #
+CONFIG_USB_DEFAULT_PERSIST=y
 CONFIG_USB_DYNAMIC_MINORS=y
-CONFIG_USB_SUSPEND=y
 # CONFIG_USB_OTG is not set
-# CONFIG_USB_DWC3 is not set
 CONFIG_USB_MON=m
 CONFIG_USB_WUSB=m
 CONFIG_USB_WUSB_CBAF=m
@@ -4696,14 +4772,16 @@ 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_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_EHCI_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
@@ -4719,12 +4797,14 @@ 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_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_UX500_DMA is not set
 CONFIG_MUSB_PIO_ONLY=y
-CONFIG_USB_CHIPIDEA=m
-CONFIG_USB_CHIPIDEA_UDC=y
-CONFIG_USB_CHIPIDEA_HOST=y
-# CONFIG_USB_CHIPIDEA_DEBUG is not set
 CONFIG_USB_RENESAS_USBHS=m
 
 #
@@ -4764,6 +4844,10 @@ CONFIG_USB_STORAGE_ENE_UB6250=m
 #
 CONFIG_USB_MDC800=m
 CONFIG_USB_MICROTEK=m
+# CONFIG_USB_DWC3 is not set
+CONFIG_USB_CHIPIDEA=m
+CONFIG_USB_CHIPIDEA_UDC=y
+# CONFIG_USB_CHIPIDEA_DEBUG is not set
 
 #
 # USB port drivers
@@ -4835,9 +4919,12 @@ 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_FLASHLOADER=m
+CONFIG_USB_SERIAL_SUUNTO=m
 # CONFIG_USB_SERIAL_DEBUG is not set
 
 #
@@ -4866,19 +4953,21 @@ CONFIG_USB_ISIGHTFW=m
 CONFIG_USB_YUREX=m
 CONFIG_USB_EZUSB_FX2=m
 CONFIG_USB_HSIC_USB3503=m
-
-#
-# USB Physical Layer drivers
-#
-# CONFIG_OMAP_USB3 is not set
-# CONFIG_OMAP_CONTROL_USB is not set
-CONFIG_USB_ISP1301=m
-CONFIG_USB_RCAR_PHY=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
@@ -4890,10 +4979,12 @@ 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_GADGET_MUSB_HDRC=m
+CONFIG_USB_MV_U3D=m
 CONFIG_USB_M66592=m
 CONFIG_USB_AMD5536UDC=m
 CONFIG_USB_NET2272=m
@@ -4905,6 +4996,15 @@ 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
@@ -4931,13 +5031,6 @@ CONFIG_USB_G_DBGP=m
 # CONFIG_USB_G_DBGP_PRINTK is not set
 CONFIG_USB_G_DBGP_SERIAL=y
 CONFIG_USB_G_WEBCAM=m
-
-#
-# OTG and related infrastructure
-#
-CONFIG_USB_OTG_UTILS=y
-# CONFIG_USB_GPIO_VBUS is not set
-CONFIG_NOP_USB_XCEIV=m
 CONFIG_UWB=m
 CONFIG_UWB_HWA=m
 CONFIG_UWB_WHCI=m
@@ -5004,6 +5097,7 @@ 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
@@ -5018,11 +5112,11 @@ CONFIG_LEDS_TCA6507=m
 CONFIG_LEDS_LM355x=m
 CONFIG_LEDS_OT200=m
 CONFIG_LEDS_BLINKM=m
-CONFIG_LEDS_TRIGGERS=y
 
 #
 # LED Triggers
 #
+CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=m
 CONFIG_LEDS_TRIGGER_ONESHOT=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
@@ -5035,6 +5129,7 @@ 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
@@ -5087,6 +5182,7 @@ 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
@@ -5151,11 +5247,13 @@ CONFIG_DMADEVICES=y
 #
 CONFIG_INTEL_MID_DMAC=m
 CONFIG_INTEL_IOATDMA=m
+CONFIG_DW_DMAC_CORE=m
 CONFIG_DW_DMAC=m
-# CONFIG_DW_DMAC_BIG_ENDIAN_IO is not set
+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
 
 #
@@ -5184,6 +5282,7 @@ CONFIG_VFIO_IOMMU_TYPE1=m
 CONFIG_VFIO=m
 CONFIG_VFIO_PCI=m
 CONFIG_VFIO_PCI_VGA=y
+CONFIG_VIRT_DRIVERS=y
 CONFIG_VIRTIO=y
 
 #
@@ -5222,17 +5321,14 @@ 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
@@ -5261,12 +5357,14 @@ 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
@@ -5288,6 +5386,7 @@ 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
@@ -5316,11 +5415,10 @@ CONFIG_COMEDI_NI_6527=m
 CONFIG_COMEDI_NI_65XX=m
 CONFIG_COMEDI_NI_660X=m
 CONFIG_COMEDI_NI_670X=m
-CONFIG_COMEDI_NI_LABPC=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
@@ -5343,8 +5441,8 @@ CONFIG_COMEDI_8255=m
 CONFIG_COMEDI_FC=m
 CONFIG_COMEDI_AMPLC_DIO200=m
 CONFIG_COMEDI_AMPLC_PC236=m
-CONFIG_COMEDI_AMPLC_PC263=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
@@ -5367,9 +5465,9 @@ 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_ZSMALLOC=y
 CONFIG_WLAGS49_H2=m
 CONFIG_WLAGS49_H25=m
 CONFIG_FB_SM7XX=m
@@ -5411,14 +5509,8 @@ 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_VIDEO_GO7007_OV7640=m
-CONFIG_VIDEO_GO7007_SAA7113=m
-CONFIG_VIDEO_GO7007_SAA7115=m
-CONFIG_VIDEO_GO7007_TW9903=m
-CONFIG_VIDEO_GO7007_UDA1342=m
-CONFIG_VIDEO_GO7007_SONY_TUNER=m
-CONFIG_VIDEO_GO7007_TW2804=m
 CONFIG_SOLO6X10=m
 CONFIG_LIRC_STAGING=y
 CONFIG_LIRC_BT829=m
@@ -5443,14 +5535,16 @@ 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=y
+CONFIG_ZCACHE=m
+# CONFIG_ZCACHE_DEBUG is not set
+# CONFIG_USB_DWC2 is not set
+CONFIG_USB_BTMTK=m
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
@@ -5500,6 +5594,9 @@ 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
@@ -5526,7 +5623,6 @@ CONFIG_STE_MODEM_RPROC=m
 #
 # Rpmsg drivers
 #
-CONFIG_VIRT_DRIVERS=y
 # CONFIG_PM_DEVFREQ is not set
 CONFIG_EXTCON=m
 
@@ -5538,10 +5634,18 @@ CONFIG_MEMORY=y
 # CONFIG_IIO 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
@@ -5549,9 +5653,6 @@ CONFIG_SERIAL_IPOCTAL=m
 CONFIG_EDD=m
 # CONFIG_EDD_OFF is not set
 CONFIG_FIRMWARE_MEMMAP=y
-CONFIG_EFI_VARS=y
-CONFIG_EFI_VARS_PSTORE=y
-# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
 CONFIG_DELL_RBU=m
 CONFIG_DCDBAS=m
 CONFIG_DMIID=y
@@ -5561,6 +5662,11 @@ 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
@@ -5589,6 +5695,7 @@ 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
@@ -5601,6 +5708,8 @@ CONFIG_OCFS2_FS_STATS=y
 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
@@ -5727,6 +5836,8 @@ 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
@@ -5736,10 +5847,12 @@ 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
@@ -5749,6 +5862,7 @@ 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
@@ -5789,6 +5903,7 @@ 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
@@ -5847,68 +5962,95 @@ CONFIG_DLM=m
 # 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_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_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_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_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_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_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_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
@@ -5920,16 +6062,12 @@ 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_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_DEBUG_PAGEALLOC 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
@@ -5958,6 +6096,7 @@ CONFIG_FUNCTION_GRAPH_TRACER=y
 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
@@ -5974,30 +6113,38 @@ CONFIG_FTRACE_MCOUNT_RECORD=y
 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_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_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
@@ -6013,8 +6160,8 @@ 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_STRICT_USER_COPY_CHECKS is not set
 # CONFIG_DEBUG_NMI_SELFTEST is not set
+# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set
 
 #
 # Security options
@@ -6036,14 +6183,16 @@ CONFIG_SECURITY_TOMOYO=y
 CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
 CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
 # CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
-CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init"
+CONFIG_SECURITY_TOMOYO_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 is not set
+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
@@ -6052,8 +6201,6 @@ CONFIG_ASYNC_MEMCPY=m
 CONFIG_ASYNC_XOR=m
 CONFIG_ASYNC_PQ=m
 CONFIG_ASYNC_RAID6_RECOV=m
-CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y
-CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y
 CONFIG_CRYPTO=y
 
 #
@@ -6106,6 +6253,7 @@ CONFIG_CRYPTO_XTS=m
 #
 # Hash modes
 #
+CONFIG_CRYPTO_CMAC=m
 CONFIG_CRYPTO_HMAC=m
 CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_VMAC=m
@@ -6164,6 +6312,8 @@ CONFIG_CRYPTO_TWOFISH_586=m
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_ZLIB=m
 CONFIG_CRYPTO_LZO=y
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
 
 #
 # Random Number Generation
@@ -6185,6 +6335,7 @@ 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
@@ -6196,8 +6347,7 @@ CONFIG_KVM=m
 CONFIG_KVM_INTEL=m
 CONFIG_KVM_AMD=m
 CONFIG_KVM_MMU_AUDIT=y
-CONFIG_VHOST_NET=m
-CONFIG_TCM_VHOST=m
+CONFIG_KVM_DEVICE_ASSIGNMENT=y
 CONFIG_LGUEST=m
 CONFIG_BINARY_PRINTF=y
 
@@ -6208,6 +6358,7 @@ 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
@@ -6231,6 +6382,9 @@ CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 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
@@ -6245,6 +6399,7 @@ 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
@@ -6273,3 +6428,16 @@ 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
new file mode 100644
index 000000000..2124427e9
--- /dev/null
+++ b/kernels/linux-libre-pae/criu-no-expert.patch
@@ -0,0 +1,22 @@
+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
index a5e974c9b..079d1b7ab 100644
--- a/kernels/linux-libre-pae/linux-libre-pae.install
+++ b/kernels/linux-libre-pae/linux-libre-pae.install
@@ -2,10 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-pae
-KERNEL_VERSION=3.9.4-1-LIBRE-PAE
-
-# set a sane PATH to ensure that critical utils like depmod will be found
-export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
+KERNEL_VERSION=
 
 post_install () {
   # updating module dependencies
@@ -15,40 +12,9 @@ post_install () {
     echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
     mkinitcpio -p linux-libre${KERNEL_NAME}
   fi
-
-  # compat symlinks for the official kernels only
-  if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-pae" ]; then
-    loaders="$(find /boot -name syslinux.cfg -or -name extlinux.conf -or -name grub.cfg -or -name menu.lst)"
-    [ -f /etc/lilo.conf ] && loaders="$loaders /etc/lilo.conf"
-    if [ -n "${loaders}" ] && grep -q -e vmlinuz26 -e kernel26.img -e kernel26-fallback.img $loaders; then
-      # add compat symlinks for the initramfs images
-      ln -sf initramfs-linux-libre${KERNEL_NAME}.img boot/kernel26${KERNEL_NAME}.img
-      ln -sf initramfs-linux-libre${KERNEL_NAME}-fallback.img \
-        boot/kernel26${KERNEL_NAME}-fallback.img
-      ln -sf vmlinuz-linux-libre${KERNEL_NAME} /boot/vmlinuz26${KERNEL_NAME}
-    fi
-  fi
 }
 
 post_upgrade() {
-  pacman -Q grub &>/dev/null
-  hasgrub=$?
-  pacman -Q grub-common &>/dev/null
-  hasgrub2=$?
-  pacman -Q lilo &>/dev/null
-  haslilo=$?
-  # reminder notices
-  if [ $haslilo -eq 0 ]; then
-    echo ">>>"
-    if [ $hasgrub -eq 0 -o $hasgrub2 -eq 0 ]; then
-      echo ">>> If you use the LILO bootloader, you should run 'lilo' before rebooting."
-    else
-      echo ">>> You appear to be using the LILO bootloader. You should run"
-      echo ">>> 'lilo' before rebooting."
-    fi
-    echo ">>>"
-  fi
-
   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
@@ -64,6 +30,6 @@ post_upgrade() {
 
 post_remove() {
   # also remove the compat symlinks
-  rm -f boot/{initramfs-linux-libre,kernel26}${KERNEL_NAME}.img
-  rm -f boot/{initramfs-linux-libre,kernel26}${KERNEL_NAME}-fallback.img
+  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/3.10.6-logitech-dj.patch b/kernels/linux-libre-rt/3.10.6-logitech-dj.patch
new file mode 100644
index 000000000..1c112ccde
--- /dev/null
+++ b/kernels/linux-libre-rt/3.10.6-logitech-dj.patch
@@ -0,0 +1,172 @@
+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/kernels/linux-libre-rt/3.10.6-reset-superseed-xhci-hcd.patch b/kernels/linux-libre-rt/3.10.6-reset-superseed-xhci-hcd.patch
new file mode 100644
index 000000000..0415b8a1e
--- /dev/null
+++ b/kernels/linux-libre-rt/3.10.6-reset-superseed-xhci-hcd.patch
@@ -0,0 +1,24 @@
+[PATCH] SCSI: Don't attempt to send extended INQUIRY command if skip_vpd_pages is set
+
+If a device has the skip_vpd_pages flag set we should simply fail the
+scsi_get_vpd_page() call.
+
+Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Acked-by: Alan Stern <stern@rowland.harvard.edu>
+Tested-by: Stuart Foster <smf.linux@ntlworld.com>
+Cc: stable@vger.kernel.org
+
+diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
+index 3b1ea34..eaa808e 100644
+--- a/drivers/scsi/scsi.c
++++ b/drivers/scsi/scsi.c
+@@ -1031,6 +1031,9 @@ int scsi_get_vpd_page(struct scsi_device *sdev, u8 page, unsigned char *buf,
+ {
+ 	int i, result;
+ 
++	if (sdev->skip_vpd_pages)
++		goto fail;
++
+ 	/* Ask for all the pages supported by this device */
+ 	result = scsi_vpd_inquiry(sdev, buf, 0, buf_len);
+ 	if (result)
diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD
index d93b6247b..601c9559f 100644
--- a/kernels/linux-libre-rt/PKGBUILD
+++ b/kernels/linux-libre-rt/PKGBUILD
@@ -1,27 +1,28 @@
+# $Id: PKGBUILD 193761 2013-08-30 11:11:43Z tpowa $
 # Maintainer:  Joakim Hernberg <jbh@alchemy.lu>
 # Contributor: Ray Rashif <schiv@archlinux.org>
 # Contributor: timbosa <tinny_tim@dodo.com.au>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
 
 pkgbase=linux-libre-rt      # Build stock -LIBRE-RT kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
-_basekernel=3.8
-_releasever=13
-_rtpatchver=rt9
+_basekernel=3.10
+_releasever=10
+_rtpatchver=rt7
 _pkgver=${_basekernel}.${_releasever}
 pkgver=${_basekernel}.${_releasever}_${_rtpatchver}
 pkgrel=1
-_lxopkgver=${_basekernel}.13 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.10 # 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}-gnu1/linux-libre-${_basekernel}-gnu1.tar.xz"
-        "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}-gnu1/patch-${_basekernel}-gnu1-${_pkgver}-gnu1.xz"
+source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz"
+        "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}-gnu/patch-${_basekernel}-gnu-${_pkgver}-gnu.xz"
         "http://www.kernel.org/pub/linux/kernel/projects/rt/${_basekernel}/patch-${_pkgver}-${_rtpatchver}.patch.xz"
         # the main kernel config files
         'config.i686' 'config.x86_64'
@@ -31,20 +32,24 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'Kbuild.platforms'
         '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=('5c7787be882c343e41fb49136ff60aec'
-         '2242024493dcb72a8777e11198f5e743'
-         '2b8fc5a819ee9bdf79aec69e07565cae'
-         '5ed195b8c44e1e00c1885077566e1f81'
-         'f97a0be3b9252e788a0cf67e93cb5c6f'
+md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
+         '673ae6d60b4ce8acad930a06f9fe2e3f'
+         'b634614a96f47a564bc32bc87afe587f'
+         '9dad7b1491caf056b10d4fbf54081988'
+         '6fb1660497947ec5c20405dc439b5c5a'
          '82496e68851d1960543a07ba51cdb44a'
          '2967cecc3af9f954ccc822fd63dca6ff'
          '8267264d9a8966e57fdacd1fa1fc65c4'
          '04b21c79df0a952c22d681dd4f4562df'
          'f3def2cefdcbb954c21d8505d23cc83c'
-         '0bb62b946f06edc2f5b0249b7fc773e4')
+         'd50c1ac47394e9aec637002ef3392bd1'
+         '3ff40ca684cfe719723e627e2cef7cea'
+         '714134bcb52e243898036beacca2e7b7')
 if [ "$CARCH" != "mips64el" ]; then
-    # Don't use the Loongson-specific patches on non-mips64el arches.
+    # don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
     unset md5sums[${#md5sums[@]}-1]
 fi
@@ -55,14 +60,14 @@ _localversionname=-LIBRE-RT
 prepare() {
   cd "${srcdir}/linux-${_basekernel}"
 
-  if [ "${_basekernel}" != "${pkgver}" ]; then
-    patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu1-${_pkgver}-gnu1"
+  if [ "${_basekernel}" != "${_pkgver}" ]; then
+    patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${_pkgver}-gnu"
   fi
 
   # add realtime patch
   patch -p1 -i "${srcdir}/patch-${_pkgver}-${_rtpatchver}.patch"
 
-  # Add freedo as boot logo
+  # 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)
@@ -70,6 +75,13 @@ prepare() {
   # (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 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-rt|" Makefile
     sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
@@ -78,10 +90,10 @@ prepare() {
     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)
+  # 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" \
@@ -148,7 +160,7 @@ build() {
 }
 
 _package() {
-  pkgdesc="The ${pkgbase} kernel and modules with realtime preemption"
+  pkgdesc="The ${pkgbase^} kernel and modules with realtime preemption"
   [ "${pkgbase}" = "linux-libre" ] && groups=('base')
   depends=('coreutils' 'linux-libre-firmware' 'kmod')
   optdepends=('crda: to set the correct wireless channels of your country')
@@ -187,14 +199,16 @@ _package() {
   # add vmlinux
   install -D -m644 vmlinux "${pkgdir}/usr/src/linux-${_kernver}/vmlinux"
 
-  # install fallback mkinitcpio.conf file and preset file for kernel
-  install -D -m644 "${srcdir}/${pkgbase}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
-
   # 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}/${pkgbase}.install"
+    -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}\"|" \
@@ -202,7 +216,7 @@ _package() {
     -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
+  # 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"
@@ -228,7 +242,7 @@ _package() {
 }
 
 _package-headers() {
-  pkgdesc="Header files and scripts for building modules for ${pkgbase} kernel"
+  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")
@@ -236,7 +250,7 @@ _package-headers() {
   KARCH=x86
   [ $CARCH = "mips64el" ] && KARCH=mips
 
-# In case of repackaging this is empty
+  # in case of repackaging this is empty
   if [ -z "${_kernver}" ]; then
     cd "${srcdir}/linux-${_basekernel}"
     _kernver="$(make LOCALVERSION= kernelrelease)"
@@ -379,7 +393,7 @@ _package-headers() {
   done
 
   # remove unneeded architectures
-  rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa}
+  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
diff --git a/kernels/linux-libre-rt/config.i686 b/kernels/linux-libre-rt/config.i686
index d6e6d82c9..8b98c58a5 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/i386 3.8.10 Kernel Configuration
+# Linux/x86 3.10.9 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -17,13 +17,11 @@ CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_GPIO=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_ARCH_HAS_CPU_RELAX=y
-CONFIG_ARCH_HAS_DEFAULT_IDLE=y
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
 CONFIG_ARCH_HAS_CPU_AUTOPROBE=y
 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
@@ -42,14 +40,12 @@ 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_HAVE_IRQ_WORK=y
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
 
 #
 # General setup
 #
-CONFIG_EXPERIMENTAL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 CONFIG_LOCALVERSION="-LIBRE-RT"
@@ -101,6 +97,9 @@ 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
 
@@ -121,12 +120,16 @@ CONFIG_TASK_IO_ACCOUNTING=y
 #
 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_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
@@ -172,18 +175,18 @@ CONFIG_RD_LZO=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
-# CONFIG_EXPERT is not set
 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_SYSCTL_EXCEPTION_TRACE=y
 CONFIG_KALLSYMS=y
-CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_PCSPKR_PLATFORM=y
-CONFIG_HAVE_PCSPKR_PLATFORM=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
@@ -192,6 +195,7 @@ 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
 
@@ -200,10 +204,8 @@ CONFIG_HAVE_PERF_EVENTS=y
 #
 CONFIG_PERF_EVENTS=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_PCI_QUIRKS=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
@@ -211,14 +213,18 @@ 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
@@ -243,8 +249,9 @@ CONFIG_SECCOMP_FILTER=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
 CONFIG_MODULES_USE_ELF_REL=y
-CONFIG_GENERIC_SIGALTSTACK=y
 CONFIG_CLONE_BACKWARDS=y
+CONFIG_OLD_SIGSUSPEND3=y
+CONFIG_OLD_SIGACTION=y
 
 #
 # GCOV-based kernel profiling
@@ -316,16 +323,18 @@ 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_PARAVIRT_GUEST=y
-CONFIG_PARAVIRT_TIME_ACCOUNTING=y
+CONFIG_HYPERVISOR_GUEST=y
+CONFIG_PARAVIRT=y
+# CONFIG_PARAVIRT_SPINLOCKS is not set
 # CONFIG_XEN_PRIVILEGED_GUEST is not set
 CONFIG_KVM_GUEST=y
 CONFIG_LGUEST_GUEST=y
-CONFIG_PARAVIRT=y
-# CONFIG_PARAVIRT_SPINLOCKS is not set
+CONFIG_PARAVIRT_TIME_ACCOUNTING=y
 CONFIG_PARAVIRT_CLOCK=y
 CONFIG_NO_BOOTMEM=y
 # CONFIG_MEMTEST is not set
@@ -399,8 +408,8 @@ CONFIG_TOSHIBA=m
 CONFIG_I8K=m
 CONFIG_X86_REBOOTFIXUPS=y
 CONFIG_MICROCODE=m
-CONFIG_MICROCODE_INTEL=y
-CONFIG_MICROCODE_AMD=y
+# 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
@@ -423,6 +432,7 @@ 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
@@ -521,9 +531,9 @@ CONFIG_ACPI_THERMAL=m
 CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y
 CONFIG_ACPI_BLACKLIST_YEAR=0
 # CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_PCI_SLOT=m
+CONFIG_ACPI_PCI_SLOT=y
 CONFIG_X86_PM_TIMER=y
-CONFIG_ACPI_CONTAINER=m
+CONFIG_ACPI_CONTAINER=y
 CONFIG_ACPI_SBS=m
 CONFIG_ACPI_HED=y
 CONFIG_ACPI_CUSTOM_METHOD=m
@@ -564,6 +574,7 @@ 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
@@ -571,6 +582,7 @@ 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
@@ -662,11 +674,11 @@ CONFIG_I82365=m
 CONFIG_TCIC=m
 CONFIG_PCMCIA_PROBE=y
 CONFIG_PCCARD_NONSTATIC=y
-CONFIG_HOTPLUG_PCI=m
+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=m
+CONFIG_HOTPLUG_PCI_ACPI=y
 CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 CONFIG_HOTPLUG_PCI_CPCI=y
 CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
@@ -678,6 +690,7 @@ 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
@@ -690,6 +703,7 @@ CONFIG_RAPIDIO_TSI500=y
 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
@@ -725,6 +739,7 @@ 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
@@ -743,8 +758,8 @@ 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=y
-CONFIG_INET_TCP_DIAG=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
@@ -809,6 +824,7 @@ 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
@@ -881,9 +897,11 @@ 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
@@ -981,7 +999,6 @@ 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_IP_NF_QUEUE=m
 CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
@@ -1058,7 +1075,7 @@ CONFIG_IP_DCCP=m
 CONFIG_INET_DCCP_DIAG=m
 
 #
-# DCCP CCIDs Configuration (EXPERIMENTAL)
+# DCCP CCIDs Configuration
 #
 # CONFIG_IP_DCCP_CCID2_DEBUG is not set
 CONFIG_IP_DCCP_CCID3=y
@@ -1088,8 +1105,10 @@ 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
@@ -1097,6 +1116,7 @@ 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
@@ -1110,10 +1130,8 @@ CONFIG_COPS_DAYNA=y
 CONFIG_COPS_TANGENT=y
 CONFIG_IPDDP=m
 CONFIG_IPDDP_ENCAP=y
-CONFIG_IPDDP_DECAP=y
 # CONFIG_X25 is not set
 # CONFIG_LAPB is not set
-# CONFIG_WAN_ROUTER is not set
 CONFIG_PHONET=m
 CONFIG_IEEE802154=m
 CONFIG_IEEE802154_6LOWPAN=m
@@ -1180,8 +1198,13 @@ 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
@@ -1361,13 +1384,17 @@ CONFIG_NFC=m
 CONFIG_NFC_NCI=m
 CONFIG_NFC_HCI=m
 # CONFIG_NFC_SHDLC is not set
-# CONFIG_NFC_LLCP 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
@@ -1384,6 +1411,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_FW_LOADER_USER_HELPER is not set
 # CONFIG_SYS_HYPERVISOR is not set
 # CONFIG_GENERIC_CPU_DEVICES is not set
 CONFIG_REGMAP=y
@@ -1404,13 +1432,13 @@ 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_CHAR=m
 CONFIG_MTD_BLKDEVS=m
 CONFIG_MTD_BLOCK=m
 CONFIG_MTD_BLOCK_RO=m
@@ -1492,9 +1520,6 @@ CONFIG_MTD_BLOCK2MTD=m
 #
 # Disk-On-Chip Device Drivers
 #
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
 CONFIG_MTD_DOCG3=m
 CONFIG_BCH_CONST_M=14
 CONFIG_BCH_CONST_T=4
@@ -1503,7 +1528,6 @@ CONFIG_MTD_NAND_ECC_SMC=y
 CONFIG_MTD_NAND=m
 # CONFIG_MTD_NAND_ECC_BCH is not set
 CONFIG_MTD_SM_COMMON=m
-# CONFIG_MTD_NAND_MUSEUM_IDS is not set
 # CONFIG_MTD_NAND_DENALI is not set
 CONFIG_MTD_NAND_IDS=m
 CONFIG_MTD_NAND_RICOH=m
@@ -1549,8 +1573,8 @@ CONFIG_OF_MTD=y
 CONFIG_PARPORT=m
 CONFIG_PARPORT_PC=m
 CONFIG_PARPORT_SERIAL=m
-CONFIG_PARPORT_PC_FIFO=y
-CONFIG_PARPORT_PC_SUPERIO=y
+# 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
@@ -1567,7 +1591,6 @@ CONFIG_ISAPNP=y
 CONFIG_PNPACPI=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_FD=m
-# CONFIG_BLK_DEV_XD is not set
 # CONFIG_PARIDE is not set
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
 CONFIG_BLK_CPQ_DA=m
@@ -1596,6 +1619,7 @@ 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
@@ -1604,14 +1628,16 @@ 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_HWLAT_DETECTOR=m
+# CONFIG_HWLAT_DETECTOR 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
@@ -1633,6 +1659,8 @@ 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
 
@@ -1660,6 +1688,8 @@ CONFIG_SENSORS_LIS3_I2C=m
 #
 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
 
@@ -1755,6 +1785,8 @@ 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
@@ -1837,6 +1869,7 @@ 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
 
 #
@@ -1942,9 +1975,9 @@ CONFIG_MD_RAID0=m
 CONFIG_MD_RAID1=m
 CONFIG_MD_RAID10=m
 CONFIG_MD_RAID456=m
-# CONFIG_MULTICORE_RAID456 is not set
 CONFIG_MD_MULTIPATH=m
 CONFIG_MD_FAULTY=m
+# CONFIG_BCACHE is not set
 CONFIG_BLK_DEV_DM=m
 # CONFIG_DM_DEBUG is not set
 CONFIG_DM_BUFIO=m
@@ -1954,6 +1987,9 @@ 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
@@ -2011,6 +2047,7 @@ 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
@@ -2064,6 +2101,10 @@ 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
@@ -2076,7 +2117,6 @@ CONFIG_NET_DSA_MV88E6123_61_65=m
 CONFIG_ETHERNET=y
 CONFIG_MDIO=m
 CONFIG_NET_VENDOR_3COM=y
-CONFIG_EL1=m
 CONFIG_EL3=m
 CONFIG_3C515=m
 CONFIG_PCMCIA_3C574=m
@@ -2092,7 +2132,6 @@ CONFIG_NET_VENDOR_AMD=y
 CONFIG_AMD8111_ETH=m
 CONFIG_LANCE=m
 CONFIG_PCNET32=m
-CONFIG_DEPCA=m
 CONFIG_PCMCIA_NMCLAN=m
 CONFIG_NI65=m
 CONFIG_NET_VENDOR_ATHEROS=y
@@ -2100,6 +2139,7 @@ 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
@@ -2112,6 +2152,7 @@ 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
@@ -2128,7 +2169,6 @@ CONFIG_NET_VENDOR_CISCO=y
 CONFIG_ENIC=m
 CONFIG_DNET=m
 CONFIG_NET_VENDOR_DEC=y
-CONFIG_EWRK3=m
 CONFIG_NET_TULIP=y
 CONFIG_DE2104X=m
 CONFIG_DE2104X_DSL=0
@@ -2142,8 +2182,6 @@ CONFIG_DM9102=m
 CONFIG_ULI526X=m
 CONFIG_PCMCIA_XIRCOM=m
 CONFIG_NET_VENDOR_DLINK=y
-CONFIG_DE600=m
-CONFIG_DE620=m
 CONFIG_DL2K=m
 CONFIG_SUNDANCE=m
 # CONFIG_SUNDANCE_MMIO is not set
@@ -2154,9 +2192,7 @@ CONFIG_S2IO=m
 CONFIG_VXGE=m
 # CONFIG_VXGE_DEBUG_TRACE_ALL is not set
 CONFIG_NET_VENDOR_FUJITSU=y
-CONFIG_AT1700=m
 CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_ETH16I=m
 CONFIG_NET_VENDOR_HP=y
 CONFIG_HP100=m
 CONFIG_NET_VENDOR_INTEL=y
@@ -2164,6 +2200,7 @@ 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
@@ -2172,14 +2209,6 @@ CONFIG_IXGBE_HWMON=y
 CONFIG_IXGBE_DCA=y
 CONFIG_IXGBEVF=m
 CONFIG_NET_VENDOR_I825XX=y
-CONFIG_ELPLUS=m
-CONFIG_EL16=m
-CONFIG_APRICOT=m
-CONFIG_EEXPRESS=m
-CONFIG_EEXPRESS_PRO=m
-CONFIG_LP486E=m
-CONFIG_NI52=m
-CONFIG_ZNET=m
 CONFIG_IP1000=m
 CONFIG_JME=m
 CONFIG_NET_VENDOR_MARVELL=y
@@ -2208,12 +2237,7 @@ CONFIG_NET_VENDOR_NATSEMI=y
 CONFIG_NATSEMI=m
 CONFIG_NS83820=m
 CONFIG_NET_VENDOR_8390=y
-CONFIG_EL2=m
-CONFIG_AC3200=m
 CONFIG_PCMCIA_AXNET=m
-CONFIG_E2100=m
-CONFIG_HPLAN_PLUS=m
-CONFIG_HPLAN=m
 CONFIG_NE2000=m
 CONFIG_NE2K_PCI=m
 CONFIG_PCMCIA_PCNET=m
@@ -2230,9 +2254,9 @@ 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_RACAL=y
 CONFIG_NET_VENDOR_REALTEK=y
 CONFIG_ATP=m
 CONFIG_8139CP=m
@@ -2245,7 +2269,6 @@ CONFIG_R8169=m
 CONFIG_NET_VENDOR_RDC=y
 CONFIG_R6040=m
 CONFIG_NET_VENDOR_SEEQ=y
-CONFIG_SEEQ8005=m
 CONFIG_NET_VENDOR_SILAN=y
 CONFIG_SC92031=m
 CONFIG_NET_VENDOR_SIS=y
@@ -2266,8 +2289,6 @@ CONFIG_STMMAC_ETH=m
 CONFIG_STMMAC_PCI=y
 # CONFIG_STMMAC_DEBUG_FS is not set
 # CONFIG_STMMAC_DA is not set
-CONFIG_STMMAC_RING=y
-# CONFIG_STMMAC_CHAINED is not set
 CONFIG_NET_VENDOR_SUN=y
 CONFIG_HAPPYMEAL=m
 CONFIG_SUNGEM=m
@@ -2345,8 +2366,10 @@ 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
@@ -2411,7 +2434,7 @@ CONFIG_ATH9K=m
 CONFIG_ATH9K_PCI=y
 CONFIG_ATH9K_AHB=y
 # CONFIG_ATH9K_DEBUGFS is not set
-CONFIG_ATH9K_RATE_CONTROL=y
+# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set
 CONFIG_ATH9K_HTC=m
 # CONFIG_ATH9K_HTC_DEBUGFS is not set
 CONFIG_CARL9170=m
@@ -2422,6 +2445,7 @@ 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
@@ -2456,7 +2480,6 @@ CONFIG_BRCMUTIL=m
 CONFIG_BRCMSMAC=m
 CONFIG_BRCMFMAC=m
 CONFIG_BRCMFMAC_SDIO=y
-# CONFIG_BRCMFMAC_SDIO_OOB is not set
 CONFIG_BRCMFMAC_USB=y
 # CONFIG_BRCM_TRACING is not set
 # CONFIG_BRCMDBG is not set
@@ -2466,19 +2489,12 @@ CONFIG_HOSTAP_FIRMWARE=y
 CONFIG_HOSTAP_PLX=m
 CONFIG_HOSTAP_PCI=m
 CONFIG_HOSTAP_CS=m
-CONFIG_IPW2100=m
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2100_DEBUG is not set
-CONFIG_IPW2200=m
-CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW2200_RADIOTAP=y
-CONFIG_IPW2200_PROMISCUOUS=y
-CONFIG_IPW2200_QOS=y
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_LIBIPW=m
-# CONFIG_LIBIPW_DEBUG is not set
+# 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
@@ -2531,8 +2547,10 @@ 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
@@ -2540,13 +2558,14 @@ 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_RTLWIFI=m
-# CONFIG_RTLWIFI_DEBUG is not set
 CONFIG_RTL8192C_COMMON=m
 CONFIG_WL_TI=y
 CONFIG_WL1251=m
@@ -2557,7 +2576,7 @@ CONFIG_WL18XX=m
 CONFIG_WLCORE=m
 # CONFIG_WLCORE_SPI is not set
 CONFIG_WLCORE_SDIO=m
-CONFIG_WL12XX_PLATFORM_DATA=y
+CONFIG_WILINK_PLATFORM_DATA=y
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
 CONFIG_MWIFIEX=m
@@ -2776,6 +2795,7 @@ 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
@@ -2785,6 +2805,7 @@ 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
@@ -2928,6 +2949,7 @@ 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
 
@@ -2945,6 +2967,7 @@ 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
@@ -2954,6 +2977,7 @@ CONFIG_GAMEPORT_FM801=m
 #
 # Character devices
 #
+CONFIG_TTY=y
 CONFIG_VT=y
 CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_VT_CONSOLE=y
@@ -2985,9 +3009,11 @@ CONFIG_TRACE_SINK=m
 # 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
@@ -3016,6 +3042,8 @@ 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
@@ -3061,6 +3089,7 @@ 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
@@ -3088,6 +3117,7 @@ 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
@@ -3148,6 +3178,7 @@ 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_SPI is not set
 # CONFIG_SPI_OC_TINY is not set
 # CONFIG_SPI_PXA2XX is not set
 # CONFIG_SPI_PXA2XX_PCI is not set
@@ -3162,6 +3193,11 @@ CONFIG_SPI_MASTER=y
 #
 # 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
 
 #
@@ -3189,6 +3225,7 @@ 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
@@ -3203,6 +3240,8 @@ CONFIG_GPIO_SYSFS=y
 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:
@@ -3267,6 +3306,7 @@ CONFIG_BATTERY_OLPC=m
 # 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
@@ -3289,6 +3329,8 @@ 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
@@ -3335,6 +3377,7 @@ 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
@@ -3345,8 +3388,9 @@ 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_NTC_THERMISTOR=m
+CONFIG_SENSORS_NCT6775=m
 CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PC87427=m
 CONFIG_SENSORS_PCF8591=m
@@ -3379,6 +3423,7 @@ 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
@@ -3411,10 +3456,12 @@ 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_FAIR_SHARE=y
-CONFIG_STEP_WISE=y
-# CONFIG_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
@@ -3423,6 +3470,7 @@ CONFIG_WATCHDOG_CORE=y
 # Watchdog Device Drivers
 #
 CONFIG_SOFT_WATCHDOG=m
+CONFIG_RETU_WATCHDOG=m
 CONFIG_ACQUIRE_WDT=m
 CONFIG_ADVANTECH_WDT=m
 CONFIG_ALIM1535_WDT=m
@@ -3515,47 +3563,50 @@ CONFIG_BCMA_DRIVER_GPIO=y
 # 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_MFD_RTSX_PCI=m
+CONFIG_ABX500_CORE=y
+# CONFIG_MFD_STMPE is not set
+# CONFIG_MFD_SYSCON is not set
 CONFIG_MFD_TI_AM335X_TSCADC=m
-CONFIG_HTC_PASIC3=m
-CONFIG_UCB1400_CORE=m
-CONFIG_MFD_LM3533=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_STMPE 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_DA9052_SPI 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_MFD_PCF50633=m
-CONFIG_PCF50633_ADC=m
-CONFIG_PCF50633_GPIO=m
-CONFIG_MFD_MC13783=m
-CONFIG_MFD_MC13XXX=m
-# CONFIG_MFD_MC13XXX_SPI is not set
-CONFIG_MFD_MC13XXX_I2C=m
-CONFIG_ABX500_CORE=y
-# CONFIG_EZX_PCAP is not set
-CONFIG_MFD_CS5535=m
-# CONFIG_MFD_TIMBERDALE is not set
-CONFIG_LPC_SCH=m
-CONFIG_LPC_ICH=m
-CONFIG_MFD_RDC321X=m
-# CONFIG_MFD_JANZ_CMODIO is not set
-CONFIG_MFD_VX855=m
-CONFIG_MFD_WL1273_CORE=m
-# CONFIG_MFD_SYSCON is not set
-CONFIG_MFD_VIPERBOARD=m
-CONFIG_MFD_RETU=m
 # CONFIG_REGULATOR is not set
 CONFIG_MEDIA_SUPPORT=m
 
@@ -3583,8 +3634,11 @@ 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
 
@@ -3685,7 +3739,6 @@ CONFIG_USB_SN9C102=m
 #
 # Analog TV USB devices
 #
-CONFIG_VIDEO_AU0828=m
 CONFIG_VIDEO_PVRUSB2=m
 CONFIG_VIDEO_PVRUSB2_SYSFS=y
 CONFIG_VIDEO_PVRUSB2_DVB=y
@@ -3699,6 +3752,8 @@ 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
@@ -3738,7 +3793,6 @@ CONFIG_DVB_USB_FRIIO=m
 CONFIG_DVB_USB_AZ6027=m
 CONFIG_DVB_USB_TECHNISAT_USB2=m
 CONFIG_DVB_USB_V2=m
-CONFIG_DVB_USB_CYPRESS_FIRMWARE=m
 CONFIG_DVB_USB_AF9015=m
 CONFIG_DVB_USB_AF9035=m
 CONFIG_DVB_USB_ANYSEE=m
@@ -3815,7 +3869,6 @@ CONFIG_VIDEO_SAA7164=m
 #
 # Media digital TV PCI Adapters
 #
-CONFIG_TTPCI_EEPROM=m
 CONFIG_DVB_AV7110=m
 CONFIG_DVB_AV7110_OSD=y
 CONFIG_DVB_BUDGET_CORE=m
@@ -3836,6 +3889,7 @@ 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
 
 #
@@ -3859,6 +3913,7 @@ 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
@@ -3880,18 +3935,22 @@ 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_MEDIA_SUBDRV_AUTOSELECT=y
+# CONFIG_SMS_SIANO_DEBUGFS is not set
 
 #
 # Media ancillary drivers (tuners, sensors, i2c, frontends)
 #
-CONFIG_VIDEO_BTCX=m
-CONFIG_VIDEO_TVEEPROM=m
+CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
+CONFIG_MEDIA_ATTACH=y
 CONFIG_VIDEO_IR_I2C=m
 
 #
@@ -3905,9 +3964,11 @@ 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
@@ -3924,6 +3985,9 @@ 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
 
 #
@@ -3933,11 +3997,6 @@ CONFIG_VIDEO_SAA717X=m
 CONFIG_VIDEO_CX25840=m
 
 #
-# MPEG video encoders
-#
-CONFIG_VIDEO_CX2341X=m
-
-#
 # Video encoders
 #
 CONFIG_VIDEO_SAA7127=m
@@ -3948,6 +4007,7 @@ CONFIG_VIDEO_ADV7175=m
 #
 # Camera sensor devices
 #
+CONFIG_VIDEO_OV7640=m
 CONFIG_VIDEO_MT9V011=m
 
 #
@@ -3968,7 +4028,6 @@ CONFIG_VIDEO_M52790=m
 #
 # Sensors used on soc_camera driver
 #
-CONFIG_MEDIA_ATTACH=y
 CONFIG_MEDIA_TUNER=m
 CONFIG_MEDIA_TUNER_SIMPLE=m
 CONFIG_MEDIA_TUNER_TDA8290=m
@@ -3998,6 +4057,8 @@ 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
@@ -4037,6 +4098,7 @@ 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
@@ -4148,20 +4210,21 @@ 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_KMS=y
+# 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
-
-#
-# I2C encoder or helper chips
-#
-CONFIG_DRM_I2C_CH7006=m
-CONFIG_DRM_I2C_SIL164=m
 CONFIG_DRM_I915=m
 CONFIG_DRM_I915_KMS=y
 CONFIG_DRM_MGA=m
@@ -4177,9 +4240,10 @@ CONFIG_DRM_UDL=m
 CONFIG_DRM_AST=m
 CONFIG_DRM_MGAG200=m
 CONFIG_DRM_CIRRUS_QEMU=m
-CONFIG_STUB_POULSBO=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
@@ -4193,7 +4257,6 @@ CONFIG_FB_SYS_COPYAREA=m
 CONFIG_FB_SYS_IMAGEBLIT=m
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 CONFIG_FB_SYS_FOPS=m
-# CONFIG_FB_WMT_GE_ROPS is not set
 CONFIG_FB_DEFERRED_IO=y
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
@@ -4238,7 +4301,7 @@ CONFIG_FB_VIA_X_COMPATIBILITY=y
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_3DFX is not set
 CONFIG_FB_VOODOO1=m
-# CONFIG_FB_VT8623 is not set
+CONFIG_FB_VT8623=m
 # CONFIG_FB_TRIDENT is not set
 # CONFIG_FB_ARK is not set
 # CONFIG_FB_PM3 is not set
@@ -4248,17 +4311,21 @@ CONFIG_FB_VOODOO1=m
 # 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
@@ -4266,6 +4333,8 @@ 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
@@ -4442,6 +4511,7 @@ 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
@@ -4458,6 +4528,7 @@ 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
@@ -4524,6 +4595,7 @@ 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
@@ -4575,6 +4647,7 @@ 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
@@ -4583,6 +4656,7 @@ 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
@@ -4617,10 +4691,9 @@ CONFIG_USB=m
 #
 # Miscellaneous USB options
 #
+CONFIG_USB_DEFAULT_PERSIST=y
 CONFIG_USB_DYNAMIC_MINORS=y
-CONFIG_USB_SUSPEND=y
 # CONFIG_USB_OTG is not set
-# CONFIG_USB_DWC3 is not set
 CONFIG_USB_MON=m
 CONFIG_USB_WUSB=m
 CONFIG_USB_WUSB_CBAF=m
@@ -4636,6 +4709,7 @@ 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
@@ -4643,7 +4717,6 @@ 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_EHCI_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
@@ -4660,11 +4733,10 @@ CONFIG_USB_HWA_HCD=m
 # 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_CHIPIDEA=m
-CONFIG_USB_CHIPIDEA_UDC=y
-CONFIG_USB_CHIPIDEA_HOST=y
-# CONFIG_USB_CHIPIDEA_DEBUG is not set
 CONFIG_USB_RENESAS_USBHS=m
 
 #
@@ -4704,6 +4776,10 @@ CONFIG_USB_STORAGE_ENE_UB6250=m
 #
 CONFIG_USB_MDC800=m
 CONFIG_USB_MICROTEK=m
+# CONFIG_USB_DWC3 is not set
+CONFIG_USB_CHIPIDEA=m
+CONFIG_USB_CHIPIDEA_UDC=y
+# CONFIG_USB_CHIPIDEA_DEBUG is not set
 
 #
 # USB port drivers
@@ -4773,7 +4849,9 @@ 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
@@ -4804,17 +4882,22 @@ CONFIG_USB_TEST=m
 CONFIG_USB_ISIGHTFW=m
 CONFIG_USB_YUREX=m
 CONFIG_USB_EZUSB_FX2=m
-
-#
-# USB Physical Layer drivers
-#
-CONFIG_USB_ISP1301=m
-CONFIG_USB_RCAR_PHY=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_FILES is not set
 # CONFIG_USB_GADGET_DEBUG_FS is not set
@@ -4827,7 +4910,9 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 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
@@ -4838,6 +4923,10 @@ 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
@@ -4850,7 +4939,7 @@ CONFIG_USB_FUNCTIONFS=m
 CONFIG_USB_FUNCTIONFS_ETH=y
 CONFIG_USB_FUNCTIONFS_RNDIS=y
 CONFIG_USB_FUNCTIONFS_GENERIC=y
-# CONFIG_USB_MASS_STORAGE is not set
+CONFIG_USB_MASS_STORAGE=m
 CONFIG_USB_GADGET_TARGET=m
 CONFIG_USB_G_SERIAL=m
 CONFIG_USB_MIDI_GADGET=m
@@ -4864,13 +4953,6 @@ CONFIG_USB_G_DBGP=m
 # CONFIG_USB_G_DBGP_PRINTK is not set
 CONFIG_USB_G_DBGP_SERIAL=y
 CONFIG_USB_G_WEBCAM=m
-
-#
-# OTG and related infrastructure
-#
-CONFIG_USB_OTG_UTILS=y
-# CONFIG_USB_GPIO_VBUS is not set
-CONFIG_NOP_USB_XCEIV=m
 CONFIG_UWB=m
 CONFIG_UWB_HWA=m
 CONFIG_UWB_WHCI=m
@@ -4934,12 +5016,15 @@ 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
@@ -4949,11 +5034,11 @@ CONFIG_LEDS_TCA6507=m
 CONFIG_LEDS_LM355x=m
 CONFIG_LEDS_OT200=m
 CONFIG_LEDS_BLINKM=m
-CONFIG_LEDS_TRIGGERS=y
 
 #
 # LED Triggers
 #
+CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=m
 CONFIG_LEDS_TRIGGER_ONESHOT=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
@@ -4966,6 +5051,7 @@ 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
@@ -4993,6 +5079,7 @@ 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
 
@@ -5042,6 +5129,7 @@ CONFIG_RTC_DRV_RV3029C2=m
 # 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
@@ -5067,6 +5155,11 @@ CONFIG_RTC_DRV_PCF50633=m
 #
 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
 
@@ -5075,9 +5168,13 @@ CONFIG_DMADEVICES=y
 #
 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
@@ -5101,7 +5198,11 @@ CONFIG_UIO_AEC=m
 CONFIG_UIO_SERCOS3=m
 CONFIG_UIO_PCI_GENERIC=m
 CONFIG_UIO_NETX=m
-# CONFIG_VFIO 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
 
 #
@@ -5179,6 +5280,7 @@ 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
@@ -5187,6 +5289,7 @@ 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
@@ -5205,6 +5308,7 @@ 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
@@ -5233,7 +5337,7 @@ CONFIG_COMEDI_NI_6527=m
 CONFIG_COMEDI_NI_65XX=m
 CONFIG_COMEDI_NI_660X=m
 CONFIG_COMEDI_NI_670X=m
-CONFIG_COMEDI_NI_LABPC=m
+CONFIG_COMEDI_NI_LABPC_PCI=m
 CONFIG_COMEDI_NI_PCIDIO=m
 CONFIG_COMEDI_NI_PCIMIO=m
 CONFIG_COMEDI_RTD520=m
@@ -5260,8 +5364,8 @@ CONFIG_COMEDI_8255=m
 CONFIG_COMEDI_FC=m
 CONFIG_COMEDI_AMPLC_DIO200=m
 CONFIG_COMEDI_AMPLC_PC236=m
-CONFIG_COMEDI_AMPLC_PC263=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
@@ -5279,16 +5383,14 @@ CONFIG_RTS5139=m
 # CONFIG_TRANZPORT is not set
 CONFIG_IDE_PHISON=m
 CONFIG_LINE6_USB=m
-# CONFIG_LINE6_USB_DUMP_PCM is not set
 # 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_ZCACHE is not set
-CONFIG_ZSMALLOC=y
 CONFIG_WLAGS49_H2=m
 CONFIG_WLAGS49_H25=m
 CONFIG_FB_SM7XX=m
@@ -5330,14 +5432,8 @@ 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_VIDEO_GO7007_OV7640=m
-CONFIG_VIDEO_GO7007_SAA7113=m
-CONFIG_VIDEO_GO7007_SAA7115=m
-CONFIG_VIDEO_GO7007_TW9903=m
-CONFIG_VIDEO_GO7007_UDA1342=m
-CONFIG_VIDEO_GO7007_SONY_TUNER=m
-CONFIG_VIDEO_GO7007_TW2804=m
 CONFIG_SOLO6X10=m
 CONFIG_LIRC_STAGING=y
 CONFIG_LIRC_BT829=m
@@ -5363,18 +5459,20 @@ CONFIG_WIMAX_GDM72XX_USB=y
 # CONFIG_WIMAX_GDM72XX_SDIO is not set
 CONFIG_WIMAX_GDM72XX_USB_PM=y
 CONFIG_CSR_WIFI=m
-CONFIG_ZCACHE2=y
 CONFIG_NET_VENDOR_SILICOM=y
 CONFIG_SBYPASS=m
 CONFIG_BPCTL=m
 CONFIG_CED1401=m
 CONFIG_DGRP=m
-CONFIG_SB105X=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
@@ -5419,6 +5517,7 @@ CONFIG_MXM_WMI=m
 CONFIG_INTEL_OAKTRAIL=m
 CONFIG_SAMSUNG_Q10=m
 CONFIG_APPLE_GMUX=m
+CONFIG_PVPANIC=m
 
 #
 # Hardware Spinlock drivers
@@ -5427,6 +5526,7 @@ 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
@@ -5436,15 +5536,14 @@ CONFIG_INTEL_IOMMU=y
 CONFIG_INTEL_IOMMU_FLOPPY_WA=y
 
 #
-# Remoteproc drivers (EXPERIMENTAL)
+# Remoteproc drivers
 #
 CONFIG_REMOTEPROC=m
 CONFIG_STE_MODEM_RPROC=m
 
 #
-# Rpmsg drivers (EXPERIMENTAL)
+# Rpmsg drivers
 #
-CONFIG_VIRT_DRIVERS=y
 # CONFIG_PM_DEVFREQ is not set
 CONFIG_EXTCON=m
 
@@ -5452,14 +5551,15 @@ CONFIG_EXTCON=m
 # Extcon Device Drivers
 #
 CONFIG_EXTCON_GPIO=m
-CONFIG_EXTCON_ARIZONA=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
@@ -5467,9 +5567,6 @@ CONFIG_SERIAL_IPOCTAL=m
 CONFIG_EDD=m
 # CONFIG_EDD_OFF is not set
 CONFIG_FIRMWARE_MEMMAP=y
-CONFIG_EFI_VARS=y
-CONFIG_EFI_VARS_PSTORE=y
-# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
 CONFIG_DELL_RBU=m
 CONFIG_DCDBAS=m
 CONFIG_DMIID=y
@@ -5479,6 +5576,13 @@ CONFIG_ISCSI_IBFT=m
 # CONFIG_GOOGLE_FIRMWARE is not set
 
 #
+# EFI (Extensible Firmware Interface) Support
+#
+CONFIG_EFI_VARS=m
+CONFIG_EFI_VARS_PSTORE=m
+CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
+
+#
 # File systems
 #
 CONFIG_DCACHE_WORD_ACCESS=y
@@ -5507,6 +5611,7 @@ 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
@@ -5519,6 +5624,8 @@ CONFIG_OCFS2_FS_STATS=y
 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
@@ -5527,7 +5634,7 @@ CONFIG_FSNOTIFY=y
 CONFIG_DNOTIFY=y
 CONFIG_INOTIFY_USER=y
 CONFIG_FANOTIFY=y
-# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set
+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
 CONFIG_QUOTA=y
 CONFIG_QUOTA_NETLINK_INTERFACE=y
 # CONFIG_PRINT_QUOTA_WARNING is not set
@@ -5592,6 +5699,7 @@ 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
@@ -5644,6 +5752,7 @@ 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
@@ -5651,15 +5760,16 @@ CONFIG_NFS_V2=m
 CONFIG_NFS_V3=m
 CONFIG_NFS_V3_ACL=y
 CONFIG_NFS_V4=m
-# CONFIG_NFS_SWAP is not set
+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="kernel.org"
+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
@@ -5672,8 +5782,9 @@ 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 is not set
+CONFIG_SUNRPC_DEBUG=y
 CONFIG_CEPH_FS=m
 CONFIG_CIFS=m
 CONFIG_CIFS_STATS=y
@@ -5778,15 +5889,21 @@ CONFIG_PANIC_ON_OOPS_VALUE=0
 # CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_SLUB_STATS is not set
 CONFIG_HAVE_DEBUG_KMEMLEAK=y
-# CONFIG_SPARSE_RCU_POINTER is not set
+CONFIG_TRACE_IRQFLAGS=y
 CONFIG_STACKTRACE=y
 CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_ARCH_WANT_FRAME_POINTERS=y
 CONFIG_FRAME_POINTER=y
+
+#
+# RCU Debugging
+#
+# CONFIG_SPARSE_RCU_POINTER is not set
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_RCU_CPU_STALL_VERBOSE is not set
 CONFIG_LKDTM=m
+CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y
 CONFIG_USER_STACKTRACE_SUPPORT=y
 CONFIG_NOP_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
@@ -5794,6 +5911,7 @@ 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
@@ -5801,20 +5919,24 @@ CONFIG_TRACER_MAX_TRACE=y
 CONFIG_TRACE_CLOCK=y
 CONFIG_RING_BUFFER=y
 CONFIG_EVENT_TRACING=y
-CONFIG_EVENT_POWER_TRACING_DEPRECATED=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_IRQSOFF_TRACER=y
+CONFIG_INTERRUPT_OFF_HIST=y
+CONFIG_PREEMPT_TRACER=y
+# CONFIG_PREEMPT_OFF_HIST 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=y
 CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
 # CONFIG_PROFILE_ALL_BRANCHES is not set
@@ -5824,12 +5946,14 @@ 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_PROVIDE_OHCI1394_DMA_INIT is not set
 # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
 CONFIG_DYNAMIC_DEBUG=y
@@ -5839,6 +5963,7 @@ CONFIG_ASYNC_RAID6_TEST=m
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
 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
@@ -5879,7 +6004,7 @@ CONFIG_SECURITY_TOMOYO=y
 CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
 CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
 # CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
-CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init"
+CONFIG_SECURITY_TOMOYO_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
@@ -5895,8 +6020,6 @@ CONFIG_ASYNC_MEMCPY=m
 CONFIG_ASYNC_XOR=m
 CONFIG_ASYNC_PQ=m
 CONFIG_ASYNC_RAID6_RECOV=m
-CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y
-CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y
 CONFIG_CRYPTO=y
 
 #
@@ -5949,6 +6072,7 @@ CONFIG_CRYPTO_XTS=m
 #
 # Hash modes
 #
+CONFIG_CRYPTO_CMAC=m
 CONFIG_CRYPTO_HMAC=m
 CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_VMAC=m
@@ -5958,6 +6082,8 @@ CONFIG_CRYPTO_VMAC=m
 #
 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
@@ -6026,6 +6152,7 @@ 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
@@ -6037,8 +6164,7 @@ CONFIG_KVM=m
 CONFIG_KVM_INTEL=m
 CONFIG_KVM_AMD=m
 CONFIG_KVM_MMU_AUDIT=y
-CONFIG_VHOST_NET=m
-CONFIG_TCM_VHOST=m
+CONFIG_KVM_DEVICE_ASSIGNMENT=y
 CONFIG_LGUEST=m
 CONFIG_BINARY_PRINTF=y
 
@@ -6113,3 +6239,4 @@ CONFIG_CORDIC=m
 CONFIG_DDR=y
 CONFIG_MPILIB=m
 CONFIG_OID_REGISTRY=m
+CONFIG_UCS2_STRING=y
diff --git a/kernels/linux-libre-rt/config.x86_64 b/kernels/linux-libre-rt/config.x86_64
index d4cef655e..ffa3a2ca0 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_64 3.8.10 Kernel Configuration
+# Linux/x86 3.10.5-1 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -18,13 +18,11 @@ CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
 CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_GPIO=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_ARCH_HAS_CPU_RELAX=y
-CONFIG_ARCH_HAS_DEFAULT_IDLE=y
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
 CONFIG_ARCH_HAS_CPU_AUTOPROBE=y
 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
@@ -43,14 +41,12 @@ CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -
 CONFIG_ARCH_CPU_PROBE_RELEASE=y
 CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-CONFIG_HAVE_IRQ_WORK=y
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
 
 #
 # General setup
 #
-CONFIG_EXPERIMENTAL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 CONFIG_LOCALVERSION="-LIBRE-RT"
@@ -103,6 +99,10 @@ 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
 
@@ -110,6 +110,7 @@ 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
@@ -123,6 +124,7 @@ CONFIG_TASK_IO_ACCOUNTING=y
 #
 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
@@ -130,6 +132,9 @@ CONFIG_RCU_FANOUT_LEAF=16
 # 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
@@ -158,7 +163,7 @@ CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=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
@@ -178,18 +183,18 @@ CONFIG_RD_LZO=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
-# CONFIG_EXPERT is not set
 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_SYSCTL_EXCEPTION_TRACE=y
 CONFIG_KALLSYMS=y
-CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_PCSPKR_PLATFORM=y
-CONFIG_HAVE_PCSPKR_PLATFORM=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
@@ -198,6 +203,7 @@ 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
 
@@ -206,10 +212,8 @@ CONFIG_HAVE_PERF_EVENTS=y
 #
 CONFIG_PERF_EVENTS=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_PCI_QUIRKS=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
@@ -217,14 +221,18 @@ 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
@@ -250,7 +258,8 @@ CONFIG_HAVE_CONTEXT_TRACKING=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
 CONFIG_MODULES_USE_ELF_RELA=y
-CONFIG_GENERIC_SIGALTSTACK=y
+CONFIG_OLD_SIGSUSPEND3=y
+CONFIG_COMPAT_OLD_SIGACTION=y
 
 #
 # GCOV-based kernel profiling
@@ -322,10 +331,12 @@ 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_PARAVIRT_GUEST=y
-CONFIG_PARAVIRT_TIME_ACCOUNTING=y
+CONFIG_HYPERVISOR_GUEST=y
+CONFIG_PARAVIRT=y
+# CONFIG_PARAVIRT_SPINLOCKS is not set
 CONFIG_XEN=y
 CONFIG_XEN_DOM0=y
 CONFIG_XEN_PRIVILEGED_GUEST=y
@@ -334,8 +345,7 @@ CONFIG_XEN_MAX_DOMAIN_MEMORY=500
 CONFIG_XEN_SAVE_RESTORE=y
 # CONFIG_XEN_DEBUG_FS is not set
 CONFIG_KVM_GUEST=y
-CONFIG_PARAVIRT=y
-# CONFIG_PARAVIRT_SPINLOCKS is not set
+CONFIG_PARAVIRT_TIME_ACCOUNTING=y
 CONFIG_PARAVIRT_CLOCK=y
 CONFIG_NO_BOOTMEM=y
 # CONFIG_MEMTEST is not set
@@ -386,8 +396,8 @@ CONFIG_X86_MCE_THRESHOLD=y
 CONFIG_X86_THERMAL_VECTOR=y
 CONFIG_I8K=m
 CONFIG_MICROCODE=m
-CONFIG_MICROCODE_INTEL=y
-CONFIG_MICROCODE_AMD=y
+# 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
@@ -420,6 +430,7 @@ 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
@@ -522,10 +533,10 @@ CONFIG_ACPI_NUMA=y
 CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y
 CONFIG_ACPI_BLACKLIST_YEAR=0
 # CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_PCI_SLOT=m
+CONFIG_ACPI_PCI_SLOT=y
 CONFIG_X86_PM_TIMER=y
-CONFIG_ACPI_CONTAINER=m
-CONFIG_ACPI_HOTPLUG_MEMORY=m
+CONFIG_ACPI_CONTAINER=y
+CONFIG_ACPI_HOTPLUG_MEMORY=y
 CONFIG_ACPI_SBS=m
 CONFIG_ACPI_HED=y
 CONFIG_ACPI_CUSTOM_METHOD=m
@@ -559,10 +570,12 @@ 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
 
@@ -633,8 +646,8 @@ CONFIG_YENTA_TOSHIBA=y
 CONFIG_PD6729=m
 CONFIG_I82092=m
 CONFIG_PCCARD_NONSTATIC=y
-CONFIG_HOTPLUG_PCI=m
-CONFIG_HOTPLUG_PCI_ACPI=m
+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
@@ -646,6 +659,7 @@ 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
@@ -659,6 +673,7 @@ 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
@@ -701,6 +716,7 @@ 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
@@ -719,8 +735,8 @@ 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=y
-CONFIG_INET_TCP_DIAG=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
@@ -785,6 +801,7 @@ 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
@@ -857,9 +874,11 @@ 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
@@ -957,7 +976,6 @@ 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_IP_NF_QUEUE=m
 CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
@@ -1034,7 +1052,7 @@ CONFIG_IP_DCCP=m
 CONFIG_INET_DCCP_DIAG=m
 
 #
-# DCCP CCIDs Configuration (EXPERIMENTAL)
+# DCCP CCIDs Configuration
 #
 # CONFIG_IP_DCCP_CCID2_DEBUG is not set
 CONFIG_IP_DCCP_CCID3=y
@@ -1064,8 +1082,10 @@ 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
@@ -1073,6 +1093,7 @@ 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
@@ -1082,10 +1103,8 @@ CONFIG_ATALK=m
 CONFIG_DEV_APPLETALK=m
 CONFIG_IPDDP=m
 CONFIG_IPDDP_ENCAP=y
-CONFIG_IPDDP_DECAP=y
 # CONFIG_X25 is not set
 # CONFIG_LAPB is not set
-# CONFIG_WAN_ROUTER is not set
 CONFIG_PHONET=m
 CONFIG_IEEE802154=m
 CONFIG_IEEE802154_6LOWPAN=m
@@ -1152,8 +1171,13 @@ 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
@@ -1329,13 +1353,17 @@ CONFIG_NFC=m
 CONFIG_NFC_NCI=m
 CONFIG_NFC_HCI=m
 # CONFIG_NFC_SHDLC is not set
-# CONFIG_NFC_LLCP 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
 
 #
@@ -1353,6 +1381,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_FW_LOADER_USER_HELPER is not set
 CONFIG_SYS_HYPERVISOR=y
 # CONFIG_GENERIC_CPU_DEVICES is not set
 CONFIG_REGMAP=y
@@ -1372,12 +1401,12 @@ 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_CHAR=m
 CONFIG_MTD_BLKDEVS=m
 CONFIG_MTD_BLOCK=m
 CONFIG_MTD_BLOCK_RO=m
@@ -1458,9 +1487,6 @@ CONFIG_MTD_BLOCK2MTD=m
 #
 # Disk-On-Chip Device Drivers
 #
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
 CONFIG_MTD_DOCG3=m
 CONFIG_BCH_CONST_M=14
 CONFIG_BCH_CONST_T=4
@@ -1469,7 +1495,6 @@ CONFIG_MTD_NAND_ECC_SMC=y
 CONFIG_MTD_NAND=m
 # CONFIG_MTD_NAND_ECC_BCH is not set
 CONFIG_MTD_SM_COMMON=m
-# CONFIG_MTD_NAND_MUSEUM_IDS is not set
 # CONFIG_MTD_NAND_DENALI is not set
 CONFIG_MTD_NAND_IDS=m
 CONFIG_MTD_NAND_RICOH=m
@@ -1497,8 +1522,8 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
 CONFIG_PARPORT=m
 CONFIG_PARPORT_PC=m
 CONFIG_PARPORT_SERIAL=m
-CONFIG_PARPORT_PC_FIFO=y
-CONFIG_PARPORT_PC_SUPERIO=y
+# 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
@@ -1543,6 +1568,7 @@ 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
@@ -1551,6 +1577,7 @@ 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_HWLAT_DETECTOR=m
 CONFIG_PHANTOM=m
@@ -1559,6 +1586,7 @@ 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
@@ -1580,6 +1608,8 @@ 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
 
@@ -1607,6 +1637,8 @@ CONFIG_SENSORS_LIS3_I2C=m
 #
 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
 
@@ -1698,6 +1730,8 @@ 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
@@ -1763,6 +1797,7 @@ 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
 
 #
@@ -1864,9 +1899,9 @@ CONFIG_MD_RAID0=m
 CONFIG_MD_RAID1=m
 CONFIG_MD_RAID10=m
 CONFIG_MD_RAID456=m
-# CONFIG_MULTICORE_RAID456 is not set
 CONFIG_MD_MULTIPATH=m
 CONFIG_MD_FAULTY=m
+# CONFIG_BCACHE is not set
 CONFIG_BLK_DEV_DM=m
 # CONFIG_DM_DEBUG is not set
 CONFIG_DM_BUFIO=m
@@ -1876,6 +1911,9 @@ 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
@@ -1934,6 +1972,7 @@ 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
@@ -1987,6 +2026,10 @@ 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
@@ -2017,6 +2060,7 @@ 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
@@ -2029,6 +2073,7 @@ 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
@@ -2055,8 +2100,6 @@ CONFIG_DM9102=m
 CONFIG_ULI526X=m
 CONFIG_PCMCIA_XIRCOM=m
 CONFIG_NET_VENDOR_DLINK=y
-CONFIG_DE600=m
-CONFIG_DE620=m
 CONFIG_DL2K=m
 CONFIG_SUNDANCE=m
 # CONFIG_SUNDANCE_MMIO is not set
@@ -2075,6 +2118,7 @@ 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
@@ -2083,7 +2127,6 @@ CONFIG_IXGBE_HWMON=y
 CONFIG_IXGBE_DCA=y
 CONFIG_IXGBEVF=m
 CONFIG_NET_VENDOR_I825XX=y
-CONFIG_ZNET=m
 CONFIG_IP1000=m
 CONFIG_JME=m
 CONFIG_NET_VENDOR_MARVELL=y
@@ -2126,6 +2169,7 @@ 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
@@ -2140,7 +2184,6 @@ CONFIG_R8169=m
 CONFIG_NET_VENDOR_RDC=y
 CONFIG_R6040=m
 CONFIG_NET_VENDOR_SEEQ=y
-CONFIG_SEEQ8005=m
 CONFIG_NET_VENDOR_SILAN=y
 CONFIG_SC92031=m
 CONFIG_NET_VENDOR_SIS=y
@@ -2160,8 +2203,6 @@ CONFIG_STMMAC_ETH=m
 CONFIG_STMMAC_PCI=y
 # CONFIG_STMMAC_DEBUG_FS is not set
 # CONFIG_STMMAC_DA is not set
-CONFIG_STMMAC_RING=y
-# CONFIG_STMMAC_CHAINED is not set
 CONFIG_NET_VENDOR_SUN=y
 CONFIG_HAPPYMEAL=m
 CONFIG_SUNGEM=m
@@ -2236,8 +2277,10 @@ 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
@@ -2302,7 +2345,7 @@ CONFIG_ATH9K=m
 CONFIG_ATH9K_PCI=y
 CONFIG_ATH9K_AHB=y
 # CONFIG_ATH9K_DEBUGFS is not set
-CONFIG_ATH9K_RATE_CONTROL=y
+# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set
 CONFIG_ATH9K_HTC=m
 # CONFIG_ATH9K_HTC_DEBUGFS is not set
 CONFIG_CARL9170=m
@@ -2313,6 +2356,7 @@ 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
@@ -2347,7 +2391,6 @@ CONFIG_BRCMUTIL=m
 CONFIG_BRCMSMAC=m
 CONFIG_BRCMFMAC=m
 CONFIG_BRCMFMAC_SDIO=y
-# CONFIG_BRCMFMAC_SDIO_OOB is not set
 CONFIG_BRCMFMAC_USB=y
 # CONFIG_BRCM_TRACING is not set
 # CONFIG_BRCMDBG is not set
@@ -2357,19 +2400,12 @@ CONFIG_HOSTAP_FIRMWARE=y
 CONFIG_HOSTAP_PLX=m
 CONFIG_HOSTAP_PCI=m
 CONFIG_HOSTAP_CS=m
-CONFIG_IPW2100=m
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2100_DEBUG is not set
-CONFIG_IPW2200=m
-CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW2200_RADIOTAP=y
-CONFIG_IPW2200_PROMISCUOUS=y
-CONFIG_IPW2200_QOS=y
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_LIBIPW=m
-# CONFIG_LIBIPW_DEBUG is not set
+# 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
@@ -2422,8 +2458,10 @@ 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
@@ -2431,13 +2469,14 @@ 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_RTLWIFI=m
-# CONFIG_RTLWIFI_DEBUG is not set
 CONFIG_RTL8192C_COMMON=m
 CONFIG_WL_TI=y
 CONFIG_WL1251=m
@@ -2448,7 +2487,7 @@ CONFIG_WL18XX=m
 CONFIG_WLCORE=m
 # CONFIG_WLCORE_SPI is not set
 CONFIG_WLCORE_SDIO=m
-CONFIG_WL12XX_PLATFORM_DATA=y
+CONFIG_WILINK_PLATFORM_DATA=y
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
 CONFIG_MWIFIEX=m
@@ -2653,6 +2692,7 @@ 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
@@ -2661,6 +2701,7 @@ CONFIG_MOUSE_PS2_SENTELIC=y
 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
@@ -2796,6 +2837,7 @@ 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
@@ -2823,6 +2865,7 @@ CONFIG_GAMEPORT_FM801=m
 #
 # Character devices
 #
+CONFIG_TTY=y
 CONFIG_VT=y
 CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_VT_CONSOLE=y
@@ -2854,14 +2897,17 @@ CONFIG_TRACE_SINK=m
 # 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
@@ -2882,6 +2928,8 @@ CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
 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
@@ -2925,6 +2973,7 @@ 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
@@ -2952,6 +3001,7 @@ 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
@@ -3010,7 +3060,9 @@ CONFIG_SPI_MASTER=y
 # CONFIG_SPI_GPIO is not set
 # CONFIG_SPI_LM70_LLP is not set
 # CONFIG_SPI_OC_TINY is not set
-# CONFIG_SPI_PXA2XX_PCI 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
@@ -3022,6 +3074,11 @@ CONFIG_SPI_MASTER=y
 #
 # 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
 
 #
@@ -3049,6 +3106,7 @@ 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_GPIO_SYSFS=y
@@ -3062,6 +3120,7 @@ CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_SCH=m
 CONFIG_GPIO_ICH=m
 # CONFIG_GPIO_VX855 is not set
+# CONFIG_GPIO_LYNXPOINT is not set
 
 #
 # I2C GPIO expanders:
@@ -3123,6 +3182,7 @@ CONFIG_TEST_POWER=m
 # 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
@@ -3144,6 +3204,8 @@ 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
@@ -3190,6 +3252,7 @@ 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
@@ -3200,7 +3263,9 @@ 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
@@ -3234,6 +3299,7 @@ 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
@@ -3266,10 +3332,12 @@ 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_FAIR_SHARE=y
-CONFIG_STEP_WISE=y
-# CONFIG_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
@@ -3278,6 +3346,7 @@ CONFIG_WATCHDOG_CORE=y
 # Watchdog Device Drivers
 #
 CONFIG_SOFT_WATCHDOG=m
+CONFIG_RETU_WATCHDOG=m
 CONFIG_ACQUIRE_WDT=m
 CONFIG_ADVANTECH_WDT=m
 CONFIG_ALIM1535_WDT=m
@@ -3363,46 +3432,50 @@ CONFIG_BCMA_DRIVER_GPIO=y
 # 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_MFD_RTSX_PCI=m
+CONFIG_ABX500_CORE=y
+# CONFIG_MFD_STMPE is not set
+# CONFIG_MFD_SYSCON is not set
 CONFIG_MFD_TI_AM335X_TSCADC=m
-CONFIG_HTC_PASIC3=m
-CONFIG_UCB1400_CORE=m
-CONFIG_MFD_LM3533=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_STMPE 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_DA9052_SPI 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_MFD_PCF50633=m
-CONFIG_PCF50633_ADC=m
-CONFIG_PCF50633_GPIO=m
-CONFIG_MFD_MC13783=m
-CONFIG_MFD_MC13XXX=m
-# CONFIG_MFD_MC13XXX_SPI is not set
-CONFIG_MFD_MC13XXX_I2C=m
-CONFIG_ABX500_CORE=y
-# CONFIG_EZX_PCAP is not set
-CONFIG_MFD_CS5535=m
-# CONFIG_MFD_TIMBERDALE is not set
-CONFIG_LPC_SCH=m
-CONFIG_LPC_ICH=m
-CONFIG_MFD_RDC321X=m
-# CONFIG_MFD_JANZ_CMODIO is not set
-CONFIG_MFD_VX855=m
-CONFIG_MFD_WL1273_CORE=m
-CONFIG_MFD_VIPERBOARD=m
-CONFIG_MFD_RETU=m
 # CONFIG_REGULATOR is not set
 CONFIG_MEDIA_SUPPORT=m
 
@@ -3430,8 +3503,11 @@ 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
 
@@ -3532,7 +3608,6 @@ CONFIG_USB_SN9C102=m
 #
 # Analog TV USB devices
 #
-CONFIG_VIDEO_AU0828=m
 CONFIG_VIDEO_PVRUSB2=m
 CONFIG_VIDEO_PVRUSB2_SYSFS=y
 CONFIG_VIDEO_PVRUSB2_DVB=y
@@ -3546,6 +3621,8 @@ 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
@@ -3585,7 +3662,6 @@ CONFIG_DVB_USB_FRIIO=m
 CONFIG_DVB_USB_AZ6027=m
 CONFIG_DVB_USB_TECHNISAT_USB2=m
 CONFIG_DVB_USB_V2=m
-CONFIG_DVB_USB_CYPRESS_FIRMWARE=m
 CONFIG_DVB_USB_AF9015=m
 CONFIG_DVB_USB_AF9035=m
 CONFIG_DVB_USB_ANYSEE=m
@@ -3662,7 +3738,6 @@ CONFIG_VIDEO_SAA7164=m
 #
 # Media digital TV PCI Adapters
 #
-CONFIG_TTPCI_EEPROM=m
 CONFIG_DVB_AV7110=m
 CONFIG_DVB_AV7110_OSD=y
 CONFIG_DVB_BUDGET_CORE=m
@@ -3683,6 +3758,7 @@ 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
 
 #
@@ -3705,6 +3781,7 @@ 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
@@ -3725,18 +3802,22 @@ 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_MEDIA_SUBDRV_AUTOSELECT=y
+# CONFIG_SMS_SIANO_DEBUGFS is not set
 
 #
 # Media ancillary drivers (tuners, sensors, i2c, frontends)
 #
-CONFIG_VIDEO_BTCX=m
-CONFIG_VIDEO_TVEEPROM=m
+CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
+CONFIG_MEDIA_ATTACH=y
 CONFIG_VIDEO_IR_I2C=m
 
 #
@@ -3750,9 +3831,11 @@ 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
@@ -3769,6 +3852,9 @@ 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
 
 #
@@ -3778,11 +3864,6 @@ CONFIG_VIDEO_SAA717X=m
 CONFIG_VIDEO_CX25840=m
 
 #
-# MPEG video encoders
-#
-CONFIG_VIDEO_CX2341X=m
-
-#
 # Video encoders
 #
 CONFIG_VIDEO_SAA7127=m
@@ -3793,6 +3874,7 @@ CONFIG_VIDEO_ADV7175=m
 #
 # Camera sensor devices
 #
+CONFIG_VIDEO_OV7640=m
 CONFIG_VIDEO_MT9V011=m
 
 #
@@ -3813,7 +3895,6 @@ CONFIG_VIDEO_M52790=m
 #
 # Sensors used on soc_camera driver
 #
-CONFIG_MEDIA_ATTACH=y
 CONFIG_MEDIA_TUNER=m
 CONFIG_MEDIA_TUNER_SIMPLE=m
 CONFIG_MEDIA_TUNER_TDA8290=m
@@ -3843,6 +3924,8 @@ 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
@@ -3882,6 +3965,7 @@ 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
@@ -3987,20 +4071,21 @@ 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_KMS=y
+# 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
-
-#
-# I2C encoder or helper chips
-#
-CONFIG_DRM_I2C_CH7006=m
-CONFIG_DRM_I2C_SIL164=m
 CONFIG_DRM_I915=m
 CONFIG_DRM_I915_KMS=y
 CONFIG_DRM_MGA=m
@@ -4016,9 +4101,10 @@ CONFIG_DRM_UDL=m
 CONFIG_DRM_AST=m
 CONFIG_DRM_MGAG200=m
 CONFIG_DRM_CIRRUS_QEMU=m
-CONFIG_STUB_POULSBO=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
@@ -4032,7 +4118,6 @@ CONFIG_FB_SYS_COPYAREA=m
 CONFIG_FB_SYS_IMAGEBLIT=m
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 CONFIG_FB_SYS_FOPS=m
-# CONFIG_FB_WMT_GE_ROPS is not set
 CONFIG_FB_DEFERRED_IO=y
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
@@ -4074,7 +4159,7 @@ CONFIG_FB_VIA_X_COMPATIBILITY=y
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_3DFX is not set
 CONFIG_FB_VOODOO1=m
-# CONFIG_FB_VT8623 is not set
+CONFIG_FB_VT8623=m
 # CONFIG_FB_TRIDENT is not set
 # CONFIG_FB_ARK is not set
 # CONFIG_FB_PM3 is not set
@@ -4084,18 +4169,21 @@ CONFIG_FB_VOODOO1=m
 # 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
@@ -4103,6 +4191,8 @@ 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
@@ -4239,6 +4329,7 @@ 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
@@ -4255,6 +4346,7 @@ 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
@@ -4320,6 +4412,7 @@ 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
@@ -4371,6 +4464,7 @@ 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
@@ -4379,6 +4473,7 @@ 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
@@ -4413,10 +4508,9 @@ CONFIG_USB=m
 #
 # Miscellaneous USB options
 #
+CONFIG_USB_DEFAULT_PERSIST=y
 CONFIG_USB_DYNAMIC_MINORS=y
-CONFIG_USB_SUSPEND=y
 # CONFIG_USB_OTG is not set
-# CONFIG_USB_DWC3 is not set
 CONFIG_USB_MON=m
 CONFIG_USB_WUSB=m
 CONFIG_USB_WUSB_CBAF=m
@@ -4432,6 +4526,7 @@ 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
@@ -4439,7 +4534,6 @@ 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_EHCI_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
@@ -4456,11 +4550,10 @@ CONFIG_USB_HWA_HCD=m
 # 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_CHIPIDEA=m
-CONFIG_USB_CHIPIDEA_UDC=y
-CONFIG_USB_CHIPIDEA_HOST=y
-# CONFIG_USB_CHIPIDEA_DEBUG is not set
 CONFIG_USB_RENESAS_USBHS=m
 
 #
@@ -4500,6 +4593,10 @@ CONFIG_USB_STORAGE_ENE_UB6250=m
 #
 CONFIG_USB_MDC800=m
 CONFIG_USB_MICROTEK=m
+# CONFIG_USB_DWC3 is not set
+CONFIG_USB_CHIPIDEA=m
+CONFIG_USB_CHIPIDEA_UDC=y
+# CONFIG_USB_CHIPIDEA_DEBUG is not set
 
 #
 # USB port drivers
@@ -4569,7 +4666,9 @@ 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
@@ -4600,17 +4699,22 @@ CONFIG_USB_TEST=m
 CONFIG_USB_ISIGHTFW=m
 CONFIG_USB_YUREX=m
 CONFIG_USB_EZUSB_FX2=m
-
-#
-# USB Physical Layer drivers
-#
-CONFIG_USB_ISP1301=m
-CONFIG_USB_RCAR_PHY=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_FILES is not set
 # CONFIG_USB_GADGET_DEBUG_FS is not set
@@ -4622,7 +4726,9 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 #
 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
@@ -4633,6 +4739,10 @@ 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
@@ -4645,7 +4755,7 @@ CONFIG_USB_FUNCTIONFS=m
 CONFIG_USB_FUNCTIONFS_ETH=y
 CONFIG_USB_FUNCTIONFS_RNDIS=y
 CONFIG_USB_FUNCTIONFS_GENERIC=y
-# CONFIG_USB_MASS_STORAGE is not set
+CONFIG_USB_MASS_STORAGE=m
 CONFIG_USB_GADGET_TARGET=m
 CONFIG_USB_G_SERIAL=m
 CONFIG_USB_MIDI_GADGET=m
@@ -4659,13 +4769,6 @@ CONFIG_USB_G_DBGP=m
 # CONFIG_USB_G_DBGP_PRINTK is not set
 CONFIG_USB_G_DBGP_SERIAL=y
 CONFIG_USB_G_WEBCAM=m
-
-#
-# OTG and related infrastructure
-#
-CONFIG_USB_OTG_UTILS=y
-# CONFIG_USB_GPIO_VBUS is not set
-CONFIG_NOP_USB_XCEIV=m
 CONFIG_UWB=m
 CONFIG_UWB_HWA=m
 CONFIG_UWB_WHCI=m
@@ -4730,8 +4833,10 @@ 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
@@ -4745,11 +4850,11 @@ CONFIG_LEDS_TCA6507=m
 CONFIG_LEDS_LM355x=m
 CONFIG_LEDS_OT200=m
 CONFIG_LEDS_BLINKM=m
-CONFIG_LEDS_TRIGGERS=y
 
 #
 # LED Triggers
 #
+CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=m
 CONFIG_LEDS_TRIGGER_ONESHOT=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
@@ -4762,6 +4867,7 @@ 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
@@ -4787,6 +4893,7 @@ 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
 
@@ -4836,6 +4943,7 @@ CONFIG_RTC_DRV_RV3029C2=m
 # 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
@@ -4860,6 +4968,11 @@ 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
 
@@ -4868,9 +4981,12 @@ CONFIG_DMADEVICES=y
 #
 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
@@ -4894,7 +5010,11 @@ CONFIG_UIO_AEC=m
 CONFIG_UIO_SERCOS3=m
 CONFIG_UIO_PCI_GENERIC=m
 CONFIG_UIO_NETX=m
-# CONFIG_VFIO 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
 
 #
@@ -4928,7 +5048,7 @@ CONFIG_XEN_XENBUS_FRONTEND=y
 CONFIG_XEN_GNTDEV=m
 CONFIG_XEN_GRANT_DEV_ALLOC=m
 CONFIG_SWIOTLB_XEN=y
-CONFIG_XEN_TMEM=y
+CONFIG_XEN_TMEM=m
 CONFIG_XEN_PCIDEV_BACKEND=m
 CONFIG_XEN_PRIVCMD=m
 CONFIG_XEN_ACPI_PROCESSOR=m
@@ -4957,6 +5077,7 @@ 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
@@ -4975,6 +5096,7 @@ 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
@@ -5003,7 +5125,7 @@ CONFIG_COMEDI_NI_6527=m
 CONFIG_COMEDI_NI_65XX=m
 CONFIG_COMEDI_NI_660X=m
 CONFIG_COMEDI_NI_670X=m
-CONFIG_COMEDI_NI_LABPC=m
+CONFIG_COMEDI_NI_LABPC_PCI=m
 CONFIG_COMEDI_NI_PCIDIO=m
 CONFIG_COMEDI_NI_PCIMIO=m
 CONFIG_COMEDI_RTD520=m
@@ -5030,8 +5152,8 @@ CONFIG_COMEDI_8255=m
 CONFIG_COMEDI_FC=m
 CONFIG_COMEDI_AMPLC_DIO200=m
 CONFIG_COMEDI_AMPLC_PC236=m
-CONFIG_COMEDI_AMPLC_PC263=m
 CONFIG_COMEDI_DAS08=m
+CONFIG_COMEDI_NI_LABPC=m
 CONFIG_COMEDI_NI_TIO=m
 CONFIG_ASUS_OLED=m
 # CONFIG_PANEL is not set
@@ -5048,16 +5170,14 @@ CONFIG_RTS5139=m
 # CONFIG_TRANZPORT is not set
 CONFIG_IDE_PHISON=m
 CONFIG_LINE6_USB=m
-# CONFIG_LINE6_USB_DUMP_PCM is not set
 # 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_ZCACHE is not set
-CONFIG_ZSMALLOC=y
 CONFIG_WLAGS49_H2=m
 CONFIG_WLAGS49_H25=m
 CONFIG_FB_SM7XX=m
@@ -5099,14 +5219,8 @@ 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_VIDEO_GO7007_OV7640=m
-CONFIG_VIDEO_GO7007_SAA7113=m
-CONFIG_VIDEO_GO7007_SAA7115=m
-CONFIG_VIDEO_GO7007_TW9903=m
-CONFIG_VIDEO_GO7007_UDA1342=m
-CONFIG_VIDEO_GO7007_SONY_TUNER=m
-CONFIG_VIDEO_GO7007_TW2804=m
 CONFIG_SOLO6X10=m
 CONFIG_LIRC_STAGING=y
 CONFIG_LIRC_BT829=m
@@ -5132,19 +5246,22 @@ CONFIG_WIMAX_GDM72XX_USB=y
 # CONFIG_WIMAX_GDM72XX_SDIO is not set
 CONFIG_WIMAX_GDM72XX_USB_PM=y
 CONFIG_CSR_WIFI=m
-CONFIG_ZCACHE2=y
-CONFIG_RAMSTER=y
 CONFIG_NET_VENDOR_SILICOM=y
 CONFIG_SBYPASS=m
 CONFIG_BPCTL=m
 CONFIG_CED1401=m
 CONFIG_DGRP=m
-CONFIG_SB105X=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
@@ -5187,6 +5304,7 @@ CONFIG_MXM_WMI=m
 CONFIG_INTEL_OAKTRAIL=m
 CONFIG_SAMSUNG_Q10=m
 CONFIG_APPLE_GMUX=m
+CONFIG_PVPANIC=m
 
 #
 # Hardware Spinlock drivers
@@ -5194,6 +5312,7 @@ CONFIG_APPLE_GMUX=m
 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
@@ -5206,15 +5325,14 @@ CONFIG_INTEL_IOMMU_FLOPPY_WA=y
 CONFIG_IRQ_REMAP=y
 
 #
-# Remoteproc drivers (EXPERIMENTAL)
+# Remoteproc drivers
 #
 CONFIG_REMOTEPROC=m
 CONFIG_STE_MODEM_RPROC=m
 
 #
-# Rpmsg drivers (EXPERIMENTAL)
+# Rpmsg drivers
 #
-CONFIG_VIRT_DRIVERS=y
 # CONFIG_PM_DEVFREQ is not set
 CONFIG_EXTCON=m
 
@@ -5222,14 +5340,15 @@ CONFIG_EXTCON=m
 # Extcon Device Drivers
 #
 CONFIG_EXTCON_GPIO=m
-CONFIG_EXTCON_ARIZONA=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
@@ -5237,9 +5356,6 @@ CONFIG_SERIAL_IPOCTAL=m
 CONFIG_EDD=m
 # CONFIG_EDD_OFF is not set
 CONFIG_FIRMWARE_MEMMAP=y
-CONFIG_EFI_VARS=y
-CONFIG_EFI_VARS_PSTORE=y
-# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
 CONFIG_DELL_RBU=m
 CONFIG_DCDBAS=m
 CONFIG_DMIID=y
@@ -5249,6 +5365,13 @@ CONFIG_ISCSI_IBFT=m
 # CONFIG_GOOGLE_FIRMWARE is not set
 
 #
+# EFI (Extensible Firmware Interface) Support
+#
+CONFIG_EFI_VARS=m
+CONFIG_EFI_VARS_PSTORE=m
+CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
+
+#
 # File systems
 #
 CONFIG_DCACHE_WORD_ACCESS=y
@@ -5277,6 +5400,7 @@ 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
@@ -5289,6 +5413,8 @@ CONFIG_OCFS2_FS_STATS=y
 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
@@ -5297,7 +5423,7 @@ CONFIG_FSNOTIFY=y
 CONFIG_DNOTIFY=y
 CONFIG_INOTIFY_USER=y
 CONFIG_FANOTIFY=y
-# CONFIG_FANOTIFY_ACCESS_PERMISSIONS is not set
+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
 CONFIG_QUOTA=y
 CONFIG_QUOTA_NETLINK_INTERFACE=y
 # CONFIG_PRINT_QUOTA_WARNING is not set
@@ -5363,6 +5489,7 @@ 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
@@ -5415,6 +5542,7 @@ 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
@@ -5422,15 +5550,16 @@ CONFIG_NFS_V2=m
 CONFIG_NFS_V3=m
 CONFIG_NFS_V3_ACL=y
 CONFIG_NFS_V4=m
-# CONFIG_NFS_SWAP is not set
+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="kernel.org"
+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
@@ -5443,8 +5572,9 @@ 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 is not set
+CONFIG_SUNRPC_DEBUG=y
 CONFIG_CEPH_FS=m
 CONFIG_CIFS=m
 CONFIG_CIFS_STATS=y
@@ -5549,15 +5679,21 @@ CONFIG_PANIC_ON_OOPS_VALUE=0
 # CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_SLUB_STATS is not set
 CONFIG_HAVE_DEBUG_KMEMLEAK=y
-# CONFIG_SPARSE_RCU_POINTER is not set
+CONFIG_TRACE_IRQFLAGS=y
 CONFIG_STACKTRACE=y
 CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_ARCH_WANT_FRAME_POINTERS=y
 CONFIG_FRAME_POINTER=y
+
+#
+# RCU Debugging
+#
+# CONFIG_SPARSE_RCU_POINTER is not set
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_RCU_CPU_STALL_VERBOSE is not set
 CONFIG_LKDTM=m
+CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y
 CONFIG_USER_STACKTRACE_SUPPORT=y
 CONFIG_NOP_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
@@ -5565,6 +5701,7 @@ 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
@@ -5573,20 +5710,24 @@ CONFIG_TRACER_MAX_TRACE=y
 CONFIG_TRACE_CLOCK=y
 CONFIG_RING_BUFFER=y
 CONFIG_EVENT_TRACING=y
-CONFIG_EVENT_POWER_TRACING_DEPRECATED=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_IRQSOFF_TRACER=y
+CONFIG_INTERRUPT_OFF_HIST=y
+CONFIG_PREEMPT_TRACER=y
+CONFIG_PREEMPT_OFF_HIST=y
 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=y
 CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
 # CONFIG_PROFILE_ALL_BRANCHES is not set
@@ -5596,12 +5737,14 @@ 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_PROVIDE_OHCI1394_DMA_INIT is not set
 # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
 CONFIG_DYNAMIC_DEBUG=y
@@ -5611,6 +5754,7 @@ CONFIG_ASYNC_RAID6_TEST=m
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
 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
@@ -5650,7 +5794,7 @@ CONFIG_SECURITY_TOMOYO=y
 CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
 CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
 # CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
-CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init"
+CONFIG_SECURITY_TOMOYO_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
@@ -5666,8 +5810,6 @@ CONFIG_ASYNC_MEMCPY=m
 CONFIG_ASYNC_XOR=m
 CONFIG_ASYNC_PQ=m
 CONFIG_ASYNC_RAID6_RECOV=m
-CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y
-CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y
 CONFIG_CRYPTO=y
 
 #
@@ -5679,7 +5821,7 @@ CONFIG_CRYPTO_AEAD=m
 CONFIG_CRYPTO_AEAD2=y
 CONFIG_CRYPTO_BLKCIPHER=m
 CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH=m
 CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_RNG=m
 CONFIG_CRYPTO_RNG2=y
@@ -5720,6 +5862,7 @@ CONFIG_CRYPTO_XTS=m
 #
 # Hash modes
 #
+CONFIG_CRYPTO_CMAC=m
 CONFIG_CRYPTO_HMAC=m
 CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_VMAC=m
@@ -5728,8 +5871,9 @@ CONFIG_CRYPTO_VMAC=m
 # Digest
 #
 CONFIG_CRYPTO_CRC32C=m
-CONFIG_CRYPTO_CRC32C_X86_64=y
 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
@@ -5740,6 +5884,8 @@ 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
@@ -5760,6 +5906,7 @@ 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
@@ -5774,6 +5921,7 @@ 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
@@ -5805,6 +5953,7 @@ 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
@@ -5816,8 +5965,7 @@ CONFIG_KVM=m
 CONFIG_KVM_INTEL=m
 CONFIG_KVM_AMD=m
 CONFIG_KVM_MMU_AUDIT=y
-CONFIG_VHOST_NET=m
-CONFIG_TCM_VHOST=m
+CONFIG_KVM_DEVICE_ASSIGNMENT=y
 CONFIG_BINARY_PRINTF=y
 
 #
@@ -5890,3 +6038,4 @@ CONFIG_CORDIC=m
 CONFIG_DDR=y
 CONFIG_MPILIB=m
 CONFIG_OID_REGISTRY=m
+CONFIG_UCS2_STRING=y
diff --git a/kernels/linux-libre-rt/criu-no-expert.patch b/kernels/linux-libre-rt/criu-no-expert.patch
new file mode 100644
index 000000000..2124427e9
--- /dev/null
+++ b/kernels/linux-libre-rt/criu-no-expert.patch
@@ -0,0 +1,22 @@
+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
index 374862298..434a0207c 100644
--- a/kernels/linux-libre-rt/linux-libre-rt.install
+++ b/kernels/linux-libre-rt/linux-libre-rt.install
@@ -2,10 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-rt
-KERNEL_VERSION=3.8.13-1-rt9-LIBRE-RT
-
-# set a sane PATH to ensure that critical utils like depmod will be found
-export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
+KERNEL_VERSION=
 
 post_install () {
   # updating module dependencies
@@ -15,40 +12,9 @@ post_install () {
     echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
     mkinitcpio -p linux-libre${KERNEL_NAME}
   fi
-
-  # compat symlinks for the official kernels only
-  if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-rt" ]; then
-    loaders="$(find /boot -name syslinux.cfg -or -name extlinux.conf -or -name grub.cfg -or -name menu.lst)"
-    [ -f /etc/lilo.conf ] && loaders="$loaders /etc/lilo.conf"
-    if [ -n "${loaders}" ] && grep -q -e vmlinuz26 -e kernel26.img -e kernel26-fallback.img $loaders; then
-      # add compat symlinks for the initramfs images
-      ln -sf initramfs-linux-libre${KERNEL_NAME}.img boot/kernel26${KERNEL_NAME}.img
-      ln -sf initramfs-linux-libre${KERNEL_NAME}-fallback.img \
-        boot/kernel26${KERNEL_NAME}-fallback.img
-      ln -sf vmlinuz-linux-libre${KERNEL_NAME} /boot/vmlinuz26${KERNEL_NAME}
-    fi
-  fi
 }
 
 post_upgrade() {
-  pacman -Q grub &>/dev/null
-  hasgrub=$?
-  pacman -Q grub-common &>/dev/null
-  hasgrub2=$?
-  pacman -Q lilo &>/dev/null
-  haslilo=$?
-  # reminder notices
-  if [ $haslilo -eq 0 ]; then
-    echo ">>>"
-    if [ $hasgrub -eq 0 -o $hasgrub2 -eq 0 ]; then
-      echo ">>> If you use the LILO bootloader, you should run 'lilo' before rebooting."
-    else
-      echo ">>> You appear to be using the LILO bootloader. You should run"
-      echo ">>> 'lilo' before rebooting."
-    fi
-    echo ">>>"
-  fi
-
   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
@@ -64,6 +30,6 @@ post_upgrade() {
 
 post_remove() {
   # also remove the compat symlinks
-  rm -f boot/{initramfs-linux-libre,kernel26}${KERNEL_NAME}.img
-  rm -f boot/{initramfs-linux-libre,kernel26}${KERNEL_NAME}-fallback.img
+  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/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD
index 7ae0ec08c..7ff630c05 100644
--- a/kernels/linux-libre-xen/PKGBUILD
+++ b/kernels/linux-libre-xen/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 186437 2013-05-26 15:22:24Z tpowa $
+# $Id: PKGBUILD 194378 2013-09-15 09:16:34Z tpowa $
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgbase=linux-libre-xen     # Build stock -LIBRE-XEN kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
-_basekernel=3.9
-pkgver=${_basekernel}.4
+_basekernel=3.11
+pkgver=${_basekernel}.1
 pkgrel=1
 arch=('i686')
 url="http://linux-libre.fsfla.org/"
@@ -20,13 +20,15 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         # standard config files for mkinitcpio ramdisk
         "${pkgbase}.preset"
         'boot-logo.patch'
-        'change-default-console-loglevel.patch')
-md5sums=('120df29f88622dabf7015a22c7cc8e25'
-         'ae8a4997bfa4a6b9acfd0cefbb6e9aa0'
-         '8cc2a43c771d0fbb652c8264c746c007'
+        'change-default-console-loglevel.patch'
+        'criu-no-expert.patch')
+md5sums=('7ec84223c7adcf01a5287eb7af96b7e7'
+         '7b051faf375c76d4763a24048c52600b'
+         '212338fa662436f9590026c9a71d82f7'
          'b7c2805bb287a644c0a303bf7721e534'
-         '04b21c79df0a952c22d681dd4f4562df'
-         'f3def2cefdcbb954c21d8505d23cc83c')
+         '36e90334b12b2e9d53fd92129ee98f5b'
+         '98beb36f9b8cf16e58de2483ea9985e3'
+         'd50c1ac47394e9aec637002ef3392bd1')
 
 _kernelname=${pkgbase#linux-libre}
 _localversionname=-LIBRE-XEN
@@ -38,7 +40,7 @@ prepare() {
     patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu"
   fi
 
-  # Add freedo as boot logo
+  # 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)
@@ -46,6 +48,10 @@ prepare() {
   # (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"
+
   cat "${srcdir}/config" > ./.config # simpler
 
   if [ "${_kernelname}" != "" ]; then
@@ -91,7 +97,7 @@ build() {
 }
 
 _package() {
-  pkgdesc="The ${pkgbase} kernel and modules with Xen guest support"
+  pkgdesc="The ${pkgbase^} kernel and modules with Xen guest support"
   [ "${pkgbase}" = "linux-libre" ] && groups=('base')
   depends=('coreutils' 'linux-libre-firmware' 'kmod' 'mkinitcpio>=0.7')
   optdepends=('crda: to set the correct wireless channels of your country')
@@ -117,14 +123,16 @@ _package() {
   # add vmlinux
   install -D -m644 vmlinux "${pkgdir}/usr/src/linux-${_kernver}/vmlinux"
 
-  # install fallback mkinitcpio.conf file and preset file for kernel
-  install -D -m644 "${srcdir}/${pkgbase}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
-
   # 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}/${pkgbase}.install"
+    -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}\"|" \
@@ -152,7 +160,7 @@ _package() {
 }
 
 _package-headers() {
-  pkgdesc="Header files and scripts for building modules for ${pkgbase} kernel"
+  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")
@@ -288,7 +296,7 @@ _package-headers() {
   done
 
   # remove unneeded architectures
-  rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arc,arm,arm26,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,metag,mips,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa}
+  rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arc,arm,arm26,arm64,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,metag,mips,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa}
 }
 
 pkgname=("${pkgbase}" "${pkgbase}-headers")
diff --git a/kernels/linux-libre-xen/boot-logo.patch b/kernels/linux-libre-xen/boot-logo.patch
index c392928a5..cbd52ea22 100644
--- a/kernels/linux-libre-xen/boot-logo.patch
+++ b/kernels/linux-libre-xen/boot-logo.patch
@@ -1,1612 +1,891 @@
-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 @@
+diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
+index 285d552..c9d8373 100644
+--- a/drivers/video/logo/logo_linux_clut224.ppm
++++ b/drivers/video/logo/logo_linux_clut224.ppm
+@@ -1,883 +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 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 11 15 17 33 49 54 59 85 92 73 97 106 
+-83 116 129 105 131 142 115 114 122 74 88 93 20 29 31 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 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 2 3 3 17 23 26 50 67 72 73 97 106 59 85 92 73 97 106 
+-105 131 142 124 127 131 105 131 142 105 131 142 53 75 83 6 8 8 0 0 0 0 0 0 
+-0 0 0 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 1 1 1 1 1 1 0 0 0 
+-0 0 0 1 1 1 26 35 39 59 85 92 59 85 92 59 85 92 29 43 47 53 75 83 
+-108 122 132 132 98 104 108 122 132 105 131 142 101 101 101 43 45 48 6 8 8 0 0 0 
+-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 1 1 1 0 0 0 0 0 0 0 0 0 
+-11 15 17 27 40 45 59 85 92 59 85 92 27 40 45 31 45 49 73 97 106 93 121 133 
+-108 122 132 108 122 132 105 131 142 108 122 132 105 131 142 73 97 106 26 35 39 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 1 1 1 7 12 13 21 31 35 42 59 64 
+-53 75 83 53 75 83 50 67 72 42 59 64 32 40 45 42 59 64 73 97 106 116 116 116 
+-132 98 104 116 116 116 108 122 132 117 104 110 105 131 142 83 116 129 50 67 72 7 12 13 
+-1 1 1 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 1 1 1 6 8 8 15 22 25 26 35 39 36 54 60 53 75 83 59 85 92 
+-59 85 92 48 63 69 15 22 25 12 17 20 52 67 79 94 94 94 132 98 104 132 98 104 
+-117 104 110 108 122 132 108 122 132 115 114 122 105 131 142 77 105 114 59 85 92 36 54 60 
+-7 12 13 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 15 22 25 29 43 47 36 54 60 42 59 64 42 59 64 48 63 69 21 31 35 
+-6 8 8 29 43 47 36 50 56 43 45 48 79 78 84 132 98 104 165 78 79 132 98 104 
+-108 122 132 117 104 110 117 104 110 108 122 132 77 105 114 73 97 106 95 131 149 78 102 129 
+-36 50 56 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 
+-
+-27 40 45 53 75 83 48 63 69 24 31 37 6 8 12 0 0 0 18 25 28 26 35 39 
+-12 17 20 26 35 39 65 78 84 112 81 86 152 81 83 137 83 86 132 98 104 117 104 110 
+-117 104 110 132 98 104 132 98 104 115 114 122 73 97 106 53 75 83 95 131 149 93 124 152 
+-68 78 128 15 22 25 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 
+-
+-36 50 56 21 30 33 4 7 7 0 0 0 1 1 1 17 12 12 69 31 31 68 59 64 
+-57 59 63 21 31 35 32 40 45 86 73 69 152 81 83 152 81 83 117 104 110 132 98 104 
+-152 81 83 132 98 104 108 122 132 77 105 114 77 105 114 93 121 133 95 131 149 93 124 152 
+-95 131 149 53 75 83 11 15 17 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 
+-
+-17 23 26 2 3 3 0 0 0 17 12 12 69 31 31 123 55 55 123 55 55 152 81 83 
+-86 73 69 17 23 26 7 12 13 45 54 57 101 101 101 137 83 86 132 98 104 132 98 104 
+-137 83 86 117 104 110 77 105 114 42 59 64 50 67 72 78 102 129 91 117 157 91 117 157 
+-95 131 149 83 116 129 40 48 73 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 
+-
+-1 1 1 1 2 2 2 3 3 28 12 12 123 55 55 174 79 79 174 79 79 174 79 79 
+-152 81 83 68 59 64 26 35 39 27 40 45 79 78 84 137 83 86 165 78 79 137 83 86 
+-94 94 94 48 63 69 36 50 56 50 67 72 73 97 106 93 121 133 93 124 152 93 124 152 
+-95 131 149 91 118 149 78 102 129 27 40 45 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 
+-
+-4 5 3 24 53 24 19 31 15 8 7 3 90 61 47 165 78 79 174 79 79 174 79 79 
+-174 79 79 137 83 86 60 52 57 7 12 13 17 23 26 70 70 70 132 98 104 112 81 86 
+-79 78 84 31 45 49 15 22 25 53 75 83 91 118 149 86 106 160 91 117 157 93 124 152 
+-91 117 157 93 124 152 95 131 149 53 75 83 50 50 50 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 
+-
+-19 31 15 34 76 34 34 76 34 19 31 15 28 12 12 123 55 55 174 79 79 174 79 79 
+-174 79 79 165 78 79 112 81 86 32 40 45 15 22 25 38 53 58 65 78 84 29 31 32 
+-21 30 33 42 59 64 60 80 103 78 102 129 87 112 149 84 96 162 91 117 157 93 124 152 
+-91 117 157 93 124 152 93 121 133 59 85 92 57 68 71 82 85 86 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 
+-
+-34 76 34 40 89 40 40 89 40 34 76 34 8 15 6 48 26 18 123 55 55 174 79 79 
+-174 79 79 174 79 79 137 83 86 68 59 64 32 40 45 21 30 33 31 45 49 21 31 35 
+-12 17 20 48 63 69 78 102 129 81 88 166 84 96 162 91 117 157 93 124 152 91 117 157 
+-93 124 152 95 131 149 83 116 129 59 85 92 57 68 71 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 
+-
+-40 89 40 40 89 40 40 89 40 40 89 40 24 53 24 6 6 6 69 31 31 123 55 55 
+-123 55 55 90 61 47 69 31 31 36 32 33 21 31 35 7 12 13 18 25 28 48 63 69 
+-60 80 103 68 78 128 84 101 153 84 96 162 84 96 162 91 117 157 91 117 157 84 96 162 
+-91 117 157 73 97 106 48 63 69 50 67 72 57 59 63 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 124 131 137 170 170 170 151 151 151 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 
+-
+-34 76 34 40 89 40 40 89 40 40 89 40 34 76 34 19 31 15 17 12 12 48 26 18 
+-48 26 18 8 7 3 10 10 22 23 29 47 51 61 92 42 59 64 21 30 33 34 45 54 
+-68 78 128 81 88 166 81 82 173 86 106 160 86 106 160 84 96 162 86 106 160 87 112 149 
+-91 118 149 77 105 114 52 67 79 32 40 45 50 50 50 86 86 86 2 2 6 14 14 14 
+-124 131 137 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 124 131 137 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 
+-
+-19 31 15 34 76 34 40 89 40 40 89 40 40 89 40 24 53 24 8 7 3 0 0 0 
+-6 8 12 28 32 52 51 61 92 54 54 122 74 77 160 68 78 128 26 35 39 6 8 8 
+-34 45 54 68 78 128 84 96 162 86 106 160 86 106 160 81 88 166 84 96 162 87 112 149 
+-73 97 106 36 50 56 33 49 54 18 18 18 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 170 170 170 124 127 131 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 
+-
+-4 5 3 24 53 24 40 89 40 40 89 40 34 76 34 12 22 15 4 5 3 4 5 3 
+-13 17 26 54 54 122 78 78 174 78 78 174 78 78 174 74 77 160 51 61 92 21 31 35 
+-26 35 39 53 75 83 84 101 153 81 82 173 81 88 166 84 101 153 60 80 103 60 80 103 
+-53 75 83 38 53 58 42 59 64 22 22 22 46 46 46 82 82 82 2 2 6 106 106 106 
+-170 170 170 26 26 26 86 86 86 226 226 226 124 127 131 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 151 151 151 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 
+-
+-1 2 2 8 15 6 24 53 24 34 76 34 19 31 15 8 15 6 63 55 20 63 55 20 
+-18 18 18 40 48 73 74 77 160 78 78 174 78 78 174 81 82 173 74 77 160 52 67 79 
+-17 23 26 21 31 35 60 80 103 81 88 166 74 77 160 78 102 129 36 54 60 12 17 20 
+-42 59 64 48 63 69 21 31 35 18 18 18 42 42 42 86 86 86 6 6 6 116 116 116 
+-106 106 106 6 6 6 70 70 70 151 151 151 124 127 131 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 
+-
+-11 15 17 0 0 0 12 22 15 19 31 15 8 15 6 63 55 20 149 139 69 149 139 69 
+-63 55 20 10 10 22 54 54 122 78 78 174 78 78 174 78 78 174 81 82 173 68 78 128 
+-24 31 37 6 6 6 36 50 56 60 80 103 51 61 92 42 59 64 36 50 56 31 45 49 
+-29 43 47 27 40 45 6 8 8 14 14 14 42 42 42 94 94 94 14 14 14 101 101 101 
+-124 127 131 2 2 6 18 18 18 116 116 116 106 107 48 121 92 8 121 92 8 98 70 6 
+-170 170 170 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 
+-
+-26 35 39 3 5 6 1 1 1 2 3 3 35 31 12 133 118 54 175 176 80 175 176 80 
+-133 118 54 35 31 12 23 29 47 54 54 122 78 78 174 78 78 174 74 77 160 68 78 128 
+-51 61 92 31 45 49 26 35 39 36 50 56 29 43 47 7 12 13 21 30 33 42 59 64 
+-18 25 28 7 12 13 1 1 1 10 10 10 38 38 38 90 90 90 14 14 14 58 58 58 
+-210 210 210 26 26 26 62 42 6 154 114 10 226 170 11 237 188 10 220 174 15 184 138 11 
+-220 174 15 174 140 55 35 31 12 2 2 6 70 70 70 246 246 246 124 131 137 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 
+-
+-27 40 45 17 23 26 2 3 3 1 1 1 56 77 35 165 152 80 175 176 80 175 176 80 
+-175 176 80 106 107 48 22 22 22 28 32 52 54 54 122 54 54 122 51 61 92 28 32 52 
+-20 27 34 31 45 49 11 15 17 7 12 13 36 50 56 31 45 49 29 43 47 36 50 56 
+-6 8 8 0 0 0 0 0 0 10 10 10 38 38 38 86 86 86 14 14 14 10 10 10 
+-195 195 195 198 179 130 192 133 9 220 174 15 239 182 13 237 188 10 232 195 16 239 207 25 
+-237 201 50 241 208 19 232 195 16 184 138 11 198 179 130 208 206 196 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 
+-
+-15 22 25 26 35 39 15 22 25 0 0 0 35 31 12 133 118 54 175 176 80 175 176 80 
+-175 176 80 165 152 80 56 77 35 6 8 12 23 29 47 13 17 26 2 2 6 0 0 0 
+-1 2 2 26 35 39 26 35 39 26 35 39 42 59 64 42 59 64 20 29 31 6 8 8 
+-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 92 8 192 133 9 219 162 10 239 182 13 237 188 10 232 195 16 241 208 19 237 201 50 
+-237 201 50 239 207 25 241 208 19 241 208 19 241 208 19 230 187 11 121 92 8 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 
+-
+-1 2 2 15 22 25 31 45 49 6 8 12 4 5 3 63 55 20 149 139 69 175 176 80 
+-175 176 80 175 176 80 106 107 48 20 16 6 1 1 1 0 0 0 2 3 3 11 15 17 
+-21 30 33 36 50 56 36 50 56 24 31 37 15 22 25 6 8 8 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 62 42 6 
+-180 123 7 206 145 10 230 174 11 239 182 13 237 188 10 238 202 15 241 208 19 237 201 50 
+-239 207 25 241 208 19 241 208 19 241 208 19 230 187 11 220 174 15 184 138 11 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 1 2 2 29 43 47 26 35 39 3 5 6 8 7 3 106 107 48 165 152 80 
+-175 176 80 149 139 69 63 55 20 4 5 3 2 3 3 12 17 20 26 35 39 26 35 39 
+-17 23 26 7 12 13 6 8 8 3 5 6 1 2 2 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 237 188 10 232 195 16 241 208 19 237 201 50 237 201 50 
+-241 208 19 241 208 19 241 208 19 204 160 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 12 17 20 27 40 45 18 25 28 1 1 1 35 31 12 106 107 48 
+-149 139 69 56 77 35 8 7 3 1 2 2 12 17 20 26 35 39 21 31 35 11 15 17 
+-3 5 6 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 10 10 10 30 30 30 78 78 78 46 46 46 22 22 22 
+-137 92 6 204 160 10 239 182 13 237 188 10 238 202 15 241 208 19 241 208 19 241 208 19 
+-241 208 19 204 160 10 184 138 11 210 150 10 216 158 10 210 150 10 98 70 6 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 1 1 1 15 22 25 33 49 54 12 17 20 2 3 3 35 31 12 
+-56 77 35 20 16 6 1 1 1 18 25 28 21 31 35 11 15 17 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 0 0 0 0 0 0 10 10 10 34 34 34 78 78 78 50 50 50 6 6 6 
+-88 55 22 139 102 15 190 146 13 230 187 11 239 207 25 232 195 16 220 174 15 190 146 13 
+-171 120 8 192 133 9 210 150 10 213 154 11 185 146 40 165 152 80 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 1 1 1 27 40 45 29 43 47 3 5 6 2 3 3 
+-8 7 3 1 1 1 17 23 26 31 45 49 15 22 25 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 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 
+-124 127 131 168 158 138 156 107 11 171 120 8 204 160 10 184 138 11 197 138 11 200 144 11 
+-206 145 10 206 145 10 197 138 11 198 179 130 195 195 195 198 198 198 170 170 170 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 11 15 17 31 45 49 26 35 39 3 5 6 
+-0 0 0 7 12 13 27 40 45 18 25 28 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 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 
+-124 131 137 190 190 190 168 158 138 156 107 11 197 138 11 200 144 11 197 138 11 192 133 9 
+-180 123 7 185 146 40 198 179 130 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 1 1 1 15 22 25 36 54 60 18 25 28 
+-0 0 0 21 30 33 27 40 45 2 3 3 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 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 
+-151 151 151 198 198 198 190 190 190 168 158 138 148 132 55 156 107 11 156 107 11 169 125 40 
+-168 158 138 187 187 187 190 190 190 210 210 210 246 246 246 253 253 253 253 253 253 180 180 180 
+-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 1 1 1 27 40 45 35 52 58 
+-18 25 28 35 52 58 17 23 26 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 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 7 12 13 33 49 54 
+-52 72 81 36 54 60 6 8 8 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-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 180 180 180 
+-253 253 253 246 246 246 202 202 202 190 190 190 190 190 190 190 190 190 190 190 190 190 190 190 
+-202 202 202 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 12 17 20 
+-36 54 60 29 43 47 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 
+-21 30 33 35 52 58 6 8 12 0 0 0 0 0 0 0 0 0 0 0 0 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 180 180 180 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 
+-12 17 20 36 54 60 29 43 47 0 0 0 0 0 0 0 0 0 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 106 106 106 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 21 30 33 35 52 58 6 8 12 0 0 0 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 12 17 20 36 54 60 29 43 47 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 21 30 33 35 52 58 6 8 12 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 202 202 202 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 202 202 202 202 202 202 202 202 202 
+-198 198 198 202 202 202 180 180 180 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 12 17 20 36 54 60 29 43 47 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 180 180 180 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 151 151 151 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 21 30 33 35 52 58 6 8 12 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 170 170 170 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 202 202 202 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 6 8 8 33 49 54 29 43 47 6 8 12 
+-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 12 17 20 33 49 54 17 23 26 
+-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 15 22 25 36 54 60 
+-0 0 0 0 0 0 0 0 0 18 18 18 54 54 54 82 82 82 2 2 6 26 26 26 
+-22 22 22 2 2 6 124 127 131 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 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 21 30 33 
+-36 54 60 0 0 0 0 0 0 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 
+-36 54 60 0 0 0 0 0 0 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 36 54 60 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 151 151 151 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 36 54 60 21 30 33 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 180 180 180 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 36 54 60 82 82 82 2 2 6 22 22 22 18 18 18 2 2 6 
+-151 151 151 253 253 253 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 202 202 202 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 36 54 60 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 202 202 202 2 2 6 
+-22 22 22 34 34 34 20 16 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 63 55 20 184 138 11 204 160 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 151 151 151 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 138 132 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 214 187 87 214 187 87 185 146 40 35 31 12 
+-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 185 146 40 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 237 201 50 241 196 14 241 208 19 232 195 16 35 31 12 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 6 6 6 30 30 30 26 26 26 
+-204 160 10 165 152 80 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 124 127 131 
+-174 140 55 210 150 10 234 174 13 246 186 14 246 190 14 246 190 14 246 190 14 237 188 10 
+-98 70 6 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 214 187 87 242 186 14 241 196 14 204 160 10 20 16 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 148 132 55 185 146 40 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 
+-220 174 15 35 31 12 2 2 6 22 22 22 151 151 151 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 214 187 87 239 182 13 237 188 10 213 154 11 35 31 12 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 62 42 6 220 174 15 
+-237 188 10 237 188 10 113 101 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 6 6 6 
+-22 22 22 54 54 54 148 132 55 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 138 11 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 213 164 39 236 178 12 236 178 12 210 150 10 137 92 6 
+-20 16 6 2 2 6 2 2 6 2 2 6 6 6 6 62 42 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 169 125 40 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 202 202 202 198 198 198 213 164 39 230 174 11 230 174 11 216 158 10 192 133 9 
+-163 110 8 120 80 7 98 70 6 120 80 7 167 114 7 197 138 11 226 170 11 239 182 13 
+-242 186 14 242 186 14 165 152 80 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 185 146 40 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 204 160 10 20 16 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 202 202 202 198 198 198 213 164 39 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 220 174 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 140 55 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 185 146 40 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 213 164 39 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 140 55 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 230 187 11 62 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 169 125 40 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 213 164 39 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 149 139 69 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 20 16 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 220 174 15 149 139 69 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 149 139 69 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 20 16 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 149 139 69 
+-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 149 139 69 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 220 174 15 198 179 130 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 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 20 16 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 185 146 40 
+-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 169 125 40 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 35 31 12 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 149 139 69 
+-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 113 101 86 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 230 187 11 204 160 10 133 118 54 
+-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 62 42 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 148 132 55 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 148 132 55 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 204 160 10 163 110 8 
+-62 42 6 124 131 137 218 218 218 250 250 250 253 253 253 253 253 253 253 253 253 250 250 250 
+-242 242 242 210 210 210 151 151 151 66 66 66 6 6 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 62 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 185 146 40 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 169 125 40 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 171 120 8 
+-85 57 6 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 85 57 6 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 140 55 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 169 125 40 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 85 57 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 
+-169 125 40 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 133 118 54 169 125 40 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 184 138 11 152 99 6 
+-104 69 6 20 16 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 85 57 6 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 148 132 55 
+-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 133 118 54 156 107 11 
+-163 110 8 167 114 7 171 120 8 180 123 7 184 138 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 134 84 6 
+-85 57 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 62 42 6 137 92 6 171 120 8 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 113 101 86 133 118 54 121 92 8 137 92 6 152 99 6 163 110 8 180 123 7 
+-184 138 11 197 138 11 206 145 10 200 144 11 180 123 7 156 107 11 134 84 6 104 69 6 
+-62 42 6 54 54 54 106 106 106 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 90 61 47 120 80 7 156 107 11 180 123 7 192 133 9 200 144 11 
+-206 145 10 200 144 11 192 133 9 171 120 8 139 102 15 113 101 86 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 113 101 86 121 92 8 120 80 7 
+-137 92 6 152 99 6 152 99 6 152 99 6 134 84 6 120 80 7 98 70 6 88 55 22 
+-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 71 85 57 6 134 84 6 156 107 11 167 114 7 171 120 8 
+-171 120 8 167 114 7 152 99 6 121 92 8 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 
+-94 86 71 98 70 6 104 69 6 104 69 6 104 69 6 85 57 6 88 55 22 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 94 86 71 85 57 6 104 69 6 120 80 7 137 92 6 
+-134 84 6 120 80 7 94 86 71 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 71 94 86 71 94 86 71 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 94 86 71 94 86 71 94 86 71 
+-94 86 71 94 86 71 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 
@@ -2464,10 +1743,11 @@ diff -Nur linux-2.6.39.1/drivers/video/logo/logo_linux_clut224.ppm linux-2.6.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 
-+
-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
+ 
+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
@@ -2831,16 +2111,15 @@ diff -Nur linux-2.6.39.1/drivers/video/logo/logo_linux_mono.pbm linux-2.6.39-LIB
 +0 0 0 0 0 0 0 0 0 0 
 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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
+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
-+# CREATOR: GIMP PNM Filter Version 1.1
-+80 78
- 255
+-255
 -  0   0   0   0   0   0   0   0   0   0   0   0
 -  0   0   0   0   0   0   0   0   0   0   0   0
 -  0   0   0   0   0   0   0   0   0   0   0   0
@@ -4441,6 +3720,9 @@ diff -Nur linux-2.6.39.1/drivers/video/logo/logo_linux_vga16.ppm linux-2.6.39-LI
 -  0   0   0   0   0   0   0   0   0   0   0   0
 -  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
diff --git a/kernels/linux-libre-xen/change-default-console-loglevel.patch b/kernels/linux-libre-xen/change-default-console-loglevel.patch
index 2685d4d23..22cd69a09 100644
--- a/kernels/linux-libre-xen/change-default-console-loglevel.patch
+++ b/kernels/linux-libre-xen/change-default-console-loglevel.patch
@@ -1,6 +1,6 @@
 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
+--- 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.. */
diff --git a/kernels/linux-libre-xen/config b/kernels/linux-libre-xen/config
index dd2c45fd8..52c3c2112 100644
--- a/kernels/linux-libre-xen/config
+++ b/kernels/linux-libre-xen/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.9.3-1 Kernel Configuration
+# Linux/x86 3.11.0-1 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -17,12 +17,10 @@ CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_GPIO=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_DEFAULT_IDLE=y
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
 CONFIG_ARCH_HAS_CPU_AUTOPROBE=y
 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
@@ -30,6 +28,8 @@ 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
@@ -49,6 +49,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
 #
 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
@@ -56,11 +57,13 @@ 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
@@ -98,6 +101,9 @@ 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
 
@@ -126,6 +132,9 @@ 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
@@ -169,22 +178,22 @@ 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_EXPERT is not set
 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_SYSCTL_EXCEPTION_TRACE=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
-CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_PCSPKR_PLATFORM=y
-CONFIG_HAVE_PCSPKR_PLATFORM=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
@@ -193,6 +202,7 @@ 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
 
@@ -202,11 +212,11 @@ CONFIG_HAVE_PERF_EVENTS=y
 CONFIG_PERF_EVENTS=y
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_PCI_QUIRKS=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
@@ -250,6 +260,7 @@ 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
@@ -283,6 +294,7 @@ CONFIG_BLK_DEV_THROTTLING=y
 #
 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
@@ -326,13 +338,14 @@ 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_PARAVIRT_GUEST=y
-CONFIG_PARAVIRT_TIME_ACCOUNTING=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
@@ -342,10 +355,8 @@ CONFIG_XEN_SAVE_RESTORE=y
 # CONFIG_XEN_DEBUG_FS is not set
 CONFIG_KVM_GUEST=y
 CONFIG_LGUEST_GUEST=y
-CONFIG_PARAVIRT=y
-# CONFIG_PARAVIRT_SPINLOCKS is not set
+CONFIG_PARAVIRT_TIME_ACCOUNTING=y
 CONFIG_PARAVIRT_CLOCK=y
-# CONFIG_PARAVIRT_DEBUG is not set
 CONFIG_NO_BOOTMEM=y
 # CONFIG_MEMTEST is not set
 # CONFIG_M486 is not set
@@ -412,12 +423,9 @@ CONFIG_TOSHIBA=m
 CONFIG_I8K=m
 CONFIG_X86_REBOOTFIXUPS=y
 CONFIG_MICROCODE=m
-CONFIG_MICROCODE_INTEL=y
-CONFIG_MICROCODE_AMD=y
+# CONFIG_MICROCODE_INTEL is not set
+# CONFIG_MICROCODE_AMD is not set
 CONFIG_MICROCODE_OLD_INTERFACE=y
-CONFIG_MICROCODE_INTEL_LIB=y
-CONFIG_MICROCODE_INTEL_EARLY=y
-CONFIG_MICROCODE_EARLY=y
 CONFIG_X86_MSR=m
 CONFIG_X86_CPUID=m
 # CONFIG_NOHIGHMEM is not set
@@ -461,6 +469,8 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
 CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CLEANCACHE=y
 CONFIG_FRONTSWAP=y
+CONFIG_ZBUD=y
+CONFIG_ZSWAP=y
 # CONFIG_HIGHPTE is not set
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
@@ -520,6 +530,7 @@ CONFIG_PM_ADVANCED_DEBUG=y
 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
@@ -593,6 +604,7 @@ 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
@@ -631,7 +643,7 @@ CONFIG_PCI_XEN=y
 CONFIG_PCI_OLPC=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=m
+CONFIG_HOTPLUG_PCI_PCIE=y
 CONFIG_PCIEAER=y
 # CONFIG_PCIE_ECRC is not set
 # CONFIG_PCIEAER_INJECT is not set
@@ -654,6 +666,10 @@ 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
@@ -687,11 +703,11 @@ CONFIG_I82365=m
 CONFIG_TCIC=m
 CONFIG_PCMCIA_PROBE=y
 CONFIG_PCCARD_NONSTATIC=y
-CONFIG_HOTPLUG_PCI=m
+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=m
+CONFIG_HOTPLUG_PCI_ACPI=y
 CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 CONFIG_HOTPLUG_PCI_CPCI=y
 CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
@@ -703,11 +719,15 @@ 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_RAPIDIO_TSI500=y
 
 #
 # Executable file formats / Emulations
@@ -715,6 +735,7 @@ CONFIG_RAPIDIO_TSI500=y
 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
@@ -750,6 +771,7 @@ 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
@@ -768,8 +790,8 @@ 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=y
-CONFIG_INET_TCP_DIAG=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
@@ -1099,7 +1121,6 @@ CONFIG_IP_DCCP_TFRC_LIB=y
 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
@@ -1146,7 +1167,6 @@ CONFIG_COPS_DAYNA=y
 CONFIG_COPS_TANGENT=y
 CONFIG_IPDDP=m
 CONFIG_IPDDP_ENCAP=y
-CONFIG_IPDDP_DECAP=y
 # CONFIG_X25 is not set
 # CONFIG_LAPB is not set
 CONFIG_PHONET=m
@@ -1215,15 +1235,22 @@ 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_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
@@ -1396,17 +1423,21 @@ CONFIG_CEPH_LIB=m
 # 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
-# CONFIG_NFC_LLCP 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
@@ -1423,7 +1454,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_FW_LOADER_USER_HELPER is not set
+CONFIG_FW_LOADER_USER_HELPER=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 CONFIG_SYS_HYPERVISOR=y
@@ -1453,7 +1484,6 @@ CONFIG_MTD_AR7_PARTS=m
 #
 # User Modules And Translation Layers
 #
-CONFIG_MTD_CHAR=m
 CONFIG_MTD_BLKDEVS=m
 CONFIG_MTD_BLOCK=m
 CONFIG_MTD_BLOCK_RO=m
@@ -1535,9 +1565,6 @@ CONFIG_MTD_BLOCK2MTD=m
 #
 # Disk-On-Chip Device Drivers
 #
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
 CONFIG_MTD_DOCG3=m
 CONFIG_BCH_CONST_M=14
 CONFIG_BCH_CONST_T=4
@@ -1546,7 +1573,6 @@ CONFIG_MTD_NAND_ECC_SMC=y
 CONFIG_MTD_NAND=m
 # CONFIG_MTD_NAND_ECC_BCH is not set
 CONFIG_MTD_SM_COMMON=m
-# CONFIG_MTD_NAND_MUSEUM_IDS is not set
 # CONFIG_MTD_NAND_DENALI is not set
 CONFIG_MTD_NAND_IDS=m
 CONFIG_MTD_NAND_RICOH=m
@@ -1582,7 +1608,6 @@ CONFIG_PROC_DEVICETREE=y
 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
@@ -1592,8 +1617,8 @@ CONFIG_OF_MTD=y
 CONFIG_PARPORT=m
 CONFIG_PARPORT_PC=m
 CONFIG_PARPORT_SERIAL=m
-CONFIG_PARPORT_PC_FIFO=y
-CONFIG_PARPORT_PC_SUPERIO=y
+# 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
@@ -1649,9 +1674,9 @@ 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
@@ -1679,6 +1704,7 @@ CONFIG_BMP085_I2C=m
 # 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
 
@@ -1706,7 +1732,7 @@ CONFIG_SENSORS_LIS3_I2C=m
 #
 CONFIG_ALTERA_STAPL=m
 CONFIG_INTEL_MEI=m
-CONFIG_INTEL_MEI_ME=y
+CONFIG_INTEL_MEI_ME=m
 CONFIG_VMWARE_VMCI=m
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
@@ -1804,6 +1830,7 @@ 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
@@ -1915,6 +1942,7 @@ 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
@@ -1994,6 +2022,10 @@ 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
@@ -2017,6 +2049,7 @@ 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
@@ -2053,16 +2086,17 @@ 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_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
@@ -2079,6 +2113,7 @@ 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
@@ -2119,6 +2154,11 @@ 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
@@ -2148,11 +2188,14 @@ 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
@@ -2235,6 +2278,7 @@ 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
@@ -2267,6 +2311,7 @@ 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
@@ -2278,6 +2323,7 @@ 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
@@ -2294,6 +2340,8 @@ 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
@@ -2301,8 +2349,6 @@ CONFIG_STMMAC_ETH=m
 CONFIG_STMMAC_PCI=y
 # CONFIG_STMMAC_DEBUG_FS is not set
 # CONFIG_STMMAC_DA is not set
-CONFIG_STMMAC_RING=y
-# CONFIG_STMMAC_CHAINED is not set
 CONFIG_NET_VENDOR_SUN=y
 CONFIG_HAPPYMEAL=m
 CONFIG_SUNGEM=m
@@ -2349,7 +2395,8 @@ CONFIG_NATIONAL_PHY=m
 CONFIG_STE10XP=m
 CONFIG_LSI_ET1011C_PHY=m
 CONFIG_MICREL_PHY=m
-# CONFIG_MDIO_BITBANG is not set
+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
@@ -2380,6 +2427,7 @@ 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
@@ -2447,7 +2495,7 @@ CONFIG_ATH9K=m
 CONFIG_ATH9K_PCI=y
 CONFIG_ATH9K_AHB=y
 # CONFIG_ATH9K_DEBUGFS is not set
-CONFIG_ATH9K_RATE_CONTROL=y
+# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set
 CONFIG_ATH9K_HTC=m
 # CONFIG_ATH9K_HTC_DEBUGFS is not set
 CONFIG_CARL9170=m
@@ -2458,12 +2506,18 @@ 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_BCMA_EXTRA is not set
 CONFIG_B43_SSB=y
 CONFIG_B43_PCI_AUTOSELECT=y
 CONFIG_B43_PCICORE_AUTOSELECT=y
@@ -2492,7 +2546,6 @@ CONFIG_BRCMUTIL=m
 CONFIG_BRCMSMAC=m
 CONFIG_BRCMFMAC=m
 CONFIG_BRCMFMAC_SDIO=y
-# CONFIG_BRCMFMAC_SDIO_OOB is not set
 CONFIG_BRCMFMAC_USB=y
 # CONFIG_BRCM_TRACING is not set
 # CONFIG_BRCMDBG is not set
@@ -2502,20 +2555,12 @@ CONFIG_HOSTAP_FIRMWARE=y
 CONFIG_HOSTAP_PLX=m
 CONFIG_HOSTAP_PCI=m
 CONFIG_HOSTAP_CS=m
-CONFIG_IPW2100=m
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2100_DEBUG is not set
-CONFIG_IPW2200=m
-CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW2200_RADIOTAP=y
-CONFIG_IPW2200_PROMISCUOUS=y
-CONFIG_IPW2200_QOS=y
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_LIBIPW=m
-# CONFIG_LIBIPW_DEBUG is not set
+# 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
@@ -2568,6 +2613,7 @@ 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
@@ -2578,13 +2624,17 @@ 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_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
@@ -2602,6 +2652,9 @@ 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
@@ -2886,6 +2939,9 @@ 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
@@ -2965,11 +3021,12 @@ 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_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_XEN_KBDDEV_FRONTEND=m
@@ -2988,6 +3045,8 @@ 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
@@ -3023,7 +3082,6 @@ CONFIG_N_GSM=m
 CONFIG_TRACE_ROUTER=m
 CONFIG_TRACE_SINK=m
 # CONFIG_DEVKMEM is not set
-# CONFIG_STALDRV is not set
 
 #
 # Serial drivers
@@ -3064,6 +3122,7 @@ 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_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
 CONFIG_PPDEV=m
@@ -3162,7 +3221,6 @@ 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
@@ -3201,6 +3259,7 @@ 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_SPI is not set
 # CONFIG_SPI_OC_TINY is not set
 # CONFIG_SPI_PXA2XX is not set
 # CONFIG_SPI_PXA2XX_PCI is not set
@@ -3259,6 +3318,7 @@ 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:
@@ -3346,6 +3406,8 @@ 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
@@ -3365,6 +3427,7 @@ 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
@@ -3392,6 +3455,7 @@ 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
@@ -3404,7 +3468,7 @@ CONFIG_SENSORS_MAX6642=m
 CONFIG_SENSORS_MAX6650=m
 CONFIG_SENSORS_MAX6697=m
 CONFIG_SENSORS_MCP3021=m
-CONFIG_SENSORS_NTC_THERMISTOR=m
+CONFIG_SENSORS_NCT6775=m
 CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PC87427=m
 CONFIG_SENSORS_PCF8591=m
@@ -3472,10 +3536,15 @@ CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 # 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_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
@@ -3523,6 +3592,7 @@ 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
 
 #
@@ -3578,47 +3648,52 @@ CONFIG_BCMA_DRIVER_GPIO=y
 # 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_MFD_RTSX_PCI=m
+CONFIG_ABX500_CORE=y
+# CONFIG_MFD_STMPE is not set
+# CONFIG_MFD_SYSCON is not set
 CONFIG_MFD_TI_AM335X_TSCADC=m
-CONFIG_HTC_PASIC3=m
-CONFIG_UCB1400_CORE=m
-CONFIG_MFD_LM3533=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_STMPE 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_DA9052_SPI 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_MFD_PCF50633=m
-CONFIG_PCF50633_ADC=m
-CONFIG_PCF50633_GPIO=m
-CONFIG_MFD_MC13783=m
-CONFIG_MFD_MC13XXX=m
-# CONFIG_MFD_MC13XXX_SPI is not set
-CONFIG_MFD_MC13XXX_I2C=m
-CONFIG_ABX500_CORE=y
-# CONFIG_EZX_PCAP is not set
-CONFIG_MFD_CS5535=m
-# CONFIG_MFD_TIMBERDALE is not set
-CONFIG_LPC_SCH=m
-CONFIG_LPC_ICH=m
-CONFIG_MFD_RDC321X=m
-# CONFIG_MFD_JANZ_CMODIO is not set
-CONFIG_MFD_VX855=m
-CONFIG_MFD_WL1273_CORE=m
-# CONFIG_MFD_SYSCON is not set
-CONFIG_MFD_VIPERBOARD=m
-CONFIG_MFD_RETU=m
 # CONFIG_REGULATOR is not set
 CONFIG_MEDIA_SUPPORT=m
 
@@ -3646,6 +3721,7 @@ 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
@@ -3746,6 +3822,7 @@ CONFIG_USB_ZR364XX=m
 CONFIG_USB_STKWEBCAM=m
 CONFIG_USB_S2255=m
 CONFIG_USB_SN9C102=m
+CONFIG_VIDEO_USBTV=m
 
 #
 # Analog TV USB devices
@@ -3804,7 +3881,6 @@ CONFIG_DVB_USB_FRIIO=m
 CONFIG_DVB_USB_AZ6027=m
 CONFIG_DVB_USB_TECHNISAT_USB2=m
 CONFIG_DVB_USB_V2=m
-CONFIG_DVB_USB_CYPRESS_FIRMWARE=m
 CONFIG_DVB_USB_AF9015=m
 CONFIG_DVB_USB_AF9035=m
 CONFIG_DVB_USB_ANYSEE=m
@@ -3950,16 +4026,19 @@ CONFIG_MEDIA_COMMON_OPTIONS=y
 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
 
 #
@@ -3973,9 +4052,11 @@ 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
@@ -3992,6 +4073,9 @@ 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
 
 #
@@ -4011,6 +4095,7 @@ CONFIG_VIDEO_ADV7175=m
 #
 # Camera sensor devices
 #
+CONFIG_VIDEO_OV7640=m
 CONFIG_VIDEO_MT9V011=m
 
 #
@@ -4031,7 +4116,6 @@ CONFIG_VIDEO_M52790=m
 #
 # Sensors used on soc_camera driver
 #
-CONFIG_MEDIA_ATTACH=y
 CONFIG_MEDIA_TUNER=m
 CONFIG_MEDIA_TUNER_SIMPLE=m
 CONFIG_MEDIA_TUNER_TDA8290=m
@@ -4061,6 +4145,8 @@ 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
@@ -4225,7 +4311,6 @@ CONFIG_DRM_RADEON=m
 # CONFIG_DRM_RADEON_UMS is not set
 CONFIG_DRM_NOUVEAU=m
 CONFIG_NOUVEAU_DEBUG=5
-CONFIG_NOUVEAU_DEBUG=5
 CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_I915=m
@@ -4243,10 +4328,9 @@ 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_OF_DISPLAY_TIMING is not set
-# CONFIG_OF_VIDEOMODE is not set
 CONFIG_HDMI=y
 CONFIG_FB=y
 CONFIG_FIRMWARE_EDID=y
@@ -4261,7 +4345,6 @@ CONFIG_FB_SYS_COPYAREA=m
 CONFIG_FB_SYS_IMAGEBLIT=m
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 CONFIG_FB_SYS_FOPS=m
-# CONFIG_FB_WMT_GE_ROPS is not set
 CONFIG_FB_DEFERRED_IO=y
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
@@ -4306,7 +4389,7 @@ CONFIG_FB_VIA_X_COMPATIBILITY=y
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_3DFX is not set
 CONFIG_FB_VOODOO1=m
-# CONFIG_FB_VT8623 is not set
+CONFIG_FB_VT8623=m
 # CONFIG_FB_TRIDENT is not set
 # CONFIG_FB_ARK is not set
 # CONFIG_FB_PM3 is not set
@@ -4323,12 +4406,15 @@ CONFIG_XEN_FBDEV_FRONTEND=m
 # 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
@@ -4341,7 +4427,7 @@ CONFIG_LCD_PLATFORM=m
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_GENERIC is not set
 CONFIG_BACKLIGHT_LM3533=m
-CONFIG_BACKLIGHT_PWM=m
+# CONFIG_BACKLIGHT_PWM is not set
 CONFIG_BACKLIGHT_APPLE=m
 # CONFIG_BACKLIGHT_SAHARA is not set
 # CONFIG_BACKLIGHT_ADP8860 is not set
@@ -4363,18 +4449,6 @@ 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
@@ -4396,6 +4470,7 @@ 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
@@ -4527,6 +4602,7 @@ 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
@@ -4571,6 +4647,7 @@ 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
@@ -4598,6 +4675,7 @@ 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
@@ -4608,9 +4686,11 @@ 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
@@ -4643,7 +4723,6 @@ 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
@@ -4663,7 +4742,6 @@ 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
@@ -4680,9 +4758,6 @@ 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
@@ -4693,10 +4768,9 @@ CONFIG_USB=m
 #
 # Miscellaneous USB options
 #
+CONFIG_USB_DEFAULT_PERSIST=y
 CONFIG_USB_DYNAMIC_MINORS=y
-CONFIG_USB_SUSPEND=y
 # CONFIG_USB_OTG is not set
-# CONFIG_USB_DWC3 is not set
 CONFIG_USB_MON=m
 CONFIG_USB_WUSB=m
 CONFIG_USB_WUSB_CBAF=m
@@ -4712,14 +4786,16 @@ 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_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_EHCI_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
@@ -4735,12 +4811,14 @@ 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_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_UX500_DMA is not set
 CONFIG_MUSB_PIO_ONLY=y
-CONFIG_USB_CHIPIDEA=m
-CONFIG_USB_CHIPIDEA_UDC=y
-CONFIG_USB_CHIPIDEA_HOST=y
-# CONFIG_USB_CHIPIDEA_DEBUG is not set
 CONFIG_USB_RENESAS_USBHS=m
 
 #
@@ -4780,6 +4858,10 @@ CONFIG_USB_STORAGE_ENE_UB6250=m
 #
 CONFIG_USB_MDC800=m
 CONFIG_USB_MICROTEK=m
+# CONFIG_USB_DWC3 is not set
+CONFIG_USB_CHIPIDEA=m
+CONFIG_USB_CHIPIDEA_UDC=y
+# CONFIG_USB_CHIPIDEA_DEBUG is not set
 
 #
 # USB port drivers
@@ -4851,9 +4933,12 @@ 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_FLASHLOADER=m
+CONFIG_USB_SERIAL_SUUNTO=m
 # CONFIG_USB_SERIAL_DEBUG is not set
 
 #
@@ -4882,19 +4967,21 @@ CONFIG_USB_ISIGHTFW=m
 CONFIG_USB_YUREX=m
 CONFIG_USB_EZUSB_FX2=m
 CONFIG_USB_HSIC_USB3503=m
-
-#
-# USB Physical Layer drivers
-#
-# CONFIG_OMAP_USB3 is not set
-# CONFIG_OMAP_CONTROL_USB is not set
-CONFIG_USB_ISP1301=m
-CONFIG_USB_RCAR_PHY=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
@@ -4906,10 +4993,12 @@ 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_GADGET_MUSB_HDRC=m
+CONFIG_USB_MV_U3D=m
 CONFIG_USB_M66592=m
 CONFIG_USB_AMD5536UDC=m
 CONFIG_USB_NET2272=m
@@ -4921,6 +5010,15 @@ 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
@@ -4936,7 +5034,6 @@ CONFIG_USB_FUNCTIONFS_GENERIC=y
 CONFIG_USB_MASS_STORAGE=m
 CONFIG_USB_GADGET_TARGET=m
 CONFIG_USB_G_SERIAL=m
-CONFIG_USB_G_SERIAL=m
 CONFIG_USB_MIDI_GADGET=m
 CONFIG_USB_G_PRINTER=m
 # CONFIG_USB_CDC_COMPOSITE is not set
@@ -4948,13 +5045,6 @@ CONFIG_USB_G_DBGP=m
 # CONFIG_USB_G_DBGP_PRINTK is not set
 CONFIG_USB_G_DBGP_SERIAL=y
 CONFIG_USB_G_WEBCAM=m
-
-#
-# OTG and related infrastructure
-#
-CONFIG_USB_OTG_UTILS=y
-# CONFIG_USB_GPIO_VBUS is not set
-CONFIG_NOP_USB_XCEIV=m
 CONFIG_UWB=m
 CONFIG_UWB_HWA=m
 CONFIG_UWB_WHCI=m
@@ -5021,6 +5111,7 @@ 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
@@ -5035,11 +5126,11 @@ CONFIG_LEDS_TCA6507=m
 CONFIG_LEDS_LM355x=m
 CONFIG_LEDS_OT200=m
 CONFIG_LEDS_BLINKM=m
-CONFIG_LEDS_TRIGGERS=y
 
 #
 # LED Triggers
 #
+CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=m
 CONFIG_LEDS_TRIGGER_ONESHOT=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
@@ -5052,6 +5143,7 @@ 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
@@ -5104,6 +5196,7 @@ 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
@@ -5168,11 +5261,13 @@ CONFIG_DMADEVICES=y
 #
 CONFIG_INTEL_MID_DMAC=m
 CONFIG_INTEL_IOATDMA=m
+CONFIG_DW_DMAC_CORE=m
 CONFIG_DW_DMAC=m
-# CONFIG_DW_DMAC_BIG_ENDIAN_IO is not set
+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
 
 #
@@ -5201,6 +5296,7 @@ CONFIG_VFIO_IOMMU_TYPE1=m
 CONFIG_VFIO=m
 CONFIG_VFIO_PCI=m
 CONFIG_VFIO_PCI_VGA=y
+CONFIG_VIRT_DRIVERS=y
 CONFIG_VIRTIO=y
 
 #
@@ -5234,7 +5330,7 @@ CONFIG_XEN_XENBUS_FRONTEND=y
 CONFIG_XEN_GNTDEV=m
 CONFIG_XEN_GRANT_DEV_ALLOC=m
 CONFIG_SWIOTLB_XEN=y
-CONFIG_XEN_TMEM=y
+CONFIG_XEN_TMEM=m
 CONFIG_XEN_PCIDEV_BACKEND=m
 CONFIG_XEN_PRIVCMD=m
 CONFIG_XEN_ACPI_PROCESSOR=m
@@ -5262,17 +5358,14 @@ 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
@@ -5301,12 +5394,14 @@ 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
@@ -5328,6 +5423,7 @@ 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
@@ -5356,11 +5452,10 @@ CONFIG_COMEDI_NI_6527=m
 CONFIG_COMEDI_NI_65XX=m
 CONFIG_COMEDI_NI_660X=m
 CONFIG_COMEDI_NI_670X=m
-CONFIG_COMEDI_NI_LABPC=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
@@ -5383,8 +5478,8 @@ CONFIG_COMEDI_8255=m
 CONFIG_COMEDI_FC=m
 CONFIG_COMEDI_AMPLC_DIO200=m
 CONFIG_COMEDI_AMPLC_PC236=m
-CONFIG_COMEDI_AMPLC_PC263=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
@@ -5407,9 +5502,9 @@ 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_ZSMALLOC=y
 CONFIG_WLAGS49_H2=m
 CONFIG_WLAGS49_H25=m
 CONFIG_FB_SM7XX=m
@@ -5451,14 +5546,8 @@ 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_VIDEO_GO7007_OV7640=m
-CONFIG_VIDEO_GO7007_SAA7113=m
-CONFIG_VIDEO_GO7007_SAA7115=m
-CONFIG_VIDEO_GO7007_TW9903=m
-CONFIG_VIDEO_GO7007_UDA1342=m
-CONFIG_VIDEO_GO7007_SONY_TUNER=m
-CONFIG_VIDEO_GO7007_TW2804=m
 CONFIG_SOLO6X10=m
 CONFIG_LIRC_STAGING=y
 CONFIG_LIRC_BT829=m
@@ -5483,14 +5572,16 @@ 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=y
+CONFIG_ZCACHE=m
+# CONFIG_ZCACHE_DEBUG is not set
+# CONFIG_USB_DWC2 is not set
+CONFIG_USB_BTMTK=m
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
@@ -5540,6 +5631,9 @@ 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
@@ -5566,7 +5660,6 @@ CONFIG_STE_MODEM_RPROC=m
 #
 # Rpmsg drivers
 #
-CONFIG_VIRT_DRIVERS=y
 # CONFIG_PM_DEVFREQ is not set
 CONFIG_EXTCON=m
 
@@ -5578,10 +5671,18 @@ CONFIG_MEMORY=y
 # CONFIG_IIO 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
@@ -5589,9 +5690,6 @@ CONFIG_SERIAL_IPOCTAL=m
 CONFIG_EDD=m
 # CONFIG_EDD_OFF is not set
 CONFIG_FIRMWARE_MEMMAP=y
-CONFIG_EFI_VARS=y
-CONFIG_EFI_VARS_PSTORE=y
-# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
 CONFIG_DELL_RBU=m
 CONFIG_DCDBAS=m
 CONFIG_DMIID=y
@@ -5601,6 +5699,11 @@ 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
@@ -5629,6 +5732,7 @@ 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
@@ -5641,6 +5745,8 @@ CONFIG_OCFS2_FS_STATS=y
 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
@@ -5767,6 +5873,8 @@ 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
@@ -5776,10 +5884,12 @@ 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
@@ -5789,6 +5899,7 @@ 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
@@ -5829,6 +5940,7 @@ 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
@@ -5887,68 +5999,95 @@ CONFIG_DLM=m
 # 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_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_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_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_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_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_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_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
@@ -5960,16 +6099,12 @@ 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_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_DEBUG_PAGEALLOC 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
@@ -5998,6 +6133,7 @@ CONFIG_FUNCTION_GRAPH_TRACER=y
 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
@@ -6014,30 +6150,38 @@ CONFIG_FTRACE_MCOUNT_RECORD=y
 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_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_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
@@ -6053,8 +6197,8 @@ 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_STRICT_USER_COPY_CHECKS is not set
 # CONFIG_DEBUG_NMI_SELFTEST is not set
+# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set
 
 #
 # Security options
@@ -6076,14 +6220,16 @@ CONFIG_SECURITY_TOMOYO=y
 CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
 CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
 # CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
-CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init"
+CONFIG_SECURITY_TOMOYO_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 is not set
+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
@@ -6092,8 +6238,6 @@ CONFIG_ASYNC_MEMCPY=m
 CONFIG_ASYNC_XOR=m
 CONFIG_ASYNC_PQ=m
 CONFIG_ASYNC_RAID6_RECOV=m
-CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y
-CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y
 CONFIG_CRYPTO=y
 
 #
@@ -6146,6 +6290,7 @@ CONFIG_CRYPTO_XTS=m
 #
 # Hash modes
 #
+CONFIG_CRYPTO_CMAC=m
 CONFIG_CRYPTO_HMAC=m
 CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_VMAC=m
@@ -6204,6 +6349,8 @@ CONFIG_CRYPTO_TWOFISH_586=m
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_ZLIB=m
 CONFIG_CRYPTO_LZO=y
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
 
 #
 # Random Number Generation
@@ -6225,6 +6372,7 @@ 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
@@ -6236,8 +6384,7 @@ CONFIG_KVM=m
 CONFIG_KVM_INTEL=m
 CONFIG_KVM_AMD=m
 CONFIG_KVM_MMU_AUDIT=y
-CONFIG_VHOST_NET=m
-CONFIG_TCM_VHOST=m
+CONFIG_KVM_DEVICE_ASSIGNMENT=y
 CONFIG_LGUEST=m
 CONFIG_BINARY_PRINTF=y
 
@@ -6248,6 +6395,7 @@ 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
@@ -6271,6 +6419,9 @@ CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 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
@@ -6285,6 +6436,7 @@ 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
@@ -6313,3 +6465,16 @@ 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
new file mode 100644
index 000000000..2124427e9
--- /dev/null
+++ b/kernels/linux-libre-xen/criu-no-expert.patch
@@ -0,0 +1,22 @@
+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
index 2bde797ef..0683dce3d 100644
--- a/kernels/linux-libre-xen/linux-libre-xen.install
+++ b/kernels/linux-libre-xen/linux-libre-xen.install
@@ -2,10 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-xen
-KERNEL_VERSION=3.9.4-1-LIBRE-XEN
-
-# set a sane PATH to ensure that critical utils like depmod will be found
-export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
+KERNEL_VERSION=
 
 post_install () {
   # updating module dependencies
@@ -15,40 +12,9 @@ post_install () {
     echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
     mkinitcpio -p linux-libre${KERNEL_NAME}
   fi
-
-  # compat symlinks for the official kernels only
-  if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-xen" ]; then
-    loaders="$(find /boot -name syslinux.cfg -or -name extlinux.conf -or -name grub.cfg -or -name menu.lst)"
-    [ -f /etc/lilo.conf ] && loaders="$loaders /etc/lilo.conf"
-    if [ -n "${loaders}" ] && grep -q -e vmlinuz26 -e kernel26.img -e kernel26-fallback.img $loaders; then
-      # add compat symlinks for the initramfs images
-      ln -sf initramfs-linux-libre${KERNEL_NAME}.img boot/kernel26${KERNEL_NAME}.img
-      ln -sf initramfs-linux-libre${KERNEL_NAME}-fallback.img \
-        boot/kernel26${KERNEL_NAME}-fallback.img
-      ln -sf vmlinuz-linux-libre${KERNEL_NAME} /boot/vmlinuz26${KERNEL_NAME}
-    fi
-  fi
 }
 
 post_upgrade() {
-  pacman -Q grub &>/dev/null
-  hasgrub=$?
-  pacman -Q grub-common &>/dev/null
-  hasgrub2=$?
-  pacman -Q lilo &>/dev/null
-  haslilo=$?
-  # reminder notices
-  if [ $haslilo -eq 0 ]; then
-    echo ">>>"
-    if [ $hasgrub -eq 0 -o $hasgrub2 -eq 0 ]; then
-      echo ">>> If you use the LILO bootloader, you should run 'lilo' before rebooting."
-    else
-      echo ">>> You appear to be using the LILO bootloader. You should run"
-      echo ">>> 'lilo' before rebooting."
-    fi
-    echo ">>>"
-  fi
-
   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
@@ -64,6 +30,6 @@ post_upgrade() {
 
 post_remove() {
   # also remove the compat symlinks
-  rm -f boot/{initramfs-linux-libre,kernel26}${KERNEL_NAME}.img
-  rm -f boot/{initramfs-linux-libre,kernel26}${KERNEL_NAME}-fallback.img
+  rm -f boot/initramfs-linux-libre${KERNEL_NAME}.img
+  rm -f boot/initramfs-linux-libre${KERNEL_NAME}-fallback.img
 }
diff --git a/libre-testing/ath9k-htc-firmware-git/LICENSE b/libre-testing/ath9k-htc-firmware-git/LICENSE
new file mode 100644
index 000000000..7668bcb97
--- /dev/null
+++ b/libre-testing/ath9k-htc-firmware-git/LICENSE
@@ -0,0 +1,33 @@
+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
new file mode 100644
index 000000000..d04643491
--- /dev/null
+++ b/libre-testing/ath9k-htc-firmware-git/PKGBUILD
@@ -0,0 +1,81 @@
+# Maintainer: André Silva <emulatorman@lavabit.com>
+# 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/linux-libre-firmware/PKGBUILD b/libre-testing/linux-libre-firmware/PKGBUILD
new file mode 100644
index 000000000..23ab691aa
--- /dev/null
+++ b/libre-testing/linux-libre-firmware/PKGBUILD
@@ -0,0 +1,59 @@
+# Maintainer: André Silva <emulatorman@lavabit.com>
+# Contributor: Márcio Silva <coadde@lavabit.com>
+
+pkgname=linux-libre-firmware
+pkgver=3.11
+pkgrel=1
+pkgdesc='Free firmware files for Linux-libre'
+arch=('any')
+url=('http://linux-libre.fsfla.org/')
+license=('GPL2')
+depends=('ath9k-htc-firmware')
+provides=('linux-firmware'
+          'kernel26-firmware=2.6.34.99')
+conflicts=('linux-firmware'
+           'linux-firmware-git'
+           'kernel26-firmware'
+           'ar9170-fw'
+           'iwlwifi-1000-ucode'
+           'iwlwifi-3945-ucode'
+           'iwlwifi-4965-ucode'
+           'iwlwifi-5000-ucode'
+           'iwlwifi-5150-ucode'
+           'iwlwifi-6000-ucode'
+           'rt2870usb-fw'
+           'rt2x00-rt61-fw'
+           'rt2x00-rt71w-fw')
+replaces=('linux-firmware'
+          'kernel26-firmware'
+          'ar9170-fw'
+          'iwlwifi-1000-ucode'
+          'iwlwifi-3945-ucode'
+          'iwlwifi-4965-ucode'
+          'iwlwifi-5000-ucode'
+          'iwlwifi-5150-ucode'
+          'iwlwifi-6000-ucode'
+          'rt2870usb-fw'
+          'rt2x00-rt61-fw'
+          'rt2x00-rt71w-fw')
+source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$pkgver-gnu/linux-libre-$pkgver-gnu.tar.xz")
+md5sums=('7ec84223c7adcf01a5287eb7af96b7e7')
+
+package() {
+
+  # create firmware folder to put the free firmware files there
+  install -d -m755 $pkgdir/usr/lib/firmware
+
+  cd $srcdir/linux-$pkgver
+
+  # compile free firmware files  
+  make INSTALL_FW_PATH=$pkgdir/usr/lib/firmware firmware_install
+
+  # create licenses folder to put the licenses files there
+  install -d -m755 $pkgdir/usr/share/licenses/$pkgname
+
+  # move WHENCE file to linux-firmware license folder
+  cd $srcdir/linux-$pkgver
+  install -m644 firmware/WHENCE $pkgdir/usr/share/licenses/$pkgname
+
+}
diff --git a/libre-testing/syslinux/PKGBUILD b/libre-testing/syslinux/PKGBUILD
new file mode 100644
index 000000000..8a8845f0b
--- /dev/null
+++ b/libre-testing/syslinux/PKGBUILD
@@ -0,0 +1,169 @@
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+# Maintainer: Thomas Bächler <thomas@archlinux.org>
+# Contributor: Keshav Padram (the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+pkgname="syslinux"
+pkgver="6.01"
+pkgrel="4.1"
+arch=('x86_64' 'i686')
+pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE (Parabola rebranded)"
+url="http://syslinux.zytor.com/"
+license=('GPL2')
+options=('!makeflags' '!emptydirs')
+backup=('boot/syslinux/syslinux.cfg'
+        'boot/syslinux/splash.png')
+makedepends=('python2' 'nasm' 'gnu-efi-libs')
+depends=('perl' 'glibc')
+optdepends=('perl-passwd-md5:  For md5pass'
+            'perl-digest-sha1: For sha1pass'
+            'mtools:           For mkdiskimage and syslinux support'
+            'gptfdisk:         For GPT support'
+            'util-linux:       For isohybrid'
+            'efibootmgr:       For EFI support'
+            'dosfstools:       For EFI support')
+md5sums=('5fe8959b92255143a334167ca1c395a6'
+         'f048880b57e2c5a7017ff8804bfda327'
+         '0e7d47e1f791f0c5e7bd40ed5c6d80cc'
+         'cb46ca47c6b6323127d908440057d98f')
+
+install="${pkgname}.install"
+
+source=("https://www.kernel.org/pub/linux/utils/boot/syslinux/${pkgname}-${pkgver}.tar.xz"
+        'syslinux.cfg'
+        'syslinux-install_update'
+        'splash.png')
+
+_build_syslinux_bios() {
+    
+    rm -rf "${srcdir}/${pkgname}-${pkgver}-bios/" || true
+    cp -r "${srcdir}/${pkgname}-${pkgver}" "${srcdir}/${pkgname}-${pkgver}-bios"
+    cd "${srcdir}/${pkgname}-${pkgver}-bios/"
+    
+    ## Do not try to build syslinux with our default LDFLAGS, it will fail
+    unset LDFLAGS
+    
+    make PYTHON="python2" bios
+    make PYTHON="python2" bios installer
+    
+}
+
+_build_syslinux_efi64() {
+    
+    rm -rf "${srcdir}/${pkgname}-${pkgver}-efi64/" || true
+    cp -r "${srcdir}/${pkgname}-${pkgver}" "${srcdir}/${pkgname}-${pkgver}-efi64"
+    cd "${srcdir}/${pkgname}-${pkgver}-efi64/"
+    
+    ## Unset all compiler FLAGS for efi64 build
+    unset CFLAGS
+    unset CPPFLAGS
+    unset CXXFLAGS
+    unset LDFLAGS
+    unset MAKEFLAGS
+    
+    make PYTHON="python2" efi64
+    make PYTHON="python2" efi64 installer
+    
+}
+
+_build_syslinux_efi32() {
+    
+    rm -rf "${srcdir}/${pkgname}-${pkgver}-efi32/" || true
+    cp -r "${srcdir}/${pkgname}-${pkgver}" "${srcdir}/${pkgname}-${pkgver}-efi32"
+    cd "${srcdir}/${pkgname}-${pkgver}-efi32/"
+    
+    ## Unset all compiler FLAGS for efi32 build
+    unset CFLAGS
+    unset CPPFLAGS
+    unset CXXFLAGS
+    unset LDFLAGS
+    unset MAKEFLAGS
+    
+    make PYTHON="python2" efi32
+    make PYTHON="python2" efi32 installer
+    
+}
+
+build() {
+    
+    cd "${srcdir}/${pkgname}-${pkgver}/"
+    
+    ## Do not try to build the Windows or DOS installers and DIAG files
+    sed 's|diag libinstaller dos win32 win64 dosutil txt|libinstaller txt|g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true
+    sed 's|win32/syslinux.exe win64/syslinux64.exe||g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true
+    sed 's|dosutil/*.com dosutil/*.sys||g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true
+    sed 's|dos/syslinux.com||g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true
+    sed 's|INSTALLSUBDIRS = com32 utils dosutil|INSTALLSUBDIRS = com32 utils|g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true
+    sed 's|install -m 644 -c $(INSTALL_DIAG) $(INSTALLROOT)$(DIAGDIR)|# install -m 644 -c $(INSTALL_DIAG) $(INSTALLROOT)$(DIAGDIR)|g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true
+    
+    ## Fix FHS manpage path
+    sed 's|/usr/man|/usr/share/man|g' -i "${srcdir}/${pkgname}-${pkgver}/mk/syslinux.mk" || true
+    
+    ## Build syslinux-efi
+    if [[ "${CARCH}" == "x86_64" ]]; then
+        _build_syslinux_efi64
+    fi
+    
+    if [[ "${CARCH}" == "i686" ]]; then
+        _build_syslinux_efi32
+    fi
+    
+    ## Build syslinux-bios
+    _build_syslinux_bios
+    
+}
+
+_package_syslinux_bios() {
+    
+    cd "${srcdir}/${pkgname}-${pkgver}-bios/"
+    
+    ## Install Syslinux bios
+    make INSTALLROOT="${pkgdir}/" AUXDIR="/usr/lib/syslinux/bios/" bios install
+    
+    ## Remove syslinux.exe,syslinux64.exe,syslinux.com and dosutil dir
+    rm "${pkgdir}/usr/lib/syslinux/bios"/syslinux.{com,exe} || true
+    rm "${pkgdir}/usr/lib/syslinux/bios/syslinux64.exe" || true
+    rm -rf "${pkgdir}/usr/lib/syslinux/bios/dosutil/" || true
+    
+    ## Remove com32 and diag dirs
+    rm -rf "${pkgdir}/usr/lib/syslinux/bios/diag/" || true
+    rm -rf "${pkgdir}/usr/lib/syslinux/bios/com32/" || true
+    
+    ## Move extlinux binary to /usr/bin
+    install -d "${pkgdir}/usr/bin"
+    mv "${pkgdir}/sbin/extlinux" "${pkgdir}/usr/bin/extlinux"
+    rm -rf "${pkgdir}/sbin/"
+    
+    ## Install docs
+    install -d "${pkgdir}/usr/share/doc"
+    cp -ar "${srcdir}/${pkgname}-${pkgver}/doc" "${pkgdir}/usr/share/doc/syslinux"
+    
+    ## Install the default configuration
+    install -D -m0644 "${srcdir}/syslinux.cfg" "${pkgdir}/boot/syslinux/syslinux.cfg"
+    
+    ## Install the installation and update script
+    ## This script is maintained at git://gist.github.com/772138.git
+    ## Script not yet updated for syslinux-efi
+    install -D -m0755 "${srcdir}/syslinux-install_update" "${pkgdir}/usr/bin/syslinux-install_update"
+    
+    # Install Parabola splash
+    install -D -m644 "${srcdir}/splash.png" "${pkgdir}/boot/syslinux/splash.png"
+}
+
+package() {
+    
+    cd "${srcdir}/${pkgname}-${pkgver}/"
+    
+    if [[ "${CARCH}" == "x86_64" ]]; then
+        cd "${srcdir}/${pkgname}-${pkgver}-efi64/"
+        make INSTALLROOT="${pkgdir}/" AUXDIR="/usr/lib/syslinux/" efi64 install
+    fi
+    
+    if [[ "${CARCH}" == "i686" ]]; then
+        cd "${srcdir}/${pkgname}-${pkgver}-efi32/"
+        make INSTALLROOT="${pkgdir}/" AUXDIR="/usr/lib/syslinux/" efi32 install
+    fi
+    
+    _package_syslinux_bios
+    
+}
diff --git a/libre-testing/syslinux/splash.png b/libre-testing/syslinux/splash.png
new file mode 100644
index 000000000..eac14536b
--- /dev/null
+++ b/libre-testing/syslinux/splash.png
diff --git a/libre-testing/syslinux/splash.xcf b/libre-testing/syslinux/splash.xcf
new file mode 100644
index 000000000..c27d04445
--- /dev/null
+++ b/libre-testing/syslinux/splash.xcf
diff --git a/libre-testing/syslinux/syslinux-6.00-efi-export-kbdmap.patch b/libre-testing/syslinux/syslinux-6.00-efi-export-kbdmap.patch
new file mode 100644
index 000000000..cbcd9a6da
--- /dev/null
+++ b/libre-testing/syslinux/syslinux-6.00-efi-export-kbdmap.patch
@@ -0,0 +1,38 @@
+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-testing/syslinux/syslinux-6.00-efi-fix-libcom32.patch b/libre-testing/syslinux/syslinux-6.00-efi-fix-libcom32.patch
new file mode 100644
index 000000000..7460cd195
--- /dev/null
+++ b/libre-testing/syslinux/syslinux-6.00-efi-fix-libcom32.patch
@@ -0,0 +1,45 @@
+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-testing/syslinux/syslinux-dont-build-dos-windows-targets.patch b/libre-testing/syslinux/syslinux-dont-build-dos-windows-targets.patch
new file mode 100644
index 000000000..54151ab87
--- /dev/null
+++ b/libre-testing/syslinux/syslinux-dont-build-dos-windows-targets.patch
@@ -0,0 +1,12 @@
+diff -Nur syslinux-4.02.orig//Makefile syslinux-4.02//Makefile
+--- syslinux-4.02.orig//Makefile	2010-07-21 21:33:13.000000000 +0200
++++ syslinux-4.02//Makefile	2010-07-22 11:14:03.325522937 +0200
+@@ -54,7 +54,7 @@
+ # files that depend only on the B phase, but may have to be regenerated
+ # for "make installer".
+ BSUBDIRS = codepage com32 lzo core memdisk mbr memdump gpxe sample \
+-	   diag libinstaller dos win32 win64 dosutil txt
++	   libinstaller txt
+ ITARGET  =
+ IOBJECTS = $(ITARGET) \
+ 	utils/gethostip utils/isohybrid utils/mkdiskimage \
diff --git a/libre-testing/syslinux/syslinux-install_update b/libre-testing/syslinux/syslinux-install_update
new file mode 100644
index 000000000..4dc09696a
--- /dev/null
+++ b/libre-testing/syslinux/syslinux-install_update
@@ -0,0 +1,461 @@
+#!/usr/bin/env bash
+#
+# Syslinux Installer / Updater Script (for BIOS only)
+# Copyright (C) 2013  Matthew Gyurgyik <pyther@pyther.net>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+#-----------------
+# Exit Codes:
+#   1 - get_boot_device or other function failed
+#   2 - install/update failed
+#   3 - set_active failed
+#   4 - install_mbr failed
+#
+shopt -s nullglob
+
+bios_libpath="/usr/lib/syslinux/bios/"
+bios_bootpath="/boot/syslinux/"
+EXTLINUX="/usr/bin/extlinux"
+
+bios_core_modules=(config.c32 chain.c32 ldlinux.c32 libcom32.c32 libgpl.c32 liblua.c32 libmenu.c32 libutil.c32 linux.c32 menu.c32 vesamenu.c32)
+bios_autoupdate_file="/boot/syslinux/SYSLINUX_AUTOUPDATE"
+pciids_file="/usr/share/hwdata/pci.ids"
+
+## Helper functions ##
+# Taken from libui-sh
+# $1 needle
+# $2 set (array) haystack
+check_is_in() {
+    local needle="$1" element
+    shift
+    for element; do
+        [[ $element = $needle ]] && return 0
+    done
+    return 1
+}
+
+# return true when blockdevice is an md raid, otherwise return a unset value
+# get all devices that are part of raid device $1
+device_is_raid() {
+    [[ $1 && -f /proc/mdstat ]] || return 1
+    local devmajor=$(stat -c %t "$1")
+    (( devmajor == 9 ))
+}
+
+mdraid_all_slaves() {
+    local slave slaves
+    for slave in /sys/class/block/${1##*/}/slaves/*; do
+        source "$slave/uevent"
+        slaves="$slaves/dev/$DEVNAME "
+        unset DEVNAME
+    done
+    echo $slaves
+}
+
+# Check /sys/block to see if device is partitioned
+# If we have a partitioned block device (sda1) /sys/block/sda1/dev will not exist
+# However, if we have an unpartitioned block device (sda) /sys/block/sda/dev will exist
+dev_is_part() {
+    # $1 - blockdevice
+    local dev=$1
+
+    # If block device uevent file should be found
+    # If a partition is passed in path shouldn't exist
+    if [[ $dev = *cciss* ]]; then
+        [[ -f /sys/block/cciss\!${dev##*/}/dev ]] && return 1
+    elif [[ $dev = *ida* ]]; then
+        [[ -f /sys/block/ida\!${dev##*/}/dev ]] && return 1
+    else
+        [[ -f /sys/block/${dev##*/}/dev ]] && return 1
+    fi
+
+    return 0
+}
+
+# If EFI PART is present in the first 8 bytes then it must be a GPT disk
+device_is_gpt() {
+    local partsig=$(dd if="$1" skip=64 bs=8 count=1 2>/dev/null)
+    [[ $partsig = "EFI PART" ]]
+}
+
+clear_gpt_attr2() {
+    # $1 - Block Device, no partitions
+    local disk=$1
+
+    # Special Exception for cciss controllers
+    if [[ $disk = *cciss* ]]; then
+        for part in /dev/cciss/${disk##*/}*p*; do
+            local partnum="${part##*[[:alpha:]]}"
+            sgdisk "$disk" --attributes="$partnum":clear:2 &>/dev/null
+        done
+    # Smart 2 Controllers
+    elif [[ $disk = *ida* ]]; then
+        for part in /dev/ida/${disk##*/}*p*; do
+            local partnum="${part##*[[:alpha:]]}"
+            sgdisk "$disk" --attributes="$partnum":clear:2 &>/dev/null
+        done
+    else
+        for part in  /sys/block/${disk##*/}/${disk##*/}*; do
+            local partnum="${part##*[[:alpha:]]}"
+            sgdisk "$disk" --attributes="$partnum":clear:2 &>/dev/null
+        done
+    fi
+    return 0
+}
+
+usage() {
+cat << EOF
+usage: $0 options
+
+This script will install or upgrade Syslinux (for BIOS only)
+
+OPTIONS:
+  -h    Show this message
+  -i    Install Syslinux
+  -u    Update Syslinux
+  -a    Set Boot flag on boot partiton
+  -m    Install Syslinux MBR
+  -s    Updates Syslinux if /boot/syslinux/SYSLINUX_AUTOUPDATE exists
+
+ Arguments Required:
+  -c    Chroot install (ex: -c /mnt)
+
+Example Usage: $0 -i -a -m     # (install, set boot flag, install mbr)
+               $0 -u           # (update)
+EOF
+}
+
+# Trys to find the partition that /boot resides on
+# This will either be on /boot or / (root)
+getBoot() {
+    if [[ ! -d "$bios_bootpath" ]]; then
+        echo "Could not find $bios_bootpath"
+        echo "Is boot mounted? Is Syslinux installed?"
+        exit 1
+    fi
+
+    syslinux_fs=(ext2 ext3 ext4 btrfs vfat)
+
+    # Use DATA from findmnt see rc.sysint for more info
+    if [[ -f /proc/self/mountinfo ]]; then
+        read rootdev rootfs < <(findmnt -run -t noautofs -o SOURCE,FSTYPE "$CHROOT/")
+        read bootdev bootfs < <(findmnt -run -t noautofs -o SOURCE,FSTYPE "$CHROOT/boot")
+    else
+        echo "Could not find /proc/self/mountinfo"
+        echo "Are you running a kernel greater than 2.6.24?"
+        exit 1
+    fi
+
+    if [[ $bootfs ]]; then
+        if ! check_is_in "$bootfs" "${syslinux_fs[@]}"; then
+            echo "/boot file system is not supported by Syslinux"
+            exit 1
+        fi
+        boot="boot"
+        bootpart="$bootdev"
+    elif [[ $rootfs ]]; then
+        if ! check_is_in "$rootfs" "${syslinux_fs[@]}"; then
+            echo "/ (root) file system is not supported by Syslinux"
+            exit 1
+        fi
+        boot="root"
+        bootpart="$rootdev"
+    else
+        echo "Could not find filesystem on / (root) or /boot."
+        exit 1
+    fi
+}
+
+# We store the partition table type either gpt or mbr in var ptb
+# In rare cases a user could have one raid disk using mbr and another using gpt
+# In such cases we accept that the output may be incomplete
+
+# Calls get_ptb() for $bootpart or for all device in RAID
+declare -A bootdevs
+get_boot_devices() {
+    if device_is_raid "$bootpart"; then
+        slaves=$(mdraid_all_slaves "$bootpart")
+
+        for slave in ${slaves[@]}; do
+            local disk="${slave%%[[:digit:]]*}"
+            device_is_gpt "$disk" && local ptb="GPT" || local ptb="MBR"
+            bootdevs[$slave]="$ptb"
+        done
+    else
+        local disk="${bootpart%%[[:digit:]]*}"
+        device_is_gpt "$disk" && local ptb="GPT" || local ptb="MBR"
+        bootdevs[$bootpart]="$ptb"
+    fi
+}
+
+# Function Assumes the boot partition should be marked as active
+# All other partitions should not have the boot flag set
+set_active() {
+    # If any bootdev is a block device without partitions bail
+    # we want to set the boot flag on partitioned disk
+    for dev in "${!bootdevs[@]}"; do
+        dev_is_part $dev || { echo "$dev - is a block device. Aborting set_active!"; return 1; }
+    done
+
+    # Clear BIOS Bootable Legacy Attribute for GPT drives
+    # In rare cases where a RAID device has slaves on the same block device
+    # Attribute 2 will be cleared for each partition multiple times
+    for dev in "${!bootdevs[@]}"; do
+        local ptb="${bootdevs[$dev]}"
+        if [[ "$ptb" = GPT ]]; then
+            local disk="${dev%%[[:digit:]]*}" #ex: /dev/sda
+            clear_gpt_attr2 "$disk"
+        fi
+    done
+
+    # Set the boot flag on bootdevs (generated from get_boot_devices)
+    for part in "${!bootdevs[@]}"; do
+        local ptb="${bootdevs[$part]}"
+        local partnum="${part##*[[:alpha:]]}"
+        case "$part" in
+            *[[:digit:]]p[[:digit:]]*)
+                local disk="${part%%p$partnum}" # get everything before p1
+                ;;
+            *)
+                local disk="${part%%[[:digit:]]*}"
+                ;;
+        esac
+
+        if [[ "$ptb" = MBR ]]; then
+            if sfdisk "$disk" -A "$partnum" &>/dev/null; then
+                echo "Boot Flag Set - $part"
+            else
+                echo "FAILED to Set the boot flag on $part"
+                exit 3
+            fi
+        elif [[ "$ptb" = GPT ]]; then
+            if sgdisk "$disk" --attributes="$partnum":set:2 &>/dev/null; then
+                echo "Attribute Legacy Bios Bootable Set - $part"
+            else
+                echo "FAILED to set attribute Legacy BIOS Bootable on $part"
+                exit 3
+            fi
+        fi
+    done
+    return 0
+}
+
+install_mbr() {
+    # If any bootdev is a block device without partitions bail
+    # we want to install the mbr to a partitioned disk
+    for dev in "${!bootdevs[@]}"; do
+        dev_is_part "$dev" || { echo "$dev - is a block device. Aborting MBR install"; return 1; }
+    done
+
+    for part in "${!bootdevs[@]}"; do
+        local partnum="${part##*[[:alpha:]]}"
+        case "$part" in
+            *[[:digit:]]p[[:digit:]]*)
+                local disk="${part%%p$partnum}" # get everything before p1
+                ;;
+            *)
+                local disk="${part%%[[:digit:]]*}"
+                ;;
+        esac
+        local ptb="${bootdevs[$part]}"
+
+        # We want to install to the root of the block device
+        # If the device is a partition - ABORT!
+        dev_is_part "$disk" && \
+        { echo "ABORT! MBR installation to partition ($disk)!"; exit 4;}
+
+        if [[ "$ptb" = MBR ]]; then
+            mbrfile="$bios_libpath/mbr.bin"
+        elif [[ "$ptb" = GPT ]]; then
+            mbrfile="$bios_libpath/gptmbr.bin"
+        fi
+
+        if dd bs=440 count=1 conv=notrunc if="$mbrfile" of="$disk" &> /dev/null; then
+            echo "Installed MBR ($mbrfile) to $disk"
+        else
+            echo "Error Installing MBR ($mbrfile) to $disk"
+            exit 4
+        fi
+    done
+    return 0
+}
+
+install_modules() {
+    # Copy all com32 files to /boot
+    for file in "${bios_libpath}"/*.c32; do
+        file=${file##*/}
+        rm "$bios_bootpath/$file" &> /dev/null
+        if [[ "$boot" = root ]]; then
+            # Symlink files if /boot resides on the same partition as root
+            ln -sf "${bios_libpath#$CHROOT}/$file" "$bios_bootpath/$file" &> /dev/null
+        elif [[ "$boot" = boot ]]; then
+            cp "$bios_libpath/$file" "$bios_bootpath/$file"
+        fi
+    done
+
+    # Copy / Symlink pci.ids if pci.ids exists on the FS
+    if [[ -f $pciids_file ]]; then
+        rm "$bios_bootpath/pci.ids" &> /dev/null
+        if [[ "$boot" = root ]]; then
+            ln -sf "$pciids_file" "$bios_bootpath/pci.ids" &> /dev/null
+        elif [[ "$boot" = boot ]]; then
+            cp "$pciids_file" "$bios_bootpath/pci.ids" &> /dev/null
+        fi
+    fi
+}
+
+_install() {
+    install_modules
+
+    if device_is_raid "$bootpart"; then
+        echo "Detected RAID on /boot"
+        "$EXTLINUX" --install "$bios_bootpath" --raid &> /dev/null
+    else
+        "$EXTLINUX" --install "$bios_bootpath" &> /dev/null
+    fi
+
+    if (( $? )); then
+        echo "Syslinux BIOS install failed"
+        exit 2
+    else
+        echo "Syslinux BIOS install successful"
+    fi
+
+    touch "$CHROOT/$bios_autoupdate_file"
+}
+
+update() {
+    install_modules
+
+    if device_is_raid $bootpart; then
+        echo "Detected RAID on /boot"
+        "$EXTLINUX" --update "$bios_bootpath" --raid &> /dev/null
+    else
+        "$EXTLINUX" --update "$bios_bootpath" &> /dev/null
+    fi
+
+    if (($?)); then
+        echo "Syslinux BIOS update failed"
+        exit 2
+    else
+        echo "Syslinux BIOS update successful"
+    fi
+}
+
+if (( $# == 0 )); then
+    usage
+    exit 1
+fi
+
+while getopts "c:uihmas" opt; do
+    case $opt in
+        c)
+            CHROOT=$(readlink -e "$OPTARG")
+            if [[ -z $CHROOT ]]; then
+                echo "error: chroot path ``$OPTARG does not exist";
+                exit 1
+            fi
+            ;;
+        h)
+            USAGE="True"
+            ;;
+        i)
+            INSTALL="True"
+            ;;
+        u)
+            UPDATE="True"
+            ;;
+        m)
+            MBR="True"
+            ;;
+        a)
+            SET_ACTIVE="True"
+            ;;
+        s)
+            # If AUTOUPDATE_FILE does not exist exit the script
+            if [[ -f $bios_autoupdate_file ]]; then
+                UPDATE="True"
+            else
+                exit 0
+            fi
+            ;;
+        *)
+            usage
+            exit 1
+            ;;
+    esac
+done
+
+if [[ $USAGE ]]; then
+    usage
+    exit 0
+fi
+
+# Make sure only root can run our script
+if (( $(id -u) != 0 )); then
+    echo "This script must be run as root" 1>&2
+    exit 1
+fi
+
+# Display Usage Information if both Install and Update are passed
+if [[ $INSTALL && $UPDATE ]]; then
+    usage
+    exit 1
+fi
+
+# If a chroot dir is path set variables to reflect chroot
+if [[ "$CHROOT" ]]; then
+    bios_libpath="$CHROOT$bios_libpath"
+    bios_bootpath="$CHROOT$bios_bootpath"
+    EXTLINUX="$CHROOT$EXTLINUX"
+fi
+
+# Exit if no /boot path exists
+if ( f=("$bios_bootpath"/*); (( ! ${#f[@]} )) ); then
+    echo "Error: $bios_bootpath is empty!"
+    echo "Is /boot mounted?"
+    exit 1
+fi
+
+# Get the boot device if any of these options are passed
+if [[ $INSTALL || $UPDATE || $SET_ACTIVE || $MBR ]]; then
+    getBoot
+fi
+
+# Install or Update
+if [[ $INSTALL ]]; then
+    _install || exit
+elif [[ $UPDATE ]]; then
+    update || exit
+fi
+
+
+# SET_ACTIVE and MBR
+if [[ $SET_ACTIVE ]] || [[ $MBR ]]; then
+    get_boot_devices
+
+    if [[ $SET_ACTIVE ]]; then
+        set_active || exit
+    fi
+
+    if [[ $MBR ]]; then
+        install_mbr || exit
+    fi
+fi
+
+exit 0
+
+# vim: set et sw=4:
diff --git a/libre-testing/syslinux/syslinux.cfg b/libre-testing/syslinux/syslinux.cfg
new file mode 100644
index 000000000..0c0c6339a
--- /dev/null
+++ b/libre-testing/syslinux/syslinux.cfg
@@ -0,0 +1,78 @@
+# Config file for Syslinux -
+# /boot/syslinux/syslinux.cfg
+#
+# Comboot modules:
+#   * menu.c32 - provides a text menu
+#   * vesamenu.c32 - provides a graphical menu
+#   * chain.c32 - chainload MBRs, partition boot sectors, Windows bootloaders
+#   * hdt.c32 - hardware detection tool
+#   * reboot.c32 - reboots the system
+#
+# To Use: Copy the respective files from /usr/lib/syslinux to /boot/syslinux.
+# If /usr and /boot are on the same file system, symlink the files instead
+# of copying them.
+#
+# If you do not use a menu, a 'boot:' prompt will be shown and the system
+# will boot automatically after 5 seconds.
+#
+# Please review the wiki: https://wiki.archlinux.org/index.php/Syslinux
+# The wiki provides further configuration examples
+
+DEFAULT parabola
+PROMPT 0        # Set to 1 if you always want to display the boot: prompt
+TIMEOUT 50
+# You can create syslinux keymaps with the keytab-lilo tool
+#KBDMAP de.ktl
+
+# Menu Configuration
+# Either menu.c32 or vesamenu32.c32 must be copied to /boot/syslinux 
+#UI menu.c32
+UI vesamenu.c32
+
+# Refer to http://syslinux.zytor.com/wiki/index.php/Doc/menu
+MENU TITLE Parabola GNU/Linux-libre
+MENU BACKGROUND splash.png
+MENU COLOR border       35;40   #ff777caa #a0000000 std
+MENU COLOR title        1;35;40 #ff777caa #a0000000 std
+MENU COLOR sel          7;35;47 #e0ffffff #20777caa all
+MENU COLOR unsel        35;40   #ff777caa #a0000000 std
+MENU COLOR help         35;40   #c0b2b2b2 #a0000000 std
+MENU COLOR timeout_msg  35;40   #ff777caa #00000000 std
+MENU COLOR timeout      1;35;40 #ff777caa #00000000 std
+MENU COLOR msg07        35;40   #ff777caa #a0000000 std
+MENU COLOR tabmsg       35;40   #ff777caa #00000000 std
+
+# boot sections follow
+#
+# TIP: If you want a 1024x768 framebuffer, add "vga=773" to your kernel line.
+#
+#-*
+
+LABEL parabola
+    MENU LABEL Parabola GNU/Linux-libre
+    LINUX ../vmlinuz-linux-libre
+    APPEND root=/dev/sda3 rw
+    INITRD ../initramfs-linux-libre.img
+
+LABEL parabolafallback
+    MENU LABEL Parabola GNU/Linux-libre Fallback
+    LINUX ../vmlinuz-linux-libre
+    APPEND root=/dev/sda3 rw
+    INITRD ../initramfs-linux-libre-fallback.img
+
+# If you want Memtest on syslinux, use this LABEL section to launch it (install the memtest86+ package)
+#    LABEL memtest
+#    MENU LABEL Memtest86+
+#    LINUX ../memtest86+/memtest.bin
+
+LABEL hdt
+        MENU LABEL HDT (Hardware Detection Tool)
+        COM32 hdt.c32
+
+LABEL reboot
+        MENU LABEL Reboot
+        COM32 reboot.c32
+
+LABEL poweroff
+        MENU LABEL Poweroff
+        COM32 poweroff.c32
diff --git a/libre-testing/syslinux/syslinux.install b/libre-testing/syslinux/syslinux.install
new file mode 100644
index 000000000..ac8553a97
--- /dev/null
+++ b/libre-testing/syslinux/syslinux.install
@@ -0,0 +1,36 @@
+post_install() {
+  echo "==> If you want to use syslinux as your BIOS bootloader"
+  echo "==> edit /boot/syslinux/syslinux.cfg and run"
+  echo "==>   # /usr/bin/syslinux-install_update -i -a -m"
+  echo "==> to install it."
+  
+  cat << EOF
+Syslinux efi64 and efi32 files have been installed at
+/usr/lib/syslinux/{efi64,efi32}/ respectively.
+
+To install, copy /usr/lib/syslinux/efi64 to (ESP)/EFI/syslinux and
+syslinux.cfg to (ESP)/EFI/syslinux/syslinux.cfg and add a boot entry
+using efibootmgr for (ESP)/EFI/syslinux/syslinux.efi
+EOF
+
+}
+
+post_upgrade() {
+  # auto-update syslinux if /boot/syslinux/SYSLINUX_AUTOUPDATE exists
+  /usr/bin/syslinux-install_update -s
+  # update to 5.01 message
+  if [ "$(vercmp $2 5.01)" -lt 0 ]; then
+      echo "If you used syslinux-install_update to install syslinux:"
+      echo "==> If you want to use syslinux with menu and all modules please rerun" 
+      echo "==>   # /usr/bin/syslinux-install_update -i -a -m"
+      echo ""
+      echo "If you manually installed syslinux:"
+      echo "==> Please copy or symlink all .c32 modules to your /boot/syslinux directory."
+      echo "==> If (/ and /boot on seperate fs):"
+      echo "==>   # cp /usr/lib/syslinux/bios/*.c32 /boot/syslinux"
+      echo "==> If (/ and /boot on same fs):"
+      echo "==>   # ln -s /usr/lib/syslinux/bios/*.c32 /boot/syslinux"
+  fi
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre-testing/systemd/rePKGBUILD b/libre-testing/systemd/rePKGBUILD
index 0487320e7..8b9e59932 100644
--- a/libre-testing/systemd/rePKGBUILD
+++ b/libre-testing/systemd/rePKGBUILD
@@ -4,7 +4,7 @@
 # then please put 'unknown'.
 
 # Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
-# Maintainer: André Silva <andre.paulista@adinet.com.uy>
+# Maintainer: André Silva <emulatorman@lavabit.com>
 source PKGBUILD
 unset build package md5sums source check
 _repo=testing
diff --git a/libre/abiword-libre/PKGBUILD b/libre/abiword-libre/PKGBUILD
index 248da54c7..30ef5cec2 100644
--- a/libre/abiword-libre/PKGBUILD
+++ b/libre/abiword-libre/PKGBUILD
@@ -7,7 +7,7 @@ _pkgbase=abiword
 pkgbase=abiword-libre
 pkgname=('abiword-libre' 'abiword-libre-plugins')
 pkgver=2.8.6
-pkgrel=9
+pkgrel=9.1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.abisource.com"
diff --git a/libre/abs-libre/PKGBUILD b/libre/abs-libre/PKGBUILD
deleted file mode 100644
index 1abcd02dc..000000000
--- a/libre/abs-libre/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 134858 2011-08-08 04:45:57Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-_pkgname=abs
-pkgname=abs-libre
-#CARCH=mips64el
-pkgver=2.4.3
-pkgrel=3
-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)
-md5sums=('b8b46b22d2f9a2aec2c994ccf230b4fd')
-provides=("${_pkgname}=${pkgver}")
-replaces=("${_pkgname}")
-conflicts=("${_pkgname}")
-
-build() {
-  cd ${srcdir}/${_pkgname}
-
-  make prefix=/usr sysconfdir=/etc prepare
-  make DESTDIR=${pkgdir} install
-
-  # Add readme file, and make base /var/abs path
-  install -dm0755 ${pkgdir}/var/abs/local/
-  install -Dm0644 ${srcdir}/abs/README ${pkgdir}/var/abs/README
-
-  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
-
-  # make adjustments to abs.conf
-  case $CARCH in
-    "i686")
-        sed -i -e 's| multilib||' -e 's| !multilib-testing||' ${pkgdir}/etc/abs.conf
-        ;;
-    "x86_64")
-        sed -i '/ARCH=/s|i686|x86_64|' ${pkgdir}/etc/abs.conf
-        ;;
-    "mips64el")
-        sed -i -e 's| multilib||' -e 's| !multilib-testing||' ${pkgdir}/etc/abs.conf
-        sed -i '/ARCH=/s|i686|mips64el|' ${pkgdir}/etc/abs.conf
-        ;;
-  esac
-}
-
diff --git a/libre/abs-libre/abs.install b/libre/abs-libre/abs.install
deleted file mode 100644
index ac814c2fc..000000000
--- a/libre/abs-libre/abs.install
+++ /dev/null
@@ -1,13 +0,0 @@
-pre_upgrade() {
-    if [ "$(vercmp $2 2.3.2-1)" -lt 0 ]; then
-        echo "==> Fixing potential ABS tree permission issues (this may take a while...)"
-    
-        for dir in core extra community testing; do
-            if [ -d /var/abs/$dir ]; then
-                find /var/abs/$dir -type d -exec chown root:root {} \;
-                find /var/abs/$dir -type d -exec chmod 755 {} \;
-            fi
-        done
-    fi
-}
-
diff --git a/libre/abs/PKGBUILD b/libre/abs/PKGBUILD
new file mode 100644
index 000000000..f7e85d0ef
--- /dev/null
+++ b/libre/abs/PKGBUILD
@@ -0,0 +1,42 @@
+# $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
index 196fb2c85..9dc5a955e 100644
--- a/libre/abuse-libre/PKGBUILD
+++ b/libre/abuse-libre/PKGBUILD
@@ -2,17 +2,17 @@
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: jlvsimoes <jlvsimoes@oninet.pt>
 # Contributor: kevin <kevin@archlinux.org>
-# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=abuse
 pkgname=abuse-libre
 pkgver=0.8
-pkgrel=3
-pkgdesc='A side-scroller action game that pits you against ruthless alien killers. Without unfree "Claudio"'
+pkgrel=2
+pkgdesc='A side-scroller action game that pits you against ruthless alien killers, without nonfree claudio support'
 arch=('i686' 'x86_64')
 url='http://abuse.zoy.org/'
 license=('GPL' 'custom')
-depends=('gcc-libs' 'libgl' 'sdl' 'sdl_mixer')
+depends=('gcc-libs' 'glu' 'sdl' 'sdl_mixer')
 provides=('$_pkgname=$pkgver')
 replaces=('$_pkgname')
 conflicts=('$_pkgname')
@@ -25,7 +25,7 @@ md5sums=('ec678b8dc8d00e0382d8c805c6438489'
 build() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
 
-# Remove the unfree 'claudio' addon
+# Remove the nonfree claudio addon
   rm -rvf ./data/addon/claudio
   patch -Np1 -i "$srcdir/non-claudio.patch"
 
diff --git a/libre/angband-libre/PKGBUILD b/libre/angband-libre/PKGBUILD
new file mode 100644
index 000000000..21bde2beb
--- /dev/null
+++ b/libre/angband-libre/PKGBUILD
@@ -0,0 +1,56 @@
+# Maintainer: Israfel <israfel@lavabit.com>
+# Original Maintainer: schuay <jakob.gruber@gmail.com>
+# Original Maintainer: 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>
+
+_pkgname=angband
+pkgname=angband-libre
+pkgver=3.4.1
+pkgrel=1
+pkgdesc="A roguelike dungeon exploration game based on the writings of JRR Tolkien, without nonfree sound effects"
+arch=('i686' 'x86_64')
+url="http://rephial.org/"
+license=('GPL2' 'custom')
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+depends=('sdl_image' 'sdl_ttf' 'sdl_mixer' 'ncurses' 'libglade')
+source=("http://rephial.org/downloads/${pkgver:0:3}/angband-v${pkgver}.tar.gz" "sound.patch")
+
+build() {
+
+  cd "${srcdir}/angband-v${pkgver}"
+  
+  patch -Np1 -i ../sound.patch
+
+  ./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}/angband-v${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+
+  rm -f "${pkgdir}/usr/share/angband/*/delete.me"
+  install -Dm644 copying.txt "${pkgdir}/usr/share/licenses/angband/COPYING"
+
+}
+sha512sums=('76099c8fa999e88ea1324bb70b4dee5df1faccd1fa256cc0c460ce2c5ddae9634fdef876bd0d826e99e6dcc54a9f9cf619d82552dc658d0115b97e0e644c19d3'
+            'fb3795f7ef5a266e36ef51c9275e65613eeba04fc4283646f21e77ca571b1562c1ad9a11782fe8f1052cefc48b0f3fa1f162bfff88fe8cf62c39e142878d3251')
diff --git a/libre/angband-libre/sound.patch b/libre/angband-libre/sound.patch
new file mode 100644
index 000000000..e70373b72
--- /dev/null
+++ b/libre/angband-libre/sound.patch
@@ -0,0 +1,154 @@
+# Removes nonfree sounds
+# Made by Israfel <israfel@lavabit.com>
+diff -Nur angband-v3.4.1/copying.txt angband-v3.4.1-libre/copying.txt
+--- angband-v3.4.1/copying.txt	2012-10-19 15:47:23.000000000 -0400
++++ angband-v3.4.1-libre/copying.txt	2013-06-29 20:07:03.250510548 -0400
+@@ -27,8 +27,6 @@
+    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 freeware, whatever that means.
+-
+  * 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.
+Binary files angband-v3.4.1/lib/xtra/sound/breath.wav and angband-v3.4.1-libre/lib/xtra/sound/breath.wav differ
+Binary files angband-v3.4.1/lib/xtra/sound/clunk.wav and angband-v3.4.1-libre/lib/xtra/sound/clunk.wav differ
+Binary files angband-v3.4.1/lib/xtra/sound/death.wav and angband-v3.4.1-libre/lib/xtra/sound/death.wav differ
+Binary files angband-v3.4.1/lib/xtra/sound/destroy.wav and angband-v3.4.1-libre/lib/xtra/sound/destroy.wav differ
+Binary files angband-v3.4.1/lib/xtra/sound/drop.wav and angband-v3.4.1-libre/lib/xtra/sound/drop.wav differ
+Binary files angband-v3.4.1/lib/xtra/sound/eat.wav and angband-v3.4.1-libre/lib/xtra/sound/eat.wav differ
+Binary files angband-v3.4.1/lib/xtra/sound/flee.wav and angband-v3.4.1-libre/lib/xtra/sound/flee.wav differ
+Binary files angband-v3.4.1/lib/xtra/sound/hallu.wav and angband-v3.4.1-libre/lib/xtra/sound/hallu.wav differ
+Binary files angband-v3.4.1/lib/xtra/sound/hit1.wav and angband-v3.4.1-libre/lib/xtra/sound/hit1.wav differ
+Binary files angband-v3.4.1/lib/xtra/sound/hit.wav and angband-v3.4.1-libre/lib/xtra/sound/hit.wav differ
+Binary files angband-v3.4.1/lib/xtra/sound/kill1.wav and angband-v3.4.1-libre/lib/xtra/sound/kill1.wav differ
+Binary files angband-v3.4.1/lib/xtra/sound/kill.wav and angband-v3.4.1-libre/lib/xtra/sound/kill.wav differ
+Binary files angband-v3.4.1/lib/xtra/sound/level.wav and angband-v3.4.1-libre/lib/xtra/sound/level.wav differ
+diff -Nur angband-v3.4.1/lib/xtra/sound/Makefile angband-v3.4.1-libre/lib/xtra/sound/Makefile
+--- angband-v3.4.1/lib/xtra/sound/Makefile	2012-10-19 15:47:23.000000000 -0400
++++ angband-v3.4.1-libre/lib/xtra/sound/Makefile	2013-06-29 20:05:33.734131933 -0400
+@@ -1,9 +1,6 @@
+ MKPATH=../../../mk/
+ include $(MKPATH)buildsys.mk
+ 
+-DATA = 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
++DATA = sound.cfg
+ PACKAGE = xtra/sound
+ 
+Binary files angband-v3.4.1/lib/xtra/sound/miss1.wav and angband-v3.4.1-libre/lib/xtra/sound/miss1.wav differ
+Binary files angband-v3.4.1/lib/xtra/sound/miss.wav and angband-v3.4.1-libre/lib/xtra/sound/miss.wav differ
+Binary files angband-v3.4.1/lib/xtra/sound/money.wav and angband-v3.4.1-libre/lib/xtra/sound/money.wav differ
+Binary files angband-v3.4.1/lib/xtra/sound/opendoor.wav and angband-v3.4.1-libre/lib/xtra/sound/opendoor.wav differ
+Binary files angband-v3.4.1/lib/xtra/sound/shutdoor.wav and angband-v3.4.1-libre/lib/xtra/sound/shutdoor.wav differ
+diff -Nur angband-v3.4.1/lib/xtra/sound/sound.cfg angband-v3.4.1-libre/lib/xtra/sound/sound.cfg
+--- angband-v3.4.1/lib/xtra/sound/sound.cfg	2012-10-19 15:47:23.000000000 -0400
++++ angband-v3.4.1-libre/lib/xtra/sound/sound.cfg	2013-06-29 20:06:41.344730009 -0400
+@@ -41,19 +41,19 @@
+ #
+ 
+ # The shopkeep bought a worthless item.
+-store1 = money.wav
++store1 =
+ 
+ # The shopkeep paid too much for an item.
+-store2 = money.wav
++store2 =
+ 
+ # The shopkeep got away with a good bargain.
+-store3 = money.wav
++store3 =
+ 
+ # The shopkeep got away with a great bargain.
+-store4 = money.wav
++store4 =
+ 
+ # You make a normal transaction (buying or selling).
+-store5 = money.wav
++store5 =
+ 
+ # You enter a store.
+ store_enter =
+@@ -69,7 +69,7 @@
+ #
+ 
+ # You succeed in a melee attack against a monster.
+-hit = hit.wav drop.wav hit1.wav
++hit =
+ 
+ # It was a good hit!
+ hit_good =
+@@ -87,7 +87,7 @@
+ hit_hi_superb =
+ 
+ # You miss a melee attack against a monster.
+-miss = miss.wav miss1.wav
++miss =
+ 
+ # You fire a missile.
+ shoot =
+@@ -99,7 +99,7 @@
+ hitpoint_warn =
+ 
+ # You die.
+-death = death.wav
++death =
+ 
+ #
+ # Player sounds - status changes
+@@ -200,10 +200,10 @@
+ money3 =
+ 
+ # You (or a monster) drop something on the ground.
+-drop = clunk.wav
++drop =
+ 
+ # You gain (or regain) a level.
+-level = level.wav
++level =
+ 
+ # You successfully study a spell or prayer.
+ study =
+@@ -227,19 +227,19 @@
+ hitwall =
+ 
+ # You eat something.
+-eat = eat.wav
++eat =
+ 
+ # You successfully dig through something.
+-dig = thump.wav
++dig =
+ 
+ # You open a door.
+-opendoor = opendoor.wav
++opendoor =
+ 
+ # You shut a door.
+-shutdoor = shutdoor.wav
++shutdoor =
+ 
+ # You teleport from a level (including via recall).
+-tplevel = teleport.wav
++tplevel =
+ 
+ # Default "bell" sound for system messages.
+ bell =
+@@ -294,10 +294,10 @@
+ #
+ 
+ # A monster flees in terror.
+-flee = flee.wav
++flee =
+ 
+ # A monster is killed.
+-kill = kill.wav destroy.wav kill1.wav
++kill =
+ 
+ # A unique is killed.
+ kill_unique =
+Binary files angband-v3.4.1/lib/xtra/sound/thump.wav and angband-v3.4.1-libre/lib/xtra/sound/thump.wav differ
+Binary files angband-v3.4.1/lib/xtra/sound/vomit.wav and angband-v3.4.1-libre/lib/xtra/sound/vomit.wav differ
diff --git a/libre/arora-libre/PKGBUILD b/libre/arora-libre/PKGBUILD
new file mode 100644
index 000000000..0b9aa4f4c
--- /dev/null
+++ b/libre/arora-libre/PKGBUILD
@@ -0,0 +1,56 @@
+# $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
new file mode 100644
index 000000000..9b979fa31
--- /dev/null
+++ b/libre/arora-libre/duckduckgo-html.xml
@@ -0,0 +1,8 @@
+<?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
new file mode 100644
index 000000000..b0409600c
--- /dev/null
+++ b/libre/arora-libre/install
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 000000000..6bb6c6b43
--- /dev/null
+++ b/libre/arora-libre/libre.patch
@@ -0,0 +1,30 @@
+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
new file mode 100644
index 000000000..93cd9b80d
--- /dev/null
+++ b/libre/arora-libre/searchengines.qrc
@@ -0,0 +1,8 @@
+<!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
new file mode 100644
index 000000000..f79d87047
--- /dev/null
+++ b/libre/arora-libre/seeks-search.xml
@@ -0,0 +1,11 @@
+<?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
new file mode 100644
index 000000000..ea590759f
--- /dev/null
+++ b/libre/arora-libre/wikipedia-en.xml
@@ -0,0 +1 @@
+<?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
new file mode 100644
index 000000000..9c97f16cc
--- /dev/null
+++ b/libre/arora-libre/yacy.xml
@@ -0,0 +1,28 @@
+<?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
new file mode 100644
index 000000000..7668bcb97
--- /dev/null
+++ b/libre/ath9k-htc-firmware/LICENSE
@@ -0,0 +1,33 @@
+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
new file mode 100644
index 000000000..6aec27967
--- /dev/null
+++ b/libre/ath9k-htc-firmware/PKGBUILD
@@ -0,0 +1,75 @@
+# Maintainer: André Silva <emulatorman@lavabit.com>
+# 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
index ea1dfec52..b2b3097b9 100644
--- a/libre/atool-libre/PKGBUILD
+++ b/libre/atool-libre/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id$
+# $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>
-# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=atool
 pkgname=atool-libre
 pkgver=0.39.0
-pkgrel=1
-pkgdesc="A script for managing file archives of various types"
+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')
@@ -25,12 +26,19 @@ optdepends=('bzip2: for using atool with bzip2 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 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}
diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD
index 90d5acdaa..e473bc64b 100644
--- a/libre/audacious-plugins-libre/PKGBUILD
+++ b/libre/audacious-plugins-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 177005 2013-02-04 00:31:50Z bisson $
+# $Id: PKGBUILD 193871 2013-09-03 05:58:51Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: William Rea <sillywilly@gmail.com>
@@ -8,9 +8,9 @@
 
 _pkgname=audacious-plugins
 pkgname=audacious-plugins-libre
-pkgver=3.3.4
-pkgrel=2
-pkgdesc='Plugins for Audacious without unfree plugins'
+pkgver=3.4.1
+pkgrel=1
+pkgdesc='Plugins for Audacious, without nonfree plugins'
 url='http://audacious-media-player.org/'
 license=('GPL' 'GPL3' 'LGPL' 'custom:BSD')
 arch=('i686' 'x86_64')
@@ -24,17 +24,18 @@ arch=('i686' 'x86_64')
 #
 # All the other custom licensed plugins I think are mostly modified BSD or ISC.
 
-provides=("audacious-plugins=$pkgver")
-replaces=("${pkgname%-libre}")
-conflicts=("${pkgname%-libre}")
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
 
 makedepends=("audacious>=${pkgver}"
-             'oss' 'alsa-lib' 'pulseaudio' 'jack2' 'lame' 'libvorbis' 'flac'
-             'mpg123' 'faad2' 'ffmpeg' 'libmodplug' 'fluidsynth' 'libcdio-paranoia' 'libsidplay' 'wavpack'
-             'libnotify' 'lirc-utils' 'curl' 'libmtp'
+             'glib2' 'python2' # for gdbus-codegen
+             'oss-libre' 'alsa-lib' 'pulseaudio' 'jack2' 'lame' 'libvorbis' 'flac'
+             'mpg123' 'faad2' 'ffmpeg' 'libmodplug' 'fluidsynth' 'libcdio-paranoia' 'libsidplayfp' 'wavpack'
+             'libnotify' 'lirc-utils-libre' 'curl' 'libmtp'
              'neon' 'libmms' 'libcue')
 
-optdepends=('oss: Open Sound System v4 output'
+optdepends=('oss-libre: Open Sound System v4 output'
             'alsa-lib: Advanced Linux Sound Arch. output'
             'pulseaudio: PulseAudio output'
             'jack2: Jack Audio Connection Kit output'
@@ -48,11 +49,11 @@ optdepends=('oss: Open Sound System v4 output'
             'libmodplug: modplug input'
             'fluidsynth: MIDI FluidSynth backend input'
             'libcdio-paranoia: CD Digital Audio input'
-            'libsidplay: Commodore 64 audio input'
+            'libsidplayfp: Commodore 64 audio input'
             'wavpack: WavPack input'
 
             'libnotify: libnotify OSD'
-            'lirc-utils: LIRC'
+            'lirc-utils-libre: LIRC'
             'curl: AudioScrobbler Client'
             'libmtp: Upload to MTP device'
 
@@ -61,9 +62,9 @@ optdepends=('oss: Open Sound System v4 output'
             'libcue: CUE playlist format')
 
 source=("http://distfiles.audacious-media-player.org/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('6493f051417a201fc0e2de7ef36a709676f96607')
+sha1sums=('81c36186d1fef7247b6ea890db7c77061965629b')
 
-build() {
+prepare() {
 	# Retrieve upstream & remove plugin 'psf' due to issues mentioned above.
 	sed -i s/enable_psf=yes/enable_psf=no/ ${_pkgname}-$pkgver/configure
 
@@ -105,6 +106,10 @@ build() {
 	install -m644 LICENSE.voice_removal $l
 	install -m644 LICENSE.xfs $l
 	popd
+}
+
+build() {
+	cd "${srcdir}/${_pkgname}-${pkgver}"
 
 	./configure \
 		--prefix=/usr \
diff --git a/libre/audacity-libre/PKGBUILD b/libre/audacity-libre/PKGBUILD
index 6d6f287b3..610404545 100644
--- a/libre/audacity-libre/PKGBUILD
+++ b/libre/audacity-libre/PKGBUILD
@@ -1,6 +1,6 @@
 # $Id: PKGBUILD 153455 2012-03-14 17:15:15Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
-# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=audacity
 pkgname=audacity-libre
diff --git a/libre/audio-convert-libre/PKGBUILD b/libre/audio-convert-libre/PKGBUILD
index 07dc6e87c..81db4af67 100644
--- a/libre/audio-convert-libre/PKGBUILD
+++ b/libre/audio-convert-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: PKGBUILD 91081 2013-05-18 21:26:27Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Igor Galic <i.galic@gmail.com>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,8 +6,8 @@
 _pkgname=audio-convert
 pkgname=audio-convert-libre
 pkgver=0.3.1.1
-pkgrel=6
-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)"
+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')
@@ -23,8 +23,11 @@ replaces=$_pkgname
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
 source=(http://savannah.nongnu.org/download/$_pkgname/$_pkgname-$pkgver.tar.bz2)
-md5sums=('0c6b61bc96be4c9879f85b000192f3fd')
+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
index 475a7a7ec..3cdb513cb 100644
--- a/libre/avidemux-libre/PKGBUILD
+++ b/libre/avidemux-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: PKGBUILD 189962 2013-07-11 23:40:28Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
@@ -6,7 +6,7 @@ _pkgbase=avidemux
 pkgbase=avidemux-libre
 pkgname=('avidemux-libre-cli' 'avidemux-libre-gtk' 'avidemux-libre-qt')
 pkgver=2.5.6
-pkgrel=6.1
+pkgrel=7
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://fixounet.free.fr/avidemux/"
@@ -21,7 +21,9 @@ build() {
   cd "${srcdir}/${_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 ..
+  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
@@ -74,7 +76,7 @@ package_avidemux-libre-cli() {
 }
 
 package_avidemux-libre-gtk() {
-  pkgdesc="A graphical tool to edit video (filter/re-encode/split), without nonfree faac support - GTK GUI"
+  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')
@@ -97,7 +99,7 @@ package_avidemux-libre-gtk() {
 }
 
 package_avidemux-libre-qt() {
-  pkgdesc="A graphical tool to edit video (filter/re-encode/split), without nonfree faac support - QT GUI"
+  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')
diff --git a/libre/avidemux-libre/PKGBUILD.WIP b/libre/avidemux-libre/PKGBUILD.WIP
index c96084eb8..65499e1ef 100644
--- a/libre/avidemux-libre/PKGBUILD.WIP
+++ b/libre/avidemux-libre/PKGBUILD.WIP
@@ -1,36 +1,42 @@
 # $Id: PKGBUILD 160693 2012-06-03 22:00:17Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
-pkgbase=avidemux
-pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt')
-pkgver=2.6.1
+_pkgbase=avidemux
+pkgbase=avidemux-libre
+pkgname=('avidemux-libre-cli' 'avidemux-libre-gtk' 'avidemux-libre-qt')
+pkgver=2.6.4
 pkgrel=1
 arch=('i686' 'x86_64')
-license=('GPL')
+license=('GPL2')
 url="http://fixounet.free.fr/avidemux/"
-makedepends=('cmake' 'libxslt' 'gtk3' 'qt' 'jack' 'libvorbis' 'sdl' 'libxv' \
-             'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate' \
+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=('a34ffc6409d96c3df30394fbd221e6693ec081ec')
-#source=(http://www.avidemux.org/nightly/source/snapshot_8273.tgz)
-#sha1sums=('cf5256ce189a51898a2e1071ffd46cd993f453f2')
+sha1sums=('7ed55fd5cfb6cfa73ebb9058af72fa2e3c9717c3')
+#source=(http://www.avidemux.org/nightly/snapshot/source_r8810.tar.gz)
+#sha1sums=('8c27d54e2b0655a8b8a3adfde1c0308ffedfec0c')
 
-build() {
-#mv snapshot_8273 ${pkgbase}_${pkgver}
-
-  cd "${srcdir}/${pkgbase}_${pkgver}"
+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-cli() {
-  pkgdesc="A graphical tool to edit video (filter/re-encode/split)"
+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'
-              'faac: 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'
@@ -38,11 +44,14 @@ package_avidemux-cli() {
               'sdl: for the corresponding audio device plugin'
               'x264: for the corresponding video encoder plugin'
               'xvidcore: for the corresponding video encoder plugin'
-              'qt: for the QtScript scripting support'
+              '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 "${srcdir}/${pkgbase}_${pkgver}"
+  cd ${_pkgbase}_${pkgver}
   (cd buildCli; make DESTDIR="${pkgdir}" install)
   (cd buildCore; make DESTDIR="${pkgdir}" install)
   (cd buildPluginsCLI; make DESTDIR="${pkgdir}" install)
@@ -52,32 +61,34 @@ package_avidemux-cli() {
   install -D -m644 man/avidemux.1 "${pkgdir}/usr/share/man/man1/avidemux.1"
 }
 
-package_avidemux-gtk() {
-  pkgdesc="A graphical tool to edit video (filter/re-encode/split) - GTK GUI"
-  depends=("avidemux-cli=${pkgver}" 'gtk3' 'libxv' 'desktop-file-utils')
+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 "${srcdir}/${pkgbase}_${pkgver}"
+  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/pluginSettings/x264/1/{PSP.json,iPhone.json}
   rm "${pkgdir}/usr/lib/ADM_plugins6/videoEncoders/libADM_ve_x264_other.so"
 }
 
-package_avidemux-qt() {
-  pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI"
-  depends=("avidemux-cli=${pkgver}" 'qt' 'x264' 'glu')
+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 "${srcdir}/${pkgbase}_${pkgver}"
+  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"
-
-  rm "${pkgdir}"/usr/lib/ADM_plugins6/pluginSettings/x264/1/{PSP.json,iPhone.json}
 }
diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD
index 2dc83cb5e..8083926a9 100644
--- a/libre/bbswitch-libre/PKGBUILD
+++ b/libre/bbswitch-libre/PKGBUILD
@@ -6,14 +6,14 @@
 _pkgname=bbswitch
 pkgname=bbswitch-libre
 pkgver=0.7
-_extramodules=extramodules-3.9-LIBRE # Don't forget to update bbswitch.install
-pkgrel=1
+_extramodules=extramodules-3.11-LIBRE # Don't forget to update bbswitch.install
+pkgrel=14
 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")
 license=('GPL')
-depends=('linux-libre>=3.9' 'linux-libre<3.10')
-makedepends=('linux-libre-headers>=3.9' 'linux-libre-headers<3.10')
+depends=('linux-libre>=3.11' 'linux-libre<3.12')
+makedepends=('linux-libre-headers>=3.11' 'linux-libre-headers<3.12')
 replaces=$_pkgname
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
@@ -25,7 +25,7 @@ build() {
   cd ${srcdir}/${_pkgname}-${pkgver}
 
   _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
-   
+
   make KDIR=/usr/src/linux-${_kernver}
 }
 
diff --git a/libre/bbswitch-libre/bbswitch.install b/libre/bbswitch-libre/bbswitch.install
index e25d40b44..089d52715 100644
--- a/libre/bbswitch-libre/bbswitch.install
+++ b/libre/bbswitch-libre/bbswitch.install
@@ -1,5 +1,5 @@
 post_install() {
-    EXTRAMODULES='extramodules-3.9-LIBRE'
+    EXTRAMODULES='extramodules-3.11-LIBRE'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
diff --git a/libre/bfgminer-libre/PKGBUILD b/libre/bfgminer-libre/PKGBUILD
index 6c6e19ef4..86e2bba5b 100644
--- a/libre/bfgminer-libre/PKGBUILD
+++ b/libre/bfgminer-libre/PKGBUILD
@@ -1,14 +1,15 @@
-# $Id$
+# $Id: PKGBUILD 96961 2013-09-09 10:42:24Z tredaelli $
 # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor: Andy Weidenbaum <archbaum@gmail.com>
 
 _pkgname=bfgminer
 pkgname=bfgminer-libre
-pkgver=3.0.0
+pkgver=3.2.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')
+depends=('curl' 'jansson' 'libusbx' 'lm_sensors')
+makedepends=('uthash' 'yasm')
 replaces=$_pkgname
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
@@ -16,20 +17,20 @@ url='https://bitcointalk.org/index.php?topic=168174.0'
 license=('GPL3')
 options=(!libtool)
 source=(http://luke.dashjr.org/programs/bitcoin/files/$_pkgname/$pkgver/$_pkgname-$pkgver.tbz2
-        change-kernel-path.patch
         remove-dangerous-rpath.patch)
-sha256sums=('86f7f977ed57b8d61c728f88a3e5962aa1df0723d667c45b1e1bfa5152292400'
-            'a551f73a430809a9b13bb535a503d24f8fd6d35a07bc579b5616d270a1bbf369'
-            '2c6d09a5e567f5099c9b117415013bf28e7b7aa75c436515d28bc7640f905db2')
+sha256sums=('39cd2b01d9096e837ccc4b3b0201711345d286f8fd02be20c3e79c8db94c122a'
+            'd26d07ca23ae25798c4db37cfda1a6a76f22d06e73efab1ddf62b3e1a7eef04c')
 
-[[ "$CARCH" == "x86_64" ]] && makedepends+=('yasm')
+prepare() {
+  cd "$srcdir"/$_pkgname-$pkgver
+
+  patch -p0 < "${srcdir}"/remove-dangerous-rpath.patch
+  NOSUBMODULES=1 ./autogen.sh
+}
 
 build() {
   cd "$srcdir"/$_pkgname-$pkgver
 
-  patch -p0 < "${srcdir}"/change-kernel-path.patch
-  patch -p0 < "${srcdir}"/remove-dangerous-rpath.patch
-  autoreconf -fi
   ./configure --prefix=/usr --enable-cpumining --enable-scrypt
   make
 }
diff --git a/libre/bfgminer-libre/remove-dangerous-rpath.patch b/libre/bfgminer-libre/remove-dangerous-rpath.patch
index a2bcfc87b..abd815141 100644
--- a/libre/bfgminer-libre/remove-dangerous-rpath.patch
+++ b/libre/bfgminer-libre/remove-dangerous-rpath.patch
@@ -1,11 +1,11 @@
---- Makefile.am.orig
-+++ Makefile.am
-@@ -38,7 +38,7 @@
- if NEED_LIBBLKMAKER
- SUBDIRS           += libblkmaker
- bfgminer_CPPFLAGS += -Ilibblkmaker
--bfgminer_LDFLAGS  += -Llibblkmaker/.libs -Wl,-rpath,libblkmaker/.libs
-+bfgminer_LDFLAGS  += -Llibblkmaker/.libs
- bfgminer_LDADD    += -lblkmaker_jansson-0.1 -lblkmaker-0.1
- 
- if HAVE_CYGWIN
+--- 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
new file mode 100644
index 000000000..7e53ce898
--- /dev/null
+++ b/libre/bitlbee-libre/PKGBUILD
@@ -0,0 +1,65 @@
+# $Id$
+
+# 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
+pkgrel=3
+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=('21e17f082c776566429603b1e8c966983a75ac9e'
+          'ec1a3efff09b9fc3d3e52560d8cdbe23186c819f'
+          '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
new file mode 100644
index 000000000..aa5a81a70
--- /dev/null
+++ b/libre/bitlbee-libre/bitlbee.install
@@ -0,0 +1,15 @@
+post_install() {
+	getent group bitlbee &>/dev/null || groupadd -r -g 65 bitlbee >/dev/null
+	getent passwd bitlbee &>/dev/null || useradd -r -u 65 -g bitlbee -d /var/lib/bitlbee -s /bin/false -c bitlbee bitlbee >/dev/null
+	systemd-tmpfiles --create bitlbee.conf
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	getent passwd bitlbee &>/dev/null && userdel bitlbee >/dev/null
+	getent group bitlbee &>/dev/null && groupdel bitlbee >/dev/null
+	true
+}
diff --git a/libre/bitlbee-libre/bitlbee.tmpfiles b/libre/bitlbee-libre/bitlbee.tmpfiles
new file mode 100644
index 000000000..da72a0a79
--- /dev/null
+++ b/libre/bitlbee-libre/bitlbee.tmpfiles
@@ -0,0 +1 @@
+d /run/bitlbee 0755 bitlbee bitlbee - -
diff --git a/libre/bitlbee-libre/xinetd b/libre/bitlbee-libre/xinetd
new file mode 100644
index 000000000..68d5663b3
--- /dev/null
+++ b/libre/bitlbee-libre/xinetd
@@ -0,0 +1,12 @@
+service bitlbee
+{
+        type = UNLISTED
+        socket_type = stream
+        protocol = tcp
+        wait = no
+        user = bitlbee
+	group = bitlbee
+        server = /usr/bin/bitlbee
+        port = 6667
+        disable = yes
+}
diff --git a/libre/blackbox-libre/PKGBUILD b/libre/blackbox-libre/PKGBUILD
index c76d7cba5..1c0c49a15 100644
--- a/libre/blackbox-libre/PKGBUILD
+++ b/libre/blackbox-libre/PKGBUILD
@@ -2,7 +2,7 @@
 # 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@adinet.com.uy>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
 _pkgname=blackbox
 pkgname=${_pkgname}-libre
diff --git a/libre/blender-addon-luxrender/PKGBUILD b/libre/blender-addon-luxrender/PKGBUILD
index 6637e134c..d3c891067 100644
--- a/libre/blender-addon-luxrender/PKGBUILD
+++ b/libre/blender-addon-luxrender/PKGBUILD
@@ -1,35 +1,37 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
 
-pkgname=blender-addon-luxrender
-_pkgname=${pkgname:14:3}${pkgname::5}25
+_srcname=luxrender
+_pkgver=1.2.1
+_bldname=blender
+_bldver=2.68
+_bldep=9
+_pkgname=${_srcname::3}${_bldname::5}25
 _srcver=c9deae0646d0
-pkgver=1.2.1.v2.67
-_pkgver=${pkgver::5}
-_reqname=${pkgname::7}
-_reqver=${pkgver:7}
-_reqep=8
-pkgrel=1
-pkgdesc="$_pkgname: A addon for the ${_reqname^} which allows render and export with LuxRender (built for the $_reqname-libre package)"
+
+pkgname=$_bldname-addon-$_srcname
+pkgver=$_pkgver.v$_bldver
+pkgrel=3
+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.${pkgname:14}.net/
+url=http://www.$_srcname.net/
 license=GPL
 depends=(
-  ${pkgname:14}=$_pkgver
-  "$_reqname>=$(($_reqep-1)):$_reqver"
-  "$_reqname<$_reqep:${_reqver::2}$((${_reqver:2:4}+1))"
+  $_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.${pkgname:14}.net/$_pkgname/archive/$_srcver.tar.bz2
+source=http://src.$_srcname.net/$_pkgname/archive/$_srcver.tar.bz2
 sha512sums=e8d93d5d9d73c1cd4f2008697bd9a8a125d08910aed3f4d3e4bcd290810d673aa663c327fc2cb7ac983cb3439a6996431c39bc3a2f0b6ed05ce5d0b8398ece92
 
 package() {
-  a=$srcdir/$_pkgname-$_srcver/src/${pkgname:14}
-  b=$pkgdir/usr/share/$_reqname/$_reqver/scripts/addons
+  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/${pkgname:14}/outputs/pure_api.py
+  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
index f226b76fd..90df03528 100644
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -1,28 +1,28 @@
 # Maintainer: Márcio Silva <coadde@lavabit.com>
 
-_spacenav=false
-_pkgname=blender-libre
-_pkgflag=libre
-if [ $_spacenav == true ]; then
-  pkgname=blender-spacenav-libre
-  _spndesc=' (with spacenav support)'
-else
-  pkgname=blender-libre
-  _spndesc=''
-fi
-epoch=8
-pkgver=2.67a
+_pkgname=blender
+epoch=10
+_pkgver=2.68a
+pkgrel=3
 _jpgver=1.5
 _pyver=3.3
-pkgrel=1
-pkgdesc="Fully integrated 3D graphics creation suite, without nonfree povray and cuda support$_spndesc"
+
+_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 povray and cuda support'$_spndesc
 arch=(
-  i686
-  x86_64
   mips64el
+  x86_64
+  i686
 )
 license=GPL
-url=http://www.${_pkgname%-$_pkgflag}.org
+url=http://www.$_pkgname.org
 depends=(
   desktop-file-utils
   ffmpeg
@@ -30,10 +30,11 @@ depends=(
   freetype2
   hicolor-icon-theme
   jack
+  #jemalloc
   libpng
   libtiff
   openal
-  openexr
+  openexr-libre
   openimageio
   'opencollada=20130413'
   opencolorio
@@ -41,9 +42,7 @@ depends=(
   shared-mime-info
   xdg-utils
 )
-if [ $_spacenav == true ]; then
-  depends+=(libspnav)
-fi
+[[ $_spn == true ]] && depends+=(libspnav)
 optdepends=(
   'bullet: for Rigid Bodies and Physics Simulation'
   'xcftools: for import GIMP images to scene (pcr repo)'
@@ -52,25 +51,52 @@ makedepends=(
   boost
   cmake
   mesa
-  subversion
 )
-provides=(${_pkgname%-$_pkgflag}=$epoch:$pkgver)
-conflicts=${_pkgname%-$_pkgflag}
-replaces=${_pkgname%-$_pkgflag}
+provides=($_pkgname)
+[[ $_spn == true ]] && provides+=("$_pkgname-libre=$epoch:$pkgver")
+conflicts=($_pkgname)
+[[ $_spn == true ]] && conflicts+=($_pkgname-libre)
+replaces=$_pkgname
 install=$_pkgname.install
-source=http://download.${_pkgname%-$_pkgflag}.org/source/${_pkgname%-$_pkgflag}-$pkgver.tar.gz
-sha512sums=1336ed00ab51c581ab5b8ef6ace04b3684290b287745de3260e4072e3527501bf62472057c4c521533678b2529b7d0c2dca93d0ca3854e29d82443a78d5c4061
+source=http://download.$_pkgname.org/source/$_pkgname-$pkgver.tar.gz
+sha512sums=ce93779c5cbadf361f08ad0f9d5370d52878f94edc0b113d73711b842169d0e000e1500ece8e534439d94c5983e6ff3f15ca4ccd74db5f21447274c475090019
 
 prepare() {
-  mkdir cd $srcdir/${_pkgname%-$_pkgflag}-$pkgver/build
+  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-libre";|' source/creator/buildinfo.c
+  sed -i 's|Linux, Mac OS X, Windows and FreeBSD|GNU and GNU/Linux-libre|
+          s|Linux, FreeBSD|GNU, GNU/Linux-libre|
+          s|Unpack the archive, Then run the Blender executable.|Intall from Parabola repo (pacman -S '"$pkgname"'), Then run blender.|
+          \|Windows|d;\|Mac OS X|d
+          s|The downloaded Blender package includes|The '"${pkgname^}"' package includes|
+         ' release/text/readme.html
+  sed -i 's|Linux|GNU/Linux-libre|
+         ' release/scripts/{addons/game_engine_save_as_runtime,modules/bl_i18n_utils/utils_rtl}.py
+  sed -i 's| (.so under Linux, .dll under windows...)||
+         ' 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
+
+  mkdir -v build
+
+  msg 'Remove nonfree povray render support'
+  rm -vr release/scripts/addons/render_povray
 }
 
 build() {
-  cd $srcdir/${_pkgname%-$_pkgflag}-$pkgver/build
-
-  [[ $CARCH == i686 ]] && DSUPPORT_SSE2_BUILD='-DSUPPORT_SSE2_BUILD=OFF'
+  cd $srcdir/$_pkgname-$pkgver/build
 
-  setarch $CARCH cmake ..\
+  [[ $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\
@@ -78,8 +104,10 @@ build() {
     -DPYTHON_INCLUDE_DIRS=/usr/include/python${_pyver}m\
     -DPYTHON_LIBPATH=/usr/lib\
     -DPYTHON_LIBRARY=python${_pyver}m\
-    -DPYTHON_VERSION=${_pyver}\
-    $DSUPPORT_SSE2_BUILD\
+    -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\
@@ -88,24 +116,24 @@ build() {
     -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
-
-  setarch $CARCH make $MAKEFLAGS
-  setarch $CARCH make
+  make $MAKEFLAGS
+  make
 }
 
 package() {
-  cd $srcdir/${_pkgname%-$_pkgflag}-$pkgver/build
-  setarch $CARCH make DESTDIR=$pkgdir install
-  setarch $CARCH python -m compileall $pkgdir/usr/share/${_pkgname%-$_pkgflag}
-  # drop nonfree povray render support
-  rm -vrf $pkgdir/usr/share/${_pkgname%-$_pkgflag}/${pkgver::4}/scripts/addons/render_povray
+  cd $srcdir/$_pkgname-$pkgver/build
+  make DESTDIR=$pkgdir install
+  python -m compileall $pkgdir/usr/share/$_pkgname
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/libre/bogofilter-libre/PKGBUILD b/libre/bogofilter-libre/PKGBUILD
index c5718a9fd..42a33a113 100644
--- a/libre/bogofilter-libre/PKGBUILD
+++ b/libre/bogofilter-libre/PKGBUILD
@@ -1,33 +1,29 @@
-# $Id: PKGBUILD 146459 2012-01-11 15:21:47Z stephane $
+# $Id: PKGBUILD 183193 2013-04-18 17:14:00Z andyrtr $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Low Kian Seong <fastmail_low@speedymail.org>
 
 _pkgname=bogofilter
 pkgname=bogofilter-libre
-pkgver=1.2.2
-pkgrel=5
-pkgdesc="A fast Bayesian spam filtering tool"
+pkgver=1.2.3
+pkgrel=1
+pkgdesc="A fast Bayesian spam filtering tool, without noncommercial files"
 arch=('i686' 'x86_64')
 license=('GPL3')
 url="http://bogofilter.sourceforge.net"
 depends=('db' 'perl' 'gsl')
 backup=('etc/bogofilter/bogofilter.cf')
-source=(http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz)
-md5sums=('af9c7857c66b1884c820f54f23082701')
+source=(http://sourceforge.net/projects/${_pkgname}/files/${_pkgname}-current/${_pkgname}-${pkgver}/${_pkgname}-${pkgver}.tar.bz2)
+md5sums=('c3ed7f483b83abcbf6d8c797084bd06e')
 provides=("${_pkgname}=${pkgver}")
 replaces=("${_pkgname}")
 conflicts=("${_pkgname}")
 
-mksource() {
-    [ -f ${_pkgname}-${pkgver}.tar.bz2 ] || wget http://sourceforge.net/projects/${_pkgname}/files/${_pkgname}-current/${_pkgname}-${pkgver}/${_pkgname}-${pkgver}.tar.bz2
-    tar xf ${_pkgname}-${pkgver}.tar.bz2
-    # Remove noncommercial files.
-    rm ${_pkgname}-${pkgver}/doc/bogofilter-SA-{2005-0{1,2},2010-01}
-    tar cJf ${pkgname}-${pkgver}.tar.xz ${_pkgname}-${pkgver}
-}
-
 build() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
+
+  # Remove noncommercial files.
+  rm doc/bogofilter-SA-{2005-0{1,2},2010-01}
+
   ./configure --prefix=/usr \
               --sysconfdir=/etc/bogofilter  \
               --localstatedir=/var \
diff --git a/libre/bumblebee-libre/PKGBUILD b/libre/bumblebee-libre/PKGBUILD
index a7b9ad140..3f43d26c9 100644
--- a/libre/bumblebee-libre/PKGBUILD
+++ b/libre/bumblebee-libre/PKGBUILD
@@ -4,7 +4,7 @@
 _pkgname=bumblebee
 pkgname=bumblebee-libre
 pkgver=3.2.1
-pkgrel=1
+pkgrel=3
 pkgdesc="NVIDIA Optimus support for GNU/Linux through VirtualGL, without nonfree nvidia driver support"
 arch=('i686' 'x86_64')
 depends=('virtualgl' 'glib2' 'mesa-libgl')
@@ -47,6 +47,7 @@ build() {
     ./configure \
         CONF_DRIVER=nouveau \
         --prefix=/usr \
+        --sbindir=/usr/bin \
         --sysconfdir=/etc \
         --without-pidfile
 
@@ -60,6 +61,7 @@ package() {
 
     # 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/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD
index caacdcfeb..9e25e1f35 100644
--- a/libre/calibre-libre/PKGBUILD
+++ b/libre/calibre-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 92536 2013-06-07 19:48:55Z jelle $
+# $Id: PKGBUILD 97123 2013-09-13 09:43:25Z 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=0.9.34
+pkgver=1.3.0
 pkgrel=1
 pkgdesc="Ebook management application, with unar support included and nonfree fonts removed"
 arch=('i686' 'x86_64' 'mips64el') 
@@ -19,18 +19,18 @@ depends=('python2-six' 'python2-dateutil' 'python2-cssutils' 'python2-cherrypy'
          'python2-mechanize' 'podofo' 'libwmf' 'python2-beautifulsoup3' 
          'imagemagick' 'poppler-qt' 'chmlib' 'python2-lxml' 'libusbx' 
          'python2-imaging' 'shared-mime-info' 'python2-dnspython' 
-         'unar' 'python2-pyqt' 'python2-psutil' 'icu' 'libmtp' 
-         'python2-netifaces' 'python2-cssselect')
+         'unar' 'python2-pyqt4' 'python2-psutil' 'icu' 'libmtp' 
+         'python2-netifaces' 'python2-cssselect' 'python2-apsw')
 makedepends=('python2-pycountry' 'qt4-private-headers')
 optdepends=('ipython2: to use calibre-debug')
 replaces=$_pkgname
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
 install=calibre.install
-source=("http://calibre-ebook.googlecode.com/files/${_pkgname}-${pkgver}.tar.xz"
+source=("http://sourceforge.net/projects/calibre/files/${pkgver}/calibre-${pkgver}.tar.xz"
         'desktop_integration.patch'
         'calibre-mount-helper')
-md5sums=('ce3e37758c2c0e85d940ff4b141b243f'
+md5sums=('38597e9ddb7b24a162f8e3bb6df18fc4'
          '8353d1878c5a498b3e49eddef473605f'
          '675cd87d41342119827ef706055491e7')
 
@@ -61,7 +61,7 @@ build() {
   # LANG='en_US.UTF-8' python2 setup.py resources
 
   # Don't build translations since building them is broken badly
-  # LANG='en_US.UTF-8' python2 setup.py translations
+#LANG='en_US.UTF-8' python2 setup.py translations
 }
 
 package() {
diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD
index 8ea0dbba7..518e25312 100644
--- a/libre/cdfs-libre/PKGBUILD
+++ b/libre/cdfs-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91714 2013-05-26 15:39:48Z tpowa $
+# $Id: PKGBUILD 93210 2013-06-28 18:33:45Z foutrelis $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: J. Santiago Hirschfeld <jsantiagoh@yahoo.com.ar>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -7,7 +7,7 @@ _pkgname=cdfs
 pkgname=cdfs-libre
 pkgver=2.6.27
 _extramodules=extramodules-3.9-LIBRE # Don't forget to update cdfs.install
-pkgrel=45
+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/"
diff --git a/libre/cgminer-libre/PKGBUILD b/libre/cgminer-libre/PKGBUILD
index 00dcb7f7a..0885c8f9d 100644
--- a/libre/cgminer-libre/PKGBUILD
+++ b/libre/cgminer-libre/PKGBUILD
@@ -1,56 +1,78 @@
-# $Id: PKGBUILD 92066 2013-05-31 05:55:37Z fyan $
+# $Id: PKGBUILD 97140 2013-09-14 03:08:03Z 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
-_pkgflag=libre
-pkgver=3.2.1
+pkgver=3.4.3
 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' 'libcl-libre')
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+depends=('curl' 'mesa-libcl' 'libusbx' 'jansson')
 makedepends=('opencl-headers')
-provides=(${pkgname%-$_pkgflag}=$pkgver)
-conflicts=${pkgname%-$_pkgflag}
-replaces=${pkgname%-$_pkgflag}
-source=("http://ck.kolivas.org/apps/${pkgname%-$_pkgflag}/${pkgname%-$_pkgflag}-${pkgver}.tar.bz2"
-        "${pkgname%-$_pkgflag}.conf.d"
-        "${pkgname%-$_pkgflag}.service")
-backup=("etc/conf.d/${pkgname%-$_pkgflag}" "etc/${pkgname%-$_pkgflag}.conf")
+source=("http://ck.kolivas.org/apps/$_pkgname/$_pkgname-${pkgver}.tar.bz2"
+        "$_pkgname.conf.d"
+        "$_pkgname.service")
+backup=("etc/conf.d/$_pkgname" "etc/$_pkgname.conf")
 
 [ "$CARCH" == "x86_64" ] && makedepends+=('yasm')
 
 build() {
-  cd "$srcdir/${pkgname%-$_pkgflag}-$pkgver"
+  cd "$srcdir/$_pkgname-$pkgver"
 
-  # Use in-tree jansson since it is not compatible with jansson 2.0
-  #sed -e 's/^AC_CHECK_LIB(jansson, json_loads, request_jansson=false, request_jansson=true)$/request_jansson=true/' -i configure.ac
+  # We have latest jansson and libusb - just use them
+  sed "s|ac_subdirs_all='compat/libusb\-1.0'||" -i ./configure
+  sed 's|subdirs="$subdirs compat/libusb\-1.0"||' -i ./configure
+  sed 's|LIBUSB_LIBS="compat/libusb-1.0/libusb/.libs/libusb-1.0.a"|LIBUSB_LIBS=-lusb-1.0|' -i ./configure
+  sed 's|JANSSON_LIBS="compat/jansson/libjansson.a"|JANSSON_LIBS=-ljansson|' -i ./configure
+  sed 's|compat/Makefile compat/jansson/Makefile||' -i ./configure
+
+  sed 's|JANSSON_INCLUDES = -I$(top_srcdir)/compat/jansson||' -i ./Makefile.in
+  sed 's|USBUTILS_INCLUDES = -I$(top_srcdir)/compat/libusb\-1.0/libusb|USBUTILS_INCLUDES = -I/usr/include/libusb-1.0|' -i ./Makefile.in
+  sed 's|SUBDIRS = lib compat ccan|SUBDIRS = lib ccan|' -i ./Makefile.in
+
+  rm -r compat
 
   # Here you may want to use custom CFLAGS
   #export CFLAGS="-O2 -march=native -mtune=native -msse2"
   
-  #./autogen.sh
-  ./configure --prefix=/usr --enable-scrypt --disable-adl
+  ./configure \
+    --prefix=/usr \
+    --enable-scrypt \
+    --enable-opencl \
+    --enable-bflsc \
+    --enable-bitforce \
+    --enable-icarus \
+    --enable-modminer \
+    --enable-ztex \
+    --enable-avalon \
+    --disable-adl # For license issues
   
   make
 }
 
 package() {
-  cd "$srcdir/${pkgname%-$_pkgflag}-$pkgver"
+  cd "$srcdir/$_pkgname-$pkgver"
 
   make DESTDIR="$pkgdir" install
 
-  install -Dm644 "$srcdir"/${pkgname%-$_pkgflag}.service "$pkgdir"/usr/lib/systemd/system/${pkgname%-$_pkgflag}.service
-  install -Dm644 "$srcdir"/${pkgname%-$_pkgflag}.conf.d "$pkgdir"/etc/conf.d/${pkgname%-$_pkgflag}
-  sed 's#/usr/local/bin#/usr/bin#g' example.conf > ${pkgname%-$_pkgflag}.conf
-  install -Dm644 ${pkgname%-$_pkgflag}.conf "$pkgdir"/etc/${pkgname%-$_pkgflag}.conf
+  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=('2a311fd93aaf489849021e34de7cb7fb9343d7ff2d05edbdcf86a0346e616384e57d2367173d0a60916d1154b78f4a1a2a458b3047a96e81ee5b757274068a5e'
+sha512sums=('e7871af17ecd17b1f7ddc21e68ed114ec71223e1c2ec0dc57066e9434c9f6955c34fb8d8986e34dc3fd50c48fccac1d36ab7695f62dea2c987bab44c90feb6ff'
             '99c38bc395848f9712ce172343d31f5c60f5d8ac1cfe2f48df8f3ec6c488fc275763a79c5ef36b99f32faa465b5a65284b38e8a63ef9b144075ee13971313b41'
             '3317b60c6b1f14c47d8ee636113ef40a4023ab14054129de80a37947b381fd2b647a7053f4e1bb639efa225a514e862fa531908714c34040dda2d6221dde7f5f')
diff --git a/libre/claws-mail-libre/PKGBUILD b/libre/claws-mail-libre/PKGBUILD
index d9a171e10..723f4c5d2 100644
--- a/libre/claws-mail-libre/PKGBUILD
+++ b/libre/claws-mail-libre/PKGBUILD
@@ -1,23 +1,21 @@
-# $Id: PKGBUILD 188143 2013-06-10 13:35:31Z bpiotrowski $
+# $Id$
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
-pkgname=claws-mail-libre
-_pkgflag=libre
-_pkgname=${pkgname%-$_pkgflag}
+_pkgname=claws-mail
+pkgname=$_pkgname-libre
 pkgver=3.9.2
-pkgrel=1
+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' 'libsm' 'db' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils')
-makedepends=('compface' 'spamassassin' 'bogofilter'
+         '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
-[ "$CARCH" != "mips64el" ] && makedepends+=('valgrind')
 optdepends=('python2:           needed for some tools and python plugin'
             'perl:              needed for some tools and perl plugin'
             'spamassassin:      adds support for spamfiltering'
@@ -51,7 +49,7 @@ build() {
   sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py
   sed -i 's:python -c:python2 -c:g' configure
 
-  ./configure --prefix=/usr --disable-static \
+  setarch $CARCH ./configure --prefix=/usr --disable-static \
     --enable-enchant \
     --enable-gnutls \
     --enable-ldap \
@@ -59,18 +57,18 @@ build() {
     --enable-pgpmime-plugin \
     --enable-spamassassin-plugin \
     --enable-bogofilter-plugin \
-    --enable-jpilot \
+    --disable-jpilot \
     #--help
-  make
+  setarch $CARCH make
 }
 
 package() {
   cd $srcdir/$_pkgname-$pkgver
-  make DESTDIR=$pkgdir install
+  setarch $CARCH make DESTDIR=$pkgdir install
 
   # build and install extra tools
   cd tools
-  make
+  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
diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD
index f52891d3d..4cc986be1 100644
--- a/libre/clementine-libre/PKGBUILD
+++ b/libre/clementine-libre/PKGBUILD
@@ -1,72 +1,84 @@
-# $Id: PKGBUILD 90335 2013-05-11 16:04:01Z tomegun $
-#Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-#Contributor: BlackEagle <ike.devolder@gmail.com>
-#Contributor: Dany Martineau <dany.luc.martineau@gmail.com>
-#Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
-#Contributor (Parabola): Kete <kete@ninthfloor.org>
-#Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
+# $Id: PKGBUILD 94971 2013-08-01 22:31:55Z alucryd $
+# Maintainer: Maxime Gauduin <alucryd@gmail.com>
+# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
+# Contributor: BlackEagle <ike.devolder@gmail.com>
+# Contributor: Dany Martineau <dany.luc.martineau@gmail.com>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): Kete <kete@ninthfloor.org>
+# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
 
 _pkgname=clementine
 pkgname=clementine-libre
 pkgver=1.1.1
-pkgrel=8
+pkgrel=9
 pkgdesc="A music player and library organizer, without nonfree artwork and spotify support"
 url="http://www.clementine-player.org/"
 license=('GPL')
 arch=('i686' 'x86_64')
-depends=('gstreamer0.10-base' 'taglib' 'glew' 'liblastfm' 'libgpod' 'projectm'
-         'libmtp' 'libplist' 'hicolor-icon-theme' 'qt4' 'libimobiledevice' 'chromaprint'
-         'sparsehash' 'qjson' 'libcdio-paranoia' 'protobuf' 'qca' 'qca-ossl' 'gvfs')
-makedepends=('cmake' 'boost' 'mesa')
-optdepends=('gstreamer0.10-base-plugins: for more open formats'
-            'gstreamer0.10-good-plugins: for use with "Good" plugin libraries'
-            'gstreamer0.10-bad-libre-plugins: for use with "Bad" plugin libraries'
-            'gstreamer0.10-ugly-plugins: for use with "Ugly" plugin libraries')
+depends=('chromaprint' 'gstreamer0.10-base' 'libcdio' 'libgpod' 'liblastfm' 'libmtp' 'projectm' 'protobuf' 'qca-ossl' 'qjson' 'taglib')
+makedepends=('cmake' 'boost' 'mesa' 'sparsehash')
+optdepends=('gstreamer0.10-base-plugins: "Base" plugin libraries'
+            'gstreamer0.10-good-plugins: "Good" plugin libraries'
+            'gstreamer0.10-bad-libre-plugins: "Bad" plugin libraries'
+            'gstreamer0.10-ugly-plugins: "Ugly" plugin libraries'
+            'gvfs: Various devices support')
 replaces=('clementine')
 conflicts=('clementine')
 provides=("clementine=$pkgver")
-source=(http://clementine-player.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz
+install=clementine.install
+source=("http://clementine-player.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz"
         'clementine-1.1.1-libimobiledevice-fix.patch'
         'remove-nonfree-artwork-and-spotify.patch'
         'moognu.png')
-install=clementine.install
+md5sums=('28e4afb822388bd337a761db8f86febf'
+         '736df6cd828a3172701f63c8dc978cb9'
+         '9ccfe62f8784a1ccbe8c96f8cacad9d0'
+         '59a8c0d7659898c457b95f877718cf1c')
 
-build() {
-   cd "${srcdir}/${_pkgname}-${pkgver}"
+prepare() {
+  cd ${_pkgname}-${pkgver}
 
-   patch -Np1 < "$srcdir"/clementine-1.1.1-libimobiledevice-fix.patch
+  patch -Np1 -i ../clementine-1.1.1-libimobiledevice-fix.patch
 
-   # Remove nonfree nonfree artwork and spotify references on files
-   patch -Np1 -i ../remove-nonfree-artwork-and-spotify.patch
+  # remove nonfree nonfree artwork and spotify references on files
+  patch -Np1 -i ../remove-nonfree-artwork-and-spotify.patch
 
-   # Remove nonfree spotifyblob folders
-   rm -rv ext/{clementine-spotifyblob,libclementine-spotifyblob}
+  # remove nonfree spotifyblob folders
+  rm -rv ext/{clementine-spotifyblob,libclementine-spotifyblob}
 
-   # Remove nonfree spotify files
-   rm -v cmake/SpotifyVersion.cmake
-   rm -v data/spotify-core-logo-128x128.png
-   rm -v data/icons/svg/spotify.svg
-   rm -v data/schema/schema-30.sql
-   rm -v src/{globalsearch/spotifysearchprovider.{cpp,h},internet/spotify{blobdownloader.{cpp,h},server.{cpp,h},service.{cpp,h},settingspage.{cpp,h,ui}}}
+  # remove nonfree spotify files
+  rm -v cmake/SpotifyVersion.cmake
+  rm -v data/spotify-core-logo-128x128.png
+  rm -v data/icons/svg/spotify.svg
+  rm -v data/schema/schema-30.sql
+  rm -v src/{globalsearch/spotifysearchprovider.{cpp,h},internet/spotify{blobdownloader.{cpp,h},server.{cpp,h},service.{cpp,h},settingspage.{cpp,h,ui}}}
 
-   ## Remove nonfree nyancat.png
-   rm -v data/nyancat.png
+  ## remove nonfree nyancat.png
+  rm -v data/nyancat.png
 
-   ## Put moognu.png to the source code
-   cp -v ../moognu.png data
+  ## rut moognu.png to the source code
+  install -m644 -v ../moognu.png data
 
-   # Create a blank file due that is a dependency for clementine
-   touch data/schema/schema-30.sql  
+  # create a blank file due which is a dependency for clementine
+  touch data/schema/schema-30.sql  
+}
 
-   cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DUSE_SYSTEM_PROJECTM=1 -DBUILD_WERROR=0
-   make
+build() {
+  cd ${_pkgname}-${pkgver}
+
+  if [[ -d build ]]; then
+    rm -rf build
+  fi
+  mkdir build && cd build
+
+  cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DUSE_SYSTEM_PROJECTM=1 -DBUILD_WERROR=0
+  make
 }
 
 package() {
-   cd "${srcdir}/${_pkgname}-${pkgver}"
-   make DESTDIR="${pkgdir}" install
+  cd ${_pkgname}-${pkgver}/build
+
+  make DESTDIR="${pkgdir}" install
 }
-md5sums=('28e4afb822388bd337a761db8f86febf'
-         '736df6cd828a3172701f63c8dc978cb9'
-         '5cc8f800dd4df7bd5548196009ab68e0'
-         '59a8c0d7659898c457b95f877718cf1c')
+
+# vim: ts=2 sw=2 et:
diff --git a/libre/clementine-libre/clementine.install b/libre/clementine-libre/clementine.install
index 2f0338d8a..927a10258 100644
--- a/libre/clementine-libre/clementine.install
+++ b/libre/clementine-libre/clementine.install
@@ -1,13 +1,15 @@
 post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  gtk-update-icon-cache -ftq usr/share/icons/hicolor
   update-desktop-database -q
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
 
 post_remove() {
-  post_install $1
+  post_install
 }
+
+# vim: ts=2 sw=2 et:
diff --git a/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch b/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch
index 6008b2d28..3a948bf96 100644
--- a/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch
+++ b/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch
@@ -658,8 +658,15 @@ diff -rauN clementine-1.1.1/src/core/backgroundstreams.cpp clementine-libre-1.1.
    if (version < kVersion) {
 diff -rauN clementine-1.1.1/src/analyzers/nyancatanalyzer.cpp clementine-libre-1.1.1/src/analyzers/nyancatanalyzer.cpp
 --- clementine-1.1.1/src/analyzers/nyancatanalyzer.cpp	2012-10-16 08:17:37.000000000 -0200
-+++ clementine-libre-1.1.1/src/analyzers/nyancatanalyzer.cpp	2013-05-13 03:56:04.732771832 -0300
-@@ -29,7 +29,7 @@
++++ clementine-libre-1.1.1/src/analyzers/nyancatanalyzer.cpp	2013-08-02 00:16:25.974215711 -0300
+@@ -23,13 +23,13 @@
+ #include <QTimerEvent>
+ #include <QBrush>
+ 
+-const char* NyanCatAnalyzer::kName = "Nyanalyzer cat";
++const char* NyanCatAnalyzer::kName = "MooGNU";
+ const float NyanCatAnalyzer::kPixelScale = 0.02f;
+ 
  
  NyanCatAnalyzer::NyanCatAnalyzer(QWidget* parent)
    : Analyzer::Base(parent, 9),
diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD
index 517ff84ef..f652fba38 100644
--- a/libre/cups-filters-libre/PKGBUILD
+++ b/libre/cups-filters-libre/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 185774 2013-05-18 15:32:58Z andyrtr $
+# $Id: PKGBUILD 194325 2013-09-13 11:45:16Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=cups-filters-libre
 _pkgname=cups-filters
-pkgver=1.0.34
-pkgrel=4
+pkgver=1.0.38
+pkgrel=1
 pkgdesc="OpenPrinting CUPS Filters, without foomatic-db-nonfree recommendation"
 arch=('i686' 'x86_64')
 url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting"
 license=('GPL')
-depends=('lcms2' 'poppler>=0.22.4' 'qpdf>=4.0.0')
+depends=('lcms2' 'poppler' 'qpdf')
 makedepends=('ghostscript' 'ttf-dejavu') # ttf-dejavu for make check
 optdepends=('ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images'
 	    'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly'
@@ -17,16 +17,14 @@ optdepends=('ghostscript: for non-PostScript printers to print with CUPS to conv
 backup=(etc/fonts/conf.d/99pdftoopvp.conf
         etc/cups/cups-browsed.conf)
 options=(!libtool)
-source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz
-        cups-browsed.service)
-md5sums=('fea9cad6bbb14ab0635243ed5d1d5c77'
-         '9ef68d7c2a84713fd421f4e87dec0a6e')
+source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz)
+md5sums=('610da4c62141d294bf456ca8725324dd')
 replaces=("${_pkgname}")
 conflicts=("${_pkgname}")
 provides=("${_pkgname}=${pkgver}")
 
 build() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd $_pkgname-$pkgver
   ./configure --prefix=/usr  \
     --sysconfdir=/etc \
     --sbindir=/usr/bin \
@@ -38,16 +36,18 @@ build() {
 }
 
 check() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  make -j1 -k check
+  cd $_pkgname-$pkgver
+  #make -j1 -k check
+  make check
 }
 
 package() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd $_pkgname-$pkgver
   make DESTDIR="$pkgdir/" install
   # drop static lib
   rm -f ${pkgdir}/usr/lib/*.a
   
-  # add missing systemd support
-  install -Dm644 ${srcdir}/cups-browsed.service ${pkgdir}/usr/lib/systemd/system/cups-browsed.service
+  # add upstream systemd support file
+  install -Dm644 utils/cups-browsed.service ${pkgdir}/usr/lib/systemd/system/cups-browsed.service
+  sed -i "s|/usr/sbin/cups-browsed|/usr/bin/cups-browsed|" ${pkgdir}/usr/lib/systemd/system/cups-browsed.service
 }
diff --git a/libre/cups-filters-libre/poppler_buildfix.diff b/libre/cups-filters-libre/poppler_buildfix.diff
new file mode 100644
index 000000000..18fc643f9
--- /dev/null
+++ b/libre/cups-filters-libre/poppler_buildfix.diff
@@ -0,0 +1,276 @@
+=== 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/devtools-legacy/PKGBUILD b/libre/devtools-legacy/PKGBUILD
deleted file mode 100644
index 2ff4cbc42..000000000
--- a/libre/devtools-legacy/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=devtools-legacy
-_pkgname=devtools
-pkgver=20130408
-pkgrel=1
-pkgdesc='Tools for Arch Linux package maintainers (legacy)'
-arch=('any')
-license=('GPL')
-url='http://projects.archlinux.org/devtools.git/'
-depends=('namcap' 'openssh' 'subversion' 'rsync' 'arch-install-scripts')
-conflicts=$_pkgname
-source=("ftp://ftp.archlinux.org/other/${_pkgname}/${_pkgname}-${pkgver}.tar.gz"
-        "ftp://ftp.archlinux.org/other/${_pkgname}/${_pkgname}-${pkgver}.tar.gz.sig")
-md5sums=('12b42b429744af6517ae789f728e9f63'
-         'SKIP')
-
-build() {
-	cd ${srcdir}/${_pkgname}-${pkgver}
-	make PREFIX=/usr
-}
-
-package() {
-	cd ${srcdir}/${_pkgname}-${pkgver}
-	make PREFIX=/usr DESTDIR=${pkgdir} install
-}
-
diff --git a/libre/django13/PKGBUILD b/libre/django13/PKGBUILD
deleted file mode 100644
index 554acccc7..000000000
--- a/libre/django13/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id$
-# Maintainer: Dan McGee <dan@archlinux.org>
-# Contributor: Shahar Weiss <sweiss4@gmx.net>
-
-pkgname=django
-pkgver=1.3.1
-pkgrel=2
-pkgdesc="A high-level Python Web framework."
-arch=('any')
-license=('BSD')
-url="http://www.djangoproject.com/"
-depends=('python2')
-makedepends=('python2-distribute')
-optdepends=('mysql-python: for MySQL backend'
-            'python2-psycopg2: for PostgreSQL backend')
-source=("https://www.djangoproject.com/m/releases/1.3/Django-$pkgver.tar.gz"
-        diff-django_branches_releases_1.3.X-from-16768-to-17460.diff)
-md5sums=('62d8642fd06b9a0bf8544178f8500767'
-         'd09d8f9e156b9aa1b580a1b43209b99f')
-sha256sums=('af9118c4e8a063deb0b8cda901fcff2b805e7cf496c93fd43507163f3cde156b'
-            '8e08b5b5bbe7c042a1df4d5615a9d068ec6718fd00bef627c0a9a9e48ee58c15')
-
-build() {
-  cd "$srcdir/Django-$pkgver"
-  patch -Np1 -i ../diff-django_branches_releases_1.3.X-from-16768-to-17460.diff
-  python2 setup.py build
-}
-
-package() {
-  cd "$srcdir/Django-$pkgver"
-  python2 setup.py install --root="$pkgdir" --optimize=1
-
-  install -Dm644 extras/django_bash_completion \
-    "$pkgdir"/etc/bash_completion.d/django
-
-  find "$pkgdir"/usr/lib/python2.7/site-packages/django/ -name '*.py' | \
-    xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|"
-
-  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
-
-_pkgname=$pkgname
-pkgname=django13
-pkgdesc+=" (legacy version for ParabolaWeb)"
-pkgrel+=.1
-provides=("$_pkgname=$pkgver")
-conflicts=("$_pkgname")
diff --git a/libre/django13/PKGBUILD.orig b/libre/django13/PKGBUILD.orig
deleted file mode 100644
index c593c5626..000000000
--- a/libre/django13/PKGBUILD.orig
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Dan McGee <dan@archlinux.org>
-# Contributor: Shahar Weiss <sweiss4@gmx.net>
-
-pkgname=django
-pkgver=1.3.1
-pkgrel=2
-pkgdesc="A high-level Python Web framework."
-arch=('any')
-license=('BSD')
-url="http://www.djangoproject.com/"
-depends=('python2')
-makedepends=('python2-distribute')
-optdepends=('mysql-python: for MySQL backend'
-            'python2-psycopg2: for PostgreSQL backend')
-source=("http://media.djangoproject.com/releases/1.3/Django-$pkgver.tar.gz"
-        diff-django_branches_releases_1.3.X-from-16771-to-17460.diff)
-md5sums=('62d8642fd06b9a0bf8544178f8500767'
-         'ea3d6cbde2fc2332ffe7f901cb60a974')
-sha256sums=('af9118c4e8a063deb0b8cda901fcff2b805e7cf496c93fd43507163f3cde156b'
-            '84e2652a8249e58fdbbd43bce7cd8d6bb2159058be6a675ebe15661ca3ee9ffc')
-
-build() {
-  cd "$srcdir/Django-$pkgver"
-  patch -Np0 < ../diff-django_branches_releases_1.3.X-from-16771-to-17460.diff
-  python2 setup.py build
-}
-
-package() {
-  cd "$srcdir/Django-$pkgver"
-  python2 setup.py install --root="$pkgdir" --optimize=1
-
-  install -Dm644 extras/django_bash_completion \
-    "$pkgdir"/etc/bash_completion.d/django
-
-  find "$pkgdir"/usr/lib/python2.7/site-packages/django/ -name '*.py' | \
-    xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|"
-
-  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/libre/django13/diff-django_branches_releases_1.3.X-from-16768-to-17460.diff b/libre/django13/diff-django_branches_releases_1.3.X-from-16768-to-17460.diff
deleted file mode 100644
index c6819c1ab..000000000
--- a/libre/django13/diff-django_branches_releases_1.3.X-from-16768-to-17460.diff
+++ /dev/null
@@ -1,1573 +0,0 @@
-diff --git a/README b/README
-index c7d225c..47bfd33 100644
---- a/README
-+++ b/README
-@@ -28,7 +28,7 @@ http://code.djangoproject.com/newticket
- To get more help:
- 
-     * Join the #django channel on irc.freenode.net. Lots of helpful people
--      hang out there. Read the archives at http://botland.oebfare.com/logger/django/.
-+      hang out there. Read the archives at http://django-irc-logs.com/.
- 
-     * Join the django-users mailing list, or read the archives, at
-       http://groups.google.com/group/django-users.
-diff --git a/django/contrib/admin/media/css/forms.css b/django/contrib/admin/media/css/forms.css
-index 1cedf24..35d0ed7 100644
---- a/django/contrib/admin/media/css/forms.css
-+++ b/django/contrib/admin/media/css/forms.css
-@@ -352,9 +352,3 @@ fieldset.monospace textarea {
- .empty-form {
-     display: none;
- }
--
--/* IE7 specific bug fixes */
--
--.submit-row input {
--    float: right;
--}
-\ No newline at end of file
-diff --git a/django/contrib/gis/db/backends/spatialite/compiler.py b/django/contrib/gis/db/backends/spatialite/compiler.py
-deleted file mode 100644
-index 3f81ae6..0000000
---- a/django/contrib/gis/db/backends/spatialite/compiler.py
-+++ /dev/null
-@@ -1,32 +0,0 @@
--from django.db.backends.util import typecast_timestamp
--from django.db.models.sql import compiler
--from django.db.models.sql.constants import MULTI
--from django.contrib.gis.db.models.sql.compiler import GeoSQLCompiler as BaseGeoSQLCompiler
--
--SQLCompiler = compiler.SQLCompiler
--
--class GeoSQLCompiler(BaseGeoSQLCompiler, SQLCompiler):
--    pass
--
--class SQLInsertCompiler(compiler.SQLInsertCompiler, GeoSQLCompiler):
--    pass
--
--class SQLDeleteCompiler(compiler.SQLDeleteCompiler, GeoSQLCompiler):
--    pass
--
--class SQLUpdateCompiler(compiler.SQLUpdateCompiler, GeoSQLCompiler):
--    pass
--
--class SQLAggregateCompiler(compiler.SQLAggregateCompiler, GeoSQLCompiler):
--    pass
--
--class SQLDateCompiler(compiler.SQLDateCompiler, GeoSQLCompiler):
--    """
--    This is overridden for GeoDjango to properly cast date columns, see #16757.
--    """
--    def results_iter(self):
--        offset = len(self.query.extra_select)
--        for rows in self.execute_sql(MULTI):
--            for row in rows:
--                date = typecast_timestamp(str(row[offset]))
--                yield date
-diff --git a/django/contrib/gis/db/backends/spatialite/creation.py b/django/contrib/gis/db/backends/spatialite/creation.py
-index c107d96..ee5f9db 100644
---- a/django/contrib/gis/db/backends/spatialite/creation.py
-+++ b/django/contrib/gis/db/backends/spatialite/creation.py
-@@ -56,14 +56,6 @@ class SpatiaLiteCreation(DatabaseCreation):
-             interactive=False,
-             database=self.connection.alias)
- 
--        # One effect of calling syncdb followed by flush is that the id of the
--        # default site may or may not be 1, depending on how the sequence was
--        # reset.  If the sites app is loaded, then we coerce it.
--        from django.db.models import get_model
--        Site = get_model('sites', 'Site')
--        if Site is not None and Site.objects.using(self.connection.alias).count() == 1:
--            Site.objects.using(self.connection.alias).update(id=settings.SITE_ID)
--
-         from django.core.cache import get_cache
-         from django.core.cache.backends.db import BaseDatabaseCache
-         for cache_alias in settings.CACHES:
-diff --git a/django/contrib/gis/db/backends/spatialite/operations.py b/django/contrib/gis/db/backends/spatialite/operations.py
-index 1dc612c..e6f8409 100644
---- a/django/contrib/gis/db/backends/spatialite/operations.py
-+++ b/django/contrib/gis/db/backends/spatialite/operations.py
-@@ -48,7 +48,7 @@ def get_dist_ops(operator):
-     return (SpatiaLiteDistance(operator),)
- 
- class SpatiaLiteOperations(DatabaseOperations, BaseSpatialOperations):
--    compiler_module = 'django.contrib.gis.db.backends.spatialite.compiler'
-+    compiler_module = 'django.contrib.gis.db.models.sql.compiler'
-     name = 'spatialite'
-     spatialite = True
-     version_regex = re.compile(r'^(?P<major>\d)\.(?P<minor1>\d)\.(?P<minor2>\d+)')
-diff --git a/django/contrib/gis/db/models/sql/compiler.py b/django/contrib/gis/db/models/sql/compiler.py
-index 782ce78..405a000 100644
---- a/django/contrib/gis/db/models/sql/compiler.py
-+++ b/django/contrib/gis/db/models/sql/compiler.py
-@@ -1,7 +1,7 @@
- from itertools import izip
--from django.db.backends.util import truncate_name
-+from django.db.backends.util import truncate_name, typecast_timestamp
- from django.db.models.sql import compiler
--from django.db.models.sql.constants import TABLE_NAME
-+from django.db.models.sql.constants import TABLE_NAME, MULTI
- from django.db.models.sql.query import get_proxied_model
- 
- SQLCompiler = compiler.SQLCompiler
-@@ -194,7 +194,7 @@ class GeoSQLCompiler(compiler.SQLCompiler):
-             # We resolve the rest of the columns if we're on Oracle or if
-             # the `geo_values` attribute is defined.
-             for value, field in map(None, row[index_start:], fields):
--                values.append(self.query.convert_values(value, field, connection=self.connection))
-+                values.append(self.query.convert_values(value, field, self.connection))
-         else:
-             values.extend(row[index_start:])
-         return tuple(values)
-@@ -275,4 +275,24 @@ class SQLAggregateCompiler(compiler.SQLAggregateCompiler, GeoSQLCompiler):
-     pass
- 
- class SQLDateCompiler(compiler.SQLDateCompiler, GeoSQLCompiler):
--    pass
-+    """
-+    This is overridden for GeoDjango to properly cast date columns, since
-+    `GeoQuery.resolve_columns` is used for spatial values.
-+    See #14648, #16757.
-+    """
-+    def results_iter(self):
-+        if self.connection.ops.oracle:
-+            from django.db.models.fields import DateTimeField
-+            fields = [DateTimeField()]
-+        else:
-+            needs_string_cast = self.connection.features.needs_datetime_string_cast
-+
-+        offset = len(self.query.extra_select)
-+        for rows in self.execute_sql(MULTI):
-+            for row in rows:
-+                date = row[offset]
-+                if self.connection.ops.oracle:
-+                    date = self.resolve_columns(row, fields)[offset]
-+                elif needs_string_cast:
-+                    date = typecast_timestamp(str(date))
-+                yield date
-diff --git a/django/contrib/gis/tests/relatedapp/fixtures/initial_data.json.gz b/django/contrib/gis/tests/relatedapp/fixtures/initial_data.json.gz
-index 68bf54c..8937637 100644
-Binary files a/django/contrib/gis/tests/relatedapp/fixtures/initial_data.json.gz and b/django/contrib/gis/tests/relatedapp/fixtures/initial_data.json.gz differ
-diff --git a/django/contrib/gis/tests/relatedapp/models.py b/django/contrib/gis/tests/relatedapp/models.py
-index 2e9a62b..aec4e15 100644
---- a/django/contrib/gis/tests/relatedapp/models.py
-+++ b/django/contrib/gis/tests/relatedapp/models.py
-@@ -36,6 +36,7 @@ class Parcel(models.Model):
- # These use the GeoManager but do not have any geographic fields.
- class Author(models.Model):
-     name = models.CharField(max_length=100)
-+    dob = models.DateField()
-     objects = models.GeoManager()
- 
- class Article(models.Model):
-diff --git a/django/contrib/gis/tests/relatedapp/tests.py b/django/contrib/gis/tests/relatedapp/tests.py
-index 250783b..1a6197c 100644
---- a/django/contrib/gis/tests/relatedapp/tests.py
-+++ b/django/contrib/gis/tests/relatedapp/tests.py
-@@ -1,3 +1,4 @@
-+from datetime import date
- from django.test import TestCase
- 
- from django.contrib.gis.geos import GEOSGeometry, Point, MultiPoint
-@@ -281,4 +282,11 @@ class RelatedGeoModelTest(TestCase):
-         # evaluated as list generation swallows TypeError in CPython.
-         sql = str(qs.query)
- 
-+    def test16_annotated_date_queryset(self):
-+        "Ensure annotated date querysets work if spatial backend is used.  See #14648."
-+        birth_years = [dt.year for dt in 
-+                       list(Author.objects.annotate(num_books=Count('books')).dates('dob', 'year'))]
-+        birth_years.sort()
-+        self.assertEqual([1950, 1974], birth_years)
-+
-     # TODO: Related tests for KML, GML, and distance lookups.
-diff --git a/django/contrib/sites/management.py b/django/contrib/sites/management.py
-index 1987274..9bf5a14 100644
---- a/django/contrib/sites/management.py
-+++ b/django/contrib/sites/management.py
-@@ -3,15 +3,34 @@ Creates the default Site object.
- """
- 
- from django.db.models import signals
-+from django.db import connections
-+from django.db import router
- from django.contrib.sites.models import Site
- from django.contrib.sites import models as site_app
-+from django.core.management.color import no_style
- 
- def create_default_site(app, created_models, verbosity, db, **kwargs):
--    if Site in created_models:
-+    # Only create the default sites in databases where Django created the table
-+    if Site in created_models and router.allow_syncdb(db, Site) :
-+        # The default settings set SITE_ID = 1, and some tests in Django's test
-+        # suite rely on this value. However, if database sequences are reused
-+        # (e.g. in the test suite after flush/syncdb), it isn't guaranteed that
-+        # the next id will be 1, so we coerce it. See #15573 and #16353. This
-+        # can also crop up outside of tests - see #15346.
-         if verbosity >= 2:
-             print "Creating example.com Site object"
--        s = Site(domain="example.com", name="example.com")
--        s.save(using=db)
-+        Site(pk=1, domain="example.com", name="example.com").save(using=db)
-+
-+        # We set an explicit pk instead of relying on auto-incrementation,
-+        # so we need to reset the database sequence.
-+        sequence_sql = connections[db].ops.sequence_reset_sql(no_style(), [Site])
-+        if sequence_sql:
-+            if verbosity >= 2:
-+                print "Resetting sequence"
-+            cursor = connections[db].cursor()
-+            for command in sequence_sql:
-+                cursor.execute(command)
-+
-     Site.objects.clear_cache()
- 
- signals.post_syncdb.connect(create_default_site, sender=site_app)
-diff --git a/django/contrib/sites/tests.py b/django/contrib/sites/tests.py
-index 17ab1f2..828badb 100644
---- a/django/contrib/sites/tests.py
-+++ b/django/contrib/sites/tests.py
-@@ -15,6 +15,12 @@ class SitesFrameworkTests(TestCase):
-     def tearDown(self):
-         Site._meta.installed = self.old_Site_meta_installed
- 
-+    def test_save_another(self):
-+        # Regression for #17415
-+        # On some backends the sequence needs reset after save with explicit ID.
-+        # Test that there is no sequence collisions by saving another site.
-+        Site(domain="example2.com", name="example2.com").save()
-+
-     def test_site_manager(self):
-         # Make sure that get_current() does not return a deleted Site object.
-         s = Site.objects.get_current()
-diff --git a/django/core/management/commands/shell.py b/django/core/management/commands/shell.py
-index e4ce462..039ebb8 100644
---- a/django/core/management/commands/shell.py
-+++ b/django/core/management/commands/shell.py
-@@ -13,9 +13,8 @@ class Command(NoArgsCommand):
- 
-     def ipython(self):
-         try:
--            from IPython.frontend.terminal.embed import TerminalInteractiveShell
--            shell = TerminalInteractiveShell()
--            shell.mainloop()
-+            from IPython import embed
-+            embed()
-         except ImportError:
-             # IPython < 0.11
-             # Explicitly pass an empty list as arguments, because otherwise
-diff --git a/django/core/validators.py b/django/core/validators.py
-index a93c6ac..9dcc2bc 100644
---- a/django/core/validators.py
-+++ b/django/core/validators.py
-@@ -147,7 +147,8 @@ class EmailValidator(RegexValidator):
- 
- email_re = re.compile(
-     r"(^[-!#$%&'*+/=?^_`{}|~0-9A-Z]+(\.[-!#$%&'*+/=?^_`{}|~0-9A-Z]+)*"  # dot-atom
--    r'|^"([\001-\010\013\014\016-\037!#-\[\]-\177]|\\[\001-011\013\014\016-\177])*"' # quoted-string
-+    # quoted-string, see also http://tools.ietf.org/html/rfc2822#section-3.2.5
-+    r'|^"([\001-\010\013\014\016-\037!#-\[\]-\177]|\\[\001-\011\013\014\016-\177])*"'
-     r')@(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+[A-Z]{2,6}\.?$', re.IGNORECASE)  # domain
- validate_email = EmailValidator(email_re, _(u'Enter a valid e-mail address.'), 'invalid')
- 
-diff --git a/django/db/backends/creation.py b/django/db/backends/creation.py
-index 57e3f77..ef594b7 100644
---- a/django/db/backends/creation.py
-+++ b/django/db/backends/creation.py
-@@ -374,15 +374,6 @@ class BaseDatabaseCreation(object):
-             verbosity=max(verbosity - 1, 0),
-             interactive=False,
-             database=self.connection.alias)
--        
--        # One effect of calling syncdb followed by flush is that the id of the
--        # default site may or may not be 1, depending on how the sequence was
--        # reset.  If the sites app is loaded, then we coerce it.
--        from django.db.models import get_model
--        if 'django.contrib.sites' in settings.INSTALLED_APPS:
--            Site = get_model('sites', 'Site')
--            if Site is not None and Site.objects.using(self.connection.alias).count() == 1:
--                Site.objects.using(self.connection.alias).update(id=settings.SITE_ID)
- 
-         from django.core.cache import get_cache
-         from django.core.cache.backends.db import BaseDatabaseCache
-diff --git a/django/http/__init__.py b/django/http/__init__.py
-index 68ac45d..07e5a46 100644
---- a/django/http/__init__.py
-+++ b/django/http/__init__.py
-@@ -92,7 +92,7 @@ else:
-         if not _cookie_allows_colon_in_names:
-             def load(self, rawdata, ignore_parse_errors=False):
-                 if ignore_parse_errors:
--                    self.bad_cookies = []
-+                    self.bad_cookies = set()
-                     self._BaseCookie__set = self._loose_set
-                 super(SimpleCookie, self).load(rawdata)
-                 if ignore_parse_errors:
-@@ -106,8 +106,8 @@ else:
-                 try:
-                     self._strict_set(key, real_value, coded_value)
-                 except Cookie.CookieError:
--                    self.bad_cookies.append(key)
--                    dict.__setitem__(self, key, None)
-+                    self.bad_cookies.add(key)
-+                    dict.__setitem__(self, key, Cookie.Morsel())
- 
- 
- class CompatCookie(SimpleCookie):
-diff --git a/django/http/utils.py b/django/http/utils.py
-index 5eea239..0180864 100644
---- a/django/http/utils.py
-+++ b/django/http/utils.py
-@@ -76,7 +76,8 @@ def fix_IE_for_vary(request, response):
- 
-     # The first part of the Content-Type field will be the MIME type,
-     # everything after ';', such as character-set, can be ignored.
--    if response['Content-Type'].split(';')[0] not in safe_mime_types:
-+    mime_type = response.get('Content-Type', '').partition(';')[0]
-+    if mime_type not in safe_mime_types:
-         try:
-             del response['Vary']
-         except KeyError:
-diff --git a/docs/howto/deployment/modpython.txt b/docs/howto/deployment/modpython.txt
-index f5030e9..693f942 100644
---- a/docs/howto/deployment/modpython.txt
-+++ b/docs/howto/deployment/modpython.txt
-@@ -293,11 +293,14 @@ of the admin app, but this is not the case when you use any other server
- arrangement. You're responsible for setting up Apache, or whichever media
- server you're using, to serve the admin files.
- 
--The admin files live in (:file:`django/contrib/admin/static/admin`) of the
-+The admin files live in (:file:`django/contrib/admin/media/admin`) of the
- Django distribution.
- 
--We **strongly** recommend using :mod:`django.contrib.staticfiles` to handle
--the admin files, but here are two other approaches:
-+We **strongly** recommend using :mod:`django.contrib.staticfiles` to handle the
-+admin files (this means using the :djadmin:`collectstatic` management command
-+to collect the static files in :setting:`STATIC_ROOT`, and then configuring
-+your webserver to serve :setting:`STATIC_ROOT` at :setting:`STATIC_URL`), but
-+here are two other approaches:
- 
-     1. Create a symbolic link to the admin static files from within your
-        document root.
-diff --git a/docs/howto/deployment/modwsgi.txt b/docs/howto/deployment/modwsgi.txt
-index de3a5b6..fdf9d27 100644
---- a/docs/howto/deployment/modwsgi.txt
-+++ b/docs/howto/deployment/modwsgi.txt
-@@ -127,11 +127,14 @@ of the admin app, but this is not the case when you use any other server
- arrangement. You're responsible for setting up Apache, or whichever media
- server you're using, to serve the admin files.
- 
--The admin files live in (:file:`django/contrib/admin/static/admin`) of the
-+The admin files live in (:file:`django/contrib/admin/media/admin`) of the
- Django distribution.
- 
--We **strongly** recommend using :mod:`django.contrib.staticfiles` to handle
--the admin files, but here are two other approaches:
-+We **strongly** recommend using :mod:`django.contrib.staticfiles` to handle the
-+admin files (this means using the :djadmin:`collectstatic` management command
-+to collect the static files in :setting:`STATIC_ROOT`, and then configuring
-+your webserver to serve :setting:`STATIC_ROOT` at :setting:`STATIC_URL`), but
-+here are two other approaches:
- 
-     1. Create a symbolic link to the admin static files from within your
-        document root.
-diff --git a/docs/index.txt b/docs/index.txt
-index 0cf066e..20a7cec 100644
---- a/docs/index.txt
-+++ b/docs/index.txt
-@@ -28,7 +28,7 @@ Having trouble? We'd like to help!
- .. _archives of the django-users mailing list: http://groups.google.com/group/django-users/
- .. _post a question: http://groups.google.com/group/django-users/
- .. _#django IRC channel: irc://irc.freenode.net/django
--.. _IRC logs: http://botland.oebfare.com/logger/django/
-+.. _IRC logs: http://django-irc-logs.com/
- .. _ticket tracker: http://code.djangoproject.com/
- 
- First steps
-diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt
-index 3f0f998..ca29d15 100644
---- a/docs/internals/deprecation.txt
-+++ b/docs/internals/deprecation.txt
-@@ -177,6 +177,12 @@ their deprecation, as per the :ref:`Django deprecation policy
-           required to end with a trailing slash to ensure there is a consistent
-           way to combine paths in templates.
- 
-+        * Translations located under the so-called *project path* will be
-+          ignored during the translation building process performed at runtime.
-+          The :setting:`LOCALE_PATHS` setting can be used for the same task by
-+          including the filesystem path to a ``locale`` directory containing
-+          non-app-specific translations in its value.
-+
-     * 2.0
-         * ``django.views.defaults.shortcut()``. This function has been moved
-           to ``django.contrib.contenttypes.views.shortcut()`` as part of the
-diff --git a/docs/internals/release-process.txt b/docs/internals/release-process.txt
-index 2a56f0b..799a59e 100644
---- a/docs/internals/release-process.txt
-+++ b/docs/internals/release-process.txt
-@@ -99,6 +99,13 @@ varying levels:
-     * Security fixes will be applied to the current trunk and the previous two
-       minor releases.
- 
-+* Documentation fixes will generally be more freely backported to the last
-+  release branch (at the discretion of the committer), and don't need to meet
-+  the "critical fixes only" bar as it's highly advantageous to have the docs
-+  for the last release be up-to-date and correct, and the downside of
-+  backporting (risk of introducing regressions) is much less of a concern
-+  with doc fixes.
-+
- As a concrete example, consider a moment in time halfway between the release of
- Django 1.3 and 1.4. At this point in time:
- 
-@@ -111,6 +118,9 @@ Django 1.3 and 1.4. At this point in time:
-       ``1.2.X`` branch. Security fixes will trigger the release of ``1.3.1``,
-       ``1.2.1``, etc.
- 
-+* Documentation fixes will be applied to trunk, and if easily backported, to
-+  the ``1.3.X`` branch.
-+
- .. _release-process:
- 
- Release process
-diff --git a/docs/intro/index.txt b/docs/intro/index.txt
-index bc61be7..19290a5 100644
---- a/docs/intro/index.txt
-+++ b/docs/intro/index.txt
-@@ -31,6 +31,6 @@ place: read this material to quickly get up and running.
-     
-     .. _python: http://python.org/
-     .. _list of Python resources for non-programmers: http://wiki.python.org/moin/BeginnersGuide/NonProgrammers
--    .. _dive into python: http://diveintopython.org/
-+    .. _dive into python: http://diveintopython.net/
-     .. _dead-tree version: http://www.amazon.com/exec/obidos/ASIN/1590593561/ref=nosim/jacobian20
-     .. _books about Python: http://wiki.python.org/moin/PythonBooks
-\ No newline at end of file
-diff --git a/docs/intro/tutorial01.txt b/docs/intro/tutorial01.txt
-index 2f2e049..4dc1e5c 100644
---- a/docs/intro/tutorial01.txt
-+++ b/docs/intro/tutorial01.txt
-@@ -59,7 +59,7 @@ This will create a ``mysite`` directory in your current directory.
-    can be run as a program. To do this, open Terminal.app and navigate (using
-    the ``cd`` command) to the directory where :doc:`django-admin.py
-    </ref/django-admin>` is installed, then run the command
--   ``chmod +x django-admin.py``.
-+   ``sudo chmod +x django-admin.py``.
- 
- .. note::
- 
-@@ -692,10 +692,9 @@ Save these changes and start a new Python interactive shell by running
- 
- For more information on model relations, see :doc:`Accessing related objects
- </ref/models/relations>`. For more on how to use double underscores to perform
--field lookups via the API, see `Field lookups`__. For full details on the
--database API, see our :doc:`Database API reference </topics/db/queries>`.
--
--__ http://docs.djangoproject.com/en/1.2/topics/db/queries/#field-lookups
-+field lookups via the API, see :ref:`Field lookups <field-lookups-intro>`. For
-+full details on the database API, see our :doc:`Database API reference
-+</topics/db/queries>`.
- 
- When you're comfortable with the API, read :doc:`part 2 of this tutorial
- </intro/tutorial02>` to get Django's automatic admin working.
-diff --git a/docs/intro/tutorial02.txt b/docs/intro/tutorial02.txt
-index 4bd31fb..1e837e6 100644
---- a/docs/intro/tutorial02.txt
-+++ b/docs/intro/tutorial02.txt
-@@ -40,22 +40,22 @@ activate the admin site for your installation, do these three things:
- 
-       .. parsed-literal::
- 
--          from django.conf.urls.defaults import *
-+          from django.conf.urls.defaults import patterns, include, url
- 
-           # Uncomment the next two lines to enable the admin:
-           **from django.contrib import admin**
-           **admin.autodiscover()**
- 
-           urlpatterns = patterns('',
--              # Example:
--              # (r'^mysite/', include('mysite.foo.urls')),
-+              # Examples:
-+              # url(r'^$', 'mysite.views.home', name='home'),
-+              # url(r'^mysite/', include('mysite.foo.urls')),
- 
--              # Uncomment the admin/doc line below and add 'django.contrib.admindocs'
--              # to INSTALLED_APPS to enable admin documentation:
--              # (r'^admin/doc/', include('django.contrib.admindocs.urls')),
-+              # Uncomment the admin/doc line below to enable admin documentation:
-+              # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
- 
-               # Uncomment the next line to enable the admin:
--              **(r'^admin/', include(admin.site.urls)),**
-+              **url(r'^admin/', include(admin.site.urls)),**
-           )
- 
-       (The bold lines are the ones that needed to be uncommented.)
-diff --git a/docs/intro/tutorial03.txt b/docs/intro/tutorial03.txt
-index 41a62a7..566ba55 100644
---- a/docs/intro/tutorial03.txt
-+++ b/docs/intro/tutorial03.txt
-@@ -78,17 +78,17 @@ point at that file::
- 
- Time for an example. Edit ``mysite/urls.py`` so it looks like this::
- 
--    from django.conf.urls.defaults import *
-+    from django.conf.urls.defaults import patterns, include, url
- 
-     from django.contrib import admin
-     admin.autodiscover()
- 
-     urlpatterns = patterns('',
--        (r'^polls/$', 'polls.views.index'),
--        (r'^polls/(?P<poll_id>\d+)/$', 'polls.views.detail'),
--        (r'^polls/(?P<poll_id>\d+)/results/$', 'polls.views.results'),
--        (r'^polls/(?P<poll_id>\d+)/vote/$', 'polls.views.vote'),
--        (r'^admin/', include(admin.site.urls)),
-+        url(r'^polls/$', 'polls.views.index'),
-+        url(r'^polls/(?P<poll_id>\d+)/$', 'polls.views.detail'),
-+        url(r'^polls/(?P<poll_id>\d+)/results/$', 'polls.views.results'),
-+        url(r'^polls/(?P<poll_id>\d+)/vote/$', 'polls.views.vote'),
-+        url(r'^admin/', include(admin.site.urls)),
-     )
- 
- This is worth a review. When somebody requests a page from your Web site -- say,
-@@ -112,7 +112,7 @@ what you can do with them. And there's no need to add URL cruft such as ``.php``
- -- unless you have a sick sense of humor, in which case you can do something
- like this::
- 
--    (r'^polls/latest\.php$', 'polls.views.index'),
-+    url(r'^polls/latest\.php$', 'polls.views.index'),
- 
- But, don't do that. It's silly.
- 
-@@ -357,22 +357,23 @@ the list is empty.
- Write a 404 (page not found) view
- =================================
- 
--When you raise :exc:`~django.http.Http404` from within a view, Django will load
--a special view devoted to handling 404 errors. It finds it by looking for the
--variable ``handler404``, which is a string in Python dotted syntax -- the same
--format the normal URLconf callbacks use. A 404 view itself has nothing special:
--It's just a normal view.
--
--You normally won't have to bother with writing 404 views. By default, URLconfs
--have the following line up top::
--
--    from django.conf.urls.defaults import *
-+When you raise :exc:`~django.http.Http404` from within a view, Django
-+will load a special view devoted to handling 404 errors. It finds it
-+by looking for the variable ``handler404`` in your root URLconf (and
-+only in your root URLconf; setting ``handler404`` anywhere else will
-+have no effect), which is a string in Python dotted syntax -- the same
-+format the normal URLconf callbacks use. A 404 view itself has nothing
-+special: It's just a normal view.
- 
--That takes care of setting ``handler404`` in the current module. As you can see
--in ``django/conf/urls/defaults.py``, ``handler404`` is set to
--:func:`django.views.defaults.page_not_found` by default.
-+You normally won't have to bother with writing 404 views. If you don't set
-+``handler404``, the built-in view :func:`django.views.defaults.page_not_found`
-+is used by default. In this case, you still have one obligation: To create a
-+``404.html`` template in the root of your template directory. The default 404
-+view will use that template for all 404 errors. If :setting:`DEBUG` is set to
-+``False`` (in your settings module) and if you didn't create a ``404.html``
-+file, an ``Http500`` is raised instead.  So remember to create a ``404.html``.
- 
--Four more things to note about 404 views:
-+A couple more things to note about 404 views:
- 
-     * If :setting:`DEBUG` is set to ``True`` (in your settings module) then your
-       404 view will never be used (and thus the ``404.html`` template will never
-@@ -381,21 +382,12 @@ Four more things to note about 404 views:
-     * The 404 view is also called if Django doesn't find a match after checking
-       every regular expression in the URLconf.
- 
--    * If you don't define your own 404 view -- and simply use the default, which
--      is recommended -- you still have one obligation: To create a ``404.html``
--      template in the root of your template directory. The default 404 view will
--      use that template for all 404 errors.
--
--    * If :setting:`DEBUG` is set to ``False`` (in your settings module) and if
--      you didn't create a ``404.html`` file, an ``Http500`` is raised instead.
--      So remember to create a ``404.html``.
--
- Write a 500 (server error) view
- ===============================
- 
--Similarly, URLconfs may define a ``handler500``, which points to a view to call
--in case of server errors. Server errors happen when you have runtime errors in
--view code.
-+Similarly, your root URLconf may define a ``handler500``, which points
-+to a view to call in case of server errors. Server errors happen when
-+you have runtime errors in view code.
- 
- Use the template system
- =======================
-@@ -432,10 +424,10 @@ Take some time to play around with the views and template system. As you edit
- the URLconf, you may notice there's a fair bit of redundancy in it::
- 
-     urlpatterns = patterns('',
--        (r'^polls/$', 'polls.views.index'),
--        (r'^polls/(?P<poll_id>\d+)/$', 'polls.views.detail'),
--        (r'^polls/(?P<poll_id>\d+)/results/$', 'polls.views.results'),
--        (r'^polls/(?P<poll_id>\d+)/vote/$', 'polls.views.vote'),
-+        url(r'^polls/$', 'polls.views.index'),
-+        url(r'^polls/(?P<poll_id>\d+)/$', 'polls.views.detail'),
-+        url(r'^polls/(?P<poll_id>\d+)/results/$', 'polls.views.results'),
-+        url(r'^polls/(?P<poll_id>\d+)/vote/$', 'polls.views.vote'),
-     )
- 
- Namely, ``polls.views`` is in every callback.
-@@ -445,10 +437,10 @@ common prefixes. You can factor out the common prefixes and add them as the
- first argument to :func:`~django.conf.urls.defaults.patterns`, like so::
- 
-     urlpatterns = patterns('polls.views',
--        (r'^polls/$', 'index'),
--        (r'^polls/(?P<poll_id>\d+)/$', 'detail'),
--        (r'^polls/(?P<poll_id>\d+)/results/$', 'results'),
--        (r'^polls/(?P<poll_id>\d+)/vote/$', 'vote'),
-+        url(r'^polls/$', 'index'),
-+        url(r'^polls/(?P<poll_id>\d+)/$', 'detail'),
-+        url(r'^polls/(?P<poll_id>\d+)/results/$', 'results'),
-+        url(r'^polls/(?P<poll_id>\d+)/vote/$', 'vote'),
-     )
- 
- This is functionally identical to the previous formatting. It's just a bit
-@@ -459,20 +451,20 @@ callback in your URLconf, you can concatenate multiple
- :func:`~django.conf.urls.defaults.patterns`. Your full ``mysite/urls.py`` might
- now look like this::
- 
--    from django.conf.urls.defaults import *
-+    from django.conf.urls.defaults import patterns, include, url
- 
-     from django.contrib import admin
-     admin.autodiscover()
-     
-     urlpatterns = patterns('polls.views',
--        (r'^polls/$', 'index'),
--        (r'^polls/(?P<poll_id>\d+)/$', 'detail'),
--        (r'^polls/(?P<poll_id>\d+)/results/$', 'results'),
--        (r'^polls/(?P<poll_id>\d+)/vote/$', 'vote'),
-+        url(r'^polls/$', 'index'),
-+        url(r'^polls/(?P<poll_id>\d+)/$', 'detail'),
-+        url(r'^polls/(?P<poll_id>\d+)/results/$', 'results'),
-+        url(r'^polls/(?P<poll_id>\d+)/vote/$', 'vote'),
-     )
-     
-     urlpatterns += patterns('',
--        (r'^admin/', include(admin.site.urls)),
-+        url(r'^admin/', include(admin.site.urls)),
-     )
- 
- Decoupling the URLconfs
-@@ -502,8 +494,8 @@ Copy the file ``mysite/urls.py`` to ``polls/urls.py``. Then, change
-     admin.autodiscover()
-     
-     urlpatterns = patterns('',
--        (r'^polls/', include('polls.urls')),
--        (r'^admin/', include(admin.site.urls)),
-+        url(r'^polls/', include('polls.urls')),
-+        url(r'^admin/', include(admin.site.urls)),
-     )
- 
- :func:`~django.conf.urls.defaults.include` simply references another URLconf.
-@@ -526,13 +518,13 @@ URLconf by removing the leading "polls/" from each line, and removing the
- lines registering the admin site. Your ``polls/urls.py`` file should now look like
- this::
- 
--    from django.conf.urls.defaults import *
-+    from django.conf.urls.defaults import patterns, include, url
- 
-     urlpatterns = patterns('polls.views',
--        (r'^$', 'index'),
--        (r'^(?P<poll_id>\d+)/$', 'detail'),
--        (r'^(?P<poll_id>\d+)/results/$', 'results'),
--        (r'^(?P<poll_id>\d+)/vote/$', 'vote'),
-+        url(r'^$', 'index'),
-+        url(r'^(?P<poll_id>\d+)/$', 'detail'),
-+        url(r'^(?P<poll_id>\d+)/results/$', 'results'),
-+        url(r'^(?P<poll_id>\d+)/vote/$', 'vote'),
-     )
- 
- The idea behind :func:`~django.conf.urls.defaults.include` and URLconf
-diff --git a/docs/intro/tutorial04.txt b/docs/intro/tutorial04.txt
-index ded5cb2..4c2f2d4 100644
---- a/docs/intro/tutorial04.txt
-+++ b/docs/intro/tutorial04.txt
-@@ -218,13 +218,13 @@ Read on for details.
- First, open the ``polls/urls.py`` URLconf. It looks like this, according to the
- tutorial so far::
- 
--    from django.conf.urls.defaults import *
-+    from django.conf.urls.defaults import patterns, include, url
- 
-     urlpatterns = patterns('polls.views',
--        (r'^$', 'index'),
--        (r'^(?P<poll_id>\d+)/$', 'detail'),
--        (r'^(?P<poll_id>\d+)/results/$', 'results'),
--        (r'^(?P<poll_id>\d+)/vote/$', 'vote'),
-+        url(r'^$', 'index'),
-+        url(r'^(?P<poll_id>\d+)/$', 'detail'),
-+        url(r'^(?P<poll_id>\d+)/results/$', 'results'),
-+        url(r'^(?P<poll_id>\d+)/vote/$', 'vote'),
-     )
- 
- Change it like so::
-@@ -234,12 +234,12 @@ Change it like so::
-     from polls.models import Poll
- 
-     urlpatterns = patterns('',
--        (r'^$',
-+        url(r'^$',
-             ListView.as_view(
-                 queryset=Poll.objects.order_by('-pub_date')[:5],
-                 context_object_name='latest_poll_list',
-                 template_name='polls/index.html')),
--        (r'^(?P<pk>\d+)/$',
-+        url(r'^(?P<pk>\d+)/$',
-             DetailView.as_view(
-                 model=Poll,
-                 template_name='polls/detail.html')),
-@@ -248,7 +248,7 @@ Change it like so::
-                 model=Poll,
-                 template_name='polls/results.html'),
-             name='poll_results'),
--        (r'^(?P<poll_id>\d+)/vote/$', 'polls.views.vote'),
-+        url(r'^(?P<poll_id>\d+)/vote/$', 'polls.views.vote'),
-     )
- 
- We're using two generic views here:
-diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt
-index beff94e..7394c3a 100644
---- a/docs/ref/contrib/admin/index.txt
-+++ b/docs/ref/contrib/admin/index.txt
-@@ -19,8 +19,10 @@ There are six steps in activating the Django admin site:
-     1. Add ``'django.contrib.admin'`` to your :setting:`INSTALLED_APPS`
-        setting.
- 
--    2. Admin has two dependencies - :mod:`django.contrib.auth` and
--       :mod:`django.contrib.contenttypes`. If these applications are not
-+    2. The admin has four dependencies - :mod:`django.contrib.auth`,
-+       :mod:`django.contrib.contenttypes`,
-+       :mod:`django.contrib.messages` and
-+       :mod:`django.contrib.sessions`.  If these applications are not
-        in your :setting:`INSTALLED_APPS` list, add them.
- 
-     3. Determine which of your application's models should be editable in the
-@@ -542,7 +544,7 @@ subclass::
-     Fields in ``list_filter`` can also span relations using the ``__`` lookup::
- 
-         class UserAdminWithLookup(UserAdmin):
--            list_filter = ('groups__name')
-+            list_filter = ('groups__name',)
- 
- .. attribute:: ModelAdmin.list_per_page
- 
-diff --git a/docs/ref/contrib/gis/geoip.txt b/docs/ref/contrib/gis/geoip.txt
-index 6503be7..f5c45e1 100644
---- a/docs/ref/contrib/gis/geoip.txt
-+++ b/docs/ref/contrib/gis/geoip.txt
-@@ -144,7 +144,7 @@ parameters.
- Returns a dictionary of city information for the given query.  Some
- of the values in the dictionary may be undefined (``None``).
- 
--.. method:: GeoIPcountry(query)
-+.. method:: GeoIP.country(query)
- 
- Returns a dictionary with the country code and country for the given 
- query.
-diff --git a/docs/ref/contrib/messages.txt b/docs/ref/contrib/messages.txt
-index ca3212d..ee7e01c 100644
---- a/docs/ref/contrib/messages.txt
-+++ b/docs/ref/contrib/messages.txt
-@@ -210,6 +210,10 @@ If you're using the context processor, your template should be rendered with a
- ``RequestContext``. Otherwise, ensure ``messages`` is available to
- the template context.
- 
-+Even if you know there is only just one message, you should still iterate over
-+the ``messages`` sequence, because otherwise the message storage will not be cleared
-+for the next request.
-+
- Creating custom message levels
- ------------------------------
- 
-diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
-index 89bc43f..58b86ea 100644
---- a/docs/ref/django-admin.txt
-+++ b/docs/ref/django-admin.txt
-@@ -1156,7 +1156,7 @@ variable.
- Note that this option is unnecessary in ``manage.py``, because it takes care of
- setting the Python path for you.
- 
--.. _import search path: http://diveintopython.org/getting_to_know_python/everything_is_an_object.html
-+.. _import search path: http://diveintopython.net/getting_to_know_python/everything_is_an_object.html
- 
- .. django-admin-option:: --settings
- 
-diff --git a/docs/ref/models/instances.txt b/docs/ref/models/instances.txt
-index 3728a09..52c0869 100644
---- a/docs/ref/models/instances.txt
-+++ b/docs/ref/models/instances.txt
-@@ -470,7 +470,7 @@ the URL. For example, if your URLconf contained a line such as::
- 
- Similarly, if you had a URLconf entry that looked like::
- 
--    (r'/archive/(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/$', archive_view)
-+    (r'/archive/(?P<year>\d{4})/(?P<month>\d{2})/(?P<day>\d{2})/$', archive_view)
- 
- ...you could reference this using ``permalink()`` as follows::
- 
-@@ -478,8 +478,8 @@ Similarly, if you had a URLconf entry that looked like::
-     def get_absolute_url(self):
-         return ('archive_view', (), {
-             'year': self.created.year,
--            'month': self.created.month,
--            'day': self.created.day})
-+            'month': self.created.strftime('%m'),
-+            'day': self.created.strftime('%d')})
- 
- Notice that we specify an empty sequence for the second parameter in this case,
- because we only want to pass keyword parameters, not positional ones.
-diff --git a/docs/ref/models/options.txt b/docs/ref/models/options.txt
-index 4530439..c1beab0 100644
---- a/docs/ref/models/options.txt
-+++ b/docs/ref/models/options.txt
-@@ -166,6 +166,13 @@ Django quotes column and table names behind the scenes.
-         >>> answer.get_previous_in_order()
-         <Answer: 1>
- 
-+.. admonition:: Changing order_with_respect_to
-+
-+        ``order_with_respect_to`` adds an additional field/database column
-+        named ``_order``, so be sure to handle that as you would any other
-+        change to your models if you add or change ``order_with_respect_to``
-+        after your initial :djadmin:`syncdb`.
-+
- ``ordering``
- ------------
- 
-@@ -238,6 +245,12 @@ Django quotes column and table names behind the scenes.
- 
-         unique_together = ("driver", "restaurant")
- 
-+    A :class:`~django.db.models.ManyToManyField` cannot be included in
-+    unique_together (it's not even clear what that would mean). If you
-+    need to validate uniqueness related to a
-+    :class:`~django.db.models.ManyToManyField`, look at signals or
-+    using an explicit :attr:`through <ManyToManyField.through>` model.
-+
- ``verbose_name``
- ----------------
- 
-diff --git a/docs/ref/signals.txt b/docs/ref/signals.txt
-index e83142e..ad25dce 100644
---- a/docs/ref/signals.txt
-+++ b/docs/ref/signals.txt
-@@ -352,12 +352,16 @@ post_syncdb
- .. data:: django.db.models.signals.post_syncdb
-    :module:
- 
--Sent by :djadmin:`syncdb` after it installs an application.
-+Sent by :djadmin:`syncdb` command after it installs an application, and
-+:djadmin:`flush` command.
- 
- Any handlers that listen to this signal need to be written in a particular
- place: a ``management`` module in one of your :setting:`INSTALLED_APPS`. If
- handlers are registered anywhere else they may not be loaded by
--:djadmin:`syncdb`.
-+:djadmin:`syncdb`. It is important that handlers of this signal perform
-+idempotent changes (e.g. no database alterations) as this may cause the
-+:djadmin:`flush` management command to fail if it also ran during the
-+:djadmin:`syncdb` command.
- 
- Arguments sent with this signal:
- 
-diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
-index 7d24c1d..6c7057a 100644
---- a/docs/ref/templates/builtins.txt
-+++ b/docs/ref/templates/builtins.txt
-@@ -1868,7 +1868,7 @@ slice
- Returns a slice of the list.
- 
- Uses the same syntax as Python's list slicing. See
--http://diveintopython.org/native_data_types/lists.html#odbchelper.list.slice
-+http://diveintopython.net/native_data_types/lists.html#odbchelper.list.slice
- for an introduction.
- 
- Example::
-diff --git a/docs/releases/0.95.txt b/docs/releases/0.95.txt
-index 7409bff..3632c31 100644
---- a/docs/releases/0.95.txt
-+++ b/docs/releases/0.95.txt
-@@ -92,15 +92,15 @@ changes is described in the `Removing The Magic`_ wiki page. There is also an
- easy checklist_ for reference when undertaking the porting operation.
- 
- .. _Removing The Magic: http://code.djangoproject.com/wiki/RemovingTheMagic
--.. _checklist: http://code.djangoproject.com/wiki/MagicRemovalCheatSheet1
-+.. _checklist: http://code.djangoproject.com/wiki/MagicRemovalCheatSheet
- 
- Problem reports and getting help
- ================================
- 
--Need help resolving a problem with Django? The documentation in the distribution
--is also available online_ at the `Django Web site`_. The :doc:`FAQ </faq/index>`
--document is especially recommended, as it contains a number of issues that come
--up time and again.
-+Need help resolving a problem with Django? The documentation in the
-+distribution is also available :doc:`online </index>` at the `Django Web
-+site`_. The :doc:`FAQ </faq/index>` document is especially recommended, as it
-+contains a number of issues that come up time and again.
- 
- For more personalized help, the `django-users`_ mailing list is a very active
- list, with more than 2,000 subscribers who can help you solve any sort of
-@@ -113,7 +113,6 @@ there's a #django channel on irc.freenode.net that is regularly populated by
- Django users and developers from around the world. Friendly people are usually
- available at any hour of the day -- to help, or just to chat.
- 
--.. _online: http://www.djangoproject.com/documentation/0.95/
- .. _Django Web site: http://www.djangoproject.com/
- .. _django-users: http://groups.google.com/group/django-users
- 
-diff --git a/docs/releases/0.96.txt b/docs/releases/0.96.txt
-index 1224360..8874ccb 100644
---- a/docs/releases/0.96.txt
-+++ b/docs/releases/0.96.txt
-@@ -50,12 +50,10 @@ aside from any necessary security fixes, it will not be actively
- maintained, and it will be removed in a future release of Django.
- 
- Also, note that some features, like the new :setting:`DATABASE_OPTIONS`
--setting (see the `databases documentation`_ for details), are only
--available on the "mysql" backend, and will not be made available for
-+setting (see the :doc:`databases documentation </ref/databases>` for details),
-+are only available on the "mysql" backend, and will not be made available for
- "mysql_old".
- 
--.. _databases documentation: http://www.djangoproject.com/documentation/0.96/databases/
--
- Database constraint names changed
- ---------------------------------
- 
-@@ -164,10 +162,8 @@ Although the ``newforms`` library will continue to evolve, it's ready for use
- for most common cases. We recommend that anyone new to form handling skip the
- old forms system and start with the new.
- 
--For more information about ``django.newforms``, read the `newforms
--documentation`_.
--
--.. _newforms documentation: http://www.djangoproject.com/documentation/0.96/newforms/
-+For more information about ``django.newforms``, read the :doc:`newforms
-+documentation </topics/forms/index>`.
- 
- URLconf improvements
- --------------------
-@@ -216,19 +212,15 @@ The test framework
- ------------------
- 
- Django now includes a test framework so you can start transmuting fear into
--boredom (with apologies to Kent Beck). You can write tests based on doctest_
--or unittest_ and test your views with a simple test client.
-+boredom (with apologies to Kent Beck). You can write tests based on
-+:mod:`doctest` or :mod:`unittest` and test your views with a simple test client.
- 
- There is also new support for "fixtures" -- initial data, stored in any of the
--supported `serialization formats`_, that will be loaded into your database at the
--start of your tests. This makes testing with real data much easier.
--
--See `the testing documentation`_ for the full details.
-+supported :doc:`serialization formats </topics/serialization>`, that will be
-+loaded into your database at the start of your tests. This makes testing with
-+real data much easier.
- 
--.. _doctest: http://docs.python.org/library/doctest.html
--.. _unittest: http://docs.python.org/library/unittest.html
--.. _the testing documentation: http://www.djangoproject.com/documentation/0.96/testing/
--.. _serialization formats: http://www.djangoproject.com/documentation/0.96/serialization/
-+See :doc:`the testing documentation </topics/testing>` for the full details.
- 
- Improvements to the admin interface
- -----------------------------------
-diff --git a/docs/releases/1.0.1.txt b/docs/releases/1.0.1.txt
-index 780dc53..3550e7c 100644
---- a/docs/releases/1.0.1.txt
-+++ b/docs/releases/1.0.1.txt
-@@ -6,10 +6,10 @@ Welcome to Django 1.0.1!
- 
- This is the first "bugfix" release in the Django 1.0 series, improving
- the stability and performance of the Django 1.0 codebase. As such,
--Django 1.0.1 contains no new features (and, pursuant to `our
--compatibility policy`_, maintains backwards compatibility with Django
--1.0), but does contain a number of fixes and other
--improvements. Django 1.0.1 is a recommended upgrade for any
-+Django 1.0.1 contains no new features (and, pursuant to :doc:`our
-+compatibility policy </misc/api-stability/>`, maintains backwards
-+compatibility with Django 1.0), but does contain a number of fixes
-+and other improvements. Django 1.0.1 is a recommended upgrade for any
- development or deployment currently using or targeting Django 1.0.
- 
- 
-@@ -46,8 +46,9 @@ highlights:
- 
- * A fix to the application of autoescaping for literal strings passed
-   to the ``join`` template filter. Previously, literal strings passed
--  to ``join`` were automatically escaped, contrary to `the documented
--  behavior for autoescaping and literal strings`_. Literal strings
-+  to ``join`` were automatically escaped, contrary to :ref:`the
-+  documented behavior for autoescaping and literal strings
-+  <string-literals-and-automatic-escaping>`. Literal strings
-   passed to ``join`` are no longer automatically escaped, meaning you
-   must now manually escape them; this is an incompatibility if you
-   were relying on this bug, but not if you were relying on escaping
-@@ -60,6 +61,4 @@ highlights:
-   documentation, including both corrections to existing documents and
-   expanded and new documentation.
- 
--.. _our compatibility policy: http://docs.djangoproject.com/en/dev/misc/api-stability/
- .. _the Subversion log of the 1.0.X branch: http://code.djangoproject.com/log/django/branches/releases/1.0.X
--.. _the documented behavior for autoescaping and literal strings: http://docs.djangoproject.com/en/dev/topics/templates/#string-literals-and-automatic-escaping
-diff --git a/docs/releases/1.2.6.txt b/docs/releases/1.2.6.txt
-new file mode 100644
-index 0000000..cfd1d9c
---- /dev/null
-+++ b/docs/releases/1.2.6.txt
-@@ -0,0 +1,16 @@
-+==========================
-+Django 1.2.6 release notes
-+==========================
-+
-+*September 9, 2011*
-+
-+Welcome to Django 1.2.6!
-+
-+This is the sixth bugfix/security release in the Django 1.2 series, fixing
-+several security issues present in Django 1.2.5.  Django 1.2.6 is a
-+recommended upgrade for all users of any Django release in the 1.2.X series.
-+
-+For a full list of issues addressed in this release, see the `security
-+advisory`_.
-+
-+.. _security advisory: https://www.djangoproject.com/weblog/2011/sep/09/security-releases-issued/
-diff --git a/docs/releases/1.2.7.txt b/docs/releases/1.2.7.txt
-new file mode 100644
-index 0000000..c0cf698
---- /dev/null
-+++ b/docs/releases/1.2.7.txt
-@@ -0,0 +1,16 @@
-+==========================
-+Django 1.2.7 release notes
-+==========================
-+
-+*September 10, 2011*
-+
-+Welcome to Django 1.2.7!
-+
-+This is the seventh bugfix/security release in the Django 1.2 series. It
-+replaces Django 1.2.6 due to problems with the 1.2.6 release tarball. 
-+Django 1.2.7 is a recommended upgrade for all users of any Django release in
-+the 1.2.X series.
-+
-+For more information, see the `release advisory`_.
-+
-+.. _release advisory: https://www.djangoproject.com/weblog/2011/sep/10/127/
-diff --git a/docs/releases/1.3.1.txt b/docs/releases/1.3.1.txt
-new file mode 100644
-index 0000000..4c28916
---- /dev/null
-+++ b/docs/releases/1.3.1.txt
-@@ -0,0 +1,16 @@
-+==========================
-+Django 1.3.1 release notes
-+==========================
-+
-+*September 9, 2011*
-+
-+Welcome to Django 1.3.1!
-+
-+This is the first security release in the Django 1.3 series, fixing several
-+security issues in Django 1.3.  Django 1.3.1 is a recommended upgrade for
-+all users of Django 1.3.
-+
-+For a full list of issues addressed in this release, see the `security
-+advisory`_.
-+
-+.. _security advisory: https://www.djangoproject.com/weblog/2011/sep/09/security-releases-issued/
-diff --git a/docs/releases/index.txt b/docs/releases/index.txt
-index 8d23c28..40fe5b0 100644
---- a/docs/releases/index.txt
-+++ b/docs/releases/index.txt
-@@ -19,6 +19,7 @@ Final releases
- .. toctree::
-    :maxdepth: 1
- 
-+   1.3.1
-    1.3
- 
- 1.2 release
-@@ -26,6 +27,8 @@ Final releases
- .. toctree::
-    :maxdepth: 1
- 
-+   1.2.7
-+   1.2.6
-    1.2.5
-    1.2.4
-    1.2.2
-diff --git a/docs/topics/auth.txt b/docs/topics/auth.txt
-index 635f18f..5a2608a 100644
---- a/docs/topics/auth.txt
-+++ b/docs/topics/auth.txt
-@@ -1251,16 +1251,19 @@ can or cannot do with Task instances, specific to your application::
-         ...
-         class Meta:
-             permissions = (
--                ("can_view", "Can see available tasks"),
--                ("can_change_status", "Can change the status of tasks"),
--                ("can_close", "Can remove a task by setting its status as closed"),
-+                ("view_task", "Can see available tasks"),
-+                ("change_task_status", "Can change the status of tasks"),
-+                ("close_task", "Can remove a task by setting its status as closed"),
-             )
- 
- The only thing this does is create those extra permissions when you run
- :djadmin:`manage.py syncdb <syncdb>`. Your code is in charge of checking the
- value of these permissions when an user is trying to access the functionality
- provided by the application (viewing tasks, changing the status of tasks,
--closing tasks.)
-+closing tasks.) Continuing the above example, the following checks if a user may
-+view tasks::
-+
-+    user.has_perm('app.view_task')
- 
- API reference
- -------------
-diff --git a/docs/topics/cache.txt b/docs/topics/cache.txt
-index 8ef4ea2..9b68353 100644
---- a/docs/topics/cache.txt
-+++ b/docs/topics/cache.txt
-@@ -99,8 +99,9 @@ To use Memcached with Django:
-       on your chosen memcached binding)
- 
-     * Set :setting:`LOCATION <CACHES-LOCATION>` to ``ip:port`` values,
--      where ``ip`` is the IP address of the Memcached daemon and
--      ``port`` is the port on which Memcached is running.
-+      where ``ip`` is the IP address of the Memcached daemon and ``port`` is the
-+      port on which Memcached is running, or to a ``unix:path`` value, where
-+      ``path`` is the path to a Memcached Unix socket file.
- 
- In this example, Memcached is running on localhost (127.0.0.1) port 11211, using
- the ``python-memcached`` binding::
-@@ -112,6 +113,16 @@ the ``python-memcached`` binding::
-         }
-     }
- 
-+In this example, Memcached is available through a local Unix socket file
-+:file:`/tmp/memcached.sock` using the ``python-memcached`` binding::
-+
-+    CACHES = {
-+        'default': {
-+            'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
-+            'LOCATION': 'unix:/tmp/memcached.sock',
-+        }
-+    }
-+
- One excellent feature of Memcached is its ability to share cache over multiple
- servers. This means you can run Memcached daemons on multiple machines, and the
- program will treat the group of machines as a *single* cache, without the need
-@@ -526,9 +537,10 @@ you may expect. But once a particular URL (e.g., ``/foo/23/``) has been
- requested, subsequent requests to that URL will use the cache.
- 
- ``cache_page`` can also take an optional keyword argument, ``cache``,
--which directs the decorator to use a specific cache alias when caching view
--results. By default, the ``default`` alias will be used, but you can specify
--any cache alias you want::
-+which directs the decorator to use a specific cache (from your
-+:setting:`CACHES` setting) when caching view results. By default, the
-+``default`` cache will be used, but you can specify any cache you
-+want::
- 
-     @cache_page(60 * 15, cache="special_cache")
-     def my_view(request):
-diff --git a/docs/topics/class-based-views.txt b/docs/topics/class-based-views.txt
-index 3831046..4da48ec 100644
---- a/docs/topics/class-based-views.txt
-+++ b/docs/topics/class-based-views.txt
-@@ -380,7 +380,7 @@ Next, we'll write the ``PublisherBookListView`` view itself::
-     class PublisherBookListView(ListView):
- 
-         context_object_name = "book_list"
--        template_name = "books/books_by_publisher.html",
-+        template_name = "books/books_by_publisher.html"
- 
-         def get_queryset(self):
-             publisher = get_object_or_404(Publisher, name__iexact=self.args[0])
-@@ -396,7 +396,7 @@ use it in the template::
-     class PublisherBookListView(ListView):
- 
-         context_object_name = "book_list"
--        template_name = "books/books_by_publisher.html",
-+        template_name = "books/books_by_publisher.html"
- 
-         def get_queryset(self):
-             self.publisher = get_object_or_404(Publisher, name__iexact=self.args[0])
-diff --git a/docs/topics/db/models.txt b/docs/topics/db/models.txt
-index 0e18205..af76344 100644
---- a/docs/topics/db/models.txt
-+++ b/docs/topics/db/models.txt
-@@ -324,11 +324,10 @@ whatever you want. For example::
-     should work; all are optional.
- 
-     For details on accessing backwards-related objects, see the
--    `Following relationships backward example`_.
--    
-+    :ref:`Following relationships backward example <backwards-related-objects>`.
-+
-     For sample code, see the `Many-to-one relationship model tests`_.
- 
--    .. _Following relationships backward example: http://docs.djangoproject.com/en/dev/topics/db/queries/#backwards-related-objects
-     .. _Many-to-one relationship model tests: http://code.djangoproject.com/browser/django/trunk/tests/modeltests/many_to_one
- 
- Many-to-many relationships
-diff --git a/docs/topics/db/sql.txt b/docs/topics/db/sql.txt
-index fe71736..d9b8b1a 100644
---- a/docs/topics/db/sql.txt
-+++ b/docs/topics/db/sql.txt
-@@ -236,6 +236,30 @@ alias::
-     # Your code here...
-     transaction.commit_unless_managed(using='my_db_alias')
- 
-+By default, the Python DB API will return results without their field
-+names, which means you end up with a ``list`` of values, rather than a
-+``dict``. At a small performance cost, you can return results as a
-+``dict`` by using something like this::
-+    
-+    def dictfetchall(cursor):
-+        "Returns all rows from a cursor as a dict"
-+        desc = cursor.description
-+        return [
-+            dict(zip([col[0] for col in desc], row))
-+            for row in cursor.fetchall()
-+        ]
-+
-+Here is an example of the difference between the two::
-+
-+    >>> cursor.execute("SELECT id, parent_id from test LIMIT 2");
-+    >>> cursor.fetchall()
-+    ((54360982L, None), (54360880L, None))
-+    
-+    >>> cursor.execute("SELECT id, parent_id from test LIMIT 2");
-+    >>> dictfetchall(cursor)
-+    [{'parent_id': None, 'id': 54360982L}, {'parent_id': None, 'id': 54360880L}]
-+
-+
- .. _transactions-and-raw-sql:
- 
- Transactions and raw SQL
-diff --git a/docs/topics/forms/modelforms.txt b/docs/topics/forms/modelforms.txt
-index 07bc5e3..24e000e 100644
---- a/docs/topics/forms/modelforms.txt
-+++ b/docs/topics/forms/modelforms.txt
-@@ -332,13 +332,17 @@ Since the Author model has only 3 fields, 'name', 'title', and
- .. note::
- 
-     If you specify ``fields`` or ``exclude`` when creating a form with
--    ``ModelForm``, then the fields that are not in the resulting form will not
--    be set by the form's ``save()`` method. Django will prevent any attempt to
--    save an incomplete model, so if the model does not allow the missing fields
--    to be empty, and does not provide a default value for the missing fields,
--    any attempt to ``save()`` a ``ModelForm`` with missing fields will fail.
--    To avoid this failure, you must instantiate your model with initial values
--    for the missing, but required fields::
-+    ``ModelForm``, then the fields that are not in the resulting form
-+    will not be set by the form's ``save()`` method. Also, if you
-+    manually add the excluded fields back to the form, they will not
-+    be initialized from the model instance.
-+
-+    Django will prevent any attempt to save an incomplete model, so if
-+    the model does not allow the missing fields to be empty, and does
-+    not provide a default value for the missing fields, any attempt to
-+    ``save()`` a ``ModelForm`` with missing fields will fail.  To
-+    avoid this failure, you must instantiate your model with initial
-+    values for the missing, but required fields::
- 
-         author = Author(title='Mr')
-         form = PartialAuthorForm(request.POST, instance=author)
-@@ -633,6 +637,12 @@ database. If a given instance's data didn't change in the bound data, the
- instance won't be saved to the database and won't be included in the return
- value (``instances``, in the above example).
- 
-+When fields are missing from the form (for example because they have
-+been excluded), these fields will not be set by the ``save()``
-+method. You can find more information about this restriction, which
-+also holds for regular ``ModelForms``, in `Using a subset of fields on
-+the form`_.
-+
- Pass ``commit=False`` to return the unsaved model instances::
- 
-     # don't save to the database
-diff --git a/docs/topics/http/urls.txt b/docs/topics/http/urls.txt
-index 1caa801..7a0e724 100644
---- a/docs/topics/http/urls.txt
-+++ b/docs/topics/http/urls.txt
-@@ -54,6 +54,10 @@ algorithm the system follows to determine which Python code to execute:
-        :class:`~django.http.HttpRequest` as its first argument and any values
-        captured in the regex as remaining arguments.
- 
-+    5. If no regex matches, or if an exception is raised during any
-+       point in this process, Django invokes an appropriate
-+       error-handling view. See `Error handling`_ below.
-+
- Example
- =======
- 
-@@ -99,10 +103,10 @@ Example requests:
-     * ``/articles/2003`` would not match any of these patterns, because each
-       pattern requires that the URL end with a slash.
- 
--    * ``/articles/2003/03/3/`` would match the final pattern. Django would call
--      the function ``news.views.article_detail(request, '2003', '03', '3')``.
-+    * ``/articles/2003/03/03/`` would match the final pattern. Django would call
-+      the function ``news.views.article_detail(request, '2003', '03', '03')``.
- 
--.. _Dive Into Python's explanation: http://diveintopython.org/regular_expressions/street_addresses.html#re.matching.2.3
-+.. _Dive Into Python's explanation: http://diveintopython.net/regular_expressions/street_addresses.html#re.matching.2.3
- 
- Named groups
- ============
-@@ -123,7 +127,7 @@ Here's the above example URLconf, rewritten to use named groups::
-         (r'^articles/2003/$', 'news.views.special_case_2003'),
-         (r'^articles/(?P<year>\d{4})/$', 'news.views.year_archive'),
-         (r'^articles/(?P<year>\d{4})/(?P<month>\d{2})/$', 'news.views.month_archive'),
--        (r'^articles/(?P<year>\d{4})/(?P<month>\d{2})/(?P<day>\d+)/$', 'news.views.article_detail'),
-+        (r'^articles/(?P<year>\d{4})/(?P<month>\d{2})/(?P<day>\d{2})/$', 'news.views.article_detail'),
-     )
- 
- This accomplishes exactly the same thing as the previous example, with one
-@@ -134,8 +138,8 @@ arguments rather than positional arguments. For example:
-       ``news.views.month_archive(request, year='2005', month='03')``, instead
-       of ``news.views.month_archive(request, '2005', '03')``.
- 
--    * A request to ``/articles/2003/03/3/`` would call the function
--      ``news.views.article_detail(request, year='2003', month='03', day='3')``.
-+    * A request to ``/articles/2003/03/03/`` would call the function
-+      ``news.views.article_detail(request, year='2003', month='03', day='03')``.
- 
- In practice, this means your URLconfs are slightly more explicit and less prone
- to argument-order bugs -- and you can reorder the arguments in your views'
-@@ -246,6 +250,31 @@ The ``prefix`` parameter has the same meaning as the first argument to
- ``patterns()`` and is only relevant when you're passing a string as the
- ``view`` parameter.
- 
-+include
-+-------
-+
-+.. function:: include(<module or pattern_list>)
-+
-+A function that takes a full Python import path to another URLconf module that
-+should be "included" in this place.
-+
-+:func:`include` also accepts as an argument an iterable that returns URL
-+patterns.
-+
-+See `Including other URLconfs`_ below.
-+
-+Error handling
-+==============
-+
-+When Django can't find a regex matching the requested URL, or when an
-+exception is raised, Django will invoke an error-handling view. The
-+views to use for these cases are specified by two variables which can
-+be set in your root URLconf. Setting these variables in any other
-+URLconf will have no effect.
-+
-+See the documentation on :ref:`customizing error views
-+<customizing-error-views>` for more details.
-+
- handler404
- ----------
- 
-@@ -275,19 +304,6 @@ value should suffice.
- .. versionchanged:: 1.2
-     Previous versions of Django only accepted strings representing import paths.
- 
--include
---------
--
--.. function:: include(<module or pattern_list>)
--
--A function that takes a full Python import path to another URLconf module that
--should be "included" in this place.
--
--:func:`include` also accepts as an argument an iterable that returns URL
--patterns.
--
--See `Including other URLconfs`_ below.
--
- Notes on capturing text in URLs
- ===============================
- 
-@@ -420,8 +436,8 @@ directly the pattern list as returned by `patterns`_ instead. For example::
-     from django.conf.urls.defaults import *
- 
-     extra_patterns = patterns('',
--        url(r'reports/(?P<id>\d+)/$', 'credit.views.report', name='credit-reports'),
--        url(r'charge/$', 'credit.views.charge', name='credit-charge'),
-+        url(r'^reports/(?P<id>\d+)/$', 'credit.views.report', name='credit-reports'),
-+        url(r'^charge/$', 'credit.views.charge', name='credit-charge'),
-     )
- 
-     urlpatterns = patterns('',
-diff --git a/docs/topics/http/views.txt b/docs/topics/http/views.txt
-index 99359ab..83a52cb 100644
---- a/docs/topics/http/views.txt
-+++ b/docs/topics/http/views.txt
-@@ -122,6 +122,8 @@ In order to use the ``Http404`` exception to its fullest, you should create a
- template that is displayed when a 404 error is raised. This template should be
- called ``404.html`` and located in the top level of your template tree.
- 
-+.. _customizing-error-views:
-+
- Customizing error views
- =======================
- 
-diff --git a/docs/topics/i18n/internationalization.txt b/docs/topics/i18n/internationalization.txt
-index 5d50fa7..a83299c 100644
---- a/docs/topics/i18n/internationalization.txt
-+++ b/docs/topics/i18n/internationalization.txt
-@@ -477,7 +477,7 @@ for use within the translation block. Examples::
- 
- You can use multiple expressions inside a single ``blocktrans`` tag::
- 
--    {% blocktrans with book_t=book|title and author_t=author|title %}
-+    {% blocktrans with book_t=book|title author_t=author|title %}
-     This is {{ book_t }} by {{ author_t }}
-     {% endblocktrans %}
- 
-diff --git a/docs/topics/settings.txt b/docs/topics/settings.txt
-index 61ddf8c..bda51f2 100644
---- a/docs/topics/settings.txt
-+++ b/docs/topics/settings.txt
-@@ -39,7 +39,7 @@ The value of ``DJANGO_SETTINGS_MODULE`` should be in Python path syntax, e.g.
- ``mysite.settings``. Note that the settings module should be on the
- Python `import search path`_.
- 
--.. _import search path: http://diveintopython.org/getting_to_know_python/everything_is_an_object.html
-+.. _import search path: http://diveintopython.net/getting_to_know_python/everything_is_an_object.html
- 
- The django-admin.py utility
- ---------------------------
-diff --git a/docs/topics/templates.txt b/docs/topics/templates.txt
-index 83269ae..fc2cd3f 100644
---- a/docs/topics/templates.txt
-+++ b/docs/topics/templates.txt
-@@ -555,6 +555,8 @@ variable that needs escaping. When auto-escaping is on, there's no danger of
- the ``escape`` filter *double-escaping* data -- the ``escape`` filter does not
- affect auto-escaped variables.
- 
-+.. _string-literals-and-automatic-escaping:
-+
- String literals and automatic escaping
- --------------------------------------
- 
-diff --git a/docs/topics/testing.txt b/docs/topics/testing.txt
-index 0a86f0d..8262b57 100644
---- a/docs/topics/testing.txt
-+++ b/docs/topics/testing.txt
-@@ -1586,7 +1586,7 @@ skipUnlessDBFeature
- Skip the decorated test if the named database feature is *not*
- supported.
- 
--For example, the following test will not be executed if the database
-+For example, the following test will only be executed if the database
- supports transactions (e.g., it would run under PostgreSQL, but *not*
- under MySQL with MyISAM tables)::
- 
-diff --git a/tests/modeltests/validators/tests.py b/tests/modeltests/validators/tests.py
-index e585262..4bd5827 100644
---- a/tests/modeltests/validators/tests.py
-+++ b/tests/modeltests/validators/tests.py
-@@ -28,6 +28,9 @@ TEST_DATA = (
-     (validate_email, 'abc', ValidationError),
-     (validate_email, 'a @x.cz', ValidationError),
-     (validate_email, 'something@@somewhere.com', ValidationError),
-+    # Quoted-string format (CR not allowed)
-+    (validate_email, '"\\\011"@here.com', None),
-+    (validate_email, '"\\\012"@here.com', ValidationError),
- 
-     (validate_slug, 'slug-ok', None),
-     (validate_slug, 'longer-slug-still-ok', None),
-diff --git a/tests/regressiontests/httpwrappers/tests.py b/tests/regressiontests/httpwrappers/tests.py
-index 2e2932f..6aabfe6 100644
---- a/tests/regressiontests/httpwrappers/tests.py
-+++ b/tests/regressiontests/httpwrappers/tests.py
-@@ -281,3 +281,9 @@ class CookieTests(unittest.TestCase):
-         Test that a single non-standard cookie name doesn't affect all cookies. Ticket #13007.
-         """
-         self.assertTrue('good_cookie' in parse_cookie('good_cookie=yes;bad:cookie=yes').keys())
-+
-+    def test_repeated_nonstandard_keys(self):
-+        """
-+        Test that a repeated non-standard name doesn't affect all cookies. Ticket #15852
-+        """
-+        self.assertTrue('good_cookie' in parse_cookie('a,=b; a,=c; good_cookie=yes').keys())
-diff --git a/tests/regressiontests/utils/http.py b/tests/regressiontests/utils/http.py
-index 83a4a7f..666d04f 100644
---- a/tests/regressiontests/utils/http.py
-+++ b/tests/regressiontests/utils/http.py
-@@ -1,5 +1,7 @@
- from django.utils import http
- from django.utils import unittest
-+from django.http import HttpResponse, utils
-+from django.test import RequestFactory
- 
- class TestUtilsHttp(unittest.TestCase):
- 
-@@ -21,3 +23,49 @@ class TestUtilsHttp(unittest.TestCase):
-         self.assertFalse(http.same_origin('http://foo.com', 'http://foo.com.evil.com'))
-         # Different port
-         self.assertFalse(http.same_origin('http://foo.com:8000', 'http://foo.com:8001'))
-+
-+    def test_fix_IE_for_vary(self):
-+        """
-+        Regression for #16632.
-+
-+        `fix_IE_for_vary` shouldn't crash when there's no Content-Type header.
-+        """
-+
-+        # functions to generate responses
-+        def response_with_unsafe_content_type():
-+            r = HttpResponse(content_type="text/unsafe")
-+            r['Vary'] = 'Cookie'
-+            return r
-+
-+        def no_content_response_with_unsafe_content_type():
-+            # 'Content-Type' always defaulted, so delete it
-+            r = response_with_unsafe_content_type()
-+            del r['Content-Type']
-+            return r
-+
-+        # request with & without IE user agent
-+        rf = RequestFactory()
-+        request = rf.get('/')
-+        ie_request = rf.get('/', HTTP_USER_AGENT='MSIE')
-+
-+        # not IE, unsafe_content_type
-+        response = response_with_unsafe_content_type()
-+        utils.fix_IE_for_vary(request, response)
-+        self.assertTrue('Vary' in response)
-+
-+        # IE, unsafe_content_type
-+        response = response_with_unsafe_content_type()
-+        utils.fix_IE_for_vary(ie_request, response)
-+        self.assertFalse('Vary' in response)
-+
-+        # not IE, no_content
-+        response = no_content_response_with_unsafe_content_type()
-+        utils.fix_IE_for_vary(request, response)
-+        self.assertTrue('Vary' in response)
-+
-+        # IE, no_content
-+        response = no_content_response_with_unsafe_content_type()
-+        utils.fix_IE_for_vary(ie_request, response)
-+        self.assertFalse('Vary' in response)
-+
-+
diff --git a/libre/django13/diff-django_branches_releases_1.3.X-from-16771-to-17460.diff b/libre/django13/diff-django_branches_releases_1.3.X-from-16771-to-17460.diff
deleted file mode 100644
index ebbf80993..000000000
--- a/libre/django13/diff-django_branches_releases_1.3.X-from-16771-to-17460.diff
+++ /dev/null
@@ -1,1575 +0,0 @@
-Index: django/http/__init__.py
-===================================================================
---- django/http/__init__.py	(revision 16771)
-+++ django/http/__init__.py	(revision 17460)
-@@ -92,7 +92,7 @@
-         if not _cookie_allows_colon_in_names:
-             def load(self, rawdata, ignore_parse_errors=False):
-                 if ignore_parse_errors:
--                    self.bad_cookies = []
-+                    self.bad_cookies = set()
-                     self._BaseCookie__set = self._loose_set
-                 super(SimpleCookie, self).load(rawdata)
-                 if ignore_parse_errors:
-@@ -106,8 +106,8 @@
-                 try:
-                     self._strict_set(key, real_value, coded_value)
-                 except Cookie.CookieError:
--                    self.bad_cookies.append(key)
--                    dict.__setitem__(self, key, None)
-+                    self.bad_cookies.add(key)
-+                    dict.__setitem__(self, key, Cookie.Morsel())
-
-
- class CompatCookie(SimpleCookie):
-Index: django/http/utils.py
-===================================================================
---- django/http/utils.py	(revision 16771)
-+++ django/http/utils.py	(revision 17460)
-@@ -76,7 +76,8 @@
-
-     # The first part of the Content-Type field will be the MIME type,
-     # everything after ';', such as character-set, can be ignored.
--    if response['Content-Type'].split(';')[0] not in safe_mime_types:
-+    mime_type = response.get('Content-Type', '').partition(';')[0]
-+    if mime_type not in safe_mime_types:
-         try:
-             del response['Vary']
-         except KeyError:
-Index: django/db/backends/creation.py
-===================================================================
---- django/db/backends/creation.py	(revision 16771)
-+++ django/db/backends/creation.py	(revision 17460)
-@@ -374,15 +374,6 @@
-             verbosity=max(verbosity - 1, 0),
-             interactive=False,
-             database=self.connection.alias)
--
--        # One effect of calling syncdb followed by flush is that the id of the
--        # default site may or may not be 1, depending on how the sequence was
--        # reset.  If the sites app is loaded, then we coerce it.
--        from django.db.models import get_model
--        if 'django.contrib.sites' in settings.INSTALLED_APPS:
--            Site = get_model('sites', 'Site')
--            if Site is not None and Site.objects.using(self.connection.alias).count() == 1:
--                Site.objects.using(self.connection.alias).update(id=settings.SITE_ID)
-
-         from django.core.cache import get_cache
-         from django.core.cache.backends.db import BaseDatabaseCache
-Index: django/core/validators.py
-===================================================================
---- django/core/validators.py	(revision 16771)
-+++ django/core/validators.py	(revision 17460)
-@@ -147,7 +147,8 @@
-
- email_re = re.compile(
-     r"(^[-!#$%&'*+/=?^_`{}|~0-9A-Z]+(\.[-!#$%&'*+/=?^_`{}|~0-9A-Z]+)*"  # dot-atom
--    r'|^"([\001-\010\013\014\016-\037!#-\[\]-\177]|\\[\001-011\013\014\016-\177])*"' # quoted-string
-+    # quoted-string, see also http://tools.ietf.org/html/rfc2822#section-3.2.5
-+    r'|^"([\001-\010\013\014\016-\037!#-\[\]-\177]|\\[\001-\011\013\014\016-\177])*"'
-     r')@(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+[A-Z]{2,6}\.?$', re.IGNORECASE)  # domain
- validate_email = EmailValidator(email_re, _(u'Enter a valid e-mail address.'), 'invalid')
-
-Index: django/core/management/commands/shell.py
-===================================================================
---- django/core/management/commands/shell.py	(revision 16771)
-+++ django/core/management/commands/shell.py	(revision 17460)
-@@ -13,9 +13,8 @@
-
-     def ipython(self):
-         try:
--            from IPython.frontend.terminal.embed import TerminalInteractiveShell
--            shell = TerminalInteractiveShell()
--            shell.mainloop()
-+            from IPython import embed
-+            embed()
-         except ImportError:
-             # IPython < 0.11
-             # Explicitly pass an empty list as arguments, because otherwise
-Index: django/contrib/gis/db/models/sql/compiler.py
-===================================================================
---- django/contrib/gis/db/models/sql/compiler.py	(revision 16771)
-+++ django/contrib/gis/db/models/sql/compiler.py	(revision 17460)
-@@ -1,7 +1,7 @@
- from itertools import izip
--from django.db.backends.util import truncate_name
-+from django.db.backends.util import truncate_name, typecast_timestamp
- from django.db.models.sql import compiler
--from django.db.models.sql.constants import TABLE_NAME
-+from django.db.models.sql.constants import TABLE_NAME, MULTI
- from django.db.models.sql.query import get_proxied_model
-
- SQLCompiler = compiler.SQLCompiler
-@@ -194,7 +194,7 @@
-             # We resolve the rest of the columns if we're on Oracle or if
-             # the `geo_values` attribute is defined.
-             for value, field in map(None, row[index_start:], fields):
--                values.append(self.query.convert_values(value, field, connection=self.connection))
-+                values.append(self.query.convert_values(value, field, self.connection))
-         else:
-             values.extend(row[index_start:])
-         return tuple(values)
-@@ -275,4 +275,24 @@
-     pass
-
- class SQLDateCompiler(compiler.SQLDateCompiler, GeoSQLCompiler):
--    pass
-+    """
-+    This is overridden for GeoDjango to properly cast date columns, since
-+    `GeoQuery.resolve_columns` is used for spatial values.
-+    See #14648, #16757.
-+    """
-+    def results_iter(self):
-+        if self.connection.ops.oracle:
-+            from django.db.models.fields import DateTimeField
-+            fields = [DateTimeField()]
-+        else:
-+            needs_string_cast = self.connection.features.needs_datetime_string_cast
-+
-+        offset = len(self.query.extra_select)
-+        for rows in self.execute_sql(MULTI):
-+            for row in rows:
-+                date = row[offset]
-+                if self.connection.ops.oracle:
-+                    date = self.resolve_columns(row, fields)[offset]
-+                elif needs_string_cast:
-+                    date = typecast_timestamp(str(date))
-+                yield date
-Index: django/contrib/gis/db/backends/spatialite/compiler.py
-===================================================================
---- django/contrib/gis/db/backends/spatialite/compiler.py	(revision 16771)
-+++ django/contrib/gis/db/backends/spatialite/compiler.py	(revision 17460)
-@@ -1,32 +0,0 @@
--from django.db.backends.util import typecast_timestamp
--from django.db.models.sql import compiler
--from django.db.models.sql.constants import MULTI
--from django.contrib.gis.db.models.sql.compiler import GeoSQLCompiler as BaseGeoSQLCompiler
--
--SQLCompiler = compiler.SQLCompiler
--
--class GeoSQLCompiler(BaseGeoSQLCompiler, SQLCompiler):
--    pass
--
--class SQLInsertCompiler(compiler.SQLInsertCompiler, GeoSQLCompiler):
--    pass
--
--class SQLDeleteCompiler(compiler.SQLDeleteCompiler, GeoSQLCompiler):
--    pass
--
--class SQLUpdateCompiler(compiler.SQLUpdateCompiler, GeoSQLCompiler):
--    pass
--
--class SQLAggregateCompiler(compiler.SQLAggregateCompiler, GeoSQLCompiler):
--    pass
--
--class SQLDateCompiler(compiler.SQLDateCompiler, GeoSQLCompiler):
--    """
--    This is overridden for GeoDjango to properly cast date columns, see #16757.
--    """
--    def results_iter(self):
--        offset = len(self.query.extra_select)
--        for rows in self.execute_sql(MULTI):
--            for row in rows:
--                date = typecast_timestamp(str(row[offset]))
--                yield date
-Index: django/contrib/gis/db/backends/spatialite/operations.py
-===================================================================
---- django/contrib/gis/db/backends/spatialite/operations.py	(revision 16771)
-+++ django/contrib/gis/db/backends/spatialite/operations.py	(revision 17460)
-@@ -48,7 +48,7 @@
-     return (SpatiaLiteDistance(operator),)
-
- class SpatiaLiteOperations(DatabaseOperations, BaseSpatialOperations):
--    compiler_module = 'django.contrib.gis.db.backends.spatialite.compiler'
-+    compiler_module = 'django.contrib.gis.db.models.sql.compiler'
-     name = 'spatialite'
-     spatialite = True
-     version_regex = re.compile(r'^(?P<major>\d)\.(?P<minor1>\d)\.(?P<minor2>\d+)')
-Index: django/contrib/gis/db/backends/spatialite/creation.py
-===================================================================
---- django/contrib/gis/db/backends/spatialite/creation.py	(revision 16771)
-+++ django/contrib/gis/db/backends/spatialite/creation.py	(revision 17460)
-@@ -56,14 +56,6 @@
-             interactive=False,
-             database=self.connection.alias)
-
--        # One effect of calling syncdb followed by flush is that the id of the
--        # default site may or may not be 1, depending on how the sequence was
--        # reset.  If the sites app is loaded, then we coerce it.
--        from django.db.models import get_model
--        Site = get_model('sites', 'Site')
--        if Site is not None and Site.objects.using(self.connection.alias).count() == 1:
--            Site.objects.using(self.connection.alias).update(id=settings.SITE_ID)
--
-         from django.core.cache import get_cache
-         from django.core.cache.backends.db import BaseDatabaseCache
-         for cache_alias in settings.CACHES:
-Index: django/contrib/gis/tests/relatedapp/fixtures/initial_data.json.gz
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
-Index: django/contrib/gis/tests/relatedapp/tests.py
-===================================================================
---- django/contrib/gis/tests/relatedapp/tests.py	(revision 16771)
-+++ django/contrib/gis/tests/relatedapp/tests.py	(revision 17460)
-@@ -1,3 +1,4 @@
-+from datetime import date
- from django.test import TestCase
-
- from django.contrib.gis.geos import GEOSGeometry, Point, MultiPoint
-@@ -281,4 +282,11 @@
-         # evaluated as list generation swallows TypeError in CPython.
-         sql = str(qs.query)
-
-+    def test16_annotated_date_queryset(self):
-+        "Ensure annotated date querysets work if spatial backend is used.  See #14648."
-+        birth_years = [dt.year for dt in
-+                       list(Author.objects.annotate(num_books=Count('books')).dates('dob', 'year'))]
-+        birth_years.sort()
-+        self.assertEqual([1950, 1974], birth_years)
-+
-     # TODO: Related tests for KML, GML, and distance lookups.
-Index: django/contrib/gis/tests/relatedapp/models.py
-===================================================================
---- django/contrib/gis/tests/relatedapp/models.py	(revision 16771)
-+++ django/contrib/gis/tests/relatedapp/models.py	(revision 17460)
-@@ -36,6 +36,7 @@
- # These use the GeoManager but do not have any geographic fields.
- class Author(models.Model):
-     name = models.CharField(max_length=100)
-+    dob = models.DateField()
-     objects = models.GeoManager()
-
- class Article(models.Model):
-Index: django/contrib/sites/management.py
-===================================================================
---- django/contrib/sites/management.py	(revision 16771)
-+++ django/contrib/sites/management.py	(revision 17460)
-@@ -3,15 +3,34 @@
- """
-
- from django.db.models import signals
-+from django.db import connections
-+from django.db import router
- from django.contrib.sites.models import Site
- from django.contrib.sites import models as site_app
-+from django.core.management.color import no_style
-
- def create_default_site(app, created_models, verbosity, db, **kwargs):
--    if Site in created_models:
-+    # Only create the default sites in databases where Django created the table
-+    if Site in created_models and router.allow_syncdb(db, Site) :
-+        # The default settings set SITE_ID = 1, and some tests in Django's test
-+        # suite rely on this value. However, if database sequences are reused
-+        # (e.g. in the test suite after flush/syncdb), it isn't guaranteed that
-+        # the next id will be 1, so we coerce it. See #15573 and #16353. This
-+        # can also crop up outside of tests - see #15346.
-         if verbosity >= 2:
-             print "Creating example.com Site object"
--        s = Site(domain="example.com", name="example.com")
--        s.save(using=db)
-+        Site(pk=1, domain="example.com", name="example.com").save(using=db)
-+
-+        # We set an explicit pk instead of relying on auto-incrementation,
-+        # so we need to reset the database sequence.
-+        sequence_sql = connections[db].ops.sequence_reset_sql(no_style(), [Site])
-+        if sequence_sql:
-+            if verbosity >= 2:
-+                print "Resetting sequence"
-+            cursor = connections[db].cursor()
-+            for command in sequence_sql:
-+                cursor.execute(command)
-+
-     Site.objects.clear_cache()
-
- signals.post_syncdb.connect(create_default_site, sender=site_app)
-Index: django/contrib/sites/tests.py
-===================================================================
---- django/contrib/sites/tests.py	(revision 16771)
-+++ django/contrib/sites/tests.py	(revision 17460)
-@@ -15,6 +15,12 @@
-     def tearDown(self):
-         Site._meta.installed = self.old_Site_meta_installed
-
-+    def test_save_another(self):
-+        # Regression for #17415
-+        # On some backends the sequence needs reset after save with explicit ID.
-+        # Test that there is no sequence collisions by saving another site.
-+        Site(domain="example2.com", name="example2.com").save()
-+
-     def test_site_manager(self):
-         # Make sure that get_current() does not return a deleted Site object.
-         s = Site.objects.get_current()
-Index: django/contrib/admin/media/css/forms.css
-===================================================================
---- django/contrib/admin/media/css/forms.css	(revision 16771)
-+++ django/contrib/admin/media/css/forms.css	(revision 17460)
-@@ -352,9 +352,3 @@
- .empty-form {
-     display: none;
- }
--
--/* IE7 specific bug fixes */
--
--.submit-row input {
--    float: right;
--}
-\ No newline at end of file
-Index: tests/modeltests/validators/tests.py
-===================================================================
---- tests/modeltests/validators/tests.py	(revision 16771)
-+++ tests/modeltests/validators/tests.py	(revision 17460)
-@@ -28,6 +28,9 @@
-     (validate_email, 'abc', ValidationError),
-     (validate_email, 'a @x.cz', ValidationError),
-     (validate_email, 'something@@somewhere.com', ValidationError),
-+    # Quoted-string format (CR not allowed)
-+    (validate_email, '"\\\011"@here.com', None),
-+    (validate_email, '"\\\012"@here.com', ValidationError),
-
-     (validate_slug, 'slug-ok', None),
-     (validate_slug, 'longer-slug-still-ok', None),
-Index: tests/regressiontests/utils/http.py
-===================================================================
---- tests/regressiontests/utils/http.py	(revision 16771)
-+++ tests/regressiontests/utils/http.py	(revision 17460)
-@@ -1,5 +1,7 @@
- from django.utils import http
- from django.utils import unittest
-+from django.http import HttpResponse, utils
-+from django.test import RequestFactory
-
- class TestUtilsHttp(unittest.TestCase):
-
-@@ -21,3 +23,49 @@
-         self.assertFalse(http.same_origin('http://foo.com', 'http://foo.com.evil.com'))
-         # Different port
-         self.assertFalse(http.same_origin('http://foo.com:8000', 'http://foo.com:8001'))
-+
-+    def test_fix_IE_for_vary(self):
-+        """
-+        Regression for #16632.
-+
-+        `fix_IE_for_vary` shouldn't crash when there's no Content-Type header.
-+        """
-+
-+        # functions to generate responses
-+        def response_with_unsafe_content_type():
-+            r = HttpResponse(content_type="text/unsafe")
-+            r['Vary'] = 'Cookie'
-+            return r
-+
-+        def no_content_response_with_unsafe_content_type():
-+            # 'Content-Type' always defaulted, so delete it
-+            r = response_with_unsafe_content_type()
-+            del r['Content-Type']
-+            return r
-+
-+        # request with & without IE user agent
-+        rf = RequestFactory()
-+        request = rf.get('/')
-+        ie_request = rf.get('/', HTTP_USER_AGENT='MSIE')
-+
-+        # not IE, unsafe_content_type
-+        response = response_with_unsafe_content_type()
-+        utils.fix_IE_for_vary(request, response)
-+        self.assertTrue('Vary' in response)
-+
-+        # IE, unsafe_content_type
-+        response = response_with_unsafe_content_type()
-+        utils.fix_IE_for_vary(ie_request, response)
-+        self.assertFalse('Vary' in response)
-+
-+        # not IE, no_content
-+        response = no_content_response_with_unsafe_content_type()
-+        utils.fix_IE_for_vary(request, response)
-+        self.assertTrue('Vary' in response)
-+
-+        # IE, no_content
-+        response = no_content_response_with_unsafe_content_type()
-+        utils.fix_IE_for_vary(ie_request, response)
-+        self.assertFalse('Vary' in response)
-+
-+
-Index: tests/regressiontests/httpwrappers/tests.py
-===================================================================
---- tests/regressiontests/httpwrappers/tests.py	(revision 16771)
-+++ tests/regressiontests/httpwrappers/tests.py	(revision 17460)
-@@ -281,3 +281,9 @@
-         Test that a single non-standard cookie name doesn't affect all cookies. Ticket #13007.
-         """
-         self.assertTrue('good_cookie' in parse_cookie('good_cookie=yes;bad:cookie=yes').keys())
-+
-+    def test_repeated_nonstandard_keys(self):
-+        """
-+        Test that a repeated non-standard name doesn't affect all cookies. Ticket #15852
-+        """
-+        self.assertTrue('good_cookie' in parse_cookie('a,=b; a,=c; good_cookie=yes').keys())
-Index: docs/index.txt
-===================================================================
---- docs/index.txt	(revision 16771)
-+++ docs/index.txt	(revision 17460)
-@@ -28,7 +28,7 @@
- .. _archives of the django-users mailing list: http://groups.google.com/group/django-users/
- .. _post a question: http://groups.google.com/group/django-users/
- .. _#django IRC channel: irc://irc.freenode.net/django
--.. _IRC logs: http://botland.oebfare.com/logger/django/
-+.. _IRC logs: http://django-irc-logs.com/
- .. _ticket tracker: http://code.djangoproject.com/
-
- First steps
-Index: docs/intro/tutorial01.txt
-===================================================================
---- docs/intro/tutorial01.txt	(revision 16771)
-+++ docs/intro/tutorial01.txt	(revision 17460)
-@@ -59,7 +59,7 @@
-    can be run as a program. To do this, open Terminal.app and navigate (using
-    the ``cd`` command) to the directory where :doc:`django-admin.py
-    </ref/django-admin>` is installed, then run the command
--   ``chmod +x django-admin.py``.
-+   ``sudo chmod +x django-admin.py``.
-
- .. note::
-
-@@ -692,10 +692,9 @@
-
- For more information on model relations, see :doc:`Accessing related objects
- </ref/models/relations>`. For more on how to use double underscores to perform
--field lookups via the API, see `Field lookups`__. For full details on the
--database API, see our :doc:`Database API reference </topics/db/queries>`.
-+field lookups via the API, see :ref:`Field lookups <field-lookups-intro>`. For
-+full details on the database API, see our :doc:`Database API reference
-+</topics/db/queries>`.
-
--__ http://docs.djangoproject.com/en/1.2/topics/db/queries/#field-lookups
--
- When you're comfortable with the API, read :doc:`part 2 of this tutorial
- </intro/tutorial02>` to get Django's automatic admin working.
-Index: docs/intro/tutorial02.txt
-===================================================================
---- docs/intro/tutorial02.txt	(revision 16771)
-+++ docs/intro/tutorial02.txt	(revision 17460)
-@@ -40,22 +40,22 @@
-
-       .. parsed-literal::
-
--          from django.conf.urls.defaults import *
-+          from django.conf.urls.defaults import patterns, include, url
-
-           # Uncomment the next two lines to enable the admin:
-           **from django.contrib import admin**
-           **admin.autodiscover()**
-
-           urlpatterns = patterns('',
--              # Example:
--              # (r'^mysite/', include('mysite.foo.urls')),
-+              # Examples:
-+              # url(r'^$', 'mysite.views.home', name='home'),
-+              # url(r'^mysite/', include('mysite.foo.urls')),
-
--              # Uncomment the admin/doc line below and add 'django.contrib.admindocs'
--              # to INSTALLED_APPS to enable admin documentation:
--              # (r'^admin/doc/', include('django.contrib.admindocs.urls')),
-+              # Uncomment the admin/doc line below to enable admin documentation:
-+              # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
-
-               # Uncomment the next line to enable the admin:
--              **(r'^admin/', include(admin.site.urls)),**
-+              **url(r'^admin/', include(admin.site.urls)),**
-           )
-
-       (The bold lines are the ones that needed to be uncommented.)
-Index: docs/intro/tutorial03.txt
-===================================================================
---- docs/intro/tutorial03.txt	(revision 16771)
-+++ docs/intro/tutorial03.txt	(revision 17460)
-@@ -78,17 +78,17 @@
-
- Time for an example. Edit ``mysite/urls.py`` so it looks like this::
-
--    from django.conf.urls.defaults import *
-+    from django.conf.urls.defaults import patterns, include, url
-
-     from django.contrib import admin
-     admin.autodiscover()
-
-     urlpatterns = patterns('',
--        (r'^polls/$', 'polls.views.index'),
--        (r'^polls/(?P<poll_id>\d+)/$', 'polls.views.detail'),
--        (r'^polls/(?P<poll_id>\d+)/results/$', 'polls.views.results'),
--        (r'^polls/(?P<poll_id>\d+)/vote/$', 'polls.views.vote'),
--        (r'^admin/', include(admin.site.urls)),
-+        url(r'^polls/$', 'polls.views.index'),
-+        url(r'^polls/(?P<poll_id>\d+)/$', 'polls.views.detail'),
-+        url(r'^polls/(?P<poll_id>\d+)/results/$', 'polls.views.results'),
-+        url(r'^polls/(?P<poll_id>\d+)/vote/$', 'polls.views.vote'),
-+        url(r'^admin/', include(admin.site.urls)),
-     )
-
- This is worth a review. When somebody requests a page from your Web site -- say,
-@@ -112,7 +112,7 @@
- -- unless you have a sick sense of humor, in which case you can do something
- like this::
-
--    (r'^polls/latest\.php$', 'polls.views.index'),
-+    url(r'^polls/latest\.php$', 'polls.views.index'),
-
- But, don't do that. It's silly.
-
-@@ -357,23 +357,24 @@
- Write a 404 (page not found) view
- =================================
-
--When you raise :exc:`~django.http.Http404` from within a view, Django will load
--a special view devoted to handling 404 errors. It finds it by looking for the
--variable ``handler404``, which is a string in Python dotted syntax -- the same
--format the normal URLconf callbacks use. A 404 view itself has nothing special:
--It's just a normal view.
-+When you raise :exc:`~django.http.Http404` from within a view, Django
-+will load a special view devoted to handling 404 errors. It finds it
-+by looking for the variable ``handler404`` in your root URLconf (and
-+only in your root URLconf; setting ``handler404`` anywhere else will
-+have no effect), which is a string in Python dotted syntax -- the same
-+format the normal URLconf callbacks use. A 404 view itself has nothing
-+special: It's just a normal view.
-
--You normally won't have to bother with writing 404 views. By default, URLconfs
--have the following line up top::
-+You normally won't have to bother with writing 404 views. If you don't set
-+``handler404``, the built-in view :func:`django.views.defaults.page_not_found`
-+is used by default. In this case, you still have one obligation: To create a
-+``404.html`` template in the root of your template directory. The default 404
-+view will use that template for all 404 errors. If :setting:`DEBUG` is set to
-+``False`` (in your settings module) and if you didn't create a ``404.html``
-+file, an ``Http500`` is raised instead.  So remember to create a ``404.html``.
-
--    from django.conf.urls.defaults import *
-+A couple more things to note about 404 views:
-
--That takes care of setting ``handler404`` in the current module. As you can see
--in ``django/conf/urls/defaults.py``, ``handler404`` is set to
--:func:`django.views.defaults.page_not_found` by default.
--
--Four more things to note about 404 views:
--
-     * If :setting:`DEBUG` is set to ``True`` (in your settings module) then your
-       404 view will never be used (and thus the ``404.html`` template will never
-       be rendered) because the traceback will be displayed instead.
-@@ -381,21 +382,12 @@
-     * The 404 view is also called if Django doesn't find a match after checking
-       every regular expression in the URLconf.
-
--    * If you don't define your own 404 view -- and simply use the default, which
--      is recommended -- you still have one obligation: To create a ``404.html``
--      template in the root of your template directory. The default 404 view will
--      use that template for all 404 errors.
--
--    * If :setting:`DEBUG` is set to ``False`` (in your settings module) and if
--      you didn't create a ``404.html`` file, an ``Http500`` is raised instead.
--      So remember to create a ``404.html``.
--
- Write a 500 (server error) view
- ===============================
-
--Similarly, URLconfs may define a ``handler500``, which points to a view to call
--in case of server errors. Server errors happen when you have runtime errors in
--view code.
-+Similarly, your root URLconf may define a ``handler500``, which points
-+to a view to call in case of server errors. Server errors happen when
-+you have runtime errors in view code.
-
- Use the template system
- =======================
-@@ -432,10 +424,10 @@
- the URLconf, you may notice there's a fair bit of redundancy in it::
-
-     urlpatterns = patterns('',
--        (r'^polls/$', 'polls.views.index'),
--        (r'^polls/(?P<poll_id>\d+)/$', 'polls.views.detail'),
--        (r'^polls/(?P<poll_id>\d+)/results/$', 'polls.views.results'),
--        (r'^polls/(?P<poll_id>\d+)/vote/$', 'polls.views.vote'),
-+        url(r'^polls/$', 'polls.views.index'),
-+        url(r'^polls/(?P<poll_id>\d+)/$', 'polls.views.detail'),
-+        url(r'^polls/(?P<poll_id>\d+)/results/$', 'polls.views.results'),
-+        url(r'^polls/(?P<poll_id>\d+)/vote/$', 'polls.views.vote'),
-     )
-
- Namely, ``polls.views`` is in every callback.
-@@ -445,10 +437,10 @@
- first argument to :func:`~django.conf.urls.defaults.patterns`, like so::
-
-     urlpatterns = patterns('polls.views',
--        (r'^polls/$', 'index'),
--        (r'^polls/(?P<poll_id>\d+)/$', 'detail'),
--        (r'^polls/(?P<poll_id>\d+)/results/$', 'results'),
--        (r'^polls/(?P<poll_id>\d+)/vote/$', 'vote'),
-+        url(r'^polls/$', 'index'),
-+        url(r'^polls/(?P<poll_id>\d+)/$', 'detail'),
-+        url(r'^polls/(?P<poll_id>\d+)/results/$', 'results'),
-+        url(r'^polls/(?P<poll_id>\d+)/vote/$', 'vote'),
-     )
-
- This is functionally identical to the previous formatting. It's just a bit
-@@ -459,20 +451,20 @@
- :func:`~django.conf.urls.defaults.patterns`. Your full ``mysite/urls.py`` might
- now look like this::
-
--    from django.conf.urls.defaults import *
-+    from django.conf.urls.defaults import patterns, include, url
-
-     from django.contrib import admin
-     admin.autodiscover()
-
-     urlpatterns = patterns('polls.views',
--        (r'^polls/$', 'index'),
--        (r'^polls/(?P<poll_id>\d+)/$', 'detail'),
--        (r'^polls/(?P<poll_id>\d+)/results/$', 'results'),
--        (r'^polls/(?P<poll_id>\d+)/vote/$', 'vote'),
-+        url(r'^polls/$', 'index'),
-+        url(r'^polls/(?P<poll_id>\d+)/$', 'detail'),
-+        url(r'^polls/(?P<poll_id>\d+)/results/$', 'results'),
-+        url(r'^polls/(?P<poll_id>\d+)/vote/$', 'vote'),
-     )
-
-     urlpatterns += patterns('',
--        (r'^admin/', include(admin.site.urls)),
-+        url(r'^admin/', include(admin.site.urls)),
-     )
-
- Decoupling the URLconfs
-@@ -502,8 +494,8 @@
-     admin.autodiscover()
-
-     urlpatterns = patterns('',
--        (r'^polls/', include('polls.urls')),
--        (r'^admin/', include(admin.site.urls)),
-+        url(r'^polls/', include('polls.urls')),
-+        url(r'^admin/', include(admin.site.urls)),
-     )
-
- :func:`~django.conf.urls.defaults.include` simply references another URLconf.
-@@ -526,13 +518,13 @@
- lines registering the admin site. Your ``polls/urls.py`` file should now look like
- this::
-
--    from django.conf.urls.defaults import *
-+    from django.conf.urls.defaults import patterns, include, url
-
-     urlpatterns = patterns('polls.views',
--        (r'^$', 'index'),
--        (r'^(?P<poll_id>\d+)/$', 'detail'),
--        (r'^(?P<poll_id>\d+)/results/$', 'results'),
--        (r'^(?P<poll_id>\d+)/vote/$', 'vote'),
-+        url(r'^$', 'index'),
-+        url(r'^(?P<poll_id>\d+)/$', 'detail'),
-+        url(r'^(?P<poll_id>\d+)/results/$', 'results'),
-+        url(r'^(?P<poll_id>\d+)/vote/$', 'vote'),
-     )
-
- The idea behind :func:`~django.conf.urls.defaults.include` and URLconf
-Index: docs/intro/index.txt
-===================================================================
---- docs/intro/index.txt	(revision 16771)
-+++ docs/intro/index.txt	(revision 17460)
-@@ -31,6 +31,6 @@
-
-     .. _python: http://python.org/
-     .. _list of Python resources for non-programmers: http://wiki.python.org/moin/BeginnersGuide/NonProgrammers
--    .. _dive into python: http://diveintopython.org/
-+    .. _dive into python: http://diveintopython.net/
-     .. _dead-tree version: http://www.amazon.com/exec/obidos/ASIN/1590593561/ref=nosim/jacobian20
-     .. _books about Python: http://wiki.python.org/moin/PythonBooks
-\ No newline at end of file
-Index: docs/intro/tutorial04.txt
-===================================================================
---- docs/intro/tutorial04.txt	(revision 16771)
-+++ docs/intro/tutorial04.txt	(revision 17460)
-@@ -218,13 +218,13 @@
- First, open the ``polls/urls.py`` URLconf. It looks like this, according to the
- tutorial so far::
-
--    from django.conf.urls.defaults import *
-+    from django.conf.urls.defaults import patterns, include, url
-
-     urlpatterns = patterns('polls.views',
--        (r'^$', 'index'),
--        (r'^(?P<poll_id>\d+)/$', 'detail'),
--        (r'^(?P<poll_id>\d+)/results/$', 'results'),
--        (r'^(?P<poll_id>\d+)/vote/$', 'vote'),
-+        url(r'^$', 'index'),
-+        url(r'^(?P<poll_id>\d+)/$', 'detail'),
-+        url(r'^(?P<poll_id>\d+)/results/$', 'results'),
-+        url(r'^(?P<poll_id>\d+)/vote/$', 'vote'),
-     )
-
- Change it like so::
-@@ -234,12 +234,12 @@
-     from polls.models import Poll
-
-     urlpatterns = patterns('',
--        (r'^$',
-+        url(r'^$',
-             ListView.as_view(
-                 queryset=Poll.objects.order_by('-pub_date')[:5],
-                 context_object_name='latest_poll_list',
-                 template_name='polls/index.html')),
--        (r'^(?P<pk>\d+)/$',
-+        url(r'^(?P<pk>\d+)/$',
-             DetailView.as_view(
-                 model=Poll,
-                 template_name='polls/detail.html')),
-@@ -248,7 +248,7 @@
-                 model=Poll,
-                 template_name='polls/results.html'),
-             name='poll_results'),
--        (r'^(?P<poll_id>\d+)/vote/$', 'polls.views.vote'),
-+        url(r'^(?P<poll_id>\d+)/vote/$', 'polls.views.vote'),
-     )
-
- We're using two generic views here:
-Index: docs/internals/release-process.txt
-===================================================================
---- docs/internals/release-process.txt	(revision 16771)
-+++ docs/internals/release-process.txt	(revision 17460)
-@@ -99,6 +99,13 @@
-     * Security fixes will be applied to the current trunk and the previous two
-       minor releases.
-
-+* Documentation fixes will generally be more freely backported to the last
-+  release branch (at the discretion of the committer), and don't need to meet
-+  the "critical fixes only" bar as it's highly advantageous to have the docs
-+  for the last release be up-to-date and correct, and the downside of
-+  backporting (risk of introducing regressions) is much less of a concern
-+  with doc fixes.
-+
- As a concrete example, consider a moment in time halfway between the release of
- Django 1.3 and 1.4. At this point in time:
-
-@@ -111,6 +118,9 @@
-       ``1.2.X`` branch. Security fixes will trigger the release of ``1.3.1``,
-       ``1.2.1``, etc.
-
-+* Documentation fixes will be applied to trunk, and if easily backported, to
-+  the ``1.3.X`` branch.
-+
- .. _release-process:
-
- Release process
-Index: docs/internals/deprecation.txt
-===================================================================
---- docs/internals/deprecation.txt	(revision 16771)
-+++ docs/internals/deprecation.txt	(revision 17460)
-@@ -177,6 +177,12 @@
-           required to end with a trailing slash to ensure there is a consistent
-           way to combine paths in templates.
-
-+        * Translations located under the so-called *project path* will be
-+          ignored during the translation building process performed at runtime.
-+          The :setting:`LOCALE_PATHS` setting can be used for the same task by
-+          including the filesystem path to a ``locale`` directory containing
-+          non-app-specific translations in its value.
-+
-     * 2.0
-         * ``django.views.defaults.shortcut()``. This function has been moved
-           to ``django.contrib.contenttypes.views.shortcut()`` as part of the
-Index: docs/howto/deployment/modpython.txt
-===================================================================
---- docs/howto/deployment/modpython.txt	(revision 16771)
-+++ docs/howto/deployment/modpython.txt	(revision 17460)
-@@ -293,11 +293,14 @@
- arrangement. You're responsible for setting up Apache, or whichever media
- server you're using, to serve the admin files.
-
--The admin files live in (:file:`django/contrib/admin/static/admin`) of the
-+The admin files live in (:file:`django/contrib/admin/media/admin`) of the
- Django distribution.
-
--We **strongly** recommend using :mod:`django.contrib.staticfiles` to handle
--the admin files, but here are two other approaches:
-+We **strongly** recommend using :mod:`django.contrib.staticfiles` to handle the
-+admin files (this means using the :djadmin:`collectstatic` management command
-+to collect the static files in :setting:`STATIC_ROOT`, and then configuring
-+your webserver to serve :setting:`STATIC_ROOT` at :setting:`STATIC_URL`), but
-+here are two other approaches:
-
-     1. Create a symbolic link to the admin static files from within your
-        document root.
-Index: docs/howto/deployment/modwsgi.txt
-===================================================================
---- docs/howto/deployment/modwsgi.txt	(revision 16771)
-+++ docs/howto/deployment/modwsgi.txt	(revision 17460)
-@@ -127,11 +127,14 @@
- arrangement. You're responsible for setting up Apache, or whichever media
- server you're using, to serve the admin files.
-
--The admin files live in (:file:`django/contrib/admin/static/admin`) of the
-+The admin files live in (:file:`django/contrib/admin/media/admin`) of the
- Django distribution.
-
--We **strongly** recommend using :mod:`django.contrib.staticfiles` to handle
--the admin files, but here are two other approaches:
-+We **strongly** recommend using :mod:`django.contrib.staticfiles` to handle the
-+admin files (this means using the :djadmin:`collectstatic` management command
-+to collect the static files in :setting:`STATIC_ROOT`, and then configuring
-+your webserver to serve :setting:`STATIC_ROOT` at :setting:`STATIC_URL`), but
-+here are two other approaches:
-
-     1. Create a symbolic link to the admin static files from within your
-        document root.
-Index: docs/topics/auth.txt
-===================================================================
---- docs/topics/auth.txt	(revision 16771)
-+++ docs/topics/auth.txt	(revision 17460)
-@@ -1251,17 +1251,20 @@
-         ...
-         class Meta:
-             permissions = (
--                ("can_view", "Can see available tasks"),
--                ("can_change_status", "Can change the status of tasks"),
--                ("can_close", "Can remove a task by setting its status as closed"),
-+                ("view_task", "Can see available tasks"),
-+                ("change_task_status", "Can change the status of tasks"),
-+                ("close_task", "Can remove a task by setting its status as closed"),
-             )
-
- The only thing this does is create those extra permissions when you run
- :djadmin:`manage.py syncdb <syncdb>`. Your code is in charge of checking the
- value of these permissions when an user is trying to access the functionality
- provided by the application (viewing tasks, changing the status of tasks,
--closing tasks.)
-+closing tasks.) Continuing the above example, the following checks if a user may
-+view tasks::
-
-+    user.has_perm('app.view_task')
-+
- API reference
- -------------
-
-Index: docs/topics/http/urls.txt
-===================================================================
---- docs/topics/http/urls.txt	(revision 16771)
-+++ docs/topics/http/urls.txt	(revision 17460)
-@@ -54,6 +54,10 @@
-        :class:`~django.http.HttpRequest` as its first argument and any values
-        captured in the regex as remaining arguments.
-
-+    5. If no regex matches, or if an exception is raised during any
-+       point in this process, Django invokes an appropriate
-+       error-handling view. See `Error handling`_ below.
-+
- Example
- =======
-
-@@ -99,10 +103,10 @@
-     * ``/articles/2003`` would not match any of these patterns, because each
-       pattern requires that the URL end with a slash.
-
--    * ``/articles/2003/03/3/`` would match the final pattern. Django would call
--      the function ``news.views.article_detail(request, '2003', '03', '3')``.
-+    * ``/articles/2003/03/03/`` would match the final pattern. Django would call
-+      the function ``news.views.article_detail(request, '2003', '03', '03')``.
-
--.. _Dive Into Python's explanation: http://diveintopython.org/regular_expressions/street_addresses.html#re.matching.2.3
-+.. _Dive Into Python's explanation: http://diveintopython.net/regular_expressions/street_addresses.html#re.matching.2.3
-
- Named groups
- ============
-@@ -123,7 +127,7 @@
-         (r'^articles/2003/$', 'news.views.special_case_2003'),
-         (r'^articles/(?P<year>\d{4})/$', 'news.views.year_archive'),
-         (r'^articles/(?P<year>\d{4})/(?P<month>\d{2})/$', 'news.views.month_archive'),
--        (r'^articles/(?P<year>\d{4})/(?P<month>\d{2})/(?P<day>\d+)/$', 'news.views.article_detail'),
-+        (r'^articles/(?P<year>\d{4})/(?P<month>\d{2})/(?P<day>\d{2})/$', 'news.views.article_detail'),
-     )
-
- This accomplishes exactly the same thing as the previous example, with one
-@@ -134,8 +138,8 @@
-       ``news.views.month_archive(request, year='2005', month='03')``, instead
-       of ``news.views.month_archive(request, '2005', '03')``.
-
--    * A request to ``/articles/2003/03/3/`` would call the function
--      ``news.views.article_detail(request, year='2003', month='03', day='3')``.
-+    * A request to ``/articles/2003/03/03/`` would call the function
-+      ``news.views.article_detail(request, year='2003', month='03', day='03')``.
-
- In practice, this means your URLconfs are slightly more explicit and less prone
- to argument-order bugs -- and you can reorder the arguments in your views'
-@@ -246,6 +250,31 @@
- ``patterns()`` and is only relevant when you're passing a string as the
- ``view`` parameter.
-
-+include
-+-------
-+
-+.. function:: include(<module or pattern_list>)
-+
-+A function that takes a full Python import path to another URLconf module that
-+should be "included" in this place.
-+
-+:func:`include` also accepts as an argument an iterable that returns URL
-+patterns.
-+
-+See `Including other URLconfs`_ below.
-+
-+Error handling
-+==============
-+
-+When Django can't find a regex matching the requested URL, or when an
-+exception is raised, Django will invoke an error-handling view. The
-+views to use for these cases are specified by two variables which can
-+be set in your root URLconf. Setting these variables in any other
-+URLconf will have no effect.
-+
-+See the documentation on :ref:`customizing error views
-+<customizing-error-views>` for more details.
-+
- handler404
- ----------
-
-@@ -275,19 +304,6 @@
- .. versionchanged:: 1.2
-     Previous versions of Django only accepted strings representing import paths.
-
--include
---------
--
--.. function:: include(<module or pattern_list>)
--
--A function that takes a full Python import path to another URLconf module that
--should be "included" in this place.
--
--:func:`include` also accepts as an argument an iterable that returns URL
--patterns.
--
--See `Including other URLconfs`_ below.
--
- Notes on capturing text in URLs
- ===============================
-
-@@ -420,8 +436,8 @@
-     from django.conf.urls.defaults import *
-
-     extra_patterns = patterns('',
--        url(r'reports/(?P<id>\d+)/$', 'credit.views.report', name='credit-reports'),
--        url(r'charge/$', 'credit.views.charge', name='credit-charge'),
-+        url(r'^reports/(?P<id>\d+)/$', 'credit.views.report', name='credit-reports'),
-+        url(r'^charge/$', 'credit.views.charge', name='credit-charge'),
-     )
-
-     urlpatterns = patterns('',
-Index: docs/topics/http/views.txt
-===================================================================
---- docs/topics/http/views.txt	(revision 16771)
-+++ docs/topics/http/views.txt	(revision 17460)
-@@ -122,6 +122,8 @@
- template that is displayed when a 404 error is raised. This template should be
- called ``404.html`` and located in the top level of your template tree.
-
-+.. _customizing-error-views:
-+
- Customizing error views
- =======================
-
-Index: docs/topics/i18n/internationalization.txt
-===================================================================
---- docs/topics/i18n/internationalization.txt	(revision 16771)
-+++ docs/topics/i18n/internationalization.txt	(revision 17460)
-@@ -477,7 +477,7 @@
-
- You can use multiple expressions inside a single ``blocktrans`` tag::
-
--    {% blocktrans with book_t=book|title and author_t=author|title %}
-+    {% blocktrans with book_t=book|title author_t=author|title %}
-     This is {{ book_t }} by {{ author_t }}
-     {% endblocktrans %}
-
-Index: docs/topics/cache.txt
-===================================================================
---- docs/topics/cache.txt	(revision 16771)
-+++ docs/topics/cache.txt	(revision 17460)
-@@ -99,8 +99,9 @@
-       on your chosen memcached binding)
-
-     * Set :setting:`LOCATION <CACHES-LOCATION>` to ``ip:port`` values,
--      where ``ip`` is the IP address of the Memcached daemon and
--      ``port`` is the port on which Memcached is running.
-+      where ``ip`` is the IP address of the Memcached daemon and ``port`` is the
-+      port on which Memcached is running, or to a ``unix:path`` value, where
-+      ``path`` is the path to a Memcached Unix socket file.
-
- In this example, Memcached is running on localhost (127.0.0.1) port 11211, using
- the ``python-memcached`` binding::
-@@ -112,6 +113,16 @@
-         }
-     }
-
-+In this example, Memcached is available through a local Unix socket file
-+:file:`/tmp/memcached.sock` using the ``python-memcached`` binding::
-+
-+    CACHES = {
-+        'default': {
-+            'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
-+            'LOCATION': 'unix:/tmp/memcached.sock',
-+        }
-+    }
-+
- One excellent feature of Memcached is its ability to share cache over multiple
- servers. This means you can run Memcached daemons on multiple machines, and the
- program will treat the group of machines as a *single* cache, without the need
-@@ -526,9 +537,10 @@
- requested, subsequent requests to that URL will use the cache.
-
- ``cache_page`` can also take an optional keyword argument, ``cache``,
--which directs the decorator to use a specific cache alias when caching view
--results. By default, the ``default`` alias will be used, but you can specify
--any cache alias you want::
-+which directs the decorator to use a specific cache (from your
-+:setting:`CACHES` setting) when caching view results. By default, the
-+``default`` cache will be used, but you can specify any cache you
-+want::
-
-     @cache_page(60 * 15, cache="special_cache")
-     def my_view(request):
-Index: docs/topics/db/models.txt
-===================================================================
---- docs/topics/db/models.txt	(revision 16771)
-+++ docs/topics/db/models.txt	(revision 17460)
-@@ -324,11 +324,10 @@
-     should work; all are optional.
-
-     For details on accessing backwards-related objects, see the
--    `Following relationships backward example`_.
--
-+    :ref:`Following relationships backward example <backwards-related-objects>`.
-+
-     For sample code, see the `Many-to-one relationship model tests`_.
-
--    .. _Following relationships backward example: http://docs.djangoproject.com/en/dev/topics/db/queries/#backwards-related-objects
-     .. _Many-to-one relationship model tests: http://code.djangoproject.com/browser/django/trunk/tests/modeltests/many_to_one
-
- Many-to-many relationships
-Index: docs/topics/db/sql.txt
-===================================================================
---- docs/topics/db/sql.txt	(revision 16771)
-+++ docs/topics/db/sql.txt	(revision 17460)
-@@ -236,6 +236,30 @@
-     # Your code here...
-     transaction.commit_unless_managed(using='my_db_alias')
-
-+By default, the Python DB API will return results without their field
-+names, which means you end up with a ``list`` of values, rather than a
-+``dict``. At a small performance cost, you can return results as a
-+``dict`` by using something like this::
-+
-+    def dictfetchall(cursor):
-+        "Returns all rows from a cursor as a dict"
-+        desc = cursor.description
-+        return [
-+            dict(zip([col[0] for col in desc], row))
-+            for row in cursor.fetchall()
-+        ]
-+
-+Here is an example of the difference between the two::
-+
-+    >>> cursor.execute("SELECT id, parent_id from test LIMIT 2");
-+    >>> cursor.fetchall()
-+    ((54360982L, None), (54360880L, None))
-+
-+    >>> cursor.execute("SELECT id, parent_id from test LIMIT 2");
-+    >>> dictfetchall(cursor)
-+    [{'parent_id': None, 'id': 54360982L}, {'parent_id': None, 'id': 54360880L}]
-+
-+
- .. _transactions-and-raw-sql:
-
- Transactions and raw SQL
-Index: docs/topics/forms/modelforms.txt
-===================================================================
---- docs/topics/forms/modelforms.txt	(revision 16771)
-+++ docs/topics/forms/modelforms.txt	(revision 17460)
-@@ -332,14 +332,18 @@
- .. note::
-
-     If you specify ``fields`` or ``exclude`` when creating a form with
--    ``ModelForm``, then the fields that are not in the resulting form will not
--    be set by the form's ``save()`` method. Django will prevent any attempt to
--    save an incomplete model, so if the model does not allow the missing fields
--    to be empty, and does not provide a default value for the missing fields,
--    any attempt to ``save()`` a ``ModelForm`` with missing fields will fail.
--    To avoid this failure, you must instantiate your model with initial values
--    for the missing, but required fields::
-+    ``ModelForm``, then the fields that are not in the resulting form
-+    will not be set by the form's ``save()`` method. Also, if you
-+    manually add the excluded fields back to the form, they will not
-+    be initialized from the model instance.
-
-+    Django will prevent any attempt to save an incomplete model, so if
-+    the model does not allow the missing fields to be empty, and does
-+    not provide a default value for the missing fields, any attempt to
-+    ``save()`` a ``ModelForm`` with missing fields will fail.  To
-+    avoid this failure, you must instantiate your model with initial
-+    values for the missing, but required fields::
-+
-         author = Author(title='Mr')
-         form = PartialAuthorForm(request.POST, instance=author)
-         form.save()
-@@ -633,6 +637,12 @@
- instance won't be saved to the database and won't be included in the return
- value (``instances``, in the above example).
-
-+When fields are missing from the form (for example because they have
-+been excluded), these fields will not be set by the ``save()``
-+method. You can find more information about this restriction, which
-+also holds for regular ``ModelForms``, in `Using a subset of fields on
-+the form`_.
-+
- Pass ``commit=False`` to return the unsaved model instances::
-
-     # don't save to the database
-Index: docs/topics/class-based-views.txt
-===================================================================
---- docs/topics/class-based-views.txt	(revision 16771)
-+++ docs/topics/class-based-views.txt	(revision 17460)
-@@ -380,7 +380,7 @@
-     class PublisherBookListView(ListView):
-
-         context_object_name = "book_list"
--        template_name = "books/books_by_publisher.html",
-+        template_name = "books/books_by_publisher.html"
-
-         def get_queryset(self):
-             publisher = get_object_or_404(Publisher, name__iexact=self.args[0])
-@@ -396,7 +396,7 @@
-     class PublisherBookListView(ListView):
-
-         context_object_name = "book_list"
--        template_name = "books/books_by_publisher.html",
-+        template_name = "books/books_by_publisher.html"
-
-         def get_queryset(self):
-             self.publisher = get_object_or_404(Publisher, name__iexact=self.args[0])
-Index: docs/topics/testing.txt
-===================================================================
---- docs/topics/testing.txt	(revision 16771)
-+++ docs/topics/testing.txt	(revision 17460)
-@@ -1586,7 +1586,7 @@
- Skip the decorated test if the named database feature is *not*
- supported.
-
--For example, the following test will not be executed if the database
-+For example, the following test will only be executed if the database
- supports transactions (e.g., it would run under PostgreSQL, but *not*
- under MySQL with MyISAM tables)::
-
-Index: docs/topics/templates.txt
-===================================================================
---- docs/topics/templates.txt	(revision 16771)
-+++ docs/topics/templates.txt	(revision 17460)
-@@ -555,6 +555,8 @@
- the ``escape`` filter *double-escaping* data -- the ``escape`` filter does not
- affect auto-escaped variables.
-
-+.. _string-literals-and-automatic-escaping:
-+
- String literals and automatic escaping
- --------------------------------------
-
-Index: docs/topics/settings.txt
-===================================================================
---- docs/topics/settings.txt	(revision 16771)
-+++ docs/topics/settings.txt	(revision 17460)
-@@ -39,7 +39,7 @@
- ``mysite.settings``. Note that the settings module should be on the
- Python `import search path`_.
-
--.. _import search path: http://diveintopython.org/getting_to_know_python/everything_is_an_object.html
-+.. _import search path: http://diveintopython.net/getting_to_know_python/everything_is_an_object.html
-
- The django-admin.py utility
- ---------------------------
-Index: docs/releases/1.2.6.txt
-===================================================================
---- docs/releases/1.2.6.txt	(revision 0)
-+++ docs/releases/1.2.6.txt	(revision 17460)
-@@ -0,0 +1,16 @@
-+==========================
-+Django 1.2.6 release notes
-+==========================
-+
-+*September 9, 2011*
-+
-+Welcome to Django 1.2.6!
-+
-+This is the sixth bugfix/security release in the Django 1.2 series, fixing
-+several security issues present in Django 1.2.5.  Django 1.2.6 is a
-+recommended upgrade for all users of any Django release in the 1.2.X series.
-+
-+For a full list of issues addressed in this release, see the `security
-+advisory`_.
-+
-+.. _security advisory: https://www.djangoproject.com/weblog/2011/sep/09/security-releases-issued/
-Index: docs/releases/1.2.7.txt
-===================================================================
---- docs/releases/1.2.7.txt	(revision 0)
-+++ docs/releases/1.2.7.txt	(revision 17460)
-@@ -0,0 +1,16 @@
-+==========================
-+Django 1.2.7 release notes
-+==========================
-+
-+*September 10, 2011*
-+
-+Welcome to Django 1.2.7!
-+
-+This is the seventh bugfix/security release in the Django 1.2 series. It
-+replaces Django 1.2.6 due to problems with the 1.2.6 release tarball.
-+Django 1.2.7 is a recommended upgrade for all users of any Django release in
-+the 1.2.X series.
-+
-+For more information, see the `release advisory`_.
-+
-+.. _release advisory: https://www.djangoproject.com/weblog/2011/sep/10/127/
-Index: docs/releases/index.txt
-===================================================================
---- docs/releases/index.txt	(revision 16771)
-+++ docs/releases/index.txt	(revision 17460)
-@@ -19,6 +19,7 @@
- .. toctree::
-    :maxdepth: 1
-
-+   1.3.1
-    1.3
-
- 1.2 release
-@@ -26,6 +27,8 @@
- .. toctree::
-    :maxdepth: 1
-
-+   1.2.7
-+   1.2.6
-    1.2.5
-    1.2.4
-    1.2.2
-Index: docs/releases/0.95.txt
-===================================================================
---- docs/releases/0.95.txt	(revision 16771)
-+++ docs/releases/0.95.txt	(revision 17460)
-@@ -92,15 +92,15 @@
- easy checklist_ for reference when undertaking the porting operation.
-
- .. _Removing The Magic: http://code.djangoproject.com/wiki/RemovingTheMagic
--.. _checklist: http://code.djangoproject.com/wiki/MagicRemovalCheatSheet1
-+.. _checklist: http://code.djangoproject.com/wiki/MagicRemovalCheatSheet
-
- Problem reports and getting help
- ================================
-
--Need help resolving a problem with Django? The documentation in the distribution
--is also available online_ at the `Django Web site`_. The :doc:`FAQ </faq/index>`
--document is especially recommended, as it contains a number of issues that come
--up time and again.
-+Need help resolving a problem with Django? The documentation in the
-+distribution is also available :doc:`online </index>` at the `Django Web
-+site`_. The :doc:`FAQ </faq/index>` document is especially recommended, as it
-+contains a number of issues that come up time and again.
-
- For more personalized help, the `django-users`_ mailing list is a very active
- list, with more than 2,000 subscribers who can help you solve any sort of
-@@ -113,7 +113,6 @@
- Django users and developers from around the world. Friendly people are usually
- available at any hour of the day -- to help, or just to chat.
-
--.. _online: http://www.djangoproject.com/documentation/0.95/
- .. _Django Web site: http://www.djangoproject.com/
- .. _django-users: http://groups.google.com/group/django-users
-
-Index: docs/releases/0.96.txt
-===================================================================
---- docs/releases/0.96.txt	(revision 16771)
-+++ docs/releases/0.96.txt	(revision 17460)
-@@ -50,12 +50,10 @@
- maintained, and it will be removed in a future release of Django.
-
- Also, note that some features, like the new :setting:`DATABASE_OPTIONS`
--setting (see the `databases documentation`_ for details), are only
--available on the "mysql" backend, and will not be made available for
-+setting (see the :doc:`databases documentation </ref/databases>` for details),
-+are only available on the "mysql" backend, and will not be made available for
- "mysql_old".
-
--.. _databases documentation: http://www.djangoproject.com/documentation/0.96/databases/
--
- Database constraint names changed
- ---------------------------------
-
-@@ -164,11 +162,9 @@
- for most common cases. We recommend that anyone new to form handling skip the
- old forms system and start with the new.
-
--For more information about ``django.newforms``, read the `newforms
--documentation`_.
-+For more information about ``django.newforms``, read the :doc:`newforms
-+documentation </topics/forms/index>`.
-
--.. _newforms documentation: http://www.djangoproject.com/documentation/0.96/newforms/
--
- URLconf improvements
- --------------------
-
-@@ -216,20 +212,16 @@
- ------------------
-
- Django now includes a test framework so you can start transmuting fear into
--boredom (with apologies to Kent Beck). You can write tests based on doctest_
--or unittest_ and test your views with a simple test client.
-+boredom (with apologies to Kent Beck). You can write tests based on
-+:mod:`doctest` or :mod:`unittest` and test your views with a simple test client.
-
- There is also new support for "fixtures" -- initial data, stored in any of the
--supported `serialization formats`_, that will be loaded into your database at the
--start of your tests. This makes testing with real data much easier.
-+supported :doc:`serialization formats </topics/serialization>`, that will be
-+loaded into your database at the start of your tests. This makes testing with
-+real data much easier.
-
--See `the testing documentation`_ for the full details.
-+See :doc:`the testing documentation </topics/testing>` for the full details.
-
--.. _doctest: http://docs.python.org/library/doctest.html
--.. _unittest: http://docs.python.org/library/unittest.html
--.. _the testing documentation: http://www.djangoproject.com/documentation/0.96/testing/
--.. _serialization formats: http://www.djangoproject.com/documentation/0.96/serialization/
--
- Improvements to the admin interface
- -----------------------------------
-
-Index: docs/releases/1.0.1.txt
-===================================================================
---- docs/releases/1.0.1.txt	(revision 16771)
-+++ docs/releases/1.0.1.txt	(revision 17460)
-@@ -6,10 +6,10 @@
-
- This is the first "bugfix" release in the Django 1.0 series, improving
- the stability and performance of the Django 1.0 codebase. As such,
--Django 1.0.1 contains no new features (and, pursuant to `our
--compatibility policy`_, maintains backwards compatibility with Django
--1.0), but does contain a number of fixes and other
--improvements. Django 1.0.1 is a recommended upgrade for any
-+Django 1.0.1 contains no new features (and, pursuant to :doc:`our
-+compatibility policy </misc/api-stability/>`, maintains backwards
-+compatibility with Django 1.0), but does contain a number of fixes
-+and other improvements. Django 1.0.1 is a recommended upgrade for any
- development or deployment currently using or targeting Django 1.0.
-
-
-@@ -46,8 +46,9 @@
-
- * A fix to the application of autoescaping for literal strings passed
-   to the ``join`` template filter. Previously, literal strings passed
--  to ``join`` were automatically escaped, contrary to `the documented
--  behavior for autoescaping and literal strings`_. Literal strings
-+  to ``join`` were automatically escaped, contrary to :ref:`the
-+  documented behavior for autoescaping and literal strings
-+  <string-literals-and-automatic-escaping>`. Literal strings
-   passed to ``join`` are no longer automatically escaped, meaning you
-   must now manually escape them; this is an incompatibility if you
-   were relying on this bug, but not if you were relying on escaping
-@@ -60,6 +61,4 @@
-   documentation, including both corrections to existing documents and
-   expanded and new documentation.
-
--.. _our compatibility policy: http://docs.djangoproject.com/en/dev/misc/api-stability/
- .. _the Subversion log of the 1.0.X branch: http://code.djangoproject.com/log/django/branches/releases/1.0.X
--.. _the documented behavior for autoescaping and literal strings: http://docs.djangoproject.com/en/dev/topics/templates/#string-literals-and-automatic-escaping
-Index: docs/releases/1.3.1.txt
-===================================================================
---- docs/releases/1.3.1.txt	(revision 0)
-+++ docs/releases/1.3.1.txt	(revision 17460)
-@@ -0,0 +1,16 @@
-+==========================
-+Django 1.3.1 release notes
-+==========================
-+
-+*September 9, 2011*
-+
-+Welcome to Django 1.3.1!
-+
-+This is the first security release in the Django 1.3 series, fixing several
-+security issues in Django 1.3.  Django 1.3.1 is a recommended upgrade for
-+all users of Django 1.3.
-+
-+For a full list of issues addressed in this release, see the `security
-+advisory`_.
-+
-+.. _security advisory: https://www.djangoproject.com/weblog/2011/sep/09/security-releases-issued/
-Index: docs/ref/models/instances.txt
-===================================================================
---- docs/ref/models/instances.txt	(revision 16771)
-+++ docs/ref/models/instances.txt	(revision 17460)
-@@ -470,7 +470,7 @@
-
- Similarly, if you had a URLconf entry that looked like::
-
--    (r'/archive/(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/$', archive_view)
-+    (r'/archive/(?P<year>\d{4})/(?P<month>\d{2})/(?P<day>\d{2})/$', archive_view)
-
- ...you could reference this using ``permalink()`` as follows::
-
-@@ -478,8 +478,8 @@
-     def get_absolute_url(self):
-         return ('archive_view', (), {
-             'year': self.created.year,
--            'month': self.created.month,
--            'day': self.created.day})
-+            'month': self.created.strftime('%m'),
-+            'day': self.created.strftime('%d')})
-
- Notice that we specify an empty sequence for the second parameter in this case,
- because we only want to pass keyword parameters, not positional ones.
-Index: docs/ref/models/options.txt
-===================================================================
---- docs/ref/models/options.txt	(revision 16771)
-+++ docs/ref/models/options.txt	(revision 17460)
-@@ -166,6 +166,13 @@
-         >>> answer.get_previous_in_order()
-         <Answer: 1>
-
-+.. admonition:: Changing order_with_respect_to
-+
-+        ``order_with_respect_to`` adds an additional field/database column
-+        named ``_order``, so be sure to handle that as you would any other
-+        change to your models if you add or change ``order_with_respect_to``
-+        after your initial :djadmin:`syncdb`.
-+
- ``ordering``
- ------------
-
-@@ -238,6 +245,12 @@
-
-         unique_together = ("driver", "restaurant")
-
-+    A :class:`~django.db.models.ManyToManyField` cannot be included in
-+    unique_together (it's not even clear what that would mean). If you
-+    need to validate uniqueness related to a
-+    :class:`~django.db.models.ManyToManyField`, look at signals or
-+    using an explicit :attr:`through <ManyToManyField.through>` model.
-+
- ``verbose_name``
- ----------------
-
-Index: docs/ref/templates/builtins.txt
-===================================================================
---- docs/ref/templates/builtins.txt	(revision 16771)
-+++ docs/ref/templates/builtins.txt	(revision 17460)
-@@ -1868,7 +1868,7 @@
- Returns a slice of the list.
-
- Uses the same syntax as Python's list slicing. See
--http://diveintopython.org/native_data_types/lists.html#odbchelper.list.slice
-+http://diveintopython.net/native_data_types/lists.html#odbchelper.list.slice
- for an introduction.
-
- Example::
-Index: docs/ref/contrib/gis/geoip.txt
-===================================================================
---- docs/ref/contrib/gis/geoip.txt	(revision 16771)
-+++ docs/ref/contrib/gis/geoip.txt	(revision 17460)
-@@ -144,7 +144,7 @@
- Returns a dictionary of city information for the given query.  Some
- of the values in the dictionary may be undefined (``None``).
-
--.. method:: GeoIPcountry(query)
-+.. method:: GeoIP.country(query)
-
- Returns a dictionary with the country code and country for the given
- query.
-Index: docs/ref/contrib/messages.txt
-===================================================================
---- docs/ref/contrib/messages.txt	(revision 16771)
-+++ docs/ref/contrib/messages.txt	(revision 17460)
-@@ -210,6 +210,10 @@
- ``RequestContext``. Otherwise, ensure ``messages`` is available to
- the template context.
-
-+Even if you know there is only just one message, you should still iterate over
-+the ``messages`` sequence, because otherwise the message storage will not be cleared
-+for the next request.
-+
- Creating custom message levels
- ------------------------------
-
-Index: docs/ref/contrib/admin/index.txt
-===================================================================
---- docs/ref/contrib/admin/index.txt	(revision 16771)
-+++ docs/ref/contrib/admin/index.txt	(revision 17460)
-@@ -19,8 +19,10 @@
-     1. Add ``'django.contrib.admin'`` to your :setting:`INSTALLED_APPS`
-        setting.
-
--    2. Admin has two dependencies - :mod:`django.contrib.auth` and
--       :mod:`django.contrib.contenttypes`. If these applications are not
-+    2. The admin has four dependencies - :mod:`django.contrib.auth`,
-+       :mod:`django.contrib.contenttypes`,
-+       :mod:`django.contrib.messages` and
-+       :mod:`django.contrib.sessions`.  If these applications are not
-        in your :setting:`INSTALLED_APPS` list, add them.
-
-     3. Determine which of your application's models should be editable in the
-@@ -542,7 +544,7 @@
-     Fields in ``list_filter`` can also span relations using the ``__`` lookup::
-
-         class UserAdminWithLookup(UserAdmin):
--            list_filter = ('groups__name')
-+            list_filter = ('groups__name',)
-
- .. attribute:: ModelAdmin.list_per_page
-
-Index: docs/ref/django-admin.txt
-===================================================================
---- docs/ref/django-admin.txt	(revision 16771)
-+++ docs/ref/django-admin.txt	(revision 17460)
-@@ -1156,7 +1156,7 @@
- Note that this option is unnecessary in ``manage.py``, because it takes care of
- setting the Python path for you.
-
--.. _import search path: http://diveintopython.org/getting_to_know_python/everything_is_an_object.html
-+.. _import search path: http://diveintopython.net/getting_to_know_python/everything_is_an_object.html
-
- .. django-admin-option:: --settings
-
-Index: docs/ref/signals.txt
-===================================================================
---- docs/ref/signals.txt	(revision 16771)
-+++ docs/ref/signals.txt	(revision 17460)
-@@ -352,12 +352,16 @@
- .. data:: django.db.models.signals.post_syncdb
-    :module:
-
--Sent by :djadmin:`syncdb` after it installs an application.
-+Sent by :djadmin:`syncdb` command after it installs an application, and
-+:djadmin:`flush` command.
-
- Any handlers that listen to this signal need to be written in a particular
- place: a ``management`` module in one of your :setting:`INSTALLED_APPS`. If
- handlers are registered anywhere else they may not be loaded by
--:djadmin:`syncdb`.
-+:djadmin:`syncdb`. It is important that handlers of this signal perform
-+idempotent changes (e.g. no database alterations) as this may cause the
-+:djadmin:`flush` management command to fail if it also ran during the
-+:djadmin:`syncdb` command.
-
- Arguments sent with this signal:
-
-Index: README
-===================================================================
---- README	(revision 16771)
-+++ README	(revision 17460)
-@@ -28,7 +28,7 @@
- To get more help:
-
-     * Join the #django channel on irc.freenode.net. Lots of helpful people
--      hang out there. Read the archives at http://botland.oebfare.com/logger/django/.
-+      hang out there. Read the archives at http://django-irc-logs.com/.
-
-     * Join the django-users mailing list, or read the archives, at
-       http://groups.google.com/group/django-users.
diff --git a/libre/dkms-libre/01-broken-uninstall.patch b/libre/dkms-libre/01-broken-uninstall.patch
new file mode 100644
index 000000000..a859efabe
--- /dev/null
+++ b/libre/dkms-libre/01-broken-uninstall.patch
@@ -0,0 +1,22 @@
+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
new file mode 100644
index 000000000..f01f22002
--- /dev/null
+++ b/libre/dkms-libre/02-no-kernel-hook.patch
@@ -0,0 +1,13 @@
+# 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
new file mode 100644
index 000000000..99caab5fa
--- /dev/null
+++ b/libre/dkms-libre/PKGBUILD
@@ -0,0 +1,66 @@
+# $Id: PKGBUILD 90494 2013-05-12 22:57:28Z seblu $
+# Maintainer: Sébastien Luttringer
+# Contributor: Balwinder S "bsd" Dheeman (bdheeman AT gmail.com)
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+_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
new file mode 100644
index 000000000..d430855bb
--- /dev/null
+++ b/libre/dkms-libre/dkms.default
@@ -0,0 +1,9 @@
+# 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
new file mode 100644
index 000000000..3d656e32d
--- /dev/null
+++ b/libre/dkms-libre/dkms.hook
@@ -0,0 +1,12 @@
+#!/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
new file mode 100644
index 000000000..4dd18dd19
--- /dev/null
+++ b/libre/dkms-libre/dkms.install
@@ -0,0 +1,13 @@
+#!/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
new file mode 100644
index 000000000..0e679a949
--- /dev/null
+++ b/libre/dkms-libre/dkms.service
@@ -0,0 +1,11 @@
+[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
new file mode 100644
index 000000000..03e6bfe97
--- /dev/null
+++ b/libre/dkms-libre/dkms.systemd
@@ -0,0 +1,61 @@
+#!/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
index 5eee8985c..9c51e7fbf 100644
--- a/libre/doublecmd-libre/PKGBUILD
+++ b/libre/doublecmd-libre/PKGBUILD
@@ -1,42 +1,58 @@
-# $Id$
+# vim:set ft=sh:
+# $Id: PKGBUILD 94327 2013-07-20 16:50:58Z idevolder $
 # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
 # Contributor: (sirocco AT ngs.ru)
 
 _pkgbase=doublecmd
 pkgbase=doublecmd-libre
-pkgname=('doublecmd-gtk2-libre' 'doublecmd-qt-libre')
-pkgver=0.5.4
-_helpver=0.5.1
-pkgrel=2.1
+pkgname=('doublecmd-libre-gtk2' 'doublecmd-libre-qt')
+pkgver=0.5.6
+_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=('lua: scripting' 'p7zip: support for 7zip archives')
-source=("http://downloads.sourceforge.net/project/$_pkgbase/Double%20Commander%20Source/$_pkgbase-$pkgver-src.tar.gz"
+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"
 )
-sha256sums=('480b83279adeba007ad5c54f455733fae3d9c9ee61762e6b5a63e2e67b1cd7b7'
-            'd9f518e05e089b71aaa31c7d4af8177e77594a02be2c316e85e061e63b4c03e5')
+sha256sums=('b909ee5c57cb2803e4393163f5c44513144cb32e304fa2e1dfee6f33d0999bc5'
+            '5c5d00187df811df0734bf751a581bce7e1bdd4cf4639b2a1101f1da8743daaf')
 
 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-gtk2-libre() {
-	pkgdesc="twin-panel (commander-style) file manager (GTK)"
+package_doublecmd-libre-gtk2() {
+	pkgdesc="twin-panel (commander-style) file manager (GTK), with unar recommendation"
 	depends=('gtk2')
-	conflicts=('doublecmd-gtk2')
-	replaces=('doublecmd-gtk2')
-	provides=("doublecmd-gtk2=${pkgver}" 'doublecmd')
+	conflicts=('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"
@@ -46,12 +62,12 @@ package_doublecmd-gtk2-libre() {
 	cp -a * "$pkgdir/usr/share/$_pkgbase/doc/"
 }
 
-package_doublecmd-qt-libre() {
-	pkgdesc="twin-panel (commander-style) file manager (QT)"
+package_doublecmd-libre-qt() {
+	pkgdesc="twin-panel (commander-style) file manager (QT), with unar recommendation"
 	depends=('qt4pas')
-	conflicts=('doublecmd-qt')
-	replaces=('doublecmd-qt')
-	provides=("doublecmd-qt=${pkgver}" 'doublecmd')
+	conflicts=('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"
diff --git a/libre/doublecmd-libre/doublecmd.install b/libre/doublecmd-libre/doublecmd.install
index 40d56528f..c27b5bb23 100644
--- a/libre/doublecmd-libre/doublecmd.install
+++ b/libre/doublecmd-libre/doublecmd.install
@@ -3,20 +3,20 @@ update_icons() {
 	# Setup Menus
 	if which update-desktop-database
 	then
-		update-desktop-database -q /usr/share/applications
+		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
+		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
+		gtk-update-icon-cache -tq /usr/share/icons/hicolor > /dev/null 2>&1
 	fi
 
 }
diff --git a/libre/dpkg/PKGBUILD b/libre/dpkg/PKGBUILD
index 5d7534534..806194577 100644
--- a/libre/dpkg/PKGBUILD
+++ b/libre/dpkg/PKGBUILD
@@ -12,28 +12,30 @@ pkgname=(dpkg-devtools perl-dpkg)
 pkgdesc="Debian Package manager and utilities"
 license=('GPL2')
 
-pkgver=1.16.9
+pkgver=1.16.10
 url="http://packages.debian.org/source/sid/dpkg"
-_debrepo=http://ftp.debian.org/debian/pool/main # Debian Sid
+_debrepo=http://ftp.debian.org/debian/pool/main
+
+pkgrel=1.3
 
-pkgrel=1.2
-debfile() { echo "${_debrepo}/${1:0:1}/${1}/${1}_${2}"; }
 arch=('i686' 'x86_64' 'mips64el')
 depends=('bzip2' 'xz' 'zlib' 'ncurses')
 checkdepends=('perl-test-pod')
 makedepends=('perl-io-string' 'perl-timedate')
-source=("$(debfile ${pkgbase} ${pkgver}).tar.xz"
-        dpkg-gzip-rsyncable.patch dpkg-gpg2.patch)
+
+_debfile() { echo "${_debrepo}/${1:0:1}/${1}/${1}_${2}"; }
+source=("$(_debfile ${pkgbase} ${pkgver}).tar.xz"
+        dpkg-gzip-rsyncable.patch)
 
 ######################################################################
 
 # This is really gross.
 # It uses the debian control files to help us split the package.
 # Shame on the dpkg developers for not putting that logic into the build system.
-_destdir="$srcdir/$pkgbase-$pkgver/debian/pkg-makepkg"
+_destdir="$pkgbase-$pkgver/debian/pkg-makepkg"
 _debhelper_install() {
   local debname=$1
-  cd "$_destdir"
+  cd "$srcdir/$_destdir"
 
   # main files
   sed -e '/^\s*$/d' -e 's|usr/share/perl5/|&vendor_perl/|g' ../$debname.install \
@@ -80,11 +82,10 @@ build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
   patch -Np0 -i "${srcdir}/dpkg-gzip-rsyncable.patch"
-  patch -Np1 -i "${srcdir}/dpkg-gpg2.patch"
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-zlib --with-bz2 --with-liblzma
   make
-  make DESTDIR="$_destdir" install
+  make DESTDIR="$srcdir/$_destdir" install
 }
 
 check() {
@@ -125,3 +126,5 @@ package_perl-dpkg() {
 md5sums=('4df9319b2d17e19cdb6fe94dacee44da'
          '5ab63758999e9bb10f84bce79a0307b2'
          '74b7ce3045690a8fc290104f10cf8d42')
+md5sums=('a20a06a5272717274a8b009368f237da'
+         '5ab63758999e9bb10f84bce79a0307b2')
diff --git a/libre/dpkg/dpkg-gpg2.patch b/libre/dpkg/dpkg-gpg2.patch
deleted file mode 100644
index 28671c484..000000000
--- a/libre/dpkg/dpkg-gpg2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dpkg-1.16.9/scripts/Dpkg/Source/Package.pm.orig	2013-01-09 01:28:47.000000000 -0500
-+++ dpkg-1.16.9/scripts/Dpkg/Source/Package.pm	2013-01-09 01:30:51.000000000 -0500
-@@ -344,7 +344,7 @@
-     my $dsc = $self->get_filename();
-     my @exec;
-     if (find_command('gpgv')) {
--        push @exec, "gpgv";
-+        push @exec, "gpgv", "--verify";
-     } elsif (find_command('gpg')) {
-         push @exec, "gpg", "--no-default-keyring", "-q", "--verify";
-     }
diff --git a/libre/ecasound-libre/PKGBUILD b/libre/ecasound-libre/PKGBUILD
index 30cbbc641..6fbdd3fb3 100644
--- a/libre/ecasound-libre/PKGBUILD
+++ b/libre/ecasound-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: PKGBUILD 180827 2013-03-26 13:29:04Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
@@ -7,13 +7,12 @@
 _pkgname=ecasound
 pkgname=ecasound-libre
 pkgver=2.9.0
-pkgrel=2.1
-pkgdesc="A software package designed for multitrack audio processing (without nonfree faac recommendation)"
+pkgrel=3
+pkgdesc="A software package designed for multitrack audio processing, without nonfree faac recommendation"
 arch=('i686' 'x86_64')
 url="http://www.eca.cx/ecasound/"
 license=('GPL' 'LGPL')
-depends=('audiofile' 'liblo'
-         'liboil' 'lilv')
+depends=('audiofile' 'liblo' 'liboil' 'lilv')
 makedepends=('python2' 'ruby')
 optdepends=('python2: ecamonitor, ECI API'
             'ruby: ECI API'
@@ -27,14 +26,16 @@ replaces=$_pkgname
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
 options=('!libtool')
-source=(http://ecasound.seul.org/download/$_pkgname-$pkgver.tar.gz)
-md5sums=('05e7d4664cdf4c7a138c098e9506a551')
+source=("http://ecasound.seul.org/download/$_pkgname-$pkgver.tar.gz"
+        'ruby2.patch')
+md5sums=('05e7d4664cdf4c7a138c098e9506a551'
+         '6909dbd4f67f76d3bd31ce7c7fe16212')
 
 build() {
   cd "$srcdir/$_pkgname-$pkgver"
 
-  # use vendor_ruby for ruby files
-  sed -e 's/CONFIG\["sitedir"\]/CONFIG\["vendordir"\]/' -i configure
+  # fix ruby 2.0 incompatibility + use vendor_ruby for ruby files
+  patch -Np1 -i "$srcdir/ruby2.patch"
 
   PYTHONPATH=/usr/bin/python2 ./configure \
     --prefix=/usr \
diff --git a/libre/ecasound-libre/ruby2.patch b/libre/ecasound-libre/ruby2.patch
new file mode 100644
index 000000000..d55f12140
--- /dev/null
+++ b/libre/ecasound-libre/ruby2.patch
@@ -0,0 +1,12 @@
+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/epdfview-libre/PKGBUILD b/libre/epdfview-libre/PKGBUILD
index 28c77eed8..626e653f2 100644
--- a/libre/epdfview-libre/PKGBUILD
+++ b/libre/epdfview-libre/PKGBUILD
@@ -3,7 +3,7 @@
 # Maintainer: schuay <jakob.gruber@gmail.com>
 # Contributor: Tom K <tomk@runbox.com>
 # Contributor: Thayer Williams <thayer@archlinux.org>
-# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
 pkgname=epdfview-libre
 _pkgname=epdfview
diff --git a/libre/epiphany-libre/PKGBUILD b/libre/epiphany-libre/PKGBUILD
new file mode 100644
index 000000000..d6a1c77b2
--- /dev/null
+++ b/libre/epiphany-libre/PKGBUILD
@@ -0,0 +1,56 @@
+# $Id: PKGBUILD 186904 2013-05-31 18:08:27Z heftig $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
+
+_pkgname=epiphany
+pkgname=epiphany-libre
+pkgver=3.8.2
+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' 'webkitgtk3' 'nss' 'iso-codes' 'dconf' 'desktop-file-utils'
+         'hicolor-icon-theme' 'gcr' 'gnome-desktop' 'libwnck3')
+makedepends=('intltool' 'gnome-doc-utils' 'startup-notification' 'gobject-introspection')
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+options=('!libtool' '!emptydirs')
+groups=('gnome')
+url="http://www.gnome.org/projects/epiphany/"
+source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz)
+sha256sums=('ae89d6902ed243304d2cbf2fa361f6dd0cb3401fdaf726e6fdd4acc09197d50a')
+
+prepare() {
+  cd $_pkgname-$pkgver
+
+  # Replace Google support to DuckDuckGo HTML
+  sed -i 's|http://www[.]google[.]com/search?q=search[&]ie=UTF-8[&]oe=UTF-8|https://duckduckgo.com/html/?q=search|g' $(grep -rlI 'http://www[.]google[.]com/search?q=search&ie=UTF-8&oe=UTF-8')
+  sed -i 's|http://www[.]google[.]com/search?q=lala%2Elala[&]ie=UTF-8[&]oe=UTF-8|https://duckduckgo.com/html/?q=lala.lala|g' $(grep -rlI 'http://www[.]google[.]com/search?q=lala%2Elala&ie=UTF-8&oe=UTF-8')
+  sed -i 's|http://www[.]google[.]com/search?q=totalgarbage0xdeadbeef[&]ie=UTF-8[&]oe=UTF-8|https://duckduckgo.com/html/?q=totalgarbage0xdeadbeef|g' $(grep -rlI 'http://www[.]google[.]com/search?q=totalgarbage0xdeadbeef&ie=UTF-8&oe=UTF-8')
+  sed -i 's|http://www[.]google[.]com/search?q=search+separated+words+please[&]ie=UTF-8[&]oe=UTF-8|https://duckduckgo.com/html/?q=search+separated+words+please|g' $(grep -rlI 'http://www[.]google[.]com/search?q=search+separated+words+please&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/epiphany-libre/epiphany.install b/libre/epiphany-libre/epiphany.install
new file mode 100644
index 000000000..8b17fa3d4
--- /dev/null
+++ b/libre/epiphany-libre/epiphany.install
@@ -0,0 +1,13 @@
+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
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/libre/file-roller-libre/PKGBUILD b/libre/file-roller-libre/PKGBUILD
index e01981433..5c6865833 100644
--- a/libre/file-roller-libre/PKGBUILD
+++ b/libre/file-roller-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 185397 2013-05-13 19:05:20Z heftig $
+# $Id: PKGBUILD 193443 2013-08-20 09:36:30Z jgc $
 # 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.8.2
+pkgver=3.8.4
 pkgrel=1
 pkgdesc="Create and modify archives, with unar recommendation included and nonfree unace recommendation removed"
 arch=('i686' 'x86_64' 'mips64el')
@@ -23,7 +23,7 @@ options=('!libtool' '!emptydirs')
 install=file-roller.install
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver::3}/$_pkgname-$pkgver.tar.xz)
-sha256sums=('b251b146d7966d770c98546e2152dbc17785ef3b8cf460f692829d0ac1cbe79e')
+sha256sums=('3615bc41bbe28030d16ee414a8f5f9a3e37f745733c39032ef1559a06be3eea8')
 
 build() {
   cd $_pkgname-$pkgver
diff --git a/libre/foomatic-filters-libre/PKGBUILD b/libre/foomatic-filters-libre/PKGBUILD
index 73a7af6c4..eeb26a639 100644
--- a/libre/foomatic-filters-libre/PKGBUILD
+++ b/libre/foomatic-filters-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id$
+# $Id: PKGBUILD 185778 2013-05-18 16:33:20Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor (Parabola): André Silva <emulatorman@lavabit.com>
  
 pkgbase="foomatic"
 pkgname=('foomatic-filters-libre')
 arch=('i686' 'x86_64' 'mips64el') # needs to be changed  in the subpackages when makepkg will support it
-_snapdate=20120712
+_snapdate=20130518
 _filtersver=4.0.17
 pkgver=${_filtersver}_${_snapdate}
 pkgrel=1
@@ -18,7 +18,7 @@ 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."
+ 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)
@@ -30,6 +30,7 @@ package_foomatic-filters-libre() {
             '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
diff --git a/libre/ghostscript-libre/PKGBUILD b/libre/ghostscript-libre/PKGBUILD
index 9aceaadd1..d339089af 100644
--- a/libre/ghostscript-libre/PKGBUILD
+++ b/libre/ghostscript-libre/PKGBUILD
@@ -1,18 +1,20 @@
-# $Id: PKGBUILD 183802 2013-04-28 00:51:13Z eric $
+# $Id: PKGBUILD 193812 2013-09-02 09:41:54Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer (Parabola): Joshua Haase <hahj87@gmail.com>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
+### !!! rebuild groff from core that picks up hardcoding the GS versioned font path !!! ###
+
 _pkgname=ghostscript
 pkgname=ghostscript-libre
-pkgver=9.07
-pkgrel=2
-pkgdesc="An interpreter for the PostScript language without nonfree files"
+pkgver=9.10
+pkgrel=1
+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' 'lcms' 'dbus')
-makedepends=('gtk2' 'gnutls')
+         'libtiff>=4.0.0' 'lcms2' 'dbus')
+makedepends=('gtk2' 'gnutls' 'openjpeg')
 optdepends=('texlive-core:      needed for dvipdf'
             'gtk2:              needed for gsx')
 conflicts=('ghostscript')
@@ -20,18 +22,18 @@ replaces=('ghostscript')
 provides=("ghostscript=$pkgver")
 url="http://www.ghostscript.com/"
 source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2)
-options=('!libtool')
-md5sums=('eea27befc1e85bef6d4768202f6b03a5')
+options=('!libtool' '!makeflags')
+md5sums=('7179bb1ed4f6f453147e6f7e1f210ce8')
 
 build() {
   cd ghostscript-${pkgver}
   
-  # delete non-free packages
+  # delete nonfree files
   grep -l "are not altered" Resource/CMap/* | xargs rm -fv
   grep -l "not be copied" Resource/CMap/* | xargs rm -fv
 
   # force it to use system-libs
-  rm -rf jpeg libpng zlib jasper expat tiff lcms freetype 
+  rm -rf jpeg libpng zlib jasper expat tiff lcms lcms2 freetype openjpeg cups/libs # jbig2dec is in community
 
   ./configure --prefix=/usr \
 	--enable-dynamic \
@@ -60,7 +62,7 @@ build() {
 
 package() {
   cd ghostscript-${pkgver}
-  make -j1 DESTDIR="${pkgdir}" \
+  make DESTDIR="${pkgdir}" \
 	cups_serverroot="${pkgdir}"/etc/cups \
 	cups_serverbin="${pkgdir}"/usr/lib/cups install soinstall
 
@@ -74,5 +76,8 @@ package() {
 
   # install IJS
   cd ijs
-  make -j1 DESTDIR="${pkgdir}" install
+  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/libre/gloobus-preview-libre/PKGBUILD b/libre/gloobus-preview-libre/PKGBUILD
new file mode 100644
index 000000000..5881a4c2e
--- /dev/null
+++ b/libre/gloobus-preview-libre/PKGBUILD
@@ -0,0 +1,94 @@
+# $Id: PKGBUILD 91026 2013-05-18 11:44:23Z 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
+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')
+makedepends=('boost' 'bzr' 'djvulibre' 'libspectre')
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+optdepends=('djvulibre: Preview DjVu documents'
+            'gstreamer0.10-bad-plugins: Extra media codecs'
+            'gstreamer0.10-good-plugins: Extra media codecs'
+            'gstreamer0.10-ffmpeg: Extra media codecs'
+            'gstreamer0.10-ugly-plugins: Extra media codecs'
+            'libspectre: Preview PostScript documents'
+            'p7zip: View content of 7z archives'
+            '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-usr-bsdtar-for-rar.patch)
+md5sums=('27b3db2043ecaf47fa928940bbb4f32a'
+         'SKIP'
+         'ca15a3e31cec01d3d4fc5a4e1720f692'
+         '03379c173e67ad1b6804bc609336451d'
+         'd6d9e2b3e001f0ea8440cccdf90480af'
+         'eeab61846c861540bb16ca00fa14cdb6')
+
+prepare() {
+  cd "$srcdir/$_pkgname-$_pkgver"
+
+  # Python2 fix
+  sed -i 's@^#!.*python$@#!/usr/bin/python2@' src/gloobus-preview-configuration
+
+  # Fix build
+  patch -Np1 -i "$srcdir/fix-gtksource-include.patch"
+  sed -i 's/-Werror//' configure.ac src/Makefile.am
+
+  # Fix unoconv support
+  patch -Np1 -i "$srcdir/fix-unoconv.patch"
+
+  # Use xdg-open
+  patch -Np1 -i "$srcdir/use-xdg-open.patch"
+
+  # Use bsdtar (libarchive) if unrar is not found.
+  patch -Np0 -i "$srcdir/gloobus-preview-usr-bsdtar-for-rar.patch"
+
+  ### Prepare gloobus-sushi
+  cd "$srcdir/gloobus-sushi"
+
+  # Python2 fix
+  sed -i 's/python /python2 /' src/gloobus-sushi.in
+}
+
+
+build() {
+  cd "$srcdir/$_pkgname-$_pkgver"
+
+  ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+               --disable-static
+  make
+
+  ### Build gloobus-sushi
+  cd "$srcdir/gloobus-sushi"
+
+  ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  make
+}
+
+package() {
+  cd "$srcdir/$_pkgname-$_pkgver"
+  make DESTDIR="$pkgdir" install
+
+  ### Install gloobus-sushi
+  cd "$srcdir/gloobus-sushi"
+  make DESTDIR="$pkgdir" install
+
+  # Rename service file to avoid conflict with sushi
+  mv "$pkgdir"/usr/share/dbus-1/services/{org.gnome.Sushi.service,net.gloobus.Sushi.service}
+}
diff --git a/libre/gloobus-preview-libre/fix-gtksource-include.patch b/libre/gloobus-preview-libre/fix-gtksource-include.patch
new file mode 100644
index 000000000..053169a43
--- /dev/null
+++ b/libre/gloobus-preview-libre/fix-gtksource-include.patch
@@ -0,0 +1,39 @@
+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
new file mode 100644
index 000000000..f918f3019
--- /dev/null
+++ b/libre/gloobus-preview-libre/fix-unoconv.patch
@@ -0,0 +1,46 @@
+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-usr-bsdtar-for-rar.patch b/libre/gloobus-preview-libre/gloobus-preview-usr-bsdtar-for-rar.patch
new file mode 100644
index 000000000..f5b7c8e00
--- /dev/null
+++ b/libre/gloobus-preview-libre/gloobus-preview-usr-bsdtar-for-rar.patch
@@ -0,0 +1,57 @@
+------------------------------------------------------------
+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
new file mode 100644
index 000000000..16ad7278f
--- /dev/null
+++ b/libre/gloobus-preview-libre/gloobus-preview.install
@@ -0,0 +1,12 @@
+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/use-xdg-open.patch b/libre/gloobus-preview-libre/use-xdg-open.patch
new file mode 100644
index 000000000..68e219e6a
--- /dev/null
+++ b/libre/gloobus-preview-libre/use-xdg-open.patch
@@ -0,0 +1,20 @@
+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/gnormalize-libre/PKGBUILD b/libre/gnormalize-libre/PKGBUILD
index 8df68e2b6..6a07966b2 100644
--- a/libre/gnormalize-libre/PKGBUILD
+++ b/libre/gnormalize-libre/PKGBUILD
@@ -1,5 +1,6 @@
-# $Id$
-# Maintainer: Chris Brannon <cmbrannon79@gmail.com>
+# $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@lavabit.com>
@@ -7,13 +8,13 @@
 _pkgname=gnormalize
 pkgname=gnormalize-libre
 pkgver=0.63
-pkgrel=4
-pkgdesc="An audio normalizer, converter, encoder/decoder, ripper, tagger and player (without nonfree faac and mac recommendation)"
-arch=(any)
-url="http://gnormalize.sourceforge.net/"
+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')
+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'
@@ -29,26 +30,33 @@ replaces=$_pkgname
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
 install=gnormalize.install
-source=(http://downloads.sourceforge.net/sourceforge/gnormalize/${_pkgname}-${pkgver}.tar.gz
-        gnormalize.desktop)
-md5sums=('25ca7520731e61a8b7f4b7fa61928d54' '81c6dffab2139816919842e042705884')
+source=("http://downloads.sourceforge.net/sourceforge/gnormalize/${_pkgname}-${pkgver}.tar.gz")
+sha256sums=('80fd9aa2da8d7fcc88bd180be2adce1aed863bedba7d715144029bd95b61ccb6')
 
-package() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  install -Dm755 gnormalize "${pkgdir}/usr/bin/gnormalize"
+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
-  install -Dm644 gnormalize.1 "${pkgdir}/usr/share/man/man1/gnormalize.1"
-  install -d "${pkgdir}/usr/share/gnormalize/animations"
-  install -m644 animations/*.gif "${pkgdir}/usr/share/gnormalize/animations/"
-  install -Dm644 README "${pkgdir}/usr/share/doc/gnormalize/README"
-  install -Dm644 icons/gnormalize.png  \
-    "${pkgdir}/usr/share/pixmaps/gnormalize.png"
+} 
+
+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/gnormalize.png"
+    install -Dm644 "icons/gnormalize-$i.png" \
+      "$pkgdir/usr/share/icons/hicolor/${i}x$i/apps/$_pkgname.png"
   done
-  install -Dm644 "${srcdir}/gnormalize.desktop" \
-    "${pkgdir}/usr/share/applications/gnormalize.desktop"
+  install -Dm644 "$_pkgname.desktop" \
+    "$pkgdir/usr/share/applications/$_pkgname.desktop"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/libre/gnu-ghostscript/PKGBUILD b/libre/gnu-ghostscript/PKGBUILD
index 827222b39..0c124d528 100644
--- a/libre/gnu-ghostscript/PKGBUILD
+++ b/libre/gnu-ghostscript/PKGBUILD
@@ -2,15 +2,16 @@
 
 _pkgname=ghostscript
 pkgname=gnu-ghostscript
-_gspkgver=9.07 # ghostscript package version
+_gspkgver=9.10 # ghostscript package version
 _pkgver=9.06
 pkgver=9.06.0
-pkgrel=3
+pkgrel=6
 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')
-makedepends=('gtk2' 'gnutls')
+depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg'
+         'libtiff>=4.0.0' 'lcms2' 'dbus')
+makedepends=('gtk2' 'gnutls' 'openjpeg')
 optdepends=('texlive-core:      needed for dvipdf'
             'gtk2:              needed for gsx')
 conflicts=${_pkgname}
@@ -19,13 +20,13 @@ 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')
+options=('!libtool' '!makeflags')
 md5sums=('85a5e07a6b91937c157576293b381065'
          '83bcae456ad4c9fb790be483914dbeba'
          '5bd5d4966007b460deed866a30a0b3c8')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
 
   # fix build with recent automake
   patch -p1 -i "$srcdir/ijs-automake.patch"
@@ -34,7 +35,7 @@ build() {
   patch -Np1 -i ${srcdir}/libtool.patch
 
   # force it to use system-libs
-  rm -rf jpeg libpng zlib jasper expat tiff lcms freetype
+  rm -rf jpeg libpng zlib jasper expat tiff lcms lcms2 freetype openjpeg cups/libs # jbig2dec is in community
 
   ./configure --prefix=/usr \
 	--enable-dynamic \
@@ -48,33 +49,38 @@ build() {
 	--enable-fontconfig \
 	--enable-freetype \
 	--without-luratech \
+	--without-omni \
 	--with-system-libtiff \
 	--disable-compile-inits #--help # needed for linking with system-zlib
   make
 
   # Build IJS
-  cd ${srcdir}/${pkgname}-${pkgver}/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 ${srcdir}/${pkgname}-${pkgver}
-  make -j1 DESTDIR=${pkgdir} \
-	cups_serverroot=${pkgdir}/etc/cups \
-	cups_serverbin=${pkgdir}/usr/lib/cups install soinstall
+  cd ${pkgname}-${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}/${pkgname}-${pkgver}/doc/{Ps2ps2.htm,gs-vms.hlp,gsdoc.el,pscet_status.txt} ${pkgdir}/usr/share/${_pkgname}/$_pkgver/doc/
+  install -m 644 "${srcdir}"/${pkgname}-${pkgver}/doc/{Ps2ps2.htm,gs-vms.hlp,gsdoc.el,pscet_status.txt} "${pkgdir}"/usr/share/${_pkgname}/$_pkgver/doc/
   
   mkdir -p ${pkgdir}/usr/share/licenses/${_pkgname}
   install -m644 LICENSE ${pkgdir}/usr/share/licenses/${_pkgname}/
 
   # remove unwanted localized man-pages
-  rm -rf $pkgdir/usr/share/man/[^man1]*
+  rm -rf "$pkgdir"/usr/share/man/[^man1]*
 
   # install IJS
-  cd ${srcdir}/${pkgname}-${pkgver}/ijs
-  make -j1 DESTDIR=${pkgdir} install
+  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/libre/grub-legacy/PKGBUILD b/libre/grub-legacy/PKGBUILD
index dd7940c2c..036540e79 100644
--- a/libre/grub-legacy/PKGBUILD
+++ b/libre/grub-legacy/PKGBUILD
@@ -2,20 +2,18 @@
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Maintainer: ava1ar <mail(dot)avatar(at)gmail(dot)com>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
-# Maintainer (Parabola): Jorge López <jorginho@lavabit.com>
+# Contributor (Parabola): Jorge López <jorginho@lavabit.com>
 
 pkgname=grub-legacy
 _srcname=grub
 pkgver=0.97
-pkgrel=25
+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' 'grub-common' 'grub-bios' 'grub-efi-i386' 'grub-efi-x86_64')
-replaces=('grub')
-provides=("grub=${pkgver}")
+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
diff --git a/libre/grub/20_memtest86+ b/libre/grub/20_memtest86+
deleted file mode 100644
index 1d3096f6b..000000000
--- a/libre/grub/20_memtest86+
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /bin/sh -e
-########################################################
-# 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
-  cat << EOF
-menuentry "Memory test (memtest86+)" $CLASS {
-EOF
-  prepare_grub_to_access_device `${grub_probe} --target=device $MEMTEST86_IMAGE` | sed -e "s/^/  /"
-  cat << EOF
-  linux16 (\$root)`make_system_path_relative_to_its_root $MEMTEST86_IMAGE`
-}
-EOF
-fi
diff --git a/libre/grub/60_memtest86+ b/libre/grub/60_memtest86+
new file mode 100644
index 000000000..086f0cc84
--- /dev/null
+++ b/libre/grub/60_memtest86+
@@ -0,0 +1,32 @@
+#!/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
index 3969d713a..ea12eb9ad 100644
--- a/libre/grub/PKGBUILD
+++ b/libre/grub/PKGBUILD
@@ -1,85 +1,91 @@
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
+# Maintainer : Tobias Powalowski <tpowa@archlinux.org>
+# Maintainer : Ronald van Haren <ronald.archlinux.org>
+# Contributor: Keshav Padram (the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
-_grub_lua_ver=24
-_grub_ntldr_ver=21
-_grub_915_ver=9
+_GRUB_BZR_REV="5086"
 
-pkgname=('grub-common' 'grub-bios' 'grub-efi-i386')
-pkgbase=grub
-pkgver=2.00
-pkgrel=2
+## grub-extras lua and gpxe fail to build with grub bzr rev 5043
+
+[[ "${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.${_GRUB_BZR_REV}
+pkgrel=1
 url="https://www.gnu.org/software/grub/"
-arch=('i686' 'x86_64')
+arch=('x86_64' 'i686')
 license=('GPL3')
-makedepends=('xz' 'bdf-unifont' 'ttf-dejavu' 'python' 'autogen'
-             'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse')
-
-source=("http://ftp.gnu.org/gnu/grub/grub-${pkgver}.tar.xz"
-        "ftp://ftp.archlinux.org/other/grub2/grub2_extras_lua_r${_grub_lua_ver}.tar.xz"
-        "ftp://ftp.archlinux.org/other/grub2/grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz"
-        "ftp://ftp.archlinux.org/other/grub2/grub2_extras_915resolution_r${_grub_915_ver}.tar.xz"
+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=('xz' 'freetype2' 'bdf-unifont' 'ttf-dejavu' 'python' 'autogen'
+             'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse' 'bzr' 'rsync')
+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}::bzr+bzr://bzr.savannah.gnu.org/grub/trunk/grub/#revision=${_GRUB_BZR_REV}"
         'parabola_grub_mkconfig_fixes.patch'
+        '60_memtest86+'
         'grub.default'
-        'grub.cfg'
-        '20_memtest86+'
-        'grub_bzr_export.sh'
-        '0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch'
-        'grub-2.00-fix-docs.patch')
+        'grub-2.00-mkinitcpio-0.15.patch'
+        'grub-2.00.5086-fix-lvm-parsing.patch')
+md5sums=('SKIP'
+         'b3068b52b6f1dcd2850b5c7585bb185f'
+         'be55eabc102f2c60b38ed35c203686d6'
+         '52d374e0194e3f2e39ff7c92ecd58a6c'
+         'd25d2dcf8ba708dcf768fcaea799f59c'
+         'b2bafd4aeb098580754e71991ab7eed8'
+         'SKIP'
+         'SKIP')
 
-noextract=("grub2_extras_lua_r${_grub_lua_ver}.tar.xz"
-           "grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz"
-           "grub2_extras_915resolution_r${_grub_915_ver}.tar.xz")
+for _DIR_ in 915resolution ntldr-img ; do
+	source+=("grub-extras-${_DIR_}::bzr+bzr://bzr.savannah.gnu.org/grub-extras/${_DIR_}/#revision=")
+done
 
 
 _build_grub-common_and_bios() {
-
-	## copy the source for building the common/bios package
-	cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub_bios-${pkgver}"
-	cd "${srcdir}/grub_bios-${pkgver}"
-
-	## Apply Parabola specific fixes to enable grub-mkconfig detect kernels and initramfs
-	patch -Np1 -i "${srcdir}/parabola_grub_mkconfig_fixes.patch"
-	echo
-
-	## fix unifont.bdf location so that grub-mkfont can create *.pf2 files
-	sed 's|/usr/share/fonts/unifont|/usr/share/fonts/unifont /usr/share/fonts/misc|g' -i "${srcdir}/grub_bios-${pkgver}/configure.ac"
-
-	## 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_bios-${pkgver}/configure.ac"
-
-	## add the grub-extra sources
-	export GRUB_CONTRIB="${srcdir}/grub_bios-${pkgver}/grub-extras/"
-	install -d "${srcdir}/grub_bios-${pkgver}/grub-extras"
-
-	bsdtar xf "${srcdir}/grub2_extras_lua_r${_grub_lua_ver}.tar.xz" \
-		-C "${srcdir}/grub_bios-${pkgver}/grub-extras"
-
-	bsdtar xf "${srcdir}/grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz" \
-		-C "${srcdir}/grub_bios-${pkgver}/grub-extras"
-
-	bsdtar xf "${srcdir}/grub2_extras_915resolution_r${_grub_915_ver}.tar.xz" \
-		-C "${srcdir}/grub_bios-${pkgver}/grub-extras"
-
-	## Requires python2
-	# sed 's|python |python2 |g' -i "${srcdir}/grub_bios-${pkgver}/autogen.sh"
-
-	# fix compiling with gcc48
-        patch -Np1 -i ${srcdir}/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch
-
-	#fix docs compiling
-        patch -Np1 -i ${srcdir}/grub-2.00-fix-docs.patch
-
-        ## start the actual build process
-	cd "${srcdir}/grub_bios-${pkgver}"
+	
+	## Copy the source for building the common/bios package
+	cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub-${pkgver}-bios"
+	cd "${srcdir}/grub-${pkgver}-bios/"
+	
+	## Add the grub-extra sources
+	export GRUB_CONTRIB="${srcdir}/grub-${pkgver}-bios/grub-extras/"
+	
+	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
+	
+	## Unset all compiler FLAGS for bios build
+	unset CFLAGS
+	unset CPPFLAGS
+	unset CXXFLAGS
+	unset LDFLAGS
+	unset MAKEFLAGS
+	
+	## Start the actual build process
+	cd "${srcdir}/grub-${pkgver}-bios/"
 	./autogen.sh
 	echo
-
-	CFLAGS="" ./configure \
+	
+	./configure \
 		--with-platform="pc" \
 		--target="i386" \
-		--host="${CARCH}-unknown-linux-gnu" \
 		"${_EFIEMU}" \
 		--enable-mm-debug \
 		--enable-nls \
@@ -94,43 +100,43 @@ _build_grub-common_and_bios() {
 		--infodir="/usr/share/info" \
 		--datarootdir="/usr/share" \
 		--sysconfdir="/etc" \
-		--program-prefix="" \
+	 	--program-prefix="" \
 		--with-bootdir="/boot" \
 		--with-grubdir="grub" \
 		--disable-werror
 	echo
-
-	CFLAGS="" make
+	
+	make
 	echo
-
 }
 
-_build_grub-efi-i386() {
-
-	## copy the source for building the efi package
-	cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub_efi-${pkgver}"
-	cd "${srcdir}/grub_efi-${pkgver}"
-
-	export GRUB_CONTRIB="${srcdir}/grub_efi-${pkgver}/grub-extras/"
-	install -d "${srcdir}/grub_efi-${pkgver}/grub-extras"
-
-	bsdtar xf "${srcdir}/grub2_extras_lua_r${_grub_lua_ver}.tar.xz" \
-		-C "${srcdir}/grub_efi-${pkgver}/grub-extras"
-
-        # fix compiling with gcc48
-        patch -Np1 -i ${srcdir}/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch
-
-	#fix docs compiling
-        patch -Np1 -i ${srcdir}/grub-2.00-fix-docs.patch
-
-	cd "${srcdir}/grub_efi-${pkgver}"
+_build_grub-efi() {
+	
+	## Copy the source for building the efi package
+	cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub-${pkgver}-efi"
+	cd "${srcdir}/grub-${pkgver}-efi/"
+	
+	# export GRUB_CONTRIB="${srcdir}/grub-${pkgver}-efi/grub-extras/"
+	
+	# install -d "${srcdir}/grub-${pkgver}-efi/grub-extras/"
+	# for _DIR_ in lua gpxe ; do
+	#	cp -r "${srcdir}/grub-extras-${_DIR_}" "${srcdir}/grub-${pkgver}-bios/grub-extras/${_DIR_}"
+	# done
+	
+	## Unset all compiler FLAGS for efi build
+	unset CFLAGS
+	unset CPPFLAGS
+	unset CXXFLAGS
+	unset LDFLAGS
+	unset MAKEFLAGS
+	
+	cd "${srcdir}/grub-${pkgver}-efi/"
 	./autogen.sh
 	echo
-
-	CFLAGS="" ./configure \
+	
+	./configure \
 		--with-platform="efi" \
-		--target="i386" \
-		--host="${CARCH}-unknown-linux-gnu" \
+		--target="${_EFI_ARCH}" \
 		--disable-efiemu \
 		--enable-mm-debug \
 		--enable-nls \
@@ -150,117 +156,95 @@ _build_grub-efi-i386() {
 		--with-grubdir="grub" \
 		--disable-werror
 	echo
-
-	CFLAGS="" make
+	
+	make
 	echo
-
+	
 }
 
-build() {
-
-	## set architecture dependent variables
+prepare() {
+	
+	## Set ARCH dependent variables
 	if [[ "${CARCH}" == 'x86_64' ]]; then
 		_EFIEMU="--enable-efiemu"
 	else
 		_EFIEMU="--disable-efiemu"
 	fi
-
-	_HOST="${CARCH}"
-
-	cd "${srcdir}/grub-${pkgver}"
-	# _get_locale_files
-
-	_build_grub-common_and_bios
+	
+	cd "${srcdir}/grub-${pkgver}/"
+	
+	## Apply Parabola specific fixes to enable grub-mkconfig detect kernels and initramfs
+	patch -Np1 -i "${srcdir}/parabola_grub_mkconfig_fixes.patch"
 	echo
 
-	_build_grub-efi-i386
-	echo
+	## fix 10_linux
+	patch -Np0 -i "${srcdir}/grub-2.00-mkinitcpio-0.15.patch"
+	patch -Np1 -i "${srcdir}/grub-2.00.5086-fix-lvm-parsing.patch"
+	
+	## fix unifont.bdf location so that grub-mkfont can create *.pf2 files
+	sed 's|/usr/share/fonts/unifont|/usr/share/fonts/unifont /usr/share/fonts/misc|g' -i "${srcdir}/grub-${pkgver}/configure.ac"
+	
+	## 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"
+	
+	## Requires python2
+	# sed 's|python |python2 |g' -i "${srcdir}/grub-${pkgver}/autogen.sh"
+
+        ## pull in language files
+        ./linguas.sh
 
 }
 
-package_grub-common() {
+build() {
 
-	pkgdesc="GNU GRand Unified Bootloader - Utilities and Common Files (Parabola rebranded)"
-	depends=('sh' 'xz' 'freetype2' 'gettext' 'device-mapper' 'fuse')
-	conflicts=('grub-legacy' 'grub')
-	replaces=('grub2-common')
-	provides=('grub2-common')
-	backup=('boot/grub/grub.cfg' 'etc/default/grub' 'etc/grub.d/40_custom')
-	optdepends=('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')
-	install="grub.install"
-	options=('strip' 'purge' 'docs' 'zipman' '!emptydirs')
+        cd "${srcdir}/grub-${pkgver}/"
 
-	cd "${srcdir}/grub_bios-${pkgver}"
-	make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
+        # remove not working langs which need LC_ALL=C.UTF-8
+        sed -i -e 's#en@cyrillic en@greek##g' po/LINGUAS
+	_build_grub-common_and_bios
+	echo
+	
+	_build_grub-efi
 	echo
-
-	## install extra /etc/grub.d/ files
-	install -D -m0755 "${srcdir}/20_memtest86+" "${pkgdir}/etc/grub.d/20_memtest86+"
-
-	## install /etc/default/grub (used by grub-mkconfig)
-	install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub"
-
-	## install grub.cfg (needed so it doesn't get removed on upgrading because it was previously here)
-	install -D -m0644 "${srcdir}/grub.cfg" "${pkgdir}/boot/grub/grub.cfg"
-
-	# remove platform specific files
-	rm -rf "${pkgdir}/usr/lib/grub/i386-pc/"
 
 }
 
-package_grub-bios() {
-
-	pkgdesc="GNU GRand Unified Bootloader - i386 PC BIOS Modules"
-	depends=("grub-common=${pkgver}")
-	options=('!strip' '!emptydirs')
-	replaces=('grub2-bios')
-	provides=('grub2-bios')
-
-	cd "${srcdir}/grub_bios-${pkgver}"
-	make DESTDIR="${pkgdir}/" install
+_package_grub-common_and_bios() {
+	
+	cd "${srcdir}/grub-${pkgver}-bios/"
+	make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
 	echo
-
-	## remove non platform-specific files
-	rm -rf "${pkgdir}"/{boot,etc,usr/{share,bin,sbin}}
-
+	
 	## remove gdb debugging related files
 	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
-
+	
+	## Install extra /etc/grub.d/ files
+	install -D -m0755 "${srcdir}/60_memtest86+" "${pkgdir}/etc/grub.d/60_memtest86+"
+	
+	## Install /etc/default/grub (used by grub-mkconfig)
+	install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub"
+	
 }
 
-package_grub-efi-i386() {
-
-	pkgdesc="GNU GRand Unified Bootloader - i386 UEFI Modules"
-	depends=("grub-common=${pkgver}" 'dosfstools' 'efibootmgr')
-	options=('!strip' '!emptydirs')
-	replaces=('grub2-efi-i386')
-	provides=('grub2-efi-i386')
-
-	cd "${srcdir}/grub_efi-${pkgver}"
-	make DESTDIR="${pkgdir}/" install
+_package_grub-efi() {
+	
+	cd "${srcdir}/grub-${pkgver}-efi/"
+	make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
 	echo
-
-	## remove non platform-specific files
-	rm -rf "${pkgdir}"/{boot,etc,usr/{share,bin,sbin}}
-
+	
 	## remove gdb debugging related files
-	rm -f "${pkgdir}/usr/lib/grub/i386-efi"/*.module || true
-	rm -f "${pkgdir}/usr/lib/grub/i386-efi"/*.image || true
-	rm -f "${pkgdir}/usr/lib/grub/i386-efi"/{kernel.exec,gdb_grub,gmodule.pl} || true
+	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
+	
+}
 
+package() {
+	
+	_package_grub-efi
+	
+	_package_grub-common_and_bios
+	
 }
-md5sums=('a1043102fbc7bcedbf53e7ee3d17ab91'
-         '704ea9f250b6137f05fa0197fd07053a'
-         '77f7d5f8ce395663cd7fff4d37099957'
-         'a80e2b1d3bab778c3b6117d5a698992f'
-         'c776aaf2cc35488a7c531b59e697470d'
-         '52d374e0194e3f2e39ff7c92ecd58a6c'
-         '255eafb440b8c285b20431366c2d2d27'
-         '9b6358d3de5c4bb95a041ab7c44a21ec'
-         'f343ed2340ebc86c427873641bb72419'
-         'ab751d1d8cd3fd47e5ee24d71ecc31ed'
-         '342dd18472a24e5fd252458b24f39a29')
diff --git a/libre/grub/grub-2.00-mkinitcpio-0.15.patch b/libre/grub/grub-2.00-mkinitcpio-0.15.patch
new file mode 100644
index 000000000..1af848fa3
--- /dev/null
+++ b/libre/grub/grub-2.00-mkinitcpio-0.15.patch
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000..9a2eb3ff7
--- /dev/null
+++ b/libre/grub/grub-2.00.5086-fix-lvm-parsing.patch
@@ -0,0 +1,54 @@
+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_bzr_export.sh b/libre/grub/grub_bzr_export.sh
deleted file mode 100644
index ff8f99ecc..000000000
--- a/libre/grub/grub_bzr_export.sh
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/usr/bin/env bash
-
-## For actual repos
-
-# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/lua lua
-# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/gpxe gpxe
-# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/ntldr-img ntldr-img
-# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/915resolution 915resolution
-
-## For launchpad mirror
-
-# bzr branch lp:~the-ridikulus-rat/grub/grub-extras-lua lua
-# bzr branch lp:~the-ridikulus-rat/grub/grub-extras-gpxe gpxe
-# bzr branch lp:~the-ridikulus-rat/grub/grub-extras-ntldr-img ntldr-img
-# bzr branch lp:~the-ridikulus-rat/grub/grub-extras-915resolution 915resolution
-
-## grub-extras zfs is integrated into grub bzr main repo and is no longer needed separately.
-
-_WD="${PWD}/"
-_OUTPUT_DIR="${_WD}/"
-
-_ACTUAL_PKGVER="2.00"
-
-_GRUB_BZR_REPO_DIR="${_WD}/grub_mainline_BZR/"
-_GRUB_BZR_EXP_REPO_DIR="${_WD}/grub_experimental_BZR/"
-_GRUB_EXTRAS_REPOS_DIR="${_WD}/grub_extras_BZR/"
-
-_MAIN_SNAPSHOT() {
-	
-	cd "${_GRUB_BZR_REPO_DIR}/"
-	echo
-	
-	_REVNUM="$(bzr revno ${_GRUB_BZR_REPO_DIR})"
-	bzr export --root="grub-${_ACTUAL_PKGVER}" --format="tar" "${_OUTPUT_DIR}/grub_r${_REVNUM}.tar"
-	echo
-	
-	cd "${_OUTPUT_DIR}/"
-	
-	xz -9 "${_OUTPUT_DIR}/grub_r${_REVNUM}.tar"
-	echo
-	
-}
-
-_EXP_SNAPSHOT() {
-	
-	cd "${_GRUB_BZR_EXP_REPO_DIR}/"
-	echo
-	
-	_REVNUM="$(bzr revno ${_GRUB_BZR_EXP_REPO_DIR})"
-	bzr export --root="grub-${_ACTUAL_PKGVER}" --format="tar" "${_OUTPUT_DIR}/grub_exp_r${_REVNUM}.tar"
-	echo
-	
-	cd "${_OUTPUT_DIR}/"
-	
-	xz -9 "${_OUTPUT_DIR}/grub_exp_r${_REVNUM}.tar"
-	echo
-	
-}
-
-_EXTRAS_SNAPSHOT() {
-	
-	cd "${_GRUB_EXTRAS_REPOS_DIR}/${_GRUB_EXTRAS_NAME}/"
-	echo
-	
-	_REVNUM="$(bzr revno ${_GRUB_EXTRAS_REPOS_DIR}/${_GRUB_EXTRAS_NAME})"
-	bzr export --root="${_GRUB_EXTRAS_NAME}" --format="tar" "${_OUTPUT_DIR}/grub_extras_${_GRUB_EXTRAS_NAME}_r${_REVNUM}.tar"
-	echo
-	
-	cd "${_OUTPUT_DIR}/"
-	echo
-	
-	xz -9 "${_OUTPUT_DIR}/grub_extras_${_GRUB_EXTRAS_NAME}_r${_REVNUM}.tar"
-	echo
-	
-}
-
-echo
-
-set -x -e
-
-echo
-
-_MAIN_SNAPSHOT
-
-echo
-
-# _EXP_SNAPSHOT
-
-echo
-
-_GRUB_EXTRAS_NAME="lua"
-_EXTRAS_SNAPSHOT
-
-# _GRUB_EXTRAS_NAME="gpxe"
-# _EXTRAS_SNAPSHOT
-
-_GRUB_EXTRAS_NAME="ntldr-img"
-_EXTRAS_SNAPSHOT
-
-_GRUB_EXTRAS_NAME="915resolution"
-_EXTRAS_SNAPSHOT
-
-echo
-
-set +x +e
-
-echo
-
-unset _WD
-unset _OUTPUT_DIR
-unset _GRUB_BZR_REPO_DIR
-unset _GRUB_EXTRAS_REPOS_DIR
-unset _GRUB_EXTRAS_NAME
diff --git a/libre/grub/parabola_grub_mkconfig_fixes.patch b/libre/grub/parabola_grub_mkconfig_fixes.patch
index 5324afa01..fbcca19ec 100644
--- a/libre/grub/parabola_grub_mkconfig_fixes.patch
+++ b/libre/grub/parabola_grub_mkconfig_fixes.patch
@@ -1,8 +1,8 @@
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 516be86..5f37db2 100644
+index 8decc1d..170047f 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
-@@ -213,6 +213,8 @@ export GRUB_DEFAULT \
+@@ -212,6 +212,8 @@ export GRUB_DEFAULT \
    GRUB_THEME \
    GRUB_GFXPAYLOAD_LINUX \
    GRUB_DISABLE_OS_PROBER \
@@ -12,10 +12,10 @@ index 516be86..5f37db2 100644
    GRUB_SAVEDEFAULT \
    GRUB_ENABLE_CRYPTODISK \
 diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
-index 765bfdc..b148558 100644
+index 2c4bb0a..c7120d2 100644
 --- a/util/grub.d/00_header.in
 +++ b/util/grub.d/00_header.in
-@@ -115,6 +115,14 @@ cat <<EOF
+@@ -125,6 +125,14 @@ cat <<EOF
  
  EOF
  
@@ -64,7 +64,7 @@ index 14402e8..e85f7d6 100644
    fi      
 -  if [ x$type != xrecovery ] ; then
 +  if [ x$type != xrecovery ] && [ x$type != xfallback ] ; then
-       save_default_entry | sed -e "s/^/\t/"
+       save_default_entry | grub_add_tab
    fi
  
 @@ -132,7 +140,8 @@ linux_entry ()
@@ -75,7 +75,7 @@ index 14402e8..e85f7d6 100644
 +
 +  message="$(gettext_printf "Loading Linux %s ..." "${version}")"
    sed "s/^/$submenu_indentation/" << EOF
- 	echo	'$message'
+ 	echo	'$(echo "$message" | grub_quote)'
  	linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
 @@ -190,7 +199,22 @@ while [ "x$list" != "x" ] ; do
    alt_version=`echo $version | sed -e "s,\.old$,,g"`
diff --git a/libre/gsoap-legacy/LICENSE b/libre/gsoap-legacy/LICENSE
new file mode 100644
index 000000000..00b8ad810
--- /dev/null
+++ b/libre/gsoap-legacy/LICENSE
@@ -0,0 +1,163 @@
+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
new file mode 100644
index 000000000..addcd690a
--- /dev/null
+++ b/libre/gsoap-legacy/PKGBUILD
@@ -0,0 +1,36 @@
+# $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
index 59f49ee5d..0eef753de 100644
--- a/libre/gst-plugins-bad-libre/PKGBUILD
+++ b/libre/gst-plugins-bad-libre/PKGBUILD
@@ -1,68 +1,26 @@
-# $Id: PKGBUILD 180524 2013-03-22 19:07:19Z heftig $
+# $Id: PKGBUILD 193745 2013-08-30 07:49:47Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
-pkgbase=gst-plugins-bad
-pkgname=gst-plugins-bad-libre
-pkgver=1.0.7
+_pkgname=gst-plugins-bad
+pkgname=$_pkgname-libre
+pkgver=1.0.10
 pkgrel=1
 pkgdesc='GStreamer Multimedia Framework Bad Plugins, without nonfree faac support'
-arch=(
-  i686
-  x86_64
-  mips64el
-)
-license=(
-  LGPL
-)
+arch=('i686' 'x86_64' 'mips64el')
+license=('LGPL')
 url="http://gstreamer.freedesktop.org/"
-depends=(
-  celt
-  chromaprint
-  curl
-  faad2
-  gst-plugins-base-libs
-  libdca
-  libdvdnav
-  libgme
-  libmms
-  libmodplug
-  mjpegtools
-  mpg123
-  opus
-  soundtouch
-  spandsp
-  wayland
-)
-makedepends=(
-  libdvdread
-  libexif
-  libmpeg2
-  libvdpau
-  schroedinger
-)
-provides=(
-  $pkgbase=$pkgver
-)
-conflicts=(
-  $pkgbase
-)
-replaces=(
-  $pkgbase 
-)
-options=(
-  '!libtool'
-  '!emptydirs'
-)
-source=(
-  "$url/src/$pkgbase/$pkgbase-$pkgver.tar.xz"
-)
-sha256sums=(
-  5f49e6353fdc855834b5beb054b3a47ef5fa558006c7eda6d2ec07b36315c2ab
-)
+depends=('mjpegtools' 'gst-plugins-base-libs' 'curl' 'chromaprint' 'libmms' 'faad2' 'mpg123' 'celt' 'libdca' 'soundtouch' 'spandsp' 'libdvdnav' 'libmodplug' 'libgme' 'opus' 'wayland' 'neon' 'libofa' 'fluidsynth' 'openjpeg')
+makedepends=('schroedinger' 'libexif' 'libdvdread' 'libvdpau' 'libmpeg2')
+provides=($_pkgname=$pkgver)
+conflicts=$_pkgname
+replaces=$_pkgname
+options=(!libtool !emptydirs)
+source=(${url}/src/$_pkgname/$_pkgname-$pkgver.tar.xz)
+sha256sums=('91da60ba2ee5c681f11188a4a456894e7f989435c2102c15eff97bbd4fc4c726')
 
 build() {
-  cd $pkgbase-$pkgver
+  cd $_pkgname-$pkgver
   sed -i '/AC_PATH_XTRA/d' configure.ac
   aclocal -I m4 -I common/m4
   autoconf
@@ -76,11 +34,12 @@ build() {
 }
 
 check() {
-  cd $pkgbase-$pkgver
-  make check
+  cd $_pkgname-$pkgver
+  # don't have a camera for the camerabin test
+  make -k check || :
 }
 
 package() {
-  cd $pkgbase-$pkgver
-  make DESTDIR=$pkgdir install
+  cd $_pkgname-$pkgver
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/libre/gummiboot/PKGBUILD b/libre/gummiboot/PKGBUILD
index bbed77b21..d5cd50f28 100644
--- a/libre/gummiboot/PKGBUILD
+++ b/libre/gummiboot/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 187912 2013-06-08 06:38:24Z tpowa $
+# $Id: PKGBUILD 194204 2013-09-10 14:24:09Z tpowa $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
@@ -6,7 +6,7 @@
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname="gummiboot"
-pkgver="32"
+pkgver="37"
 pkgrel="1"
 pkgdesc="Simple text-mode UEFI Boot Manager (Parabola rebranded)"
 url="http://freedesktop.org/wiki/Software/gummiboot"
diff --git a/libre/hexchat-libre/PKGBUILD b/libre/hexchat-libre/PKGBUILD
index a377c189c..161f78e82 100644
--- a/libre/hexchat-libre/PKGBUILD
+++ b/libre/hexchat-libre/PKGBUILD
@@ -1,57 +1,47 @@
-# $Id: PKGBUILD 91125 2013-05-19 21:58:09Z alucryd $
+# $Id: PKGBUILD 97268 2013-09-15 22:44:23Z alucryd $
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 # Contributor: TingPing <tingping@tingping.se>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=hexchat
 pkgname=hexchat-libre
-pkgver=2.9.5
-pkgrel=5
+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://www.hexchat.org/"
+url="http://hexchat.github.io/"
 license=('GPL')
-depends=('dbus-glib' 'desktop-file-utils' 'hicolor-icon-theme' 'libnotify' 'libproxy' 'libsexy' 'pciutils')
-makedepends=('perl' 'python2')
+depends=('dbus-glib' 'desktop-file-utils' 'hicolor-icon-theme' 'libcanberra' 'libnotify' 'libproxy' 'libsexy' 'pciutils')
+makedepends=('perl' 'python')
 optdepends=('enchant: Spell check'
             'perl: Perl plugin'
-            'python2: Python plugin')
+            'python: Python plugin')
 options=('!libtool')
-install=${_pkgname}.install
+install="${_pkgname}.install"
 replaces=$_pkgname
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
-source=("http://dl.hexchat.org/hexchat/hexchat-${pkgver}.tar.xz"
-        'remove-non-free-suggestion.patch'
-        'no-firefox.patch')
-sha256sums=('11dfd0fbfb88d8dbb38f631fab8a7dffbb179f7f7dafe316953ed6f513ac623d'
-            '61040cb2a369b1b8801509c88019d68d1ab4c2505b1dfd859de1a4c22503f02d'
-            'de338821e1a8790a6fbdba2ce41d323002f51e3ae3e99ee8d815fcf087197e45')
+source=("http://dl.hexchat.org/${_pkgname}/${_pkgname}-${pkgver}.tar.xz")
+sha256sums=('6267ff3c4d0aec8a808365b384115a769d5001d99dbb10403634667c43966470')
 
 build() {
-  cd "${srcdir}"/${_pkgname}-${pkgver}
+  cd ${_pkgname}-${pkgver}
 
 # Rebrand to Parabola
-  sed -i -e 's#ArchLinux#Parabola GNU/Linux-libre#' plugins/sysinfo/parse.c
+  sed -i 's#ArchLinux#Parabola GNU/Linux-libre#' plugins/sysinfo/parse.c
 
 # Remove nonfree browser references
-  patch -p1 -i "${srcdir}/remove-non-free-suggestion.patch"
-  patch -p1 -i "${srcdir}/no-firefox.patch"
+  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
 
-# Build
-  ./autogen.sh
-  ./configure --prefix=/usr --enable-{shm,spell=libsexy,textfe}
+  ./configure --prefix='/usr' --enable-{python='python3',shm,spell='libsexy',textfe}
   make
 }
 
 package() {
-  cd "${srcdir}"/${_pkgname}-${pkgver}
+  cd ${_pkgname}-${pkgver}
 
-# Install
   make DESTDIR="$pkgdir" install
-
-# IRC Mime Types
-  desktop-file-edit --add-mime-type='x-scheme-handler/irc;x-scheme-handler/ircs' --set-key=Exec --set-value='sh -c "hexchat --existing --url %u || exec hexchat"' "$pkgdir/usr/share/applications/hexchat.desktop"
 }
 
 # vim: ts=2 sw=2 et:
diff --git a/libre/hexchat-libre/no-firefox.patch b/libre/hexchat-libre/no-firefox.patch
deleted file mode 100644
index 998ff4dca..000000000
--- a/libre/hexchat-libre/no-firefox.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Nur hexchat-2.9.4.orig/src/fe-gtk/fe-gtk.c hexchat-2.9.4/src/fe-gtk/fe-gtk.c
---- hexchat-2.9.4.orig/src/fe-gtk/fe-gtk.c	2012-11-11 07:08:30.000000000 -0200
-+++ hexchat-2.9.4/src/fe-gtk/fe-gtk.c	2013-01-30 23:06:38.670239405 -0200
-@@ -1039,8 +1039,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/hexchat-libre/remove-non-free-suggestion.patch b/libre/hexchat-libre/remove-non-free-suggestion.patch
deleted file mode 100644
index a83a71f17..000000000
--- a/libre/hexchat-libre/remove-non-free-suggestion.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur hexchat-2.9.4.orig/src/common/hexchat.c hexchat-2.9.4/src/common/hexchat.c
---- hexchat-2.9.4.orig/src/common/hexchat.c	2012-11-11 07:08:30.000000000 -0200
-+++ hexchat-2.9.4/src/common/hexchat.c	2013-01-30 23:02:12.884864062 -0200
-@@ -618,7 +618,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/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD
index 2623328ac..d2c020a75 100644
--- a/libre/hplip-libre/PKGBUILD
+++ b/libre/hplip-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 185808 2013-05-19 10:16:28Z andyrtr $
+# $Id: PKGBUILD 194375 2013-09-15 08:00:33Z 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.5
-pkgrel=2
+pkgver=3.13.9
+pkgrel=1
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet, without hplip-plugin binary blobs recommendation"
 arch=('i686' 'x86_64')
 url="http://hplipopensource.com"
@@ -30,26 +30,16 @@ provides=$_pkgname=$pkgver
 options=('!libtool')
 install=hplip.install
 source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc}
-        cups-1.6-buildfix.diff
-        hp-mkuri.patch
-        hplip_typo.patch)
-md5sums=('f0c406f06f191a120f7d283b69ff10e8'
+        hp-mkuri.patch)
+md5sums=('8fcbbd0d3a0b76550f325bd6cf46d9d9'
          'SKIP'
-         'ef64578c6cb3ce252dbdcb0f1c2f4a47'
-         '0bd7779fdbc4d7a9386df04dce2cb8d4'
-         'b3dd33a538ed8a3774f3c22f13e0a549')
+         '0bd7779fdbc4d7a9386df04dce2cb8d4')
 
 build() {
  cd "$srcdir/$_pkgname-$pkgver"
 
- # fix build with cups 1.6 - FC hplip-ipp-accessors.patch
- patch -p1 -i "${srcdir}/cups-1.6-buildfix.diff"
- 
  # fix linking libnotify, FS#34283
  patch -Np0 -i ${srcdir}/hp-mkuri.patch
-
- # fix typo preventing FW to load
- patch -Np0 -i ${srcdir}/hplip_typo.patch
  
  export PYTHON=python2
  
diff --git a/libre/iceape-l10n/PKGBUILD b/libre/iceape-l10n/PKGBUILD
index c9f22703d..5e088da07 100644
--- a/libre/iceape-l10n/PKGBUILD
+++ b/libre/iceape-l10n/PKGBUILD
@@ -12,7 +12,7 @@
 
 _debname=iceape
 _debver=2.7.12
-_debrel=1
+_debrel=deb1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
@@ -22,19 +22,20 @@ pkgbase=iceape-l10n
 pkgname=($(for lang in ${_langpacks[@]}
         do echo $pkgbase-$lang | tr A-Z a-z
         done))
+epoch=1
 pkgver=${_debver}.${_debrel}
-pkgrel=4
+pkgrel=1
 
 pkgdesc="Language packs for Debian Iceape."
 arch=('any')
 url="http://packages.debian.org/sid/iceape"
 license=('MPL' 'GPL')
-depends=("iceape-libre>=$pkgver")
+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}_all.deb")
+    source+=("${_debrepo}/`debfile ${_debname}`-l10n-$(echo $lang | tr A-Z a-z)_${_debver}-${_debrel#deb}_all.deb")
 done
 
 _path="/usr/lib/iceape/extensions"
diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD
index 22ad1541b..1ea0c56b0 100644
--- a/libre/iceape-libre/PKGBUILD
+++ b/libre/iceape-libre/PKGBUILD
@@ -4,14 +4,15 @@
 # We're getting this from Debian Sid
 _debname=iceape
 _debver=2.7.12
-_debrel=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=8
+pkgrel=1
 pkgdesc="A libre version of Debian Iceape, the internet suite based on SeaMonkey."
 arch=('i686' 'x86_64' 'mips64el')
 license=('MPL' 'GPL' 'LGPL')
@@ -23,7 +24,7 @@ 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}.debian.tar.gz"
+        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel#deb}.debian.tar.gz"
         mozconfig
         ${_pkgname}.desktop
         ${_pkgname}-2.0-lang.patch
@@ -98,6 +99,11 @@ prepare() {
 }
 
 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}"
@@ -113,6 +119,11 @@ 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
diff --git a/libre/icecat-adblock-plus/PKGBUILD b/libre/icecat-adblock-plus/PKGBUILD
index 9508d8e15..3c078997c 100644
--- a/libre/icecat-adblock-plus/PKGBUILD
+++ b/libre/icecat-adblock-plus/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 90899 2013-05-15 12:56:13Z spupykin $
+# $Id: PKGBUILD 94536 2013-07-26 13:15:58Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=firefox-adblock-plus
 pkgname=icecat-adblock-plus
-pkgver=2.2.4
+pkgver=2.3.1
 _addons_file=206960
-pkgrel=2
+pkgrel=1
 pkgdesc="plugin for icecat which block ads and banners"
 arch=('any')
 url="http://adblockplus.org/"
diff --git a/libre/icecat-noscript/PKGBUILD b/libre/icecat-noscript/PKGBUILD
index 1a0e3ddd0..9ce528bd3 100644
--- a/libre/icecat-noscript/PKGBUILD
+++ b/libre/icecat-noscript/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 90901 2013-05-15 12:56:28Z spupykin $
+# $Id: PKGBUILD 93410 2013-07-03 10:50:31Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=firefox-noscript
 pkgname=icecat-noscript
-pkgver=2.6.6
-pkgrel=2
+pkgver=2.6.6.7
+pkgrel=1.1
 pkgdesc="plugin for icecat which disables script"
 arch=('any')
 url="http://noscript.net/"
@@ -14,7 +14,7 @@ depends=()
 provides=$_pkgname=$pkgver
 makedepends=('unzip')
 source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi)
-md5sums=('a018efb1fe0f722ff307382791bf3c98')
+md5sums=('10b6704f34568d226fb5fe69b7d6043d')
 
 package() {
 #  _ffver=`pacman -Q icecat | cut -f2 -d\ | cut -f1 -d-`
@@ -23,7 +23,7 @@ package() {
 
   cd $srcdir
   local emid=$(sed -n -e '/<\?em:id>\?/!d; s/.*\([\"{].*[}\"]\).*/\1/; s/\"//g; p; q' install.rdf)
-  local dstdir=$pkgdir/usr/lib/icecat/browser/extensions/${emid}
+  local dstdir=$pkgdir/usr/lib/icecat/extensions/${emid}
   install -d $dstdir
 #  sed -i 's#<em:maxVersion>.*</em:maxVersion>#<em:maxVersion>7.*</em:maxVersion>#' install.rdf
   cp -R * $dstdir
diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD
index d9c2c7481..bbd3e1213 100644
--- a/libre/icedove-l10n/PKGBUILD
+++ b/libre/icedove-l10n/PKGBUILD
@@ -2,8 +2,9 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
 pkgbase=icedove-l10n
-_pkgver=17.0.5
-pkgver=17.0.5.2
+epoch=1
+_pkgver=17.0.8
+pkgver=17.0.8.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)
 
@@ -16,7 +17,7 @@ pkgdesc="Language packs for Debian Icedove."
 arch=('any')
 url="http://packages.debian.org/sid/icedove"
 license=('MPL' 'GPL')
-depends=("icedove-libre>=$pkgver")
+depends=("icedove-libre>=$epoch:$pkgver")
 makedepends=('unzip' 'zip')
 _url=https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$_pkgver/linux-i686/xpi
 
@@ -64,58 +65,58 @@ done
 
 md5sums=('d5b2567a8cc8f64591f313a6efdaaffc'
          'f3719964e893c1002b7a923e8f95f923'
-         'ef463b3772f804beb4108e15917485fd'
-         '6125a2e91119afe4cd4fb78909bc2168'
-         '990067ee981db3bf9873e4bd9b2b1eba'
-         'e32d496230cba49a435775359d4485ce'
-         'd212d8bc244184e816cf36a9b654e7e6'
-         '4a83b506d1b81dfffa0b33bc0f12b24f'
-         '6349985a77b2db81a43cb22291bfd972'
-         'dd4a259bfa4ce6816c55e9d7ff7f1172'
-         'dc3ec06ccb5e98cfa332fca40af77470'
-         'e81e63d8fac6c61cbbe72b1c8b0ce05c'
-         'f0850f83f396c33a4e69abd00bda0e55'
-         'ffc5de6b5409cf7cdd411ae853e0ba05'
-         '169780df5d160a04221dd80c92dd131a'
-         '8d1eacb770748156dbe02e493c41a5a6'
-         'a3a0d856da6af722a6444567b684eb14'
-         '798415f06ce916eb6c84ea4cf97e1253'
-         'c8eefe6a65295d354beb59e8f1b3116e'
-         '3ec1490226e064bc1145072ecdf031b4'
-         'a3ff2959c9375084683b0741797103f9'
-         '99ea64506470bf7938e169bfe5f569b3'
-         '8170d58dcbb1b84820ef0ace6dc23965'
-         '24ba56f81446d551101d1848ed660682'
-         '53b9b22f7ad5916c8dfccd8b758828dc'
-         '0bdcd2f628dff58a4544e93a88344b76'
-         '87d516fbb68ae06d5ee7439a8a4d3d96'
-         'c3cfa07d55fec1eb558e11c63ebd2a97'
-         '9845802371f603cb70df77a63088c16d'
-         '552e297a315a1b6f308604da4b492c53'
-         'dc6755c33351b95f9e883c8e64fab7b6'
-         'f3a67c52f5c5ca8cd5484250617f1aff'
-         '48fc583c7e67e87113fb73243da46313'
-         '4450b7753336f279296260e444cb0ba2'
-         '3a639521e20e5fb936f6d1b7679becd9'
-         '241a29846743f4dbcd5704e470193f30'
-         '71d71192e076a889da26129efd5f2f3d'
-         'efc91beb8c199d459e1f24164066d75e'
-         'ed717c1b94618faa8304796f1ff0acd7'
-         '8fc0aea02c1373f0ac0b7fa7eac2fa0c'
-         '808c60d4af8ee7b6bbbd82a5079c293e'
-         '6f0e4c6fe66e6d0e98f2fc444b59d629'
-         'bc5e9972f5a092f4f28f577f7ade7ad7'
-         '2f852610ddc1550200965d4be6320879'
-         '6ad80cd433ef69c3577bfea9fd26cedc'
-         '0dd02b5317c9656c64543067956940bf'
-         '9e0d2f288130f048358135a89732ca85'
-         '936dbda4758d9a65f8c27603a2dee3bd'
-         '820d70ce31ca9731c162ab942b0daea1'
-         'd737350d9edb73c15096e867fbdd8f3c'
-         'b1896502d411dd6037f141d3561461d4'
-         '491a3a386c4963f162e050c370ffa140'
-         'aa9f4e83501e624e4054f3ff61b71db3'
-         '257ee623933cfda550a8643a1a0b1d1c'
-         'c3a8fa4fc511d914892e08fa17fab8a9'
-         '44be6381519c6c5ea785a4f5a5122a64'
-         '6693c752bf6272caed2e204556fc69b8')
+         'ad61f2a7632c8ce1251d5952181398df'
+         '3fd84e4b803bca0fedb737440a040e45'
+         '4586a2dabddfcc16855edf6b8d69962a'
+         'c584f31ae8b2c24da15666fc4fa3563b'
+         '702f3257cf019843d74fbaadb99e2886'
+         '6551ad7767aa87ee42e6d31ff9590648'
+         'd1b275d962f96166e2a459f58b1709d6'
+         'ca7a944cd07ee0c0d04a454a2516d49d'
+         '76d452fada4e133f6dc3b3584c6fac08'
+         '3b4b2cee9016abd15da1bcd6286dbc6c'
+         '028c90f0c31ab3a7b071a718d08258bb'
+         '12355d30501f1ac7a10831763bc1f354'
+         '23b28003c65f5df1be2e8008c97edc15'
+         'afc8052118c343e867718ef8561e831e'
+         '65db2679e3a8c1868739da2e27783484'
+         '1334e12708bf352a2be09d5795c95213'
+         'f73ac3d0baedb8f525676118f51426f9'
+         '4c31cb388ccaff76c95d5b46f49c4ecc'
+         '2bd1d5f69bee27da325f8298f0d1e134'
+         '6bdd8f7a3beee272d7cdfc24882d254b'
+         'e6d1dc109c9a934277aaab7e696d389b'
+         '70408d96a8bbd4aceccf1c56d05f15ce'
+         'd8fbf504de160554a9bc1e4fe13492ce'
+         '094d2815ab1668f1ebf8fcb3a764a4ec'
+         'e6b14831bdc3ce639b390175ac04113b'
+         'cf7743c55272ba14d6804a1121f9ab6b'
+         '44be8dbc2d025afa4730bfa025fa7a42'
+         'c4e95ec094792b880a1ddb8b9aff48aa'
+         'b91510b33bc07ae10f97c223f652517f'
+         '2f6364f530d8f57d104cb4f4e7b28409'
+         '5375575fd2e6721505a9fc06b0247c49'
+         '18ee8f5eaa26ec1f60e81541d5ebc6ca'
+         'ba23f860392aefa18ff50bcdc450af52'
+         '36573ca497ecd8ab8df6b1155546e698'
+         '239622a8ed51b43791d34f4c09b3f6ec'
+         '850cc70db0785d88afe03a4d9964ccd3'
+         'ed3293f4b84e4984d67f44977fccccd5'
+         '9604a4e8c42e605c04e77d204bad5664'
+         '9d5a4a6f6a6b905bb509502972682a04'
+         'ad9c38941f4a8ce055406c1bb5e7ef35'
+         '25e04c4c5a1c0c0eff21e94f75a51f5b'
+         'a369031e02f05a10b68d8ef032cb4105'
+         '4657f4f697459aa51a09915dbc3270bb'
+         '09817688b547c5a20bc8422ce1f7eab1'
+         'd194d43d1dbf60c94028a5a718ba7e36'
+         '0ebbfcf410b53596fc8fb99df51ed030'
+         'cfa588e76644846f31fbc5360cfa89a1'
+         '06141e939e5c53251c7af6d23935024d'
+         'd07936ae70c5baa32ac5f4ecdb691c8e'
+         'e5c0f2ebac114fdc2a0db275ea385858'
+         'dac675a37e160aafb0e052ae561fe189'
+         '5e112c628766e03cdae62f64d42020ca'
+         '85d89ffd10bba250f4ce8acd39b3d6f8'
+         'f068603a927801bc0c5386e61bcc8b4e'
+         '2e6f3b969a175bbe2f88b266482f4c2e')
diff --git a/libre/icedove-libre/Icedove-branding.patch b/libre/icedove-libre/Icedove-branding.patch
deleted file mode 100644
index 751305147..000000000
--- a/libre/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/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD
index 8473cadd8..246f228bc 100644
--- a/libre/icedove-libre/PKGBUILD
+++ b/libre/icedove-libre/PKGBUILD
@@ -3,13 +3,14 @@
 
 # We're getting this from Debian Sid
 _debname=icedove
-_debver=17.0.5
-_debrel=2
+_debver=17.0.8
+_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."
@@ -24,24 +25,18 @@ conflicts=('thunderbird')
 provides=('thunderbird')
 install=${_pkgname}.install
 source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
-        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz"
+        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel#deb}.debian.tar.gz"
         mozconfig
         replace-urls.txt
         vendor.js
-        makefile.patch
-        branding.patch
-        ${_pkgname}.desktop
-        Icedove-branding.patch)
+        ${_pkgname}.desktop)
 options=(!emptydirs)
-md5sums=('0c68298c17757257da79b6bb39e3fd10'
-         '2086f544ef90570d7629374aeac22aa6'
+md5sums=('37a706e6b2c17049ab70739600ef47b0'
+         '0524d248bd0e83fa62c261700640ac0d'
          '5cf95ea94f69cdd36604890cfbf7b954'
          'a8fc4658d45b6bf9350023e5c3f34e56'
          '4eecc4fc5aafaf0da651a09eadc90bee'
-         'c4ed43e85945e180a89cce03e45ec62c'
-         '126b1446212396c33220936c01d9592d'
-         'e785e0c267f4435ae1a9aa0b03bcacfb'
-         'ea5f7a06967f561d47d7e5c35b23de6f')
+         'e785e0c267f4435ae1a9aa0b03bcacfb')
 
 prepare() {
   export DEBIAN_BUILD="comm-esr17"
@@ -63,14 +58,24 @@ prepare() {
       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
+  # 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
 
-  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
+  # 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 branding
+  sed -i 's|Icedove Mail/News|Icedove|' mail/branding/icedove/locales/en-US/brand.{dtd,properties}
 
   # Replace common URLs
   sed '/^#/d' ../replace-urls.txt | while read -r moz_url gnu_url; do
@@ -94,6 +99,8 @@ prepare() {
 }
 
 build() {
+  export DEBIAN_BUILD="comm-esr17"
+
   cd "${srcdir}/${DEBIAN_BUILD}"
 
   export LDFLAGS="${LDFLAGS} -Wl,-rpath,/usr/lib/${_pkgname}"
@@ -103,6 +110,8 @@ build() {
 }
 
 package() {
+  export DEBIAN_BUILD="comm-esr17"
+
   cd "${srcdir}/${DEBIAN_BUILD}"
 
   make -j1 -f client.mk DESTDIR="${pkgdir}" install
diff --git a/libre/icedove-libre/branding.patch b/libre/icedove-libre/branding.patch
deleted file mode 100644
index d84b8075a..000000000
--- a/libre/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/libre/icedove-libre/libre.patch b/libre/icedove-libre/libre.patch
deleted file mode 100644
index a6f23bdcd..000000000
--- a/libre/icedove-libre/libre.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -Nur comm-esr17.orig/mail/app/profile/all-thunderbird.js comm-esr17/mail/app/profile/all-thunderbird.js
---- comm-esr17.orig/mail/app/profile/all-thunderbird.js	2013-05-18 18:46:27.290732014 -0300
-+++ comm-esr17/mail/app/profile/all-thunderbird.js	2013-05-18 18:10:57.239376924 -0300
-@@ -160,11 +160,11 @@
- // Preferences for AMO integration
- pref("extensions.getAddons.cache.enabled", true);
- pref("extensions.getAddons.maxResults", 15);
--pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=%OS%&appVersion=%VERSION%");
--pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&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%/thunderbird/search?q=%TERMS%");
--pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=thunderbird");
--pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/discovery/pane/%VERSION%/%OS%");
-+pref("extensions.getAddons.get.url", "https://trisquel.info/browser-plain");
-+pref("extensions.getAddons.getWithPerformance.url", "https://trisquel.info/browser-plain");
-+pref("extensions.getAddons.search.browseURL", "https://trisquel.info/browser-plain");
-+pref("extensions.getAddons.search.url", "https://trisquel.info/browser-plain");
-+pref("extensions.webservice.discoverURL", "https://trisquel.info/browser-plain");
- 
- // Blocklist preferences
- pref("extensions.blocklist.enabled", true);
-@@ -189,7 +189,7 @@
- pref("extensions.update.interval", 86400);  // Check for updates to Extensions and 
-                                             // Themes every day
- 
--pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/themes/");
-+pref("extensions.getMoreThemesURL", "https://trisquel.info/browser-plain");
- pref("extensions.dss.enabled", false);          // Dynamic Skin Switching                                               
- pref("extensions.dss.switchPending", false);    // Non-dynamic switch pending after next
- 
-@@ -390,7 +390,7 @@
- 
- pref("spellchecker.dictionary", "");
- // Dictionary download preference
--pref("spellchecker.dictionaries.download.url", "https://addons.mozilla.com/%LOCALE%/thunderbird/dictionaries/");
-+pref("spellchecker.dictionaries.download.url", "https://trisquel.info/browser-plain");
- 
- // profile.force.migration can be used to bypass the migration wizard, forcing migration from a particular
- // mail application without any user intervention. Possible values are: 
-@@ -747,9 +747,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%&appRelease=%APP_RELEASE%");
-+pref("pfs.datasource.url", "http://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE%");
- 
- // By default we show an infobar message when pages require plugins the user has
- // not installed, or are outdated.
diff --git a/libre/icedove-libre/makefile.patch b/libre/icedove-libre/makefile.patch
deleted file mode 100644
index 8f8137bec..000000000
--- a/libre/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/libre/iceweasel-adblock-plus/PKGBUILD b/libre/iceweasel-adblock-plus/PKGBUILD
index 019d1edd2..81648fbcd 100644
--- a/libre/iceweasel-adblock-plus/PKGBUILD
+++ b/libre/iceweasel-adblock-plus/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 90899 2013-05-15 12:56:13Z spupykin $
+# $Id: PKGBUILD 94536 2013-07-26 13:15:58Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=firefox-adblock-plus
 pkgname=iceweasel-adblock-plus
-pkgver=2.2.4
+pkgver=2.3.1
 _addons_file=206960
-pkgrel=2
+pkgrel=1
 pkgdesc="plugin for iceweasel which block ads and banners"
 arch=('any')
 url="http://adblockplus.org/"
diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD
index 298d740cc..a135d161e 100644
--- a/libre/iceweasel-l10n/PKGBUILD
+++ b/libre/iceweasel-l10n/PKGBUILD
@@ -1,8 +1,8 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer: André Silva <emulatorman@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+# Contributor: 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@lavabit.com>
 # Based on icecat-i18n package, which is in turn based on firefox-i18n
 
 # When updating to a newer upstream release:
@@ -11,8 +11,8 @@
 # - Run 'make'. It will take care of everything else for you.
 
 _debname=iceweasel
-_debver=21.0
-_debrel=1
+_debver=24.0
+_debrel=deb2
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
@@ -22,19 +22,20 @@ pkgbase=iceweasel-l10n
 pkgname=($(for lang in ${_langpacks[@]}
         do echo $pkgbase-$lang | tr A-Z a-z
         done))
+epoch=1
 pkgver=$_debver.$_debrel
-pkgrel=2
+pkgrel=1
 
 pkgdesc="Language packs for Debian Iceweasel."
 arch=('any')
-url="http://packages.debian.org/experimental/iceweasel"
+url="http://packages.debian.org/sid/iceweasel"
 license=('MPL' 'GPL')
-depends=("iceweasel-libre>=$pkgver")
+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}_all.deb")
+    source+=("${_debrepo}/`debfile ${_debname}`-l10n-$(echo $lang | tr A-Z a-z)_${_debver}-${_debrel#deb}_all.deb")
 done
 
 _path="/usr/lib/iceweasel/browser/extensions/"
@@ -54,7 +55,7 @@ build() {
     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
+    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
@@ -75,91 +76,91 @@ package_iceweasel-l10n-$(echo $lang | tr A-Z a-z)() {
 done
 
 md5sums=('e88728730ecf9f0f145de5f70e362b15'
-         '59b4b2a362eece9edabb2fdc0f548ea2'
-         '24df894af578b902d16d4bc91759e926'
-         '489f555d46d08e3cb37eb5cb16203a3b'
-         '3b71f901014bd3fdcfc53d19a13cff10'
-         'fc4a5af84dcf6b055b11b8d2ac9868ac'
-         '7d03e2d5c2660942d5fbb5078b71c8cc'
-         'd12132ce5c0a4a881363dfebbf23fbee'
-         '09a5cf2d291f052433bdf834fe1f5100'
-         'a8eb8983f0c63c1383f18f894f2292ee'
-         'ef6fbffbad81223386c30c06da584f65'
-         'f4b80fc31cea5e0aa3c03eab9f36765f'
-         'c7ba7f36e104046ab22f37202c5e291e'
-         'e884fe1127ef15376f4d72047e2ee924'
-         'b235bed0eb4f872d5478a58c00341458'
-         '577498e39c9dd00ea2fb72146b3b5eac'
-         'c611cfc16c7c7b5b6c877fd88b40c10e'
-         '5c6e2f317aba37bc701e4aab4720fcd7'
-         'f9f7db03d1fcf2337902eba79289934c'
-         'e601dc8a1bdd9204ca3a4db5e4fe0df1'
-         'c2075468a1fea47efb7c65000fe73652'
-         'fcf2f689a8d06c7c2c6bb49f57037d55'
-         'f0c8d22cc820bb7177326bb069a38f5e'
-         '9dd2dc6c155ec3a61e26fba4baa980bc'
-         '41eff39b7c819c78fcac10f8064a2627'
-         'c3f9a5f5305fece3f165d5d946805180'
-         'd424c55b8a0242e500916f5bfdc60319'
-         'f5d41bf99c08a27c4f4a2d370e6414f2'
-         '420a3b3194938ecc31e05899bd0c52e4'
-         '19e23ac8f3e187c1b7112e1a252adacb'
-         'f1c9f646c5b70f591497cc36b7312aae'
-         'b246026367f3c5416397566bd5980e5b'
-         '24e4bf6cc17e3fd724387e157e6a49b1'
-         '60af06bc25f259311284d83cb6b2ba02'
-         'c5d8d2fecb6b0d2172ea1b4a4bdb2d68'
-         '58c93fd5ad320935666f0e10a2111f0a'
-         '7777c5b6bfa40c3ece5b48ef18d12938'
-         '47725d7fa7594f5739725096ae999dd1'
-         'c2f34c4fbd2eaf0a9c7e8d97ac49ae43'
-         '7900a33d5694744af6c1b3a6b8a5f2df'
-         '97a95a5c30d8ba542a4c5457a831259d'
-         '02a3052bf3af409c56cdca72c23f2669'
-         'a617e607fe3f952b6a152707c5c895e4'
-         '8d93b0550a30af8377e6198d67fb740e'
-         '938c22bdb193a8be3cf317deded8a49e'
-         'f343106f50810e14ae1264933d5495fb'
-         'a58187d70e895b90ea7667b08e0df6e4'
-         'a014309f9621a15a7f86e759d5a42aa5'
-         '8a4c8bea9c508ad4ca395eb5d31e3105'
-         '6e728d930ca539a022d1d5cc5d8cc9c8'
-         '6c10afb3a86a1305ec4fdfde5702908e'
-         '3f749b1b19d5534442eb9daf5f9ddba1'
-         'd8876e6f3ee24768a602128963f80e1c'
-         '6b7213d8c4d625ff0293e7a7c8eb4254'
-         '3d2b5b760c369ce1ff764205b196f0e5'
-         'c09eec3566a2352f1dd2f2ad0e7cbf6c'
-         '5e560da497a4e448413bfd343d23493d'
-         'faf5235cb19f5d1ee1d8868eb9399d8a'
-         '1dc06a576d7c87059125fa51e8677500'
-         'ea7c6eb5df30fbf3b7b4737025492fd9'
-         'f50c41542503959ddcc0ce200c2f8ec4'
-         '1a633a935016e3570327b52b66bb0dca'
-         '59bcc03566d356ac027655453775efa4'
-         '2d8644f035fe7d4e77a0f5eb196ddb0b'
-         'a5cf6b19492d3e969187fe847d4ee990'
-         'e3167e646b7c556e0d43565a13b066f9'
-         'b1ce311e588dd120d04c2d94597ae100'
-         '129a07881b89c3f3ab14971dec88007f'
-         '37bc634c1f82bd9a01ea7e817e100d71'
-         'd9b39409aa83bcae7aa22c54ebcd48b0'
-         '582926879e8d10d52448f373cd3fbd33'
-         'cf6bafb6e3ee659c27579b43038f704c'
-         '083f69fd4f64fd436d7fdfe8a7747b41'
-         '6f65d6a154fa2c7d72045b4b34fc8890'
-         '1a060b1b08d6fa8413995003c62b220f'
-         '84194eba8c736cd8036975a8423758c0'
-         '30f15d767b3e867df514175680a78a8d'
-         '32946289930406ed3ccd1c174e464210'
-         '05547b17ebd589408a9633aeb4fede40'
-         'f53c078d1ed0e90f2d68f098b34279f2'
-         'a11cf418be9247856f3179f85fe57c9a'
-         '39d47c6e738749b1c01d06a1b112c368'
-         '63adbbe9ac9dde80d2c3ae0c861f1d33'
-         '82d6b78bf72083a5e01652c02e152680'
-         '725a322b12f522591a5fba5aa32031bb'
-         '98c7ed17e8fbe4478032a31ad2c2aa07'
-         'a7c33685d88af8a90a14c874538fa53a'
-         '9b43e2e557c82a20509f34a54cc42e0f'
-         '84e12ebfd749a04adc5b3ace348a06f1')
+         '8b54f8c36f8465987871145fd70956ce'
+         'ad3a11f1485a58a0ad59d861d37a08a5'
+         '9761805e9011c371bb443d8f74fede3c'
+         '87bb6a20535feb2692aa2a6a1afa11e5'
+         '656dca2918d356fbe368b18fb9eac7ec'
+         'e1c793ac7d7beed9d21631154c3dbe1c'
+         '862470f8d5ee8f8d2f68afc7f4a3d5c1'
+         '5d7d027fe8c821689a4fdb022fdf7b1f'
+         'ab298b1e9d86dfccb6797a8f2f28c8af'
+         '4c3dd02509c0f7a8506b7303a410692b'
+         'ebe4f9e91981bbe85d4f2024325d4cf2'
+         'c7e1dae44043c1236f96739ad1117fbe'
+         'b33da7699c2a2f5e0febd11e4489d382'
+         '63c8b3e4c079fbbd98e321035b5c6317'
+         'f14d3462af09d8094393ee16f679e5ab'
+         '0eac6ddbcce45fd8e9a202c93a3738cb'
+         'c837f374f56c0bd6efdde745dce89f8a'
+         '5f780c1b42835050c39db15493dff728'
+         '69303505295c74467a56aa2a43ea2b82'
+         '7c44dba21f5d03604b5dd120231a00ae'
+         'a401bc653b544ac4f259cca56b79d96d'
+         'abdac5ba27fc5cd2ec4d5bc514772670'
+         '0ddc4de7b3050ed2a49233fbe18eebb3'
+         '7d09b317736ba78bd6bcf86f5f6e1e11'
+         '14d1ceaaef00130134e017ae868db8ea'
+         '9ddedfef7ffea213ef4d4e1773b3ad15'
+         'ae89977182d5998204b8ebc1e2603e9f'
+         '642cdf237587093072412720fb36485a'
+         '113ef967c5c05ae9ceae093064fdc116'
+         '90425e1d17c39090a68014c6ce7fb17b'
+         '0d9e0fc7162eb0aca197866ef427f481'
+         '95cc1695aa5bffbdcbcb773fb0430319'
+         '1475a2ad88c8699a9c36e07baed988e0'
+         '26fd5bf6e4e0a6c634ca7632fb20d69d'
+         '1cfb6db8de12e0698f0663fffe651962'
+         '47cbb471101ed09e1d43f85a38cac91f'
+         'e8cb435f70c0d62b07cddf051b2e6a5b'
+         'bc58060bf3539ab408f1a331ec617949'
+         '01e8eedc1594c13db4f8a991fcf87f83'
+         '91179c0d3ee8f003a848eedd2435ea3c'
+         '0bac7e153488e965f164d61d81de87cb'
+         '4dabbdfa4fe6477e862eb381eb2c4fd0'
+         'a83a772712ae74ddb309cb4a7cb52f75'
+         'e16444075ca17e7b5961f7e1e0a828bf'
+         '4df54bf6c1b1cb35a130d34f9a981eec'
+         '27e8f49d9a73c79515aa75304758ae22'
+         '4ad85b335fd26d3474548433fd20d919'
+         '7f63adfe80832afc40cc3774b48fdefc'
+         'dbeac803ed5906af388d2130cdac5c32'
+         'f82ba92549541e2d89d5040d175a11d8'
+         'bd46bc7902cba8866ffedbb50c8ca2f8'
+         '203f1fcb9dd3de9396787fc9dab0312a'
+         'da685c4c4bd727b337bb720d83de8cf5'
+         '42fbbda5287dfbf11619e6046bd06f8b'
+         '65844655106abc5fba71a2cd9bec2d26'
+         '4ad3f9cbb469aeca27443e39a53e8c73'
+         '9225277738d7a0fb8b585314ecdb642f'
+         '292574470c2daeda3c005b12d8a66269'
+         '954554b04d7aee0c6662d2edf7b48c1b'
+         'f15824595b7aab31ce8cc91de781ea03'
+         'c5f2c9ddb5775179be5eea13b12f843f'
+         'def21db04a3b606c603412d7a0091041'
+         '686fcc1eefcce197c8b27363c5db6f34'
+         '9eb2657a7af95927274b0453056173b3'
+         '58e3dedcb8c0f85766aaaa0d35746b94'
+         '209670672c37d4befa4375528385ae4a'
+         'f3b09defe2dd33f94c5aa4f3c19d726e'
+         '3f05b588ddea099c873203267287e296'
+         '91180565b17731d4ff40e6612f499527'
+         'fac9050297be0dfe64473d3fe3bce03b'
+         'd72a455cd79e304627db71c0ad42e42c'
+         'f271b0a4b2d348edca352611da9fa79e'
+         '367a12e148e94885d5141a7b374523f7'
+         '18fb3c7bbfdf0b81a40ef5f0bd9d3c2c'
+         '4e5418b69f62e5d281aa98b0089149de'
+         'bfdf7ae55a0994fbe3ed2359dfd2d437'
+         'e7b4b504e518b16bb5d9cea8770b1b7a'
+         'a8719e1294071e9e0366f686b89a793f'
+         'c422789ab794748200b3d33f660b0076'
+         'ac040347a410692fea6b7fdda06802cf'
+         '97c066c4bd823d8f3157fbb390cbaaac'
+         '3167b085b038f6f1bde2530a167e7405'
+         'e969d0185a8c34341edba2ea2e70a476'
+         'aff3452e3b6663a2e2f8870924bfded6'
+         '44519549cf6b052b49519c9960f97481'
+         'fe67796800cb807148a39722d689a4c7'
+         'b947f013e632c6d262ebdbfac53e3958'
+         '677267c8284fca2b3749f53eba598121')
diff --git a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
index d89e4d1ae..5d56ee23b 100644
--- a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
+++ b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
@@ -3,7 +3,7 @@ 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

+index 91c5c1c..2f8bd1a 100644

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

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

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

@@ -67,10 +67,10 @@ index d7fec75..d531b83 100644
  component {3d2532e3-4932-4774-b7ba-968f5899d3a4} IEProfileMigrator.js

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

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

-index 52722e9..0448444 100644

+index 23e021d..469e504 100644

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

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

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

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

  

  

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

@@ -80,22 +80,23 @@ index 52722e9..0448444 100644
  

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

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

-index 401623a..4ce7a3e 100644

+index 3d23a98..4ce7a3e 100644

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

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

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

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

     * @see nsIStringBundle

     */

    getLocalizedString: function MU_getLocalizedString(aKey, aReplacements) {

 -    const OVERRIDES = {

--      "4_firefox": "4_firefox_history_and_bookmarks"

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

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

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

    },

  

    /**

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

  

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

-index 260bc29..52b32cc 100644

+index b1cb03d..1755ae7 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

@@ -181,13 +182,13 @@ index 260bc29..52b32cc 100644
  64_ie=Other Data

  64_safari=Other Data

  64_chrome=Other Data

--64_firefox=Bookmarks Backups

-+64_self=Bookmarks Backups

+-64_firefox_other=Other Data

++64_self=Other Data

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

-index fa45115..1fcf3cd 100644

+index 5c23509..54b82bd 100644

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

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

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

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

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

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

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

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

  %{C++

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

-index b08f8ce..446ee74 100644

+index cc3f65e..cdd4305 100644

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

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

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

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

          if (gDoProfileReset) {

            // Automatically migrate from the current application if we just

            // reset the profile.

diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index eebf10e57..069b2827d 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -1,10 +1,10 @@
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 # Contributor (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org>
 # Contributor (Parabola): Luke Shumaker <lukeshu@sbcglobal.net>
 # Contributor: Figue <ffigue at gmail>
 # Contributor (Parabola): fauno <fauno@kiwwwi.com.ar>
 # Contributor (Parabola): vando <facundo@esdebian.org>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
-# 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>
@@ -12,57 +12,61 @@
 
 _pgo=true
 
-# We're getting this from Debian Experimental
+# We're getting this from Debian Sid
 _debname=iceweasel
-_debver=21.0
-_debrel=1
+_debver=24.0
+_debrel=deb2
 _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=3
+pkgrel=1
 
 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 gstreamer0.10-base hicolor-icon-theme hunspell libevent libnotify libvpx libxt mime-types mozilla-common mozilla-searchplugins nss sqlite startup-notification)
-makedepends=(autoconf2.13 diffutils imagemagick libidl2 librsvg libxslt mesa pkg-config python2 quilt unzip zip)
+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')
-url="http://packages.debian.org/experimental/${_pkgname}"
+optdepends=('networkmanager: Location detection via available WiFi networks'
+            'gstreamer0.10-base-plugins: vorbis decoding, ogg demuxing'
+            'gstreamer0.10-bad-libre-plugins: aac, vp8 and opus decoding'
+            'gstreamer0.10-good-plugins: webm and mp4 demuxing'
+            'gstreamer0.10-ugly-plugins: h.264 decoding'
+            'libpulse: PulseAudio audio driver')
+url="http://packages.debian.org/sid/${_pkgname}"
 install=iceweasel.install
 replaces=('firefox')
 conflicts=('firefox')
 provides=('firefox')
 source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
-        "$_debrepo/`debfile $_debname`_$_debver-$_debrel.debian.tar.gz"
+        "$_debrepo/`debfile $_debname`_$_debver-${_debrel#deb}.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=('0a7c51bb494463c327af918bae6c4ee4'
-         'c17121a4ffd40f463e16d7828445d96e'
-         'e1e903ca91997f18b428c54ef604f27d'
-         '383e8e2a97a8b13fe56d153adb6878b6'
-         '2930f3bffe0d7a6b9845f8c006821bc2'
+md5sums=('8f24807d67599516850a4bdca2b2fbd6'
+         '1f4f1347e05b15f5af137787d614ecdf'
+         '350feec44d359c31679dbec3de6685df'
+         'df08eaa1ac3bc6c2356be4fbf8ec8932'
+         '5b32b39c033a33f45e2cfc6c3e80f20c'
          '7b9e5996dd9fe0b186a43a297db1c6b5'
          'abf5ecb74caa857abb42bcfbb3442d9c'
-         '0c26941504d3f2abed759221e9bb5de1'
-         '52e52f840a49eb1d14be1c0065b03a93'
+         '121fefaa040936c3b96298da0c49f450'
          'a8fc4658d45b6bf9350023e5c3f34e56'
-         '85e67561e0e491cd538ce018dfc2d948')
+         'f1594fa3567e5b70202c3432d7c00202')
 
 prepare() {
   export DEBIAN_BUILD="mozilla-release"
@@ -84,7 +88,6 @@ prepare() {
 
   patch -Np1 -i "$srcdir/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch" # Adding fixed Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
   patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname
-  patch -Np1 -i "$srcdir/shared-libs.patch"
 
   # Replace common URLs
   sed '/^#/d' ../replace-urls.txt | while read -r moz_url gnu_url; do
@@ -140,33 +143,51 @@ prepare() {
   # WebRTC build tries to execute "python" and expects Python 2
   ln -s /usr/bin/python2 "$srcdir/path/python"
 
+  # Use gold, as Mozilla can use some of its features, such as safe ICF
+  #ln -s /usr/bin/ld.gold "$srcdir/path/ld"
+
   # configure script misdetects the preprocessor without an optimization level
   # https://bugs.archlinux.org/task/34644
   sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure
 }
 
 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 $_pgo; then
-    export DISPLAY=:99
-    Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY &
-    _fail=0
-
-    make -f client.mk build MOZ_PGO=1 || _fail=1
+  if [[ $CARCH == i686 ]]; then
+    # Work around memory address space exhaustion during linking on i686
+    LDFLAGS+=' -Wl,--no-keep-memory'
+  fi
 
-    kill $! || true
-    return $_fail
+  if $_pgo; then
+    if [[ $CARCH != i686 ]]; then
+      # Set up PGO
+      export DISPLAY=:99
+      Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY &
+
+      if ! make -f client.mk build MOZ_PGO=1; then
+        kill $!
+        return 1
+      fi
+
+      kill $! || true
+    else
+      make -f client.mk build
+    fi
   else
     make -f client.mk build
   fi
 }
 
 package() {
+  export DEBIAN_BUILD="mozilla-release"
+
   cd "$srcdir/$DEBIAN_BUILD"
   make -f client.mk DESTDIR="$pkgdir" install
 
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index 3bb39d215..504ebca91 100644
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -1,90 +1,155 @@
 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-05-11 16:19:20.000000000 -0300
-+++ mozilla-release/browser/app/profile/firefox.js	2013-05-18 13:47:28.091097903 -0300
-@@ -1203,12 +1203,6 @@
+--- mozilla-release.orig/browser/app/profile/firefox.js	2013-08-07 10:36:49.891513965 -0300
++++ mozilla-release/browser/app/profile/firefox.js	2013-08-12 22:34:34.309460804 -0300
+@@ -1206,14 +1206,6 @@
  // (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", "{\"builtin\": \"true\",\"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\",\"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\"}");
--pref("social.manifest.mixi", "{\"builtin\": \"true\",\"origin\":\"https://mixi.jp\",\"name\":\"mixi\",\"description\":\"好きなWebサイトを見ながらmixiのチェックもできる便利なツールです。友人がつけてくれたイイネやコメントを通知するので、見落とさずにすぐにお返事ができます。また友人が今何をしているかをいつでも確認できます。\",\"workerURL\":\"https://mixi.jp/static/public/js/sidebar/firefox/worker.js\",\"sidebarURL\":\"https://mixi.jp/firefox_sidebar.pl\",\"iconURL\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIE1hY2ludG9zaCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDozMDZFOUZCMDkyQzIxMUUyOEM1RTgyQ0UwMUE5RjI0RiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDozMDZFOUZCMTkyQzIxMUUyOEM1RTgyQ0UwMUE5RjI0RiI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkQ0QkM3NDc1OTJDMTExRTI4QzVFODJDRTAxQTlGMjRGIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkQ0QkM3NDc2OTJDMTExRTI4QzVFODJDRTAxQTlGMjRGIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+fT8vWQAAAkxJREFUeNpi/P//PwMlgBFdIDtST4GLg6Weg50lgJmJUQAm/vff/w8/fv7Z8O3Hn8apyy89wGpAWZJxv7AAR4GYEBeDAC87AxsrEwMjIyMDyJW/fv9j+PD5J8PLt98YXr/7nti78NwCFANq0k3ny0vyJUiL8wA1szGwszEzMDOBDGBgAPny779/DD9//WV49/EHw8NnnxkePv+c2DXv7AJmkObqNNMCZVn+CiBm0LaMZuBgZ2YQVnBg4BSQZ/j27g6DqKoHA7+kAdhFrP8/AOVZGP4xMLlqKAhMYwEZIC8rWi0vyc7AD3S2lE4Iw9/f3xg+PTvDwCflwSCuGczw4+NDsCtFVDwYvu/IZxAGhgwwLLh//JGIZKnLNHMQ4mEQ4eNhBzoZ4qNnlxYzvH94iEH82xsGQXlbhruHWhiYWbkYtH1ng13159d1Bn4eNgYFRRkHJkv7QA1eLjYGVhYmeGD+/vYaif0GEgtAV8FDHmgPSD03Nw8vExMzIwMLEDMykp4GePjF3zFpGXvc/kdiWgLFyn9G9n8aJr47GYFxzHft2IJ7P57uFGZhZiLKgD9//zGwSTg/07FN0WQCJpRPWlYJjRyipp/+EuEUUKL6xyb+E6i5A6SXEUmi/cn1HQnv7mwW/v/rAyu2MPkHtIBVUPuLskXWIU4eIW+MpAw0JAhI5Xz7+Ezh++eXYEPePjjE9+X5ST5GZo5/ohphr6Q1PdYB1VSCbMfnTGkgNgPhS4fmbXl4ddvzn98+noNagJobicjOME17gBjDVoAAAwDPu94Fx/JhBAAAAABJRU5ErkJggg==\",\"icon32URL\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIE1hY2ludG9zaCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpENEJDNzQ3MzkyQzExMUUyOEM1RTgyQ0UwMUE5RjI0RiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpENEJDNzQ3NDkyQzExMUUyOEM1RTgyQ0UwMUE5RjI0RiI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkQ0QkM3NDcxOTJDMTExRTI4QzVFODJDRTAxQTlGMjRGIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkQ0QkM3NDcyOTJDMTExRTI4QzVFODJDRTAxQTlGMjRGIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+0Zya+QAABRJJREFUeNrEV11sFFUUPjOzMzs7u92Z2W532227u6Ur7VJsS02VBqnwYAIvNYJREQnhgRcIAaNI6hPxxZ+YgJFoeDCGNBhCDNSEGB54wBpFTZtWjC3B8tNq20CX7S5s9292Zz331sXd7fYvLfYkNzNz5977nfOdc+49l8lkMrCawixl8KE3mrYIPIeNfYHn2WaWYZTc/8QWLaVfTWrpgYSW/v6zs791L1uBA683Kiaj4YhF4vdaLYJXtgiA74B9YDCwwDD/LZFO6xCLpyAS0+BhJAmhR4m7j6a1M7FE6uTn566HlqzA23tbjqiKeNyhirJdMUGJWUBgDpAFCo4MQA4+EHciA5DUdIgnUhBGJQJTMbgXjI8GQ7HDJ7r6uxelwMFdjYrNKl50OcxbXGVmUGURJBEt5tg8wPmEuCOFjESRjUAoDmP3IjB2f/rkh1/2vpU7jiucePjN5uYKh2XA55brayqtYFdNlG6OYxYNTi3DsRzLgFEwUJeRhmtsbKyze3v6xr8tqsCRPc1et8v661q3bK1yWsCKlHNLsHpORXANERkkLGLMNK9/qjT8Q9/4z3kKHNrdpLjL1Su+6pKqSocFRKMhL8CWKyReBIGjjKQzbHu9V/n6p4GJkCE7oMJpO1ZdLjaUl0o0yAi2IJWBYLZDOhmFWHgEOF4Ck+IBUfZAHL8jk0N5ICbsF/F/WotCPDQCyehk3n/iEpJFLrsoRRNlH2HXa9TEo/tavHVe9c5ajwKYao8td/p3YtsB04EhCI70gKtxD1UiKwRg5NoJ+u5q2gNmuz8PMDB8Gcavd80KzmkMzOHREAzeDtZQF7y6vfG0p8LUYMNo51j28WBL2TpsfgQ1g1LVBizHU2WIhbyo0H6p1Ad233YwlrioQvHwKO0nYyWbj45PRgOzYiKjZyDDqzMusMmGDtVqpGlWTIjVxAXE2iytdt82ygihnQixlFicHV+/7VP6VN3ts1xFXEGyQpWlDvb4gee2yBIjGgVu3iCaQIBcn06hS3Lfs+B0R0SGHo730nfBXFZ0PRJnIp9xszW1dbvNJEdZdk5wAlxoBQHJSniir8icwLwGkZ1UTwbtrMNZVSkY5s91bYHFdG16yWlpwI1NRNZZssOxLLMqR7HiqIsaVqsO0FIZSELmAWsQpNhq1CTkoLLY1oyy5d4NA/oqaKBpaSivab3I+lu2f8PwivZ/6qDjJiTan45U+1rP0ei72XthMDx83o+lVn6uFpwFhUJ2SSIx3Pdz03KhuVGsmtwbj56vrG2dOQuwktnRe6mzi0+MSCt5AhaTNFovOJ6famg/sAmxhtiZ/Zm5sH7ru5cSaf6JhgMp2XTemfA07TxFwOkxnf0pmtX9vs2dNzK8/ETigVbMuqC7W/Zds8jOT4rWhKihPxELn7517dSGZPAPy0ptUAQ8DYJes+nYDbW8/pWs9UWLUlTCio8PHvzV3zH++9kyPTZuXE5cENoZsSJR/cz+W4Xg85blOPFZfLwXvn+zOXDnqjUe/FNKRceWpAxJN15tiNS2HewRJeWdQvBFXUyIW/DxMjaikP/B3/1Sfq0HcPvHj6t4A5tHOSPImnPdrkln7WZyF+hE8IdFD6WFq1qq9VABM3kSiWq/kIKGBi9n1K3VW6dc6zoGjSb5fZx/ZcXuhnPJd1+8lKl2+xK2NS9O2T1tE4LJ+hV2n5nL6hWXybGhu8hMN9nQ/g3ixd8bVuh67s9101LkHwEGAHiA8Hoi/Qh6AAAAAElFTkSuQmCC\",\"icon64URL\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIE1hY2ludG9zaCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpENEJDNzQ2RjkyQzExMUUyOEM1RTgyQ0UwMUE5RjI0RiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpENEJDNzQ3MDkyQzExMUUyOEM1RTgyQ0UwMUE5RjI0RiI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkQ0QkM3NDZEOTJDMTExRTI4QzVFODJDRTAxQTlGMjRGIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkQ0QkM3NDZFOTJDMTExRTI4QzVFODJDRTAxQTlGMjRGIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+zVczFAAACZBJREFUeNrkW3lsFOcV/2Zmd2fP2fvwHnixjcGYYMeAgVQEIogU/qAyoapI20CcgpqUIENa0aQSUv5o1ESNokRBQRGtQkgbkipHFeWPqgE1dtpAD8A4UZ0WUuwGX/jaNd5zZmf63vjI2p41u77wsk/6vNd8O/v7vfd+733fjClJkkghG00K3KiFOMkTD1VtUavoapWKKlYx+EgHGZoKTjdHSInNqZQU4gWxEUYbjE9efbulLS8IOLB7dVCjZuq0LLNZx6rqDHo10WtVRMuqiI5lCKtRESCE0LTy6UVRJEleJPFkisTiAonGeRKJCTD4Nnj9h3gi9cax05ebFx0BDT+ofsSoV+81GTRbzEYNMZtYwhnUAHoEsAoHQxOGoQhD04TKcHbUpZQoQRRIBDxPeD5FEjCiQELoZoIMhOMkPJxsi0T5l2MJ4eTxdz4P3TYCfrx7tQUAHgLADXaL1gJDBm4Aj7MAXDONp3Mx1GpIC5JIIhE8CUeSpD8UJ72D8XBoKP5SNC68BCkSWlACfrK35pDVon3GbdWZnTYdQa/rdWrCqtG78ycvSAZGRgxSYxAioncgRrr7Y+GBUOzQi6cunZx3Ag5+v6rayrGve53G6iKHntjMWgCumjas54uIFOgFpkY/pEXnjQjp7B3+JHwzWf/KW5ezEkwm15MeeXTNM3638XRZwOIpLjIRh1Un5zio+oKCl70H58P0AsEloD0EtAeFNkgo+tG7yuznz7d0t81ZBBx4aLUFPP3BEo9pi99jlL0+36Gee0RIJJZIkRv9UXKtc4h09AzX/+r1iydnHQGg7tVFLtOHZX5ufdDHAXhWZn0xgR+JCEquMgbdSNmFDKlbVWZv/+ulruYZE3D44bur/UVcU6nfFAh4THJZw1xftJ0d+ATLrA77Dug3wOoqpyGBuRX4gJdrAs+bvE6DzOpi83rGHh+0QTvadImSVFdZamv8rLmrLWsCIOwtAL5lWcBsKgLw+EX5An4yCZiu0FjuqghaT4MwTugVVIpl7ntVFq/L1FTi40weKHMj+Z6fix3UBIdFR5LJlIkX6LfgrXtuGQF1W5f/usRn3OZzG+U8ylfw6ZHAahgiCHxgZamtvelCZ3NGAp7et7Zuqdf4LNZ4gy7/wj6TMKqYkQrBp+j7y4vNr5673B2fQgCIniXot3y61MdpsJ+fbQ/PqPXEYC8jnHctMbmriMbglBsPIRHOar7RWUEMzpXEDPN1lmJCM2qS4qNEEvkZlUhckMFKU5MQ1OTjz66dnaIBHhd3zOfSGy0AnrkF+OCGwzKwMYv0tZKvmn4hP9foncRd8SCxFt+rOBdB9F39I+lpfW/KZ2Nz8buRQCUbbG8inS1vyt+Tqx7YoYFzmIUGDPYJEfCzH64JBouMv8Faj+v2W0W+vWSb/GPHjI/2yT8MQQc3Pkn0trLMOQmeRO8awbtDnf8c96ij7AGypPagPBePyWQYDXj+4Z6WrKMpvUfgBUG9ssTW/ud/XG8e72i8bsfzblB8nXbmoofgA2t+lNFzk83gqABv75Kf4zzv6oeznovHFW88nPXx4/OgicNVa3Ew+Ph4BKD3Ax7tCa9c77NbH9kAbHoEMGoDsfg3TjgmFm4n4evnyU3wFJKafvyYobdxrr1k64T3k9FeiI4LZKjrAhH5CFFpLVOiAudJoiCnXy5RgCMUDvmWB60vyxrg93kPOq20HPqzEbx04F2Qo8O93/ywntYRAtBrOnPxhLkY+un6gPmN6TTZMEom64q1eJOilkxn2NeYjSzx+YvvkVPArKceGenxZ1/yEPx/QQzTwad7FT/LJF74Pn6uBB7t6wuvTfE2kpprGmB1w1TnOONO+uhjtUE9K9hm4/3JAKZTZ/wMhU/J2s+/KBM4nQ0okIOimKvhVp1OQ9eqvF7/XpNelEvEbA1LWzalKQkVY7KhZ5WiZrLxEEVzYdgTgN7ZaTNn+DZuVc9Fw5cpdJVSIRvPKqZYqH1OCGCwK4z1OWmtWlqCojAX4Z/M0jtKXoxnCSzX5iczAdAaU4KGFpMDDtyvn63Fw7PzTCw8N57NWghx9wi37LVQ93GhUGg20g9QUBFo+o5Y8c1kA1Vv9iUK9uowXnpLSczNwiUgJRFGw4ULlgC8zsganW2wvtCJhXiTiCCIxOIqb6R1Jm+k0BiQrykSVlxRs/1dWmsOXEM2CksARWJwrhqA6tdK6y2BxiSfKigC8O4Tva1U7r3pyvW7fitIbMFkgRz+NMdXbvju8dGOkPo756vtxbAoFPU3edZ2AO4zMgH4x1e+9c14Irc0SCUjeen9REotBqt2HB9viUfbQl/zxy/8Swpf5OZiV2hR137P1s7KTfsqIAKGxiMAXnT4K3f8Lgns3KlaIN9kRSD3N+17bgz8OAFoDu/yZ60l2zuQpTtT+VPEX1P/BYB/ZcKy+JvlIdVRvm73UUofjN5p9w/jwsfg2zzoLd3w2JR9gYlrZOqNivuOfCRpPIk7hQTEIardiSWrHzyGFW9aAtB0Buv+pRsbmnhRk/d6IN9PCDiW1NSfM5rdLyhujGRgzTfQ9eWfrl88USrFu9h83TDBji+w/sl/u4PrdmLbq3SM4nIY9cBWtOI7y+87elZi8zMdUMxdq/Z0A/g9mcBnjIC0SODg4dSVc6/dO9zRaM2XHgHBOyv3dAdWbj8A4N+f7lgqSyH5ed/Xlx7vuHTCTfiwejFnRC7gsyZglIRaeHjuf5+/v2rg6kd2SkzQi4kIzFKRYsXAuic6HYGahmzA50RAGhF7k7Ghhp6rZ/yDbWctUjJ02yMCNYrSFiUCa/Z/ZfWsqFcqd3NGQJo27ISxt//6pWX9bY1crK/FSFILHxXY5Ohc64aCa+v/otVbfjqd4M0ZAQqpgWRsC9/4j3Oo5wt9pO9LHR/pYMXE/EXHWMgXVdV3e0o3nYK3fpne4y8YAZPIqICH2tGBz31ACiskIwwsn+nI4DV2nBAAoDG4eK3JJUQH29gbrb93ZnuFWgSvs7bK4dKNB69odNyRsbX9TIxagPxEIkwwuFFS0q0DxvXWv72zc+DKe0+Z9Opbep2ozby/Zn+P3X/3h/Dq6Zl4Pd1U803ApJxU9NTZd5+voZIpQjIQgMApjYV3LNvR71vxAH7fU7kI3W0lIKvaDQhVCt2mAvBj2Za3vCJAqaypudKoOfCtofkCvigJkGhWNBZtCDuWbhkyu8o/hbc+mC/gi4oAl29Fl/2uDZ2B5Zs7EfQo8NaFODe1SFZ6vtEKcWahT0wV+r/P/1+AAQBXzMCkCOGqMwAAAABJRU5ErkJggg==\",\"author\":\"mixi\",\"homepageURL\":\"https://mixi.jp/promotion.pl?id=social_sidebar\"}");
--pref("social.manifest.cliqz", "{\"builtin\": \"true\",\"origin\": \"https://mozsocial.cliqz.com\",\"name\": \"Cliqz\",\"description\": \"Cliqz for Firefox Social\",\"author\": \"Cliqz\",\"homepageURL\": \"https://mozsocial.cliqz.com/\",\"version\": \"0.9\",\"workerURL\": \"https://mozsocial.cliqz.com/worker\",\"sidebarURL\": \"https://mozsocial.cliqz.com/sidebar\",\"iconURL\": \"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9wKEgkPNcdyEiIAAANaSURBVDjLVZNPUJR1HMY/39/77vLXZYFhKf4sbEKRTlrjFFIzFgtlJmQyddAmrOlgjdIAt+yQp04Wzti9sUZwPFgzOdg0sIuThaGUOBROEqLAimsoiqy77Lvvt0s09ZyeZ+Z5ntPzCKvo2w+7Poe+/YXAQeBtEINqX9gX+2JT3mKpgznT0zhwpyvaTE/jAAACQG8H7D4CJ/YZHFkA/ICi4JW01FtXWFco5NjcPxweXMN/YADw/KMyEkHEj7qKugJQQZxlR4klUEvI74o0H/hfQXc0DG8cgd7uLah5Gle1oWSt7KzYyIH1WyXotYknYHBGJDIHk/fc1tXw5lPbsIaPXuXg2aZ1Wcn5L/3OzbKkeGVTyXpa86u044lmuRC7pkOxCbGMhTGqapuKqnfqArPHrvTP9k4inZFwgSLXz8cTvnDldj0zPcXrj+5gauZPQUT7fo9KVWUJo7f/wJDi2eoACSt1yxa79VzL6Z+lK9L0yVJ65cONpW26u/ZdOT87wUJqCUln9NvpC9IQXK8dT+2Qk5NDvFq7BdsYfWton4zfu9ydbbyHbYW2omw/raGXpGf4OP6cAurL6xCF0O0Ae598hUPnTuDPd4gtzVOc6xdLLIyx6tWYLAPUPJRbzuJyhkNj/fy6cFXzvblqWbZU+AM6Mjshlf4AP8Z+I+Wm+GFmmLG743iNXSyqxlZ0xWNl54SKgnzz2kfM3YnL7L1bpB1H60qCUr6mRPOycqTS9yZluaWMLPzC3sf28P3ckDt6+1LGatjzyDaQ4ONFm/jp2hQ3kotcvxvn1uJfYtse8myvLK08IJlOUVZQSI0vpM8FnuHFsudrkunUBemKNrcLenQxZeuxcVtWXME4GVh6oJlsj3Q07NQNxdXSffYzNqzNxRjFqKXv1bZLla/yvnFd97gqA/leR8r9adRRzSSSmlFXWF7WUEGpXIxfpcAnOLpC2nVIaWp810Bb9Wh87CsB6Iy+kJVlrA8u3+X9Gzfd0Mik8+9NPF6vbq57WJJ5N7FtC4X7ItI+vL3/awDpijbR0zgIQOdguEqMmU6kVCdiLhkX2Ri0UIuxiw88EYWMoB8Pt3yXWJ2zrJLOSBOHw4N0RppeFuGkCDkArnLJQrZ+2jgwv+ptOLWN4ZbTAPwNmUptT0KshT0AAAAASUVORK5CYII=\",\"icon32URL\": \"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB90DEgoTOwK3bfUAAAj8SURBVFjDnZd5cFXlGcZ/7znnLslNCIEkQBJI2IksAWpcgmjFugRxA41lwFKmTgd0tB2qqVVpLXWGAk4V1y5IxRnRCR2tWIgwWhYxCJECYQmEVWQLSch2c7dz73n7x80NIVKgfn+d78x3zvu8z/d+z/e8wtWMt2YJkA88ATwA5AF+YBOwFKhk7orA02sLkkSwAP/ikhotqyhgcUnNZX8tVwgMc1fAW7OWAPMA47uLFNT8bEafHStzkyOliqQBu4EFi0tqzlwpN7mK4OuB2y9E6/aNQo5V5+9v1bmuywqrx1CvxFfUA/2B8OVYMK4QfFFHcL00YMUtkXCedSZJwVNV73EUHI2vzgTe+35b8NYsgBuArRdlrQoiF2U/xHWivbfZ7ANBFTK8sbYxvcOpjkriu75A3f8CcmkG5q4AeK87SJ/hBtuOA0EBgwyzydB4MAxRGsNmqj9itBmoCIoqpd9nC24FBnVE6kx39oiJzC+YDOqQl9SL61Iy2xx1kkTQYIzwcb/VXN1kNa086jM2nkmqP9zqag3G5AaA4vKi/wOAmmWoRFFT4ruviuNwU99hLPjRDCUQ4rMpT+u2GYt8PieFuqC0H26zjFZbegqaHoyJN6r0POF39djR6L35xvKiSZWlVVcH4NcVIxaOc1dPutazxxrlPtjgNcJ+VIRohCl5hQpItiadG9I7WzAw+voKA+fCZiqKSwQVEQTMlogREVAHegp8XlxeNOhSLFiJh7KKggGqbDsfNrIscQwR1SQCGePdNdGacH5bD7M3Pm9SaiQS0dPHq7MSxXm2LeQRcFQQVAURRNBWW+jlcUSMzhzXV5ZWDSkuL6IrG0ZZRQFlFQVeoFJE+zZHjLAhEAgHpL9ngLaEok6kqd64N+caF6Brd20WnADlX6+XxqbzbD6wL9Re394eCLRKRKMoiqMqLbYSdSKECBmKqqoOLi4v+nn3rTA6KvRlIEcAv23YkWhEl5e8S/n0D2XONfOt9kA0uaSg2APIJzVf8NTtj/HIyt8G+70ylZgZ1WWT/5B65vHN3N93Il7bIs1IZkzK0OTSQdOdZwqfc/tsn0j8+L74HR3oyD4IqIHK1joz+sS4F6xpYx4kbIfVdERcvxlHdHE1pmWS9quJ+sW85bK5dkfkiY1L3c8U/0QX3jlXAFr8rfr+rn/JDwYXUtRvZKd+LK98m2Wn/4yoABQC1QkmDGB253kX6O8bHp425kE9eOZI9HD9SQKREAOzCzAtk6bWZrvV9suYnKGMyx7mTnL5dOEdcwTgmVUvB9NSekhuj36c9Td26oeqkpGUgaNOIumpF9UAcGdiEtMYj46bGwPk2fVvRHPTsmTLsd1MG3UrAB/u2+T6cdHkMMDRxlM8XTxdEGHNzk3U2Oe8AEcaDzoBuyHQRb7jmV24SyZ0PwWjExPbjnFT3m0+gH/WVuL+eLHGVOWXEx6OA9i/iceKpynAmsNfsfSBeQDM3/A2f5zyuAB8fWpbtOXs2WS71c/EwTfH8jLzzb0NezDEAEWAEd11ICcxyU4ZqaYlZkNTQ9TRqPuDA5/Jqj3rKM6PY1xbs0VLht/oBTjeeFr7pPbG3+5nd+NR7hh2PXHg1U5LuJlRA0ZrXma+Wf1NNWvOrU7sP0Cf7gy4OwGkjhCAUNS2EFGX5aWw32AAak8dY1juYDEMg2AwqP0y+gjAp/u3UvbDRwDYeWQ/flzORw99TC9fljS3NTPn80eR1HgtAIiIqzsDwc7Lxp0OQG5mP56b8DPZMuNVxmcOAeDT2m3cOTSe5eZDO4LjBxQA4HG7eeHWeB2vOVjJu1N/n9zLl6XRqM2bX77OXcNLmNTnNgp7jsWHD9ux/V3vBgv4FhgOEIi0kKjcFyfPYd3eL7k+fxQA645sZ+rYeDF+XlvlDMobiKpyT+EttLb78VhuVtd+yYZJb6Ad1+Ozdz3fmWkoEuK0/xSvb301uerNXTmVpVWnEgzsSiyqqd8ExPUc0AUb3qE51AbAlm+rtTHQqgCVx3anNAZaAyLCifrTnGs7D0DV4e34vMkqIrgsl3al2uv2MjB9EH+6e6k81X/evsQZsYA1wMMAQRp4f/vzMijz7tjKnZVm5dnd7N14gnEZQ2gNnufFje9Er80a6jrceJJl2z+Woj7DdcG6ZbLlF3/j0Mlj4IXjdSelOdxgN9r1rohGsMRFmjuN3JRcstNzAGTRXUvSjqw49PeP+GS2lFUUJM6nAhKLRTnRmtqyaq8nFbdloIpHXITVhpDd5o4ZqVGN4VgExO1OnjKsmNUzF/GXzf9gzr9fJie5HyNy6traJZga1SimmHitJNI96QxMHshjY59kSOYQXbPrE7l3x72ZibtgQYdyqWlapCaFzZ5phOOQhDBRgBB2LCWiURwUomqoSeyW/LEKsOWbPSAmpwJ1rWFPyGu4DHW73ZguE1sinIvU8VXz1qr71kye/8Hulc7dY+9h9LmRs40O7/47oDoBoofLsfLSIyKidgc5NoGIdpU0VL2EIu15afHjuPXUXsVB8zPtmKO4uvlN7VDEsv2zD704a/PMCa99/cqx+0bff4fRxa/dAuwAxGupN8XlyLDMsE3MaCdg28QcL8iFwhJRIk7KquoNQUCP1B+TdF/U3zc96tbvel0BVleWVm0sLi8i8qRue2n3ohu2BiozzMSKCTMzQ4tLav46YWbmGYUs2zGCvb2xpGxPKHS8wUiL2+G44bgg8cK+s7XhHccPuo9Evm0fk20ni9dwuosNcBq4rv9DOZ1mZOT4gnY7K7LzIqhdW6l3vhqUeqDZ3WoKHKiz2rYcdVt1TaYLwUI6rLqCx6OhgtxQsGeaZQQxephes3v6a4GfVpZW1Xd9mXBGl23NyioKlqjylCFKKCrRpoBhH6izAu0R6e0yNDwg3WnPTY+lpXgcsR0xtrX5pqtQKiIZQC2wHPhPZWlVqLsVu2JrlmCjrKLgeEczqqBiCEhHi6LaYQbjL55cMrnmte7/+V+BL2/LoWtXOwHYFwcrOCrEVMRRUaWzJBYumVzzWoemXDQuF/yyALqwcAq4EXipq8noYO8b4DbguatpxS81/gvSJCNlZUMZjgAAAABJRU5ErkJggg==\",\"icon64URL\": \"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB90DEgoTJxa2MboAABYBSURBVHjazZt5fFXlue+/z1p7SnYmMjHPMwJaNAhxQFTUWJHj0FBrK7W2tdajtYPYW/3ce+w5tz2N3rannh7s7amntLXHwxFbtYpinTUKQcFAEhAhEAghZCLJTva01nruH3vI3mEnjNL7fj7wgb3e913v83vm53mXcCbHmlVw11pYs8oAioFy4CZgITAJ8AD9wG7gTeC/gQbuWtuRtv4sDvkUiP8McC9wPVA4aJZmeOceYD3wKHetbTvbIMgZJv4nwLcA7zAEZxoakwy9hbt+9zzA6g2zvw9UAuOAZuBp4EdVFQ26esNsqioa/j8AYIDw/Lg4LzsJogdjoCAy09v82PJRzV8xRP0ZtrHjoDwDnBEQjNNaHSO+BHjvtIlXQya5DjYXaMfdtR2eABBWRQdNNOPqUlVV0cDqDbP/hhKwZlUCwEPAyFMnPjZKjfbmye5DY0FQhRy3c6CsJDTeUVGRjPveXlXR8Nu/DQAx4gV4A7j09I6gamJHLvTuCFtq5saJVUeRsdnWgZkFkUwgJMAuBjpORxWMUxZ9+D9x4vX06Ddkurup1cbISyFSDFFt7neNbg26OkRUhmDcv56uHThVCTgf2HL6NljVQAMXemtzHMxMZ1HLoXfpmKDPEPUMcdw8oPdUgTBOQfSJuyQ9ffpFRpttQQdjKEaIy9C87Z2e9mEOevfZU4GY1f/7eFR3fOlRe8DDDSGApWZnRFWGAVO0M2yOOhoxWjN4BQU+f3bc4AD3f3pC3FdleeEczN5wDKoECKrx5QrgZEl4VKqB0+TfiiqWrViOovVdHmxFog6W7RBBUVBR5dyzZwPWrPom8MsTmmtH2XL9P9B5tIurXnwE8v0Dz4JhvLaB5Qs2l/kbx2qcD6qoiIoq/V0RI9gdFaffMkKWUuAo/mm5dme2S51slxMs9dmlxT67s8DrjHWUOVUVOxs+fRWAfzhh3Y9EOX/cdJbNW8j3Z14d47wC4Qg7bvlnmr/5ODe6xrkUAR0gPhCVxp09LmnuN/MCUaPEUcYbkOsSNTrCRtQULQ1ZxsSmgNu3rcNbuq3du9ctOvXTVYE1q2DNbYtRSlAkBsHwOMwtnAQCqsqPl98Bnb2A8o/n38Q5oyZSmJXDU3f8vDTcGU3Iod0aNPbtCbgm20qWCG4RGPgjdEekQJVIzHwiirg6w+aUv7blrC5fVzYGoHxd2acAwF1rQd13ATbi9IMoaoLKEBZOuXri/JiOiYApzMsbC5EQ9y64GlVFRDDchiwbd7WKgd3UZxxpDZmTTBk6oDSErK6IEUh5LHGAzgU+KF9XNre6subMAJAaZz/08sxvnefZfukF3h1mmac+6wLvds711u8qMjt3ooYcIwyOzXXj56chkuXyUpJVRF52jooMUDB/1Dxp7OVQT9QYY8jw0bSI0hE2+g1SAqPYkjAwCqgpX1eWezJSMJwEeFZvmP3l+1+cHWoPmf/LLdZEQ1QNUTFExSeRmTPcTbMW+mr35BmBXhQnKQ1Rh8umpAEgTR9vazzHMvYOpjDPW9rXGWK8CHp8myz0W1KkYA3QryCE4v/1Ae8CcqIguIbgvAn8BVgmorSHXFGJnVwGXIdgIyro1DmePf2tdtHhRmvCGByr55Ks0ihCUdLoB4N6uPvA5Al9o9NqBKqqLf2dfpdpxJPhE+CYkBWIykG/i7EJ9ymGGCnyMA/4SXVlzepTkoB4VFUXT28RoC1kdqYeTuOMFpCYx5asUrNzzDjrkzr21JsVE+cXpVrJDVveFPKy2dK8MxbZJNaLyNY9uy0nZDTG4v3jOxgRpc+S0pT8wBZDxgxy6/eXryubdFIAJHR+9YbZzwAzUxAnEDUKBokcUTtKxIoko5ZDPZ5DB9uYAVbn8tkXozqgpy/UvQ1uNw4Wv3nzGUQGIr/1O14Lhdt0UvgozSBRTcZCmhoZpUWGPVHjiCSCaUNaMxgOBZ44KQDiBYY7gRtSXxuypVNiCQeqiqI4fQ7LS1fwxYmrcPWY0tjlaznQ5SlB1O3y55XOnTCDVEP359o3Yv+IRrnnhZ/yxGvrpT/Q59z+qwdp94aCGCpWQEf17e8+0t/VLf3BfhAh4sRdpKaRJkFbvPHtRd3qcsRJk8z4WFq+rmz+8WyBpHDfA4QHFzY6Q8b+2k7vRIn79Cmuaaz9/B/weDwA9Pf1WwUPX+WK+g0FleUTF/Hclx9JHqito52R378Ysrw8vbKKm9f9AFzSCozE7wPT6KE3lFvozuG52x6Vi+acr798aa3cs+VR7pi6nCcbX8bIcsWNBhhiIGowP9+xjYhpTiycFOgP9+U060HIjs2Jg6/A+urKms8d1wjGuf+zweGxKvTbkgNgOxbn55fx+I3/nmY5sv3ZrqrL79Rvv/crQeCzM8vTnPTzH7wOuTnML53OTRdfw/17a3mk7mmTbF/SEUwuHNu++e+fKC7OL0RV5e5rVrG+biO/vuVHnPPSVL734S+4anI5V41ZRGn2CCblj2FW6RQKCwoVyAF49v1nebj+IbJys1KZe3P5ujI3EB0qPjBWb5jN6g2z3cA3B2ucCBp1pFAE8p0RPPZ3a9KI19jgxnOXCsEghIOsmHVxmig+v+MtME2Wz4sVjqpuW02u5c1JvisU0tfu/GVRnPik6vzm1h8DcN81dzBDRjN/1AzuW7KKL5RdT/mMC7SwoNBM8SasWLSCaFs0E423DmsD4lb/7szJkUrYkoBlR/nh0h/hMl1J4roC3Y7EBiX5hWBZFGQXM2pESZr+v7DrXSUa5oZzLkus1RvnXOZDENThwUtul0nFYyU1GVRVJo+akHzXlZMXY9n2kElc4n1jfeMyldsrh4sOE/z8ekZ7C0RU+s/NW0D5tKRoa9OR/dHH/vqknVjTerQDXC5WzLgozVXu3LfbtoywZHlyOH/ynMRBZfyIkQDkGFk8fNXXSXWLL25+nT9UP59GmKgQtELHteh5nvzBLBSgYlgJWL1hdg4we6gYtDcUtL6z6P7kgUREbl17f/iCqfPdqiqqyvt7a8Hr4rrp6fr/yq7NXfj93Dzv8rQ9u/sDgPKDi76I6TIREVSVcCjMZ9fe3/KnHW8GUuc3tO3hcKDjuBlYtic74+/l68pmDicB1wy36VTfdD1nwjlJrn7c1MA7Bz8KTSscqwlC39q/DWyHilnlaWufrN1YjGOFV553VZpdqGvZA1GL715ySyr3eWDdT5Viz+jKCytyUufXtm4Pd/Yd2Juq85mGZVtDkXHhUO7QABYP3a9yuGXequwUruoT76/vpKC4+N39tZIQ0Q273mdqwST82SkccGBT83YQaf3svEvS7MLbB7Zzw8yleDyeJPejkSj/suUZwVZWzh+QmKZD+ykq6vX2RHZN6e3vSYCufcF+AsE0QaEr2DUUKecNZQdcwJyhmhr9oSAXTanIT7HO8vvtG724TL7yl5/gx0NleQX7uvfz7bI70vT/1Y/eBb+HZRPK8lN33ntwP1Gjj68vuC5NXf7vq+ugwMPyaRchhpHc5836mqP+An+BiMGq9V+Um8ZXsmV/jeT5c3sevvmfkgGaIOwJfkKRFmYyhNOGU4HJQ+l/kWuq5vpzzAT3jna3c6ivO4IqeF2sfPZBXN9bDHnZXDttUZo4/2VnNXhcesO8y/JT93y5rhr8fq6Zk64u//b+M4DNvRfenLbPf9W+7TcMM4zCQesA/1z/j4wYXaAP3/xPeaqadJ3/8sLPyB+fl0k9BJgwXCA0aqiHs0ZekgbM7ubGfrKzRhALCyE7BxuF/n6unLkwLZ17tu5tsIPy+flXpvn3l3dv4oopC9Pe09bRTn3XJ+SWjoztkwrY3vfck71mc2G2PSYYDsqPLq1i+dwVaXu+VfsWTx78He4i91CkFA8nATmZ9d9mXP7cNESbe7oE00hv6CKcM2oWidK+qhIMBtnXu5/xBRMYkZOfqv/60p7NVMxYlPau/968EQpyuG/hzWlq9ElTI5YnSm/YLLVtSx67fA3L565IiwMOt7dwz8Zv4C5yD2kc43WCIQEwMxZ1HYvS7OlpxksMMyuWEcWTd8cBhaunXZi29oWtb0Ken+tmpIv54bZWDdtHuWjsvLTDbty9OZbDXnxrmvi/vONdyPVrf9Db8eiSn7FkxmVpz1s7W7nlyZXkTMpJk4hMxZ3hAMgYPzqOTaE/XTsun7MQjvYKakNvD09UPACdnSyZeG7awV7c9R6YwrIpFyR/V1Verd8UJcvDBeNnpx323aZa7rngJnKz/Wm/v/zxJrAj8vvlPyxZMv3yNCL7+/v1tie/QP/IAI468crEkKN/OBvQBxQcA4A6eN3+tN9yc3J54cv/xp/q3+T+y7/IyJwivmJFuGzqgmMPLhEumXTeQDQnwmu7awLiy/O63OmFqHNLpvKL5d85houv7Klh8Tmf4fr5l5qpkWFvX69z82N/Z8g4YaprGoZjEFWLzmgHtmljmVGiGk0EbqjqsAC0ZAIABNuxBjV7lGsXXMq1C2KJzUtb3sJTOJo8f25yTiAQ4FB/C+TmUpw/Im39hrrq/tGjRhQN3vOvD/w6rfihqhw43ExI+vjaBcuPAeZw12F55r7n1e/LPkbmWztb2XF4O5uPvM8rjRvp8Xbj9XgPDKcCezM9ME2TrsBhMiUdifFcw9t8Zsz0NGJe2V4NednMLkz3PKFgiJaeg/jdvmP2VFU6urvS9n/xo7ch10v52LmDmaDTx02XTMQDjCwcyRVzruSBS3/A+pXPcoVrGX29fecveWFxXjllGQHYkVE0DDdNR2uHaPvFWPXEthfxmu40Yl7b8wG43eR4s9LmV9dvgWxfSW8kqIP3EhG27qlL22fjrk0ATBgxMt0Qi5xQO88wDAqyCvhJ5aPcO+k7/kib1cQzx9xawwCqM5eKTDbtfzpTqQkR4dG//AfhLIfa1r1pc97ZXwsKDe37kxwTEbY0NYDH4zvcc6R9cJiy9ZM6wthp73lp9yZwHHxu76k3PuPS9ZWld/CDeQ/l97YE3rs7cod50bqFaQC8NFQm0Gp/xLY9bx0j+h837eX+N9aA281Rq5c/ffBqcs62lp0xW2D369M1r2iCYzta9sRcp9rRmsYdmoziEK78+Tf47IIlyT2aW1sImrG6YNiKnt4NkDgI1y24Xr85/Z4Z7z1Z85t3KzenFUQiwNZjU03B5XLzxIdfY9OuDRzubNLG1mbnuQ9fZ87PvgB5WbFAyHRx47oHeWXHexxqbQFvvK5ruuRzf3ygd937L2FZFge6DsdLmq68rz1bJXuPHOTjln1cUfVVSqakFzJer9sEeX4Qk7ZAV7xwFNLWzlZnT+sn1LfUsb2llo8ObaPu8A52te7iQMcBugPdGVU1DoJ8Y9ldOjYwdlX5+rK5g4uidwKPZ9J1EQj2hckzx/BUQ0FgT1erH78v1g5LhMQCEna4qGQW73Q2gCvu5gKho4Qi+ZdM+IzsPtLEYe1VhA6y3cX5+LGtKAEJcs+ilfzium8n33v7rx/ity1vgRXlx4u+SmNrM2FjX6DbaQsfNbqKgk6QKFEsx8JrevEYXvLceRR5ihibNY6y4gu5/twVuL3HhsZ7D+3l2qeWfbjru3vPB5DErcvVG2brUBcdQDAN5andeQ2N7d7Zx1bhNVMm3UxfaFwSpERfSRVys5pBxwCCY/Pnyh+zYu6S5OJJ/+Na9vtiRRPsGJ8WTgz0uXJdhqI+QGLbSfyexLH5n9Nrc9O4lXxn2fcwTTNVGvSr/3G77C7eOc8K2TuMlPs1jwyhRMRb+IzJjRa4TKf9WG1J62PHxCYc8ZNogIik55sRKysepYAVYenkBakRGPu7mxIlSTAFhIDHJ0cRshJ1SEk26CQZ8CR+F0MwC1z6X0f/2HPJ2sVH/7j1DwSCAU2owl2L79Yjje3fra6sidUE432Bh4DQUGUnVfCbjjGjJOzgyHBXYwTb6cRyRmRMs0WUiOWL9yDw+wqSgZSqUl33wYB9iedXpqkd6jFKdZhs55hyqSJe0/uvdr61+Kd1jzx9x0u3ScPBehURzp91AcXR4i8li6JVFQ3EjeGdHNuLSeynBV6nIM9rl/p9dnNGmGJJkkMwoogMfTNKNRvL7gaYVzIlzWK/07gNsnyJ1FpRZHShZSjiPtEYIOX8P3Q5rp0ffKn2c81O8y23vrrSeWPX6wBcNulyc8lzixek9QarKhp+B/xnJhBUkQKP02arMKsklINof5ryxyxmlGC0HUeLj9voD0U9QLDQl5v2nk1NDSl1BRWPy+maUBT1ZLghdjw5eLS6siZcXVlD+boyqj9X85Q/N3vBt96/++Pff7hWrphyJR2HOpYO7g0CfAl4fTAIIjDCa4+2laDL1PwZxeFOHJE4l2LhXDjaQtQuHob7Awd0tICI3d3Y1ZIG1LbDHye7AzjSPXdU0I9p+Ia4LzwU94PAA4lCaAKEd27aXJuTk7Pw8d2/bNja8yGRgHWekaE1bldVNFweB8EZJFJmgcfpACjMtsaV5kbjqqA2YWsvYWtC3DrJCUQoSihS2nDk47YPGusH3FTH/qQBnF4a6nOb2o6QfxLEC/CF6soaJ7UQmvy3Q7dLXPP+89AfWgtHj5g01P0A4iDcA+xKlqOBcX4rW1WwVZhQGCkpyY7W0Wd1EY5OiXNeTkJMDdT0Xfbbe3vXbX4ZjdjgUnAITxgRaS32W2PEbbhPkvjHqytr/jxUGby6soa3Vr5nu93uiw23UXLcw8YbJwuBL6uyUEQL3jyU1Vnoc/qm5Ebn+lxqbqjzHqxvcU+O3x87mbuHiqrgMg66s7LGzXWP1q19+2TKaLupJMcep6qGmWP2AjknaABfqq6sqShfV8Zw7bDE8/J1ZTeeCADHfJnx4MuzfmU7fN2JeT31uFRervfu/fCge4zjiA85SRxUwe06INnmyGnFkZaiLGuio4KYHDCzzfEnuMsb1ZU1S49H/GAQTvq2eNxQlgBHEmKnirpNlX2dZucrO709bUfNScR6t8dBInY9EovQ7HHR3rIpFp/0uq2oI6MFxfSb3Qh5Q3A/de//Cfzv6soa56STpVPNslZvmP14PG5IIUXFUXEOdpmt6z/y9UWjMm3gC4CUA+sACQV+Z+vnFwSn5/o0W0QNVaH+qHtrW8Q1zpVtlhyH8HpgObD3ZO8HnhYAcSnwAV3EvhBLvVShhqh4XNDSYzTvOOQ62t5nlkQsSh0VDFHH5+bwmHy749yx0fG5Xi2I2ANHUUVNUWlzXIvqA76lIrIMKIq/JxIvcNYBv62urHknVZzPGgApQFwHPJ+ptZYAIpkigNqKJL4MUAVHYzYkxccnVOrbj1zb8PMUfc2NAx4Bek9F1D8VAOIg/DtwB6f50VTK+lerKhquPJPfBn6aEpCIIDdyWp/NJddtA8oA62wQf0YkIA6EN55D3HAKICTmbwaurKpo6OUsDuMM7ROuqmi4EfgVKfd4T3DYwItVFQ0XAmeV+DMmAYPUoQK4D7hqGPeVGO8Aa6oqGv7I32jImdwsBYQsYh8930rsktJcYtcYw8BOYCPwO2BfVUVDgL/h+H+8Ex3DrupO9wAAAABJRU5ErkJggg==\"}");
--pref("social.manifest.msnnow", "{\"builtin\": \"true\",\"origin\": \"https://now.msn.com\",\"name\": \"msnNOW\",\"workerURL\": \"https://now.msn.com/js/firefoxworker\",\"iconURL\": \"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2RpVFh0WE1MomNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDozMkY0QkZFREQxM0JFMTExQUE0MEYwQTFBRTFEN0QwMyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo5RjUxOThGOTJDRjkxMUUyQTQ5NzkxRkQxQjI1Mzg2NCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo5RjUxOThGODJDRjkxMUUyQTQ5NzkxRkQxQjI1Mzg2NCIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1IFdpbmRvd3MiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDowMTVCMTdDQ0M1MkFFMjExODNDRENFQTc0Q0EwNzEyMCIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDozMkY0QkZFREQxM0JFMTExQUE0MEYwQTFBRTFEN0QwMyIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Ppp4JKMAAABiSURBVHjaYvz//z8DJYCJgULAAmNwJEwk2Sk/FuQzUuyCUQMGgwGM+FIitrQBintKXKCG0wVA27Cl0t9IfEUgfoDmGuwuAEkAAbLzJdE14/UC1DUwOW6ggS/ICkRiAECAAQBDhCEtt+sSkAAAAABJRU5ErkJggg==\",\"icon32URL\": \"data:image/gif;base64,R0lGODlhIAAgAMQAAABgkm+lwf///y99psDY5K/N3c/h6k+RtA9pmO/1+I+5zz+HrR9zn7/X5N/r8V+bu3+vyJ/D1oCwySB0oGCcu+Ht80CIrRBqmTB+pwAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAAHAP8ALAAAAAAgACAAAAXAICCOZGmeaKqubOu+cCzPdG3fraDvfO//OhFwSNwJi0jfUQBpKCCRnQNCdQgMDV0iK9haBcvS4ooYIZyAAjMtUAC4YUYiwQAkDgBIAgIYJAAPAnWBDAxGAEZjAgtvYYgHCAYAFpEACoeJOowNZVZ/CAIFfRcOfQBfYIhBipsPfRADgDoTshgABzxhrG8JjCILCToBb21smEUODahIS0nOzc7MAATU1dbX1qjYBDUSOhQ4JN7g4SMS5OXp6uvs7eshADs=\",\"icon64URL\": \"data:image/gif;base64, R0lGODlhQABAAPcAAABgkonIVjuOhf///7tnLwhnmY6bU8/h6gGO/7/X5H+vyK/N3WBaW0+RtACSnF+buy6Gl0uy/9l7J6PXeV6HaO/1+PvIIwyNxY+5z02acCpfghaw6hR5mPh2FKlXUn/I8v+UcgJ2wSCwoyB0oD+HrfB5TpuZV4TDXsyyOiCc/9/r8Uuf0G+lwdtcPACvoESShBGt+Z/D1iN6hIbFUid/rQea/Ri79x2Cwt9VFZPRYf1bB3B8jHhmYwNnoD1tdjeIjwN7yG+0YK2oRQtokRGV/xKupgWcpLBoTx7E6QWAxy99pueyQJ3Rj1i5/+pJPUmahwl7qjBsjw2m+wC3qQGblftlDB9jgkCIrVGfgn1nUJrRbRzC9h9zn+eEIi+k/5HMYhi33iaqlsHZ5SaKyRBqmRa2+P9PBfH3+Quh+wCllzB+pwNupmC5+WCcuwWV/YrHWBFti4zJWxCUxKxPVJfPaQ5omYCwyabZfjBhfuHt83CmwgCZmQmGxgC8rdHj61CStLHP3YHK+QR4uhaX/1C0/w+TxASjo6HF1xCq+o3MWh7G9RKv+ZG70QOS/kSVgQme/Ad5yQCxo5rSbgqj+xOx+QSV/xKV/43JXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAAHAP8ALAAAAABAAEAAAAj/AAEIHEiwoMGDCBMqXMiwocOHECNKnEixosWLGDNq3Mixo8ePIC2uCPSBRkiNYyJEaMKmwMmLPSzJTOHlxkuLIdzodIMA0s2IO6IITIKmKJoaQH5CBFECDwA+i6IikiJI6cMjZnAAuGCjaxlKazJeKTjW4BU1B0eUBcBAR5UshcCAUaRow8UrMQboTTAi714yAEYk0Lt37BU7ZwgnQEuggwQoVNIYQSLn4oAzba60SYxZ85kEABac+TNCzZ8YdgDotXPFswoAVrrM0bDHhQtDHCy3GdhmwJ+BegYASKAiM+CBAzAQ/DMArQ8nHhxM6RPmBByLA9ZeyT5wOwA1fggP//CD1jfB7WV5tIBQRISkS0Gwa+cu0Ht3zSr8qF4LAL1AIRYYwMQdWsQRgAAV0defgt7pgdZAC+in4IJlUWABCj9MQMcbiWCR4HzzhXZZAgkkttuE/glkwhIAvPDFDDk8UdEVxwFABo0D3VifHTzqMUJ9NdqIo0EyZODIEBWRqOSSTDbp5JNQRvmkQOJVaeWVWGap5ZZ6Ucnll2CGeaWXYpZpZpZknqmmmmmu6WaYbb4pp5ZxVlkBiQdoeecCCww2p5VxkmBjAoLmqICVKjxgEAsV6FWBApD6qZcKkPpFGAaVVhmoQg+Id0CQBCmhgl4/AqCEeMoJ1KheBwyEgaaqVf9ZqEANKNAAQX5WECQJSoSqV6oAjKpXrwJZysJAqxK2qY156hXDQJ0OoMBAorJKLAB5VeDqpAQ1QBgXAkUr3rIkVAkuAOUOcC4ZyQ7QKq163WrqrwU1+q6IsFpZaLqE7dslvFUSy4VeCww06rml5nVsYGPGKp6/DwtUrrYCHSorcnodh8G7IxQMgLfnWpzvxeiSnC60+mI8wMJKLMzCAMeBJpCwI0dcss3pHjeweBTf7O5A5+apKADnbtdwyj7rBfHQAIg7gLwAvErYgwKNQHBBltbcr8Qmc0utAiyca2O7zw70csY5tjuuw1snPQDEA5SNkKSOEtTsAEw7rbXSXONxLN4CYgN9t3hDW02YxwAMvre7eFZ5QONVLqDAAw8oQPefwrGN+ebKas755nV+Pmfoor9Jeulrno76mQJJ6frrSyZW5WevWzXQ5WdQbXtDdOe+O0SS+v77Q34KP7xDgxl/PO/KL8/QAro7L/301FcfUkAAOw==\",\"sidebarURL\": \"https://now.msn.com/sidebar\",\"description\": \"See what's trending in realtime on Twitter, Facebook, Bing, YouTube and more.\",\"author\": \"Microsoft\",\"homepageURL\": \"https://now.msn.com/now-for-firefox\"}");
+-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);
- pref("social.toast-notifications.enabled", true);
+-pref("social.sidebar.open", true);
+-pref("social.sidebar.unload_timeout_ms", 10000);
+-
+-pref("dom.identity.enabled", false);
+-
+ // Turn on the CSP 1.0 parser for Content Security Policy headers
+ pref("security.csp.speccompliant", true);
+ 
 diff -ruN mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozilla-release/browser/base/content/abouthome/aboutHome.js
---- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js	2013-05-11 16:19:20.000000000 -0300
-+++ mozilla-release/browser/base/content/abouthome/aboutHome.js	2013-05-20 17:49:18.467307120 -0300
-@@ -3,69 +3,41 @@
+--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js	2013-08-07 11:44:11.230486326 -0300
++++ mozilla-release/browser/base/content/abouthome/aboutHome.js	2013-08-08 08:27:08.189418422 -0300
+@@ -3,132 +3,41 @@
   * 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," +
--           "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
+-           "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" +
@@ -121,26 +186,15 @@ diff -ruN mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil
    }
  };
  
-@@ -75,7 +47,7 @@
+@@ -138,7 +47,7 @@
  //   * add an entry here in the proper ordering (based on spans)
  // The <a/> part of the snippet will be linked to the corresponding url.
  const DEFAULT_SNIPPETS_URLS = [
--  "http://www.mozilla.com/firefox/features/?WT.mc_ID=default1"
+-  "https://www.mozilla.org/firefox/features/?utm_source=snippet&utm_medium=snippet&utm_campaign=default+feature+snippet"
 +  "http://packages.debian.org/experimental/iceweasel"
  , "https://www.gnu.org/software/gnuzilla/addons.html"
  ];
  
-@@ -139,10 +111,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
@@ -155,9 +209,9 @@ diff -urN mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi
  
  #searchText {
 diff -urN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties
---- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties	2013-02-15 19:14:45.000000000 -0200
-+++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties	2013-02-20 19:55:41.962705914 -0200
-@@ -3,19 +3,12 @@
+--- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties	2013-09-10 20:14:52.000000000 -0300
++++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties	2013-09-18 17:24:08.209539436 -0300
+@@ -3,17 +3,12 @@
  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
  # Default search engine
@@ -171,17 +225,15 @@ diff -urN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/regio
 -
 -# 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.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 
-@@ -24,20 +17,10 @@
+@@ -22,20 +17,10 @@
  # don't make any spelling errors here.
  gecko.handlerService.defaultHandlersVersion=3
  
@@ -191,7 +243,7 @@ diff -urN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/regio
 -
 -# 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.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
 -
@@ -229,27 +281,26 @@ diff -ruN mozilla-release.orig/layout/ipc/test-ipcbrowser.xul mozilla-release/la
             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
-+++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in
-@@ -11,13 +11,21 @@
+--- mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in	2013-09-10 20:14:52.000000000 -0300
++++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in	2013-09-18 17:41:28.559462661 -0300
+@@ -15,13 +15,20 @@
      <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3>
  <DD>@bookmarks_toolbarfolder_description@
      <DL><p>
--        <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/central/" ID="rdf:#$GvPhC3">@getting_started@</A>
+-        <DT><A HREF="https://www.mozilla.org/@AB_CD@/firefox/central/" ID="rdf:#$GvPhC3">@getting_started@</A>
 +        <DT><A HREF="https://parabolagnulinux.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre</A>
      </DL><p>
 -    <DT><H3 ID="rdf:#$ZvPhC3">@firefox_heading@</H3>
 +    <DT><H3 ID="rdf:#$YvPhC3">Parabola GNU/Linux-libre</H3>
      <DL><p>
--        <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/help/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$22iCK1">@firefox_help@</A>
--        <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/customize/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$32iCK1">@firefox_customize@</A>
--        <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/community/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$42iCK1">@firefox_community@</A>
--        <DT><A HREF="http://www.mozilla.com/@AB_CD@/about/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$52iCK1">@firefox_about@</A>
+-        <DT><A HREF="https://www.mozilla.org/@AB_CD@/firefox/help/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$22iCK1">@firefox_help@</A>
+-        <DT><A HREF="https://www.mozilla.org/@AB_CD@/firefox/customize/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$32iCK1">@firefox_customize@</A>
+-        <DT><A HREF="https://www.mozilla.org/@AB_CD@/contribute/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$42iCK1">@firefox_community@</A>
+-        <DT><A HREF="https://www.mozilla.org/@AB_CD@/about/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$52iCK1">@firefox_about@</A>
 +        <DT><A HREF="https://parabolagnulinux.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre</A>
 +        <DT><A HREF="https://parabolagnulinux.org/packages/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre Packages</A>
 +        <DT><A HREF="https://wiki.parabolagnulinux.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre Wiki</A>
 +        <DT><A HREF="https://labs.parabola.nu/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAA/klEQVQ4jWP4TyFgGAYGLN25iDID+pd0UGbAxMUTUQT+fP36/9+/f2A2jMZrwKyNEC/8+P71/6/ijP9/fv/+/23Hzv+fly/9/7m7+//XkuL/7yvL/j+PCf3/qrn+/+ed2/7/evocZPr/b3fu/Ge4cuf6/2/fPv5PnaD9f720wP9lyir/F0kI/V8myv9/jbjA/w3i/P+XC/H8n8Uv8H+6kOj/JZIS/2eqaP2/umPP/88/fv5nADnz+cuX/x0S9f8n6Kv/jxGQ+R8vJPu/x9D+/2wrz//9hnb/mzVM/5fKav4vMbL835OZ+//ty9dw7zFcuPuYKL/iDAOydY4aAAcA33O6tzziloYAAAAASUVORK5CYII=">Parabola GNU/Linux-libre Labs</A>
-+        <DT><A HREF="https://identi.ca/group/parabola" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAHElEQVQ4jWNgGFTgVwLLf2LwqAGjBgxyA4YmAABB5QQG+m9VWQAAAABJRU5ErkJggg==" LAST_CHARSET="UTF-8">Parabola GNU/Linux-libre (parabola) group - Identi.ca</A>
 +    </DL><p>
 +    <DT><H3 ID="rdf:#$ZvPhC3">Free Software Foundation</H3>
 +    <DL><p>
@@ -259,3 +310,27 @@ diff -urN mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in
 +        <DT><A HREF="http://www.h-node.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABgElEQVQ4jaXRz2uSARzHcb0vlRGEzTVWISU1BVkFYTIyjNK1pKcxHA+yhWMWIamHYikFgpoLIi9jwegi3QbL9SzdLmMbM9J+DkJBgm5RDvEPeHeQHOyQz0OH9+V7ePGBr0pqpPmfVPsP8a0AR4MnMEwf48x9K0s/E8oAY9iEMOvD+8yP2qVjrhhRBnSN61n5sIpULqC+pGHh8wNlgEY8jPQXcGh4VXukDND5evYAl46odIuXtYdKAANSudAChO52/XeMZMohecCbcoGdH99Y+7LO72adT9+/4nh8nYOjBl7/SsoB8gBkpHk8T0S2K++pN3fRin3cfnFDHvCuWkI9rEMvHGEo5gbAHnXhnLF1BpZLeRaLOVT2A8Q3A5wMngXgWtKLxX9KPqC+rCWQvYkpeK4NWKcGOgO50ts2MJJ0cPreeQDciTHMchZYIhcwh2wcuqjn+ccwGm9v6wsTxxn0dVgQXZ7Ek3Agpq6QrcaQGmmebtxFSDkRU1fJVmL/BpT2ByV/3eDMhinRAAAAAElFTkSuQmCC">h-node</A>
      </DL><p>
  </DL><p>
+diff -ruN mozilla-release.orig/modules/libpref/src/init/all.js mozilla-release/modules/libpref/src/init/all.js
+--- mozilla-release.orig/modules/libpref/src/init/all.js	2013-08-07 10:36:49.851516239 -0300
++++ mozilla-release/modules/libpref/src/init/all.js	2013-08-12 22:35:19.870374357 -0300
+@@ -4127,20 +4127,6 @@
+ // Disable freeing dirty pages when minimizing memory.
+ pref("memory.free_dirty_pages", false);
+ 
+-pref("social.enabled", false);
+-// comma separated list of domain origins (e.g. https://domain.com) for
+-// providers that can install from their own website without user warnings.
+-// entries are
+-pref("social.whitelist", "https://mozsocial.cliqz.com,https://now.msn.com,https://mixi.jp");
+-// omma separated list of domain origins (e.g. https://domain.com) for directory
+-// websites (e.g. AMO) that can install providers for other sites
+-pref("social.directories", "https://addons.mozilla.org");
+-// remote-install allows any website to activate a provider, with extended UI
+-// notifying user of installation. we can later pref off remote install if
+-// necessary. This does not affect whitelisted and directory installs.
+-pref("social.remote-install.enabled", true);
+-pref("social.toast-notifications.enabled", true);
+-
+ // Disable idle observer fuzz, because only privileged content can access idle
+ // observers (bug 780507).
+ pref("dom.idle-observers-api.fuzz_time.disabled", true);
diff --git a/libre/iceweasel-libre/mozconfig b/libre/iceweasel-libre/mozconfig
index 21d56e13c..d2ea098d2 100644
--- a/libre/iceweasel-libre/mozconfig
+++ b/libre/iceweasel-libre/mozconfig
@@ -24,11 +24,10 @@ ac_add_options --enable-system-pixman
 
 # Features
 ac_add_options --enable-startup-notification
-ac_add_options --enable-gstreamer
+ac_add_options --enable-pulseaudio
 
 ac_add_options --disable-crashreporter
 ac_add_options --disable-updater
-ac_add_options --disable-tests
 ac_add_options --disable-installer
 
 # Parabola features
diff --git a/libre/iceweasel-libre/mozconfig.pgo b/libre/iceweasel-libre/mozconfig.pgo
index 2f4ebe32b..71ba205a4 100644
--- a/libre/iceweasel-libre/mozconfig.pgo
+++ b/libre/iceweasel-libre/mozconfig.pgo
@@ -1,3 +1,3 @@
 
 # PGO
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py 10'
+mk_add_options PROFILE_GEN_SCRIPT='EXTRA_TEST_ARGS=10 $(MAKE) -C $(MOZ_OBJDIR) pgo-profile-run'
diff --git a/libre/iceweasel-libre/shared-libs.patch b/libre/iceweasel-libre/shared-libs.patch
deleted file mode 100644
index 1f22b2b0d..000000000
--- a/libre/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/libre/iceweasel-libre/vendor.js b/libre/iceweasel-libre/vendor.js
index bd8bcb148..91414dbbd 100644
--- a/libre/iceweasel-libre/vendor.js
+++ b/libre/iceweasel-libre/vendor.js
@@ -17,5 +17,8 @@ pref("app.update.enabled", false);
 pref("app.update.auto", false);
 pref("dom.storage.enabled", false);
 
-// Enable gstreamer support
-pref("media.gstreamer.enabled", true);
+// Disable Social API
+pref("social.remote-install.enabled", false);
+
+// Disable missing nonfree flash notification
+pref("plugins.notifyMissingFlash", false);
diff --git a/libre/iceweasel-noscript/PKGBUILD b/libre/iceweasel-noscript/PKGBUILD
index 7db206be9..2d5f48040 100644
--- a/libre/iceweasel-noscript/PKGBUILD
+++ b/libre/iceweasel-noscript/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 90901 2013-05-15 12:56:28Z spupykin $
+# $Id: PKGBUILD 93410 2013-07-03 10:50:31Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=firefox-noscript
 pkgname=iceweasel-noscript
-pkgver=2.6.6
-pkgrel=2
+pkgver=2.6.6.7
+pkgrel=1
 pkgdesc="plugin for iceweasel which disables script"
 arch=('any')
 url="http://noscript.net/"
@@ -14,7 +14,7 @@ depends=()
 provides=$_pkgname=$pkgver
 makedepends=('unzip')
 source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi)
-md5sums=('a018efb1fe0f722ff307382791bf3c98')
+md5sums=('10b6704f34568d226fb5fe69b7d6043d')
 
 package() {
 #  _ffver=`pacman -Q iceweasel-libre | cut -f2 -d\ | cut -f1 -d-`
diff --git a/libre/ipsec-tools-libre/PKGBUILD b/libre/ipsec-tools-libre/PKGBUILD
new file mode 100644
index 000000000..6de9bd7d5
--- /dev/null
+++ b/libre/ipsec-tools-libre/PKGBUILD
@@ -0,0 +1,48 @@
+# $Id: PKGBUILD 91859 2013-05-28 17:36:54Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Allan Henriksen <allan.henriksen@gmail.com>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+_pkgname=ipsec-tools
+pkgname=ipsec-tools-libre
+pkgver=0.8.1
+pkgrel=4
+pkgdesc="KAME IPSec tools ported to Linux (built for the linux-libre-headers package)"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://ipsec-tools.sourceforge.net/"
+depends=('readline' 'openssl' 'krb5')
+makedepends=('linux-libre-headers')
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+license=('GPL')
+options=('!makeflags' '!libtool')
+source=(http://downloads.sourceforge.net/sourceforge/ipsec-tools/$_pkgname-$pkgver.tar.bz2
+	racoon.service
+	ipsec.service
+	ipsec-tools-linux-3.7-compat.patch)
+md5sums=('d38b39f291ba2962387c3232e7335dd8'
+         '3a64a9e3b498c6da90450ffb0b758aea'
+         '387a0b0c4f10e42b2bb62282885cdc9c'
+         'ae1dd20c83dcfce3dedb46ee73e83613')
+
+build() {
+  cd $srcdir/$_pkgname-$pkgver
+
+  patch -p1 <$srcdir/ipsec-tools-linux-3.7-compat.patch
+  sed -i 's#-Werror##' configure.ac
+
+  ./bootstrap
+  ./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
+  make
+}
+
+package() {
+  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/libre/ipsec-tools-libre/ipsec-tools-linux-3.7-compat.patch
new file mode 100644
index 000000000..46b11ee51
--- /dev/null
+++ b/libre/ipsec-tools-libre/ipsec-tools-linux-3.7-compat.patch
@@ -0,0 +1,50 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -74,9 +74,10 @@ case "$host_os" in
+ 	    [ KERNEL_INCLUDE="/lib/modules/`uname -r`/build/include" ])
+ 
+     AC_CHECK_HEADER($KERNEL_INCLUDE/linux/pfkeyv2.h, ,
+-	[ AC_CHECK_HEADER(/usr/src/linux/include/linux/pfkeyv2.h,
+-	  KERNEL_INCLUDE=/usr/src/linux/include ,
+-	  [ AC_MSG_ERROR([Unable to find linux-2.6 kernel headers. Aborting.]) ] ) ] )
++	[ AC_CHECK_HEADER($KERNEL_INCLUDE/uapi/linux/pfkeyv2.h, ,
++	  [ AC_CHECK_HEADER(/usr/src/linux/include/linux/pfkeyv2.h,
++	    KERNEL_INCLUDE=/usr/src/linux/include ,
++	    [ AC_MSG_ERROR([Unable to find linux-2.6 kernel headers. Aborting.]) ] ) ] ) ] )
+     AC_SUBST(KERNEL_INCLUDE)
+     # We need the configure script to run with correct kernel headers.
+     # However we don't want to point to kernel source tree in compile time,
+@@ -643,7 +644,14 @@ AC_EGREP_CPP(yes,
+ #ifdef SADB_X_EXT_NAT_T_TYPE
+ yes
+ #endif
+-], [kernel_natt="yes"])
++], [kernel_natt="yes"], [
++  AC_EGREP_CPP(yes,
++  [#include <uapi/linux/pfkeyv2.h>
++  #ifdef SADB_X_EXT_NAT_T_TYPE
++  yes
++  #endif
++  ], [kernel_natt="yes"])
++])
+ 	;;
+ freebsd*|netbsd*)
+ # NetBSD case
+--- a/src/include-glibc/Makefile.am
++++ b/src/include-glibc/Makefile.am
+@@ -1,14 +1,7 @@
+-
+-.includes: ${top_builddir}/config.status
+-	ln -snf $(KERNEL_INCLUDE)/linux
+-	touch .includes
+-
+-all: .includes
+-
+ EXTRA_DIST = \
+   glibc-bugs.h \
+   net/pfkeyv2.h \
+   netinet/ipsec.h \
+   sys/queue.h
+ 
+-DISTCLEANFILES = .includes linux
++DISTCLEANFILES = linux
diff --git a/libre/ipsec-tools-libre/ipsec.service b/libre/ipsec-tools-libre/ipsec.service
new file mode 100644
index 000000000..483a5b58d
--- /dev/null
+++ b/libre/ipsec-tools-libre/ipsec.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Load IPSec Security Policy Database
+After=syslog.target network.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=true
+ExecStart=/usr/bin/setkey -f /etc/ipsec.conf
+ExecStop=/usr/bin/setkey -F -P ; /usr/bin/setkey -F
+
+[Install]
+WantedBy=multi-user.target
diff --git a/libre/ipsec-tools-libre/racoon.service b/libre/ipsec-tools-libre/racoon.service
new file mode 100644
index 000000000..95324bd5d
--- /dev/null
+++ b/libre/ipsec-tools-libre/racoon.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Racoon IKEv1 key management daemon for IPSEC
+After=syslog.target network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/racoon
+
+[Install]
+WantedBy=multi-user.target
diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD
index d5a72e95c..368ee981c 100644
--- a/libre/kdebase-konqueror-libre/PKGBUILD
+++ b/libre/kdebase-konqueror-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186956 2013-06-01 13:20:19Z andrea $
+# $Id: PKGBUILD 194222 2013-09-10 22:37:57Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
@@ -6,16 +6,18 @@
 
 _pkgname='kdebase-konqueror'
 pkgname='kdebase-konqueror-libre'
-pkgver=4.10.4
-pkgrel=1
+pkgver=4.11.1
+pkgrel=2
 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=('5465fffdaea70a5ca225283f45b9504775d0432d'
+        'kdebug-324511.patch'
+        'konq-about-fsdg.diff')
+sha1sums=('a8781b2d7d431024cd5355a1e57d387d5945e12f'
+          'ff32bee8ef0ee154f1885fa4cd91a6754d980343'
           'd6cbb53c04179b8180f9439eca156b7ff2e76b3a')
 pkgdesc='KDE File Manager & Web Browser, without Google and nonfree software recommendation'
 depends=('kdebase-dolphin' 'kdebase-keditbookmarks')
@@ -25,15 +27,16 @@ conflicts=('kdebase-nsplugins' 'kdebase-konqueror')
 replaces=('kdebase-nsplugins' 'kdebase-konqueror')
 provides=("kdebase-konqueror=$pkgver")
 
-build() {
-    cd kde-baseapps-${pkgver}
-
-    # Don't recommend nonfree software or Google.
-    patch -Np1 -i "${srcdir}/konq-about-fsdg.diff"
+prepare() {
+  mkdir build
 
-    cd ..
+  cd kde-baseapps-${pkgver}
+  patch -p1 -i "${srcdir}"/kdebug-324511.patch
+  # Don't recommend nonfree software or Google.
+  patch -Np1 -i "${srcdir}/konq-about-fsdg.diff"
+}
 
-	mkdir build
+build() {
 	cd build
 	cmake ../kde-baseapps-${pkgver} \
 		-DCMAKE_BUILD_TYPE=Release \
diff --git a/libre/kdebase-konqueror-libre/kdebug-324511.patch b/libre/kdebase-konqueror-libre/kdebug-324511.patch
new file mode 100644
index 000000000..cca2a7254
--- /dev/null
+++ b/libre/kdebase-konqueror-libre/kdebug-324511.patch
@@ -0,0 +1,25 @@
+commit 43a981481ab9161a83dd200db39c093e2502f68a
+Author: Bernd Buschinski <b.buschinski@googlemail.com>
+Date:   Wed Sep 4 16:23:35 2013 +0200
+
+    Fix toplevel bookmarks not showing in toolbar
+    regression from d1963e23
+
+diff --git a/konqueror/src/konqbookmarkbar.cpp b/konqueror/src/konqbookmarkbar.cpp
+index 2141575..199e15f 100644
+--- a/konqueror/src/konqbookmarkbar.cpp
++++ b/konqueror/src/konqbookmarkbar.cpp
+@@ -184,10 +184,12 @@ void KBookmarkBar::fillBookmarkBar(const KBookmarkGroup & parent)
+ 
+         if (!bm.isGroup())
+         {
+-	    if ( bm.isSeparator() )
++            if ( bm.isSeparator() )
++            {
+                 if (m_toolBar) {
+                     m_toolBar->addSeparator();
+                 }
++            }
+             else
+             {
+                 KAction *action = new KBookmarkAction( bm, m_pOwner, 0 );
diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD
index 4b6f40af9..a27f22dcf 100644
--- a/libre/kdebase-runtime-libre/PKGBUILD
+++ b/libre/kdebase-runtime-libre/PKGBUILD
@@ -1,62 +1,76 @@
-# $Id: PKGBUILD 186956 2013-06-01 13:20:19Z andrea $
+# $Id: PKGBUILD 194219 2013-09-10 22:35:14Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=kdebase-runtime
 pkgname=kdebase-runtime-libre
-pkgver=4.10.4
-pkgrel=1
+pkgver=4.11.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'
 license=('GPL' 'LGPL')
-depends=("kdelibs>=${pkgver}" 'kactivities' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons'
-         'xorg-xauth')
-makedepends=('pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'doxygen'
-             'networkmanager')
-optdepends=('kdepimlibs: to generate drkonqi reports'
-            'htdig: to build the search index in khelpcenter'
-            'rarian: needed by khelpcenter'
-            'gdb: drkonq crash handler')
 replaces=("${_pkgname}")
 conflicts=("${_pkgname}")
 provides=("${_pkgname}=${pkgver}")
+depends=("kdelibs>=${pkgver}" 'kactivities' 'smbclient' 'libssh' 'libcanberra'
+         'oxygen-icons' 'xorg-xauth' 'libwebp')
+makedepends=('pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'doxygen'
+             'networkmanager')
+optdepends=('kdepimlibs: needed by DrKonqi to send crash reports to KDE.org'
+            'gdb: needed by DrKonqi to generate backtrace'
+            'htdig: to build the search index in the KHelpCenter'
+            'rarian: needed by KHelpCenter')
 install="${_pkgname}.install"
 source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz"
+        'kdebug-324470.patch'
         'duckduckgo_html.desktop'
         'duckduckgo_lite.desktop')
-sha1sums=('f406c8c9e42c2508a7acf88b9719f5fa5b4683a1'
+sha1sums=('3457ffdbd1921bc6bc78cd8a9a463822d515b079'
+          '80db2d34f9e62dbea5d7e94b7bef93d2cf46f6d7'
           'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd'
           'ac3bac94a2c4b1444642524bc5fb539c4c5dcc5b')
 
+prepare() {
+  mkdir build
+
+  cd kde-runtime-${pkgver}
+  patch -p1 -i "${srcdir}"/kdebug-324470.patch
+}
+
 build() {
-	cd "${srcdir}"
-
-	# Removing non-privacy search providers 
-	rm -v kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders/{7digital,acronym,altavista,amazon{,_mp3},amg,austronaut,backports,baidu,bing,blip,cia,dbug,deb,duckduckgo{,_info,_shopping},facebook,ecosia,feedster,flickr,flickrcc,froogle,google,google_advanced,google_code,google_groups,google_images,google_lucky,google_maps,google_movie,google_news,gracenote,imdb,jeeves,katatudo,magnatune,metacrawler,msdn,nl-telephone,nl-teletekst,python,rpmfind,tvtome,uspto,vimeo,vivisimo,voila,yahoo,yahoo_image,yahoo_local,yahoo_shopping,yahoo_video,youtube}.desktop
-
-	# Adding DuckDuckGo HTML
-	cp -v duckduckgo_html.desktop "kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders"
-
-	# Adding DuckDuckGo Lite
-	cp -v duckduckgo_lite.desktop "kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders"
-
-	mkdir build
-	cd build
-	cmake ../kde-runtime-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DKDE4_BUILD_TESTS=OFF \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DWITH_QNtrack=OFF -DSAMBA_INCLUDE_DIR=/usr/include/samba-4.0
-	make
+  cd "${srcdir}"
+
+  # Removing non-privacy search providers 
+  rm -v kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders/{7digital,acronym,amazon{,_mp3},amg,backports,baidu,bing,blip,cia,dbug,deb,duckduckgo{,_info,_shopping},facebook,ecosia,feedster,flickr,flickrcc,google,google_advanced,google_code,google_groups,google_images,google_lucky,google_maps,google_movie,google_news,imdb,jamendo,jeeves,magnatune,metacrawler,msdn,nl-telephone,nl-teletekst,python,rpmfind,tvtome,uspto,vimeo,voila,yahoo,yahoo_image,yahoo_local,yahoo_shopping,yahoo_video,youtube}.desktop
+
+  # Adding DuckDuckGo HTML
+  cp -v duckduckgo_html.desktop "kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders"
+
+  # Adding DuckDuckGo Lite
+  cp -v duckduckgo_lite.desktop "kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders"
+
+  cd build
+  cmake ../kde-runtime-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DKDE4_BUILD_TESTS=OFF \
+    -DCMAKE_SKIP_RPATH=ON \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DWITH_QNtrack=OFF \
+    -DSAMBA_INCLUDE_DIR=/usr/include/samba-4.0
+  make
 }
 
 package() {
-	cd "$srcdir/build"
-	make DESTDIR="$pkgdir" install
-	rm -f "${pkgdir}/usr/share/icons/hicolor/index.theme"
+  cd build
+  make DESTDIR="$pkgdir" install
+
+  rm "${pkgdir}"/usr/share/icons/hicolor/index.theme
+
+  ln -sf /usr/lib/kde4/libexec/kdesu "${pkgdir}/usr/bin/"
 
-	ln -sf /usr/lib/kde4/libexec/kdesu "${pkgdir}/usr/bin/"
+  # https://bugs.archlinux.org/task/36668
+  chown :nobody "${pkgdir}"/usr/lib/kde4/libexec/kdesud
+  chmod g+s "${pkgdir}"/usr/lib/kde4/libexec/kdesud
 }
diff --git a/libre/kdebase-runtime-libre/kdebug-324470.patch b/libre/kdebase-runtime-libre/kdebug-324470.patch
new file mode 100644
index 000000000..4269df829
--- /dev/null
+++ b/libre/kdebase-runtime-libre/kdebug-324470.patch
@@ -0,0 +1,49 @@
+commit be1a5d484c70f4f6a383150810afbfbb367db2ac
+Author: Eike Hein <hein@kde.org>
+Date:   Tue Sep 3 20:29:23 2013 +0200
+
+    Discard the recorded events in the item-local handlers.
+    
+    Solves problems with identical events being ignored due to
+    QGraphicsView's reuse of QGraphicsSceneMouseEvent instances.
+    
+    CCMAIL:rdieter@fedoraproject.org
+    BUG:324470
+    BUG:324471
+
+diff --git a/plasma/declarativeimports/qtextracomponents/mouseeventlistener.cpp b/plasma/declarativeimports/qtextracomponents/mouseeventlistener.cpp
+index b534845..36530e0 100644
+--- a/plasma/declarativeimports/qtextracomponents/mouseeventlistener.cpp
++++ b/plasma/declarativeimports/qtextracomponents/mouseeventlistener.cpp
+@@ -90,6 +90,7 @@ bool MouseEventListener::containsMouse() const
+ void MouseEventListener::mousePressEvent(QGraphicsSceneMouseEvent *me)
+ {
+     if (m_lastEvent == me) {
++        m_lastEvent = 0;
+         return;
+     }
+ 
+@@ -112,6 +113,7 @@ void MouseEventListener::mousePressEvent(QGraphicsSceneMouseEvent *me)
+ void MouseEventListener::mouseMoveEvent(QGraphicsSceneMouseEvent *me)
+ {
+     if (m_lastEvent == me) {
++        m_lastEvent = 0;
+         return;
+     }
+ 
+@@ -122,6 +124,7 @@ void MouseEventListener::mouseMoveEvent(QGraphicsSceneMouseEvent *me)
+ void MouseEventListener::mouseReleaseEvent(QGraphicsSceneMouseEvent *me)
+ {
+     if (m_lastEvent == me) {
++        m_lastEvent = 0;
+         return;
+     }
+ 
+@@ -138,6 +141,7 @@ void MouseEventListener::mouseReleaseEvent(QGraphicsSceneMouseEvent *me)
+ void MouseEventListener::wheelEvent(QGraphicsSceneWheelEvent *we)
+ {
+     if (m_lastEvent == we) {
++        m_lastEvent = 0;
+         return;
+     }
+ 
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
index ea698dfd7..368b7062f 100644
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 186956 2013-06-01 13:20:19Z andrea $
+# $Id: PKGBUILD 194033 2013-09-10 12:51:41Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=kdelibs
 pkgname=kdelibs-libre
-pkgver=4.10.4
+pkgver=4.11.1
 pkgrel=1
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64' 'mips64el')
@@ -24,13 +24,13 @@ 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=('b5db1b91bd96b44ebd1b5e71019bb95b59775237'
+sha1sums=('db938479fe1599f9f1ac497de48ad8de692ac6c9'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
           'ed1f57ee661e5c7440efcaba7e51d2554709701c'
           'a1502a964081ad583a00cf90c56e74bf60121830')
 
 prepare() {
-       cd "${srcdir}"/${_pkgname}-${pkgver}
+       cd ${_pkgname}-${pkgver}
        # avoid file conflict with gnome-menus
        patch -p1 -i "${srcdir}"/kde-applications-menu.patch
        # qmake refers to Qt5
@@ -40,7 +40,6 @@ prepare() {
 }
 
 build() {
-       cd "${srcdir}"
        mkdir build
        cd build
        cmake ../${_pkgname}-${pkgver} \
diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD
index 819bb02ce..c4343e402 100644
--- a/libre/kdenetwork-kopete-libre/PKGBUILD
+++ b/libre/kdenetwork-kopete-libre/PKGBUILD
@@ -1,61 +1,52 @@
-# $Id: PKGBUILD 186956 2013-06-01 13:20:19Z andrea $
+# $Id: PKGBUILD 194033 2013-09-10 12:51:41Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
-pkgbase=kdenetwork
-pkgname=('kdenetwork-kopete-libre')
-pkgver=4.10.4
+_pkgname=kdenetwork-kopete
+pkgname=kdenetwork-kopete-libre
+pkgver=4.11.1
 pkgrel=1
+pkgdesc='Instant Messenger, without skype support'
+url='http://kde.org/applications/internet/kopete/'
 arch=('i686' 'x86_64' 'mips64el')
-url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdenetwork')
-makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr3' 'ppp'
-	'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver'
-    'v4l-utils' 'libidn' 'qimageblitz' 'libxdamage' 'libgadu' 'libmsn'
-    'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
-        'use-libotr3.patch')
-sha1sums=('891277c8dcbf231452947e9b4c54324bad35fd1a'
-          '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384')
+depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr3' '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"
+        'libotr3.patch'
+        'mediastreamer29.patch')
+sha1sums=('1dd677e6fd4335e6d0bb906f4c981395ca204e12'
+          '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384'
+          '317683a5c2acd0a0058c5ab42f6006e9db511ef3')
 
 prepare() {
-    cd ${pkgbase}-${pkgver}
-    patch -p1 -i "${srcdir}"/use-libotr3.patch
-    cd ../
-# 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' "${pkgbase}-${pkgver}/kopete/protocols/CMakeLists.txt"
-    rm -rf "${pkgbase}-${pkgver}/kopete/protocols/skype"
-    sed 's/, Skype//' -i "${pkgbase}-${pkgver}/doc/kopete/index.docbook"
+  cd kopete-${pkgver}
+  patch -p2 -i "${srcdir}"/libotr3.patch
+  patch -p1 -i "${srcdir}"/mediastreamer29.patch
+  # 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
 }
 
 build() {
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DKDE4_BUILD_TESTS=OFF \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DMOZPLUGIN_INSTALL_DIR=/usr/lib/mozilla/plugins/ \
-		-DWITH_Xmms=OFF \
-		-DWITH_LibMeanwhile=OFF \
-		-DWITH_qq=OFF
-	make
+  mkdir build
+  cd build
+  cmake ../kopete-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DKDE4_BUILD_TESTS=OFF \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_SKIP_RPATH=ON
+  make
 }
 
-package_kdenetwork-kopete-libre() {
-	pkgdesc='Instant Messenger, without skype support'
-	depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr3' 'libmsn'
-	         'libidn' 'qimageblitz' 'libgadu' 'mediastreamer')
-        conflicts=('kdenetwork-kopete')
-        provides=("kdenetwork-kopete=${pkgver}")
-        replaces=('kdenetwork-kopete')
-	url="http://kde.org/applications/internet/kopete/"
-	install='kdenetwork-kopete.install'
-	cd $srcdir/build/kopete
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kopete
-	make DESTDIR=$pkgdir install
+package() {
+  cd build
+  make DESTDIR=$pkgdir install
 }
diff --git a/libre/kdenetwork-kopete-libre/use-libotr3.patch b/libre/kdenetwork-kopete-libre/libotr3.patch
index 1e96c98d6..1e96c98d6 100644
--- a/libre/kdenetwork-kopete-libre/use-libotr3.patch
+++ b/libre/kdenetwork-kopete-libre/libotr3.patch
diff --git a/libre/kdenetwork-kopete-libre/mediastreamer29.patch b/libre/kdenetwork-kopete-libre/mediastreamer29.patch
new file mode 100644
index 000000000..eb0b2297e
--- /dev/null
+++ b/libre/kdenetwork-kopete-libre/mediastreamer29.patch
@@ -0,0 +1,22 @@
+diff --git a/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc b/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
+index 88fdbd1..57c6c05 100644
+--- a/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
++++ b/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
+@@ -200,7 +200,7 @@ bool LinphoneVoiceChannel::SetSendCodecs(const std::vector<AudioCodec>& codecs)
+       LOG(LS_INFO) << "Using " << i->name << "/" << i->clockrate;
+       pt_ = i->id;
+       audio_stream_ = audio_stream_start(&av_profile, -1, "localhost", port1, i->id, 250, 0); /* -1 means that function will choose some free port */
+-      port2 = rtp_session_get_local_port(audio_stream_->session);
++      port2 = rtp_session_get_local_port(audio_stream_->ms.session);
+       first = false;
+     }
+   }
+@@ -211,7 +211,7 @@ bool LinphoneVoiceChannel::SetSendCodecs(const std::vector<AudioCodec>& codecs)
+     // working with a buggy client; let's try PCMU.
+     LOG(LS_WARNING) << "Received empty list of codces; using PCMU/8000";
+     audio_stream_ = audio_stream_start(&av_profile, -1, "localhost", port1, 0, 250, 0); /* -1 means that function will choose some free port */
+-    port2 = rtp_session_get_local_port(audio_stream_->session);
++    port2 = rtp_session_get_local_port(audio_stream_->ms.session);
+   }
+ 
+   return true;
diff --git a/libre/kdepim-libre/PKGBUILD b/libre/kdepim-libre/PKGBUILD
index 007ed7f74..fc172a0e9 100644
--- a/libre/kdepim-libre/PKGBUILD
+++ b/libre/kdepim-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186956 2013-06-01 13:20:19Z andrea $
+# $Id: PKGBUILD 194033 2013-09-10 12:51:41Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -22,16 +22,16 @@ pkgname=('kdepim-akonadiconsole-libre'
          'kdepim-ktimetracker-libre'
          'kdepim-ktnef-libre'
          'kdepim-libkdepim-libre')
-pkgver=4.10.4
+pkgver=4.11.1
 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')
-             source=("http://download.kde.org/stable/${pkgver}/src/${_pkgbase}-${pkgver}.tar.xz")
-sha1sums=('b1b8bdefd8a7b21c3a4518285ef8fd73890e8cf3')
+             'kde-agent' 'nepomuk-widgets' 'link-grammar')
+source=("http://download.kde.org/stable/${pkgver}/src/${_pkgbase}-${pkgver}.tar.xz")
+sha1sums=('d0f240520b4f79a56a2d8421b59654f108180bcd')
 
 build() {
 	mkdir build
@@ -75,7 +75,7 @@ package_kdepim-akregator-libre() {
 
 package_kdepim-blogilo-libre() {
 	pkgdesc='A KDE Blogging Client, without nonfree pilot-link support'
-	depends=('kdepim-runtime')
+	depends=('kdepim-libkdepim')
 	url="http://kde.org/applications/internet/blogilo/"
 	replaces=('kdepim-blogilo' 'blogilo')
 	conflicts=('kdepim-blogilo' 'blogilo')
@@ -85,6 +85,8 @@ package_kdepim-blogilo-libre() {
 	make DESTDIR="${pkgdir}" install
 	cd "${srcdir}"/build/doc/blogilo
 	make DESTDIR="${pkgdir}" install
+    cd "${srcdir}"/build/composereditor-ng
+	make DESTDIR="${pkgdir}" install
 }
 
 package_kdepim-console-libre() {
@@ -177,7 +179,7 @@ package_kdepim-kmail-libre() {
 	provides=("kdepim-kmail=${pkgver}")
 	for i in kmail doc/kmail kmailcvt archivemailagent \
 	importwizard ksendemail libksieve messagelist mailfilteragent \
-	ontologies kontact/plugins/kmail; do
+	ontologies kontact/plugins/kmail headerthemeeditor; do
 		cd "${srcdir}"/build/${i}
 		make DESTDIR="${pkgdir}" install
 	done
@@ -289,18 +291,18 @@ package_kdepim-ktnef-libre() {
 package_kdepim-libkdepim-libre() {
 	pkgdesc='Library for KDE PIM, without nonfree pilot-link support'
 	groups=()
-	depends=('kde-agent' 'kdepim-runtime')
+	depends=('kde-agent' 'kdepim-runtime' 'link-grammar')
 	url='http://pim.kde.org'
 	conflicts=('kdepim-libkdepim' 'kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp'
-                   'kdepim-strigi-analyzer' 'kdepim-akonadi')
+                   'kdepim-akonadi')
 	replaces=('kdepim-libkdepim' 'kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp'
-                  'kdepim-strigi-analyzer' 'kdepim-akonadi')
+                  'kdepim-akonadi')
 	provides=("kdepim-libkdepim=${pkgver}")
 	for i in akonadi_next calendarsupport incidenceeditor-ng \
 	kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \
 	mailcommon mailimporter messagecomposer messagecore messageviewer \
-	icons strigi-analyzer templateparser plugins/messageviewer \
-	plugins/ktexteditor pimcommon pimsettingexporter; do
+	icons templateparser plugins/messageviewer grammar sendlateragent \
+	plugins/ktexteditor pimactivity pimcommon pimsettingexporter; do
 		cd "${srcdir}"/build/${i}
 		make DESTDIR="${pkgdir}" install
 	done
diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD
index 6b7a264ae..bf4664b12 100644
--- a/libre/kdeutils-ark-libre/PKGBUILD
+++ b/libre/kdeutils-ark-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 186956 2013-06-01 13:20:19Z andrea $
+# $Id: PKGBUILD 194033 2013-09-10 12:51:41Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=kdeutils-ark
 pkgname=kdeutils-ark-libre
-pkgver=4.10.4
+pkgver=4.11.1
 pkgrel=1
 pkgdesc='Archiving Tool, with unar support'
 url='http://kde.org/applications/utilities/ark/'
@@ -20,7 +20,7 @@ replaces=('kdeutils-ark')
 conflicts=('kdeutils-ark')
 source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz"
         'ark-unar-06.patch')
-sha1sums=('3b98f04817a31b14b8899ddf024b03ff14420ea7'
+sha1sums=('591ab1b3825f3646b26bd55484fc7f4291086a63'
           'a0a836950f185d9b2245204579f969203036fdec')
 
 build() {
diff --git a/libre/lib32-libclc-svn/PKGBUILD b/libre/lib32-libclc-svn/PKGBUILD
new file mode 100644
index 000000000..c1c7e021c
--- /dev/null
+++ b/libre/lib32-libclc-svn/PKGBUILD
@@ -0,0 +1,41 @@
+# 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/libcl-libre/PKGBUILD b/libre/libcl-libre/PKGBUILD
deleted file mode 100644
index 425525492..000000000
--- a/libre/libcl-libre/PKGBUILD
+++ /dev/null
@@ -1,75 +0,0 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-
-pkgbase=mesa
-pkgname=libcl-libre
-pkgver=9.0
-pkgrel=2
-arch=(
-  i686
-  x86_64
-  mips64el
-)
-makedepends=(
-  clang
-  dri2proto
-  git
-  glproto
-  imake
-  libdrm
-  libxdamage
-  libxext
-  libxml2
-  llvm
-  python2
-)
-license=(
-  MIT
-  Khronos
-  LGPL
-)
-url="http://${pkgbase}3d.sourceforge.net"
-depends=(
-  gcc-libs
-  libdrm
-  libffi
-  libxcb
-  udev
-)
-conflicts=(
-  ${pkgname%-libre}
-)
-provides=(
-  ${pkgname%-libre}
-)
-replaces=(
-  ${pkgname%-libre}
-)
-pkgdesc='Mesa OpenCL library and ICD loader'
-source=(
-  ftp://ftp.freedesktop.org/pub/$pkgbase/$pkgver/${pkgbase^}Lib-$pkgver.tar.bz2
-)
-sha512sums=(
-  878dc8e3f87aa4ad8d96599a87c733c15b725251c797cdfa6d03fee3c2959fd81a07ac7363e7a8946cf597303398aa581356b46827e7ffa27b33971d39bd29a2
-)
-
-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-dri-drivers=i915,i965,nouveau,r200,radeon,swrast \
-    --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 -m755 -d $pkgdir/usr/share/licenses/${pkgname%-libre}
-  bin/minstall docs/COPYING      $pkgdir/usr/share/licenses/${pkgname%-libre}
-  bin/minstall docs/license.html $pkgdir/usr/share/licenses/${pkgname%-libre}
-}
diff --git a/libre/libclc-svn/PKGBUILD b/libre/libclc-svn/PKGBUILD
new file mode 100644
index 000000000..3b7034348
--- /dev/null
+++ b/libre/libclc-svn/PKGBUILD
@@ -0,0 +1,33 @@
+# 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
index 81165b02d..c78321b25 100644
--- a/libre/libquicktime-libre/PKGBUILD
+++ b/libre/libquicktime-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91608 2013-05-25 11:33:59Z bpiotrowski $
+# $Id: PKGBUILD 94168 2013-07-15 13:24:41Z bpiotrowski $
 # Maintainer: Federico Cinelli <cinelli@aur.archlinux.org>
 # Maintainer: Mateusz Herych   <heniekk@gmail.com>
 # Contributor (Parabola): Jorge Lopez <jorginho@lavabit.com>
@@ -6,19 +6,27 @@
 pkgname=libquicktime-libre
 _pkgname=libquicktime
 pkgver=1.2.4
-pkgrel=6
+pkgrel=7
 pkgdesc="A library for reading and writing quicktime files, without nonfree faac support"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://libquicktime.sourceforge.net/"
 depends=('gtk2' 'ffmpeg' 'libxv' 'libxaw' 'faad2')
+makedepends=('mesa-libgl')
 options=('!libtool')
-source=("http://downloads.sourceforge.net/sourceforge/$_pkgname/$_pkgname-$pkgver.tar.gz")
-sha256sums=('1c53359c33b31347b4d7b00d3611463fe5e942cae3ec0fefe0d2fd413fd47368')
+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 \
diff --git a/libre/libquicktime-libre/ffmpeg2.0.patch b/libre/libquicktime-libre/ffmpeg2.0.patch
new file mode 100644
index 000000000..6bec4d99a
--- /dev/null
+++ b/libre/libquicktime-libre/ffmpeg2.0.patch
@@ -0,0 +1,135 @@
+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-legacy/PKGBUILD b/libre/libretools-legacy/PKGBUILD
deleted file mode 100644
index 59e383449..000000000
--- a/libre/libretools-legacy/PKGBUILD
+++ /dev/null
@@ -1,100 +0,0 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-# Maintainer: Joshua Haase <hahj87@gmail.com
-# Contributor: fauno <fauno@kiwwwi.com.ar>
-
-pkgbase=libretools
-pkgname=(libretools-legacy libretools-legacy-pr libretools-legacy-mips64el)
-pkgver=20120924
-pkgrel=1
-pkgdesc="Programs for Parabola development (legacy)"
-arch=('any')
-url="http://parabolagnulinux.org"
-license=('GPL3+')
-depends=(openssh rsync git wget devtools-legacy)
-install=libretools-legacy.install
-source=(https://projects.parabolagnulinux.org/$pkgbase.git/snapshot/$pkgbase-v$pkgver.tar)
-md5sums=(dfb8cb24d3deda29178d0fdc20b0e4bd)
-conflicts=libretools
-
-package_libretools-legacy() {
-  backup=(etc/libretools.conf)
-
-  cd $srcdir/$pkgbase-v$pkgver
-
-  # fixing librebasebuilder librechroot libremakepkg !!!NEED MORE PATCH for makechrootpkg -d and mkarchroot -n!!!
-  # more info in:
-  # https://projects.archlinux.org/devtools.git/commit/?id=abba9f07a6d703cd97fc2d2bbd397072d5bf796d
-  # https://projects.archlinux.org/devtools.git/commit/?id=453558c4bb44b4bff43fcd22f96d4cfe1dbcf6f1
-  #sed -i 's|makechrootpkg -d -r "$CHROOTDIR" -l "$CHROOT" -- $MAKEPKG_ARGS|makechrootpkg -r "$CHROOTDIR" -l "$CHROOT" -- $MAKEPKG_ARGS|;
-  #        s|mkarchroot -n|mkarchroot|;
-  #        s|mkarchroot -r "/clean" "${CHROOTDIR}/${CHROOTNAME}"|arch-nspawn "${CHROOTDIR}/${CHROOTNAME}" "/clean"|;
-  #        s|mkarchroot -r "bash" "${CHROOTDIR}/${CHROOTNAME}"|arch-nspawn "${CHROOTDIR}/${CHROOTNAME}" "bash"|;
-  #        s|mkarchroot -u "${CHROOTDIR}/${CHROOTNAME}"|arch-nspawn "${CHROOTDIR}/${CHROOTNAME}" pacman -Syu --noconfirm|;
-  #       ' librebasebuilder librechroot libremakepkg
-
-  install -d ${pkgdir}/etc/libretools.d
-  install -m644 libretools.conf ${pkgdir}/etc/
-
-  install -d ${pkgdir}/usr/bin
-  install -m755 abslibre-commit        ${pkgdir}/usr/bin
-  install -m755 add-mips64el           ${pkgdir}/usr/bin
-  install -m755 aur                    ${pkgdir}/usr/bin
-  install -m755 buildenv               ${pkgdir}/usr/bin
-  install -m755 chcleanup              ${pkgdir}/usr/bin
-  install -m755 createworkdir          ${pkgdir}/usr/bin
-  install -m755 diff-unfree            ${pkgdir}/usr/bin
-  install -m755 fullpkg                ${pkgdir}/usr/bin
-  install -m755 fullpkg-build          ${pkgdir}/usr/bin
-  install -m755 fullpkg-find           ${pkgdir}/usr/bin
-  install -m755 is_built               ${pkgdir}/usr/bin
-  install -m755 is_unfree              ${pkgdir}/usr/bin
-  install -m755 lb                     ${pkgdir}/usr/bin
-  install -m755 libreaddiff            ${pkgdir}/usr/bin
-  install -m755 librebasebuilder       ${pkgdir}/usr/bin
-  install -m755 librechroot            ${pkgdir}/usr/bin
-  install -m755 librecommit            ${pkgdir}/usr/bin
-  install -m755 librediff              ${pkgdir}/usr/bin
-  install -m755 libremakepkg           ${pkgdir}/usr/bin
-  install -m755 libremessages          ${pkgdir}/usr/bin
-  install -m755 libremkchroot          ${pkgdir}/usr/bin
-  install -m755 librerelease           ${pkgdir}/usr/bin
-  install -m755 librerepkg             ${pkgdir}/usr/bin
-  install -m755 librestage             ${pkgdir}/usr/bin
-  install -m755 pkgbuild-check-nonfree ${pkgdir}/usr/bin
-  install -m755 toru                   ${pkgdir}/usr/bin
-  install -m755 toru-path              ${pkgdir}/usr/bin
-  install -m755 toru-utils             ${pkgdir}/usr/bin
-  install -m755 toru-where             ${pkgdir}/usr/bin
-  install -m755 updateabslibre         ${pkgdir}/usr/bin
-  install -m755 update-cleansystem     ${pkgdir}/usr/bin
-  
-  install -d ${pkgdir}/usr/share/pacman
-  install -m755 rePKGBUILD.proto ${pkgdir}/usr/share/pacman
-}
-
-package_libretools-legacy-pr() {
-  backup=('etc/libretools.d/prtools.conf')
-
-  cd $srcdir/$pkgbase-v$pkgver
-
-  install -d ${pkgdir}/etc/libretools.d
-  install -m644 prtools/prtools.conf ${pkgdir}/etc/libretools.d
-
-  install -d ${pkgdir}/usr/bin
-  install -m755 prtools/prfullpkg ${pkgdir}/usr/bin
-  install -m755 prtools/prmipsrelease ${pkgdir}/usr/bin
-  install -m755 prtools/prtoru ${pkgdir}/usr/bin
-}
-
-package_libretools-legacy-mips64el() {
-  backup=('etc/libretools.d/mips64el.conf')
-
-  cd $srcdir/$pkgbase-v$pkgver
-
-  install -d ${pkgdir}/etc/libretools.d
-  install -m755 mips64el/mips64el.conf ${pkgdir}/etc/libretools.d
-
-  install -d ${pkgdir}/usr/bin
-  install -m755 mips64el/mips-add ${pkgdir}/usr/bin
-  install -m755 mips64el/mipsrelease ${pkgdir}/usr/bin
-}
diff --git a/libre/libretools-legacy/libretools-legacy.install b/libre/libretools-legacy/libretools-legacy.install
deleted file mode 100644
index 3ede1f904..000000000
--- a/libre/libretools-legacy/libretools-legacy.install
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-# arg 1:  the new package version
-post_install() {
-  cat <<EOF
-Please check https://wiki.parabolagnulinux.org/Package_maintainer_guide
-and follow instructions there before using libretools.
-
-If you plan using fullpkg you should read https://wiki.parabolagnulinux.org/fullpkg
-and install libretools-\$arch if avaliable
-
-EOF
-  update-cleansystem
-}
-
-## arg 1:  the new package version
-## arg 2:  the old package version
-post_upgrade() {
-  cat <<EOF
-Check your /etc/libretools.conf, it has changed substantially.
-
-If using fullpkg, you should install libretools-\$arch if avaliable
-
-EOF
-  update-cleansystem
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index 49dc7feb2..953cd18b1 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -4,14 +4,14 @@
 # Contributor: Márcio Silva <coadde@lavabit.com>
 
 pkgbase=libretools
-pkgname=(libretools libretools-mips64el)
+pkgname=(libretools libretools-mips64el librelib libregit)
 pkgdesc="Programs for Parabola development"
 url="https://projects.parabolagnulinux.org/packages/libretools.git/"
 license=('GPL3' 'GPL2')
 
-pkgver=20130611
-_libretools_commit=e6944bc03f587ad177c6b825e3f4c116fb9b9b12
-_devtools_commit=bf8513ae631484a0c292ad085ea7ede9859f8e0f
+pkgver=20130914
+_libretools_commit=ab8dc8d4204d198f01e1fc7f59498a2794df829f
+_devtools_commit=6fbdc4eb481302541cf8fa282fb3453e4c5d0d16
 
 _packages_url=https://projects.parabolagnulinux.org/packages
 source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.tar.bz2
@@ -19,20 +19,37 @@ source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.ta
 
 pkgrel=1
 arch=('any')
-makedepends=(emacs) # emacs --batch is used during the build to process text
+makedepends=(emacs ronn) # emacs --batch is used during the build to process text
 checkdepends=(sh-roundup)
 
 build() {
   cd "$srcdir"
   ln -sf devtools-par-$_devtools_commit devtools-par
   cd "$srcdir/$pkgbase-$_libretools_commit"
-  make build-libretools build-libretools-mips64el build-doc
+  make build-libretools build-libretools-mips64el build-librelib build-doc
 }
 
 check() {
   cd "$srcdir/$pkgbase-$_libretools_commit"
 
-  make check TESTENVFLAGS='--no-network --no-sudo'
+  SUDO_USER= make check TESTENVFLAGS='--no-network --no-sudo'
+}
+
+package_librelib() {
+  pkgdesc="Shell library portion of libretools"
+  depends=(
+    wget # `aur` and `lib/blacklist.sh`
+  )
+
+  cd "$srcdir/$pkgbase-$_libretools_commit"
+  make install-librelib DESTDIR="$pkgdir"
+}
+
+package_libregit() {
+  depends=("librelib=$pkgver" git)
+
+  cd "$srcdir/$pkgbase-$_libretools_commit"
+  make install-libregit DESTDIR="$pkgdir"
 }
 
 package_libretools() {
@@ -42,13 +59,13 @@ package_libretools() {
   conflicts=(devtools)
 
   depends=(
+    "librelib=$pkgver"
     arch-install-scripts # `archroot` uses `pacstrap`
-    git # `createworkdir` (also mips-add in -mips64el)
+    git # `createworkdir`
     openssh # `librerelease`
     rsync # `librerelease` and `makechrootpkg.sh`
     subversion # `diff-unfree`
     tokyocabinet # `treepkg`
-    wget # `aur` and `lib/blacklist.sh`
   )
   optdepends=('namcap: to check package files')
 
@@ -58,11 +75,13 @@ package_libretools() {
 
 package_libretools-mips64el() {
   pkgdesc="Scripts for Parabola development (for mips64el architecture)"
-  depends=("$pkgbase=$pkgver")
+  depends=("$pkgbase=$pkgver"
+    git # mips-add
+  )
 
   cd "$srcdir/$pkgbase-$_libretools_commit"
   make install-libretools-mips64el DESTDIR="$pkgdir"
 }
 
-md5sums=('3d5645488481fab48954e194274f70ac'
-         'b28b1492fda205be7c577fc03cbc3399')
+md5sums=('91b1d56254bd61f1266ee2cb20e671a3'
+         'f44ca55997ab9598b7f1a8aeb2379b52')
diff --git a/libre/libretools/libretools.install b/libre/libretools/libretools.install
index ff6a238fe..d46990da8 100644
--- a/libre/libretools/libretools.install
+++ b/libre/libretools/libretools.install
@@ -21,7 +21,7 @@ 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'
+		sed -i '/libre::/d' etc/makepkg.conf
 	else
 		libremessages msg2 "libretools: librefetch is not in /etc/makepkg.conf as we added it"
 	fi
diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD
index 3ac0fdb5d..8ff51b16d 100644
--- a/libre/liferea-libre/PKGBUILD
+++ b/libre/liferea-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 186254 2013-05-23 00:44:27Z eric $
+# $Id: PKGBUILD 193917 2013-09-06 04:31:29Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Contributor (Parabola): bitlord
 # Contributor (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=liferea
 pkgname=liferea-libre
-pkgver=1.8.14
+pkgver=1.10.2
 pkgrel=1
 pkgdesc="A desktop news aggregator for online news feeds and weblogs, without nonfree suggestions"
 arch=('i686' 'x86_64')
@@ -14,28 +14,30 @@ provides=("liferea=$pkgver")
 replaces=('liferea')
 conflicts=('liferea')
 license=('GPL')
-depends=('gconf' 'webkitgtk2' 'libnotify' 'libunique' 'json-glib' 'hicolor-icon-theme'
-         'desktop-file-utils')
+depends=('webkitgtk' 'libnotify' 'json-glib' 'libpeas' 'python2-gobject' 
+         'gnome-icon-theme' 'desktop-file-utils')
 makedepends=('intltool')
+optdepends=('gnome-keyring: for keyring plugin support'
+            'libgnome-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')
 install=liferea.install
 source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.bz2
         remove-non-free-suggestions.patch)
-sha1sums=('980939a9f6483f4e9ca2353ffdba131cb9a88a6e'
-          '0d68c567c3d37932a49709c58c37c3f138fd19cb')
+sha1sums=('24d533af7dcd985d3cc8b2589fc3443c17b5acd7'
+          '855de60c91b5fee71c7ec88dd04b7d24a02dc0d1')
 
 build() {
   cd liferea-${pkgver}
+  # remove nonfree suggestions
   patch -Np1 -i "$srcdir/remove-non-free-suggestions.patch"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-schemas-install
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-schemas-compile
   make
 }
 
 package() {
   cd liferea-${pkgver}
   make DESTDIR="${pkgdir}" install
-  
-  install -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${_pkgname}.schemas" "${pkgdir}"/etc/gconf/schemas/*.schemas
-  rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas
 }
diff --git a/libre/liferea-libre/liferea.install b/libre/liferea-libre/liferea.install
index 327c567d2..7fff91b49 100644
--- a/libre/liferea-libre/liferea.install
+++ b/libre/liferea-libre/liferea.install
@@ -1,24 +1,21 @@
 pkgname=liferea
 
 post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
+  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() {
-  pre_remove $1
+  if [ -f usr/share/gconf/schemas/$pkgname.schemas ]; then
+    gconfpkg --uninstall $pkgname
+  fi
 }
 
 post_upgrade() {
   post_install $1
 }
 
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
 post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
+  post_install $1
 }
diff --git a/libre/liferea-libre/remove-non-free-suggestions.patch b/libre/liferea-libre/remove-non-free-suggestions.patch
index 325017567..5024f19ee 100644
--- a/libre/liferea-libre/remove-non-free-suggestions.patch
+++ b/libre/liferea-libre/remove-non-free-suggestions.patch
@@ -1,28 +1,29 @@
---- liferea-1.8.0/src/browser.c_orig	2011-11-28 19:50:57.000000000 -0200
-+++ liferea-1.8.0/src/browser.c	2012-03-07 14:49:31.862987204 -0200
-@@ -35,24 +35,16 @@
+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 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)'"
+-		/* 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\""
  	},
  	{
--		/* 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)'"
--	},
+-		"google-chrome", "Chrome", "google-chrome \"%s\"",
+-		NULL, NULL,
+-		NULL, NULL,
+-		NULL, NULL
+-	},		
 -	{
--		"opera", "Opera","opera \"%s\"",
+-		"opera", "Opera", "opera \"%s\"",
 -		"opera \"%s\"", "opera -remote \"openURL(%s)\"",
 -		"opera -newwindow \"%s\"", NULL,
 -		"opera -newpage \"%s\"", NULL
@@ -32,4 +33,18 @@
 +		NULL, "icecat -new-tab \"%s\""
  	},
  	{
- 		"epiphany", "Epiphany","epiphany \"%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/lilo/PKGBUILD b/libre/lilo/PKGBUILD
deleted file mode 100644
index a896613ee..000000000
--- a/libre/lilo/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
-
-pkgname=lilo
-pkgver=23.2
-pkgrel=3.2
-pkgdesc="A bootloader for GNU/Linux, Parabola rebranded"
-arch=('i686' 'x86_64')
-url="https://alioth.debian.org/projects/lilo/"
-license=('BSD')
-# While lilo should stay in the base category,
-# it usually makes no sense if it is installed
-# with pacman -S base, therefore, don't add
-# the base group here.
-#groups=('base')
-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')
-md5sums=('51b9b9db665d3b8724919e3d46054d12'
-         'd06b3c4655577ed01fea79ec5743b4b0')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  export LC_ALL=C
-  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"
-}
diff --git a/libre/linux-libre-api-headers/PKGBUILD b/libre/linux-libre-api-headers/PKGBUILD
index 266a52603..e8876b3bd 100644
--- a/libre/linux-libre-api-headers/PKGBUILD
+++ b/libre/linux-libre-api-headers/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 180857 2013-03-27 11:11:40Z allan $
+# $Id: PKGBUILD 192503 2013-08-13 10:47:26Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 # toolchain build order: linux-libre-api-headers->glibc->binutils->gcc->binutils->glibc
 
 pkgname=linux-libre-api-headers
-_basekernel=3.8
-_sublevel=4
+_basekernel=3.10
+_sublevel=6
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
 pkgdesc="Kernel headers sanitized for use in userspace"
@@ -18,8 +18,8 @@ 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=('84c2a77910932ffc7d958744ac9cf2f5'
-         'be610dd93dbe033cfe04018b27557c3e')
+md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
+         '63a1c2aba22871f8e8dacdb4968d9a1f')
 
 build() {
   cd ${srcdir}/linux-${_basekernel}
diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD
index 99c54a1b2..8bd7c5989 100644
--- a/libre/linux-libre-firmware/PKGBUILD
+++ b/libre/linux-libre-firmware/PKGBUILD
@@ -2,12 +2,13 @@
 # Contributor: Márcio Silva <coadde@lavabit.com>
 
 pkgname=linux-libre-firmware
-pkgver=3.9
+pkgver=3.10
 pkgrel=1
 pkgdesc='Free firmware files for Linux-libre'
 arch=('any')
-url='http://linux-libre.fsfla.org/'
+url=('http://linux-libre.fsfla.org/')
 license=('GPL2')
+depends=('ath9k-htc-firmware')
 provides=('linux-firmware'
           'kernel26-firmware=2.6.34.99')
 conflicts=('linux-firmware'
@@ -36,14 +37,23 @@ replaces=('linux-firmware'
           'rt2x00-rt61-fw'
           'rt2x00-rt71w-fw')
 source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$pkgver-gnu/linux-libre-$pkgver-gnu.tar.xz")
-md5sums=('120df29f88622dabf7015a22c7cc8e25')
+md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c')
 
 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
 
-  # move WHENCE file to linux-firmware license folder
+  # create licenses folder to put the licenses files there
   install -d -m755 $pkgdir/usr/share/licenses/$pkgname
-  mv firmware/WHENCE $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-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD
deleted file mode 100644
index e99585dd2..000000000
--- a/libre/linux-libre-kmod-alx/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Maintainer: André Silva <emulatorman@lavabit.com>
-
-_kernver=3.9.5
-_kernrel=1
-pkgname=('linux-libre-kmod-alx')
-_version=v3.9-rc4
-_pkgver=3.9-rc4-2-su
-pkgver=3.9rc4.2
-pkgrel=6
-pkgdesc='Atheros alx ethernet device driver for linux-libre kernel'
-arch=('i686' 'x86_64')
-url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx'
-license=('GPL2')
-depends=("linux-libre=$_kernver-$_kernrel")
-makedepends=("linux-libre-headers=$_kernver-$_kernrel")
-install=linux-libre-kmod-alx.install
-replaces=('alx' 'alx-driver' 'dkms-alx')
-provides=('alx' 'alx-driver' 'dkms-alx')
-conflicts=('alx' 'alx-driver' 'dkms-alx')
-source=(http://www.kernel.org/pub/linux/kernel/projects/backports/stable/$_version/compat-drivers-$_pkgver.tar.xz)
-
-md5sums=('a00e82e212fe7533c9059e5b78cc3c1c')
-
-
-package() {
-	# current extramodules version
-	_extraver=extramodules-3.9-LIBRE
-
-	cd $srcdir/compat-drivers-$_pkgver
-
-	# replacing to specific linux-libre kernel version
-	sed -i -e "s/lib\/modules\/\$(shell uname -r)/usr\/lib\/modules\/$_kernver-$_kernrel-LIBRE/" Makefile
-
-	./scripts/driver-select alx
-	make
-	cd $srcdir/compat-drivers-$_pkgver/compat
-	gzip -9 compat.ko
-	install -D -m 0644 compat.ko.gz $pkgdir/lib/modules/$_extraver/compat.ko.gz
-	cd $srcdir/compat-drivers-$_pkgver/drivers/net/ethernet/atheros/alx
-	gzip -9 alx.ko
-	install -D -m 0644 alx.ko.gz $pkgdir/lib/modules/$_extraver/alx.ko.gz
-}
diff --git a/libre/linux-libre-kmod-alx/linux-libre-kmod-alx.install b/libre/linux-libre-kmod-alx/linux-libre-kmod-alx.install
deleted file mode 100644
index 069348192..000000000
--- a/libre/linux-libre-kmod-alx/linux-libre-kmod-alx.install
+++ /dev/null
@@ -1,32 +0,0 @@
-generic() {
-    echo " > Running depmod now..."
-    depmod -a
-}
-
-unload() {
-    lsmod | grep alx > /dev/null
-    if [ "$?" = "0" ]; then
-        rmmod alx
-    fi
-}
-
-post_install() {
-    generic
-    echo " > Reloading alx module..."
-    echo "   Please note that you may REBOOT your system to get it works!"
-    unload
-    sleep 0.5
-    modprobe alx
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    generic
-    echo " > Unloading memory resident module..."
-    unload
-    rmmod compat
-    echo "  Module unloaded!."
-}
diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD
deleted file mode 100644
index 09e07891d..000000000
--- a/libre/linux-libre-lts-kmod-alx/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Maintainer: André Silva <emulatorman@lavabit.com>
-
-_kernver=3.0.81
-_kernrel=1
-pkgname=('linux-libre-lts-kmod-alx')
-_version=v3.9-rc4
-_pkgver=3.9-rc4-2-su
-pkgver=3.9rc4.2
-pkgrel=5
-pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel'
-arch=('i686' 'x86_64')
-url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx'
-license=('GPL2')
-depends=("linux-libre-lts=$_kernver-$_kernrel")
-makedepends=("linux-libre-lts-headers=$_kernver-$_kernrel")
-install=linux-libre-lts-kmod-alx.install
-replaces=('alx' 'alx-driver' 'dkms-alx')
-provides=('alx' 'alx-driver' 'dkms-alx')
-conflicts=('alx' 'alx-driver' 'dkms-alx')
-source=(http://www.kernel.org/pub/linux/kernel/projects/backports/stable/$_version/compat-drivers-$_pkgver.tar.xz)
-
-md5sums=('a00e82e212fe7533c9059e5b78cc3c1c')
-
-
-package() {
-	# current extramodules version
-	_extraver=extramodules-3.0-LIBRE-LTS
-
-	cd $srcdir/compat-drivers-$_pkgver
-
-	# replacing to specific linux-libre-lts kernel version
-	sed -i -e "s/lib\/modules\/\$(shell uname -r)/usr\/lib\/modules\/$_kernver-$_kernrel-LIBRE-LTS/" Makefile
-
-	./scripts/driver-select alx
-	make
-	cd $srcdir/compat-drivers-$_pkgver/compat
-	gzip -9 compat.ko
-	install -D -m 0644 compat.ko.gz $pkgdir/lib/modules/$_extraver/compat.ko.gz
-	cd $srcdir/compat-drivers-$_pkgver/drivers/net/ethernet/atheros/alx
-	gzip -9 alx.ko
-	install -D -m 0644 alx.ko.gz $pkgdir/lib/modules/$_extraver/alx.ko.gz
-}
diff --git a/libre/linux-libre-lts-kmod-alx/linux-libre-lts-kmod-alx.install b/libre/linux-libre-lts-kmod-alx/linux-libre-lts-kmod-alx.install
deleted file mode 100644
index aad4270cd..000000000
--- a/libre/linux-libre-lts-kmod-alx/linux-libre-lts-kmod-alx.install
+++ /dev/null
@@ -1,33 +0,0 @@
-generic() {
-    echo " > Running depmod now..."
-    depmod -a
-}
-
-unload() {
-    lsmod | grep alx > /dev/null
-    if [ "$?" = "0" ]; then
-        rmmod alx
-    fi
-}
-
-post_install() {
-    generic
-    echo " > Reloading alx module..."
-    echo "   Please note that you may REBOOT your system to get it works!"
-    unload
-    sleep 0.5
-    modprobe alx
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    generic
-    echo " > Unloading memory resident module..."
-    unload
-    rmmod compat
-    echo "  Module unloaded!."
-}
-
diff --git a/libre/linux-libre-lts/3.0.54-ptrace-i686-build.patch b/libre/linux-libre-lts/3.0.54-ptrace-i686-build.patch
deleted file mode 100644
index 6ef275bda..000000000
--- a/libre/linux-libre-lts/3.0.54-ptrace-i686-build.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: H. Peter Anvin <hpa@linux.intel.com>
-Date: Wed, 21 Nov 2012 06:21:02 +0000 (-0800)
-Subject: x86-32: Export kernel_stack_pointer() for modules
-X-Git-Tag: v3.6.9~50
-X-Git-Url: https://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fstable%2Flinux-stable.git;a=commitdiff_plain;h=051d62f6f239a9427fcab244a310610ed8bedb43
-
-x86-32: Export kernel_stack_pointer() for modules
-
-commit cb57a2b4cff7edf2a4e32c0163200e9434807e0a upstream.
-
-Modules, in particular oprofile (and possibly other similar tools)
-need kernel_stack_pointer(), so export it using EXPORT_SYMBOL_GPL().
-
-Link: http://lkml.kernel.org/r/20120912135059.GZ8285@erda.amd.com
-Cc: Yang Wei <wei.yang@windriver.com>
-Cc: Robert Richter <robert.richter@amd.com>
-Cc: Jun Zhang <jun.zhang@intel.com>
-Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
-
-diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
-index 947cf90..9ee1787 100644
---- a/arch/x86/kernel/ptrace.c
-+++ b/arch/x86/kernel/ptrace.c
-@@ -21,6 +21,7 @@
- #include <linux/signal.h>
- #include <linux/perf_event.h>
- #include <linux/hw_breakpoint.h>
-+#include <linux/module.h>
- 
- #include <asm/uaccess.h>
- #include <asm/pgtable.h>
-@@ -192,6 +193,7 @@ unsigned long kernel_stack_pointer(struct pt_regs *regs)
- 
- 	return (unsigned long)regs;
- }
-+EXPORT_SYMBOL_GPL(kernel_stack_pointer);
- 
- static unsigned long *pt_regs_access(struct pt_regs *regs, unsigned long regno)
- {
diff --git a/libre/linux-libre-lts/3.10.6-logitech-dj.patch b/libre/linux-libre-lts/3.10.6-logitech-dj.patch
new file mode 100644
index 000000000..1c112ccde
--- /dev/null
+++ b/libre/linux-libre-lts/3.10.6-logitech-dj.patch
@@ -0,0 +1,172 @@
+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
new file mode 100644
index 000000000..7bff7d34d
--- /dev/null
+++ b/libre/linux-libre-lts/ChangeLog
@@ -0,0 +1,39 @@
+2013-07-15  André Silva  <emulatorman@lavabit.com>
+
+        * linux-libre-3.10.1-1
+        * Removed linux-libre-kmod-alx package from Parabola due which CONFIG_ALX module was implemented by default in the kernel.
+
+2013-04-30  André Silva  <emulatorman@lavabit.com>
+
+        * linux-libre-3.9-2
+        * Removed CONFIG_STUB_POULSBO module from config files.
+
+2012-12-19  André Silva  <emulatorman@lavabit.com>
+
+	* linux-libre-3.7.1-1
+	* Replaced CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" to CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org"
+
+2012-06-23  André Silva  <emulatorman@lavabit.com>
+
+	* linux-libre-3.4.4-1
+	* Replaced email account andre.paulista@adinet.com.uy to emulatorman@lavabit.com.
+
+2012-05-26  André Silva  <emulatorman@lavabit.com>
+
+	* linux-libre-3.4-1.2
+	* Disabled CONFIG_MICROCODE_INTEL and CONFIG_MICROCODE_AMD modules https://labs.parabola.nu/issues/116
+
+2012-04-24  André Silva  <emulatorman@lavabit.com>
+
+	* linux-libre-3.3.3-1
+	* Disabled CONFIG_STUB_POULSBO module https://labs.parabola.nu/issues/90 
+
+2012-04-08  André Silva  <emulatorman@lavabit.com>
+
+	* linux-libre-3.3.1-1.1
+	* Disabled CONFIG_IPW2100 and CONFIG_IPW2200 modules https://labs.parabola.nu/issues/47
+
+2012-03-03  André Silva  <emulatorman@lavabit.com>
+
+	* linux-libre-3.2.9-2
+	* Enabled CONFIG_FB_VT8623 module https://labs.parabola.nu/issues/14
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 0e35aa970..060527012 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -1,23 +1,26 @@
-# $Id: PKGBUILD 188071 2013-06-08 08:49:41Z tpowa $
+# $Id: PKGBUILD 194492 2013-09-16 20:12:13Z andyrtr $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# 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     # Build stock -LIBRE-LTS kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
-_basekernel=3.0
-_sublevel=81
+_basekernel=3.10
+_sublevel=12
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.80 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.12 # 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')
+makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc')
 options=('!strip')
-source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu1/linux-libre-${_basekernel}-gnu1.tar.xz"
-        "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu1/patch-${_basekernel}-gnu1-${pkgver}-gnu1.xz"
+source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz"
+        "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz"
         # the main kernel config files
         'config.i686' 'config.x86_64'
         # standard config files for mkinitcpio ramdisk
@@ -26,27 +29,23 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'Kbuild.platforms'
         'boot-logo.patch'
         'change-default-console-loglevel.patch'
-        'i915-fix-ghost-tv-output.patch'
-        'ext4-options.patch'
-        'module-symbol-waiting-3.0.patch'
-        'module-init-wait-3.0.patch'
-        "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu1_0loongsonlibre_mipsel.tar.bz2")
-md5sums=('f30a562307b6f71204370fcd33756466'
-         '6538b7cc875c6960d47a8894a3dfea9d'
-         'fe0e9b4415b82f306fc1b63eb9a742a4'
-         '69a689019ea0b6ed46b387907f14bc8a'
+        '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'
+         'd2cfd95d71d64950b77d534793272486'
+         '678afb6322e0b0caad6b08bdb2b23dc8'
+         '13e5a0aa3faf60f791403d0b367dca86'
          'c072b17032e80debc6a8626299245d46'
          '2967cecc3af9f954ccc822fd63dca6ff'
          '8267264d9a8966e57fdacd1fa1fc65c4'
          '04b21c79df0a952c22d681dd4f4562df'
          'f3def2cefdcbb954c21d8505d23cc83c'
-         '263725f20c0b9eb9c353040792d644e5'
-         'f36222e7ce20c8e4dc27376f9be60f6c'
-         '670931649c60fcb3ef2e0119ed532bd4'
-         '8a71abc4224f575008f974a099b5cf6f'
-         '7a0757288e0f61cbd91f7fc6b2bafb7b')
+         'd50c1ac47394e9aec637002ef3392bd1'
+         '3ff40ca684cfe719723e627e2cef7cea'
+         '59e1e27d0f3548226694abcbec79af0b')
 if [ "$CARCH" != "mips64el" ]; then
-    # Don't use the Loongson-specific patches on non-mips64el arches.
+    # don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
     unset md5sums[${#md5sums[@]}-1]
 fi
@@ -58,34 +57,23 @@ prepare() {
   cd "${srcdir}/linux-${_basekernel}"
 
   if [ "${_basekernel}" != "${pkgver}" ]; then
-    patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu1-${pkgver}-gnu1"
+    patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu"
   fi
 
-  # Add freedo as boot logo
+  # add freedo as boot logo
   patch -Np1 -i "${srcdir}/boot-logo.patch"
 
-  # Some chips detect a ghost TV output
-  # mailing list discussion: http://lists.freedesktop.org/archives/intel-gfx/2011-April/010371.html
-  # Arch Linux bug report: FS#19234
-  #
-  # It is unclear why this patch wasn't merged upstream, it was accepted,
-  # then dropped because the reasoning was unclear. However, it is clearly
-  # needed.
-  patch -Np1 -i "${srcdir}/i915-fix-ghost-tv-output.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"
 
-  # fix ext4 module to mount ext3/2 correct
-  # https://bugs.archlinux.org/task/28653
-  patch -Np1 -i "${srcdir}/ext4-options.patch"
-
-  # fix module initialisation
-  # https://bugs.archlinux.org/task/32122
-  patch -Np1 -i "${srcdir}/module-symbol-waiting-3.0.patch"
-  patch -Np1 -i "${srcdir}/module-init-wait-3.0.patch"
+  # allow criu without expert option set
+  # 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
@@ -95,10 +83,10 @@ prepare() {
     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)
+  # 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" \
@@ -165,7 +153,7 @@ build() {
 }
 
 _package() {
-  pkgdesc="The ${pkgbase} kernel and modules - stable longtime supported kernel package suitable for servers"
+  pkgdesc="The ${pkgbase^} kernel and modules - stable longtime supported kernel package suitable for servers"
   [ "${pkgbase}" = "linux-libre" ] && groups=('base')
   depends=('coreutils' 'linux-libre-firmware' 'kmod')
   optdepends=('crda: to set the correct wireless channels of your country')
@@ -174,6 +162,11 @@ _package() {
   replaces=("kernel26${_kernelname}" "kernel26-libre${_kernelname}" "linux${_kernelname}")
   backup=("etc/mkinitcpio.d/${pkgbase}.preset")
   install=${pkgbase}.install
+  if [ "$CARCH" != "mips64el" ]; then
+     provides+=('linux-libre-lts-kmod-alx')
+     conflicts+=('linux-libre-lts-kmod-alx')
+     replaces+=('linux-libre-lts-kmod-alx')
+  fi
   if [ "$CARCH" = "mips64el" ]; then
       optdepends+=('mkinitcpio: to make the initramfs (needs reinstall of this package)')
       conflicts+=('mkinitcpio<0.7')
@@ -204,7 +197,6 @@ _package() {
   # 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
@@ -213,9 +205,8 @@ _package() {
     -e  "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/" \
     -i "${startdir}/${install}"
 
-  # install fallback mkinitcpio.conf file and preset file for kernel
+  # 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}\"|" \
@@ -223,7 +214,7 @@ _package() {
     -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
+  # 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"
@@ -249,7 +240,7 @@ _package() {
 }
 
 _package-headers() {
-  pkgdesc="Header files and scripts for building modules for ${pkgbase} kernel"
+  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")
@@ -257,7 +248,7 @@ _package-headers() {
   KARCH=x86
   [ $CARCH = "mips64el" ] && KARCH=mips
 
-# In case of repackaging this is empty
+  # in case of repackaging this is empty
   if [ -z "${_kernver}" ]; then
     cd "${srcdir}/linux-${_basekernel}"
     _kernver="$(make LOCALVERSION= kernelrelease)"
@@ -278,8 +269,8 @@ _package-headers() {
 
   mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include"
 
-  for i in acpi asm-generic config crypto drm generated linux math-emu \
-    media mtd net pcmcia scsi sound trace video xen; do
+  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
 
@@ -312,13 +303,22 @@ _package-headers() {
   cp arch/${KARCH}/kernel/asm-offsets.s "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel/"
 
   # add headers for lirc package
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video"
-
-  cp drivers/media/video/*.h  "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/"
-
-  for i in bt8xx cpia2 cx25840 cx88 em28xx et61x251 pwc saa7134 sn9c102; do
-    mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}"
-    cp -a drivers/media/video/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}"
+  # 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
@@ -340,8 +340,8 @@ _package-headers() {
   # 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/dvb-core"
-  cp drivers/media/dvb/dvb-core/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core/"
+  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/"
@@ -350,19 +350,19 @@ _package-headers() {
   # 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/video/msp3400-driver.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
+  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/dvb/dvb-usb"
-  cp drivers/media/dvb/dvb-usb/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/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/common/tuners"
-  cp drivers/media/common/tuners/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners/"
+  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"
@@ -391,7 +391,7 @@ _package-headers() {
   done
 
   # remove unneeded architectures
-  rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,microblaze,mn10300,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,um,unicore32,v850,xtensa}
+  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
diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686
index 849fd016b..3a2a9a4a5 100644
--- a/libre/linux-libre-lts/config.i686
+++ b/libre/linux-libre-lts/config.i686
@@ -1,47 +1,34 @@
 #
-# Automatically generated make config: don't edit
-# Linux/i386 3.0.54-1 Kernel Configuration
+# Automatically generated file; DO NOT EDIT.
+# Linux/x86 3.10.10-1 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
-# CONFIG_X86_64 is not set
 CONFIG_X86=y
 CONFIG_INSTRUCTION_DECODER=y
 CONFIG_OUTPUT_FORMAT="elf32-i386"
 CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_CLOCKSOURCE_WATCHDOG=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_MMU=y
-CONFIG_ZONE_DMA=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_GENERIC_ISA_DMA=y
-CONFIG_GENERIC_IOMAP=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_GPIO=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
-# CONFIG_GENERIC_TIME_VSYSCALL is not set
 CONFIG_ARCH_HAS_CPU_RELAX=y
-CONFIG_ARCH_HAS_DEFAULT_IDLE=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_HAVE_CPUMASK_OF_CPU_MAP is not set
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 # CONFIG_ZONE_DMA32 is not set
-CONFIG_ARCH_POPULATES_NODE_MAP=y
 # CONFIG_AUDIT_ARCH is not set
 CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -49,16 +36,15 @@ 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_KTIME_SCALAR=y
 CONFIG_ARCH_CPU_PROBE_RELEASE=y
+CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-CONFIG_HAVE_IRQ_WORK=y
 CONFIG_IRQ_WORK=y
+CONFIG_BUILDTIME_EXTABLE_SORT=y
 
 #
 # General setup
 #
-CONFIG_EXPERIMENTAL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 CONFIG_LOCALVERSION="-LIBRE-LTS"
@@ -79,44 +65,77 @@ CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
 CONFIG_POSIX_MQUEUE_SYSCTL=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_FHANDLE=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=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_HAVE_SPARSE_IRQ=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 is not set
+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_TREE_PREEMPT_RCU is not set
 # CONFIG_PREEMPT_RCU is not set
-# CONFIG_RCU_TRACE 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
@@ -125,19 +144,22 @@ CONFIG_CPUSETS=y
 CONFIG_PROC_PID_CPUSET=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
-CONFIG_CGROUP_MEM_RES_CTLR=y
-CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
-# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
+CONFIG_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=y
 CONFIG_PID_NS=y
 CONFIG_NET_NS=y
 CONFIG_SCHED_AUTOGROUP=y
@@ -154,12 +176,15 @@ 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=y
+# CONFIG_SYSCTL_SYSCALL is not set
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
-CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
@@ -172,6 +197,7 @@ 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
 
@@ -179,10 +205,8 @@ CONFIG_HAVE_PERF_EVENTS=y
 # Kernel Performance Events And Counters
 #
 CONFIG_PERF_EVENTS=y
-CONFIG_PERF_COUNTERS=y
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_PCI_QUIRKS=y
 CONFIG_SLUB_DEBUG=y
 # CONFIG_COMPAT_BRK is not set
 # CONFIG_SLAB is not set
@@ -192,26 +216,49 @@ 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
@@ -227,14 +274,39 @@ 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
@@ -247,63 +319,38 @@ CONFIG_DEFAULT_DEADLINE=y
 CONFIG_DEFAULT_IOSCHED="deadline"
 CONFIG_PREEMPT_NOTIFIERS=y
 CONFIG_PADATA=y
-# CONFIG_INLINE_SPIN_TRYLOCK is not set
-# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK is not set
-# CONFIG_INLINE_SPIN_LOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-CONFIG_INLINE_SPIN_UNLOCK=y
-# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+CONFIG_ASN1=m
 CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_READ_TRYLOCK is not set
-# CONFIG_INLINE_READ_LOCK is not set
-# CONFIG_INLINE_READ_LOCK_BH is not set
-# CONFIG_INLINE_READ_LOCK_IRQ is not set
-# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
 CONFIG_INLINE_READ_UNLOCK=y
-# CONFIG_INLINE_READ_UNLOCK_BH is not set
 CONFIG_INLINE_READ_UNLOCK_IRQ=y
-# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_WRITE_TRYLOCK is not set
-# CONFIG_INLINE_WRITE_LOCK is not set
-# CONFIG_INLINE_WRITE_LOCK_BH is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
 CONFIG_INLINE_WRITE_UNLOCK=y
-# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
 CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
-# CONFIG_MUTEX_SPIN_ON_OWNER is not set
 CONFIG_FREEZER=y
 
 #
 # Processor type and features
 #
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+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_PARAVIRT_GUEST=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_CLOCK=y
 CONFIG_KVM_GUEST=y
 CONFIG_LGUEST_GUEST=y
-CONFIG_PARAVIRT=y
-# CONFIG_PARAVIRT_SPINLOCKS is not set
+CONFIG_PARAVIRT_TIME_ACCOUNTING=y
 CONFIG_PARAVIRT_CLOCK=y
-# CONFIG_PARAVIRT_DEBUG is not set
 CONFIG_NO_BOOTMEM=y
 # CONFIG_MEMTEST is not set
-# CONFIG_M386 is not set
 # CONFIG_M486 is not set
 # CONFIG_M586 is not set
 # CONFIG_M586TSC is not set
@@ -330,15 +377,8 @@ CONFIG_M686=y
 # CONFIG_MATOM is not set
 CONFIG_X86_GENERIC=y
 CONFIG_X86_INTERNODE_CACHE_SHIFT=6
-CONFIG_X86_CMPXCHG=y
-CONFIG_CMPXCHG_LOCAL=y
 CONFIG_X86_L1_CACHE_SHIFT=6
-CONFIG_X86_XADD=y
 # CONFIG_X86_PPRO_FENCE is not set
-CONFIG_X86_WP_WORKS_OK=y
-CONFIG_X86_INVLPG=y
-CONFIG_X86_BSWAP=y
-CONFIG_X86_POPAD_OK=y
 CONFIG_X86_INTEL_USERCOPY=y
 CONFIG_X86_USE_PPRO_CHECKSUM=y
 CONFIG_X86_TSC=y
@@ -347,20 +387,15 @@ CONFIG_X86_CMOV=y
 CONFIG_X86_MINIMUM_CPU_FAMILY=5
 CONFIG_X86_DEBUGCTLMSR=y
 CONFIG_CPU_SUP_INTEL=y
-CONFIG_CPU_SUP_CYRIX_32=y
 CONFIG_CPU_SUP_AMD=y
 CONFIG_CPU_SUP_CENTAUR=y
 CONFIG_CPU_SUP_TRANSMETA_32=y
-CONFIG_CPU_SUP_UMC_32=y
 CONFIG_HPET_TIMER=y
 CONFIG_HPET_EMULATE_RTC=y
 CONFIG_DMI=y
-# CONFIG_IOMMU_HELPER is not set
-CONFIG_IOMMU_API=y
 CONFIG_NR_CPUS=8
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
-# CONFIG_IRQ_TIME_ACCOUNTING is not set
 CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PREEMPT is not set
@@ -379,8 +414,8 @@ CONFIG_TOSHIBA=m
 CONFIG_I8K=m
 CONFIG_X86_REBOOTFIXUPS=y
 CONFIG_MICROCODE=m
-CONFIG_MICROCODE_INTEL=y
-CONFIG_MICROCODE_AMD=y
+# 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
@@ -389,8 +424,6 @@ CONFIG_HIGHMEM4G=y
 # CONFIG_HIGHMEM64G is not set
 CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_HIGHMEM=y
-# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
-# CONFIG_ARCH_DMA_ADDR_T_64BIT is not set
 CONFIG_ARCH_FLATMEM_ENABLE=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
@@ -402,8 +435,13 @@ 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
@@ -417,9 +455,11 @@ CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_MEMORY_FAILURE=y
 CONFIG_HWPOISON_INJECT=m
 CONFIG_TRANSPARENT_HUGEPAGE=y
-# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
-CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
+CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
+# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
+CONFIG_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
@@ -432,7 +472,9 @@ 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
@@ -449,6 +491,8 @@ 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
@@ -463,42 +507,51 @@ 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_CAN_PM_TRACE=y
+CONFIG_PM_SLEEP_DEBUG=y
+CONFIG_PM_TRACE=y
 CONFIG_PM_TRACE_RTC=y
 CONFIG_ACPI=y
 CONFIG_ACPI_SLEEP=y
-CONFIG_ACPI_PROCFS=y
+# CONFIG_ACPI_PROCFS is not set
 # CONFIG_ACPI_PROCFS_POWER is not set
 CONFIG_ACPI_EC_DEBUGFS=m
-CONFIG_ACPI_PROC_EVENT=y
+# CONFIG_ACPI_PROC_EVENT is not set
 CONFIG_ACPI_AC=m
 CONFIG_ACPI_BATTERY=m
 CONFIG_ACPI_BUTTON=m
 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=m
+CONFIG_ACPI_PCI_SLOT=y
 CONFIG_X86_PM_TIMER=y
-CONFIG_ACPI_CONTAINER=m
+CONFIG_ACPI_CONTAINER=y
 CONFIG_ACPI_SBS=m
-CONFIG_ACPI_HED=m
+CONFIG_ACPI_HED=y
 CONFIG_ACPI_CUSTOM_METHOD=m
+CONFIG_ACPI_BGRT=y
 CONFIG_ACPI_APEI=y
-CONFIG_ACPI_APEI_GHES=m
+CONFIG_ACPI_APEI_GHES=y
 CONFIG_ACPI_APEI_PCIEAER=y
+CONFIG_ACPI_APEI_MEMORY_FAILURE=y
 CONFIG_ACPI_APEI_EINJ=m
 CONFIG_ACPI_APEI_ERST_DEBUG=m
 CONFIG_SFI=y
@@ -515,6 +568,7 @@ CONFIG_APM_DO_ENABLE=y
 #
 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
@@ -530,12 +584,15 @@ 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
@@ -552,8 +609,10 @@ CONFIG_X86_E_POWERSAVER=m
 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
 
 #
@@ -570,10 +629,6 @@ CONFIG_PCI_DIRECT=y
 CONFIG_PCI_MMCONFIG=y
 CONFIG_PCI_OLPC=y
 CONFIG_PCI_DOMAINS=y
-# CONFIG_PCI_CNB20LE_QUIRK is not set
-CONFIG_DMAR=y
-# CONFIG_DMAR_DEFAULT_ON is not set
-CONFIG_DMAR_FLOPPY_WA=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_HOTPLUG_PCI_PCIE=m
 CONFIG_PCIEAER=y
@@ -581,22 +636,34 @@ CONFIG_PCIEAER=y
 # 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_MCA is not set
 # CONFIG_SCx200 is not set
 CONFIG_OLPC=y
-CONFIG_OLPC_XO1=m
+CONFIG_OLPC_XO1_PM=y
+CONFIG_OLPC_XO1_RTC=y
+CONFIG_OLPC_XO1_SCI=y
+CONFIG_OLPC_XO15_SCI=y
+# CONFIG_ALIX is not set
+# CONFIG_NET5501 is not set
+# CONFIG_GEOS is not set
 CONFIG_AMD_NB=y
 CONFIG_PCCARD=m
 CONFIG_PCMCIA=m
@@ -618,35 +685,40 @@ CONFIG_I82365=m
 CONFIG_TCIC=m
 CONFIG_PCMCIA_PROBE=y
 CONFIG_PCCARD_NONSTATIC=y
-CONFIG_HOTPLUG_PCI=m
-CONFIG_HOTPLUG_PCI_FAKE=m
+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=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
-CONFIG_RAPIDIO_DEBUG=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
@@ -655,8 +727,11 @@ 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
@@ -675,6 +750,7 @@ 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
@@ -683,6 +759,7 @@ 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
@@ -692,8 +769,9 @@ 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=y
-CONFIG_INET_TCP_DIAG=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
@@ -730,6 +808,7 @@ 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
@@ -745,14 +824,18 @@ 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
@@ -769,6 +852,19 @@ 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
 
@@ -790,13 +886,17 @@ 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
@@ -808,9 +908,11 @@ 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
@@ -818,6 +920,7 @@ CONFIG_NETFILTER_XT_MATCH_CPU=m
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
 CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
 CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ECN=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
@@ -829,6 +932,7 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 CONFIG_NETFILTER_XT_MATCH_MAC=m
 CONFIG_NETFILTER_XT_MATCH_MARK=m
 CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
 CONFIG_NETFILTER_XT_MATCH_OSF=m
 CONFIG_NETFILTER_XT_MATCH_OWNER=m
 CONFIG_NETFILTER_XT_MATCH_POLICY=m
@@ -857,6 +961,7 @@ CONFIG_IP_SET_HASH_IPPORTIP=m
 CONFIG_IP_SET_HASH_IPPORTNET=m
 CONFIG_IP_SET_HASH_NET=m
 CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
 CONFIG_IP_SET_LIST_SET=m
 CONFIG_IP_VS=m
 # CONFIG_IP_VS_IPV6 is not set
@@ -888,6 +993,11 @@ CONFIG_IP_VS_SED=m
 CONFIG_IP_VS_NQ=m
 
 #
+# IPVS SH scheduler
+#
+CONFIG_IP_VS_SH_TAB_BITS=8
+
+#
 # IPVS application helper
 #
 CONFIG_IP_VS_FTP=m
@@ -899,33 +1009,23 @@ CONFIG_IP_VS_PE_SIP=m
 #
 CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_NF_CONNTRACK_IPV4=m
-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-CONFIG_IP_NF_QUEUE=m
+# CONFIG_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_LOG=m
 CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_NF_NAT=m
-CONFIG_NF_NAT_NEEDED=y
+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_DCCP=m
 CONFIG_NF_NAT_PROTO_GRE=m
-CONFIG_NF_NAT_PROTO_UDPLITE=m
-CONFIG_NF_NAT_PROTO_SCTP=m
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NF_NAT_AMANDA=m
 CONFIG_NF_NAT_PPTP=m
 CONFIG_NF_NAT_H323=m
-CONFIG_NF_NAT_SIP=m
 CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_TARGET_CLUSTERIP=m
 CONFIG_IP_NF_TARGET_ECN=m
@@ -941,7 +1041,6 @@ CONFIG_IP_NF_ARP_MANGLE=m
 #
 CONFIG_NF_DEFRAG_IPV6=m
 CONFIG_NF_CONNTRACK_IPV6=m
-CONFIG_IP6_NF_QUEUE=m
 CONFIG_IP6_NF_IPTABLES=m
 CONFIG_IP6_NF_MATCH_AH=m
 CONFIG_IP6_NF_MATCH_EUI64=m
@@ -950,14 +1049,17 @@ CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_HL=m
 CONFIG_IP6_NF_MATCH_IPV6HEADER=m
 CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RPFILTER=m
 CONFIG_IP6_NF_MATCH_RT=m
 CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_TARGET_LOG=m
 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
@@ -984,7 +1086,7 @@ CONFIG_IP_DCCP=m
 CONFIG_INET_DCCP_DIAG=m
 
 #
-# DCCP CCIDs Configuration (EXPERIMENTAL)
+# DCCP CCIDs Configuration
 #
 # CONFIG_IP_DCCP_CCID2_DEBUG is not set
 CONFIG_IP_DCCP_CCID3=y
@@ -1000,9 +1102,11 @@ CONFIG_IP_SCTP=m
 CONFIG_NET_SCTPPROBE=m
 # CONFIG_SCTP_DBG_MSG is not set
 # CONFIG_SCTP_DBG_OBJCNT is not set
-# CONFIG_SCTP_HMAC_NONE is not set
-CONFIG_SCTP_HMAC_SHA1=y
-# CONFIG_SCTP_HMAC_MD5 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
@@ -1018,11 +1122,18 @@ 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_NET_DSA is not set
+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
@@ -1036,13 +1147,12 @@ CONFIG_COPS_DAYNA=y
 CONFIG_COPS_TANGENT=y
 CONFIG_IPDDP=m
 CONFIG_IPDDP_ENCAP=y
-CONFIG_IPDDP_DECAP=y
 # CONFIG_X25 is not set
 # CONFIG_LAPB is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
 CONFIG_PHONET=m
 CONFIG_IEEE802154=m
+CONFIG_IEEE802154_6LOWPAN=m
+CONFIG_MAC802154=m
 CONFIG_NET_SCHED=y
 
 #
@@ -1066,7 +1176,10 @@ 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
@@ -1100,10 +1213,20 @@ 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
@@ -1194,8 +1317,6 @@ CONFIG_VLSI_FIR=m
 CONFIG_VIA_FIR=m
 CONFIG_MCS_FIR=m
 CONFIG_BT=m
-CONFIG_BT_L2CAP=y
-CONFIG_BT_SCO=y
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BT_BNEP=m
@@ -1214,6 +1335,7 @@ 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
@@ -1237,14 +1359,13 @@ CONFIG_WEXT_PROC=y
 CONFIG_WEXT_SPY=y
 CONFIG_WEXT_PRIV=y
 CONFIG_CFG80211=m
-CONFIG_NL80211_TESTMODE=y
+# 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_WIRELESS_EXT_SYSFS=y
 CONFIG_LIB80211=m
 CONFIG_LIB80211_CRYPT_WEP=m
 CONFIG_LIB80211_CRYPT_CCMP=m
@@ -1259,6 +1380,7 @@ 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
@@ -1271,8 +1393,25 @@ CONFIG_NET_9P_VIRTIO=m
 CONFIG_CAIF=m
 # CONFIG_CAIF_DEBUG is not set
 CONFIG_CAIF_NETDEV=m
+CONFIG_CAIF_USB=m
 CONFIG_CEPH_LIB=m
 # CONFIG_CEPH_LIB_PRETTYDEBUG is not set
+# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
+CONFIG_NFC=m
+CONFIG_NFC_NCI=m
+CONFIG_NFC_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
@@ -1289,25 +1428,36 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 CONFIG_FIRMWARE_IN_KERNEL=y
 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_DEBUG is not set
 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_OF_PARTS=y
+CONFIG_MTD_CMDLINE_PARTS=m
+CONFIG_MTD_OF_PARTS=m
 CONFIG_MTD_AR7_PARTS=m
 
 #
 # User Modules And Translation Layers
 #
-CONFIG_MTD_CHAR=m
 CONFIG_MTD_BLKDEVS=m
 CONFIG_MTD_BLOCK=m
 CONFIG_MTD_BLOCK_RO=m
@@ -1376,6 +1526,9 @@ CONFIG_MTD_PLATRAM=m
 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
@@ -1386,16 +1539,14 @@ CONFIG_MTD_BLOCK2MTD=m
 #
 # Disk-On-Chip Device Drivers
 #
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
+CONFIG_MTD_DOCG3=m
+CONFIG_BCH_CONST_M=14
+CONFIG_BCH_CONST_T=4
 CONFIG_MTD_NAND_ECC=m
 CONFIG_MTD_NAND_ECC_SMC=y
 CONFIG_MTD_NAND=m
-# CONFIG_MTD_NAND_VERIFY_WRITE is not set
 # CONFIG_MTD_NAND_ECC_BCH is not set
 CONFIG_MTD_SM_COMMON=m
-# CONFIG_MTD_NAND_MUSEUM_IDS is not set
 # CONFIG_MTD_NAND_DENALI is not set
 CONFIG_MTD_NAND_IDS=m
 CONFIG_MTD_NAND_RICOH=m
@@ -1403,6 +1554,7 @@ CONFIG_MTD_NAND_DISKONCHIP=m
 # CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
 CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
 # CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
+CONFIG_MTD_NAND_DOCG4=m
 # CONFIG_MTD_NAND_CAFE is not set
 CONFIG_MTD_NAND_CS553X=m
 CONFIG_MTD_NAND_NANDSIM=m
@@ -1417,29 +1569,31 @@ CONFIG_MTD_LPDDR=m
 CONFIG_MTD_QINFO_PROBE=m
 CONFIG_MTD_UBI=m
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTD_UBI_BEB_RESERVE=1
+CONFIG_MTD_UBI_BEB_LIMIT=20
+# CONFIG_MTD_UBI_FASTMAP is not set
 # CONFIG_MTD_UBI_GLUEBI is not set
-# CONFIG_MTD_UBI_DEBUG 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_GPIO=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=y
-CONFIG_PARPORT_PC_SUPERIO=y
+# 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
@@ -1456,8 +1610,8 @@ CONFIG_ISAPNP=y
 CONFIG_PNPACPI=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_FD=m
-# CONFIG_BLK_DEV_XD is not set
 # CONFIG_PARIDE is not set
+CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
 CONFIG_BLK_CPQ_DA=m
 CONFIG_BLK_CPQ_CISS_DA=m
 # CONFIG_CISS_SCSI_TAPE is not set
@@ -1465,13 +1619,14 @@ 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_UB is not set
 CONFIG_BLK_DEV_RAM=m
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=16384
@@ -1483,10 +1638,16 @@ 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_MISC_DEVICES=y
 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
@@ -1494,6 +1655,7 @@ 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
@@ -1508,9 +1670,15 @@ 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=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
 
@@ -1518,21 +1686,28 @@ 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
-CONFIG_IWMC3200TOP=m
-# CONFIG_IWMC3200TOP_DEBUG is not set
-# CONFIG_IWMC3200TOP_DEBUGFS is not set
 
 #
 # 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
 
@@ -1562,7 +1737,6 @@ CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
 # CONFIG_SCSI_SCAN_ASYNC is not set
-CONFIG_SCSI_WAIT_SCAN=m
 
 #
 # SCSI Transports
@@ -1611,11 +1785,12 @@ 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_ARCMSR_AER=y
 CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
@@ -1624,10 +1799,17 @@ 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
@@ -1665,6 +1847,7 @@ 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
@@ -1683,6 +1866,8 @@ 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
@@ -1702,6 +1887,7 @@ 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
 
 #
@@ -1726,6 +1912,7 @@ 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
@@ -1806,13 +1993,24 @@ CONFIG_MD_RAID0=m
 CONFIG_MD_RAID1=m
 CONFIG_MD_RAID10=m
 CONFIG_MD_RAID456=m
-# CONFIG_MULTICORE_RAID456 is not set
 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
@@ -1823,13 +2021,15 @@ 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_LOOPBACK_TARGET_CDB_DEBUG is not set
 CONFIG_TCM_FC=m
+CONFIG_ISCSI_TARGET=m
+CONFIG_SBP_TARGET=m
 CONFIG_FUSION=y
 CONFIG_FUSION_SPI=m
 CONFIG_FUSION_FC=m
@@ -1843,7 +2043,6 @@ CONFIG_FUSION_CTL=m
 #
 CONFIG_FIREWIRE=m
 CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_OHCI_DEBUG=y
 CONFIG_FIREWIRE_SBP2=m
 CONFIG_FIREWIRE_NET=m
 CONFIG_FIREWIRE_NOSY=m
@@ -1859,60 +2058,141 @@ CONFIG_I2O_PROC=m
 CONFIG_MACINTOSH_DRIVERS=y
 CONFIG_MAC_EMUMOUSEBTN=y
 CONFIG_NETDEVICES=y
-CONFIG_IFB=m
-CONFIG_DUMMY=m
+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_EQUALIZER=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_NET_SB1000=m
+CONFIG_VIRTIO_NET=m
+CONFIG_SUNGEM_PHY=m
 # CONFIG_ARCNET is not set
-CONFIG_MII=m
-CONFIG_PHYLIB=m
+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
 
 #
-# MII PHY device drivers
+# CAIF transport drivers
 #
-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_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_NET_ETHERNET=y
-CONFIG_HAPPYMEAL=m
-CONFIG_SUNGEM=m
-CONFIG_CASSINI=m
+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_EL1=m
-CONFIG_EL2=m
-CONFIG_ELPLUS=m
-CONFIG_EL16=m
 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_NET_VENDOR_SMC=y
-CONFIG_WD80x3=m
-CONFIG_ULTRA=m
-CONFIG_SMC9194=m
-CONFIG_ETHOC=m
-CONFIG_NET_VENDOR_RACAL=y
-CONFIG_NI52=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
@@ -1925,131 +2205,224 @@ CONFIG_WINBOND_840=m
 CONFIG_DM9102=m
 CONFIG_ULI526X=m
 CONFIG_PCMCIA_XIRCOM=m
-CONFIG_AT1700=m
-CONFIG_DEPCA=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_ISA=y
-CONFIG_E2100=m
-CONFIG_EWRK3=m
-CONFIG_EEXPRESS=m
-CONFIG_EEXPRESS_PRO=m
-CONFIG_HPLAN_PLUS=m
-CONFIG_HPLAN=m
-CONFIG_LP486E=m
-CONFIG_ETH16I=m
-CONFIG_NE2000=m
-CONFIG_ZNET=m
-CONFIG_SEEQ8005=m
-# CONFIG_IBM_NEW_EMAC_ZMII is not set
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
-# CONFIG_IBM_NEW_EMAC_TAH is not set
-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
-# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
-# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
-CONFIG_NET_PCI=y
-CONFIG_PCNET32=m
-CONFIG_AMD8111_ETH=m
-CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_AC3200=m
-CONFIG_KSZ884X_PCI=m
-CONFIG_APRICOT=m
-CONFIG_B44=m
-CONFIG_B44_PCI_AUTOSELECT=y
-CONFIG_B44_PCICORE_AUTOSELECT=y
-CONFIG_B44_PCI=y
-CONFIG_FORCEDETH=m
-CONFIG_CS89x0=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_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
-CONFIG_TLAN=m
-CONFIG_KS8842=m
-CONFIG_KS8851_MLL=m
-CONFIG_VIA_RHINE=m
-# CONFIG_VIA_RHINE_MMIO is not set
-CONFIG_SC92031=m
-CONFIG_NET_POCKET=y
-CONFIG_ATP=m
-CONFIG_DE600=m
-CONFIG_DE620=m
-CONFIG_ATL2=m
-CONFIG_NETDEV_1000=y
-CONFIG_ACENIC=m
-# CONFIG_ACENIC_OMIT_TIGON_I is not set
-CONFIG_DL2K=m
-CONFIG_E1000=m
-CONFIG_E1000E=m
-CONFIG_IP1000=m
-CONFIG_IGB=m
-CONFIG_IGB_DCA=y
-CONFIG_IGBVF=m
-CONFIG_NS83820=m
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_R8169=m
-CONFIG_SIS190=m
-CONFIG_SKGE=m
-# CONFIG_SKGE_DEBUG is not set
-CONFIG_SKY2=m
-# CONFIG_SKY2_DEBUG is not set
-CONFIG_VIA_VELOCITY=m
-CONFIG_TIGON3=m
-CONFIG_BNX2=m
-CONFIG_CNIC=m
-CONFIG_QLA3XXX=m
-CONFIG_ATL1=m
-CONFIG_ATL1E=m
-CONFIG_ATL1C=m
-CONFIG_JME=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_STMMAC_DUAL_MAC=y
-CONFIG_PCH_GBE=m
-CONFIG_NETDEV_10000=y
-CONFIG_MDIO=m
-CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T3=m
-CONFIG_CHELSIO_T4=m
-CONFIG_CHELSIO_T4VF=m
-CONFIG_ENIC=m
-CONFIG_IXGBE=m
-CONFIG_IXGBE_DCA=y
-CONFIG_IXGBEVF=m
-CONFIG_IXGB=m
-CONFIG_S2IO=m
-CONFIG_VXGE=m
-# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
-CONFIG_MYRI10GE=m
-CONFIG_MYRI10GE_DCA=y
-CONFIG_NETXEN_NIC=m
+CONFIG_NET_VENDOR_SUN=y
+CONFIG_HAPPYMEAL=m
+CONFIG_SUNGEM=m
+CONFIG_CASSINI=m
 CONFIG_NIU=m
-CONFIG_MLX4_EN=m
-CONFIG_MLX4_CORE=m
-CONFIG_MLX4_DEBUG=y
+CONFIG_NET_VENDOR_TEHUTI=y
 CONFIG_TEHUTI=m
-CONFIG_BNX2X=m
-CONFIG_QLCNIC=m
-CONFIG_QLGE=m
-CONFIG_BNA=m
-CONFIG_SFC=m
-CONFIG_SFC_MTD=y
-CONFIG_BE2NET=m
-# CONFIG_TR is not set
+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
@@ -2072,6 +2445,7 @@ 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
@@ -2079,24 +2453,39 @@ CONFIG_ATH5K=m
 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_RATE_CONTROL=y
+# 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
@@ -2111,48 +2500,45 @@ 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=m
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2100_DEBUG is not set
-CONFIG_IPW2200=m
-CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW2200_RADIOTAP=y
-CONFIG_IPW2200_PROMISCUOUS=y
-CONFIG_IPW2200_QOS=y
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_LIBIPW=m
-# CONFIG_LIBIPW_DEBUG is not set
-CONFIG_IWLAGN=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_DEVICE_SVTOOL=y
-CONFIG_IWL_P2P=y
-CONFIG_IWLWIFI_LEGACY=m
+# CONFIG_IWLWIFI_P2P is not set
+CONFIG_IWLEGACY=m
+CONFIG_IWL4965=m
+CONFIG_IWL3945=m
 
 #
-# Debugging Options
+# iwl3945 / iwl4965 Debugging Options
 #
-# CONFIG_IWLWIFI_LEGACY_DEBUG is not set
-# CONFIG_IWLWIFI_LEGACY_DEVICE_TRACING is not set
-CONFIG_IWL4965=m
-CONFIG_IWL3945=m
-CONFIG_IWM=m
-# CONFIG_IWM_DEBUG is not set
-CONFIG_IWM_TRACING=y
+# 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
@@ -2168,6 +2554,7 @@ 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
@@ -2177,14 +2564,17 @@ 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
@@ -2192,149 +2582,46 @@ 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_RTLWIFI=m
 CONFIG_RTL8192C_COMMON=m
+CONFIG_WL_TI=y
 CONFIG_WL1251=m
+# CONFIG_WL1251_SPI is not set
 CONFIG_WL1251_SDIO=m
-CONFIG_WL12XX_MENU=m
 CONFIG_WL12XX=m
-CONFIG_WL12XX_HT=y
-CONFIG_WL12XX_SDIO=m
-CONFIG_WL12XX_SDIO_TEST=m
-CONFIG_WL12XX_PLATFORM_DATA=y
+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_SDIO=m
-# CONFIG_WIMAX_IWMC3200_SDIO is not set
 CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
-
-#
-# USB Network Adapters
-#
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_USBNET=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_CDCETHER=m
-CONFIG_USB_NET_CDC_EEM=m
-CONFIG_USB_NET_CDC_NCM=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_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_NET_PCMCIA=y
-CONFIG_PCMCIA_3C589=m
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_PCMCIA_XIRC2PS=m
-CONFIG_PCMCIA_AXNET=m
 # CONFIG_WAN 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
 CONFIG_IEEE802154_DRIVERS=m
 CONFIG_IEEE802154_FAKEHARD=m
-
-#
-# CAIF transport drivers
-#
-CONFIG_CAIF_TTY=m
-CONFIG_CAIF_SPI_SLAVE=m
-CONFIG_CAIF_SPI_SYNC=y
-CONFIG_RIONET=m
-CONFIG_RIONET_TX_SIZE=128
-CONFIG_RIONET_RX_SIZE=128
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-CONFIG_PLIP=m
-CONFIG_PPP=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_MPPE=m
-CONFIG_PPPOE=m
-CONFIG_PPTP=m
-CONFIG_PPPOATM=m
-CONFIG_PPPOL2TP=m
-CONFIG_SLIP=m
-# CONFIG_SLIP_COMPRESSED is not set
-CONFIG_SLHC=m
-# CONFIG_SLIP_SMART is not set
-# CONFIG_SLIP_MODE_SLIP6 is not set
-# CONFIG_NET_FC is not set
-CONFIG_NETCONSOLE=m
-CONFIG_NETCONSOLE_DYNAMIC=y
-CONFIG_NETPOLL=y
-# CONFIG_NETPOLL_TRAP is not set
-CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_VIRTIO_NET=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
@@ -2481,7 +2768,6 @@ CONFIG_MISDN_NETJET=m
 CONFIG_MISDN_IPAC=m
 CONFIG_MISDN_ISAR=m
 CONFIG_ISDN_HDLC=m
-# CONFIG_PHONE is not set
 
 #
 # Input device support
@@ -2490,6 +2776,7 @@ CONFIG_INPUT=y
 CONFIG_INPUT_FF_MEMLESS=m
 CONFIG_INPUT_POLLDEV=m
 CONFIG_INPUT_SPARSEKMAP=m
+CONFIG_INPUT_MATRIXKMAP=m
 
 #
 # Userland interfaces
@@ -2515,8 +2802,10 @@ CONFIG_KEYBOARD_QT2160=m
 # 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
@@ -2530,6 +2819,7 @@ 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
@@ -2539,6 +2829,7 @@ 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
@@ -2546,6 +2837,7 @@ 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
@@ -2585,33 +2877,48 @@ 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
@@ -2624,34 +2931,49 @@ 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_AB8500_PONKEY=m
 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_REMOTE=m
 CONFIG_INPUT_ATI_REMOTE2=m
 CONFIG_INPUT_KEYSPAN_REMOTE=m
+CONFIG_INPUT_KXTJ9=m
+# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set
 CONFIG_INPUT_POWERMATE=m
 CONFIG_INPUT_YEALINK=m
 CONFIG_INPUT_CM109=m
+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
 
@@ -2668,6 +2990,8 @@ 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
@@ -2677,9 +3001,11 @@ 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
@@ -2707,30 +3033,41 @@ CONFIG_TRACE_SINK=m
 # 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_PNP=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
@@ -2749,6 +3086,7 @@ 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
@@ -2771,12 +3109,13 @@ 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_RAMOOPS=m
 CONFIG_I2C=m
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_COMPAT=y
@@ -2802,6 +3141,7 @@ 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
@@ -2819,6 +3159,10 @@ 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
@@ -2827,7 +3171,6 @@ CONFIG_I2C_PXA=m
 CONFIG_I2C_PXA_PCI=y
 CONFIG_I2C_SIMTEC=m
 CONFIG_I2C_XILINX=m
-CONFIG_I2C_EG20T=m
 
 #
 # External I2C/SMBus adapter drivers
@@ -2837,17 +3180,50 @@ 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_I2C_STUB is not set
 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 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
@@ -2861,6 +3237,7 @@ CONFIG_PPS=m
 CONFIG_PPS_CLIENT_KTIMER=m
 CONFIG_PPS_CLIENT_LDISC=m
 CONFIG_PPS_CLIENT_PARPORT=m
+CONFIG_PPS_CLIENT_GPIO=m
 
 #
 # PPS generators support
@@ -2871,41 +3248,56 @@ CONFIG_PPS_CLIENT_PARPORT=m
 #
 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_BASIC_MMIO_CORE=m
-CONFIG_GPIO_BASIC_MMIO=m
+# 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=m
+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:
@@ -2915,22 +3307,35 @@ 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 is not set
-# CONFIG_BATTERY_BQ20Z75 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
@@ -2940,14 +3345,19 @@ CONFIG_HWMON_VID=m
 #
 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
@@ -2969,6 +3379,7 @@ 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
@@ -2976,6 +3387,7 @@ 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
@@ -2991,23 +3403,34 @@ 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
@@ -3019,10 +3442,15 @@ 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
@@ -3042,6 +3470,7 @@ CONFIG_SENSORS_W83L786NG=m
 CONFIG_SENSORS_W83627HF=m
 CONFIG_SENSORS_W83627EHF=m
 CONFIG_SENSORS_APPLESMC=m
+CONFIG_SENSORS_MC13783_ADC=m
 
 #
 # ACPI drivers
@@ -3050,13 +3479,24 @@ 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
@@ -3071,6 +3511,7 @@ 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
@@ -3086,6 +3527,7 @@ CONFIG_SBC7240_WDT=m
 CONFIG_CPU5_WDT=m
 CONFIG_SMSC_SCH311X_WDT=m
 CONFIG_SMSC37B787_WDT=m
+CONFIG_VIA_WDT=m
 CONFIG_W83627HF_WDT=m
 CONFIG_W83697HF_WDT=m
 CONFIG_W83697UG_WDT=m
@@ -3129,67 +3571,121 @@ 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
-CONFIG_MFD_SUPPORT=y
+
+#
+# Multifunction device drivers
+#
 CONFIG_MFD_CORE=y
-CONFIG_MFD_SM501=m
-CONFIG_MFD_SM501_GPIO=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_UCB1400_CORE=m
-# CONFIG_TPS6105X is not set
-CONFIG_TPS65010=m
-CONFIG_TPS6507X=m
-# CONFIG_MFD_TMIO is not set
-CONFIG_MFD_WM8400=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_AB8500_CORE=y
-# CONFIG_AB8500_DEBUG is not set
-CONFIG_MFD_CS5535=m
+# 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_LPC_SCH=m
-CONFIG_MFD_RDC321X=m
-# CONFIG_MFD_JANZ_CMODIO is not set
+# CONFIG_MFD_TMIO is not set
 CONFIG_MFD_VX855=m
-CONFIG_MFD_WL1273_CORE=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_COMMON=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_VIDEO_MEDIA=m
+CONFIG_DVB_NET=y
+CONFIG_TTPCI_EEPROM=m
+CONFIG_DVB_MAX_ADAPTERS=8
+# CONFIG_DVB_DYNAMIC_MINORS is not set
 
 #
-# Multimedia drivers
+# Media drivers
 #
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
 CONFIG_RC_CORE=m
-CONFIG_LIRC=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_LIRC_CODEC=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
@@ -3199,190 +3695,15 @@ 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_MEDIA_ATTACH=y
-CONFIG_MEDIA_TUNER=m
-# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-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_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_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_TDA18212=m
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEOBUF_DMA_CONTIG=m
-CONFIG_VIDEOBUF_DVB=m
-CONFIG_VIDEO_BTCX=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_VIDEO_TUNER=m
-CONFIG_V4L2_MEM2MEM_DEV=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_VIDEO_CAPTURE_DRIVERS=y
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
-CONFIG_VIDEO_IR_I2C=m
-
-#
-# Encoders, decoders, sensors and other helper chips
-#
+CONFIG_IR_GPIO_CIR=m
+CONFIG_MEDIA_USB_SUPPORT=y
 
 #
-# Audio decoders, processors and mixers
+# Webcam devices
 #
-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_TLV320AIC23B=m
-CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_WM8739=m
-CONFIG_VIDEO_VP27SMPX=m
-
-#
-# RDS decoders
-#
-CONFIG_VIDEO_SAA6588=m
-
-#
-# Video decoders
-#
-CONFIG_VIDEO_ADV7180=m
-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_SAA7191=m
-CONFIG_VIDEO_TVP514X=m
-CONFIG_VIDEO_TVP5150=m
-CONFIG_VIDEO_TVP7002=m
-CONFIG_VIDEO_VPX3220=m
-
-#
-# Video and audio decoders
-#
-CONFIG_VIDEO_SAA717X=m
-CONFIG_VIDEO_CX25840=m
-
-#
-# MPEG video encoders
-#
-CONFIG_VIDEO_CX2341X=m
-
-#
-# Video encoders
-#
-CONFIG_VIDEO_SAA7127=m
-CONFIG_VIDEO_SAA7185=m
-CONFIG_VIDEO_ADV7170=m
-CONFIG_VIDEO_ADV7175=m
-CONFIG_VIDEO_ADV7343=m
-CONFIG_VIDEO_AK881X=m
-
-#
-# Camera sensor devices
-#
-CONFIG_VIDEO_OV7670=m
-CONFIG_VIDEO_MT9V011=m
-CONFIG_VIDEO_MT9V032=m
-CONFIG_VIDEO_TCM825X=m
-
-#
-# Video improvement chips
-#
-CONFIG_VIDEO_UPD64031A=m
-CONFIG_VIDEO_UPD64083=m
-
-#
-# Miscelaneous helper chips
-#
-CONFIG_VIDEO_THS7303=m
-CONFIG_VIDEO_M52790=m
-CONFIG_VIDEO_VIVI=m
-CONFIG_VIDEO_BT848=m
-CONFIG_VIDEO_BT848_DVB=y
-CONFIG_VIDEO_PMS=m
-CONFIG_VIDEO_BWQCAM=m
-CONFIG_VIDEO_CQCAM=m
-CONFIG_VIDEO_W9966=m
-CONFIG_VIDEO_CPIA2=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN_AVS6EYES=m
-CONFIG_VIDEO_MEYE=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_RC=y
-CONFIG_VIDEO_SAA7134_DVB=m
-CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_TIMBERDALE=m
-CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_ALSA=m
-CONFIG_VIDEO_CX88_BLACKBIRD=m
-CONFIG_VIDEO_CX88_DVB=m
-CONFIG_VIDEO_CX88_MPEG=m
-CONFIG_VIDEO_CX88_VP3054=m
-CONFIG_VIDEO_CX23885=m
-CONFIG_MEDIA_ALTERA_CI=m
-CONFIG_VIDEO_AU0828=m
-CONFIG_VIDEO_IVTV=m
-CONFIG_VIDEO_FB_IVTV=m
-CONFIG_VIDEO_CX18=m
-CONFIG_VIDEO_CX18_ALSA=m
-CONFIG_VIDEO_SAA7164=m
-CONFIG_VIDEO_CAFE_CCIC=m
-CONFIG_VIDEO_SR030PC30=m
-CONFIG_VIDEO_VIA_CAMERA=m
-CONFIG_VIDEO_NOON010PC30=m
-CONFIG_VIDEO_M5MOLS=m
-CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_IMX074=m
-CONFIG_SOC_CAMERA_MT9M001=m
-CONFIG_SOC_CAMERA_MT9M111=m
-CONFIG_SOC_CAMERA_MT9T031=m
-CONFIG_SOC_CAMERA_MT9T112=m
-CONFIG_SOC_CAMERA_MT9V022=m
-CONFIG_SOC_CAMERA_RJ54N1=m
-CONFIG_SOC_CAMERA_TW9910=m
-CONFIG_SOC_CAMERA_PLATFORM=m
-CONFIG_SOC_CAMERA_OV2640=m
-CONFIG_SOC_CAMERA_OV6650=m
-CONFIG_SOC_CAMERA_OV772X=m
-CONFIG_SOC_CAMERA_OV9640=m
-CONFIG_SOC_CAMERA_OV9740=m
-CONFIG_V4L_USB_DRIVERS=y
 CONFIG_USB_VIDEO_CLASS=m
 CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
 CONFIG_USB_GSPCA=m
@@ -3395,6 +3716,7 @@ CONFIG_USB_GSPCA_CPIA1=m
 CONFIG_USB_GSPCA_ETOMS=m
 CONFIG_USB_GSPCA_FINEPIX=m
 CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_JL2005BCD=m
 CONFIG_USB_GSPCA_KINECT=m
 CONFIG_USB_GSPCA_KONICA=m
 CONFIG_USB_GSPCA_MARS=m
@@ -3406,6 +3728,7 @@ CONFIG_USB_GSPCA_OV534_9=m
 CONFIG_USB_GSPCA_PAC207=m
 CONFIG_USB_GSPCA_PAC7302=m
 CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SE401=m
 CONFIG_USB_GSPCA_SN9C2028=m
 CONFIG_USB_GSPCA_SN9C20X=m
 CONFIG_USB_GSPCA_SONIXB=m
@@ -3424,83 +3747,49 @@ 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_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_EM28XX=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_TLG2300=m
-CONFIG_VIDEO_CX231XX=m
-CONFIG_VIDEO_CX231XX_RC=y
-CONFIG_VIDEO_CX231XX_ALSA=m
-CONFIG_VIDEO_CX231XX_DVB=m
-CONFIG_VIDEO_USBVISION=m
-CONFIG_USB_ET61X251=m
-CONFIG_USB_SN9C102=m
 CONFIG_USB_PWC=m
 # CONFIG_USB_PWC_DEBUG is not set
 CONFIG_USB_PWC_INPUT_EVDEV=y
+CONFIG_VIDEO_CPIA2=m
 CONFIG_USB_ZR364XX=m
 CONFIG_USB_STKWEBCAM=m
 CONFIG_USB_S2255=m
-CONFIG_V4L_MEM2MEM_DRIVERS=y
-CONFIG_VIDEO_MEM2MEM_TESTDEV=m
-CONFIG_RADIO_ADAPTERS=y
-CONFIG_RADIO_CADET=m
-CONFIG_RADIO_RTRACK=m
-CONFIG_RADIO_RTRACK2=m
-CONFIG_RADIO_AZTECH=m
-CONFIG_RADIO_GEMTEK=m
-CONFIG_RADIO_MAXIRADIO=m
-CONFIG_RADIO_MIROPCM20=m
-CONFIG_RADIO_SF16FMI=m
-CONFIG_RADIO_SF16FMR2=m
-CONFIG_RADIO_TERRATEC=m
-CONFIG_RADIO_TRUST=m
-CONFIG_RADIO_TYPHOON=m
-CONFIG_RADIO_ZOLTRIX=m
-CONFIG_I2C_SI4713=m
-CONFIG_RADIO_SI4713=m
-CONFIG_USB_DSBR=m
-CONFIG_RADIO_SI470X=y
-CONFIG_USB_SI470X=m
-CONFIG_I2C_SI470X=m
-CONFIG_USB_MR800=m
-CONFIG_RADIO_TEA5764=m
-CONFIG_RADIO_SAA7706H=m
-CONFIG_RADIO_TEF6862=m
-CONFIG_RADIO_WL1273=m
+CONFIG_USB_SN9C102=m
 
 #
-# Texas Instruments WL128x FM driver (ST based)
+# Analog TV USB devices
 #
-CONFIG_RADIO_WL128X=m
-CONFIG_DVB_MAX_ADAPTERS=8
-# CONFIG_DVB_DYNAMIC_MINORS is not set
-CONFIG_DVB_CAPTURE_DRIVERS=y
+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
 
 #
-# Supported SAA7146 based PCI Adapters
+# Analog/digital TV USB devices
 #
-CONFIG_TTPCI_EEPROM=m
-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_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
 
 #
-# Supported USB Adapters
+# Digital TV USB devices
 #
 CONFIG_DVB_USB=m
 # CONFIG_DVB_USB_DEBUG is not set
@@ -3512,8 +3801,6 @@ CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_UMT_010=m
 CONFIG_DVB_USB_CXUSB=m
 CONFIG_DVB_USB_M920X=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_AU6610=m
 CONFIG_DVB_USB_DIGITV=m
 CONFIG_DVB_USB_VP7045=m
 CONFIG_DVB_USB_VP702X=m
@@ -3524,77 +3811,280 @@ 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_ANYSEE=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_FRIIO=m
 CONFIG_DVB_USB_EC168=m
-CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_IT913X=m
 CONFIG_DVB_USB_LME2510=m
-CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_MXL111SF=m
+CONFIG_DVB_USB_RTL28XXU=m
 CONFIG_DVB_TTUSB_BUDGET=m
 CONFIG_DVB_TTUSB_DEC=m
-CONFIG_SMS_SIANO_MDTV=m
+CONFIG_SMS_USB_DRV=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
 
 #
-# Siano module components
+# Webcam, TV (analog/digital) USB devices
 #
-CONFIG_SMS_USB_DRV=m
-CONFIG_SMS_SDIO_DRV=m
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=m
+CONFIG_MEDIA_PCI_SUPPORT=y
 
 #
-# Supported FlexCopII (B2C2) Adapters
+# Media capture support
 #
-CONFIG_DVB_B2C2_FLEXCOP=m
-CONFIG_DVB_B2C2_FLEXCOP_PCI=m
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set
+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
 
 #
-# Supported BT878 Adapters
+# 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
 
 #
-# Supported Pluto2 Adapters
+# 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 SDMC DM1105 Adapters
+# Supported MMC/SDIO adapters
 #
-CONFIG_DVB_DM1105=m
+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
 
 #
-# Supported Earthsoft PT1 Adapters
+# common driver options
 #
-CONFIG_DVB_PT1=m
+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
 
 #
-# Supported Mantis Adapters
+# Media ancillary drivers (tuners, sensors, i2c, frontends)
 #
-CONFIG_MANTIS_CORE=m
-CONFIG_DVB_MANTIS=m
-CONFIG_DVB_HOPPER=m
+CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
+CONFIG_MEDIA_ATTACH=y
+CONFIG_VIDEO_IR_I2C=m
 
 #
-# Supported nGene Adapters
+# Audio decoders, processors and mixers
 #
-CONFIG_DVB_NGENE=m
+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
 
 #
-# Supported DVB Frontends
+# RDS decoders
 #
-# CONFIG_DVB_FE_CUSTOMISE is not set
+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
@@ -3605,6 +4095,12 @@ CONFIG_DVB_STV090x=m
 CONFIG_DVB_STV6110x=m
 
 #
+# Multistandard (cable + terrestrial) frontends
+#
+CONFIG_DVB_DRXK=m
+CONFIG_DVB_TDA18271C2DD=m
+
+#
 # DVB-S (satellite) frontends
 #
 CONFIG_DVB_CX24110=m
@@ -3628,8 +4124,10 @@ 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
@@ -3653,6 +4151,8 @@ 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
@@ -3671,8 +4171,11 @@ 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
 
 #
@@ -3693,13 +4196,18 @@ 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
@@ -3724,12 +4232,25 @@ 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_KMS=y
+# 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
@@ -3737,9 +4258,19 @@ CONFIG_DRM_MGA=m
 CONFIG_DRM_SIS=m
 CONFIG_DRM_VIA=m
 CONFIG_DRM_SAVAGE=m
-CONFIG_STUB_POULSBO=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
@@ -3753,7 +4284,6 @@ CONFIG_FB_SYS_COPYAREA=m
 CONFIG_FB_SYS_IMAGEBLIT=m
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 CONFIG_FB_SYS_FOPS=m
-# CONFIG_FB_WMT_GE_ROPS is not set
 CONFIG_FB_DEFERRED_IO=y
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
@@ -3779,6 +4309,7 @@ CONFIG_FB_EFI=y
 # 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
@@ -3797,7 +4328,7 @@ CONFIG_FB_VIA_X_COMPATIBILITY=y
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_3DFX is not set
 CONFIG_FB_VOODOO1=m
-# CONFIG_FB_VT8623 is not set
+CONFIG_FB_VT8623=m
 # CONFIG_FB_TRIDENT is not set
 # CONFIG_FB_ARK is not set
 # CONFIG_FB_PM3 is not set
@@ -3805,31 +4336,46 @@ CONFIG_FB_VOODOO1=m
 # 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_PLATFORM is not set
+# 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_PROGEAR=m
+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
-
-#
-# Display device support
-#
-CONFIG_DISPLAY_SUPPORT=m
-
-#
-# Display hardware drivers
-#
+# 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
@@ -3852,7 +4398,9 @@ CONFIG_FONT_8x16=y
 # 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
@@ -3877,6 +4425,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SND_VERBOSE_PRINTK is not set
 # CONFIG_SND_DEBUG is not set
 CONFIG_SND_VMASTER=y
+CONFIG_SND_KCTL_JACK=y
 CONFIG_SND_DMA_SGBUF=y
 CONFIG_SND_RAWMIDI_SEQ=m
 CONFIG_SND_OPL3_LIB_SEQ=m
@@ -3912,6 +4461,7 @@ 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
@@ -3937,6 +4487,7 @@ CONFIG_SND_SSCAPE=m
 CONFIG_SND_WAVEFRONT=m
 CONFIG_SND_MSND_PINNACLE=m
 CONFIG_SND_MSND_CLASSIC=m
+CONFIG_SND_TEA575X=m
 CONFIG_SND_PCI=y
 CONFIG_SND_AD1889=m
 CONFIG_SND_ALS300=m
@@ -3986,8 +4537,9 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FM801=m
 CONFIG_SND_FM801_TEA575X_BOOL=y
-CONFIG_SND_TEA575X=m
 CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_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
@@ -4002,10 +4554,11 @@ 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=y
 CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
 CONFIG_SND_HDSP=m
 CONFIG_SND_HDSPM=m
@@ -4033,6 +4586,7 @@ 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
@@ -4045,22 +4599,21 @@ 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
-CONFIG_HID_SUPPORT=y
-CONFIG_HID=m
-CONFIG_HIDRAW=y
 
 #
-# USB Input Devices
+# HID support
 #
-CONFIG_USB_HID=m
-CONFIG_HID_PID=y
-CONFIG_USB_HIDDEV=y
+CONFIG_HID=m
+CONFIG_HIDRAW=y
+CONFIG_UHID=m
+CONFIG_HID_GENERIC=m
 
 #
 # Special HID drivers
@@ -4069,6 +4622,8 @@ 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
@@ -4079,19 +4634,24 @@ 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_LOGIWII_FF=y
+CONFIG_LOGIWHEELS_FF=y
 CONFIG_HID_MAGICMOUSE=m
 CONFIG_HID_MICROSOFT=m
 CONFIG_HID_MONTEREY=m
@@ -4106,33 +4666,51 @@ CONFIG_HID_PICOLCD_FB=y
 CONFIG_HID_PICOLCD_BACKLIGHT=y
 CONFIG_HID_PICOLCD_LCD=y
 CONFIG_HID_PICOLCD_LEDS=y
-CONFIG_HID_QUANTA=m
+CONFIG_HID_PICOLCD_CIR=y
+CONFIG_HID_PRIMAX=m
+CONFIG_HID_PS3REMOTE=m
 CONFIG_HID_ROCCAT=m
-CONFIG_HID_ROCCAT_COMMON=m
-CONFIG_HID_ROCCAT_ARVO=m
-CONFIG_HID_ROCCAT_KONE=m
-CONFIG_HID_ROCCAT_KONEPLUS=m
-CONFIG_HID_ROCCAT_KOVAPLUS=m
-CONFIG_HID_ROCCAT_PYRA=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_WACOM_POWER_SUPPLY=y
+CONFIG_HID_WIIMOTE=m
+CONFIG_HID_WIIMOTE_EXT=y
 CONFIG_HID_ZEROPLUS=m
 CONFIG_ZEROPLUS_FF=y
 CONFIG_HID_ZYDACRON=m
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_ARCH_HAS_HCD=y
+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
@@ -4140,10 +4718,8 @@ CONFIG_USB=m
 #
 # Miscellaneous USB options
 #
-CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_DEVICE_CLASS is not set
+CONFIG_USB_DEFAULT_PERSIST=y
 CONFIG_USB_DYNAMIC_MINORS=y
-CONFIG_USB_SUSPEND=y
 # CONFIG_USB_OTG is not set
 CONFIG_USB_MON=m
 CONFIG_USB_WUSB=m
@@ -4159,12 +4735,15 @@ 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_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
@@ -4174,8 +4753,18 @@ 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
@@ -4195,6 +4784,7 @@ CONFIG_USB_TMC=m
 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
@@ -4207,21 +4797,22 @@ CONFIG_USB_STORAGE_ONETOUCH=m
 CONFIG_USB_STORAGE_KARMA=m
 CONFIG_USB_STORAGE_CYPRESS_ATACB=m
 CONFIG_USB_STORAGE_ENE_UB6250=m
-CONFIG_USB_UAS=m
-# CONFIG_USB_LIBUSUAL is not set
 
 #
 # USB Imaging devices
 #
 CONFIG_USB_MDC800=m
 CONFIG_USB_MICROTEK=m
+# CONFIG_USB_DWC3 is not set
+CONFIG_USB_CHIPIDEA=m
+CONFIG_USB_CHIPIDEA_UDC=y
+# CONFIG_USB_CHIPIDEA_DEBUG is not set
 
 #
 # USB port drivers
 #
 CONFIG_USB_USS720=m
 CONFIG_USB_SERIAL=m
-CONFIG_USB_EZUSB=y
 CONFIG_USB_SERIAL_GENERIC=y
 CONFIG_USB_SERIAL_AIRCABLE=m
 CONFIG_USB_SERIAL_ARK3116=m
@@ -4239,6 +4830,7 @@ 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
@@ -4259,6 +4851,7 @@ 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
@@ -4283,8 +4876,12 @@ 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
 
 #
@@ -4311,32 +4908,56 @@ 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_SELECTED=y
-# CONFIG_USB_GADGET_FUSB300 is not set
-# CONFIG_USB_GADGET_R8A66597 is not set
-# CONFIG_USB_GADGET_PXA_U2O is not set
-# CONFIG_USB_GADGET_M66592 is not set
-# CONFIG_USB_GADGET_AMD5536UDC is not set
-# CONFIG_USB_GADGET_CI13XXX_PCI is not set
-CONFIG_USB_GADGET_NET2280=y
+CONFIG_USB_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_GADGET_GOKU is not set
-# CONFIG_USB_GADGET_LANGWELL is not set
-# CONFIG_USB_GADGET_EG20T is not set
-# CONFIG_USB_GADGET_DUMMY_HCD is not set
-CONFIG_USB_GADGET_DUALSPEED=y
+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
@@ -4346,28 +4967,20 @@ CONFIG_USB_FUNCTIONFS=m
 CONFIG_USB_FUNCTIONFS_ETH=y
 CONFIG_USB_FUNCTIONFS_RNDIS=y
 CONFIG_USB_FUNCTIONFS_GENERIC=y
-CONFIG_USB_FILE_STORAGE=m
-# CONFIG_USB_FILE_STORAGE_TEST is not set
-# CONFIG_USB_MASS_STORAGE is not set
+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
-
-#
-# OTG and related infrastructure
-#
-CONFIG_USB_OTG_UTILS=y
-CONFIG_USB_GPIO_VBUS=m
-CONFIG_NOP_USB_XCEIV=m
-CONFIG_AB8500_USB=m
 CONFIG_UWB=m
 CONFIG_UWB_HWA=m
 CONFIG_UWB_WHCI=m
@@ -4375,7 +4988,7 @@ CONFIG_UWB_I1480U=m
 CONFIG_MMC=m
 # CONFIG_MMC_DEBUG is not set
 # CONFIG_MMC_UNSAFE_RESUME is not set
-CONFIG_MMC_CLKGATE=y
+# CONFIG_MMC_CLKGATE is not set
 
 #
 # MMC/SD/SDIO Card Drivers
@@ -4392,7 +5005,7 @@ CONFIG_SDIO_UART=m
 CONFIG_MMC_SDHCI=m
 CONFIG_MMC_SDHCI_PCI=m
 CONFIG_MMC_RICOH_MMC=y
-CONFIG_MMC_SDHCI_OF=m
+CONFIG_MMC_SDHCI_ACPI=m
 CONFIG_MMC_SDHCI_PLTFM=m
 CONFIG_MMC_WBSD=m
 CONFIG_MMC_TIFM_SD=m
@@ -4401,6 +5014,7 @@ 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
 
@@ -4416,6 +5030,7 @@ CONFIG_MSPRO_BLOCK=m
 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
 
@@ -4423,48 +5038,57 @@ CONFIG_LEDS_CLASS=y
 # LED drivers
 #
 CONFIG_LEDS_LM3530=m
-CONFIG_LEDS_ALIX2=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_TRIGGERS=y
+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_NFC_DEVICES=y
-CONFIG_PN544_NFC=m
+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
-
-#
-# Reporting subsystems
-#
+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_MCE=y
 CONFIG_EDAC_AMD76X=m
 CONFIG_EDAC_E7XXX=m
 CONFIG_EDAC_E752X=m
@@ -4483,6 +5107,7 @@ 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
 
@@ -4507,6 +5132,7 @@ 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
@@ -4522,6 +5148,16 @@ 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
@@ -4539,12 +5175,19 @@ 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
-CONFIG_RTC_DRV_AB8500=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
 
@@ -4553,9 +5196,13 @@ CONFIG_DMADEVICES=y
 #
 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
@@ -4574,34 +5221,35 @@ 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_DIGIEPCA is not set
-# CONFIG_RISCOM8 is not set
-# CONFIG_SPECIALIX is not set
-# CONFIG_COMPUTONE is not set
 CONFIG_ET131X=m
-# CONFIG_ET131X_DEBUG is not set
 CONFIG_SLICOSS=m
-CONFIG_VIDEO_GO7007=m
-CONFIG_VIDEO_GO7007_USB=m
-# CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set
-CONFIG_VIDEO_GO7007_OV7640=m
-CONFIG_VIDEO_GO7007_SAA7113=m
-CONFIG_VIDEO_GO7007_SAA7115=m
-CONFIG_VIDEO_GO7007_TW9903=m
-CONFIG_VIDEO_GO7007_UDA1342=m
-CONFIG_VIDEO_GO7007_SONY_TUNER=m
-CONFIG_VIDEO_GO7007_TW2804=m
-CONFIG_VIDEO_CX25821=m
-CONFIG_VIDEO_CX25821_ALSA=m
-CONFIG_VIDEO_TM6000=m
-CONFIG_VIDEO_TM6000_ALSA=m
-CONFIG_VIDEO_TM6000_DVB=m
-CONFIG_DVB_CXD2099=m
 CONFIG_USBIP_CORE=m
 CONFIG_USBIP_VHCI_HCD=m
 CONFIG_USBIP_HOST=m
@@ -4609,20 +5257,18 @@ CONFIG_USBIP_HOST=m
 CONFIG_W35UND=m
 CONFIG_PRISM2_USB=m
 CONFIG_ECHO=m
-CONFIG_BRCMUTIL=m
-CONFIG_BRCMSMAC=m
-# CONFIG_BRCMFMAC is not set
-# CONFIG_BRCMDBG is not set
 CONFIG_COMEDI=m
 # CONFIG_COMEDI_DEBUG is not set
-CONFIG_COMEDI_MISC_DRIVERS=m
+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=m
+CONFIG_COMEDI_ISA_DRIVERS=y
 CONFIG_COMEDI_ACL7225B=m
 CONFIG_COMEDI_PCL711=m
 CONFIG_COMEDI_PCL724=m
@@ -4634,9 +5280,13 @@ 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
@@ -4658,43 +5308,45 @@ 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=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_2016=m
 CONFIG_COMEDI_ADDI_APCI_2032=m
 CONFIG_COMEDI_ADDI_APCI_2200=m
-CONFIG_COMEDI_ADDI_APCI_3001=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_PCI7230=m
-CONFIG_COMEDI_ADL_PCI7296=m
-CONFIG_COMEDI_ADL_PCI7432=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=m
-CONFIG_COMEDI_AMPLC_PC236=m
-CONFIG_COMEDI_AMPLC_PC263=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
@@ -4705,7 +5357,6 @@ CONFIG_COMEDI_KE_COUNTER=m
 CONFIG_COMEDI_CB_PCIDAS64=m
 CONFIG_COMEDI_CB_PCIDAS=m
 CONFIG_COMEDI_CB_PCIDDA=m
-CONFIG_COMEDI_CB_PCIDIO=m
 # CONFIG_COMEDI_CB_PCIMDAS is not set
 CONFIG_COMEDI_CB_PCIMDDA=m
 CONFIG_COMEDI_ME4000=m
@@ -4714,13 +5365,16 @@ 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_PCMCIA_DRIVERS=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
@@ -4728,111 +5382,49 @@ 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=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_NI_COMMON=m
-CONFIG_COMEDI_MITE=m
-CONFIG_COMEDI_NI_TIO=m
-CONFIG_COMEDI_NI_LABPC=m
 CONFIG_COMEDI_8255=m
-CONFIG_COMEDI_DAS08=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_R8712_AP=y
-CONFIG_RTS_PSTOR=m
-# CONFIG_RTS_PSTOR_DEBUG is not set
+CONFIG_RTS5139=m
+# CONFIG_RTS5139_DEBUG is not set
 # CONFIG_TRANZPORT is not set
-CONFIG_POHMELFS=m
-# CONFIG_POHMELFS_DEBUG is not set
-CONFIG_POHMELFS_CRYPTO=y
 CONFIG_IDE_PHISON=m
 CONFIG_LINE6_USB=m
-# CONFIG_LINE6_USB_DEBUG is not set
-# CONFIG_LINE6_USB_DUMP_CTRL is not set
-# CONFIG_LINE6_USB_DUMP_MIDI is not set
-# CONFIG_LINE6_USB_DUMP_PCM is not set
-# CONFIG_LINE6_USB_RAW is not set
 # CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set
-CONFIG_DRM_VMWGFX=m
-CONFIG_DRM_NOUVEAU=m
-CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_NOUVEAU_DEBUG=y
-
-#
-# I2C encoder or helper chips
-#
-CONFIG_DRM_I2C_CH7006=m
-CONFIG_DRM_I2C_SIL164=m
 CONFIG_USB_SERIAL_QUATECH2=m
-CONFIG_USB_SERIAL_QUATECH_USB2=m
 CONFIG_VT6655=m
 CONFIG_VT6656=m
-CONFIG_HYPERV=m
-CONFIG_HYPERV_STORAGE=m
-CONFIG_HYPERV_BLOCK=m
-CONFIG_HYPERV_NET=m
-CONFIG_HYPERV_UTILS=m
-CONFIG_HYPERV_MOUSE=m
-# CONFIG_VME_BUS is not set
 CONFIG_DX_SEP=m
-# CONFIG_IIO is not set
-CONFIG_CS5535_GPIO=m
-CONFIG_XVMALLOC=y
+CONFIG_ZSMALLOC=y
 CONFIG_ZRAM=m
 # CONFIG_ZRAM_DEBUG is not set
-CONFIG_ZCACHE=m
 CONFIG_WLAGS49_H2=m
 CONFIG_WLAGS49_H25=m
 CONFIG_FB_SM7XX=m
-CONFIG_VIDEO_DT3155=m
-CONFIG_DT3155_CCIR=y
 CONFIG_CRYSTALHD=m
 CONFIG_FB_XGI=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_TTUSBIR=m
-CONFIG_LIRC_ZILOG=m
-CONFIG_EASYCAP=m
-CONFIG_EASYCAP_SND=y
-# CONFIG_EASYCAP_OSS is not set
-# CONFIG_EASYCAP_DEBUG is not set
-CONFIG_SOLO6X10=m
 CONFIG_ACPI_QUICKSTART=m
-CONFIG_MACH_NO_WESTBRIDGE=y
-CONFIG_ATH6K_LEGACY=m
-CONFIG_AR600x_SD31_XXX=y
-# CONFIG_AR600x_WB31_XXX is not set
-# CONFIG_AR600x_SD32_XXX is not set
-# CONFIG_AR600x_CUSTOM_XXX is not set
-CONFIG_ATH6KL_ENABLE_COEXISTENCE=y
-CONFIG_AR600x_DUAL_ANTENNA=y
-# CONFIG_AR600x_SINGLE_ANTENNA is not set
-# CONFIG_AR600x_BT_QCOM is not set
-# CONFIG_AR600x_BT_CSR is not set
-CONFIG_AR600x_BT_AR3001=y
-CONFIG_ATH6KL_HCI_BRIDGE=y
-CONFIG_ATH6KL_CONFIG_GPIO_BT_RESET=y
-CONFIG_AR600x_BT_RESET_PIN=22
-CONFIG_ATH6KL_HTC_RAW_INTERFACE=y
-CONFIG_ATH6KL_VIRTUAL_SCATTER_GATHER=y
-CONFIG_ATH6KL_SKIP_ABI_VERSION_CHECK=y
-# CONFIG_ATH6KL_DEBUG is not set
 CONFIG_USB_ENESTORAGE=m
 CONFIG_BCM_WIMAX=m
 CONFIG_FT1000=m
@@ -4860,22 +5452,62 @@ CONFIG_SPEAKUP_SYNTH_TXPRT=m
 CONFIG_SPEAKUP_SYNTH_DUMMY=m
 CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
 CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
-CONFIG_DRM_PSB=m
+CONFIG_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
 
 #
-# Altera FPGA firmware download module
-#
-CONFIG_ALTERA_STAPL=m
-CONFIG_INTEL_MEI=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
@@ -4900,7 +5532,6 @@ CONFIG_ASUS_NB_WMI=m
 CONFIG_EEEPC_WMI=m
 CONFIG_ACPI_WMI=m
 CONFIG_MSI_WMI=m
-CONFIG_ACPI_ASUS=m
 CONFIG_TOPSTAR_LAPTOP=m
 CONFIG_ACPI_TOSHIBA=m
 CONFIG_TOSHIBA_BT_RFKILL=m
@@ -4912,7 +5543,51 @@ 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
@@ -4920,24 +5595,27 @@ CONFIG_CLKSRC_I8253=y
 CONFIG_EDD=m
 # CONFIG_EDD_OFF is not set
 CONFIG_FIRMWARE_MEMMAP=y
-CONFIG_EFI_VARS=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_SIGMA=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_XATTR=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 # CONFIG_EXT4_DEBUG is not set
@@ -4959,6 +5637,7 @@ 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
@@ -4970,6 +5649,9 @@ CONFIG_OCFS2_FS_STATS=y
 # CONFIG_OCFS2_DEBUG_FS is not set
 CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
+# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
+# CONFIG_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
@@ -4978,7 +5660,7 @@ CONFIG_FSNOTIFY=y
 CONFIG_DNOTIFY=y
 CONFIG_INOTIFY_USER=y
 CONFIG_FANOTIFY=y
-CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y 
+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
 CONFIG_QUOTA=y
 CONFIG_QUOTA_NETLINK_INTERFACE=y
 # CONFIG_PRINT_QUOTA_WARNING is not set
@@ -5038,11 +5720,12 @@ CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TMPFS_XATTR=y
 CONFIG_HUGETLBFS=y
 CONFIG_HUGETLB_PAGE=y
-CONFIG_CONFIGFS_FS=m
+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
@@ -5061,17 +5744,17 @@ CONFIG_JFFS2_ZLIB=y
 CONFIG_JFFS2_RTIME=y
 # CONFIG_JFFS2_RUBIN is not set
 CONFIG_UBIFS_FS=m
-CONFIG_UBIFS_FS_XATTR=y
 # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
 CONFIG_UBIFS_FS_LZO=y
 CONFIG_UBIFS_FS_ZLIB=y
-# CONFIG_UBIFS_FS_DEBUG is not set
 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
@@ -5079,37 +5762,56 @@ 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_V3=y
+CONFIG_NFS_V2=m
+CONFIG_NFS_V3=m
 CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=y
-# CONFIG_NFS_V4_1 is not set
+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_USE_NEW_IDMAPPER is not set
+CONFIG_NFS_DEBUG=y
 CONFIG_NFSD=m
-# CONFIG_NFSD_DEPRECATED is not set
 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
@@ -5118,10 +5820,11 @@ CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_DEBUG2 is not set
+CONFIG_CIFS_ACL=y
+# CONFIG_CIFS_DEBUG is not set
 CONFIG_CIFS_DFS_UPCALL=y
+CONFIG_CIFS_SMB2=y
 CONFIG_CIFS_FSCACHE=y
-CONFIG_CIFS_ACL=y
 CONFIG_NCP_FS=m
 # CONFIG_NCPFS_PACKET_SIGNING is not set
 # CONFIG_NCPFS_IOCTL_LOCKING is not set
@@ -5138,29 +5841,6 @@ CONFIG_AFS_FSCACHE=y
 CONFIG_9P_FS=m
 CONFIG_9P_FSCACHE=y
 CONFIG_9P_FS_POSIX_ACL=y
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_MAC_PARTITION=y
-CONFIG_MSDOS_PARTITION=y
-CONFIG_BSD_DISKLABEL=y
-CONFIG_MINIX_SUBPARTITION=y
-CONFIG_SOLARIS_X86_PARTITION=y
-# CONFIG_UNIXWARE_DISKLABEL is not set
-CONFIG_LDM_PARTITION=y
-# CONFIG_LDM_DEBUG is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-CONFIG_KARMA_PARTITION=y
-CONFIG_EFI_PARTITION=y
-# CONFIG_SYSV68_PARTITION is not set
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
 CONFIG_NLS_CODEPAGE_437=m
@@ -5200,6 +5880,17 @@ 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
@@ -5215,6 +5906,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
 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
@@ -5227,6 +5919,8 @@ CONFIG_HARDLOCKUP_DETECTOR=y
 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
@@ -5237,6 +5931,7 @@ 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
@@ -5244,9 +5939,8 @@ CONFIG_TIMER_STATS=y
 CONFIG_DEBUG_MUTEXES=y
 # CONFIG_DEBUG_LOCK_ALLOC is not set
 # CONFIG_PROVE_LOCKING is not set
-# CONFIG_SPARSE_RCU_POINTER is not set
 # CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 CONFIG_STACKTRACE=y
 # CONFIG_DEBUG_STACK_USAGE is not set
@@ -5266,35 +5960,42 @@ CONFIG_DEBUG_MEMORY_INIT=y
 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_CPU_NOTIFIER_ERROR_INJECT=m
+# CONFIG_NOTIFIER_ERROR_INJECTION is not set
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_LATENCYTOP is not set
-CONFIG_SYSCTL_SYSCALL_CHECK=y
+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_FTRACE_NMI_ENTER=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_FTRACE_NMI_ENTER=y
 CONFIG_EVENT_TRACING=y
-CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
 CONFIG_CONTEXT_SWITCH_TRACER=y
 CONFIG_RING_BUFFER_ALLOW_SWAP=y
 CONFIG_TRACING=y
@@ -5306,19 +6007,27 @@ 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
@@ -5329,6 +6038,7 @@ CONFIG_ASYNC_RAID6_TEST=m
 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
@@ -5341,6 +6051,7 @@ CONFIG_DEBUG_RODATA=y
 # 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
@@ -5356,7 +6067,7 @@ 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_STRICT_USER_COPY_CHECKS is not set
+# CONFIG_DEBUG_NMI_SELFTEST is not set
 
 #
 # Security options
@@ -5375,11 +6086,19 @@ CONFIG_SECURITY_PATH=y
 # CONFIG_SECURITY_SELINUX is not set
 # CONFIG_SECURITY_SMACK is not set
 CONFIG_SECURITY_TOMOYO=y
+CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
+CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
+# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
+CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/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
@@ -5388,14 +6107,12 @@ CONFIG_ASYNC_MEMCPY=m
 CONFIG_ASYNC_XOR=m
 CONFIG_ASYNC_PQ=m
 CONFIG_ASYNC_RAID6_RECOV=m
-CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y
-CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y
 CONFIG_CRYPTO=y
 
 #
 # Crypto core or helper
 #
-CONFIG_CRYPTO_ALGAPI=m
+CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_ALGAPI2=y
 CONFIG_CRYPTO_AEAD=m
 CONFIG_CRYPTO_AEAD2=y
@@ -5409,6 +6126,7 @@ 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
@@ -5417,6 +6135,8 @@ 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
@@ -5439,6 +6159,7 @@ CONFIG_CRYPTO_XTS=m
 #
 # Hash modes
 #
+CONFIG_CRYPTO_CMAC=m
 CONFIG_CRYPTO_HMAC=m
 CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_VMAC=m
@@ -5448,6 +6169,8 @@ CONFIG_CRYPTO_VMAC=m
 #
 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
@@ -5465,13 +6188,15 @@ CONFIG_CRYPTO_WP512=m
 #
 # Ciphers
 #
-CONFIG_CRYPTO_AES=m
+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
@@ -5481,6 +6206,7 @@ CONFIG_CRYPTO_SALSA20=m
 CONFIG_CRYPTO_SALSA20_586=m
 CONFIG_CRYPTO_SEED=m
 CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_SERPENT_SSE2_586=m
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TWOFISH=m
 CONFIG_CRYPTO_TWOFISH_COMMON=m
@@ -5491,7 +6217,7 @@ CONFIG_CRYPTO_TWOFISH_586=m
 #
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_ZLIB=m
-CONFIG_CRYPTO_LZO=m
+CONFIG_CRYPTO_LZO=y
 
 #
 # Random Number Generation
@@ -5507,23 +6233,26 @@ 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_VHOST_NET=m
+CONFIG_KVM_DEVICE_ASSIGNMENT=y
 CONFIG_LGUEST=m
-CONFIG_VIRTIO=y
-CONFIG_VIRTIO_RING=y
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_BALLOON=m
 CONFIG_BINARY_PRINTF=y
 
 #
@@ -5531,14 +6260,26 @@ CONFIG_BINARY_PRINTF=y
 #
 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
@@ -5558,8 +6299,13 @@ 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_REED_SOLOMON_DEC16=y
+CONFIG_BCH=m
+CONFIG_BCH_CONST_PARAMS=y
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
 CONFIG_TEXTSEARCH_BM=m
@@ -5570,6 +6316,14 @@ 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
index fe5875138..36e06facd 100644
--- a/libre/linux-libre-lts/config.x86_64
+++ b/libre/linux-libre-lts/config.x86_64
@@ -1,48 +1,35 @@
 #
-# Automatically generated make config: don't edit
-# Linux/x86_64 3.0.54-1 Kernel Configuration
+# Automatically generated file; DO NOT EDIT.
+# Linux/x86 3.10.10-1 Kernel Configuration
 #
 CONFIG_64BIT=y
-# CONFIG_X86_32 is not set
 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_GENERIC_CMOS_UPDATE=y
-CONFIG_CLOCKSOURCE_WATCHDOG=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_MMU=y
-CONFIG_ZONE_DMA=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_GENERIC_ISA_DMA=y
-CONFIG_GENERIC_IOMAP=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
 CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_GPIO=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_ARCH_HAS_CPU_RELAX=y
-CONFIG_ARCH_HAS_DEFAULT_IDLE=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_HAVE_CPUMASK_OF_CPU_MAP=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ZONE_DMA32=y
-CONFIG_ARCH_POPULATES_NODE_MAP=y
 CONFIG_AUDIT_ARCH=y
 CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
@@ -50,16 +37,15 @@ 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_KTIME_SCALAR is not set
 CONFIG_ARCH_CPU_PROBE_RELEASE=y
+CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-CONFIG_HAVE_IRQ_WORK=y
 CONFIG_IRQ_WORK=y
+CONFIG_BUILDTIME_EXTABLE_SORT=y
 
 #
 # General setup
 #
-CONFIG_EXPERIMENTAL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 CONFIG_LOCALVERSION="-LIBRE-LTS"
@@ -80,44 +66,84 @@ CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
 CONFIG_POSIX_MQUEUE_SYSCTL=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_FHANDLE=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=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_HAVE_SPARSE_IRQ=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 is not set
+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_TREE_PREEMPT_RCU is not set
 # CONFIG_PREEMPT_RCU is not set
-# CONFIG_RCU_TRACE 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
@@ -126,19 +152,22 @@ CONFIG_CPUSETS=y
 CONFIG_PROC_PID_CPUSET=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
-CONFIG_CGROUP_MEM_RES_CTLR=y
-CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
-# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
+CONFIG_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=y
 CONFIG_PID_NS=y
 CONFIG_NET_NS=y
 CONFIG_SCHED_AUTOGROUP=y
@@ -155,12 +184,15 @@ 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=y
+# CONFIG_SYSCTL_SYSCALL is not set
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
-CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
@@ -173,6 +205,7 @@ 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
 
@@ -180,10 +213,8 @@ CONFIG_HAVE_PERF_EVENTS=y
 # Kernel Performance Events And Counters
 #
 CONFIG_PERF_EVENTS=y
-CONFIG_PERF_COUNTERS=y
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_PCI_QUIRKS=y
 CONFIG_SLUB_DEBUG=y
 # CONFIG_COMPAT_BRK is not set
 # CONFIG_SLAB is not set
@@ -193,26 +224,49 @@ 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
@@ -228,11 +282,36 @@ 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
 
 #
@@ -248,64 +327,39 @@ CONFIG_DEFAULT_DEADLINE=y
 CONFIG_DEFAULT_IOSCHED="deadline"
 CONFIG_PREEMPT_NOTIFIERS=y
 CONFIG_PADATA=y
-# CONFIG_INLINE_SPIN_TRYLOCK is not set
-# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK is not set
-# CONFIG_INLINE_SPIN_LOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-CONFIG_INLINE_SPIN_UNLOCK=y
-# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+CONFIG_ASN1=m
 CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_READ_TRYLOCK is not set
-# CONFIG_INLINE_READ_LOCK is not set
-# CONFIG_INLINE_READ_LOCK_BH is not set
-# CONFIG_INLINE_READ_LOCK_IRQ is not set
-# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
 CONFIG_INLINE_READ_UNLOCK=y
-# CONFIG_INLINE_READ_UNLOCK_BH is not set
 CONFIG_INLINE_READ_UNLOCK_IRQ=y
-# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_WRITE_TRYLOCK is not set
-# CONFIG_INLINE_WRITE_LOCK is not set
-# CONFIG_INLINE_WRITE_LOCK_BH is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
 CONFIG_INLINE_WRITE_UNLOCK=y
-# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
 CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
-# CONFIG_MUTEX_SPIN_ON_OWNER is not set
 CONFIG_FREEZER=y
 
 #
 # Processor type and features
 #
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+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_PARAVIRT_GUEST=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=128
+CONFIG_XEN_MAX_DOMAIN_MEMORY=500
 CONFIG_XEN_SAVE_RESTORE=y
 # CONFIG_XEN_DEBUG_FS is not set
-# CONFIG_XEN_DEBUG is not set
-CONFIG_KVM_CLOCK=y
 CONFIG_KVM_GUEST=y
-CONFIG_PARAVIRT=y
-# CONFIG_PARAVIRT_SPINLOCKS is not set
+CONFIG_PARAVIRT_TIME_ACCOUNTING=y
 CONFIG_PARAVIRT_CLOCK=y
-# CONFIG_PARAVIRT_DEBUG is not set
 CONFIG_NO_BOOTMEM=y
 # CONFIG_MEMTEST is not set
 # CONFIG_MK8 is not set
@@ -313,12 +367,8 @@ CONFIG_NO_BOOTMEM=y
 # CONFIG_MCORE2 is not set
 # CONFIG_MATOM is not set
 CONFIG_GENERIC_CPU=y
-CONFIG_X86_INTERNODE_CACHE_SHIFT=7
-CONFIG_X86_CMPXCHG=y
-CONFIG_CMPXCHG_LOCAL=y
+CONFIG_X86_INTERNODE_CACHE_SHIFT=6
 CONFIG_X86_L1_CACHE_SHIFT=6
-CONFIG_X86_XADD=y
-CONFIG_X86_WP_WORKS_OK=y
 CONFIG_X86_TSC=y
 CONFIG_X86_CMPXCHG64=y
 CONFIG_X86_CMOV=y
@@ -333,16 +383,12 @@ CONFIG_DMI=y
 CONFIG_GART_IOMMU=y
 CONFIG_CALGARY_IOMMU=y
 CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
-CONFIG_AMD_IOMMU=y
-# CONFIG_AMD_IOMMU_STATS is not set
 CONFIG_SWIOTLB=y
 CONFIG_IOMMU_HELPER=y
-CONFIG_IOMMU_API=y
 # CONFIG_MAXSMP is not set
 CONFIG_NR_CPUS=64
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
-# CONFIG_IRQ_TIME_ACCOUNTING is not set
 CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PREEMPT is not set
@@ -357,8 +403,8 @@ CONFIG_X86_MCE_THRESHOLD=y
 CONFIG_X86_THERMAL_VECTOR=y
 CONFIG_I8K=m
 CONFIG_MICROCODE=m
-CONFIG_MICROCODE_INTEL=y
-CONFIG_MICROCODE_AMD=y
+# 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
@@ -387,11 +433,17 @@ 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
@@ -405,9 +457,11 @@ CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_MEMORY_FAILURE=y
 CONFIG_HWPOISON_INJECT=m
 CONFIG_TRANSPARENT_HUGEPAGE=y
-# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
-CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
+CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
+# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
+CONFIG_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
@@ -418,7 +472,9 @@ 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
@@ -434,6 +490,8 @@ 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
@@ -451,25 +509,31 @@ 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_CAN_PM_TRACE=y
+CONFIG_PM_SLEEP_DEBUG=y
+CONFIG_PM_TRACE=y
 CONFIG_PM_TRACE_RTC=y
 CONFIG_ACPI=y
 CONFIG_ACPI_SLEEP=y
-CONFIG_ACPI_PROCFS=y
+# CONFIG_ACPI_PROCFS is not set
 # CONFIG_ACPI_PROCFS_POWER is not set
 CONFIG_ACPI_EC_DEBUGFS=m
-CONFIG_ACPI_PROC_EVENT=y
+# CONFIG_ACPI_PROC_EVENT is not set
 CONFIG_ACPI_AC=m
 CONFIG_ACPI_BATTERY=m
 CONFIG_ACPI_BUTTON=m
 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
@@ -477,18 +541,21 @@ 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=m
+CONFIG_ACPI_PCI_SLOT=y
 CONFIG_X86_PM_TIMER=y
-CONFIG_ACPI_CONTAINER=m
-CONFIG_ACPI_HOTPLUG_MEMORY=m
+CONFIG_ACPI_CONTAINER=y
+CONFIG_ACPI_HOTPLUG_MEMORY=y
 CONFIG_ACPI_SBS=m
-CONFIG_ACPI_HED=m
+CONFIG_ACPI_HED=y
 CONFIG_ACPI_CUSTOM_METHOD=m
+CONFIG_ACPI_BGRT=y
 CONFIG_ACPI_APEI=y
-CONFIG_ACPI_APEI_GHES=m
+CONFIG_ACPI_APEI_GHES=y
 CONFIG_ACPI_APEI_PCIEAER=y
+CONFIG_ACPI_APEI_MEMORY_FAILURE=y
 CONFIG_ACPI_APEI_EINJ=m
 CONFIG_ACPI_APEI_ERST_DEBUG=m
 CONFIG_SFI=y
@@ -498,6 +565,7 @@ CONFIG_SFI=y
 #
 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
@@ -513,9 +581,12 @@ 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
 
@@ -524,8 +595,10 @@ CONFIG_X86_P4_CLOCKMOD=m
 #
 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
 
 #
@@ -542,11 +615,6 @@ CONFIG_PCI_DIRECT=y
 CONFIG_PCI_MMCONFIG=y
 CONFIG_PCI_XEN=y
 CONFIG_PCI_DOMAINS=y
-# CONFIG_PCI_CNB20LE_QUIRK is not set
-CONFIG_DMAR=y
-# CONFIG_DMAR_DEFAULT_ON is not set
-CONFIG_DMAR_FLOPPY_WA=y
-# CONFIG_INTR_REMAP is not set
 CONFIG_PCIEPORTBUS=y
 CONFIG_HOTPLUG_PCI_PCIE=m
 CONFIG_PCIEAER=y
@@ -554,14 +622,21 @@ CONFIG_PCIEAER=y
 # 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
@@ -583,39 +658,46 @@ CONFIG_YENTA_TOSHIBA=y
 CONFIG_PD6729=m
 CONFIG_I82092=m
 CONFIG_PCCARD_NONSTATIC=y
-CONFIG_HOTPLUG_PCI=m
-CONFIG_HOTPLUG_PCI_FAKE=m
-CONFIG_HOTPLUG_PCI_ACPI=m
+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
-CONFIG_RAPIDIO_DEBUG=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
 
@@ -623,8 +705,11 @@ 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
@@ -643,6 +728,7 @@ 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
@@ -651,6 +737,7 @@ 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
@@ -660,8 +747,9 @@ 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=y
-CONFIG_INET_TCP_DIAG=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
@@ -698,6 +786,7 @@ 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
@@ -713,14 +802,18 @@ 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
@@ -737,6 +830,19 @@ 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
 
@@ -758,13 +864,17 @@ 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
@@ -776,9 +886,11 @@ 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
@@ -786,6 +898,7 @@ CONFIG_NETFILTER_XT_MATCH_CPU=m
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
 CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
 CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ECN=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
@@ -797,6 +910,7 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 CONFIG_NETFILTER_XT_MATCH_MAC=m
 CONFIG_NETFILTER_XT_MATCH_MARK=m
 CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
 CONFIG_NETFILTER_XT_MATCH_OSF=m
 CONFIG_NETFILTER_XT_MATCH_OWNER=m
 CONFIG_NETFILTER_XT_MATCH_POLICY=m
@@ -825,6 +939,7 @@ CONFIG_IP_SET_HASH_IPPORTIP=m
 CONFIG_IP_SET_HASH_IPPORTNET=m
 CONFIG_IP_SET_HASH_NET=m
 CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
 CONFIG_IP_SET_LIST_SET=m
 CONFIG_IP_VS=m
 # CONFIG_IP_VS_IPV6 is not set
@@ -856,6 +971,11 @@ CONFIG_IP_VS_SED=m
 CONFIG_IP_VS_NQ=m
 
 #
+# IPVS SH scheduler
+#
+CONFIG_IP_VS_SH_TAB_BITS=8
+
+#
 # IPVS application helper
 #
 CONFIG_IP_VS_FTP=m
@@ -867,33 +987,23 @@ CONFIG_IP_VS_PE_SIP=m
 #
 CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_NF_CONNTRACK_IPV4=m
-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-CONFIG_IP_NF_QUEUE=m
+# CONFIG_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_LOG=m
 CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_NF_NAT=m
-CONFIG_NF_NAT_NEEDED=y
+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_DCCP=m
 CONFIG_NF_NAT_PROTO_GRE=m
-CONFIG_NF_NAT_PROTO_UDPLITE=m
-CONFIG_NF_NAT_PROTO_SCTP=m
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NF_NAT_AMANDA=m
 CONFIG_NF_NAT_PPTP=m
 CONFIG_NF_NAT_H323=m
-CONFIG_NF_NAT_SIP=m
 CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_TARGET_CLUSTERIP=m
 CONFIG_IP_NF_TARGET_ECN=m
@@ -909,7 +1019,6 @@ CONFIG_IP_NF_ARP_MANGLE=m
 #
 CONFIG_NF_DEFRAG_IPV6=m
 CONFIG_NF_CONNTRACK_IPV6=m
-CONFIG_IP6_NF_QUEUE=m
 CONFIG_IP6_NF_IPTABLES=m
 CONFIG_IP6_NF_MATCH_AH=m
 CONFIG_IP6_NF_MATCH_EUI64=m
@@ -918,14 +1027,17 @@ CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_HL=m
 CONFIG_IP6_NF_MATCH_IPV6HEADER=m
 CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RPFILTER=m
 CONFIG_IP6_NF_MATCH_RT=m
 CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_TARGET_LOG=m
 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
@@ -952,7 +1064,7 @@ CONFIG_IP_DCCP=m
 CONFIG_INET_DCCP_DIAG=m
 
 #
-# DCCP CCIDs Configuration (EXPERIMENTAL)
+# DCCP CCIDs Configuration
 #
 # CONFIG_IP_DCCP_CCID2_DEBUG is not set
 CONFIG_IP_DCCP_CCID3=y
@@ -968,9 +1080,11 @@ CONFIG_IP_SCTP=m
 CONFIG_NET_SCTPPROBE=m
 # CONFIG_SCTP_DBG_MSG is not set
 # CONFIG_SCTP_DBG_OBJCNT is not set
-# CONFIG_SCTP_HMAC_NONE is not set
-CONFIG_SCTP_HMAC_SHA1=y
-# CONFIG_SCTP_HMAC_MD5 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
@@ -986,11 +1100,18 @@ 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_NET_DSA is not set
+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
@@ -1000,13 +1121,12 @@ CONFIG_ATALK=m
 CONFIG_DEV_APPLETALK=m
 CONFIG_IPDDP=m
 CONFIG_IPDDP_ENCAP=y
-CONFIG_IPDDP_DECAP=y
 # CONFIG_X25 is not set
 # CONFIG_LAPB is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
 CONFIG_PHONET=m
 CONFIG_IEEE802154=m
+CONFIG_IEEE802154_6LOWPAN=m
+CONFIG_MAC802154=m
 CONFIG_NET_SCHED=y
 
 #
@@ -1030,7 +1150,10 @@ 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
@@ -1064,11 +1187,20 @@ 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_HAVE_BPF_JIT=y
+CONFIG_NETPRIO_CGROUP=m
+CONFIG_BQL=y
 CONFIG_BPF_JIT=y
 
 #
@@ -1155,8 +1287,6 @@ CONFIG_VLSI_FIR=m
 CONFIG_VIA_FIR=m
 CONFIG_MCS_FIR=m
 CONFIG_BT=m
-CONFIG_BT_L2CAP=y
-CONFIG_BT_SCO=y
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BT_BNEP=m
@@ -1175,6 +1305,7 @@ 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
@@ -1198,14 +1329,13 @@ CONFIG_WEXT_PROC=y
 CONFIG_WEXT_SPY=y
 CONFIG_WEXT_PRIV=y
 CONFIG_CFG80211=m
-CONFIG_NL80211_TESTMODE=y
+# 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_WIRELESS_EXT_SYSFS=y
 CONFIG_LIB80211=m
 CONFIG_LIB80211_CRYPT_WEP=m
 CONFIG_LIB80211_CRYPT_CCMP=m
@@ -1220,6 +1350,7 @@ 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
@@ -1232,8 +1363,26 @@ CONFIG_NET_9P_VIRTIO=m
 CONFIG_CAIF=m
 # CONFIG_CAIF_DEBUG is not set
 CONFIG_CAIF_NETDEV=m
+CONFIG_CAIF_USB=m
 CONFIG_CEPH_LIB=m
 # CONFIG_CEPH_LIB_PRETTYDEBUG is not set
+# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
+CONFIG_NFC=m
+CONFIG_NFC_NCI=m
+CONFIG_NFC_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
@@ -1250,24 +1399,34 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 CONFIG_FIRMWARE_IN_KERNEL=y
 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_DEBUG is not set
 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_CHAR=m
 CONFIG_MTD_BLKDEVS=m
 CONFIG_MTD_BLOCK=m
 CONFIG_MTD_BLOCK_RO=m
@@ -1335,6 +1494,9 @@ CONFIG_MTD_PLATRAM=m
 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
@@ -1345,16 +1507,14 @@ CONFIG_MTD_BLOCK2MTD=m
 #
 # Disk-On-Chip Device Drivers
 #
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
+CONFIG_MTD_DOCG3=m
+CONFIG_BCH_CONST_M=14
+CONFIG_BCH_CONST_T=4
 CONFIG_MTD_NAND_ECC=m
 CONFIG_MTD_NAND_ECC_SMC=y
 CONFIG_MTD_NAND=m
-# CONFIG_MTD_NAND_VERIFY_WRITE is not set
 # CONFIG_MTD_NAND_ECC_BCH is not set
 CONFIG_MTD_SM_COMMON=m
-# CONFIG_MTD_NAND_MUSEUM_IDS is not set
 # CONFIG_MTD_NAND_DENALI is not set
 CONFIG_MTD_NAND_IDS=m
 CONFIG_MTD_NAND_RICOH=m
@@ -1362,6 +1522,7 @@ CONFIG_MTD_NAND_DISKONCHIP=m
 # CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
 CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
 # CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
+CONFIG_MTD_NAND_DOCG4=m
 # CONFIG_MTD_NAND_CAFE is not set
 CONFIG_MTD_NAND_NANDSIM=m
 # CONFIG_MTD_NAND_PLATFORM is not set
@@ -1375,14 +1536,14 @@ CONFIG_MTD_LPDDR=m
 CONFIG_MTD_QINFO_PROBE=m
 CONFIG_MTD_UBI=m
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
-CONFIG_MTD_UBI_BEB_RESERVE=1
+CONFIG_MTD_UBI_BEB_LIMIT=20
+# CONFIG_MTD_UBI_FASTMAP is not set
 # CONFIG_MTD_UBI_GLUEBI is not set
-# CONFIG_MTD_UBI_DEBUG is not set
 CONFIG_PARPORT=m
 CONFIG_PARPORT_PC=m
 CONFIG_PARPORT_SERIAL=m
-CONFIG_PARPORT_PC_FIFO=y
-CONFIG_PARPORT_PC_SUPERIO=y
+# 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
@@ -1398,6 +1559,7 @@ CONFIG_PNPACPI=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_FD=m
 # CONFIG_PARIDE is not set
+CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
 CONFIG_BLK_CPQ_DA=m
 CONFIG_BLK_CPQ_CISS_DA=m
 # CONFIG_CISS_SCSI_TAPE is not set
@@ -1405,13 +1567,14 @@ 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_UB is not set
 CONFIG_BLK_DEV_RAM=m
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=16384
@@ -1425,10 +1588,16 @@ 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_MISC_DEVICES=y
 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
@@ -1436,6 +1605,7 @@ 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
@@ -1450,9 +1620,15 @@ 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=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
 
@@ -1460,21 +1636,28 @@ 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
-CONFIG_IWMC3200TOP=m
-# CONFIG_IWMC3200TOP_DEBUG is not set
-# CONFIG_IWMC3200TOP_DEBUGFS is not set
 
 #
 # 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
 
@@ -1504,7 +1687,6 @@ CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
 # CONFIG_SCSI_SCAN_ASYNC is not set
-CONFIG_SCSI_WAIT_SCAN=m
 
 #
 # SCSI Transports
@@ -1550,10 +1732,11 @@ 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_ARCMSR_AER=y
 CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
@@ -1562,9 +1745,16 @@ 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
@@ -1595,6 +1785,7 @@ CONFIG_SCSI_IPR=m
 # 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
@@ -1605,6 +1796,8 @@ 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
@@ -1623,6 +1816,7 @@ 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
 
 #
@@ -1647,6 +1841,7 @@ 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
@@ -1723,13 +1918,24 @@ CONFIG_MD_RAID0=m
 CONFIG_MD_RAID1=m
 CONFIG_MD_RAID10=m
 CONFIG_MD_RAID456=m
-# CONFIG_MULTICORE_RAID456 is not set
 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
@@ -1740,13 +1946,15 @@ 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_LOOPBACK_TARGET_CDB_DEBUG is not set
 CONFIG_TCM_FC=m
+CONFIG_ISCSI_TARGET=m
+CONFIG_SBP_TARGET=m
 CONFIG_FUSION=y
 CONFIG_FUSION_SPI=m
 CONFIG_FUSION_FC=m
@@ -1760,7 +1968,6 @@ CONFIG_FUSION_CTL=m
 #
 CONFIG_FIREWIRE=m
 CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_OHCI_DEBUG=y
 CONFIG_FIREWIRE_SBP2=m
 CONFIG_FIREWIRE_NET=m
 CONFIG_FIREWIRE_NOSY=m
@@ -1777,46 +1984,134 @@ CONFIG_I2O_PROC=m
 CONFIG_MACINTOSH_DRIVERS=y
 CONFIG_MAC_EMUMOUSEBTN=y
 CONFIG_NETDEVICES=y
-CONFIG_IFB=m
-CONFIG_DUMMY=m
+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_EQUALIZER=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_NET_SB1000=m
+CONFIG_VIRTIO_NET=m
+CONFIG_SUNGEM_PHY=m
 # CONFIG_ARCNET is not set
-CONFIG_MII=m
-CONFIG_PHYLIB=m
+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
 
 #
-# MII PHY device drivers
+# CAIF transport drivers
 #
-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_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_NET_ETHERNET=y
-CONFIG_HAPPYMEAL=m
-CONFIG_SUNGEM=m
-CONFIG_CASSINI=m
+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_ETHOC=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
@@ -1829,114 +2124,217 @@ 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_IBM_NEW_EMAC_ZMII is not set
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
-# CONFIG_IBM_NEW_EMAC_TAH is not set
-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
-# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
-# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
-CONFIG_NET_PCI=y
-CONFIG_PCNET32=m
-CONFIG_AMD8111_ETH=m
-CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_KSZ884X_PCI=m
-CONFIG_B44=m
-CONFIG_B44_PCI_AUTOSELECT=y
-CONFIG_B44_PCICORE_AUTOSELECT=y
-CONFIG_B44_PCI=y
-CONFIG_FORCEDETH=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_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
-CONFIG_TLAN=m
-CONFIG_KS8842=m
-CONFIG_KS8851_MLL=m
-CONFIG_VIA_RHINE=m
-# CONFIG_VIA_RHINE_MMIO is not set
-CONFIG_SC92031=m
-CONFIG_NET_POCKET=y
-CONFIG_ATP=m
-CONFIG_DE600=m
-CONFIG_DE620=m
-CONFIG_ATL2=m
-CONFIG_NETDEV_1000=y
-CONFIG_ACENIC=m
-# CONFIG_ACENIC_OMIT_TIGON_I is not set
-CONFIG_DL2K=m
-CONFIG_E1000=m
-CONFIG_E1000E=m
-CONFIG_IP1000=m
-CONFIG_IGB=m
-CONFIG_IGB_DCA=y
-CONFIG_IGBVF=m
-CONFIG_NS83820=m
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_R8169=m
-CONFIG_SIS190=m
-CONFIG_SKGE=m
-# CONFIG_SKGE_DEBUG is not set
-CONFIG_SKY2=m
-# CONFIG_SKY2_DEBUG is not set
-CONFIG_VIA_VELOCITY=m
-CONFIG_TIGON3=m
-CONFIG_BNX2=m
-CONFIG_CNIC=m
-CONFIG_QLA3XXX=m
-CONFIG_ATL1=m
-CONFIG_ATL1E=m
-CONFIG_ATL1C=m
-CONFIG_JME=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_STMMAC_DUAL_MAC=y
-CONFIG_PCH_GBE=m
-CONFIG_NETDEV_10000=y
-CONFIG_MDIO=m
-CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T3=m
-CONFIG_CHELSIO_T4=m
-CONFIG_CHELSIO_T4VF=m
-CONFIG_ENIC=m
-CONFIG_IXGBE=m
-CONFIG_IXGBE_DCA=y
-CONFIG_IXGBEVF=m
-CONFIG_IXGB=m
-CONFIG_S2IO=m
-CONFIG_VXGE=m
-# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
-CONFIG_MYRI10GE=m
-CONFIG_MYRI10GE_DCA=y
-CONFIG_NETXEN_NIC=m
+CONFIG_NET_VENDOR_SUN=y
+CONFIG_HAPPYMEAL=m
+CONFIG_SUNGEM=m
+CONFIG_CASSINI=m
 CONFIG_NIU=m
-CONFIG_MLX4_EN=m
-CONFIG_MLX4_CORE=m
-CONFIG_MLX4_DEBUG=y
+CONFIG_NET_VENDOR_TEHUTI=y
 CONFIG_TEHUTI=m
-CONFIG_BNX2X=m
-CONFIG_QLCNIC=m
-CONFIG_QLGE=m
-CONFIG_BNA=m
-CONFIG_SFC=m
-CONFIG_SFC_MTD=y
-CONFIG_BE2NET=m
-# CONFIG_TR is not set
+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
@@ -1959,6 +2357,7 @@ 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
@@ -1966,24 +2365,39 @@ CONFIG_ATH5K=m
 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_RATE_CONTROL=y
+# 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
@@ -1998,48 +2412,45 @@ 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=m
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2100_DEBUG is not set
-CONFIG_IPW2200=m
-CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW2200_RADIOTAP=y
-CONFIG_IPW2200_PROMISCUOUS=y
-CONFIG_IPW2200_QOS=y
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_LIBIPW=m
-# CONFIG_LIBIPW_DEBUG is not set
-CONFIG_IWLAGN=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_DEVICE_SVTOOL=y
-CONFIG_IWL_P2P=y
-CONFIG_IWLWIFI_LEGACY=m
+# CONFIG_IWLWIFI_P2P is not set
+CONFIG_IWLEGACY=m
+CONFIG_IWL4965=m
+CONFIG_IWL3945=m
 
 #
-# Debugging Options
+# iwl3945 / iwl4965 Debugging Options
 #
-# CONFIG_IWLWIFI_LEGACY_DEBUG is not set
-# CONFIG_IWLWIFI_LEGACY_DEVICE_TRACING is not set
-CONFIG_IWL4965=m
-CONFIG_IWL3945=m
-CONFIG_IWM=m
-# CONFIG_IWM_DEBUG is not set
-CONFIG_IWM_TRACING=y
+# 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
@@ -2055,6 +2466,7 @@ 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
@@ -2064,14 +2476,17 @@ 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
@@ -2079,151 +2494,48 @@ 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_RTLWIFI=m
 CONFIG_RTL8192C_COMMON=m
+CONFIG_WL_TI=y
 CONFIG_WL1251=m
+# CONFIG_WL1251_SPI is not set
 CONFIG_WL1251_SDIO=m
-CONFIG_WL12XX_MENU=m
 CONFIG_WL12XX=m
-CONFIG_WL12XX_HT=y
-CONFIG_WL12XX_SDIO=m
-CONFIG_WL12XX_SDIO_TEST=m
-CONFIG_WL12XX_PLATFORM_DATA=y
+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_SDIO=m
-# CONFIG_WIMAX_IWMC3200_SDIO is not set
 CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
-
-#
-# USB Network Adapters
-#
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_USBNET=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_CDCETHER=m
-CONFIG_USB_NET_CDC_EEM=m
-CONFIG_USB_NET_CDC_NCM=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_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_NET_PCMCIA=y
-CONFIG_PCMCIA_3C589=m
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_PCMCIA_XIRC2PS=m
-CONFIG_PCMCIA_AXNET=m
 # CONFIG_WAN 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
 CONFIG_IEEE802154_DRIVERS=m
 CONFIG_IEEE802154_FAKEHARD=m
-
-#
-# CAIF transport drivers
-#
-CONFIG_CAIF_TTY=m
-CONFIG_CAIF_SPI_SLAVE=m
-CONFIG_CAIF_SPI_SYNC=y
+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_RIONET=m
-CONFIG_RIONET_TX_SIZE=128
-CONFIG_RIONET_RX_SIZE=128
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-CONFIG_PLIP=m
-CONFIG_PPP=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_MPPE=m
-CONFIG_PPPOE=m
-CONFIG_PPTP=m
-CONFIG_PPPOATM=m
-CONFIG_PPPOL2TP=m
-CONFIG_SLIP=m
-# CONFIG_SLIP_COMPRESSED is not set
-CONFIG_SLHC=m
-# CONFIG_SLIP_SMART is not set
-# CONFIG_SLIP_MODE_SLIP6 is not set
-# CONFIG_NET_FC is not set
-CONFIG_NETCONSOLE=m
-CONFIG_NETCONSOLE_DYNAMIC=y
-CONFIG_NETPOLL=y
-# CONFIG_NETPOLL_TRAP is not set
-CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_VIRTIO_NET=m
 CONFIG_VMXNET3=m
+CONFIG_HYPERV_NET=m
 CONFIG_ISDN=y
 CONFIG_ISDN_I4L=m
 CONFIG_ISDN_PPP=y
@@ -2354,7 +2666,6 @@ CONFIG_MISDN_NETJET=m
 CONFIG_MISDN_IPAC=m
 CONFIG_MISDN_ISAR=m
 CONFIG_ISDN_HDLC=m
-# CONFIG_PHONE is not set
 
 #
 # Input device support
@@ -2363,6 +2674,7 @@ CONFIG_INPUT=y
 CONFIG_INPUT_FF_MEMLESS=m
 CONFIG_INPUT_POLLDEV=m
 CONFIG_INPUT_SPARSEKMAP=m
+CONFIG_INPUT_MATRIXKMAP=m
 
 #
 # Userland interfaces
@@ -2388,8 +2700,10 @@ CONFIG_KEYBOARD_QT2160=m
 # 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
@@ -2403,6 +2717,7 @@ 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
@@ -2411,9 +2726,11 @@ CONFIG_MOUSE_PS2_SENTELIC=y
 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
@@ -2453,32 +2770,46 @@ 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
@@ -2491,33 +2822,47 @@ 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_AB8500_PONKEY=m
 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_REMOTE=m
 CONFIG_INPUT_ATI_REMOTE2=m
 CONFIG_INPUT_KEYSPAN_REMOTE=m
+CONFIG_INPUT_KXTJ9=m
+# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set
 CONFIG_INPUT_POWERMATE=m
 CONFIG_INPUT_YEALINK=m
 CONFIG_INPUT_CM109=m
+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
@@ -2535,6 +2880,7 @@ 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
@@ -2544,9 +2890,11 @@ 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
@@ -2574,35 +2922,46 @@ CONFIG_TRACE_SINK=m
 # 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_PNP=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_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_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
@@ -2616,6 +2975,7 @@ 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
@@ -2634,12 +2994,13 @@ 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_RAMOOPS=m
 CONFIG_I2C=m
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_COMPAT=y
@@ -2665,6 +3026,7 @@ 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
@@ -2682,6 +3044,10 @@ 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
@@ -2689,7 +3055,6 @@ CONFIG_I2C_PCA_PLATFORM=m
 # CONFIG_I2C_PXA_PCI is not set
 CONFIG_I2C_SIMTEC=m
 CONFIG_I2C_XILINX=m
-CONFIG_I2C_EG20T=m
 
 #
 # External I2C/SMBus adapter drivers
@@ -2699,6 +3064,7 @@ 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
@@ -2707,7 +3073,39 @@ CONFIG_I2C_TINY_USB=m
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_SPI 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
@@ -2721,6 +3119,7 @@ CONFIG_PPS=m
 CONFIG_PPS_CLIENT_KTIMER=m
 CONFIG_PPS_CLIENT_LDISC=m
 CONFIG_PPS_CLIENT_PARPORT=m
+CONFIG_PPS_CLIENT_GPIO=m
 
 #
 # PPS generators support
@@ -2731,23 +3130,29 @@ CONFIG_PPS_CLIENT_PARPORT=m
 #
 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_BASIC_MMIO_CORE=m
-CONFIG_GPIO_BASIC_MMIO=m
+# 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
@@ -2758,6 +3163,7 @@ CONFIG_GPIO_SCH=m
 # 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
@@ -2766,6 +3172,10 @@ CONFIG_GPIO_LANGWELL=y
 #
 # 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:
@@ -2775,21 +3185,33 @@ 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_BQ20Z75 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
@@ -2799,14 +3221,19 @@ CONFIG_HWMON_VID=m
 #
 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
@@ -2828,6 +3255,7 @@ 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
@@ -2835,6 +3263,7 @@ 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
@@ -2850,23 +3279,35 @@ 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
@@ -2878,10 +3319,15 @@ 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
@@ -2901,6 +3347,7 @@ CONFIG_SENSORS_W83L786NG=m
 CONFIG_SENSORS_W83627HF=m
 CONFIG_SENSORS_W83627EHF=m
 CONFIG_SENSORS_APPLESMC=m
+CONFIG_SENSORS_MC13783_ADC=m
 
 #
 # ACPI drivers
@@ -2909,13 +3356,24 @@ 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
@@ -2930,6 +3388,7 @@ 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
@@ -2944,6 +3403,7 @@ CONFIG_SBC8360_WDT=m
 CONFIG_CPU5_WDT=m
 CONFIG_SMSC_SCH311X_WDT=m
 CONFIG_SMSC37B787_WDT=m
+CONFIG_VIA_WDT=m
 CONFIG_W83627HF_WDT=m
 CONFIG_W83697HF_WDT=m
 CONFIG_W83697UG_WDT=m
@@ -2981,67 +3441,121 @@ 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
-CONFIG_MFD_SUPPORT=y
+
+#
+# Multifunction device drivers
+#
 CONFIG_MFD_CORE=y
-CONFIG_MFD_SM501=m
-CONFIG_MFD_SM501_GPIO=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_UCB1400_CORE=m
-# CONFIG_TPS6105X is not set
-CONFIG_TPS65010=m
-CONFIG_TPS6507X=m
-# CONFIG_MFD_TMIO is not set
-CONFIG_MFD_WM8400=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_AB8500_CORE=y
-# CONFIG_AB8500_DEBUG is not set
-CONFIG_MFD_CS5535=m
+# 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_LPC_SCH=m
-CONFIG_MFD_RDC321X=m
-# CONFIG_MFD_JANZ_CMODIO is not set
+# CONFIG_MFD_TMIO is not set
 CONFIG_MFD_VX855=m
-CONFIG_MFD_WL1273_CORE=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_COMMON=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_VIDEO_MEDIA=m
+CONFIG_DVB_NET=y
+CONFIG_TTPCI_EEPROM=m
+CONFIG_DVB_MAX_ADAPTERS=8
+# CONFIG_DVB_DYNAMIC_MINORS is not set
 
 #
-# Multimedia drivers
+# Media drivers
 #
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
 CONFIG_RC_CORE=m
-CONFIG_LIRC=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_LIRC_CODEC=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
@@ -3051,189 +3565,15 @@ 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_MEDIA_ATTACH=y
-CONFIG_MEDIA_TUNER=m
-# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-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_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_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_TDA18212=m
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEOBUF_DMA_CONTIG=m
-CONFIG_VIDEOBUF_DVB=m
-CONFIG_VIDEO_BTCX=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_VIDEO_TUNER=m
-CONFIG_V4L2_MEM2MEM_DEV=m
-CONFIG_VIDEOBUF2_CORE=m
-CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_VMALLOC=m
-CONFIG_VIDEO_CAPTURE_DRIVERS=y
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
-CONFIG_VIDEO_IR_I2C=m
-
-#
-# Encoders, decoders, sensors and other helper chips
-#
-
-#
-# 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_TLV320AIC23B=m
-CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_WM8739=m
-CONFIG_VIDEO_VP27SMPX=m
-
-#
-# RDS decoders
-#
-CONFIG_VIDEO_SAA6588=m
+CONFIG_IR_GPIO_CIR=m
+CONFIG_MEDIA_USB_SUPPORT=y
 
 #
-# Video decoders
-#
-CONFIG_VIDEO_ADV7180=m
-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_SAA7191=m
-CONFIG_VIDEO_TVP514X=m
-CONFIG_VIDEO_TVP5150=m
-CONFIG_VIDEO_TVP7002=m
-CONFIG_VIDEO_VPX3220=m
-
-#
-# Video and audio decoders
-#
-CONFIG_VIDEO_SAA717X=m
-CONFIG_VIDEO_CX25840=m
-
-#
-# MPEG video encoders
-#
-CONFIG_VIDEO_CX2341X=m
-
-#
-# Video encoders
-#
-CONFIG_VIDEO_SAA7127=m
-CONFIG_VIDEO_SAA7185=m
-CONFIG_VIDEO_ADV7170=m
-CONFIG_VIDEO_ADV7175=m
-CONFIG_VIDEO_ADV7343=m
-CONFIG_VIDEO_AK881X=m
-
-#
-# Camera sensor devices
-#
-CONFIG_VIDEO_OV7670=m
-CONFIG_VIDEO_MT9V011=m
-CONFIG_VIDEO_MT9V032=m
-CONFIG_VIDEO_TCM825X=m
-
-#
-# Video improvement chips
-#
-CONFIG_VIDEO_UPD64031A=m
-CONFIG_VIDEO_UPD64083=m
-
+# Webcam devices
 #
-# Miscelaneous helper chips
-#
-CONFIG_VIDEO_THS7303=m
-CONFIG_VIDEO_M52790=m
-CONFIG_VIDEO_VIVI=m
-CONFIG_VIDEO_BT848=m
-CONFIG_VIDEO_BT848_DVB=y
-CONFIG_VIDEO_BWQCAM=m
-CONFIG_VIDEO_CQCAM=m
-CONFIG_VIDEO_W9966=m
-CONFIG_VIDEO_CPIA2=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN_AVS6EYES=m
-CONFIG_VIDEO_MEYE=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_RC=y
-CONFIG_VIDEO_SAA7134_DVB=m
-CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_TIMBERDALE=m
-CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_ALSA=m
-CONFIG_VIDEO_CX88_BLACKBIRD=m
-CONFIG_VIDEO_CX88_DVB=m
-CONFIG_VIDEO_CX88_MPEG=m
-CONFIG_VIDEO_CX88_VP3054=m
-CONFIG_VIDEO_CX23885=m
-CONFIG_MEDIA_ALTERA_CI=m
-CONFIG_VIDEO_AU0828=m
-CONFIG_VIDEO_IVTV=m
-CONFIG_VIDEO_FB_IVTV=m
-CONFIG_VIDEO_CX18=m
-CONFIG_VIDEO_CX18_ALSA=m
-CONFIG_VIDEO_SAA7164=m
-CONFIG_VIDEO_CAFE_CCIC=m
-CONFIG_VIDEO_SR030PC30=m
-CONFIG_VIDEO_VIA_CAMERA=m
-CONFIG_VIDEO_NOON010PC30=m
-CONFIG_VIDEO_M5MOLS=m
-CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_IMX074=m
-CONFIG_SOC_CAMERA_MT9M001=m
-CONFIG_SOC_CAMERA_MT9M111=m
-CONFIG_SOC_CAMERA_MT9T031=m
-CONFIG_SOC_CAMERA_MT9T112=m
-CONFIG_SOC_CAMERA_MT9V022=m
-CONFIG_SOC_CAMERA_RJ54N1=m
-CONFIG_SOC_CAMERA_TW9910=m
-CONFIG_SOC_CAMERA_PLATFORM=m
-CONFIG_SOC_CAMERA_OV2640=m
-CONFIG_SOC_CAMERA_OV6650=m
-CONFIG_SOC_CAMERA_OV772X=m
-CONFIG_SOC_CAMERA_OV9640=m
-CONFIG_SOC_CAMERA_OV9740=m
-CONFIG_V4L_USB_DRIVERS=y
 CONFIG_USB_VIDEO_CLASS=m
 CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
 CONFIG_USB_GSPCA=m
@@ -3246,6 +3586,7 @@ CONFIG_USB_GSPCA_CPIA1=m
 CONFIG_USB_GSPCA_ETOMS=m
 CONFIG_USB_GSPCA_FINEPIX=m
 CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_JL2005BCD=m
 CONFIG_USB_GSPCA_KINECT=m
 CONFIG_USB_GSPCA_KONICA=m
 CONFIG_USB_GSPCA_MARS=m
@@ -3257,6 +3598,7 @@ CONFIG_USB_GSPCA_OV534_9=m
 CONFIG_USB_GSPCA_PAC207=m
 CONFIG_USB_GSPCA_PAC7302=m
 CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SE401=m
 CONFIG_USB_GSPCA_SN9C2028=m
 CONFIG_USB_GSPCA_SN9C20X=m
 CONFIG_USB_GSPCA_SONIXB=m
@@ -3275,71 +3617,49 @@ 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_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_EM28XX=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_TLG2300=m
-CONFIG_VIDEO_CX231XX=m
-CONFIG_VIDEO_CX231XX_RC=y
-CONFIG_VIDEO_CX231XX_ALSA=m
-CONFIG_VIDEO_CX231XX_DVB=m
-CONFIG_VIDEO_USBVISION=m
-CONFIG_USB_ET61X251=m
-CONFIG_USB_SN9C102=m
 CONFIG_USB_PWC=m
 # CONFIG_USB_PWC_DEBUG is not set
 CONFIG_USB_PWC_INPUT_EVDEV=y
+CONFIG_VIDEO_CPIA2=m
 CONFIG_USB_ZR364XX=m
 CONFIG_USB_STKWEBCAM=m
 CONFIG_USB_S2255=m
-CONFIG_V4L_MEM2MEM_DRIVERS=y
-CONFIG_VIDEO_MEM2MEM_TESTDEV=m
-CONFIG_RADIO_ADAPTERS=y
-CONFIG_RADIO_MAXIRADIO=m
-CONFIG_I2C_SI4713=m
-CONFIG_RADIO_SI4713=m
-CONFIG_USB_DSBR=m
-CONFIG_RADIO_SI470X=y
-CONFIG_USB_SI470X=m
-CONFIG_I2C_SI470X=m
-CONFIG_USB_MR800=m
-CONFIG_RADIO_TEA5764=m
-CONFIG_RADIO_SAA7706H=m
-CONFIG_RADIO_TEF6862=m
-CONFIG_RADIO_WL1273=m
+CONFIG_USB_SN9C102=m
 
 #
-# Texas Instruments WL128x FM driver (ST based)
+# Analog TV USB devices
 #
-CONFIG_RADIO_WL128X=m
-CONFIG_DVB_MAX_ADAPTERS=8
-# CONFIG_DVB_DYNAMIC_MINORS is not set
-CONFIG_DVB_CAPTURE_DRIVERS=y
+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
 
 #
-# Supported SAA7146 based PCI Adapters
+# Analog/digital TV USB devices
 #
-CONFIG_TTPCI_EEPROM=m
-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_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
 
 #
-# Supported USB Adapters
+# Digital TV USB devices
 #
 CONFIG_DVB_USB=m
 # CONFIG_DVB_USB_DEBUG is not set
@@ -3351,8 +3671,6 @@ CONFIG_DVB_USB_DIB0700=m
 CONFIG_DVB_USB_UMT_010=m
 CONFIG_DVB_USB_CXUSB=m
 CONFIG_DVB_USB_M920X=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_AU6610=m
 CONFIG_DVB_USB_DIGITV=m
 CONFIG_DVB_USB_VP7045=m
 CONFIG_DVB_USB_VP702X=m
@@ -3363,77 +3681,278 @@ 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_ANYSEE=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_FRIIO=m
 CONFIG_DVB_USB_EC168=m
-CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_IT913X=m
 CONFIG_DVB_USB_LME2510=m
-CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_MXL111SF=m
+CONFIG_DVB_USB_RTL28XXU=m
 CONFIG_DVB_TTUSB_BUDGET=m
 CONFIG_DVB_TTUSB_DEC=m
-CONFIG_SMS_SIANO_MDTV=m
+CONFIG_SMS_USB_DRV=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
 
 #
-# Siano module components
+# Webcam, TV (analog/digital) USB devices
 #
-CONFIG_SMS_USB_DRV=m
-CONFIG_SMS_SDIO_DRV=m
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=m
+CONFIG_MEDIA_PCI_SUPPORT=y
 
 #
-# Supported FlexCopII (B2C2) Adapters
+# Media capture support
 #
-CONFIG_DVB_B2C2_FLEXCOP=m
-CONFIG_DVB_B2C2_FLEXCOP_PCI=m
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set
+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
 
 #
-# Supported BT878 Adapters
+# 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
 
 #
-# Supported Pluto2 Adapters
+# 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 SDMC DM1105 Adapters
+# Supported MMC/SDIO adapters
 #
-CONFIG_DVB_DM1105=m
+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
 
 #
-# Supported Earthsoft PT1 Adapters
+# common driver options
 #
-CONFIG_DVB_PT1=m
+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
 
 #
-# Supported Mantis Adapters
+# Media ancillary drivers (tuners, sensors, i2c, frontends)
 #
-CONFIG_MANTIS_CORE=m
-CONFIG_DVB_MANTIS=m
-CONFIG_DVB_HOPPER=m
+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
 
 #
-# Supported nGene Adapters
+# RDS decoders
 #
-CONFIG_DVB_NGENE=m
+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
 
 #
-# Supported DVB Frontends
+# Miscelaneous helper chips
+#
+CONFIG_VIDEO_M52790=m
+
+#
+# Sensors used on soc_camera driver
 #
-# CONFIG_DVB_FE_CUSTOMISE is not set
+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
@@ -3444,6 +3963,12 @@ CONFIG_DVB_STV090x=m
 CONFIG_DVB_STV6110x=m
 
 #
+# Multistandard (cable + terrestrial) frontends
+#
+CONFIG_DVB_DRXK=m
+CONFIG_DVB_TDA18271C2DD=m
+
+#
 # DVB-S (satellite) frontends
 #
 CONFIG_DVB_CX24110=m
@@ -3467,8 +3992,10 @@ 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
@@ -3492,6 +4019,8 @@ 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
@@ -3510,8 +4039,11 @@ 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
 
 #
@@ -3532,13 +4064,18 @@ 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
@@ -3557,12 +4094,25 @@ 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_KMS=y
+# 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
@@ -3570,9 +4120,19 @@ CONFIG_DRM_MGA=m
 CONFIG_DRM_SIS=m
 CONFIG_DRM_VIA=m
 CONFIG_DRM_SAVAGE=m
-CONFIG_STUB_POULSBO=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
@@ -3586,7 +4146,6 @@ CONFIG_FB_SYS_COPYAREA=m
 CONFIG_FB_SYS_IMAGEBLIT=m
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 CONFIG_FB_SYS_FOPS=m
-# CONFIG_FB_WMT_GE_ROPS is not set
 CONFIG_FB_DEFERRED_IO=y
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
@@ -3612,6 +4171,7 @@ CONFIG_FB_EFI=y
 # 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
@@ -3627,7 +4187,7 @@ CONFIG_FB_VIA_X_COMPATIBILITY=y
 # CONFIG_FB_KYRO is not set
 # CONFIG_FB_3DFX is not set
 CONFIG_FB_VOODOO1=m
-# CONFIG_FB_VT8623 is not set
+CONFIG_FB_VT8623=m
 # CONFIG_FB_TRIDENT is not set
 # CONFIG_FB_ARK is not set
 # CONFIG_FB_PM3 is not set
@@ -3635,32 +4195,45 @@ CONFIG_FB_VOODOO1=m
 # 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_PROGEAR=m
+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
-
-#
-# Display device support
-#
-CONFIG_DISPLAY_SUPPORT=m
-
-#
-# Display hardware drivers
-#
+# 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
@@ -3682,6 +4255,7 @@ CONFIG_FONT_8x16=y
 # 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
@@ -3707,6 +4281,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SND_VERBOSE_PRINTK is not set
 # CONFIG_SND_DEBUG is not set
 CONFIG_SND_VMASTER=y
+CONFIG_SND_KCTL_JACK=y
 CONFIG_SND_DMA_SGBUF=y
 CONFIG_SND_RAWMIDI_SEQ=m
 CONFIG_SND_OPL3_LIB_SEQ=m
@@ -3731,6 +4306,7 @@ CONFIG_SND_AC97_POWER_SAVE=y
 CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
 CONFIG_SND_SB_COMMON=m
 CONFIG_SND_SB16_DSP=m
+CONFIG_SND_TEA575X=m
 CONFIG_SND_PCI=y
 CONFIG_SND_AD1889=m
 CONFIG_SND_ALS300=m
@@ -3780,8 +4356,9 @@ CONFIG_SND_ES1968_INPUT=y
 CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FM801=m
 CONFIG_SND_FM801_TEA575X_BOOL=y
-CONFIG_SND_TEA575X=m
 CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_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
@@ -3796,10 +4373,11 @@ 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=y
 CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
 CONFIG_SND_HDSP=m
 CONFIG_SND_HDSPM=m
@@ -3826,6 +4404,7 @@ 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
@@ -3838,22 +4417,21 @@ 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
-CONFIG_HID_SUPPORT=y
-CONFIG_HID=m
-CONFIG_HIDRAW=y
 
 #
-# USB Input Devices
+# HID support
 #
-CONFIG_USB_HID=m
-CONFIG_HID_PID=y
-CONFIG_USB_HIDDEV=y
+CONFIG_HID=m
+CONFIG_HIDRAW=y
+CONFIG_UHID=m
+CONFIG_HID_GENERIC=m
 
 #
 # Special HID drivers
@@ -3862,6 +4440,8 @@ 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
@@ -3872,19 +4452,24 @@ 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_LOGIWII_FF=y
+CONFIG_LOGIWHEELS_FF=y
 CONFIG_HID_MAGICMOUSE=m
 CONFIG_HID_MICROSOFT=m
 CONFIG_HID_MONTEREY=m
@@ -3899,33 +4484,51 @@ CONFIG_HID_PICOLCD_FB=y
 CONFIG_HID_PICOLCD_BACKLIGHT=y
 CONFIG_HID_PICOLCD_LCD=y
 CONFIG_HID_PICOLCD_LEDS=y
-CONFIG_HID_QUANTA=m
+CONFIG_HID_PICOLCD_CIR=y
+CONFIG_HID_PRIMAX=m
+CONFIG_HID_PS3REMOTE=m
 CONFIG_HID_ROCCAT=m
-CONFIG_HID_ROCCAT_COMMON=m
-CONFIG_HID_ROCCAT_ARVO=m
-CONFIG_HID_ROCCAT_KONE=m
-CONFIG_HID_ROCCAT_KONEPLUS=m
-CONFIG_HID_ROCCAT_KOVAPLUS=m
-CONFIG_HID_ROCCAT_PYRA=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_WACOM_POWER_SUPPLY=y
+CONFIG_HID_WIIMOTE=m
+CONFIG_HID_WIIMOTE_EXT=y
 CONFIG_HID_ZEROPLUS=m
 CONFIG_ZEROPLUS_FF=y
 CONFIG_HID_ZYDACRON=m
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_ARCH_HAS_HCD=y
+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
@@ -3933,10 +4536,8 @@ CONFIG_USB=m
 #
 # Miscellaneous USB options
 #
-CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_DEVICE_CLASS is not set
+CONFIG_USB_DEFAULT_PERSIST=y
 CONFIG_USB_DYNAMIC_MINORS=y
-CONFIG_USB_SUSPEND=y
 # CONFIG_USB_OTG is not set
 CONFIG_USB_MON=m
 CONFIG_USB_WUSB=m
@@ -3952,12 +4553,15 @@ 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_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
@@ -3967,8 +4571,18 @@ 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
@@ -3988,6 +4602,7 @@ CONFIG_USB_TMC=m
 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
@@ -4000,21 +4615,22 @@ CONFIG_USB_STORAGE_ONETOUCH=m
 CONFIG_USB_STORAGE_KARMA=m
 CONFIG_USB_STORAGE_CYPRESS_ATACB=m
 CONFIG_USB_STORAGE_ENE_UB6250=m
-CONFIG_USB_UAS=m
-# CONFIG_USB_LIBUSUAL is not set
 
 #
 # USB Imaging devices
 #
 CONFIG_USB_MDC800=m
 CONFIG_USB_MICROTEK=m
+# CONFIG_USB_DWC3 is not set
+CONFIG_USB_CHIPIDEA=m
+CONFIG_USB_CHIPIDEA_UDC=y
+# CONFIG_USB_CHIPIDEA_DEBUG is not set
 
 #
 # USB port drivers
 #
 CONFIG_USB_USS720=m
 CONFIG_USB_SERIAL=m
-CONFIG_USB_EZUSB=y
 CONFIG_USB_SERIAL_GENERIC=y
 CONFIG_USB_SERIAL_AIRCABLE=m
 CONFIG_USB_SERIAL_ARK3116=m
@@ -4032,6 +4648,7 @@ 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
@@ -4052,6 +4669,7 @@ 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
@@ -4076,8 +4694,12 @@ 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
 
 #
@@ -4104,32 +4726,55 @@ 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_SELECTED=y
-# CONFIG_USB_GADGET_FUSB300 is not set
-# CONFIG_USB_GADGET_R8A66597 is not set
-# CONFIG_USB_GADGET_PXA_U2O is not set
-# CONFIG_USB_GADGET_M66592 is not set
-# CONFIG_USB_GADGET_AMD5536UDC is not set
-# CONFIG_USB_GADGET_CI13XXX_PCI is not set
-CONFIG_USB_GADGET_NET2280=y
+CONFIG_USB_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_GADGET_GOKU is not set
-# CONFIG_USB_GADGET_LANGWELL is not set
-# CONFIG_USB_GADGET_EG20T is not set
-# CONFIG_USB_GADGET_DUMMY_HCD is not set
-CONFIG_USB_GADGET_DUALSPEED=y
+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
@@ -4139,28 +4784,20 @@ CONFIG_USB_FUNCTIONFS=m
 CONFIG_USB_FUNCTIONFS_ETH=y
 CONFIG_USB_FUNCTIONFS_RNDIS=y
 CONFIG_USB_FUNCTIONFS_GENERIC=y
-CONFIG_USB_FILE_STORAGE=m
-# CONFIG_USB_FILE_STORAGE_TEST is not set
-# CONFIG_USB_MASS_STORAGE is not set
+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
-
-#
-# OTG and related infrastructure
-#
-CONFIG_USB_OTG_UTILS=y
-CONFIG_USB_GPIO_VBUS=m
-CONFIG_NOP_USB_XCEIV=m
-CONFIG_AB8500_USB=m
 CONFIG_UWB=m
 CONFIG_UWB_HWA=m
 CONFIG_UWB_WHCI=m
@@ -4168,7 +4805,7 @@ CONFIG_UWB_I1480U=m
 CONFIG_MMC=m
 # CONFIG_MMC_DEBUG is not set
 # CONFIG_MMC_UNSAFE_RESUME is not set
-CONFIG_MMC_CLKGATE=y
+# CONFIG_MMC_CLKGATE is not set
 
 #
 # MMC/SD/SDIO Card Drivers
@@ -4185,14 +4822,17 @@ CONFIG_SDIO_UART=m
 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
 
@@ -4208,6 +4848,7 @@ CONFIG_MSPRO_BLOCK=m
 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
 
@@ -4215,48 +4856,56 @@ CONFIG_LEDS_CLASS=y
 # LED drivers
 #
 CONFIG_LEDS_LM3530=m
-CONFIG_LEDS_ALIX2=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_TRIGGERS=y
+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_NFC_DEVICES=y
-CONFIG_PN544_NFC=m
+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
-
-#
-# Reporting subsystems
-#
+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_MCE=y
 CONFIG_EDAC_AMD64=m
 # CONFIG_EDAC_AMD64_ERROR_INJECTION is not set
 CONFIG_EDAC_E752X=m
@@ -4269,9 +4918,11 @@ 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
 
@@ -4296,6 +4947,7 @@ 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
@@ -4311,6 +4963,16 @@ 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
@@ -4328,12 +4990,18 @@ 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
-CONFIG_RTC_DRV_AB8500=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
 
@@ -4342,9 +5010,12 @@ CONFIG_DMADEVICES=y
 #
 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
@@ -4363,50 +5034,58 @@ 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=m
+CONFIG_XEN_XENBUS_FRONTEND=y
 CONFIG_XEN_GNTDEV=m
 CONFIG_XEN_GRANT_DEV_ALLOC=m
-CONFIG_XEN_PLATFORM_PCI=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_DIGIEPCA is not set
-# CONFIG_RISCOM8 is not set
-# CONFIG_SPECIALIX is not set
-# CONFIG_COMPUTONE is not set
 CONFIG_ET131X=m
-# CONFIG_ET131X_DEBUG is not set
 CONFIG_SLICOSS=m
-CONFIG_VIDEO_GO7007=m
-CONFIG_VIDEO_GO7007_USB=m
-# CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set
-CONFIG_VIDEO_GO7007_OV7640=m
-CONFIG_VIDEO_GO7007_SAA7113=m
-CONFIG_VIDEO_GO7007_SAA7115=m
-CONFIG_VIDEO_GO7007_TW9903=m
-CONFIG_VIDEO_GO7007_UDA1342=m
-CONFIG_VIDEO_GO7007_SONY_TUNER=m
-CONFIG_VIDEO_GO7007_TW2804=m
-CONFIG_VIDEO_CX25821=m
-CONFIG_VIDEO_CX25821_ALSA=m
-CONFIG_VIDEO_TM6000=m
-CONFIG_VIDEO_TM6000_ALSA=m
-CONFIG_VIDEO_TM6000_DVB=m
-CONFIG_DVB_CXD2099=m
 CONFIG_USBIP_CORE=m
 CONFIG_USBIP_VHCI_HCD=m
 CONFIG_USBIP_HOST=m
@@ -4414,50 +5093,49 @@ CONFIG_USBIP_HOST=m
 CONFIG_W35UND=m
 CONFIG_PRISM2_USB=m
 CONFIG_ECHO=m
-CONFIG_BRCMUTIL=m
-CONFIG_BRCMSMAC=m
-# CONFIG_BRCMFMAC is not set
-# CONFIG_BRCMDBG is not set
 CONFIG_COMEDI=m
 # CONFIG_COMEDI_DEBUG is not set
-CONFIG_COMEDI_MISC_DRIVERS=m
+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=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_2016=m
 CONFIG_COMEDI_ADDI_APCI_2032=m
 CONFIG_COMEDI_ADDI_APCI_2200=m
-CONFIG_COMEDI_ADDI_APCI_3001=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_PCI7230=m
-CONFIG_COMEDI_ADL_PCI7296=m
-CONFIG_COMEDI_ADL_PCI7432=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=m
-CONFIG_COMEDI_AMPLC_PC236=m
-CONFIG_COMEDI_AMPLC_PC263=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
@@ -4468,7 +5146,6 @@ CONFIG_COMEDI_KE_COUNTER=m
 CONFIG_COMEDI_CB_PCIDAS64=m
 CONFIG_COMEDI_CB_PCIDAS=m
 CONFIG_COMEDI_CB_PCIDDA=m
-CONFIG_COMEDI_CB_PCIDIO=m
 CONFIG_COMEDI_CB_PCIMDAS=m
 CONFIG_COMEDI_CB_PCIMDDA=m
 CONFIG_COMEDI_ME4000=m
@@ -4477,13 +5154,16 @@ 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_PCMCIA_DRIVERS=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
@@ -4491,109 +5171,48 @@ 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=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_NI_COMMON=m
-CONFIG_COMEDI_MITE=m
-CONFIG_COMEDI_NI_TIO=m
-CONFIG_COMEDI_NI_LABPC=m
 CONFIG_COMEDI_8255=m
-CONFIG_COMEDI_DAS08=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_R8712_AP=y
-CONFIG_RTS_PSTOR=m
-# CONFIG_RTS_PSTOR_DEBUG is not set
+CONFIG_RTS5139=m
+# CONFIG_RTS5139_DEBUG is not set
 # CONFIG_TRANZPORT is not set
-CONFIG_POHMELFS=m
-# CONFIG_POHMELFS_DEBUG is not set
-CONFIG_POHMELFS_CRYPTO=y
 CONFIG_IDE_PHISON=m
 CONFIG_LINE6_USB=m
-# CONFIG_LINE6_USB_DEBUG is not set
-# CONFIG_LINE6_USB_DUMP_CTRL is not set
-# CONFIG_LINE6_USB_DUMP_MIDI is not set
-# CONFIG_LINE6_USB_DUMP_PCM is not set
-# CONFIG_LINE6_USB_RAW is not set
 # CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set
-CONFIG_DRM_VMWGFX=m
-CONFIG_DRM_NOUVEAU=m
-CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_NOUVEAU_DEBUG=y
-
-#
-# I2C encoder or helper chips
-#
-CONFIG_DRM_I2C_CH7006=m
-CONFIG_DRM_I2C_SIL164=m
 CONFIG_USB_SERIAL_QUATECH2=m
-CONFIG_USB_SERIAL_QUATECH_USB2=m
 CONFIG_VT6655=m
 CONFIG_VT6656=m
-CONFIG_HYPERV=m
-CONFIG_HYPERV_STORAGE=m
-CONFIG_HYPERV_BLOCK=m
-CONFIG_HYPERV_NET=m
-CONFIG_HYPERV_UTILS=m
-CONFIG_HYPERV_MOUSE=m
-# CONFIG_VME_BUS is not set
 CONFIG_DX_SEP=m
-# CONFIG_IIO is not set
-CONFIG_XVMALLOC=y
+CONFIG_ZSMALLOC=y
 CONFIG_ZRAM=m
 # CONFIG_ZRAM_DEBUG is not set
-CONFIG_ZCACHE=m
 CONFIG_WLAGS49_H2=m
 CONFIG_WLAGS49_H25=m
 CONFIG_FB_SM7XX=m
-CONFIG_VIDEO_DT3155=m
-CONFIG_DT3155_CCIR=y
 CONFIG_CRYSTALHD=m
 CONFIG_FB_XGI=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_TTUSBIR=m
-CONFIG_LIRC_ZILOG=m
-CONFIG_EASYCAP=m
-CONFIG_EASYCAP_SND=y
-# CONFIG_EASYCAP_OSS is not set
-# CONFIG_EASYCAP_DEBUG is not set
-CONFIG_SOLO6X10=m
 CONFIG_ACPI_QUICKSTART=m
-CONFIG_MACH_NO_WESTBRIDGE=y
-CONFIG_ATH6K_LEGACY=m
-CONFIG_AR600x_SD31_XXX=y
-# CONFIG_AR600x_WB31_XXX is not set
-# CONFIG_AR600x_SD32_XXX is not set
-# CONFIG_AR600x_CUSTOM_XXX is not set
-CONFIG_ATH6KL_ENABLE_COEXISTENCE=y
-CONFIG_AR600x_DUAL_ANTENNA=y
-# CONFIG_AR600x_SINGLE_ANTENNA is not set
-# CONFIG_AR600x_BT_QCOM is not set
-# CONFIG_AR600x_BT_CSR is not set
-CONFIG_AR600x_BT_AR3001=y
-CONFIG_ATH6KL_HCI_BRIDGE=y
-CONFIG_ATH6KL_CONFIG_GPIO_BT_RESET=y
-CONFIG_AR600x_BT_RESET_PIN=22
-CONFIG_ATH6KL_HTC_RAW_INTERFACE=y
-CONFIG_ATH6KL_VIRTUAL_SCATTER_GATHER=y
-CONFIG_ATH6KL_SKIP_ABI_VERSION_CHECK=y
-# CONFIG_ATH6KL_DEBUG is not set
 CONFIG_USB_ENESTORAGE=m
 CONFIG_BCM_WIMAX=m
 CONFIG_FT1000=m
@@ -4621,22 +5240,64 @@ CONFIG_SPEAKUP_SYNTH_TXPRT=m
 CONFIG_SPEAKUP_SYNTH_DUMMY=m
 CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
 CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
-CONFIG_DRM_PSB=m
+CONFIG_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
 
 #
-# Altera FPGA firmware download module
-#
-CONFIG_ALTERA_STAPL=m
-CONFIG_INTEL_MEI=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
@@ -4660,7 +5321,6 @@ CONFIG_ASUS_NB_WMI=m
 CONFIG_EEEPC_WMI=m
 CONFIG_ACPI_WMI=m
 CONFIG_MSI_WMI=m
-CONFIG_ACPI_ASUS=m
 CONFIG_TOPSTAR_LAPTOP=m
 CONFIG_ACPI_TOSHIBA=m
 CONFIG_TOSHIBA_BT_RFKILL=m
@@ -4671,6 +5331,53 @@ 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
@@ -4678,24 +5385,27 @@ CONFIG_INTEL_OAKTRAIL=m
 CONFIG_EDD=m
 # CONFIG_EDD_OFF is not set
 CONFIG_FIRMWARE_MEMMAP=y
-CONFIG_EFI_VARS=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_SIGMA=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_XATTR=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 # CONFIG_EXT4_DEBUG is not set
@@ -4717,6 +5427,7 @@ 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
@@ -4728,6 +5439,9 @@ CONFIG_OCFS2_FS_STATS=y
 # CONFIG_OCFS2_DEBUG_FS is not set
 CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
+# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
+# CONFIG_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
@@ -4736,7 +5450,7 @@ CONFIG_FSNOTIFY=y
 CONFIG_DNOTIFY=y
 CONFIG_INOTIFY_USER=y
 CONFIG_FANOTIFY=y
-CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y 
+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
 CONFIG_QUOTA=y
 CONFIG_QUOTA_NETLINK_INTERFACE=y
 # CONFIG_PRINT_QUOTA_WARNING is not set
@@ -4797,11 +5511,12 @@ CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TMPFS_XATTR=y
 CONFIG_HUGETLBFS=y
 CONFIG_HUGETLB_PAGE=y
-CONFIG_CONFIGFS_FS=m
+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
@@ -4820,17 +5535,17 @@ CONFIG_JFFS2_ZLIB=y
 CONFIG_JFFS2_RTIME=y
 # CONFIG_JFFS2_RUBIN is not set
 CONFIG_UBIFS_FS=m
-CONFIG_UBIFS_FS_XATTR=y
 # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
 CONFIG_UBIFS_FS_LZO=y
 CONFIG_UBIFS_FS_ZLIB=y
-# CONFIG_UBIFS_FS_DEBUG is not set
 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
@@ -4838,37 +5553,56 @@ 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_V3=y
+CONFIG_NFS_V2=m
+CONFIG_NFS_V3=m
 CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=y
-# CONFIG_NFS_V4_1 is not set
+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_USE_NEW_IDMAPPER is not set
+CONFIG_NFS_DEBUG=y
 CONFIG_NFSD=m
-# CONFIG_NFSD_DEPRECATED is not set
 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
@@ -4877,10 +5611,11 @@ CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_DEBUG2 is not set
+CONFIG_CIFS_ACL=y
+# CONFIG_CIFS_DEBUG is not set
 CONFIG_CIFS_DFS_UPCALL=y
+CONFIG_CIFS_SMB2=y
 CONFIG_CIFS_FSCACHE=y
-CONFIG_CIFS_ACL=y
 CONFIG_NCP_FS=m
 # CONFIG_NCPFS_PACKET_SIGNING is not set
 # CONFIG_NCPFS_IOCTL_LOCKING is not set
@@ -4897,29 +5632,6 @@ CONFIG_AFS_FSCACHE=y
 CONFIG_9P_FS=m
 CONFIG_9P_FSCACHE=y
 CONFIG_9P_FS_POSIX_ACL=y
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_MAC_PARTITION=y
-CONFIG_MSDOS_PARTITION=y
-CONFIG_BSD_DISKLABEL=y
-CONFIG_MINIX_SUBPARTITION=y
-CONFIG_SOLARIS_X86_PARTITION=y
-# CONFIG_UNIXWARE_DISKLABEL is not set
-CONFIG_LDM_PARTITION=y
-# CONFIG_LDM_DEBUG is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-CONFIG_KARMA_PARTITION=y
-CONFIG_EFI_PARTITION=y
-# CONFIG_SYSV68_PARTITION is not set
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
 CONFIG_NLS_CODEPAGE_437=m
@@ -4959,6 +5671,17 @@ 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
@@ -4974,6 +5697,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
 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
@@ -4986,6 +5710,8 @@ CONFIG_HARDLOCKUP_DETECTOR=y
 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
@@ -4996,15 +5722,16 @@ 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_SPARSE_RCU_POINTER is not set
 # CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 CONFIG_STACKTRACE=y
 # CONFIG_DEBUG_STACK_USAGE is not set
@@ -5023,35 +5750,43 @@ CONFIG_DEBUG_MEMORY_INIT=y
 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_CPU_NOTIFIER_ERROR_INJECT=m
+# CONFIG_NOTIFIER_ERROR_INJECTION is not set
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_LATENCYTOP is not set
-CONFIG_SYSCTL_SYSCALL_CHECK=y
+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_FTRACE_NMI_ENTER=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_FTRACE_NMI_ENTER=y
 CONFIG_EVENT_TRACING=y
-CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
 CONFIG_CONTEXT_SWITCH_TRACER=y
 CONFIG_RING_BUFFER_ALLOW_SWAP=y
 CONFIG_TRACING=y
@@ -5063,19 +5798,27 @@ 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
@@ -5086,6 +5829,7 @@ CONFIG_ASYNC_RAID6_TEST=m
 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
@@ -5097,6 +5841,7 @@ 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
@@ -5113,7 +5858,7 @@ 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_STRICT_USER_COPY_CHECKS is not set
+# CONFIG_DEBUG_NMI_SELFTEST is not set
 
 #
 # Security options
@@ -5132,11 +5877,19 @@ CONFIG_SECURITY_PATH=y
 # CONFIG_SECURITY_SELINUX is not set
 # CONFIG_SECURITY_SMACK is not set
 CONFIG_SECURITY_TOMOYO=y
+CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
+CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
+# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
+CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/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
@@ -5145,14 +5898,12 @@ CONFIG_ASYNC_MEMCPY=m
 CONFIG_ASYNC_XOR=m
 CONFIG_ASYNC_PQ=m
 CONFIG_ASYNC_RAID6_RECOV=m
-CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y
-CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y
 CONFIG_CRYPTO=y
 
 #
 # Crypto core or helper
 #
-CONFIG_CRYPTO_ALGAPI=m
+CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_ALGAPI2=y
 CONFIG_CRYPTO_AEAD=m
 CONFIG_CRYPTO_AEAD2=y
@@ -5166,6 +5917,7 @@ 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
@@ -5174,6 +5926,8 @@ 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
@@ -5196,6 +5950,7 @@ CONFIG_CRYPTO_XTS=m
 #
 # Hash modes
 #
+CONFIG_CRYPTO_CMAC=m
 CONFIG_CRYPTO_HMAC=m
 CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_VMAC=m
@@ -5205,6 +5960,8 @@ CONFIG_CRYPTO_VMAC=m
 #
 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
@@ -5214,6 +5971,9 @@ 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
@@ -5223,15 +5983,23 @@ CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
 #
 # Ciphers
 #
-CONFIG_CRYPTO_AES=m
+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
@@ -5239,17 +6007,22 @@ 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=m
+CONFIG_CRYPTO_LZO=y
 
 #
 # Random Number Generation
@@ -5262,24 +6035,25 @@ CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
 CONFIG_CRYPTO_DEV_PADLOCK_SHA=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_VHOST_NET=m
-CONFIG_VIRTIO=m
-CONFIG_VIRTIO_RING=m
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_BALLOON=m
+CONFIG_KVM_DEVICE_ASSIGNMENT=y
 CONFIG_BINARY_PRINTF=y
 
 #
@@ -5287,14 +6061,26 @@ CONFIG_BINARY_PRINTF=y
 #
 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
@@ -5313,8 +6099,13 @@ 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_REED_SOLOMON_DEC16=y
+CONFIG_BCH=m
+CONFIG_BCH_CONST_PARAMS=y
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
 CONFIG_TEXTSEARCH_BM=m
@@ -5325,6 +6116,14 @@ 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
new file mode 100644
index 000000000..2124427e9
--- /dev/null
+++ b/libre/linux-libre-lts/criu-no-expert.patch
@@ -0,0 +1,22 @@
+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/ext4-options.patch b/libre/linux-libre-lts/ext4-options.patch
deleted file mode 100644
index ef1b2417d..000000000
--- a/libre/linux-libre-lts/ext4-options.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Report: https://bbs.archlinux.org/profile.php?id=33804
-Signed-off-by: Tom Gundersen <teg@jklm.no>
-Cc: Thomas Baechler <thomas@archlinux.org>
-Cc: Tobias Powalowski <tobias.powalowski@googlemail.com>
-Cc: Dave Reisner <d@falconindy.com>
----
- fs/ext4/super.c |   15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
-diff --git a/fs/ext4/super.c b/fs/ext4/super.c
-index 502c61f..30de9cd 100644
---- a/fs/ext4/super.c
-+++ b/fs/ext4/super.c
-@@ -1333,6 +1333,7 @@ enum {
- 	Opt_inode_readahead_blks, Opt_journal_ioprio,
- 	Opt_dioread_nolock, Opt_dioread_lock,
- 	Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable,
-+	Opt_nocheck, Opt_reservation, Opt_noreservation, Opt_journal_inum,
- };
- 
- static const match_table_t tokens = {
-@@ -1408,6 +1409,10 @@ static const match_table_t tokens = {
- 	{Opt_init_itable, "init_itable=%u"},
- 	{Opt_init_itable, "init_itable"},
- 	{Opt_noinit_itable, "noinit_itable"},
-+	{Opt_nocheck, "nocheck"},
-+	{Opt_reservation, "reservation"},
-+	{Opt_noreservation, "noreservation"},
-+	{Opt_journal_inum, "journal=%u"},
- 	{Opt_err, NULL},
- };
- 
-@@ -1904,6 +1909,16 @@ set_qf_format:
- 		case Opt_noinit_itable:
- 			clear_opt(sb, INIT_INODE_TABLE);
- 			break;
-+#ifdef CONFIG_EXT4_USE_FOR_EXT23
-+		case Opt_nocheck:
-+		case Opt_reservation:
-+		case Opt_noreservation:
-+		case Opt_journal_inum:
-+			ext4_msg(sb, KERN_WARNING,
-+			       "ext3 mount option \"%s\" ignored "
-+			       "by ext4 module", p);
-+			break;
-+#endif
- 		default:
- 			ext4_msg(sb, KERN_ERR,
- 			       "Unrecognized mount option \"%s\" "
diff --git a/libre/linux-libre-lts/ext4-use-atomic64_t-for-the-per-flexbg-free_clusters-count.patch b/libre/linux-libre-lts/ext4-use-atomic64_t-for-the-per-flexbg-free_clusters-count.patch
deleted file mode 100644
index be6f7d1e9..000000000
--- a/libre/linux-libre-lts/ext4-use-atomic64_t-for-the-per-flexbg-free_clusters-count.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-From 90ba983f6889e65a3b506b30dc606aa9d1d46cd2 Mon Sep 17 00:00:00 2001
-From: Theodore Ts'o <tytso@mit.edu>
-Date: Mon, 11 Mar 2013 23:39:59 -0400
-Subject: ext4: use atomic64_t for the per-flexbg free_clusters count
-
-From: Theodore Ts'o <tytso@mit.edu>
-
-commit 90ba983f6889e65a3b506b30dc606aa9d1d46cd2 upstream.
-
-A user who was using a 8TB+ file system and with a very large flexbg
-size (> 65536) could cause the atomic_t used in the struct flex_groups
-to overflow.  This was detected by PaX security patchset:
-
-http://forums.grsecurity.net/viewtopic.php?f=3&t=3289&p=12551#p12551
-
-This bug was introduced in commit 9f24e4208f7e, so it's been around
-since 2.6.30.  :-(
-
-Fix this by using an atomic64_t for struct orlav_stats's
-free_clusters.
-
-[Backported for 3.0-stable. Renamed free_clusters back to free_blocks;
-fixed a few more atomic_read's of free_blocks left in 3.0.]
-
-Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
-Reviewed-by: Lukas Czerner <lczerner@redhat.com>
-Signed-off-by: Lingzhu Xiang <lxiang@redhat.com>
-Reviewed-by: CAI Qian <caiqian@redhat.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
---- a/fs/ext4/ext4.h
-+++ b/fs/ext4/ext4.h
-@@ -288,9 +288,9 @@ struct ext4_group_desc
-  */
- 
- struct flex_groups {
--	atomic_t free_inodes;
--	atomic_t free_blocks;
--	atomic_t used_dirs;
-+	atomic64_t	free_blocks;
-+	atomic_t	free_inodes;
-+	atomic_t	used_dirs;
- };
- 
- #define EXT4_BG_INODE_UNINIT	0x0001 /* Inode table/bitmap not in use */
-diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
-index 29272de..dd732c7 100644
---- a/fs/ext4/ialloc.c
-+++ b/fs/ext4/ialloc.c
-@@ -345,8 +345,8 @@ static int find_group_flex(struct super_block *sb, struct inode *parent,
- 	ext4_group_t ngroups = ext4_get_groups_count(sb);
- 	int flex_size = ext4_flex_bg_size(sbi);
- 	ext4_group_t best_flex = parent_fbg_group;
--	int blocks_per_flex = sbi->s_blocks_per_group * flex_size;
--	int flexbg_free_blocks;
-+	ext4_fsblk_t blocks_per_flex = sbi->s_blocks_per_group * flex_size;
-+	ext4_fsblk_t flexbg_free_blocks;
- 	int flex_freeb_ratio;
- 	ext4_group_t n_fbg_groups;
- 	ext4_group_t i;
-@@ -355,7 +355,7 @@ static int find_group_flex(struct super_block *sb, struct inode *parent,
- 		sbi->s_log_groups_per_flex;
- 
- find_close_to_parent:
--	flexbg_free_blocks = atomic_read(&flex_group[best_flex].free_blocks);
-+	flexbg_free_blocks = atomic64_read(&flex_group[best_flex].free_blocks);
- 	flex_freeb_ratio = flexbg_free_blocks * 100 / blocks_per_flex;
- 	if (atomic_read(&flex_group[best_flex].free_inodes) &&
- 	    flex_freeb_ratio > free_block_ratio)
-@@ -370,7 +370,7 @@ find_close_to_parent:
- 		if (i == parent_fbg_group || i == parent_fbg_group - 1)
- 			continue;
- 
--		flexbg_free_blocks = atomic_read(&flex_group[i].free_blocks);
-+		flexbg_free_blocks = atomic64_read(&flex_group[i].free_blocks);
- 		flex_freeb_ratio = flexbg_free_blocks * 100 / blocks_per_flex;
- 
- 		if (flex_freeb_ratio > free_block_ratio &&
-@@ -380,14 +380,14 @@ find_close_to_parent:
- 		}
- 
- 		if ((atomic_read(&flex_group[best_flex].free_inodes) == 0) ||
--		    ((atomic_read(&flex_group[i].free_blocks) >
--		      atomic_read(&flex_group[best_flex].free_blocks)) &&
-+		    ((atomic64_read(&flex_group[i].free_blocks) >
-+		      atomic64_read(&flex_group[best_flex].free_blocks)) &&
- 		     atomic_read(&flex_group[i].free_inodes)))
- 			best_flex = i;
- 	}
- 
- 	if (!atomic_read(&flex_group[best_flex].free_inodes) ||
--	    !atomic_read(&flex_group[best_flex].free_blocks))
-+	    !atomic64_read(&flex_group[best_flex].free_blocks))
- 		return -1;
- 
- found_flexbg:
-@@ -406,8 +406,8 @@ out:
- }
- 
- struct orlov_stats {
-+	__u64 free_blocks;
- 	__u32 free_inodes;
--	__u32 free_blocks;
- 	__u32 used_dirs;
- };
- 
-@@ -424,7 +424,7 @@ static void get_orlov_stats(struct super_block *sb, ext4_group_t g,
- 
- 	if (flex_size > 1) {
- 		stats->free_inodes = atomic_read(&flex_group[g].free_inodes);
--		stats->free_blocks = atomic_read(&flex_group[g].free_blocks);
-+		stats->free_blocks = atomic64_read(&flex_group[g].free_blocks);
- 		stats->used_dirs = atomic_read(&flex_group[g].used_dirs);
- 		return;
- 	}
-diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
-index 31bbdb5..35959f6 100644
---- a/fs/ext4/mballoc.c
-+++ b/fs/ext4/mballoc.c
-@@ -2814,8 +2814,8 @@ ext4_mb_mark_diskspace_used(struct ext4_allocation_context *ac,
- 	if (sbi->s_log_groups_per_flex) {
- 		ext4_group_t flex_group = ext4_flex_group(sbi,
- 							  ac->ac_b_ex.fe_group);
--		atomic_sub(ac->ac_b_ex.fe_len,
--			   &sbi->s_flex_groups[flex_group].free_blocks);
-+		atomic64_sub(ac->ac_b_ex.fe_len,
-+			     &sbi->s_flex_groups[flex_group].free_blocks);
- 	}
- 
- 	err = ext4_handle_dirty_metadata(handle, NULL, bitmap_bh);
-@@ -4614,7 +4614,7 @@ do_more:
- 
- 	if (sbi->s_log_groups_per_flex) {
- 		ext4_group_t flex_group = ext4_flex_group(sbi, block_group);
--		atomic_add(count, &sbi->s_flex_groups[flex_group].free_blocks);
-+		atomic64_add(count, &sbi->s_flex_groups[flex_group].free_blocks);
- 	}
- 
- 	ext4_mb_unload_buddy(&e4b);
-@@ -4745,8 +4745,8 @@ void ext4_add_groupblocks(handle_t *handle, struct super_block *sb,
- 
- 	if (sbi->s_log_groups_per_flex) {
- 		ext4_group_t flex_group = ext4_flex_group(sbi, block_group);
--		atomic_add(blocks_freed,
--			   &sbi->s_flex_groups[flex_group].free_blocks);
-+		atomic64_add(blocks_freed,
-+			     &sbi->s_flex_groups[flex_group].free_blocks);
- 	}
- 
- 	ext4_mb_unload_buddy(&e4b);
-diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
-index 244100f..d2661aac 100644
---- a/fs/ext4/resize.c
-+++ b/fs/ext4/resize.c
-@@ -929,8 +929,8 @@ int ext4_group_add(struct super_block *sb, struct ext4_new_group_data *input)
- 	    sbi->s_log_groups_per_flex) {
- 		ext4_group_t flex_group;
- 		flex_group = ext4_flex_group(sbi, input->group);
--		atomic_add(input->free_blocks_count,
--			   &sbi->s_flex_groups[flex_group].free_blocks);
-+		atomic64_add(input->free_blocks_count,
-+			     &sbi->s_flex_groups[flex_group].free_blocks);
- 		atomic_add(EXT4_INODES_PER_GROUP(sb),
- 			   &sbi->s_flex_groups[flex_group].free_inodes);
- 	}
-diff --git a/fs/ext4/super.c b/fs/ext4/super.c
-index c6a3363..e05cd34 100644
---- a/fs/ext4/super.c
-+++ b/fs/ext4/super.c
-@@ -1992,8 +1992,8 @@ static int ext4_fill_flex_info(struct super_block *sb)
- 		flex_group = ext4_flex_group(sbi, i);
- 		atomic_add(ext4_free_inodes_count(sb, gdp),
- 			   &sbi->s_flex_groups[flex_group].free_inodes);
--		atomic_add(ext4_free_blks_count(sb, gdp),
--			   &sbi->s_flex_groups[flex_group].free_blocks);
-+		atomic64_add(ext4_free_blks_count(sb, gdp),
-+			     &sbi->s_flex_groups[flex_group].free_blocks);
- 		atomic_add(ext4_used_dirs_count(sb, gdp),
- 			   &sbi->s_flex_groups[flex_group].used_dirs);
- 	}
--- 
-1.7.11.7
-
---
-To unsubscribe from this list: send the line "unsubscribe stable" 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/libre/linux-libre-lts/i915-fix-ghost-tv-output.patch b/libre/linux-libre-lts/i915-fix-ghost-tv-output.patch
deleted file mode 100644
index 3b631361a..000000000
--- a/libre/linux-libre-lts/i915-fix-ghost-tv-output.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
-Tested-by: Santi <santi@agolina.net>
----
- drivers/gpu/drm/i915/intel_tv.c |    9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
-index dc83b7a..c8f67bf 100644
---- a/drivers/gpu/drm/i915/intel_tv.c
-+++ b/drivers/gpu/drm/i915/intel_tv.c
-@@ -1267,6 +1267,15 @@
- 		   DAC_B_0_7_V |
- 		   DAC_C_0_7_V);
- 
-+	/*
-+	 * The TV sense state should be cleared to zero on cantiga platform. Otherwise
-+	 * the TV is misdetected. This is hardware requirement.
-+	 */
-+	if (IS_GM45(dev))
-+		tv_dac &= ~(TVDAC_STATE_CHG_EN | TVDAC_A_SENSE_CTL |
-+			    TVDAC_B_SENSE_CTL | TVDAC_C_SENSE_CTL);
-+
-+	
- 	I915_WRITE(TV_CTL, tv_ctl);
- 	I915_WRITE(TV_DAC, tv_dac);
- 	POSTING_READ(TV_DAC);
diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install
index d0d47c6a0..7a4a271df 100644
--- a/libre/linux-libre-lts/linux-libre-lts.install
+++ b/libre/linux-libre-lts/linux-libre-lts.install
@@ -4,9 +4,6 @@
 KERNEL_NAME=-lts
 KERNEL_VERSION=
 
-# set a sane PATH to ensure that critical utils like depmod will be found
-export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
-
 post_install () {
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
@@ -15,40 +12,9 @@ post_install () {
     echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
     mkinitcpio -p linux-libre${KERNEL_NAME}
   fi
-
-  # compat symlinks for the official kernels only
-  if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-lts" ]; then
-    loaders="$(find /boot -name syslinux.cfg -or -name extlinux.conf -or -name grub.cfg -or -name menu.lst)"
-    [ -f /etc/lilo.conf ] && loaders="$loaders /etc/lilo.conf"
-    if [ -n "${loaders}" ] && grep -q -e vmlinuz26 -e kernel26.img -e kernel26-fallback.img $loaders; then
-      # add compat symlinks for the initramfs images
-      ln -sf initramfs-linux-libre${KERNEL_NAME}.img boot/kernel26${KERNEL_NAME}.img
-      ln -sf initramfs-linux-libre${KERNEL_NAME}-fallback.img \
-        boot/kernel26${KERNEL_NAME}-fallback.img
-      ln -sf vmlinuz-linux-libre${KERNEL_NAME} /boot/vmlinuz26${KERNEL_NAME}
-    fi
-  fi
 }
 
 post_upgrade() {
-  pacman -Q grub &>/dev/null
-  hasgrub=$?
-  pacman -Q grub-common &>/dev/null
-  hasgrub2=$?
-  pacman -Q lilo &>/dev/null
-  haslilo=$?
-  # reminder notices
-  if [ $haslilo -eq 0 ]; then
-    echo ">>>"
-    if [ $hasgrub -eq 0 -o $hasgrub2 -eq 0 ]; then
-      echo ">>> If you use the LILO bootloader, you should run 'lilo' before rebooting."
-    else
-      echo ">>> You appear to be using the LILO bootloader. You should run"
-      echo ">>> 'lilo' before rebooting."
-    fi
-    echo ">>>"
-  fi
-
   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
@@ -64,6 +30,6 @@ post_upgrade() {
 
 post_remove() {
   # also remove the compat symlinks
-  rm -f boot/{initramfs-linux-libre,kernel26}${KERNEL_NAME}.img
-  rm -f boot/{initramfs-linux-libre,kernel26}${KERNEL_NAME}-fallback.img
+  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/module-init-wait-3.0.patch b/libre/linux-libre-lts/module-init-wait-3.0.patch
deleted file mode 100644
index 1bcfd2491..000000000
--- a/libre/linux-libre-lts/module-init-wait-3.0.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From: Rusty Russell <rusty@rustcorp.com.au>
-Date: Fri, 28 Sep 2012 05:01:03 +0000 (+0930)
-Subject: module: wait when loading a module which is currently initializing.
-X-Git-Tag: v3.7-rc1~2^2~32
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=9bb9c3be568346538
-
-module: wait when loading a module which is currently initializing.
-
-The original module-init-tools module loader used a fnctl lock on the
-.ko file to avoid attempts to simultaneously load a module.
-Unfortunately, you can't get an exclusive fcntl lock on a read-only
-fd, making this not work for read-only mounted filesystems.
-module-init-tools has a hacky sleep-and-loop for this now.
-
-It's not that hard to wait in the kernel, and only return -EEXIST once
-the first module has finished loading (or continue loading the module
-if the first one failed to initialize for some reason).  It's also
-consistent with what we do for dependent modules which are still loading.
-
-Suggested-by: Lucas De Marchi <lucas.demarchi@profusion.mobi>
-Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
----
-
-diff --git a/kernel/module.c b/kernel/module.c
-index 63cf6e7..74bc195 100644
---- a/kernel/module.c
-+++ b/kernel/module.c
-@@ -2845,6 +2845,20 @@ static int post_relocation(struct module *mod, const struct load_info *info)
- 	return module_finalize(info->hdr, info->sechdrs, mod);
- }
- 
-+/* Is this module of this name done loading?  No locks held. */
-+static bool finished_loading(const char *name)
-+{
-+	struct module *mod;
-+	bool ret;
-+
-+	mutex_lock(&module_mutex);
-+	mod = find_module(name);
-+	ret = !mod || mod->state != MODULE_STATE_COMING;
-+	mutex_unlock(&module_mutex);
-+
-+	return ret;
-+}
-+
- /* Allocate and load the module: note that size of section 0 is always
-    zero, and we rely on this for optional sections. */
- static struct module *load_module(void __user *umod,
-@@ -2852,7 +2866,7 @@ static struct module *load_module(void __user *umod,
- 				  const char __user *uargs)
- {
- 	struct load_info info = { NULL, };
--	struct module *mod;
-+	struct module *mod, *old;
- 	long err;
- 
- 	pr_debug("load_module: umod=%p, len=%lu, uargs=%p\n",
-@@ -2918,8 +2932,18 @@ static struct module *load_module(void __user *umod,
- 	 * function to insert in a way safe to concurrent readers.
- 	 * The mutex protects against concurrent writers.
- 	 */
-+again:
- 	mutex_lock(&module_mutex);
--	if (find_module(mod->name)) {
-+	if ((old = find_module(mod->name)) != NULL) {
-+		if (old->state == MODULE_STATE_COMING) {
-+			/* Wait in case it fails to load. */
-+			mutex_unlock(&module_mutex);
-+			err = wait_event_interruptible(module_wq,
-+					       finished_loading(mod->name));
-+			if (err)
-+				goto free_arch_cleanup;
-+			goto again;
-+		}
- 		err = -EEXIST;
- 		goto unlock;
- 	}
diff --git a/libre/linux-libre-lts/module-symbol-waiting-3.0.patch b/libre/linux-libre-lts/module-symbol-waiting-3.0.patch
deleted file mode 100644
index b87a38ff5..000000000
--- a/libre/linux-libre-lts/module-symbol-waiting-3.0.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From: Rusty Russell <rusty@rustcorp.com.au>
-Date: Fri, 28 Sep 2012 05:01:03 +0000 (+0930)
-Subject: module: fix symbol waiting when module fails before init
-X-Git-Tag: v3.7-rc1~2^2~33
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=6f13909f4fe9652f1
-
-module: fix symbol waiting when module fails before init
-
-We use resolve_symbol_wait(), which blocks if the module containing
-the symbol is still loading.  However:
-
-1) The module_wq we use is only woken after calling the modules' init
-   function, but there are other failure paths after the module is
-   placed in the linked list where we need to do the same thing.
-
-2) wake_up() only wakes one waiter, and our waitqueue is shared by all
-   modules, so we need to wake them all.
-
-3) wake_up_all() doesn't imply a memory barrier: I feel happier calling
-   it after we've grabbed and dropped the module_mutex, not just after
-   the state assignment.
-
-Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
----
-
-diff --git a/kernel/module.c b/kernel/module.c
-index 7f2ee45f..63cf6e7 100644
---- a/kernel/module.c
-+++ b/kernel/module.c
-@@ -2959,7 +2959,7 @@ static struct module *load_module(void __user *umod,
- 	/* Unlink carefully: kallsyms could be walking list. */
- 	list_del_rcu(&mod->list);
- 	module_bug_cleanup(mod);
--
-+	wake_up_all(&module_wq);
-  ddebug:
- 	dynamic_debug_remove(info.debug);
-  unlock:
-@@ -3034,7 +3034,7 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
- 		blocking_notifier_call_chain(&module_notify_list,
- 					     MODULE_STATE_GOING, mod);
- 		free_module(mod);
--		wake_up(&module_wq);
-+		wake_up_all(&module_wq);
- 		return ret;
- 	}
- 	if (ret > 0) {
-@@ -3046,9 +3046,8 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
- 		dump_stack();
- 	}
- 
--	/* Now it's a first class citizen!  Wake up anyone waiting for it. */
-+	/* Now it's a first class citizen! */
- 	mod->state = MODULE_STATE_LIVE;
--	wake_up(&module_wq);
- 	blocking_notifier_call_chain(&module_notify_list,
- 				     MODULE_STATE_LIVE, mod);
- 
-@@ -3071,6 +3070,7 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
- 	mod->init_ro_size = 0;
- 	mod->init_text_size = 0;
- 	mutex_unlock(&module_mutex);
-+	wake_up_all(&module_wq);
- 
- 	return 0;
- }
diff --git a/libre/linux-libre-manpages/PKGBUILD b/libre/linux-libre-manpages/PKGBUILD
index f8ce261db..695ea966e 100644
--- a/libre/linux-libre-manpages/PKGBUILD
+++ b/libre/linux-libre-manpages/PKGBUILD
@@ -5,8 +5,8 @@
 
 pkgname=linux-libre-manpages
 pkgver=3.9
-pkgrel=1
-pkgdesc="Kernel hackers manual - Section 9 manpages that comes with the linux-libre kernel"
+pkgrel=1.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')
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index 85ba7dba7..c9721b11e 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91131 2013-05-19 23:48:35Z seblu $
+# $Id: PKGBUILD 96809 2013-09-05 18:48:20Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
@@ -9,11 +9,11 @@ pkgname=('linux-libre-tools-meta'
          'cpupower-libre'
          'x86_energy_perf_policy-libre'
          'usbip-libre')
-_basekernel=3.9
+_basekernel=3.11
 #_sublevel=6
-_pkgver=$_basekernel.$_sublevel
+#_pkgver=$_basekernel.$_sublevel
 pkgver=$_basekernel
-pkgrel=3
+pkgrel=1
 license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
 url='http://linux-libre.fsfla.org/'
@@ -29,18 +29,19 @@ makedepends+=('pciutils')
 makedepends+=('glib2' 'sysfsutils')
 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=('62f113b4bd9ee832e8906da970c5bf4585c057af4eab14ec6ad57e9b2fd084ef'
+sha256sums=('f4ea56c7bc8b6c497562e7c36de9c7c1e67142aba694ff139bc1fb3d3b0193ee'
+            #'a1ed93ea50bd6e19d2834556900c6ca3af37632b1eda3bde50ec9c305b7640fc'
             '4fa509949d6863d001075fa3e8671eff2599c046d20c98bb4a70778595cd1c3f'
             'fbf6e0ce6eb0ef15703fe212958de6ca46e62188900b5e9f9272ed3cc9cfd54e'
             'a89284d0ecb556ca53a66d1c2087b5fd6d0a901ab2769cd3aebb93f4478905dc'
             '2e187734d8aec58a3046d79883510d779aa93fb3ab20bd3132c1a607ebe5498f')
 
-build() {
+prepare() {
   # apply stable patching set
   if (( NOEXTRACT == 0 )) && [[ -e "$srcdir"/patch-$_basekernel-gnu-$_pkgver-gnu ]]; then
     msg2 'Applying stable patch set'
@@ -48,7 +49,9 @@ build() {
     patch -Np1 -i "$srcdir"/patch-$_basekernel-gnu-$_pkgver-gnu
     cd ..
   fi
+}
 
+build() {
   msg2 'Build libtraceevent-libre'
   pushd linux-$pkgver/tools/lib/traceevent
   make
diff --git a/libre/linux-libre/ChangeLog b/libre/linux-libre/ChangeLog
index 12f517b4f..7bff7d34d 100644
--- a/libre/linux-libre/ChangeLog
+++ b/libre/linux-libre/ChangeLog
@@ -1,8 +1,12 @@
-2012-04-30  André Silva  <emulatorman@lavabit.com>
+2013-07-15  André Silva  <emulatorman@lavabit.com>
 
-        * linux-libre-3.9-2
-        * Removed CONFIG_STUB_POULSBO module from config files
+        * linux-libre-3.10.1-1
+        * Removed linux-libre-kmod-alx package from Parabola due which CONFIG_ALX module was implemented by default in the kernel.
+
+2013-04-30  André Silva  <emulatorman@lavabit.com>
 
+        * linux-libre-3.9-2
+        * Removed CONFIG_STUB_POULSBO module from config files.
 
 2012-12-19  André Silva  <emulatorman@lavabit.com>
 
@@ -31,5 +35,5 @@
 
 2012-03-03  André Silva  <emulatorman@lavabit.com>
 
-	* linux-libre-2.3.9-2
+	* linux-libre-3.2.9-2
 	* Enabled CONFIG_FB_VT8623 module https://labs.parabola.nu/issues/14
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 89f6a9178..70d9f739b 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 188067 2013-06-08 08:17:48Z tpowa $
+# $Id: PKGBUILD 194378 2013-09-15 09:16:34Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
-# Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
-# Maintainer (Parabola): Sorin-Mihai Vârgolici <smv@yobicore.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
-# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# 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         # Build stock -LIBRE kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
-_basekernel=3.9
-_sublevel=5
+_basekernel=3.11
+_sublevel=1
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.4 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.0 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -29,19 +29,21 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         '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=('120df29f88622dabf7015a22c7cc8e25'
-         '558743403ba219c51570d29e03d362d5'
-         'b0bc969b9e8c1767b16cdc0504a7bad7'
-         '42dfd3a3702433b68c079d6b3fd13c3c'
+md5sums=('7ec84223c7adcf01a5287eb7af96b7e7'
+         '7b051faf375c76d4763a24048c52600b'
+         'b7718a81faf845ab53234336122ad631'
+         'f7ee88ffc93b665345b6ee89ff192e1f'
          'e49ac236dfeef709f91a3d993ea7b62c'
          '2967cecc3af9f954ccc822fd63dca6ff'
          '8267264d9a8966e57fdacd1fa1fc65c4'
-         '04b21c79df0a952c22d681dd4f4562df'
-         'f3def2cefdcbb954c21d8505d23cc83c'
-         '846eb5948403dd0f2f02c50d3acb69c3')
+         '36e90334b12b2e9d53fd92129ee98f5b'
+         '98beb36f9b8cf16e58de2483ea9985e3'
+         'd50c1ac47394e9aec637002ef3392bd1'
+         '135ff203ec680a91e87eed4df72f453d')
 if [ "$CARCH" != "mips64el" ]; then
-    # Don't use the Loongson-specific patches on non-mips64el arches.
+    # don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
     unset md5sums[${#md5sums[@]}-1]
 fi
@@ -56,7 +58,7 @@ prepare() {
     patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu"
   fi
 
-  # Add freedo as boot logo
+  # 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)
@@ -64,6 +66,10 @@ prepare() {
   # (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|" Makefile
     sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
@@ -72,10 +78,10 @@ prepare() {
     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)
+  # 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" \
@@ -142,7 +148,7 @@ build() {
 }
 
 _package() {
-  pkgdesc="The ${pkgbase} kernel and modules"
+  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')
@@ -151,6 +157,11 @@ _package() {
   replaces=("kernel26${_kernelname}" "kernel26-libre${_kernelname}" "linux${_kernelname}")
   backup=("etc/mkinitcpio.d/${pkgbase}.preset")
   install=${pkgbase}.install
+  if [ "$CARCH" != "mips64el" ]; then
+     provides+=('linux-libre-kmod-alx')
+     conflicts+=('linux-libre-kmod-alx')
+     replaces+=('linux-libre-kmod-alx')
+  fi
   if [ "$CARCH" = "mips64el" ]; then
       optdepends+=('mkinitcpio: to make the initramfs (needs reinstall of this package)')
       conflicts+=('mkinitcpio<0.7')
@@ -198,7 +209,7 @@ _package() {
     -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
+  # 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"
@@ -224,7 +235,7 @@ _package() {
 }
 
 _package-headers() {
-  pkgdesc="Header files and scripts for building modules for ${pkgbase} kernel"
+  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")
@@ -232,7 +243,7 @@ _package-headers() {
   KARCH=x86
   [ $CARCH = "mips64el" ] && KARCH=mips
 
-# In case of repackaging this is empty
+  # in case of repackaging this is empty
   if [ -z "${_kernver}" ]; then
     cd "${srcdir}/linux-${_basekernel}"
     _kernver="$(make LOCALVERSION= kernelrelease)"
@@ -375,7 +386,7 @@ _package-headers() {
   done
 
   # remove unneeded architectures
-  rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arc,arm,arm26,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}
+  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
@@ -384,7 +395,7 @@ _package-headers() {
 }
 
 _package-docs() {
-  pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase} kernel"
+  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")
diff --git a/libre/linux-libre/boot-logo.patch b/libre/linux-libre/boot-logo.patch
index c392928a5..cbd52ea22 100644
--- a/libre/linux-libre/boot-logo.patch
+++ b/libre/linux-libre/boot-logo.patch
@@ -1,1612 +1,891 @@
-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 @@
+diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
+index 285d552..c9d8373 100644
+--- a/drivers/video/logo/logo_linux_clut224.ppm
++++ b/drivers/video/logo/logo_linux_clut224.ppm
+@@ -1,883 +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 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 11 15 17 33 49 54 59 85 92 73 97 106 
+-83 116 129 105 131 142 115 114 122 74 88 93 20 29 31 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 0 0 0 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 2 3 3 17 23 26 50 67 72 73 97 106 59 85 92 73 97 106 
+-105 131 142 124 127 131 105 131 142 105 131 142 53 75 83 6 8 8 0 0 0 0 0 0 
+-0 0 0 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 1 1 1 1 1 1 0 0 0 
+-0 0 0 1 1 1 26 35 39 59 85 92 59 85 92 59 85 92 29 43 47 53 75 83 
+-108 122 132 132 98 104 108 122 132 105 131 142 101 101 101 43 45 48 6 8 8 0 0 0 
+-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 1 1 1 0 0 0 0 0 0 0 0 0 
+-11 15 17 27 40 45 59 85 92 59 85 92 27 40 45 31 45 49 73 97 106 93 121 133 
+-108 122 132 108 122 132 105 131 142 108 122 132 105 131 142 73 97 106 26 35 39 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 1 1 1 7 12 13 21 31 35 42 59 64 
+-53 75 83 53 75 83 50 67 72 42 59 64 32 40 45 42 59 64 73 97 106 116 116 116 
+-132 98 104 116 116 116 108 122 132 117 104 110 105 131 142 83 116 129 50 67 72 7 12 13 
+-1 1 1 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 1 1 1 6 8 8 15 22 25 26 35 39 36 54 60 53 75 83 59 85 92 
+-59 85 92 48 63 69 15 22 25 12 17 20 52 67 79 94 94 94 132 98 104 132 98 104 
+-117 104 110 108 122 132 108 122 132 115 114 122 105 131 142 77 105 114 59 85 92 36 54 60 
+-7 12 13 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 15 22 25 29 43 47 36 54 60 42 59 64 42 59 64 48 63 69 21 31 35 
+-6 8 8 29 43 47 36 50 56 43 45 48 79 78 84 132 98 104 165 78 79 132 98 104 
+-108 122 132 117 104 110 117 104 110 108 122 132 77 105 114 73 97 106 95 131 149 78 102 129 
+-36 50 56 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 
+-
+-27 40 45 53 75 83 48 63 69 24 31 37 6 8 12 0 0 0 18 25 28 26 35 39 
+-12 17 20 26 35 39 65 78 84 112 81 86 152 81 83 137 83 86 132 98 104 117 104 110 
+-117 104 110 132 98 104 132 98 104 115 114 122 73 97 106 53 75 83 95 131 149 93 124 152 
+-68 78 128 15 22 25 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 
+-
+-36 50 56 21 30 33 4 7 7 0 0 0 1 1 1 17 12 12 69 31 31 68 59 64 
+-57 59 63 21 31 35 32 40 45 86 73 69 152 81 83 152 81 83 117 104 110 132 98 104 
+-152 81 83 132 98 104 108 122 132 77 105 114 77 105 114 93 121 133 95 131 149 93 124 152 
+-95 131 149 53 75 83 11 15 17 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 
+-
+-17 23 26 2 3 3 0 0 0 17 12 12 69 31 31 123 55 55 123 55 55 152 81 83 
+-86 73 69 17 23 26 7 12 13 45 54 57 101 101 101 137 83 86 132 98 104 132 98 104 
+-137 83 86 117 104 110 77 105 114 42 59 64 50 67 72 78 102 129 91 117 157 91 117 157 
+-95 131 149 83 116 129 40 48 73 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 
+-
+-1 1 1 1 2 2 2 3 3 28 12 12 123 55 55 174 79 79 174 79 79 174 79 79 
+-152 81 83 68 59 64 26 35 39 27 40 45 79 78 84 137 83 86 165 78 79 137 83 86 
+-94 94 94 48 63 69 36 50 56 50 67 72 73 97 106 93 121 133 93 124 152 93 124 152 
+-95 131 149 91 118 149 78 102 129 27 40 45 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 
+-
+-4 5 3 24 53 24 19 31 15 8 7 3 90 61 47 165 78 79 174 79 79 174 79 79 
+-174 79 79 137 83 86 60 52 57 7 12 13 17 23 26 70 70 70 132 98 104 112 81 86 
+-79 78 84 31 45 49 15 22 25 53 75 83 91 118 149 86 106 160 91 117 157 93 124 152 
+-91 117 157 93 124 152 95 131 149 53 75 83 50 50 50 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 
+-
+-19 31 15 34 76 34 34 76 34 19 31 15 28 12 12 123 55 55 174 79 79 174 79 79 
+-174 79 79 165 78 79 112 81 86 32 40 45 15 22 25 38 53 58 65 78 84 29 31 32 
+-21 30 33 42 59 64 60 80 103 78 102 129 87 112 149 84 96 162 91 117 157 93 124 152 
+-91 117 157 93 124 152 93 121 133 59 85 92 57 68 71 82 85 86 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 
+-
+-34 76 34 40 89 40 40 89 40 34 76 34 8 15 6 48 26 18 123 55 55 174 79 79 
+-174 79 79 174 79 79 137 83 86 68 59 64 32 40 45 21 30 33 31 45 49 21 31 35 
+-12 17 20 48 63 69 78 102 129 81 88 166 84 96 162 91 117 157 93 124 152 91 117 157 
+-93 124 152 95 131 149 83 116 129 59 85 92 57 68 71 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 
+-
+-40 89 40 40 89 40 40 89 40 40 89 40 24 53 24 6 6 6 69 31 31 123 55 55 
+-123 55 55 90 61 47 69 31 31 36 32 33 21 31 35 7 12 13 18 25 28 48 63 69 
+-60 80 103 68 78 128 84 101 153 84 96 162 84 96 162 91 117 157 91 117 157 84 96 162 
+-91 117 157 73 97 106 48 63 69 50 67 72 57 59 63 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 124 131 137 170 170 170 151 151 151 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 
+-
+-34 76 34 40 89 40 40 89 40 40 89 40 34 76 34 19 31 15 17 12 12 48 26 18 
+-48 26 18 8 7 3 10 10 22 23 29 47 51 61 92 42 59 64 21 30 33 34 45 54 
+-68 78 128 81 88 166 81 82 173 86 106 160 86 106 160 84 96 162 86 106 160 87 112 149 
+-91 118 149 77 105 114 52 67 79 32 40 45 50 50 50 86 86 86 2 2 6 14 14 14 
+-124 131 137 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 124 131 137 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 
+-
+-19 31 15 34 76 34 40 89 40 40 89 40 40 89 40 24 53 24 8 7 3 0 0 0 
+-6 8 12 28 32 52 51 61 92 54 54 122 74 77 160 68 78 128 26 35 39 6 8 8 
+-34 45 54 68 78 128 84 96 162 86 106 160 86 106 160 81 88 166 84 96 162 87 112 149 
+-73 97 106 36 50 56 33 49 54 18 18 18 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 170 170 170 124 127 131 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 
+-
+-4 5 3 24 53 24 40 89 40 40 89 40 34 76 34 12 22 15 4 5 3 4 5 3 
+-13 17 26 54 54 122 78 78 174 78 78 174 78 78 174 74 77 160 51 61 92 21 31 35 
+-26 35 39 53 75 83 84 101 153 81 82 173 81 88 166 84 101 153 60 80 103 60 80 103 
+-53 75 83 38 53 58 42 59 64 22 22 22 46 46 46 82 82 82 2 2 6 106 106 106 
+-170 170 170 26 26 26 86 86 86 226 226 226 124 127 131 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 151 151 151 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 
+-
+-1 2 2 8 15 6 24 53 24 34 76 34 19 31 15 8 15 6 63 55 20 63 55 20 
+-18 18 18 40 48 73 74 77 160 78 78 174 78 78 174 81 82 173 74 77 160 52 67 79 
+-17 23 26 21 31 35 60 80 103 81 88 166 74 77 160 78 102 129 36 54 60 12 17 20 
+-42 59 64 48 63 69 21 31 35 18 18 18 42 42 42 86 86 86 6 6 6 116 116 116 
+-106 106 106 6 6 6 70 70 70 151 151 151 124 127 131 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 
+-
+-11 15 17 0 0 0 12 22 15 19 31 15 8 15 6 63 55 20 149 139 69 149 139 69 
+-63 55 20 10 10 22 54 54 122 78 78 174 78 78 174 78 78 174 81 82 173 68 78 128 
+-24 31 37 6 6 6 36 50 56 60 80 103 51 61 92 42 59 64 36 50 56 31 45 49 
+-29 43 47 27 40 45 6 8 8 14 14 14 42 42 42 94 94 94 14 14 14 101 101 101 
+-124 127 131 2 2 6 18 18 18 116 116 116 106 107 48 121 92 8 121 92 8 98 70 6 
+-170 170 170 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 
+-
+-26 35 39 3 5 6 1 1 1 2 3 3 35 31 12 133 118 54 175 176 80 175 176 80 
+-133 118 54 35 31 12 23 29 47 54 54 122 78 78 174 78 78 174 74 77 160 68 78 128 
+-51 61 92 31 45 49 26 35 39 36 50 56 29 43 47 7 12 13 21 30 33 42 59 64 
+-18 25 28 7 12 13 1 1 1 10 10 10 38 38 38 90 90 90 14 14 14 58 58 58 
+-210 210 210 26 26 26 62 42 6 154 114 10 226 170 11 237 188 10 220 174 15 184 138 11 
+-220 174 15 174 140 55 35 31 12 2 2 6 70 70 70 246 246 246 124 131 137 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 
+-
+-27 40 45 17 23 26 2 3 3 1 1 1 56 77 35 165 152 80 175 176 80 175 176 80 
+-175 176 80 106 107 48 22 22 22 28 32 52 54 54 122 54 54 122 51 61 92 28 32 52 
+-20 27 34 31 45 49 11 15 17 7 12 13 36 50 56 31 45 49 29 43 47 36 50 56 
+-6 8 8 0 0 0 0 0 0 10 10 10 38 38 38 86 86 86 14 14 14 10 10 10 
+-195 195 195 198 179 130 192 133 9 220 174 15 239 182 13 237 188 10 232 195 16 239 207 25 
+-237 201 50 241 208 19 232 195 16 184 138 11 198 179 130 208 206 196 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 
+-
+-15 22 25 26 35 39 15 22 25 0 0 0 35 31 12 133 118 54 175 176 80 175 176 80 
+-175 176 80 165 152 80 56 77 35 6 8 12 23 29 47 13 17 26 2 2 6 0 0 0 
+-1 2 2 26 35 39 26 35 39 26 35 39 42 59 64 42 59 64 20 29 31 6 8 8 
+-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 92 8 192 133 9 219 162 10 239 182 13 237 188 10 232 195 16 241 208 19 237 201 50 
+-237 201 50 239 207 25 241 208 19 241 208 19 241 208 19 230 187 11 121 92 8 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 
+-
+-1 2 2 15 22 25 31 45 49 6 8 12 4 5 3 63 55 20 149 139 69 175 176 80 
+-175 176 80 175 176 80 106 107 48 20 16 6 1 1 1 0 0 0 2 3 3 11 15 17 
+-21 30 33 36 50 56 36 50 56 24 31 37 15 22 25 6 8 8 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 62 42 6 
+-180 123 7 206 145 10 230 174 11 239 182 13 237 188 10 238 202 15 241 208 19 237 201 50 
+-239 207 25 241 208 19 241 208 19 241 208 19 230 187 11 220 174 15 184 138 11 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 1 2 2 29 43 47 26 35 39 3 5 6 8 7 3 106 107 48 165 152 80 
+-175 176 80 149 139 69 63 55 20 4 5 3 2 3 3 12 17 20 26 35 39 26 35 39 
+-17 23 26 7 12 13 6 8 8 3 5 6 1 2 2 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 237 188 10 232 195 16 241 208 19 237 201 50 237 201 50 
+-241 208 19 241 208 19 241 208 19 204 160 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 12 17 20 27 40 45 18 25 28 1 1 1 35 31 12 106 107 48 
+-149 139 69 56 77 35 8 7 3 1 2 2 12 17 20 26 35 39 21 31 35 11 15 17 
+-3 5 6 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 10 10 10 30 30 30 78 78 78 46 46 46 22 22 22 
+-137 92 6 204 160 10 239 182 13 237 188 10 238 202 15 241 208 19 241 208 19 241 208 19 
+-241 208 19 204 160 10 184 138 11 210 150 10 216 158 10 210 150 10 98 70 6 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 1 1 1 15 22 25 33 49 54 12 17 20 2 3 3 35 31 12 
+-56 77 35 20 16 6 1 1 1 18 25 28 21 31 35 11 15 17 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 0 0 0 0 0 0 10 10 10 34 34 34 78 78 78 50 50 50 6 6 6 
+-88 55 22 139 102 15 190 146 13 230 187 11 239 207 25 232 195 16 220 174 15 190 146 13 
+-171 120 8 192 133 9 210 150 10 213 154 11 185 146 40 165 152 80 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 1 1 1 27 40 45 29 43 47 3 5 6 2 3 3 
+-8 7 3 1 1 1 17 23 26 31 45 49 15 22 25 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 0 0 0 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 
+-124 127 131 168 158 138 156 107 11 171 120 8 204 160 10 184 138 11 197 138 11 200 144 11 
+-206 145 10 206 145 10 197 138 11 198 179 130 195 195 195 198 198 198 170 170 170 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 11 15 17 31 45 49 26 35 39 3 5 6 
+-0 0 0 7 12 13 27 40 45 18 25 28 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 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 
+-124 131 137 190 190 190 168 158 138 156 107 11 197 138 11 200 144 11 197 138 11 192 133 9 
+-180 123 7 185 146 40 198 179 130 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 1 1 1 15 22 25 36 54 60 18 25 28 
+-0 0 0 21 30 33 27 40 45 2 3 3 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 0 0 0 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 
+-151 151 151 198 198 198 190 190 190 168 158 138 148 132 55 156 107 11 156 107 11 169 125 40 
+-168 158 138 187 187 187 190 190 190 210 210 210 246 246 246 253 253 253 253 253 253 180 180 180 
+-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 1 1 1 27 40 45 35 52 58 
+-18 25 28 35 52 58 17 23 26 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-0 0 0 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 7 12 13 33 49 54 
+-52 72 81 36 54 60 6 8 8 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+-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 180 180 180 
+-253 253 253 246 246 246 202 202 202 190 190 190 190 190 190 190 190 190 190 190 190 190 190 190 
+-202 202 202 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 12 17 20 
+-36 54 60 29 43 47 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 
+-21 30 33 35 52 58 6 8 12 0 0 0 0 0 0 0 0 0 0 0 0 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 180 180 180 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 
+-12 17 20 36 54 60 29 43 47 0 0 0 0 0 0 0 0 0 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 106 106 106 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 21 30 33 35 52 58 6 8 12 0 0 0 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 12 17 20 36 54 60 29 43 47 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 21 30 33 35 52 58 6 8 12 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 202 202 202 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 202 202 202 202 202 202 202 202 202 
+-198 198 198 202 202 202 180 180 180 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 12 17 20 36 54 60 29 43 47 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 180 180 180 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 151 151 151 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 21 30 33 35 52 58 6 8 12 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 170 170 170 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 202 202 202 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 6 8 8 33 49 54 29 43 47 6 8 12 
+-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 12 17 20 33 49 54 17 23 26 
+-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 15 22 25 36 54 60 
+-0 0 0 0 0 0 0 0 0 18 18 18 54 54 54 82 82 82 2 2 6 26 26 26 
+-22 22 22 2 2 6 124 127 131 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 
+-253 253 253 253 253 253 253 253 253 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 21 30 33 
+-36 54 60 0 0 0 0 0 0 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 
+-36 54 60 0 0 0 0 0 0 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 36 54 60 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 151 151 151 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 36 54 60 21 30 33 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 180 180 180 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 36 54 60 82 82 82 2 2 6 22 22 22 18 18 18 2 2 6 
+-151 151 151 253 253 253 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 202 202 202 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 36 54 60 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 202 202 202 2 2 6 
+-22 22 22 34 34 34 20 16 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 63 55 20 184 138 11 204 160 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 151 151 151 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 138 132 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 214 187 87 214 187 87 185 146 40 35 31 12 
+-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 185 146 40 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 237 201 50 241 196 14 241 208 19 232 195 16 35 31 12 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 6 6 6 30 30 30 26 26 26 
+-204 160 10 165 152 80 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 124 127 131 
+-174 140 55 210 150 10 234 174 13 246 186 14 246 190 14 246 190 14 246 190 14 237 188 10 
+-98 70 6 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 214 187 87 242 186 14 241 196 14 204 160 10 20 16 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 148 132 55 185 146 40 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 
+-220 174 15 35 31 12 2 2 6 22 22 22 151 151 151 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 214 187 87 239 182 13 237 188 10 213 154 11 35 31 12 
+-2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 62 42 6 220 174 15 
+-237 188 10 237 188 10 113 101 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 6 6 6 
+-22 22 22 54 54 54 148 132 55 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 138 11 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 213 164 39 236 178 12 236 178 12 210 150 10 137 92 6 
+-20 16 6 2 2 6 2 2 6 2 2 6 6 6 6 62 42 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 169 125 40 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 202 202 202 198 198 198 213 164 39 230 174 11 230 174 11 216 158 10 192 133 9 
+-163 110 8 120 80 7 98 70 6 120 80 7 167 114 7 197 138 11 226 170 11 239 182 13 
+-242 186 14 242 186 14 165 152 80 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 185 146 40 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 204 160 10 20 16 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 202 202 202 198 198 198 213 164 39 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 220 174 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 140 55 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 185 146 40 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 213 164 39 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 140 55 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 230 187 11 62 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 169 125 40 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 213 164 39 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 149 139 69 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 20 16 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 220 174 15 149 139 69 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 149 139 69 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 20 16 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 149 139 69 
+-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 149 139 69 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 220 174 15 198 179 130 253 253 253 
+-253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 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 20 16 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 185 146 40 
+-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 169 125 40 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 35 31 12 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 149 139 69 
+-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 113 101 86 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 230 187 11 204 160 10 133 118 54 
+-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 62 42 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 148 132 55 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 148 132 55 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 204 160 10 163 110 8 
+-62 42 6 124 131 137 218 218 218 250 250 250 253 253 253 253 253 253 253 253 253 250 250 250 
+-242 242 242 210 210 210 151 151 151 66 66 66 6 6 6 2 2 6 2 2 6 2 2 6 
+-2 2 6 2 2 6 62 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 185 146 40 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 169 125 40 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 171 120 8 
+-85 57 6 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 85 57 6 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 140 55 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 169 125 40 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 85 57 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 
+-169 125 40 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 133 118 54 169 125 40 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 184 138 11 152 99 6 
+-104 69 6 20 16 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 85 57 6 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 148 132 55 
+-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 133 118 54 156 107 11 
+-163 110 8 167 114 7 171 120 8 180 123 7 184 138 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 134 84 6 
+-85 57 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 62 42 6 137 92 6 171 120 8 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 113 101 86 133 118 54 121 92 8 137 92 6 152 99 6 163 110 8 180 123 7 
+-184 138 11 197 138 11 206 145 10 200 144 11 180 123 7 156 107 11 134 84 6 104 69 6 
+-62 42 6 54 54 54 106 106 106 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 90 61 47 120 80 7 156 107 11 180 123 7 192 133 9 200 144 11 
+-206 145 10 200 144 11 192 133 9 171 120 8 139 102 15 113 101 86 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 113 101 86 121 92 8 120 80 7 
+-137 92 6 152 99 6 152 99 6 152 99 6 134 84 6 120 80 7 98 70 6 88 55 22 
+-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 71 85 57 6 134 84 6 156 107 11 167 114 7 171 120 8 
+-171 120 8 167 114 7 152 99 6 121 92 8 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 
+-94 86 71 98 70 6 104 69 6 104 69 6 104 69 6 85 57 6 88 55 22 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 94 86 71 85 57 6 104 69 6 120 80 7 137 92 6 
+-134 84 6 120 80 7 94 86 71 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 71 94 86 71 94 86 71 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 94 86 71 94 86 71 94 86 71 
+-94 86 71 94 86 71 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 
@@ -2464,10 +1743,11 @@ diff -Nur linux-2.6.39.1/drivers/video/logo/logo_linux_clut224.ppm linux-2.6.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 
-+
-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
+ 
+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
@@ -2831,16 +2111,15 @@ diff -Nur linux-2.6.39.1/drivers/video/logo/logo_linux_mono.pbm linux-2.6.39-LIB
 +0 0 0 0 0 0 0 0 0 0 
 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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
+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
-+# CREATOR: GIMP PNM Filter Version 1.1
-+80 78
- 255
+-255
 -  0   0   0   0   0   0   0   0   0   0   0   0
 -  0   0   0   0   0   0   0   0   0   0   0   0
 -  0   0   0   0   0   0   0   0   0   0   0   0
@@ -4441,6 +3720,9 @@ diff -Nur linux-2.6.39.1/drivers/video/logo/logo_linux_vga16.ppm linux-2.6.39-LI
 -  0   0   0   0   0   0   0   0   0   0   0   0
 -  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
diff --git a/libre/linux-libre/change-default-console-loglevel.patch b/libre/linux-libre/change-default-console-loglevel.patch
index 2685d4d23..22cd69a09 100644
--- a/libre/linux-libre/change-default-console-loglevel.patch
+++ b/libre/linux-libre/change-default-console-loglevel.patch
@@ -1,6 +1,6 @@
 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
+--- 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.. */
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index 107968129..a19c09d75 100644
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.9.3-1 Kernel Configuration
+# Linux/x86 3.11.0-1 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -17,12 +17,10 @@ CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_GPIO=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_DEFAULT_IDLE=y
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
 CONFIG_ARCH_HAS_CPU_AUTOPROBE=y
 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
@@ -30,6 +28,8 @@ 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
@@ -49,6 +49,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
+# CONFIG_COMPILE_TEST is not set
 CONFIG_LOCALVERSION="-LIBRE"
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_HAVE_KERNEL_GZIP=y
@@ -56,11 +57,13 @@ 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
@@ -98,6 +101,9 @@ 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
 
@@ -126,6 +132,9 @@ 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
@@ -169,22 +178,22 @@ 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_EXPERT is not set
 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_SYSCTL_EXCEPTION_TRACE=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
-CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_PCSPKR_PLATFORM=y
-CONFIG_HAVE_PCSPKR_PLATFORM=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
@@ -193,6 +202,7 @@ 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
 
@@ -202,11 +212,11 @@ CONFIG_HAVE_PERF_EVENTS=y
 CONFIG_PERF_EVENTS=y
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_PCI_QUIRKS=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
@@ -250,6 +260,7 @@ 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
@@ -283,6 +294,7 @@ CONFIG_BLK_DEV_THROTTLING=y
 #
 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
@@ -326,20 +338,19 @@ 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_PARAVIRT_GUEST=y
-CONFIG_PARAVIRT_TIME_ACCOUNTING=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=y
-# CONFIG_PARAVIRT_SPINLOCKS is not set
+CONFIG_PARAVIRT_TIME_ACCOUNTING=y
 CONFIG_PARAVIRT_CLOCK=y
-# CONFIG_PARAVIRT_DEBUG is not set
 CONFIG_NO_BOOTMEM=y
 # CONFIG_MEMTEST is not set
 # CONFIG_M486 is not set
@@ -452,6 +463,8 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
 CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CLEANCACHE=y
 CONFIG_FRONTSWAP=y
+CONFIG_ZBUD=y
+CONFIG_ZSWAP=y
 # CONFIG_HIGHPTE is not set
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
@@ -511,6 +524,7 @@ CONFIG_PM_ADVANCED_DEBUG=y
 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
@@ -584,6 +598,7 @@ 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
@@ -621,7 +636,7 @@ CONFIG_PCI_MMCONFIG=y
 CONFIG_PCI_OLPC=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=m
+CONFIG_HOTPLUG_PCI_PCIE=y
 CONFIG_PCIEAER=y
 # CONFIG_PCIE_ECRC is not set
 # CONFIG_PCIEAER_INJECT is not set
@@ -643,6 +658,10 @@ 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
@@ -676,11 +695,11 @@ CONFIG_I82365=m
 CONFIG_TCIC=m
 CONFIG_PCMCIA_PROBE=y
 CONFIG_PCCARD_NONSTATIC=y
-CONFIG_HOTPLUG_PCI=m
+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=m
+CONFIG_HOTPLUG_PCI_ACPI=y
 CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 CONFIG_HOTPLUG_PCI_CPCI=y
 CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
@@ -692,11 +711,15 @@ 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_RAPIDIO_TSI500=y
 
 #
 # Executable file formats / Emulations
@@ -704,6 +727,7 @@ CONFIG_RAPIDIO_TSI500=y
 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
@@ -739,6 +763,7 @@ 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
@@ -757,8 +782,8 @@ 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=y
-CONFIG_INET_TCP_DIAG=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
@@ -1088,7 +1113,6 @@ CONFIG_IP_DCCP_TFRC_LIB=y
 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
@@ -1135,7 +1159,6 @@ CONFIG_COPS_DAYNA=y
 CONFIG_COPS_TANGENT=y
 CONFIG_IPDDP=m
 CONFIG_IPDDP_ENCAP=y
-CONFIG_IPDDP_DECAP=y
 # CONFIG_X25 is not set
 # CONFIG_LAPB is not set
 CONFIG_PHONET=m
@@ -1204,15 +1227,22 @@ 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_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
@@ -1385,17 +1415,21 @@ CONFIG_CEPH_LIB=m
 # 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
-# CONFIG_NFC_LLCP 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
@@ -1412,7 +1446,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_FW_LOADER_USER_HELPER is not set
+CONFIG_FW_LOADER_USER_HELPER=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
@@ -1442,7 +1476,6 @@ CONFIG_MTD_AR7_PARTS=m
 #
 # User Modules And Translation Layers
 #
-CONFIG_MTD_CHAR=m
 CONFIG_MTD_BLKDEVS=m
 CONFIG_MTD_BLOCK=m
 CONFIG_MTD_BLOCK_RO=m
@@ -1524,9 +1557,6 @@ CONFIG_MTD_BLOCK2MTD=m
 #
 # Disk-On-Chip Device Drivers
 #
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
 CONFIG_MTD_DOCG3=m
 CONFIG_BCH_CONST_M=14
 CONFIG_BCH_CONST_T=4
@@ -1535,7 +1565,6 @@ CONFIG_MTD_NAND_ECC_SMC=y
 CONFIG_MTD_NAND=m
 # CONFIG_MTD_NAND_ECC_BCH is not set
 CONFIG_MTD_SM_COMMON=m
-# CONFIG_MTD_NAND_MUSEUM_IDS is not set
 # CONFIG_MTD_NAND_DENALI is not set
 CONFIG_MTD_NAND_IDS=m
 CONFIG_MTD_NAND_RICOH=m
@@ -1571,7 +1600,6 @@ CONFIG_PROC_DEVICETREE=y
 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
@@ -1581,8 +1609,8 @@ CONFIG_OF_MTD=y
 CONFIG_PARPORT=m
 CONFIG_PARPORT_PC=m
 CONFIG_PARPORT_SERIAL=m
-CONFIG_PARPORT_PC_FIFO=y
-CONFIG_PARPORT_PC_SUPERIO=y
+# 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
@@ -1636,9 +1664,9 @@ 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
@@ -1666,6 +1694,7 @@ CONFIG_BMP085_I2C=m
 # 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
 
@@ -1693,7 +1722,7 @@ CONFIG_SENSORS_LIS3_I2C=m
 #
 CONFIG_ALTERA_STAPL=m
 CONFIG_INTEL_MEI=m
-CONFIG_INTEL_MEI_ME=y
+CONFIG_INTEL_MEI_ME=m
 CONFIG_VMWARE_VMCI=m
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
@@ -1791,6 +1820,7 @@ 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
@@ -1902,6 +1932,7 @@ 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
@@ -1981,6 +2012,10 @@ 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
@@ -2004,6 +2039,7 @@ 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
@@ -2040,16 +2076,17 @@ 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_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
@@ -2066,6 +2103,7 @@ 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
@@ -2106,6 +2144,11 @@ 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
@@ -2135,11 +2178,14 @@ 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
@@ -2222,6 +2268,7 @@ 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
@@ -2254,6 +2301,7 @@ 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
@@ -2265,6 +2313,7 @@ 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
@@ -2281,6 +2330,8 @@ 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
@@ -2288,8 +2339,6 @@ CONFIG_STMMAC_ETH=m
 CONFIG_STMMAC_PCI=y
 # CONFIG_STMMAC_DEBUG_FS is not set
 # CONFIG_STMMAC_DA is not set
-CONFIG_STMMAC_RING=y
-# CONFIG_STMMAC_CHAINED is not set
 CONFIG_NET_VENDOR_SUN=y
 CONFIG_HAPPYMEAL=m
 CONFIG_SUNGEM=m
@@ -2336,7 +2385,8 @@ CONFIG_NATIONAL_PHY=m
 CONFIG_STE10XP=m
 CONFIG_LSI_ET1011C_PHY=m
 CONFIG_MICREL_PHY=m
-# CONFIG_MDIO_BITBANG is not set
+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
@@ -2367,6 +2417,7 @@ 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
@@ -2434,7 +2485,7 @@ CONFIG_ATH9K=m
 CONFIG_ATH9K_PCI=y
 CONFIG_ATH9K_AHB=y
 # CONFIG_ATH9K_DEBUGFS is not set
-CONFIG_ATH9K_RATE_CONTROL=y
+# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set
 CONFIG_ATH9K_HTC=m
 # CONFIG_ATH9K_HTC_DEBUGFS is not set
 CONFIG_CARL9170=m
@@ -2445,12 +2496,18 @@ 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_BCMA_EXTRA is not set
 CONFIG_B43_SSB=y
 CONFIG_B43_PCI_AUTOSELECT=y
 CONFIG_B43_PCICORE_AUTOSELECT=y
@@ -2479,7 +2536,6 @@ CONFIG_BRCMUTIL=m
 CONFIG_BRCMSMAC=m
 CONFIG_BRCMFMAC=m
 CONFIG_BRCMFMAC_SDIO=y
-# CONFIG_BRCMFMAC_SDIO_OOB is not set
 CONFIG_BRCMFMAC_USB=y
 # CONFIG_BRCM_TRACING is not set
 # CONFIG_BRCMDBG is not set
@@ -2494,6 +2550,7 @@ CONFIG_HOSTAP_CS=m
 CONFIG_IWLWIFI=m
 CONFIG_IWLDVM=m
 CONFIG_IWLMVM=m
+CONFIG_IWLWIFI_OPMODE_MODULAR=y
 
 #
 # Debugging Options
@@ -2546,6 +2603,7 @@ 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
@@ -2556,13 +2614,17 @@ 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_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
@@ -2580,6 +2642,9 @@ 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
@@ -2862,6 +2927,9 @@ 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
@@ -2941,11 +3009,12 @@ 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_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
 
@@ -2963,6 +3032,8 @@ 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
@@ -2998,7 +3069,6 @@ CONFIG_N_GSM=m
 CONFIG_TRACE_ROUTER=m
 CONFIG_TRACE_SINK=m
 # CONFIG_DEVKMEM is not set
-# CONFIG_STALDRV is not set
 
 #
 # Serial drivers
@@ -3039,6 +3109,7 @@ 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_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
 CONFIG_PPDEV=m
@@ -3135,7 +3206,6 @@ 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
@@ -3174,6 +3244,7 @@ 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_SPI is not set
 # CONFIG_SPI_OC_TINY is not set
 # CONFIG_SPI_PXA2XX is not set
 # CONFIG_SPI_PXA2XX_PCI is not set
@@ -3232,6 +3303,7 @@ 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:
@@ -3319,6 +3391,8 @@ 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
@@ -3338,6 +3412,7 @@ 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
@@ -3365,6 +3440,7 @@ 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
@@ -3377,7 +3453,7 @@ CONFIG_SENSORS_MAX6642=m
 CONFIG_SENSORS_MAX6650=m
 CONFIG_SENSORS_MAX6697=m
 CONFIG_SENSORS_MCP3021=m
-CONFIG_SENSORS_NTC_THERMISTOR=m
+CONFIG_SENSORS_NCT6775=m
 CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PC87427=m
 CONFIG_SENSORS_PCF8591=m
@@ -3445,10 +3521,15 @@ CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 # 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_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
@@ -3496,6 +3577,7 @@ 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
@@ -3550,47 +3632,52 @@ CONFIG_BCMA_DRIVER_GPIO=y
 # 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_MFD_RTSX_PCI=m
+CONFIG_ABX500_CORE=y
+# CONFIG_MFD_STMPE is not set
+# CONFIG_MFD_SYSCON is not set
 CONFIG_MFD_TI_AM335X_TSCADC=m
-CONFIG_HTC_PASIC3=m
-CONFIG_UCB1400_CORE=m
-CONFIG_MFD_LM3533=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_STMPE 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_DA9052_SPI 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_MFD_PCF50633=m
-CONFIG_PCF50633_ADC=m
-CONFIG_PCF50633_GPIO=m
-CONFIG_MFD_MC13783=m
-CONFIG_MFD_MC13XXX=m
-# CONFIG_MFD_MC13XXX_SPI is not set
-CONFIG_MFD_MC13XXX_I2C=m
-CONFIG_ABX500_CORE=y
-# CONFIG_EZX_PCAP is not set
-CONFIG_MFD_CS5535=m
-# CONFIG_MFD_TIMBERDALE is not set
-CONFIG_LPC_SCH=m
-CONFIG_LPC_ICH=m
-CONFIG_MFD_RDC321X=m
-# CONFIG_MFD_JANZ_CMODIO is not set
-CONFIG_MFD_VX855=m
-CONFIG_MFD_WL1273_CORE=m
-# CONFIG_MFD_SYSCON is not set
-CONFIG_MFD_VIPERBOARD=m
-CONFIG_MFD_RETU=m
 # CONFIG_REGULATOR is not set
 CONFIG_MEDIA_SUPPORT=m
 
@@ -3618,6 +3705,7 @@ 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
@@ -3718,6 +3806,7 @@ CONFIG_USB_ZR364XX=m
 CONFIG_USB_STKWEBCAM=m
 CONFIG_USB_S2255=m
 CONFIG_USB_SN9C102=m
+CONFIG_VIDEO_USBTV=m
 
 #
 # Analog TV USB devices
@@ -3776,7 +3865,6 @@ CONFIG_DVB_USB_FRIIO=m
 CONFIG_DVB_USB_AZ6027=m
 CONFIG_DVB_USB_TECHNISAT_USB2=m
 CONFIG_DVB_USB_V2=m
-CONFIG_DVB_USB_CYPRESS_FIRMWARE=m
 CONFIG_DVB_USB_AF9015=m
 CONFIG_DVB_USB_AF9035=m
 CONFIG_DVB_USB_ANYSEE=m
@@ -3922,16 +4010,19 @@ CONFIG_MEDIA_COMMON_OPTIONS=y
 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
 
 #
@@ -3945,9 +4036,11 @@ 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
@@ -3964,6 +4057,9 @@ 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
 
 #
@@ -3983,6 +4079,7 @@ CONFIG_VIDEO_ADV7175=m
 #
 # Camera sensor devices
 #
+CONFIG_VIDEO_OV7640=m
 CONFIG_VIDEO_MT9V011=m
 
 #
@@ -4003,7 +4100,6 @@ CONFIG_VIDEO_M52790=m
 #
 # Sensors used on soc_camera driver
 #
-CONFIG_MEDIA_ATTACH=y
 CONFIG_MEDIA_TUNER=m
 CONFIG_MEDIA_TUNER_SIMPLE=m
 CONFIG_MEDIA_TUNER_TDA8290=m
@@ -4033,6 +4129,8 @@ 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
@@ -4214,10 +4312,9 @@ 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_OF_DISPLAY_TIMING is not set
-# CONFIG_OF_VIDEOMODE is not set
 CONFIG_HDMI=y
 CONFIG_FB=y
 CONFIG_FIRMWARE_EDID=y
@@ -4232,7 +4329,6 @@ CONFIG_FB_SYS_COPYAREA=m
 CONFIG_FB_SYS_IMAGEBLIT=m
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 CONFIG_FB_SYS_FOPS=m
-# CONFIG_FB_WMT_GE_ROPS is not set
 CONFIG_FB_DEFERRED_IO=y
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
@@ -4293,12 +4389,15 @@ CONFIG_FB_VIRTUAL=m
 # 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
@@ -4311,7 +4410,7 @@ CONFIG_LCD_PLATFORM=m
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_GENERIC is not set
 CONFIG_BACKLIGHT_LM3533=m
-CONFIG_BACKLIGHT_PWM=m
+# CONFIG_BACKLIGHT_PWM is not set
 CONFIG_BACKLIGHT_APPLE=m
 # CONFIG_BACKLIGHT_SAHARA is not set
 # CONFIG_BACKLIGHT_ADP8860 is not set
@@ -4333,18 +4432,6 @@ 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
@@ -4366,6 +4453,7 @@ 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
@@ -4497,6 +4585,7 @@ 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
@@ -4541,6 +4630,7 @@ 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
@@ -4568,6 +4658,7 @@ 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
@@ -4578,9 +4669,11 @@ 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
@@ -4613,7 +4706,6 @@ 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
@@ -4633,7 +4725,6 @@ 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
@@ -4650,9 +4741,6 @@ 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
@@ -4663,10 +4751,9 @@ CONFIG_USB=m
 #
 # Miscellaneous USB options
 #
+CONFIG_USB_DEFAULT_PERSIST=y
 CONFIG_USB_DYNAMIC_MINORS=y
-CONFIG_USB_SUSPEND=y
 # CONFIG_USB_OTG is not set
-# CONFIG_USB_DWC3 is not set
 CONFIG_USB_MON=m
 CONFIG_USB_WUSB=m
 CONFIG_USB_WUSB_CBAF=m
@@ -4682,14 +4769,16 @@ 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_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_EHCI_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
@@ -4705,12 +4794,14 @@ 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_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_UX500_DMA is not set
 CONFIG_MUSB_PIO_ONLY=y
-CONFIG_USB_CHIPIDEA=m
-CONFIG_USB_CHIPIDEA_UDC=y
-CONFIG_USB_CHIPIDEA_HOST=y
-# CONFIG_USB_CHIPIDEA_DEBUG is not set
 CONFIG_USB_RENESAS_USBHS=m
 
 #
@@ -4750,6 +4841,10 @@ CONFIG_USB_STORAGE_ENE_UB6250=m
 #
 CONFIG_USB_MDC800=m
 CONFIG_USB_MICROTEK=m
+# CONFIG_USB_DWC3 is not set
+CONFIG_USB_CHIPIDEA=m
+CONFIG_USB_CHIPIDEA_UDC=y
+# CONFIG_USB_CHIPIDEA_DEBUG is not set
 
 #
 # USB port drivers
@@ -4821,9 +4916,12 @@ 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_FLASHLOADER=m
+CONFIG_USB_SERIAL_SUUNTO=m
 # CONFIG_USB_SERIAL_DEBUG is not set
 
 #
@@ -4852,19 +4950,21 @@ CONFIG_USB_ISIGHTFW=m
 CONFIG_USB_YUREX=m
 CONFIG_USB_EZUSB_FX2=m
 CONFIG_USB_HSIC_USB3503=m
-
-#
-# USB Physical Layer drivers
-#
-# CONFIG_OMAP_USB3 is not set
-# CONFIG_OMAP_CONTROL_USB is not set
-CONFIG_USB_ISP1301=m
-CONFIG_USB_RCAR_PHY=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
@@ -4876,10 +4976,12 @@ 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_GADGET_MUSB_HDRC=m
+CONFIG_USB_MV_U3D=m
 CONFIG_USB_M66592=m
 CONFIG_USB_AMD5536UDC=m
 CONFIG_USB_NET2272=m
@@ -4891,6 +4993,15 @@ 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
@@ -4917,13 +5028,6 @@ CONFIG_USB_G_DBGP=m
 # CONFIG_USB_G_DBGP_PRINTK is not set
 CONFIG_USB_G_DBGP_SERIAL=y
 CONFIG_USB_G_WEBCAM=m
-
-#
-# OTG and related infrastructure
-#
-CONFIG_USB_OTG_UTILS=y
-# CONFIG_USB_GPIO_VBUS is not set
-CONFIG_NOP_USB_XCEIV=m
 CONFIG_UWB=m
 CONFIG_UWB_HWA=m
 CONFIG_UWB_WHCI=m
@@ -4990,6 +5094,7 @@ 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
@@ -5004,11 +5109,11 @@ CONFIG_LEDS_TCA6507=m
 CONFIG_LEDS_LM355x=m
 CONFIG_LEDS_OT200=m
 CONFIG_LEDS_BLINKM=m
-CONFIG_LEDS_TRIGGERS=y
 
 #
 # LED Triggers
 #
+CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=m
 CONFIG_LEDS_TRIGGER_ONESHOT=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
@@ -5021,6 +5126,7 @@ 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
@@ -5073,6 +5179,7 @@ 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
@@ -5137,11 +5244,13 @@ CONFIG_DMADEVICES=y
 #
 CONFIG_INTEL_MID_DMAC=m
 CONFIG_INTEL_IOATDMA=m
+CONFIG_DW_DMAC_CORE=m
 CONFIG_DW_DMAC=m
-# CONFIG_DW_DMAC_BIG_ENDIAN_IO is not set
+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
 
 #
@@ -5170,6 +5279,7 @@ CONFIG_VFIO_IOMMU_TYPE1=m
 CONFIG_VFIO=m
 CONFIG_VFIO_PCI=m
 CONFIG_VFIO_PCI_VGA=y
+CONFIG_VIRT_DRIVERS=y
 CONFIG_VIRTIO=y
 
 #
@@ -5208,17 +5318,14 @@ 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
@@ -5247,12 +5354,14 @@ 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
@@ -5274,6 +5383,7 @@ 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
@@ -5302,11 +5412,10 @@ CONFIG_COMEDI_NI_6527=m
 CONFIG_COMEDI_NI_65XX=m
 CONFIG_COMEDI_NI_660X=m
 CONFIG_COMEDI_NI_670X=m
-CONFIG_COMEDI_NI_LABPC=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
@@ -5329,8 +5438,8 @@ CONFIG_COMEDI_8255=m
 CONFIG_COMEDI_FC=m
 CONFIG_COMEDI_AMPLC_DIO200=m
 CONFIG_COMEDI_AMPLC_PC236=m
-CONFIG_COMEDI_AMPLC_PC263=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
@@ -5353,9 +5462,9 @@ 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_ZSMALLOC=y
 CONFIG_WLAGS49_H2=m
 CONFIG_WLAGS49_H25=m
 CONFIG_FB_SM7XX=m
@@ -5397,14 +5506,8 @@ 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_VIDEO_GO7007_OV7640=m
-CONFIG_VIDEO_GO7007_SAA7113=m
-CONFIG_VIDEO_GO7007_SAA7115=m
-CONFIG_VIDEO_GO7007_TW9903=m
-CONFIG_VIDEO_GO7007_UDA1342=m
-CONFIG_VIDEO_GO7007_SONY_TUNER=m
-CONFIG_VIDEO_GO7007_TW2804=m
 CONFIG_SOLO6X10=m
 CONFIG_LIRC_STAGING=y
 CONFIG_LIRC_BT829=m
@@ -5429,14 +5532,16 @@ 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=y
+CONFIG_ZCACHE=m
+# CONFIG_ZCACHE_DEBUG is not set
+# CONFIG_USB_DWC2 is not set
+CONFIG_USB_BTMTK=m
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
@@ -5486,6 +5591,9 @@ 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
@@ -5512,7 +5620,6 @@ CONFIG_STE_MODEM_RPROC=m
 #
 # Rpmsg drivers
 #
-CONFIG_VIRT_DRIVERS=y
 # CONFIG_PM_DEVFREQ is not set
 CONFIG_EXTCON=m
 
@@ -5524,10 +5631,18 @@ CONFIG_MEMORY=y
 # CONFIG_IIO 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
@@ -5535,9 +5650,6 @@ CONFIG_SERIAL_IPOCTAL=m
 CONFIG_EDD=m
 # CONFIG_EDD_OFF is not set
 CONFIG_FIRMWARE_MEMMAP=y
-CONFIG_EFI_VARS=y
-CONFIG_EFI_VARS_PSTORE=y
-# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
 CONFIG_DELL_RBU=m
 CONFIG_DCDBAS=m
 CONFIG_DMIID=y
@@ -5547,6 +5659,11 @@ 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
@@ -5575,6 +5692,7 @@ 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
@@ -5587,6 +5705,8 @@ CONFIG_OCFS2_FS_STATS=y
 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
@@ -5713,6 +5833,8 @@ 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
@@ -5722,10 +5844,12 @@ 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
@@ -5735,6 +5859,7 @@ 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
@@ -5775,6 +5900,7 @@ 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
@@ -5833,68 +5959,95 @@ CONFIG_DLM=m
 # 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_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_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_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_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_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_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_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
@@ -5906,16 +6059,12 @@ 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_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_DEBUG_PAGEALLOC 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
@@ -5944,6 +6093,7 @@ CONFIG_FUNCTION_GRAPH_TRACER=y
 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
@@ -5960,30 +6110,38 @@ CONFIG_FTRACE_MCOUNT_RECORD=y
 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_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_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
@@ -5999,8 +6157,8 @@ 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_STRICT_USER_COPY_CHECKS is not set
 # CONFIG_DEBUG_NMI_SELFTEST is not set
+# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set
 
 #
 # Security options
@@ -6022,14 +6180,16 @@ CONFIG_SECURITY_TOMOYO=y
 CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
 CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
 # CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
-CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init"
+CONFIG_SECURITY_TOMOYO_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 is not set
+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
@@ -6038,8 +6198,6 @@ CONFIG_ASYNC_MEMCPY=m
 CONFIG_ASYNC_XOR=m
 CONFIG_ASYNC_PQ=m
 CONFIG_ASYNC_RAID6_RECOV=m
-CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y
-CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y
 CONFIG_CRYPTO=y
 
 #
@@ -6092,6 +6250,7 @@ CONFIG_CRYPTO_XTS=m
 #
 # Hash modes
 #
+CONFIG_CRYPTO_CMAC=m
 CONFIG_CRYPTO_HMAC=m
 CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_VMAC=m
@@ -6150,6 +6309,8 @@ CONFIG_CRYPTO_TWOFISH_586=m
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_ZLIB=m
 CONFIG_CRYPTO_LZO=y
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
 
 #
 # Random Number Generation
@@ -6171,6 +6332,7 @@ 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
@@ -6182,8 +6344,7 @@ CONFIG_KVM=m
 CONFIG_KVM_INTEL=m
 CONFIG_KVM_AMD=m
 CONFIG_KVM_MMU_AUDIT=y
-CONFIG_VHOST_NET=m
-CONFIG_TCM_VHOST=m
+CONFIG_KVM_DEVICE_ASSIGNMENT=y
 CONFIG_LGUEST=m
 CONFIG_BINARY_PRINTF=y
 
@@ -6194,6 +6355,7 @@ 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
@@ -6217,6 +6379,9 @@ CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 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
@@ -6231,6 +6396,7 @@ 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
@@ -6259,3 +6425,16 @@ CONFIG_DDR=y
 CONFIG_MPILIB=m
 CONFIG_OID_REGISTRY=m
 CONFIG_UCS2_STRING=y
+CONFIG_FONT_SUPPORT=y
+CONFIG_FONTS=y
+# CONFIG_FONT_8x8 is not set
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
+CONFIG_FONT_AUTOSELECT=y
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index 24d6be2bd..169a2285b 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.9.4-1 Kernel Configuration
+# Linux/x86 3.11.0-1 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -18,12 +18,10 @@ CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
 CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_GPIO=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_DEFAULT_IDLE=y
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
 CONFIG_ARCH_HAS_CPU_AUTOPROBE=y
 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
@@ -31,6 +29,8 @@ 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
@@ -50,6 +50,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
+# CONFIG_COMPILE_TEST is not set
 CONFIG_LOCALVERSION="-LIBRE"
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_HAVE_KERNEL_GZIP=y
@@ -57,11 +58,13 @@ 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
@@ -100,6 +103,10 @@ 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
 
@@ -130,6 +137,9 @@ 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
@@ -159,7 +169,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
@@ -176,22 +186,22 @@ 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_EXPERT is not set
 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_SYSCTL_EXCEPTION_TRACE=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
-CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_PCSPKR_PLATFORM=y
-CONFIG_HAVE_PCSPKR_PLATFORM=y
 CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 CONFIG_EPOLL=y
@@ -200,6 +210,7 @@ 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
 
@@ -209,11 +220,11 @@ CONFIG_HAVE_PERF_EVENTS=y
 CONFIG_PERF_EVENTS=y
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_PCI_QUIRKS=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
@@ -258,6 +269,7 @@ 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
@@ -289,6 +301,7 @@ CONFIG_BLK_DEV_THROTTLING=y
 #
 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
@@ -336,8 +349,10 @@ CONFIG_X86_MPPARSE=y
 # CONFIG_X86_INTEL_LPSS is not set
 CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_PARAVIRT_GUEST=y
-CONFIG_PARAVIRT_TIME_ACCOUNTING=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
@@ -346,10 +361,8 @@ CONFIG_XEN_MAX_DOMAIN_MEMORY=500
 CONFIG_XEN_SAVE_RESTORE=y
 # CONFIG_XEN_DEBUG_FS is not set
 CONFIG_KVM_GUEST=y
-CONFIG_PARAVIRT=y
-# CONFIG_PARAVIRT_SPINLOCKS is not set
+CONFIG_PARAVIRT_TIME_ACCOUNTING=y
 CONFIG_PARAVIRT_CLOCK=y
-# CONFIG_PARAVIRT_DEBUG is not set
 CONFIG_NO_BOOTMEM=y
 # CONFIG_MEMTEST is not set
 # CONFIG_MK8 is not set
@@ -453,6 +466,9 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
 CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CLEANCACHE=y
 CONFIG_FRONTSWAP=y
+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
@@ -512,6 +528,7 @@ CONFIG_PM_ADVANCED_DEBUG=y
 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
@@ -538,7 +555,7 @@ CONFIG_ACPI_BLACKLIST_YEAR=0
 CONFIG_ACPI_PCI_SLOT=y
 CONFIG_X86_PM_TIMER=y
 CONFIG_ACPI_CONTAINER=y
-CONFIG_ACPI_HOTPLUG_MEMORY=m
+CONFIG_ACPI_HOTPLUG_MEMORY=y
 CONFIG_ACPI_SBS=m
 CONFIG_ACPI_HED=y
 CONFIG_ACPI_CUSTOM_METHOD=m
@@ -577,6 +594,7 @@ 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
 
@@ -606,7 +624,7 @@ CONFIG_PCI_MMCONFIG=y
 CONFIG_PCI_XEN=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=m
+CONFIG_HOTPLUG_PCI_PCIE=y
 CONFIG_PCIEAER=y
 # CONFIG_PCIE_ECRC is not set
 # CONFIG_PCIEAER_INJECT is not set
@@ -629,6 +647,10 @@ 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
@@ -648,8 +670,8 @@ CONFIG_YENTA_TOSHIBA=y
 CONFIG_PD6729=m
 CONFIG_I82092=m
 CONFIG_PCCARD_NONSTATIC=y
-CONFIG_HOTPLUG_PCI=m
-CONFIG_HOTPLUG_PCI_ACPI=m
+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
@@ -661,11 +683,15 @@ 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_RAPIDIO_TSI500=y
 
 #
 # Executable file formats / Emulations
@@ -674,6 +700,7 @@ 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
@@ -716,6 +743,7 @@ 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
@@ -734,8 +762,8 @@ 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=y
-CONFIG_INET_TCP_DIAG=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
@@ -1065,7 +1093,6 @@ CONFIG_IP_DCCP_TFRC_LIB=y
 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
@@ -1108,7 +1135,6 @@ CONFIG_ATALK=m
 CONFIG_DEV_APPLETALK=m
 CONFIG_IPDDP=m
 CONFIG_IPDDP_ENCAP=y
-CONFIG_IPDDP_DECAP=y
 # CONFIG_X25 is not set
 # CONFIG_LAPB is not set
 CONFIG_PHONET=m
@@ -1177,16 +1203,23 @@ 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_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
@@ -1354,17 +1387,21 @@ CONFIG_CEPH_LIB=m
 # 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
-# CONFIG_NFC_LLCP 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
 
 #
@@ -1382,7 +1419,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_FW_LOADER_USER_HELPER is not set
+CONFIG_FW_LOADER_USER_HELPER=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 CONFIG_SYS_HYPERVISOR=y
@@ -1410,7 +1447,6 @@ CONFIG_MTD_AR7_PARTS=m
 #
 # User Modules And Translation Layers
 #
-CONFIG_MTD_CHAR=m
 CONFIG_MTD_BLKDEVS=m
 CONFIG_MTD_BLOCK=m
 CONFIG_MTD_BLOCK_RO=m
@@ -1491,9 +1527,6 @@ CONFIG_MTD_BLOCK2MTD=m
 #
 # Disk-On-Chip Device Drivers
 #
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
 CONFIG_MTD_DOCG3=m
 CONFIG_BCH_CONST_M=14
 CONFIG_BCH_CONST_T=4
@@ -1502,7 +1535,6 @@ CONFIG_MTD_NAND_ECC_SMC=y
 CONFIG_MTD_NAND=m
 # CONFIG_MTD_NAND_ECC_BCH is not set
 CONFIG_MTD_SM_COMMON=m
-# CONFIG_MTD_NAND_MUSEUM_IDS is not set
 # CONFIG_MTD_NAND_DENALI is not set
 CONFIG_MTD_NAND_IDS=m
 CONFIG_MTD_NAND_RICOH=m
@@ -1530,8 +1562,8 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
 CONFIG_PARPORT=m
 CONFIG_PARPORT_PC=m
 CONFIG_PARPORT_SERIAL=m
-CONFIG_PARPORT_PC_FIFO=y
-CONFIG_PARPORT_PC_SUPERIO=y
+# 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
@@ -1585,9 +1617,9 @@ 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
@@ -1615,6 +1647,7 @@ CONFIG_BMP085_I2C=m
 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
 
@@ -1642,7 +1675,7 @@ CONFIG_SENSORS_LIS3_I2C=m
 #
 CONFIG_ALTERA_STAPL=m
 CONFIG_INTEL_MEI=m
-CONFIG_INTEL_MEI_ME=y
+CONFIG_INTEL_MEI_ME=m
 CONFIG_VMWARE_VMCI=m
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
@@ -1736,8 +1769,10 @@ 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
@@ -1830,6 +1865,7 @@ 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
@@ -1905,6 +1941,10 @@ 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
@@ -1928,6 +1968,7 @@ 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
@@ -1965,16 +2006,17 @@ 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_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
@@ -1991,6 +2033,7 @@ 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
@@ -2031,6 +2074,11 @@ 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
@@ -2056,11 +2104,13 @@ 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
@@ -2140,6 +2190,7 @@ 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
@@ -2169,6 +2220,7 @@ 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
@@ -2180,6 +2232,7 @@ 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
@@ -2195,6 +2248,8 @@ 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
@@ -2202,8 +2257,6 @@ CONFIG_STMMAC_ETH=m
 CONFIG_STMMAC_PCI=y
 # CONFIG_STMMAC_DEBUG_FS is not set
 # CONFIG_STMMAC_DA is not set
-CONFIG_STMMAC_RING=y
-# CONFIG_STMMAC_CHAINED is not set
 CONFIG_NET_VENDOR_SUN=y
 CONFIG_HAPPYMEAL=m
 CONFIG_SUNGEM=m
@@ -2250,7 +2303,8 @@ CONFIG_NATIONAL_PHY=m
 CONFIG_STE10XP=m
 CONFIG_LSI_ET1011C_PHY=m
 CONFIG_MICREL_PHY=m
-# CONFIG_MDIO_BITBANG is not set
+CONFIG_MDIO_BITBANG=m
+# CONFIG_MDIO_GPIO is not set
 # CONFIG_MICREL_KS8995MA is not set
 CONFIG_PLIP=m
 CONFIG_PPP=m
@@ -2278,6 +2332,7 @@ 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
@@ -2345,7 +2400,7 @@ CONFIG_ATH9K=m
 CONFIG_ATH9K_PCI=y
 CONFIG_ATH9K_AHB=y
 # CONFIG_ATH9K_DEBUGFS is not set
-CONFIG_ATH9K_RATE_CONTROL=y
+# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set
 CONFIG_ATH9K_HTC=m
 # CONFIG_ATH9K_HTC_DEBUGFS is not set
 CONFIG_CARL9170=m
@@ -2356,12 +2411,18 @@ 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_BCMA_EXTRA is not set
 CONFIG_B43_SSB=y
 CONFIG_B43_PCI_AUTOSELECT=y
 CONFIG_B43_PCICORE_AUTOSELECT=y
@@ -2390,7 +2451,6 @@ CONFIG_BRCMUTIL=m
 CONFIG_BRCMSMAC=m
 CONFIG_BRCMFMAC=m
 CONFIG_BRCMFMAC_SDIO=y
-# CONFIG_BRCMFMAC_SDIO_OOB is not set
 CONFIG_BRCMFMAC_USB=y
 # CONFIG_BRCM_TRACING is not set
 # CONFIG_BRCMDBG is not set
@@ -2405,6 +2465,7 @@ CONFIG_HOSTAP_CS=m
 CONFIG_IWLWIFI=m
 CONFIG_IWLDVM=m
 CONFIG_IWLMVM=m
+CONFIG_IWLWIFI_OPMODE_MODULAR=y
 
 #
 # Debugging Options
@@ -2457,6 +2518,7 @@ 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
@@ -2467,13 +2529,17 @@ 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_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
@@ -2491,6 +2557,9 @@ 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
@@ -2754,6 +2823,9 @@ 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
@@ -2834,6 +2906,7 @@ 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
@@ -2887,7 +2960,6 @@ CONFIG_N_GSM=m
 CONFIG_TRACE_ROUTER=m
 CONFIG_TRACE_SINK=m
 # CONFIG_DEVKMEM is not set
-# CONFIG_STALDRV is not set
 
 #
 # Serial drivers
@@ -2926,6 +2998,7 @@ 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_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
 CONFIG_PPDEV=m
@@ -3020,7 +3093,6 @@ 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
@@ -3197,6 +3269,8 @@ 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
@@ -3216,6 +3290,7 @@ 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
@@ -3243,6 +3318,7 @@ 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
@@ -3255,6 +3331,7 @@ 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
@@ -3323,10 +3400,15 @@ CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 # 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_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
@@ -3373,6 +3455,7 @@ 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
 
 #
@@ -3421,46 +3504,52 @@ CONFIG_BCMA_DRIVER_GPIO=y
 # 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_MFD_RTSX_PCI=m
+CONFIG_ABX500_CORE=y
+# CONFIG_MFD_STMPE is not set
+# CONFIG_MFD_SYSCON is not set
 CONFIG_MFD_TI_AM335X_TSCADC=m
-CONFIG_HTC_PASIC3=m
-CONFIG_UCB1400_CORE=m
-CONFIG_MFD_LM3533=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_STMPE 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_DA9052_SPI 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_MFD_PCF50633=m
-CONFIG_PCF50633_ADC=m
-CONFIG_PCF50633_GPIO=m
-CONFIG_MFD_MC13783=m
-CONFIG_MFD_MC13XXX=m
-# CONFIG_MFD_MC13XXX_SPI is not set
-CONFIG_MFD_MC13XXX_I2C=m
-CONFIG_ABX500_CORE=y
-# CONFIG_EZX_PCAP is not set
-CONFIG_MFD_CS5535=m
-# CONFIG_MFD_TIMBERDALE is not set
-CONFIG_LPC_SCH=m
-CONFIG_LPC_ICH=m
-CONFIG_MFD_RDC321X=m
-# CONFIG_MFD_JANZ_CMODIO is not set
-CONFIG_MFD_VX855=m
-CONFIG_MFD_WL1273_CORE=m
-CONFIG_MFD_VIPERBOARD=m
-CONFIG_MFD_RETU=m
 # CONFIG_REGULATOR is not set
 CONFIG_MEDIA_SUPPORT=m
 
@@ -3488,6 +3577,7 @@ 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
@@ -3588,6 +3678,7 @@ CONFIG_USB_ZR364XX=m
 CONFIG_USB_STKWEBCAM=m
 CONFIG_USB_S2255=m
 CONFIG_USB_SN9C102=m
+CONFIG_VIDEO_USBTV=m
 
 #
 # Analog TV USB devices
@@ -3646,7 +3737,6 @@ CONFIG_DVB_USB_FRIIO=m
 CONFIG_DVB_USB_AZ6027=m
 CONFIG_DVB_USB_TECHNISAT_USB2=m
 CONFIG_DVB_USB_V2=m
-CONFIG_DVB_USB_CYPRESS_FIRMWARE=m
 CONFIG_DVB_USB_AF9015=m
 CONFIG_DVB_USB_AF9035=m
 CONFIG_DVB_USB_ANYSEE=m
@@ -3790,16 +3880,19 @@ CONFIG_MEDIA_COMMON_OPTIONS=y
 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
 
 #
@@ -3813,9 +3906,11 @@ 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
@@ -3832,6 +3927,9 @@ 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
 
 #
@@ -3851,6 +3949,7 @@ CONFIG_VIDEO_ADV7175=m
 #
 # Camera sensor devices
 #
+CONFIG_VIDEO_OV7640=m
 CONFIG_VIDEO_MT9V011=m
 
 #
@@ -3871,7 +3970,6 @@ CONFIG_VIDEO_M52790=m
 #
 # Sensors used on soc_camera driver
 #
-CONFIG_MEDIA_ATTACH=y
 CONFIG_MEDIA_TUNER=m
 CONFIG_MEDIA_TUNER_SIMPLE=m
 CONFIG_MEDIA_TUNER_TDA8290=m
@@ -3901,6 +3999,8 @@ 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
@@ -4076,6 +4176,7 @@ 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
@@ -4092,7 +4193,6 @@ CONFIG_FB_SYS_COPYAREA=m
 CONFIG_FB_SYS_IMAGEBLIT=m
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 CONFIG_FB_SYS_FOPS=m
-# CONFIG_FB_WMT_GE_ROPS is not set
 CONFIG_FB_DEFERRED_IO=y
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
@@ -4139,7 +4239,6 @@ CONFIG_FB_VT8623=m
 # 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
@@ -4151,12 +4250,14 @@ CONFIG_XEN_FBDEV_FRONTEND=m
 # 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
@@ -4189,18 +4290,6 @@ 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
@@ -4221,6 +4310,7 @@ 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
@@ -4315,6 +4405,7 @@ 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
@@ -4358,6 +4449,7 @@ 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
@@ -4385,6 +4477,7 @@ 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
@@ -4395,9 +4488,11 @@ 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
@@ -4430,7 +4525,6 @@ 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
@@ -4450,7 +4544,6 @@ 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
@@ -4467,9 +4560,6 @@ 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
@@ -4480,10 +4570,9 @@ CONFIG_USB=m
 #
 # Miscellaneous USB options
 #
+CONFIG_USB_DEFAULT_PERSIST=y
 CONFIG_USB_DYNAMIC_MINORS=y
-CONFIG_USB_SUSPEND=y
 # CONFIG_USB_OTG is not set
-# CONFIG_USB_DWC3 is not set
 CONFIG_USB_MON=m
 CONFIG_USB_WUSB=m
 CONFIG_USB_WUSB_CBAF=m
@@ -4499,14 +4588,16 @@ 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_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_EHCI_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
@@ -4522,12 +4613,14 @@ 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_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_UX500_DMA is not set
 CONFIG_MUSB_PIO_ONLY=y
-CONFIG_USB_CHIPIDEA=m
-CONFIG_USB_CHIPIDEA_UDC=y
-CONFIG_USB_CHIPIDEA_HOST=y
-# CONFIG_USB_CHIPIDEA_DEBUG is not set
 CONFIG_USB_RENESAS_USBHS=m
 
 #
@@ -4567,6 +4660,10 @@ CONFIG_USB_STORAGE_ENE_UB6250=m
 #
 CONFIG_USB_MDC800=m
 CONFIG_USB_MICROTEK=m
+# CONFIG_USB_DWC3 is not set
+CONFIG_USB_CHIPIDEA=m
+CONFIG_USB_CHIPIDEA_UDC=y
+# CONFIG_USB_CHIPIDEA_DEBUG is not set
 
 #
 # USB port drivers
@@ -4638,9 +4735,12 @@ 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_FLASHLOADER=m
+CONFIG_USB_SERIAL_SUUNTO=m
 # CONFIG_USB_SERIAL_DEBUG is not set
 
 #
@@ -4669,19 +4769,21 @@ CONFIG_USB_ISIGHTFW=m
 CONFIG_USB_YUREX=m
 CONFIG_USB_EZUSB_FX2=m
 CONFIG_USB_HSIC_USB3503=m
-
-#
-# USB Physical Layer drivers
-#
-# CONFIG_OMAP_USB3 is not set
-# CONFIG_OMAP_CONTROL_USB is not set
-CONFIG_USB_ISP1301=m
-CONFIG_USB_RCAR_PHY=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
@@ -4692,10 +4794,12 @@ 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_GADGET_MUSB_HDRC=m
+CONFIG_USB_MV_U3D=m
 CONFIG_USB_M66592=m
 CONFIG_USB_AMD5536UDC=m
 CONFIG_USB_NET2272=m
@@ -4707,6 +4811,15 @@ 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
@@ -4733,13 +4846,6 @@ CONFIG_USB_G_DBGP=m
 # CONFIG_USB_G_DBGP_PRINTK is not set
 CONFIG_USB_G_DBGP_SERIAL=y
 CONFIG_USB_G_WEBCAM=m
-
-#
-# OTG and related infrastructure
-#
-CONFIG_USB_OTG_UTILS=y
-# CONFIG_USB_GPIO_VBUS is not set
-CONFIG_NOP_USB_XCEIV=m
 CONFIG_UWB=m
 CONFIG_UWB_HWA=m
 CONFIG_UWB_WHCI=m
@@ -4807,6 +4913,7 @@ 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
@@ -4820,11 +4927,11 @@ CONFIG_LEDS_TCA6507=m
 CONFIG_LEDS_LM355x=m
 CONFIG_LEDS_OT200=m
 CONFIG_LEDS_BLINKM=m
-CONFIG_LEDS_TRIGGERS=y
 
 #
 # LED Triggers
 #
+CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=m
 CONFIG_LEDS_TRIGGER_ONESHOT=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
@@ -4837,6 +4944,7 @@ 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
@@ -4887,6 +4995,7 @@ 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
@@ -4950,11 +5059,13 @@ CONFIG_DMADEVICES=y
 #
 CONFIG_INTEL_MID_DMAC=m
 CONFIG_INTEL_IOATDMA=m
+CONFIG_DW_DMAC_CORE=m
 CONFIG_DW_DMAC=m
-# CONFIG_DW_DMAC_BIG_ENDIAN_IO is not set
+CONFIG_DW_DMAC_PCI=m
 CONFIG_TIMB_DMA=m
 CONFIG_PCH_DMA=m
 CONFIG_DMA_ENGINE=y
+CONFIG_DMA_ACPI=y
 
 #
 # DMA Clients
@@ -4982,6 +5093,7 @@ CONFIG_VFIO_IOMMU_TYPE1=m
 CONFIG_VFIO=m
 CONFIG_VFIO_PCI=m
 CONFIG_VFIO_PCI_VGA=y
+CONFIG_VIRT_DRIVERS=y
 CONFIG_VIRTIO=m
 
 #
@@ -5015,7 +5127,7 @@ CONFIG_XEN_XENBUS_FRONTEND=y
 CONFIG_XEN_GNTDEV=m
 CONFIG_XEN_GRANT_DEV_ALLOC=m
 CONFIG_SWIOTLB_XEN=y
-CONFIG_XEN_TMEM=y
+CONFIG_XEN_TMEM=m
 CONFIG_XEN_PCIDEV_BACKEND=m
 CONFIG_XEN_PRIVCMD=m
 CONFIG_XEN_ACPI_PROCESSOR=m
@@ -5063,6 +5175,7 @@ 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
@@ -5091,11 +5204,10 @@ CONFIG_COMEDI_NI_6527=m
 CONFIG_COMEDI_NI_65XX=m
 CONFIG_COMEDI_NI_660X=m
 CONFIG_COMEDI_NI_670X=m
-CONFIG_COMEDI_NI_LABPC=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
@@ -5118,8 +5230,8 @@ CONFIG_COMEDI_8255=m
 CONFIG_COMEDI_FC=m
 CONFIG_COMEDI_AMPLC_DIO200=m
 CONFIG_COMEDI_AMPLC_PC236=m
-CONFIG_COMEDI_AMPLC_PC263=m
 CONFIG_COMEDI_DAS08=m
+CONFIG_COMEDI_NI_LABPC=m
 CONFIG_COMEDI_NI_TIO=m
 CONFIG_ASUS_OLED=m
 # CONFIG_PANEL is not set
@@ -5141,9 +5253,9 @@ 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_ZSMALLOC=y
 CONFIG_WLAGS49_H2=m
 CONFIG_WLAGS49_H25=m
 CONFIG_FB_SM7XX=m
@@ -5185,14 +5297,8 @@ 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_VIDEO_GO7007_OV7640=m
-CONFIG_VIDEO_GO7007_SAA7113=m
-CONFIG_VIDEO_GO7007_SAA7115=m
-CONFIG_VIDEO_GO7007_TW9903=m
-CONFIG_VIDEO_GO7007_UDA1342=m
-CONFIG_VIDEO_GO7007_SONY_TUNER=m
-CONFIG_VIDEO_GO7007_TW2804=m
 CONFIG_SOLO6X10=m
 CONFIG_LIRC_STAGING=y
 CONFIG_LIRC_BT829=m
@@ -5217,15 +5323,18 @@ 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=y
-CONFIG_RAMSTER=y
+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_USB_BTMTK=m
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
@@ -5273,6 +5382,9 @@ 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
@@ -5301,7 +5413,6 @@ CONFIG_STE_MODEM_RPROC=m
 #
 # Rpmsg drivers
 #
-CONFIG_VIRT_DRIVERS=y
 # CONFIG_PM_DEVFREQ is not set
 CONFIG_EXTCON=m
 
@@ -5317,6 +5428,12 @@ CONFIG_MEMORY=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
@@ -5324,9 +5441,6 @@ CONFIG_SERIAL_IPOCTAL=m
 CONFIG_EDD=m
 # CONFIG_EDD_OFF is not set
 CONFIG_FIRMWARE_MEMMAP=y
-CONFIG_EFI_VARS=y
-CONFIG_EFI_VARS_PSTORE=y
-# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
 CONFIG_DELL_RBU=m
 CONFIG_DCDBAS=m
 CONFIG_DMIID=y
@@ -5336,6 +5450,11 @@ 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
@@ -5364,6 +5483,7 @@ 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
@@ -5376,6 +5496,8 @@ CONFIG_OCFS2_FS_STATS=y
 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
@@ -5503,6 +5625,8 @@ 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
@@ -5512,10 +5636,12 @@ 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
@@ -5525,6 +5651,7 @@ 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
@@ -5565,6 +5692,7 @@ 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
@@ -5623,67 +5751,94 @@ CONFIG_DLM=m
 # 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_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_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_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_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_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_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_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
@@ -5695,16 +5850,12 @@ 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_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_DEBUG_PAGEALLOC 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
@@ -5734,6 +5885,7 @@ CONFIG_FUNCTION_GRAPH_TRACER=y
 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
@@ -5750,29 +5902,37 @@ CONFIG_FTRACE_MCOUNT_RECORD=y
 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_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_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_DEBUG is not set
 # CONFIG_IOMMU_STRESS is not set
@@ -5790,8 +5950,8 @@ 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_STRICT_USER_COPY_CHECKS is not set
 # CONFIG_DEBUG_NMI_SELFTEST is not set
+# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set
 
 #
 # Security options
@@ -5813,14 +5973,16 @@ CONFIG_SECURITY_TOMOYO=y
 CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
 CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
 # CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
-CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init"
+CONFIG_SECURITY_TOMOYO_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 is not set
+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
@@ -5829,8 +5991,6 @@ CONFIG_ASYNC_MEMCPY=m
 CONFIG_ASYNC_XOR=m
 CONFIG_ASYNC_PQ=m
 CONFIG_ASYNC_RAID6_RECOV=m
-CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y
-CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y
 CONFIG_CRYPTO=y
 
 #
@@ -5842,7 +6002,7 @@ CONFIG_CRYPTO_AEAD=m
 CONFIG_CRYPTO_AEAD2=y
 CONFIG_CRYPTO_BLKCIPHER=m
 CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH=m
 CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_RNG=m
 CONFIG_CRYPTO_RNG2=y
@@ -5883,6 +6043,7 @@ CONFIG_CRYPTO_XTS=m
 #
 # Hash modes
 #
+CONFIG_CRYPTO_CMAC=m
 CONFIG_CRYPTO_HMAC=m
 CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_VMAC=m
@@ -5891,7 +6052,6 @@ CONFIG_CRYPTO_VMAC=m
 # Digest
 #
 CONFIG_CRYPTO_CRC32C=m
-CONFIG_CRYPTO_CRC32C_X86_64=y
 CONFIG_CRYPTO_CRC32C_INTEL=m
 CONFIG_CRYPTO_CRC32=m
 CONFIG_CRYPTO_CRC32_PCLMUL=m
@@ -5905,6 +6065,8 @@ 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
@@ -5925,6 +6087,7 @@ 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
@@ -5939,6 +6102,7 @@ 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
@@ -5952,6 +6116,8 @@ CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_ZLIB=m
 CONFIG_CRYPTO_LZO=y
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
 
 #
 # Random Number Generation
@@ -5970,6 +6136,7 @@ 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
@@ -5981,8 +6148,7 @@ CONFIG_KVM=m
 CONFIG_KVM_INTEL=m
 CONFIG_KVM_AMD=m
 CONFIG_KVM_MMU_AUDIT=y
-CONFIG_VHOST_NET=m
-CONFIG_TCM_VHOST=m
+CONFIG_KVM_DEVICE_ASSIGNMENT=y
 CONFIG_BINARY_PRINTF=y
 
 #
@@ -5992,6 +6158,7 @@ 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
@@ -6014,6 +6181,9 @@ CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 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
@@ -6028,6 +6198,7 @@ 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
@@ -6056,3 +6227,16 @@ CONFIG_DDR=y
 CONFIG_MPILIB=m
 CONFIG_OID_REGISTRY=m
 CONFIG_UCS2_STRING=y
+CONFIG_FONT_SUPPORT=y
+CONFIG_FONTS=y
+# CONFIG_FONT_8x8 is not set
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
+CONFIG_FONT_AUTOSELECT=y
diff --git a/libre/linux-libre/criu-no-expert.patch b/libre/linux-libre/criu-no-expert.patch
new file mode 100644
index 000000000..2124427e9
--- /dev/null
+++ b/libre/linux-libre/criu-no-expert.patch
@@ -0,0 +1,22 @@
+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/linux-libre.install b/libre/linux-libre/linux-libre.install
index 3f5daa725..8d5658aab 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -4,9 +4,6 @@
 KERNEL_NAME=
 KERNEL_VERSION=
 
-# set a sane PATH to ensure that critical utils like depmod will be found
-export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
-
 post_install () {
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
@@ -15,40 +12,9 @@ post_install () {
     echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
     mkinitcpio -p linux-libre${KERNEL_NAME}
   fi
-
-  # compat symlinks for the official kernels only
-  if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-lts" ]; then
-    loaders="$(find /boot -name syslinux.cfg -or -name extlinux.conf -or -name grub.cfg -or -name menu.lst)"
-    [ -f /etc/lilo.conf ] && loaders="$loaders /etc/lilo.conf"
-    if [ -n "${loaders}" ] && grep -q -e vmlinuz26 -e kernel26.img -e kernel26-fallback.img $loaders; then
-      # add compat symlinks for the initramfs images
-      ln -sf initramfs-linux-libre${KERNEL_NAME}.img boot/kernel26${KERNEL_NAME}.img
-      ln -sf initramfs-linux-libre${KERNEL_NAME}-fallback.img \
-        boot/kernel26${KERNEL_NAME}-fallback.img
-      ln -sf vmlinuz-linux-libre${KERNEL_NAME} /boot/vmlinuz26${KERNEL_NAME}
-    fi
-  fi
 }
 
 post_upgrade() {
-  pacman -Q grub &>/dev/null
-  hasgrub=$?
-  pacman -Q grub-common &>/dev/null
-  hasgrub2=$?
-  pacman -Q lilo &>/dev/null
-  haslilo=$?
-  # reminder notices
-  if [ $haslilo -eq 0 ]; then
-    echo ">>>"
-    if [ $hasgrub -eq 0 -o $hasgrub2 -eq 0 ]; then
-      echo ">>> If you use the LILO bootloader, you should run 'lilo' before rebooting."
-    else
-      echo ">>> You appear to be using the LILO bootloader. You should run"
-      echo ">>> 'lilo' before rebooting."
-    fi
-    echo ">>>"
-  fi
-
   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
@@ -64,6 +30,6 @@ post_upgrade() {
 
 post_remove() {
   # also remove the compat symlinks
-  rm -f boot/{initramfs-linux-libre,kernel26}${KERNEL_NAME}.img
-  rm -f boot/{initramfs-linux-libre,kernel26}${KERNEL_NAME}-fallback.img
+  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/logo_linux_clut224.ppm b/libre/linux-libre/logo_linux_clut224.ppm
new file mode 100644
index 000000000..c9d837347
--- /dev/null
+++ b/libre/linux-libre/logo_linux_clut224.ppm
@@ -0,0 +1,861 @@
+P3
+80 78
+255
+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 
+0 2 0 0 2 0 0 2 0 0 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/libre/linux-libre/logo_linux_mono.pbm b/libre/linux-libre/logo_linux_mono.pbm
new file mode 100644
index 000000000..3d3c35807
--- /dev/null
+++ b/libre/linux-libre/logo_linux_mono.pbm
@@ -0,0 +1,159 @@
+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/libre/linux-libre/logo_linux_vga16.ppm b/libre/linux-libre/logo_linux_vga16.ppm
new file mode 100644
index 000000000..f279f972c
--- /dev/null
+++ b/libre/linux-libre/logo_linux_vga16.ppm
@@ -0,0 +1,18724 @@
+P3
+# 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/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD
index 509275d5d..9afdc4e4f 100644
--- a/libre/lirc-libre/PKGBUILD
+++ b/libre/lirc-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186447 2013-05-26 15:45:25Z tpowa $
+# $Id: PKGBUILD 194386 2013-09-15 11:30:54Z tpowa $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
@@ -6,14 +6,14 @@ _pkgbase=lirc
 pkgbase=lirc-libre
 pkgname=('lirc-libre' 'lirc-utils-libre')
 pkgver=0.9.0
-pkgrel=46
+pkgrel=60
 epoch=1
-_extramodules=extramodules-3.9-LIBRE
+_extramodules=extramodules-3.11-LIBRE
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lirc.org/"
 license=('GPL')
 ### NOTICE don't forget to bump version in depends in package_lirc
-makedepends=('help2man' 'linux-libre-headers>=3.9' 'linux-libre-headers<3.10' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
+makedepends=('help2man' 'linux-libre>=3.11' 'linux-libre<3.12' 'linux-libre-headers>=3.11' 'linux-libre-headers<3.12' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
 options=('!makeflags' '!strip')
 source=(http://prdownloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar.bz2
         lirc_wpc8769l.patch
@@ -59,7 +59,7 @@ build() {
 
 package_lirc-libre() {
   pkgdesc="Linux Infrared Remote Control kernel modules for stock kernel (built for the linux-libre kernel package)"
-  depends=('lirc-utils-libre' 'linux-libre>=3.9' 'linux-libre<3.10')
+  depends=('lirc-utils-libre' 'linux-libre>=3.11' 'linux-libre<3.12')
   replaces=('lirc' 'lirc+pctv')
   conflicts=('lirc')
   provides=("lirc=$pkgver")
diff --git a/libre/lirc-libre/lirc.install b/libre/lirc-libre/lirc.install
index cd4a57231..2f46d837b 100644
--- a/libre/lirc-libre/lirc.install
+++ b/libre/lirc-libre/lirc.install
@@ -1,4 +1,4 @@
-EXTRAMODULES=extramodules-3.9-LIBRE
+EXTRAMODULES=extramodules-3.11-LIBRE
 
 post_install() {
   # updating module dependencies
diff --git a/libre/lsb-release-libre/PKGBUILD b/libre/lsb-release/PKGBUILD
index 51ec79bea..adf9c4774 100644
--- a/libre/lsb-release-libre/PKGBUILD
+++ b/libre/lsb-release/PKGBUILD
@@ -1,35 +1,36 @@
-# Parabola maintainer: Michał Masłowski <mtjm@mtjm.eu>
-# Parabola contributor: André Silva <andre.paulista@adinet.com.uy>
-# $Id: PKGBUILD 22635 2010-07-25 20:05:28Z svenstaro $
+# $Id: PKGBUILD 79819 2012-11-13 13:12:30Z 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@lavabit.com>
 
-_pkgname=lsb-release
-pkgname=lsb-release-libre
+pkgname=lsb-release
 pkgver=1.4
-pkgrel=12
-pkgdesc="LSB version query program with Parabola name"
+pkgrel=13
+pkgdesc="LSB version query program (Parabola rebranded)"
 arch=('any')
 url="http://www.linuxbase.org/"
 license=('GPL2')
-provides=('lsb-release')
-conflicts=('lsb-release')
-replaces=('lsb-release')
+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)
+source=(http://downloads.sourceforge.net/lsb/$pkgname-$pkgver.tar.gz)
 md5sums=('30537ef5a01e0ca94b7b8eb6a36bb1e4')
 
 build() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
 
   make
 }
 
 package() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  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"
diff --git a/libre/lsb-release-libre/lsb-release.install b/libre/lsb-release/lsb-release.install
index 62d404892..62d404892 100644
--- a/libre/lsb-release-libre/lsb-release.install
+++ b/libre/lsb-release/lsb-release.install
diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD
index 2e3126da7..0c109a5d1 100644
--- a/libre/luxrender-libre/PKGBUILD
+++ b/libre/luxrender-libre/PKGBUILD
@@ -3,52 +3,59 @@
 # Contributor: flixie <69one@gmx.net>
 # Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org>
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-pkgname=luxrender-libre
-_pkgflag=libre
+_pkgname=luxrender
+pkgname=$_pkgname-libre
 pkgver=1.2.1
 _pkgver=3066b2161439
-pkgrel=3
+pkgrel=5
 pkgdesc="Rendering system for physically correct, unbiased image synthesis, without nonfree OpenCL recommendation"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://www.${pkgname%-$_pkgflag}.net/"
+url="http://www.$_pkgname.net/"
 license=('GPL')
-depends=('boost-libs' 'freeimage' 'openexr' 'libcl' 'libgl')
+depends=('boost-libs' 'freeimage' 'openexr' 'libcl-libre' 'mesa-libgl')
 optdepends=('blender-addon-luxrender: Blender for renderer and exporter' 'qt4: Qt GUI' \
             'python: Python interface (pylux)')
-makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=${pkgver::3}" 'python' 'opencl-headers')
-provides=(${pkgname%-$_pkgflag}=$pkgver)
-conflicts=${pkgname%-$_pkgflag}
-replaces=${pkgname%-$_pkgflag}
-source=(https://bitbucket.org/${pkgname%-$_pkgflag}/lux/get/$_pkgver.tar.bz2
+makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python' 'opencl-headers')
+makedepends+=('gcc-lts')
+provides=($_pkgname=$pkgver)
+conflicts=$_pkgname
+replaces=$_pkgname
+source=(https://bitbucket.org/$_pkgname/lux/get/$_pkgver.tar.bz2
         boost-1.53-shared_array_constructor.diff)
 md5sums=(
   '87958798c164ad14f92fb4af2595d332'
   'dd19c7ac2ba8c9b703018a176ef77f98')
 
-build() {
-  cd "$srcdir"/${pkgname%-$_pkgflag}-lux-$_pkgver
+prepare() {
+  cd "$srcdir"/$_pkgname-lux-$_pkgver
 
   # fix the installation
-  sed -i '/.*wxgui.*/ d' CMakeLists.txt
+  sed -i '/.*wxgui.*/ d
+          s|-ftree-vectorize ||
+         ' CMakeLists.txt
   # fix for boost 1.53
   patch -Np1 < "$srcdir/boost-1.53-shared_array_constructor.diff" || true
 
   export CXXFLAGS="$CXXFLAGS -lpthread"
-  setarch $CARCH cmake -DCMAKE_INSTALL_PREFIX=/usr \
+}
+
+build() {
+  cd "$srcdir"/$_pkgname-lux-$_pkgver
+
+  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/ \
-    .
-  setarch $CARCH make
+    -DPYTHON_INCLUDE_PATH=/usr/include/python3.3m
+  make
 }
 
 package() {
-  cd "$srcdir"/${pkgname%-$_pkgflag}-lux-$_pkgver
+  cd "$srcdir"/$_pkgname-lux-$_pkgver
   setarch $CARCH make DESTDIR="$pkgdir" install
 
-  # fix library path on x86_64
-  [ "$CARCH" = "x86_64" ] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib
+  # 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
diff --git a/libre/mc-libre/PKGBUILD b/libre/mc-libre/PKGBUILD
index 3528fba0e..e270f8d3d 100644
--- a/libre/mc-libre/PKGBUILD
+++ b/libre/mc-libre/PKGBUILD
@@ -1,69 +1,75 @@
-# $Id$
+# $Id: PKGBUILD 97329 2013-09-18 07:33:03Z schuay $
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Maintainer: schuay <jakob.gruber@gmail.com>
 
 _pkgname=mc
 pkgname=mc-libre
-pkgver=4.8.4
-pkgrel=1
-pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander"
+pkgver=4.8.10
+pkgrel=2
+pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander, with unar and arj recommendation included and nonfree unace recommendation removed"
 arch=('i686' 'x86_64')
 url="http://www.ibiblio.org/mc/"
 license=('GPL')
-depends=('e2fsprogs' 'glib2' 'pcre' 'gpm' 'slang')
+depends=(
+    'e2fsprogs'
+    'glib2'
+    'gpm'
+    'libssh2'
+    'slang')
 makedepends=('libxt' 'libx11')
-optdepends=('p7zip: support for 7zip archives'
-	'mtools: a+ extfs'
-	'cdparanoia: audio extfs'
-	'gawk: hp48+ extfs'
-	'cdrkit: iso9660 extfs'
-	'perl: needed by several extfs scripts'
-	'python-boto: s3+ extfs'
-	'python2-pytz: s3+ extfs'
-	'p7zip: u7z extfs'
-	'arj: uarj extfs'
-	'cabextract: ucab extfs'
-	'ununrar: urar extfs'
-	'zip: uzip extfs')
+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'
+    'unar: urar 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/edit.spell.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")
+source=("http://www.midnight-commander.org/downloads/${_pkgname}-${pkgver}.tar.bz2"
+        "fs36962.diff")
 
 build() {
-	cd "${srcdir}/${_pkgname}-${pkgver}"
+    cd "${srcdir}/${_pkgname}-${pkgver}"
 
-	./configure \
-	    --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man \
-	    --enable-background --enable-charset --enable-largefile \
-	    --with-edit --with-gpm-mouse --with-mmap --enable-vfs-smb \
-	    --with-screen=slang --with-subshell --with-vfs --with-x \
-	    --without-debug --without-gnome --without-included-gettext \
-	    --libexecdir=/usr/lib
+    patch -Np1 < "${srcdir}/fs36962.diff"
 
-	make
+    ./configure --prefix=/usr --sysconfdir=/etc --enable-vfs-smb \
+        --with-x --libexecdir=/usr/lib
+
+    make
 }
 
 package() {
-	cd "${srcdir}/${_pkgname}-${pkgver}"
+    cd "${srcdir}/${_pkgname}-${pkgver}"
 
-	make DESTDIR="${pkgdir}" install
+    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"
+    # 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+"
+    sed 's#/usr/bin/env python#/usr/bin/python2#' \
+        -i "${pkgdir}/usr/lib/mc/extfs.d/s3+"
 }
 
-md5sums=('a8edb8226cb25869f925ecce043faf1e')
+md5sums=('eb4bdc23abd4fdfa14911d53d65c8186'
+         '7f7cf5388a5390c2ed49965492f490aa')
diff --git a/libre/mc-libre/fs36962.diff b/libre/mc-libre/fs36962.diff
new file mode 100644
index 000000000..0db5ed42b
--- /dev/null
+++ b/libre/mc-libre/fs36962.diff
@@ -0,0 +1,77 @@
+diff -ur mc-4.8.10-orig/src/filemanager/file.c mc-4.8.10/src/filemanager/file.c
+--- mc-4.8.10-orig/src/filemanager/file.c	2013-08-02 22:02:40.000000000 +0400
++++ mc-4.8.10/src/filemanager/file.c	2013-09-17 09:59:30.699635407 +0400
+@@ -1272,8 +1272,8 @@
+ 
+ /** Initialize variables for progress bars */
+ static FileProgressStatus
+-panel_operate_init_totals (FileOperation operation, const WPanel * panel, const char *source,
+-                           FileOpContext * ctx, filegui_dialog_type_t dialog_type)
++panel_operate_init_totals (const WPanel * panel, const char *source, FileOpContext * ctx,
++                           filegui_dialog_type_t dialog_type)
+ {
+     FileProgressStatus status;
+ 
+@@ -1282,7 +1282,7 @@
+         return FILE_CONT;
+ #endif
+ 
+-    if (operation != OP_MOVE && verbose && file_op_compute_totals)
++    if (verbose && file_op_compute_totals)
+     {
+         ComputeDirSizeUI *ui;
+ 
+@@ -2378,13 +2378,6 @@
+     mc_refresh ();
+     if (ctx->erase_at_end)
+     {
+-        /* remove files after move */
+-        if (erase_list != NULL)
+-        {
+-            file_op_context_destroy_ui (ctx);
+-            file_op_context_create_ui (ctx, FALSE, FILEGUI_DIALOG_DELETE_ITEM);
+-        }
+-
+         while (erase_list != NULL && return_status != FILE_ABORT)
+         {
+             struct link *lp = (struct link *) erase_list->data;
+@@ -2792,14 +2785,12 @@
+     {
+         if (operation == OP_DELETE)
+             dialog_type = FILEGUI_DIALOG_DELETE_ITEM;
++        else if (single_entry && S_ISDIR (selection (panel)->st.st_mode))
++            dialog_type = FILEGUI_DIALOG_MULTI_ITEM;
++        else if (single_entry || force_single)
++            dialog_type = FILEGUI_DIALOG_ONE_ITEM;
+         else
+-        {
+-            dialog_type = ((operation != OP_COPY) || single_entry || force_single)
+-                ? FILEGUI_DIALOG_ONE_ITEM : FILEGUI_DIALOG_MULTI_ITEM;
+-
+-            if (single_entry && (operation == OP_COPY) && S_ISDIR (selection (panel)->st.st_mode))
+-                dialog_type = FILEGUI_DIALOG_MULTI_ITEM;
+-        }
++            dialog_type = FILEGUI_DIALOG_MULTI_ITEM;
+     }
+ 
+     /* Initialize things */
+@@ -2844,8 +2835,8 @@
+         else
+             source_with_vpath = vfs_path_append_new (panel->cwd_vpath, source, (char *) NULL);
+ #endif /* WITH_FULL_PATHS */
+-        if (panel_operate_init_totals
+-            (operation, panel, vfs_path_as_str (source_with_vpath), ctx, dialog_type) == FILE_CONT)
++        if (panel_operate_init_totals (panel, vfs_path_as_str (source_with_vpath), ctx, dialog_type)
++            == FILE_CONT)
+         {
+             if (operation == OP_DELETE)
+             {
+@@ -2936,7 +2927,7 @@
+                 goto clean_up;
+         }
+ 
+-        if (panel_operate_init_totals (operation, panel, NULL, ctx, dialog_type) == FILE_CONT)
++        if (panel_operate_init_totals (panel, NULL, ctx, dialog_type) == FILE_CONT)
+         {
+             /* Loop for every file, perform the actual copy operation */
+             for (i = 0; i < panel->count; i++)
diff --git a/libre/mcomix-libre/PKGBUILD b/libre/mcomix-libre/PKGBUILD
index aba53582b..97e796231 100644
--- a/libre/mcomix-libre/PKGBUILD
+++ b/libre/mcomix-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91436 2013-05-22 14:15:00Z schuay $
+# $Id: PKGBUILD 95818 2013-08-17 10:12:09Z schuay $
 # Maintainer: schuay <jakob.gruber@gmail.com>
 # Contributor: Ray Powell <ray_al@xphoniexx.net>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,13 +6,13 @@
 _pkgname=mcomix
 pkgname=mcomix-libre
 pkgver=1.00
-pkgrel=3
+pkgrel=4
 pkgdesc="A user-friendly, customizable image viewer specifically designed to handle comic books, with unar recommendation"
 arch=('any')
 url="http://sourceforge.net/projects/mcomix/"
 license=('GPL')
 depends=('pygtk' 'python-imaging' 'xdg-utils' 'python2' \
-         'desktop-file-utils' 'hicolor-icon-theme' 'python2-distribute')
+         'desktop-file-utils' 'hicolor-icon-theme' 'python2-setuptools')
 makedepends=('gettext' 'intltool')
 optdepends=('unar: for rar compressed comics')
 conflicts=('mcomix' 'comix')
diff --git a/libre/mesa-libcl/PKGBUILD b/libre/mesa-libcl/PKGBUILD
new file mode 100644
index 000000000..828e2bdb9
--- /dev/null
+++ b/libre/mesa-libcl/PKGBUILD
@@ -0,0 +1,52 @@
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+
+pkgbase=mesa
+_pkgname=libcl
+pkgname=$pkgbase-$_pkgname
+_pkgflag=libre
+pkgver=9.2.0
+pkgrel=2
+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)
+options=(!libtool)
+source=ftp://ftp.freedesktop.org/pub/$pkgbase/${pkgver%.0}/${pkgbase^}Lib-$pkgver.tar.bz2
+sha512sums=26c4b41b7e1d5284b87e2997a14424c1ee0713e11fd9dd65932987832e43b96986ed5e88c06fad4616fc912ffb8e17a2314b282cbf38a2640d76c39724965910
+
+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
new file mode 100644
index 000000000..868c578ab
--- /dev/null
+++ b/libre/midori-gtk3-libre/PKGBUILD
@@ -0,0 +1,69 @@
+# $Id: PKGBUILD 95784 2013-08-16 19:36:19Z 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.5
+pkgrel=1
+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' 'webkitgtk' 'libnotify' 'libxss' 'hicolor-icon-theme' 'desktop-file-utils' 'libunique3' 'gcr')
+makedepends=('bzr' 'python2' 'intltool' 'vala' 'librsvg')
+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=('ca69382a285222a86028abebd73fed1976735883027ff0adc094b627789bbd62')
+
+prepare() {
+  cd "$srcdir/${_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 "$srcdir/${_pkgname/-gtk3}-${pkgver}"
+
+  ./configure \
+    --prefix=/usr \
+    --enable-gtk3 \
+    --disable-granite
+  make
+}
+
+package() {
+  cd "$srcdir/${_pkgname/-gtk3}-${pkgver}"
+
+  make 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
new file mode 100644
index 000000000..e6af79c5f
--- /dev/null
+++ b/libre/midori-gtk3-libre/midori.install
@@ -0,0 +1,14 @@
+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
new file mode 100644
index 000000000..dd1f9e36d
--- /dev/null
+++ b/libre/midori-libre/PKGBUILD
@@ -0,0 +1,66 @@
+# $Id: PKGBUILD 95661 2013-08-15 11:42:31Z 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.5
+pkgrel=1
+pkgdesc='Lightweight web browser (GTK2), without non-privacy search providers'
+arch=('x86_64' 'i686')
+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')
+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=('ca69382a285222a86028abebd73fed1976735883027ff0adc094b627789bbd62')
+
+prepare() {
+  cd "$srcdir/${_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 "$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/libre/midori-libre/midori.install b/libre/midori-libre/midori.install
new file mode 100644
index 000000000..e6af79c5f
--- /dev/null
+++ b/libre/midori-libre/midori.install
@@ -0,0 +1,14 @@
+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
index 2ac7928c1..31e373545 100644
--- a/libre/mime-types/PKGBUILD
+++ b/libre/mime-types/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id$
+# $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=8
-pkgrel=1.2
-pkgdesc='Provides /etc/mime.types, Parabola rebranded'
+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=('01682b0ad3111a6cf65e6c9db0c18ddd7523c593'
+sha1sums=('b21b7775a006b60113a6648e20beb1decdac8899'
           '0d3b34c7b4a384be674192ecbfd8f22271906ae8')
 
 package() {
diff --git a/libre/mkbootcd/PKGBUILD b/libre/mkbootcd/PKGBUILD
deleted file mode 100644
index 8990fbae3..000000000
--- a/libre/mkbootcd/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 137619 2011-09-10 08:04:29Z pierre $
-# Maintainer : Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=mkbootcd
-pkgver=2008.09
-pkgrel=2.2
-pkgdesc="Advanced, modular isolinux bootcd image creation utility (Parabola rebranded)"
-arch=('any')
-license=('GPL')
-url="https://parabolagnulinux.org/"
-depends=('mkinitcpio' 'cdrkit' 'syslinux')
-source=('boot.msg' 'mkbootcd' 'mkbootcd.conf' 'options.msg')
-backup=('etc/mkbootcd.conf')
-md5sums=('2b55189d64e5263c5a3925a7b949c1f8'
-         '521107289007f0c3f11ddbb6fdfcbd22'
-         '4794673fa413eb5459b40172be7ae541'
-         '75b69407f88f2838c66f4dda4d8455e3')
-
-package() {
-  cd $srcdir
-  install -D -m755 mkbootcd $pkgdir/usr/sbin/mkbootcd
-  install -D -m644 mkbootcd.conf $pkgdir/etc/mkbootcd.conf
-  install -D -m644 boot.msg $pkgdir/usr/share/mkbootcd/boot.msg
-  install -D -m644 options.msg $pkgdir/usr/share/mkbootcd/options.msg
-}
diff --git a/libre/mkbootcd/boot.msg b/libre/mkbootcd/boot.msg
deleted file mode 100644
index 5e441e746..000000000
--- a/libre/mkbootcd/boot.msg
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-------------------------------------------------------------------------------
-Parabola GNU/Linux-libre
-ISOLINUX BOOT
-created with 'mkbootcd' written by Tobias Powalowski <tpowa@archlinux.org>
-rebranded for Parabola by André Silva <emulatorman@lavabit.com>
-
-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/mkbootcd/mkbootcd b/libre/mkbootcd/mkbootcd
deleted file mode 100755
index 012267be9..000000000
--- a/libre/mkbootcd/mkbootcd
+++ /dev/null
@@ -1,144 +0,0 @@
-#! /bin/sh
-# Created by Tobias Powalowski <tpowa@archlinux.org>
-# Rebranded for Parabola by André Silva <emulatorman@lavabit.com>
-# Settings
-APPNAME=$(basename "${0}")
-CONFIG="/etc/mkbootcd.conf"
-GENIMG=""
-BURN="0"
-BLANK="0"
-GRUB="0"
-TARNAME=""
-export TEMPDIR=$(mktemp /tmp/mkbootcd.XXXX)
-usage ()
-{
-    echo "${APPNAME}: usage"
-    echo "  -g=IMAGE         Generate a ISO image as IMAGE"
-    echo "  -c=CONFIG        Use CONFIG file. default: /etc/mkbootcd.conf"
-    echo "  -B               Burn the ISO image after creation"
-    echo "  -b               Blanking media first"
-    echo "  -grub            Use grub instead of isolinux"
-    echo "  -t=TARNAME       Generate a tar image instead of an iso image"
-    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" ;;
-		-grub|--grub) GRUB="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 "${APPENDBOOTMESSAGE_SYSLINUX}" ] && export APPENDBOOTMESSAGE_SYSLINUX
-[ -n "${APPENDBOOTMESSAGE_SYSLINUX_LOWMEM}" ] && export APPENDBOOTMESSAGE_SYSLINUX_LOWMEM
-[ -n "${APPENDOPTIONSBOOTMESSAGE}" ] && export APPENDOPTIONSBOOTMESSAGE
-
-if [ "$GRUB" = "1" ]; then
-	export RUNPROGRAM="${APPNAME}-grub"
-	export BOOTDIRNAME="boot"
-else
-	export RUNPROGRAM="${APPNAME}"
-	export BOOTDIRNAME="isolinux"
-fi
-[ "${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
-[ -e ${TEMPDIR} ] && rm -r ${TEMPDIR}
-mkdir -p ${TEMPDIR}/${BOOTDIRNAME}
-if [ "$GRUB" = "1" ]; then
-	mkdir ${TEMPDIR}/${BOOTDIRNAME}/grub
-	install -m755 /usr/share/grub/i386-pc/stage2_eltorito ${TEMPDIR}/${BOOTDIRNAME}/grub/stage2_eltorito
-else
-	install -m755 /usr/lib/syslinux/isolinux.bin ${TEMPDIR}/${BOOTDIRNAME}/isolinux.bin
-fi
-# create isolinux.cfg
-if [ "$GRUB" = "1" ]; then
-	echo ":: Creating menu.lst ..."
-	[ ! -e "${MENULST}" ] && echo "No menu.lst found" && exit 1
-	sed "s|@@PROMPT@@|${PROMPT}|g;s|@@TIMEOUT@@|${TIMEOUT}|g;s|@@KERNEL_BOOT_OPTIONS@@|${KERNEL_BOOT_OPTIONS}|g" \
-		${MENULST} \
-		> ${TEMPDIR}/${BOOTDIRNAME}/grub/menu.lst
-else
-	echo ":: Creating isolinux.cfg ..."
-	if [ "${ISOLINUXCFG}" = "" ]; then
-		[ -e  ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg ] && rm  ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
-		echo "prompt ${PROMPT}" >>  ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
-		echo "timeout ${TIMEOUT}" >>  ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
-		echo "display boot.msg" >>  ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
-		echo "F1 boot.msg" >>  ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
-		echo "F2 options.msg" >>  ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
-		echo "default parabola"  >>  ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
-		echo "label parabola" >>  ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
-		echo "kernel vmlinuz" >>  ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
-		echo "append initrd=initrd.img ${KERNEL_BOOT_OPTIONS}" >>  ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
-	else
-	sed "s|@@PROMPT@@|${PROMPT}|g;s|@@TIMEOUT@@|${TIMEOUT}|g;s|@@KERNEL_BOOT_OPTIONS@@|${KERNEL_BOOT_OPTIONS}|g" \
-		${ISOLINUXCFG} > ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
-	fi
-	[ ! -s ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg ] && echo "No isolinux.cfg found" && exit 1
-fi
-echo ":: Calling mkinitcpio CONFIG=${MKINITCPIO_CONFIG} KERNEL=${VERSION} ..." 
-# generate initramdisk
-echo ":: Creating initramdisk ..."
-	mkinitcpio -c ${MKINITCPIO_CONFIG} -k ${VERSION} -g ${TEMPDIR}/${BOOTDIRNAME}/initrd.img
-echo ":: Using ${KERNEL} as image kernel ..."
-	install -m644 ${KERNEL} ${TEMPDIR}/${BOOTDIRNAME}/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
-if ! [ "${TARNAME}" = "" ]; then
-	echo ":: Creating tar image ..."
-	[ -e ${TARNAME} ] && rm ${TARNAME}
-	rm ${TEMPDIR}/parabola/pkg/*.pkg.tar.gz > /dev/null 2>&1
-	tar cfv ${TARNAME} ${TEMPDIR} > /dev/null 2>&1 && echo ":: tar Image succesfull created at ${TARNAME}"
-else
-	echo ":: Creating ISO image ..."
-		[ -e ${GENIMG} ] && rm ${GENIMG}
-		[ -s "${ISONAME}" ] && ISONAME=$(cat $ISONAME) || ISONAME="Parabola GNU/Linux-libre"
-		if [ "$GRUB" = "1" ]; then
-			mkisofs -RlDJLV "${ISONAME}" -b boot/grub/stage2_eltorito -c boot/boot.cat \
-				-no-emul-boot -boot-load-size 4 -boot-info-table -o ${GENIMG} ${TEMPDIR}/ > /dev/null 2>&1
-		else
-			mkisofs -RlDJLV "${ISONAME}" -b isolinux/isolinux.bin -c isolinux/boot.cat \
-				-no-emul-boot -boot-load-size 4 -boot-info-table -o ${GENIMG} ${TEMPDIR}/ > /dev/null 2>&1
-		fi
-		[ $? -ne 0 ] && 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
-fi
-# clean /tmp
-rm -r ${TEMPDIR}
diff --git a/libre/mkbootcd/mkbootcd.conf b/libre/mkbootcd/mkbootcd.conf
deleted file mode 100644
index 5b287a6ea..000000000
--- a/libre/mkbootcd/mkbootcd.conf
+++ /dev/null
@@ -1,39 +0,0 @@
-# Created by Tobias Powalowski <tpowa@archlinux.org>
-# Rebranded for Parabola by André Silva <emulatorman@lavabit.com>
-# config file of mkbootcd
-
-# DEFAULT kernel boot options like root=/dev/hda3 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/mkbootcd/boot.msg"
-OPTIONSBOOTMESSAGE="/usr/share/mkbootcd/options.msg"
-
-# menu.lst or isolinux.cfg file to use
-ISOLINUXCFG=""
-MENULST=""
-
-# Prompt on CD boot, defaulted to yes, 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 in seconds on CD boot, defaulted to 0, because we prompt by default
-TIMEOUT="0"
-
-# Setting cdrecord options
-DEVICE=""
-SPEED=""
-BLANKMODE=""
diff --git a/libre/mkbootcd/options.msg b/libre/mkbootcd/options.msg
deleted file mode 100644
index 63f56e755..000000000
--- a/libre/mkbootcd/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 may be useful.
-------------------------------------------------------------------------------
diff --git a/libre/mozilla-searchplugins/PKGBUILD b/libre/mozilla-searchplugins/PKGBUILD
index 0d1d14cd0..2405ac889 100644
--- a/libre/mozilla-searchplugins/PKGBUILD
+++ b/libre/mozilla-searchplugins/PKGBUILD
@@ -1,16 +1,16 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net
+# 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@adinet.com.uy>
+# 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.3
-pkgrel=5
+pkgver=1.4
+pkgrel=2
 pkgdesc="System-wide OpenSearch plugins common for Mozilla based browsers."
 arch=('any')
 license=('MPL' 'GPL' 'LGPL')
@@ -19,20 +19,14 @@ source=(
   duckduckgo-html.xml
   duckduckgo-lite.xml
   internet-archive.xml
-  jamendo-en.xml.in
-  jamendo.ico::http://www.jamendo.com/favicon.ico
-  parabola-packages.xml
-  parabola-wiki-en.xml
+  parabola-packages.xml::https://parabolagnulinux.org/opensearch/packages/
+  parabola-wiki-en.xml::
   seeks-search.xml::http://www.seeks.fr/opensearch.xml
-  yacybluebox.xml::http://yacy.dyndns.org:8000/opensearchdescription.xml
+#  yacy.xml::http://search.ipredator.se/opensearchdescription.xml
+  yacy.xml
   wikipedia-en.xml::https://en.wikipedia.org/w/opensearch_desc.php
 )
 
-build() {
-  cd "$srcdir"
-  sed "s,@icon@,$(base64 -w0 < jamendo.ico)," < jamendo-en.xml.in > jamendo-en.xml
-}
-
 package() {
   install -m755 -d                "${pkgdir}/usr/lib/mozilla/searchplugins"
   install -m644 "${srcdir}"/*.xml "${pkgdir}/usr/lib/mozilla/searchplugins"
@@ -41,10 +35,8 @@ package() {
 md5sums=('b4cc6bd8353af36ade441916217619e4'
          '766aa6def4bf63c0d65afd6ca1b1ce37'
          '462c68585461f8cdc23c93c46f6ee4cf'
-         '0c9a3f48971aab8aa0cf2f5e2ff67292'
-         'e50a847cec81357e8730e0d327515a9c'
-         '8d486e7ae47f54c2d6555d96adbdd236'
-         '5bf9ca2558026fa3f4ec52d8e64fee47'
+         '92f834a3a1d85c9ae202955cdfe941eb'
+         'b9a0893d7f6d41d755c478fd60c44be8'
          'dc6c76acf4c68a40710383513d72fa8b'
-         'bdb2640c643493063051bc72eeeff920'
-         'cb281f07933210c812a6153f32109645')
+         '0f6cb4119f54e90d678827e2928474d4'
+         'dbdd9b61e89d73cc3a70cbe20a1160e1')
diff --git a/libre/mozilla-searchplugins/jamendo-en.xml.in b/libre/mozilla-searchplugins/jamendo-en.xml.in
deleted file mode 100644
index 96b3a008d..000000000
--- a/libre/mozilla-searchplugins/jamendo-en.xml.in
+++ /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>Jamendo (en)</os:ShortName>
-<os:Description>Search Jamendo.com English site for downloadable Creative Commons music</os:Description>
-<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">data:image/x-icon;base64,@icon@</os:Image>
-<UpdateUrl>http://mycroft.mozdev.org/updateos.php/id0/jamendo.xml</UpdateUrl>
-<SearchForm>http://www.jamendo.com/en</SearchForm>
-<os:Url type="text/html" method="GET" template="http://www.jamendo.com/en/search#qs=q={searchTerms}">
-</os:Url>
-</SearchPlugin>
diff --git a/libre/mozilla-searchplugins/parabola-packages.xml b/libre/mozilla-searchplugins/parabola-packages.xml
index f746ad8f8..1cefb19da 100644
--- a/libre/mozilla-searchplugins/parabola-packages.xml
+++ b/libre/mozilla-searchplugins/parabola-packages.xml
@@ -2,7 +2,7 @@
 <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/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==</os:Image>
+<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>
diff --git a/libre/mozilla-searchplugins/parabola-wiki-en.xml b/libre/mozilla-searchplugins/parabola-wiki-en.xml
index d218b21f8..a391d7335 100644
--- a/libre/mozilla-searchplugins/parabola-wiki-en.xml
+++ b/libre/mozilla-searchplugins/parabola-wiki-en.xml
@@ -1,11 +1,10 @@
 <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>Parabola GNU/Linux-Libre Wiki (en)</os:ShortName>
+<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/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==</os:Image>
+<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>
\ No newline at end of file
+</SearchPlugin>
diff --git a/libre/mozilla-searchplugins/yacy.xml b/libre/mozilla-searchplugins/yacy.xml
new file mode 100644
index 000000000..9c97f16cc
--- /dev/null
+++ b/libre/mozilla-searchplugins/yacy.xml
@@ -0,0 +1,28 @@
+<?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/0001-demux_gif-declare-missing-PrintGifError.patch b/libre/mplayer-libre/0001-demux_gif-declare-missing-PrintGifError.patch
new file mode 100644
index 000000000..c8a527cf3
--- /dev/null
+++ b/libre/mplayer-libre/0001-demux_gif-declare-missing-PrintGifError.patch
@@ -0,0 +1,34 @@
+From 5194f95d39ffbb0a4a7b027d8f1b084436feb22c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= <b@bpiotrowski.pl>
+Date: Sun, 14 Jul 2013 10:51:11 +0200
+Subject: [PATCH] demux_gif: declare missing PrintGifError
+
+Apparently it has been removed from newer Giflib releases.
+---
+ libmpdemux/demux_gif.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/libmpdemux/demux_gif.c b/libmpdemux/demux_gif.c
+index eee7a85..3d761c0 100644
+--- a/libmpdemux/demux_gif.c
++++ b/libmpdemux/demux_gif.c
+@@ -44,6 +44,16 @@ typedef struct {
+ 
+ #define GIF_SIGNATURE (('G' << 16) | ('I' << 8) | 'F')
+ 
++static void PrintGifError(void)
++{
++  char *Err = GifErrorString();
++
++  if (Err != NULL)
++    fprintf(stderr, "\nGIF-LIB error: %s.\n", Err);
++  else
++    fprintf(stderr, "\nGIF-LIB undefined error %d.\n", GifError());
++}
++
+ #ifndef CONFIG_GIF_TVT_HACK
+ // not supported by certain versions of the library
+ static int my_read_gif(GifFileType *gif, uint8_t *buf, int len)
+-- 
+1.8.3.2
+
diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD
index a49b889bd..a5bda5d85 100644
--- a/libre/mplayer-libre/PKGBUILD
+++ b/libre/mplayer-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186432 2013-05-26 10:14:39Z foutrelis $
+# $Id: PKGBUILD 193127 2013-08-17 00:43:52Z eric $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -8,7 +8,7 @@ _pkgbase=mplayer
 pkgbase=mplayer-libre
 pkgname=('mplayer-libre' 'mencoder-libre')
 pkgver=36285
-pkgrel=1
+pkgrel=4
 arch=('i686' 'x86_64')
 makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
 'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils'  'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx'
@@ -18,15 +18,18 @@ url="http://www.mplayerhq.hu/"
 options=('!buildflags' '!emptydirs')
 source=(ftp://ftp.archlinux.org/other/packages/$_pkgbase/$_pkgbase-$pkgver.tar.xz
         mplayer.desktop
-        cdio-includes.patch)
+        cdio-includes.patch
+        0001-demux_gif-declare-missing-PrintGifError.patch)
 md5sums=('5e4f0d4d039b0219514cf52ae6da831d'
          'c0d6ef795cf6de48e3b87ff7c23f0319'
-         '7b5be7191aafbea64218dc4916343bbc')
+         '7b5be7191aafbea64218dc4916343bbc'
+         '12a2a5b79849d57eab60a1bfec2978c4')
 
 prepare() {
     cd "$srcdir/$_pkgbase-$pkgver"
 
     patch -Np0 -i ../cdio-includes.patch
+    patch -Np1 -i ../0001-demux_gif-declare-missing-PrintGifError.patch
 }
 
 build() {
diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD
index 311c469ca..71d158d17 100644
--- a/libre/mplayer-vaapi-libre/PKGBUILD
+++ b/libre/mplayer-vaapi-libre/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 91641 2013-05-26 08:06:21Z foutrelis $
+# $Id: PKGBUILD 95856 2013-08-17 15:21:03Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
-# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
 # Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
 
+_pkgname=mplayer-vaapi
 pkgname=mplayer-vaapi-libre
-pkgver=35107
-pkgrel=8
-pkgdesc="A movie player, compiled with vaapi, without nonfree faac support"
+pkgver=36265
+pkgrel=4
+pkgdesc="A movie player, compiled with vaapi support, without nonfree faac support"
 arch=('i686' 'x86_64')
 url="http://gitorious.org/vaapi/mplayer"
 license=('GPL')
@@ -19,25 +20,26 @@ depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libcdio-paranoia' 'libxinerama'
          'lirc-utils' 'ttf-dejavu' 'libxvmc' 'enca' 'opencore-amr' 'libdca'
          'a52dec' 'schroedinger' 'mpg123' 'libvpx' 'libpulse' 'fribidi'
          'libbluray' 'libva' 'libass' 'desktop-file-utils')
-makedepends=('unzip-libre' 'live-media' 'yasm' 'ladspa' 'git' 'mesa')
+makedepends=('unzip' 'live-media' 'yasm' 'ladspa' 'git' 'mesa')
 provides=("mplayer=$pkgver" "mplayer-vaapi=$pkgver")
 conflicts=('mplayer' 'mplayer-vaapi')
 replaces=('mplayer-vaapi')
 backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
-source=(http://pkgbuild.com/~foutrelis/mplayer-vaapi-$pkgver.tar.xz
+source=(http://pkgbuild.com/~foutrelis/sources/$_pkgname/$_pkgname-$pkgver.tar.xz{,.sig}
         cdio-includes.patch
         tweak-desktop-file.patch
         subreader-fix-srt-parsing.patch)
 options=('!buildflags' '!emptydirs')
 install=mplayer-vaapi.install
-sha256sums=('a6c645625cc2cd6ca48764db302c926049f831e757857ece351b37b674e05e56'
+sha256sums=('5747c28c30c15d1000fb655a8abaa4b22483746d0e82775b27466948ae0c549a'
+            'SKIP'
             '72e6c654f9733953ad2466d0ea1a52f23e753791d8232d90f13293eb1b358720'
             '5a09fb462729a4e573568f9e8c1f57dbe7f69c0b68cfa4f6d70b3e52c450d93b'
             '8b6cd325d89ff8bce3662c6aaa9b61b8e6163c6574e09b575426a1eed02b8ad3')
 
 
 prepare() {
-  cd "$srcdir/mplayer-vaapi-$pkgver"
+  cd "$srcdir/$_pkgname-$pkgver"
 
   patch -Np0 -i "$srcdir/cdio-includes.patch"
   patch -d etc -Np0 -i "$srcdir/tweak-desktop-file.patch"
@@ -47,13 +49,14 @@ prepare() {
 }
 
 build() {
-  cd "$srcdir/mplayer-vaapi-$pkgver"
+  cd "$srcdir/$_pkgname-$pkgver"
 
   ./configure \
     --prefix=/usr \
     --enable-runtime-cpudetection \
     --disable-gui \
     --disable-arts \
+    --disable-gif \
     --disable-liblzo \
     --enable-speex \
     --disable-cdparanoia \
@@ -78,7 +81,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/mplayer-vaapi-$pkgver"
+  cd "$srcdir/$_pkgname-$pkgver"
 
   make DESTDIR="$pkgdir" install-mplayer install-mplayer-man
   install -Dm644 etc/{codecs.conf,input.conf,example.conf} "$pkgdir/etc/mplayer/"
diff --git a/libre/netsurf-libre/PKGBUILD b/libre/netsurf-libre/PKGBUILD
new file mode 100644
index 000000000..d3c6463a2
--- /dev/null
+++ b/libre/netsurf-libre/PKGBUILD
@@ -0,0 +1,124 @@
+# $Id: PKGBUILD 95886 2013-08-18 11:31:23Z 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=4
+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")
+sha256sums=('f0dbcc5d80bf03d706aa8b28a322aa7f169a40813848c2d1505691f6e2c7ef00'
+            '7c6a48d3cc3e9a3e3a51b532ddf60f7697e97bf8b61a6d3b2ced1a2e89fbccc6')
+
+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"
+  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
new file mode 100644
index 000000000..98f3ea190
--- /dev/null
+++ b/libre/netsurf-libre/netsurf.install
@@ -0,0 +1,14 @@
+post_upgrade() {
+  #gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor
+  update-desktop-database -q
+}
+
+post_install() {
+  post_upgrade
+}
+
+post_remove() {
+  post_upgrade
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/newton-dynamics-libre/PKGBUILD b/libre/newton-dynamics-libre/PKGBUILD
new file mode 100644
index 000000000..1702cca70
--- /dev/null
+++ b/libre/newton-dynamics-libre/PKGBUILD
@@ -0,0 +1,50 @@
+# $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@lavabit.com>
+_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
new file mode 100644
index 000000000..83dfdd790
--- /dev/null
+++ b/libre/newton-dynamics-libre/assert-fix.patch
@@ -0,0 +1,13 @@
+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
index cd2e48f2b..6876f699f 100644
--- a/libre/ogmrip-libre/PKGBUILD
+++ b/libre/ogmrip-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: PKGBUILD 89460 2013-04-29 13:17:27Z jelle $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Daenyth
 # Contributor: Allan McRae <allan@archlinux.org>
@@ -7,9 +7,9 @@
 
 _pkgname=ogmrip
 pkgname=ogmrip-libre
-pkgver=0.13.8
-pkgrel=1
-pkgdesc="Libraries and GTK2 interface for DVD ripping using mencoder (without nonfree faac support)"
+pkgver=1.0.0
+pkgrel=2
+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')
@@ -31,7 +31,7 @@ options=('!libtool' '!makeflags')
 changelog=$_pkgname.changelog
 install=$_pkgname.install
 source=(http://downloads.sourceforge.net/sourceforge/${_pkgname}/${_pkgname}-${pkgver}.tar.gz)
-sha256sums=('ea6a75e6cc4fe7df1ed65648af208c87748959a6b372847b1005c3b92cc5a423')
+sha256sums=('6848a622152a62899b6e876e70ec36df1af7be9803b8b9c809ed631196bc18cc')
 
 build() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
diff --git a/libre/ogmrip-libre/ogmrip.changelog b/libre/ogmrip-libre/ogmrip.changelog
index 76179a2d3..bf5d84482 100644
--- a/libre/ogmrip-libre/ogmrip.changelog
+++ b/libre/ogmrip-libre/ogmrip.changelog
@@ -1,3 +1,6 @@
+2013-04-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* ogmrip 1.0.0-1
+
 2013-03-13 André Silva <emulatorman@lavabit.com>
 	* Remove nonfree faac support
 
diff --git a/libre/ogre-libre/PKGBUILD b/libre/ogre-libre/PKGBUILD
index 05e7d8cbb..f0ff93a83 100644
--- a/libre/ogre-libre/PKGBUILD
+++ b/libre/ogre-libre/PKGBUILD
@@ -1,29 +1,28 @@
-# $Id$
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+
+_bldname=blender
+_bldver=2.68
+_bldep=10
+
+# ($srcdir/Tools/${_bldname^}2.5Export/__init__.py:bl_info>version)
+_addver=2.0.1
+_addrel=1
 
 pkgbase=ogre
 pkgname=(
-  ogre-libre
-  #ogre-docs
-)
-pkgflag=(
-  -libre
-  -docs
+  $pkgbase-libre
+  #$_bldname-addon-$pkgbase # package unstable
 )
 pkgver=1.8.1
-pkgrel=4
-pkgdesc='Scene-oriented, flexible 3D engine written in C++, without nonfree nvidia-cg-toolkit support, nonfree fonts and arts'
+pkgrel=5
+pkgdesc='Scene-oriented, flexible 3D engine written in C++, without nonfree software support and files'
 arch=(
-  i686
-  x86_64
   mips64el
+  x86_64
+  i686
 )
-url="http://www.${pkgbase}3d.org"
-license=(
-  'MIT:(software)'
-  'cc by-sa:(sinbad character)'
-)
+url=http://www.${pkgbase}3d.org
+license=MIT
 depends=(
   boost-libs
   freeimage
@@ -39,26 +38,20 @@ makedepends=(
   cmake
   doxygen
   graphviz
-  intel-tbb
   mesa
-  #poco
   ttf-dejavu
 )
-install=$pkgbase.install
-source=(
-  "https://downloads.sourceforge.net/$pkgbase/${pkgbase}_src_v${pkgver//./-}.tar.bz2"
-)
-sha512sums=(
-  0bbce593e5a9ebf51e3cb53661f6447d99ae28a53365d7f518c6d408216690527ef7552385160cff8d5c3ef15d3ab5c2520ef2c1f51fda5541d5d4dca4663ae2
-)
+source=https://downloads.sourceforge.net/$pkgbase/${pkgbase}_src_v${pkgver//./-}.tar.bz2
+sha512sums=0bbce593e5a9ebf51e3cb53661f6447d99ae28a53365d7f518c6d408216690527ef7552385160cff8d5c3ef15d3ab5c2520ef2c1f51fda5541d5d4dca4663ae2
 
 build() {
   cd $srcdir/${pkgbase}_src_v${pkgver//./-}
 
   # get a clean build dir
-  [[ -d build ]] && rm -rf build
-  mkdir build    && cd build
+  [[ -d build ]] && rm -vrf build
+  mkdir -v build && cd build
 
+  # SAMPLES, SAMPLES_SOURCE and TESTS are nonfree
   cmake .. \
     -DCMAKE_BUILD_TYPE=Release\
     -DCMAKE_INSTALL_PREFIX=/usr\
@@ -67,120 +60,72 @@ build() {
     -D${pkgbase^^}_BUILD_COMPONENT_PROPERTY=TRUE\
     -D${pkgbase^^}_BUILD_COMPONENT_RTSHADERSYSTEM=TRUE\
     -D${pkgbase^^}_BUILD_COMPONENT_TERRAIN=TRUE\
-    -D${pkgbase^^}_BUILD_PLATFORM_APPLE_IOS=FALSE\
+    -D${pkgbase^^}_BUILD_PLATFORM_NACL=FALSE\
     -D${pkgbase^^}_BUILD_PLUGIN_BSP=TRUE\
-    -D${pkgbase^^}_BUILD_PLUGIN_CG=FALSE\
     -D${pkgbase^^}_BUILD_PLUGIN_OCTREE=TRUE\
     -D${pkgbase^^}_BUILD_PLUGIN_PCZ=TRUE\
     -D${pkgbase^^}_BUILD_PLUGIN_PFX=TRUE\
-    -D${pkgbase^^}_BUILD_RENDERSYSTEM_D3D9=FALSE\
-    -D${pkgbase^^}_BUILD_RENDERSYSTEM_D3D11=FALSE\
     -D${pkgbase^^}_BUILD_RENDERSYSTEM_GL=TRUE\
     -D${pkgbase^^}_BUILD_RENDERSYSTEM_GLES=FALSE\
     -D${pkgbase^^}_BUILD_RENDERSYSTEM_GLES2=FALSE\
-    -D${pkgbase^^}_BUILD_SAMPLES=TRUE\
+    -D${pkgbase^^}_BUILD_RTSHADERSYSTEM_CORE_SHADERS=TRUE\
+    -D${pkgbase^^}_BUILD_RTSHADERSYSTEM_EXT_SHADERS=TRUE\
+    -D${pkgbase^^}_BUILD_SAMPLES=FALSE\
     -D${pkgbase^^}_BUILD_TESTS=FALSE\
     -D${pkgbase^^}_BUILD_TOOLS=TRUE\
     -D${pkgbase^^}_CONFIG_ENABLE_DDS=TRUE\
     -D${pkgbase^^}_CONFIG_ENABLE_FREEIMAGE=TRUE\
-    -D${pkgbase^^}_CONFIG_ENABLE_GLES2_CG_SUPPORT=FALSE\
-    -D${pkgbase^^}_CONFIG_ENABLE_GLES2_GLSL_OPTIMISER=FALSE\
+    -D${pkgbase^^}_CONFIG_ENABLE_GLES2_GLSL_OPTIMISER=TRUE\
     -D${pkgbase^^}_CONFIG_ENABLE_PVRTC=TRUE\
     -D${pkgbase^^}_CONFIG_ENABLE_VIEWPORT_ORIENTATIONMODE=TRUE\
     -D${pkgbase^^}_CONFIG_ENABLE_ZIP=TRUE\
     -D${pkgbase^^}_CONFIG_NEW_COMPILERS=TRUE\
-    -D${pkgbase^^}_INSTALL_DOCS=TRUE\
-    -D${pkgbase^^}_INSTALL_SAMPLES=TRUE\
-    -D${pkgbase^^}_INSTALL_SAMPLES_SOURCE=TRUE\
+    -D${pkgbase^^}_CONFIG_THREAD_PROVIDER=boost\
+    -D${pkgbase^^}_INSTALL_DOCS=FALSE\
+    -D${pkgbase^^}_INSTALL_SAMPLES=FALSE\
+    -D${pkgbase^^}_INSTALL_SAMPLES_SOURCE=FALSE\
     -D${pkgbase^^}_INSTALL_TOOLS=TRUE\
     -D${pkgbase^^}_LIB_DIRECTORY=lib\
     -D${pkgbase^^}_PROFILING=TRUE\
     -D${pkgbase^^}_USE_BOOST=TRUE
   make V=0
-
-  # generate docs
-  if [[ $(which dot) && $(which doxygen) ]]; then
-    make V=0 doc
-  fi
 }
 
 package_ogre-libre() {
   optdepends=(
-    'intel-tbb: better threading support'
-    #'poco: portability'
     "boost: for developing using $pkgbase"
-    "$pkgbase${pkgflag[1]}: documentation"
-  )
-  provides=(
-    $pkgbase=$pkgver
-  )
-  conflicts=(
-    $pkgbase
-  )
-  replaces=(
-    $pkgbase
+    "$pkgbase-docs: documentation"
   )
+  provides=($pkgbase=$pkgver)
+  conflicts=$pkgbase
+  replaces=$pkgbase
 
   cd $srcdir/${pkgbase}_src_v${pkgver//./-}/build
 
   make DESTDIR=$pkgdir install
 
-  # fix samplebrowser name
-  mv $pkgdir/usr/bin/SampleBrowser $pkgdir/usr/bin/${pkgbase^}SampleBrowser
-
-  ## LIBRE PATCH ##
-  # drop cg shaders, hlsl shaders, unusable headers, unusable samples, nonfree fonts and nonfree arts
-  rm -fv  $pkgdir/usr/include/${pkgbase^^}/RTShaderSystem/${pkgbase^}Shader{CG,HLSL}Program{Processor,Writer}.h
-  rm -fv  $pkgdir/usr/lib/${pkgbase^^}/Samples/Sample_{BSP,CelShading,Dot3Bump,Fresnel,SSAO}.so
-  rm -fvr $pkgdir/usr/share/${pkgbase^^}/Samples/{BSP,CelShading,Dot3Bump,Fresnel,SSAO}
-  rm -fvr $pkgdir/usr/share/${pkgbase^^}/media/materials/textures/nvidia
-  rm -fv  $pkgdir/usr/share/${pkgbase^^}/media/packs/{chiropteraDM.{pk3,txt},cubemapsJS.zip}
-  rm -fvr $pkgdir/usr/share/${pkgbase^^}/media/fonts
-  sed -i -e '
-  /BSP/d
-  /CelShading/d
-  /Dot3Bump/d
-  /Fresnel/d
-  /SSAO/d
-  ' $pkgdir/usr/share/${pkgbase^^}/samples.cfg
-  sed -i -e '
-  /Direct3D9/d
-  /Direct3D11/d
-  /CgProgramManager/d
-  ' $pkgdir/usr/share/${pkgbase^^}/plugins.cfg
-  sed -i -e '
-  /cubemapsJS/d
-  /fonts/d
-  /nvidia/d
-  ' $pkgdir/usr/share/${pkgbase^^}/resources.cfg
-  find $pkgdir -type f -name *.cg   -delete
-  find $pkgdir -type f -name *.hlsl -delete
-  rm -fvr $pkgdir/usr/share/${pkgbase^^}/Samples/Browser/Android
-  rm -fvr $pkgdir/usr/share/${pkgbase^^}/Samples/Browser/include/SampleBrowser_{NaCl,OSX,iOS}.h
-  rm -fvr $pkgdir/usr/share/${pkgbase^^}/Samples/Browser/src/FileSystemLayerImpl_{{Android,NaCl,OSX,WIN32}.cpp,iOS.mm}
-
   # install license
-  install -Dm644 ../Docs/License.html $pkgdir/usr/share/licenses/$pkgbase/license.html
+  install -vDm644 ../Docs/License.html $pkgdir/usr/share/licenses/$pkgbase/license.html
 
-  # move docs out of this package
-  mv $pkgdir/usr/share/${pkgbase^^}/docs $srcdir/docs
+  # remove nonfree files
+  rm -vr $pkgdir/usr/lib/OGRE/cmake
+  rm -v $pkgdir/usr/include/OGRE/Example*.h
 }
 
-package_ogre-docs() {
-  pkgdesc="Documentation for $pkgbase"
+package_blender-addon-ogre() {
+  pkgdesc="${pkgbase^} Mesh Exporter: A addon for the ${_bldname^} which allows export mesh and (skeletal/morph/pose) animations to ${pkgbase^}3D format (built for the $_bldname-libre package)"
+  arch=any
   depends=(
+    "$_bldname-libre>=$(($_bldep-1)):$_bldver"
+    "$_bldname-libre<$_bldep:${_bldver::2}$((${_bldver:2:4}+1))"
   )
+  _pkgver=$pkgver
+  pkgver=$_addver.v$_bldver
+  pkgrel=$_addrel
 
-  cd $srcdir/${pkgbase}_src_v${pkgver//./-}/build
-
-  # move docs into this package
-  install -dm755  $pkgdir/usr/share/doc
-  mv $srcdir/docs $pkgdir/usr/share/doc/${pkgbase^^}
-
-  # symlink for docs
-  install -dm755 $pkgdir/usr/share/${pkgbase^^}
-  cd             $pkgdir/usr/share
-  ln -s          doc/${pkgbase^^} ${pkgbase^^}/docs
+  cd $srcdir/${pkgbase}_src_v${_pkgver//./-}
+  a=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons               
+  install -vd $a && cp -va Tools/${_bldname^}2.5Export $a/$pkgbase
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/libre/ogre-libre/ogre.install b/libre/ogre-libre/ogre.install
deleted file mode 100644
index c05ad1ed3..000000000
--- a/libre/ogre-libre/ogre.install
+++ /dev/null
@@ -1,3 +0,0 @@
-post_install() {
-    echo "To view the OGRE samples just run OgreSampleBrowser"
-}
diff --git a/libre/openexr-libre/PKGBUILD b/libre/openexr-libre/PKGBUILD
new file mode 100644
index 000000000..638d504b7
--- /dev/null
+++ b/libre/openexr-libre/PKGBUILD
@@ -0,0 +1,63 @@
+# $Id: PKGBUILD 191713 2013-07-29 10:21:41Z tpowa $
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+_pkgname=openexr
+pkgname=openexr-libre
+pkgver=2.0.1
+pkgrel=1
+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
new file mode 100644
index 000000000..ab99eb9a1
--- /dev/null
+++ b/libre/openexr-libre/gcc43.patch
@@ -0,0 +1,11 @@
+--- 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
index 31ea71824..4c5c97a12 100644
--- a/libre/openshot-libre/PKGBUILD
+++ b/libre/openshot-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: PKGBUILD 92333 2013-06-04 05:05:15Z svenstaro $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Asa Marco <marcoasa90[at]gmail[.]com>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,8 +6,8 @@
 _pkgname=openshot
 pkgname=openshot-libre
 pkgver=1.4.3
-pkgrel=1
-pkgdesc="a free, non-linear video editor for GNU/Linux based on MLT framework (without nonfree faac recommendation)"
+pkgrel=2
+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')
diff --git a/libre/openshot-libre/openshot.install b/libre/openshot-libre/openshot.install
index cc0de896d..aab69abed 100644
--- a/libre/openshot-libre/openshot.install
+++ b/libre/openshot-libre/openshot.install
@@ -1,11 +1,11 @@
 post_install() {
-	[ -x `which update-mime-database` ] &&  update-mime-database usr/share/mime
+    update-mime-database usr/share/mime &>/dev/null
 }
 
 post_upgrade() {
-	[ -x `which update-mime-database` ] &&  update-mime-database usr/share/mime
+    post_install
 }
 
 post_remove() {
-	[ -x `which update-mime-database` ] &&  update-mime-database usr/share/mime
+    post_install
 }
diff --git a/libre/oss-libre/PKGBUILD b/libre/oss-libre/PKGBUILD
new file mode 100644
index 000000000..ab51da0cd
--- /dev/null
+++ b/libre/oss-libre/PKGBUILD
@@ -0,0 +1,104 @@
+# $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@lavabit.com>
+
+pkgname=oss-libre
+pkgver=4.2_2007
+pkgrel=4
+arch=('i686' 'x86_64')
+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
new file mode 100644
index 000000000..46200e01a
--- /dev/null
+++ b/libre/oss-libre/linux-3.8.patch
@@ -0,0 +1,40 @@
+--- 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
new file mode 100644
index 000000000..9bd4e1fbc
--- /dev/null
+++ b/libre/oss-libre/oss.install
@@ -0,0 +1,25 @@
+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
new file mode 100644
index 000000000..0200d2477
--- /dev/null
+++ b/libre/oss-libre/oss.service
@@ -0,0 +1,12 @@
+[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
new file mode 100644
index 000000000..27e2ef2de
--- /dev/null
+++ b/libre/oss-libre/remove-hal.patch
@@ -0,0 +1,20 @@
+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
new file mode 100644
index 000000000..981ff605f
--- /dev/null
+++ b/libre/oss-libre/rm-init-scripts.patch
@@ -0,0 +1,52 @@
+--- 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
new file mode 100644
index 000000000..4702b8680
--- /dev/null
+++ b/libre/oss-libre/soundon.patch
@@ -0,0 +1,28 @@
+--- 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/PKGBUILD b/libre/p7zip-libre/PKGBUILD
index 2e6ab6e01..fbd189a81 100644
--- a/libre/p7zip-libre/PKGBUILD
+++ b/libre/p7zip-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: PKGBUILD 188504 2013-06-15 04:51:48Z 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
@@ -8,7 +8,7 @@
 pkgname=p7zip-libre
 _pkgname=${pkgname%-libre}
 pkgver=9.20.1
-pkgrel=6
+pkgrel=7
 pkgdesc='Command-line version of the 7zip compressed file archiver without Rar'
 url='http://p7zip.sourceforge.net/'
 license=('GPL')
@@ -20,21 +20,22 @@ depends=('gcc-libs' 'bash')
 optdepends=('wxgtk: GUI'
             'desktop-file-utils: desktop entries')
 makedepends=('yasm' 'nasm' 'wxgtk')
-source=("http://repo.parabolagnulinux.org/other/${pkgname}_${pkgver}.tar.bz2"
+source=("http://downloads.sourceforge.net/project/${_pkgname}/${_pkgname}/${pkgver}/${_pkgname}_${pkgver}_src_all.tar.bz2"
         'p7zip-libre.patch'
         '7zFM.desktop')
-sha1sums=('4cffac613e7f3d8fc3c60677491b83a2d5cf16c9'
+sha1sums=('1cd567e043ee054bf08244ce15f32cb3258306b7'
           '8fc0e6e80aeec371a8c80e7a6082594ac6d08aed'
           'f2c370d6f1b286b7ce9a2804e22541b755616a40')
+
+options=('!makeflags')
 install=install
 
-mksource() {
-    if [ ! -d "${_pkgname}_${pkgver}" ]; then
-    wget -O - "http://downloads.sourceforge.net/project/${_pkgname}/${_pkgname}/${pkgver}/${_pkgname}_${pkgver}_src_all.tar.bz2" | \
-        tar xjf -
-    fi
+build() {
+	cd "${srcdir}/${_pkgname}_${pkgver}"
 
-    pushd "${_pkgname}_${pkgver}"
+	[[ $CARCH = x86_64 ]] \
+	&& cp makefile.linux_amd64_asm makefile.machine \
+	|| cp makefile.linux_x86_asm_gcc_4.X makefile.machine
 
     msg "Removing unRar"
 # Generate patch
@@ -43,20 +44,7 @@ mksource() {
 # Remove Rar mentions in CPP/7zip/Bundles/Format7zFree/makefile
     patch -Np1 -i ../p7zip-libre.patch
 
-    popd
-
-    tar czvf "${pkgname}_${pkgver}.tar.bz2" "${_pkgname}_${pkgver}"
-}
-
-build() {
-	cd "${srcdir}/${_pkgname}_${pkgver}"
-
-        case $CARCH in
-            x86_64) cp makefile.linux_amd64_asm makefile.machine ;;
-            i686) cp makefile.linux_x86_asm_gcc_4.X makefile.machine ;;
-        esac
-
-        make all4 OPTFLAGS="${CXXFLAGS}"
+	make all4 OPTFLAGS="${CXXFLAGS}"
 }
 
 package() {
@@ -68,7 +56,7 @@ package() {
 		DEST_MAN="/usr/share/man"
 
 	# Integration with stuff...
-	install -D GUI/p7zip_32.png "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/p7zip.png
+	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/
diff --git a/libre/pacman-mirrorlist-libre/PKGBUILD b/libre/pacman-mirrorlist-libre/PKGBUILD
index c29fe14f5..b2507af21 100644
--- a/libre/pacman-mirrorlist-libre/PKGBUILD
+++ b/libre/pacman-mirrorlist-libre/PKGBUILD
@@ -1,6 +1,6 @@
 # $Id: PKGBUILD 88892 2010-08-26 04:28:34Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
-# Maintainer Parabola GNU/Linux: Joshua Ismael <hahj87@gmail.com>
+# Maintainer (Parabola): Esteban Carnevale <alfplayer@mailoo.org>
 
 pkgname=pacman-mirrorlist-libre
 pkgver=$(date +%Y%m%d)
@@ -15,7 +15,7 @@ source=(mirrorlist::${url})
 conflicts=(pacman-mirrorlist)
 replaces=(pacman-mirrorlist)
 provides=(pacman-mirrorlist)
-md5sums=('d83594593b9856ae1c0a22f16af94520')
+md5sums=('16ae993e6145aeaa435318386a057482')
 
 # keep an upgrade path for older installations
 PKGEXT='.pkg.tar.gz'
diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index 614c1156e..1dec5dcc9 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -1,10 +1,10 @@
 # vim: set ts=2 sw=2 et:
-# $Id: PKGBUILD 184462 2013-05-07 03:37:44Z allan $
+# $Id: PKGBUILD 188692 2013-06-18 04:04:38Z allan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 
 pkgname=pacman
-pkgver=4.1.1
+pkgver=4.1.2
 pkgrel=1
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64' 'mips64el')
@@ -26,7 +26,7 @@ source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
         pacman.conf.x86_64
         pacman.conf.mips64el
         makepkg.conf)
-md5sums=('72a1688ff73c1c0b79d8f87b3793d446'
+md5sums=('063c8b0ff6bdf903dc235445525627cd'
          'SKIP'
          '688feb0a552f42643a76f72e7198bfe4'
          '765858b55d2112d948932fc645ea538b'
diff --git a/libre/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD
index d5a1e561d..dd48634fd 100644
--- a/libre/parabola-keyring/PKGBUILD
+++ b/libre/parabola-keyring/PKGBUILD
@@ -7,13 +7,13 @@ 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}-${pkgver}.tar.gz"
-        "http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz.sig")
+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}"
+	cd $srcdir/$pkgname-$pkgver
 	make PREFIX=/usr DESTDIR=${pkgdir} install
 }
-md5sums=('ad747cf1f710e5962aa6b0931fcb580f'
-         'c1030ca1c960d2ee6cfe11d798a7b471')
+md5sums=('d50f8ba9f108b38c0e084d21742ea059'
+         'SKIP')
diff --git a/libre/parabolaiso-data/PKGBUILD b/libre/parabolaiso-data/PKGBUILD
new file mode 100644
index 000000000..22c1b98f6
--- /dev/null
+++ b/libre/parabolaiso-data/PKGBUILD
@@ -0,0 +1,29 @@
+# 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/parabola-archiso/PKGBUILD b/libre/parabolaiso/PKGBUILD
index 336892373..833a6f56b 100644
--- a/libre/parabola-archiso/PKGBUILD
+++ b/libre/parabolaiso/PKGBUILD
@@ -1,20 +1,21 @@
+# Maintainer: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): Esteban Carnevale <alfplayer@mailoo.org>
 
-pkgname=parabola-archiso
-pkgver=2012.10.17
-pkgrel=1
+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://parabolagnulinux.org'
+url='https://projects.parabolagnulinux.org/parabolaiso.git/'
 license=('GPL')
-depends=('make' 'squashfs-tools' 'libisoburn' 'dosfstools' 'patch' 'lynx' 'wget')
+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=('b8a5d4a6ee2547a502cbecea0e238e61'
-         '9425cc4353b5654d7478e9e2b0bf848d')
+md5sums=('e94c1f49f32e02480c14ee3162e8ee1b'
+         'SKIP')
 
 package() {
 	cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/libre/parabolaweb-utils/PKGBUILD b/libre/parabolaweb-utils/PKGBUILD
index 4220394dc..0a49ce048 100644
--- a/libre/parabolaweb-utils/PKGBUILD
+++ b/libre/parabolaweb-utils/PKGBUILD
@@ -1,63 +1,37 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 
-. "${startdir:-.}/helper.sh"
-# provides:
-#  _get_depends
-#  _get_depends_nover (no version requirements)
-
-pkgname=parabolaweb-utils
-pkgver=20120425.0657
-pkgdesc="Utils for the Parabola website"
-url="https://projects.parabolagnulinux.org/parabolaweb.git/"
+pkgname=(parabolaweb-utils parabolaweb-dev)
+pkgver=20130717
+pkgdesc="Utilities for managing the parabolaweb website application"
+url="https://projects.parabolagnulinux.org/packages/parabolaweb-utils.git/"
 license=('GPL2')
 
 pkgrel=1
 epoch=1
 arch=('any')
-depends=(
-    'python2'      # duh
-    'python2-flup' # for fcgi
-    'postgresql'   # for database
-    'git'          # used in parabolaweb-download
-    'libretools'   # used in parabolaweb-{download,update} (libremessages)
-    `_get_depends`)
-conflicts=('django>=1.5') # hold it at 1.4
-makedepends=(makepkg-git)
-backup=('etc/conf.d/parabolaweb')
 
-source=(git://parabolagnulinux.org/parabolaweb.git
-	parabolaweb-download
-	parabolaweb-update
-	parabolaweb-fcgi
-	parabolaweb.rc
-	parabolaweb.service
-	parabolaweb.conf)
+source=(
+  "https://projects.parabolagnulinux.org/packages/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
+  "https://projects.parabolagnulinux.org/parabolaweb.git/plain/requirements_prod.txt"
+)
 
-pkgver() {
-	cd "$srcdir/parabolaweb"
-	# get the date requirements_prod.txt was last modified
-	gitdate="$(git log -n1 --date=iso --format=format:'%cd' ./requirements_prod.txt)"
-	date -u +%Y%m%d.%H%M -d "$gitdate"
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+	prod_file="file://${srcdir}/requirements_prod.txt" make
 }
 
-build() {
-	:
+package_parabolaweb-utils() {
+	cd "$srcdir/$pkgbase-$pkgver"
+	depends=($(cat depends.txt))
+	backup=('etc/conf.d/parabolaweb')
+	make install DESTDIR="$pkgdir"
 }
 
-package() {
-	cd "${srcdir}"
-	install -Dm755 parabolaweb-download  "${pkgdir}/usr/sbin/parabolaweb-download"
-	install -Dm755 parabolaweb-update    "${pkgdir}/usr/sbin/parabolaweb-update"
-	install -Dm755 parabolaweb-fcgi      "${pkgdir}/usr/sbin/parabolaweb-fcgi"
-	install -Dm755 parabolaweb.rc        "${pkgdir}/etc/rc.d/parabolaweb"
-	install -Dm644 parabolaweb.service   "${pkgdir}/usr/lib/systemd/system/parabolaweb.service"
-	install -Dm644 parabolaweb.conf      "${pkgdir}/etc/conf.d/parabolaweb"
+package_parabolaweb-dev() {
+	cd "$srcdir/$pkgbase-$pkgver"
+	pkgdesc="Depends on packages needed to develop parabolaweb"
+	depends=($(sed -r -e 's/\s*#.*//' depends_make.txt))
 }
 
-md5sums=('SKIP'
-         'f162c2ce49b4cafe0a14bd4767dfea04'
-         '7c212024c134fdd0d0318b52a5448ddb'
-         'd5294495f42df29d29519ebd0a8f6093'
-         'cc15e153f99fba82e7bb032896f655c2'
-         'a468016a7155b5da46521dcfc6428384'
-         'ffd37a19b1a72fbac2c58504aa17b355')
+md5sums=('a6734335001c7695d5a57fb509f8a745'
+         'c84e52d81683cb3d572571ac19be89ac')
diff --git a/libre/parabolaweb-utils/helper.sh b/libre/parabolaweb-utils/helper.sh
deleted file mode 100644
index ce8638e7e..000000000
--- a/libre/parabolaweb-utils/helper.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-_mksource() {
-	pushd "${startdir:-.}" >/dev/null
-	if [[ -z $_DO_NOT_RUN_MKSOURCE && $0 =~ ^makepkg ]]; then
-		local flags=(-o)
-		(( EUID )) || flags+=(--asroot)
-		_DO_NOT_RUN_MKSOURCE=true "${0}" "${flags[@]}"
-	fi
-	popd >/dev/null
-}
-
-_get_depends() {
-	_mksource 1>&2
-	if [[ -f "${srcdir:-${startdir:-.}/src}/parabolaweb/requirements_prod.txt" ]]; then
-		pushd "${srcdir:-src}" >/dev/null
-		< parabolaweb/requirements_prod.txt sed -r \
-			-e 's/.*/\L&/' -e 's/==/>=/' \
-			-e 's/^(python2?-)?/python2-/' \
-			-e 's/python2-django/django/'
-		popd >/dev/null
-	fi
-}
-
-_get_depends_nover() {
-	_get_depends | sed 's/[<>=].*//'
-}
diff --git a/libre/parabolaweb-utils/parabolaweb-download b/libre/parabolaweb-utils/parabolaweb-download
deleted file mode 100644
index e124295d4..000000000
--- a/libre/parabolaweb-utils/parabolaweb-download
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-
-. /etc/conf.d/parabolaweb
-. /usr/bin/libremessages
-
-dir=$WEBDIR
-repo=$GITURL
-ref=$GITREF
-
-cd_safe() {
-	if ! cd "$1"; then
-		error "$(gettext "Failed to change to directory %s")" "$1"
-		plain "$(gettext "Aborting...")"
-		exit 1
-	fi
-}
-
-download_git() {
-	if [[ ! -d "$dir/.git" ]] ; then
-		msg2 "$(gettext "Cloning %s %s repo...")" "${repo}" "git"
-		if ! git clone "$repo" "$dir"; then
-			error "$(gettext "Failure while downloading %s %s repo")" "${repo}" "git"
-			plain "$(gettext "Aborting...")"
-			exit 1
-		fi
-	else
-		cd_safe "$dir"
-		# Make sure we are fetching the right repo
-		if [[ "$repo" != "$(git config --get remote.origin.url)"  ]] ; then
-			error "$(gettext "%s is not a clone of %s")" "$dir" "$repo"
-			plain "$(gettext "Aborting...")"
-			exit 1
-		fi
-		msg2 "$(gettext "Updating %s %s repo...")" "${repo}" "git"
-		if ! git pull origin "$ref"; then
-			# only warn on failure to allow offline builds
-			warning "$(gettext "Failure while updating %s %s repo")" "${repo}" "git"
-		fi
-	fi
-}
-
-main() {
-	[[ -d "${dir%/*}" ]] || mkdir -p "${dir%/*}"
-	download_git
-}
-
-main "$@"
diff --git a/libre/parabolaweb-utils/parabolaweb-fcgi b/libre/parabolaweb-utils/parabolaweb-fcgi
deleted file mode 100644
index e42aec3cd..000000000
--- a/libre/parabolaweb-utils/parabolaweb-fcgi
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-set -e
-
-. /etc/conf.d/parabolaweb
-
-[[ -e ${WEBDIR}/manage.py ]]
-
-sudo -u "${WEBUSER:-$USER}" python2 "${WEBDIR}/manage.py" runfcgi \
-	host=${HOST} \
-	port=${PORT} \
-	--settings=settings \
-	"$@"
diff --git a/libre/parabolaweb-utils/parabolaweb-update b/libre/parabolaweb-utils/parabolaweb-update
deleted file mode 100644
index 2da9eea8a..000000000
--- a/libre/parabolaweb-utils/parabolaweb-update
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/bash
-set -e
-
-. /etc/conf.d/parabolaweb
-. /usr/bin/libremessages
-
-find_makefiles() {
-	pushd "$WEBDIR" > /dev/null
-	echo ./sitestatic
-	find . -name static -type d | while read dir; do
-		if [[ -e "$WEBDIR/$dir/Makefile" ]]; then
-			printf '%s\n' "$dir"
-		fi
-	done
-}
-
-clean() {
-	cd "$WEBDIR"
-	msg "Purging old .pyc files..."
-	find . -name '*.pyc' -delete
-	msg "Purging old GNU Make generated files..."
-	for dir in `find_makefiles`; do
-		make -C "$WEBDIR/$dir" clean
-	done
-}
-
-configure() {
-	cd "$WEBDIR"
-	msg "Checking configuration..."
-	if [[ ! -f local_settings.py ]]; then
-		msg2 "Configuration file missing, opening editor..."
-		cp local_settings.py.example local_settings.tmp.$$.py
-		if "$EDITOR" local_settings.tmp.$$.py; then
-			mv local_settings.tmp.$$.py local_settings.py
-		else
-			rm local_settings.tmp.$$.py
-			msg "Failed to configure, exiting"
-			exit 1
-		fi
-		msg2 "Creating database..."
-		./manage.py syncdb
-	else
-		msg2 "Current configuration checks out"
-	fi
-}
-
-update-database() {
-	cd "$WEBDIR"
-	msg "Updating database..."
-	msg2 "Running migrations..."
-	./manage.py migrate
-	if [[ -f devel/management/commands/update_types_permissions.py ]]; then
-		msg2 "Updating permissions..."
-		./manage.py update_types_permissions
-	fi
-	msg2 "Loading fixtures..."
-	./manage.py loaddata */fixtures/*.json
-}
-
-update-filesystem() {
-	msg "Updating filesystem..."
-	for dir in `find_makefiles`; do
-		msg2 "Updating $dir with GNU Make..."
-		make -C "$WEBDIR/$dir"
-	done
-	cd "$WEBDIR"
-	msg2 "Collecting static files..."
-	echo yes | ./manage.py collectstatic -l
-}
-
-main() {
-	if [[ -z "$EDITOR" ]]; then
-		error 'Please set the $EDITOR variable'
-		exit 1
-	fi
-
-	if [[ -d "$WEBDIR" ]]; then
-		clean
-	fi
-	parabolaweb-download
-	configure
-	update-database
-	update-filesystem
-}
-
-main "$@"
diff --git a/libre/parabolaweb-utils/parabolaweb.conf b/libre/parabolaweb-utils/parabolaweb.conf
deleted file mode 100644
index 5363479b3..000000000
--- a/libre/parabolaweb-utils/parabolaweb.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-HOST=127.0.0.1
-PORT=8090 # 80 is nginx
-WEBDIR=/srv/http/web
-WEBUSER=nobody
-GITURL=git://parabolagnulinux.org/parabolaweb.git
-GITREF=master
diff --git a/libre/parabolaweb-utils/parabolaweb.rc b/libre/parabolaweb-utils/parabolaweb.rc
deleted file mode 100644
index 5e310b01d..000000000
--- a/libre/parabolaweb-utils/parabolaweb.rc
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PIDFILE=/run/web/parabolaweb.pid
-
-case $1 in
-start)
-	stat_busy "Starting ParabolaWeb"
-	install -dm777 ${PIDFILE%/*}
-	if parabolaweb-fcgi pidfile=${PIDFILE}; then
-		add_daemon parabolaweb
-		stat_done
-		exit 0
-	else
-		stat_fail
-		exit 1
-	fi
-	;;
-
-stop)
-	stat_busy "Stopping ParabolaWeb"
-	if [[ -f ${PIDFILE} ]]; then
-		pid=$(cat ${PIDFILE})
-		kill ${pid}
-		rm_daemon parabolaweb
-		stat_done
-	else
-		stat_fail
-		exit 1
-	fi
-	;;
-
-restart)
-	$0 stop
-	$0 start
-	;;
-
-*)
-	echo "Usage: $0 {start|stop|restart}" >&2
-	exit 1
-
-esac
diff --git a/libre/parabolaweb-utils/parabolaweb.service b/libre/parabolaweb-utils/parabolaweb.service
deleted file mode 100644
index a59d58512..000000000
--- a/libre/parabolaweb-utils/parabolaweb.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Requires=postgresql.service
-After=postgresql.service
-Description=ParabolaWeb
-
-[Service]
-Type=forking
-PIDFile=/run/web/parabolaweb.pid
-ExecStartPre=/usr/bin/install -dm777 /run/web
-ExecStart=/usr/sbin/parabolaweb-fcgi pidfile=/run/web/parabolaweb.pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/pcr/pngcrush/PKGBUILD b/libre/pngcrush/PKGBUILD
index a4ac8b5cb..f44ace016 100644
--- a/pcr/pngcrush/PKGBUILD
+++ b/libre/pngcrush/PKGBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 
 pkgname=pngcrush
-pkgver=1.7.58
+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/"
+url="http://pmt.sourceforge.net/pngcrush/"
 license=('custom')
 depends=('libpng' 'zlib')
 source=(http://downloads.sourceforge.net/pmt/$pkgname-$pkgver-nolib.tar.xz)
@@ -23,4 +23,5 @@ package() {
   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=('aa09aa8a65999ba522e5735ed0ad6a1a')
+
+md5sums=('b4130246c14c1cffc6c2014ff86f1008')
diff --git a/libre/psutils-libre/PKGBUILD b/libre/psutils-libre/PKGBUILD
index 3679222b1..4a55ea38e 100644
--- a/libre/psutils-libre/PKGBUILD
+++ b/libre/psutils-libre/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 140791 2011-10-19 10:03:22Z andrea $
+# $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>
-# Contributor: xihh <hahj87@gmail.com>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): xihh <hahj87@gmail.com>
 
 _pkgname=psutils
 pkgname=psutils-libre
 pkgver=1.17
-pkgrel=3.1
+pkgrel=4
 arch=('i686' 'x86_64' 'mips64el')
-pkgdesc="A set of postscript utilities"
-url="http://www.tardis.ed.ac.uk/~ajcd/psutils/index.html"
+pkgdesc="A set of postscript utilities, without nonfree files"
+url="http://knackered.org/angus/psutils/"
 license=('custom')
 depends=('glibc' 'ghostscript')
 provides=('psutils-lprng' 'psutils')
@@ -18,16 +19,22 @@ 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')
+        'psutils-1.17.diff'
+        'libre.patch')
 md5sums=('b161522f3bd1507655326afa7db4a0ad'
-         '2b49e9e796000b42f42804d4b50a2be1')
+         '2b49e9e796000b42f42804d4b50a2be1'
+         'a4beaf371607085e89ef190c1db7aee3')
 
 build() {
   cd "${srcdir}/${_pkgname}"
   patch -Np1 -i "${srcdir}/psutils-1.17.diff"
-  make -f Makefile.unix BINDIR="${pkgdir}/usr/bin" \
-    INCLUDEDIR="${pkgdir}/usr/include/psutils" PERL=/usr/bin/perl \
-    MANDIR="${pkgdir}/usr/share/man/man1" \
+  # 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"
 }
diff --git a/libre/psutils-libre/libre.patch b/libre/psutils-libre/libre.patch
new file mode 100644
index 000000000..c2bd21245
--- /dev/null
+++ b/libre/psutils-libre/libre.patch
@@ -0,0 +1,41 @@
+--- 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/python2-bencode/PKGBUILD b/libre/python2-bencode/PKGBUILD
new file mode 100644
index 000000000..762d55cad
--- /dev/null
+++ b/libre/python2-bencode/PKGBUILD
@@ -0,0 +1,24 @@
+# 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
new file mode 100644
index 000000000..f0625f45c
--- /dev/null
+++ b/libre/python2-bencode/bittorrent-osl.txt
@@ -0,0 +1,510 @@
+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
index 0f155de89..ba21b8fc4 100644
--- a/libre/python2-cssmin-fredj/PKGBUILD
+++ b/libre/python2-cssmin-fredj/PKGBUILD
@@ -4,14 +4,13 @@ _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="Provides a country field for Django models"
-license=('custom:MIT')
-url="http://bitbucket.org/smileychris/django-countries/"
-
+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=1
+pkgrel=2
 arch=(any)
 
 makedepends=('python2-distribute')
diff --git a/libre/python2-jsmin/PKGBUILD b/libre/python2-jsmin/PKGBUILD
new file mode 100644
index 000000000..5c7646ec2
--- /dev/null
+++ b/libre/python2-jsmin/PKGBUILD
@@ -0,0 +1,27 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+_pkgname=jsmin
+pkgname=python2-jsmin
+pkgver=2.0.3
+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=('6bdce452c7508d9bd11b133e965fb64e')
diff --git a/libre/python2-reportlab-libre/PKGBUILD b/libre/python2-reportlab-libre/PKGBUILD
index 27014d100..10bb58bdc 100644
--- a/libre/python2-reportlab-libre/PKGBUILD
+++ b/libre/python2-reportlab-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 67753 2012-03-14 10:35:58Z giovanni $
+# $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>
@@ -9,26 +9,25 @@
 pkgbase=python-reportlab-libre
 pkgname=python2-reportlab-libre
 _origname=reportlab
-pkgver=2.6
+pkgver=2.7
 pkgrel=1
-pkgdesc="A proven industry-strength PDF generating solution (without non-free Adobe T1 fonts)"
+pkgdesc="A proven industry-strength PDF generating solution, without nonfree Adobe T1 fonts"
 arch=('i686' 'x86_64')
 url="http://www.reportlab.org/rl_toolkit.html"
-depends=('python2' 'freetype2' 'ttf-bitstream-vera' 'gsfonts' 'python-imaging')
-conflicts=('python2-reportlab' 'python-reportlab<=2.5-2')
-replaces=('python2-reportlab' 'python-reportlab<=2.5-2')
+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/${_origname}-$pkgver.tar.gz
+source=(http://www.reportlab.com/ftp/reportlab-$pkgver.tar.gz
         free-fonts.patch)
-md5sums=('e5d27a24a2c8456b168913242aa1940f'
+md5sums=('78300e6fe8a0d020fc16734a3de80cc4'
          '1588b88851711cc6c868db4c7d4f4dea')
-optdepends=('ghostscript')
 
 build() {
     cd $srcdir/${_origname}-$pkgver
 
-    # remove non-free Adobe T1 fonts
+    # remove nonfree Adobe T1 fonts
     patch -p1 -i $srcdir/free-fonts.patch
 
     # Parabola contains those fonts from the ttf-bitstream-vera package
@@ -43,7 +42,11 @@ build() {
 
 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/qupzilla-libre/PKGBUILD b/libre/qupzilla-libre/PKGBUILD
new file mode 100644
index 000000000..ba0a64ed1
--- /dev/null
+++ b/libre/qupzilla-libre/PKGBUILD
@@ -0,0 +1,57 @@
+# $Id: PKGBUILD 96569 2013-09-01 16:36:10Z speps $
+# Maintainer: speps <speps at aur dot archlinux dot org>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+
+_name=QupZilla
+_pkgname=qupzilla
+pkgname=qupzilla-libre
+pkgver=1.4.4
+pkgrel=1.1
+pkgdesc="Cross-platform QtWebKit browser, without non-privacy search providers"
+arch=(i686 x86_64 mips64el)
+url="http://www.qupzilla.com/"
+license=('GPL3')
+depends=('qtwebkit' 'hunspell')
+optdepends=('bash-completion: bash completion support')
+install="$_pkgname.install"
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+source=("$_pkgname-$pkgver.tar.gz::https://github.com/$_name/$_pkgname/tarball/v$pkgver"
+         'searchenginesmanager.cpp.sed'
+         'speeddial.cpp.sed'
+         'start.html.sed')
+md5sums=('cfbf5cd23d184275c389c79a39a28631'
+         '1d926e97a5b287d40fb695f6516f2a06'
+         '0f166fa102af975b3b8ac030d477e9b8'
+         '77120a0c39ba8254e5b2c273910f029a')
+
+prepare() {
+  cd "$srcdir/$_name-$_pkgname-"*
+
+  # remove Google and Youtube support, replaces it to DDG HTML
+  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 "$srcdir/$_name-$_pkgname-"*
+
+  # enable webgl support
+  export USE_WEBGL=true
+
+  qmake-qt4 QUPZILLA_PREFIX=/usr/
+  make
+}
+
+package() {
+  cd "$srcdir/$_name-$_pkgname-"*
+  make INSTALL_ROOT="$pkgdir/" install
+
+  # zsh completion
+  install -Dm644 linux/completion/zsh_completion.sh \
+    "$pkgdir/usr/share/zsh/site-functions/_$_pkgname"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/ams/ams.install b/libre/qupzilla-libre/qupzilla.install
index e111ef946..029294d67 100644
--- a/pcr/ams/ams.install
+++ b/libre/qupzilla-libre/qupzilla.install
@@ -1,4 +1,5 @@
 post_install() {
+  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
   update-desktop-database -q
 }
 
diff --git a/libre/qupzilla-libre/searchenginesmanager.cpp.sed b/libre/qupzilla-libre/searchenginesmanager.cpp.sed
new file mode 100644
index 000000000..76011d058
--- /dev/null
+++ b/libre/qupzilla-libre/searchenginesmanager.cpp.sed
@@ -0,0 +1,19 @@
+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
new file mode 100644
index 000000000..b8f591e87
--- /dev/null
+++ b/libre/qupzilla-libre/speeddial.cpp.sed
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 000000000..f59a65979
--- /dev/null
+++ b/libre/qupzilla-libre/start.html.sed
@@ -0,0 +1 @@
+\|<form action="https://duckduckgo[.]com/" method="GET">| s|duckduckgo[.]com|duckduckgo.com/html|
diff --git a/libre/soundkonverter-libre/PKGBUILD b/libre/soundkonverter-libre/PKGBUILD
index b8872fa5d..5e87a1e8c 100644
--- a/libre/soundkonverter-libre/PKGBUILD
+++ b/libre/soundkonverter-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 92587 2013-06-09 14:53:02Z stativ $
+# $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>
@@ -7,7 +7,7 @@
 
 _pkgname=soundkonverter
 pkgname=soundkonverter-libre
-pkgver=2.0.3
+pkgver=2.0.4
 pkgrel=1
 pkgdesc="Front-end to various audio converters, without nonfree faac and mac recommendation"
 arch=('i686' 'x86_64')
@@ -36,7 +36,7 @@ conflicts=$_pkgname
 provides=$_pkgname=$pkgver
 install=$_pkgname.install
 source=("http://kde-apps.org/CONTENT/content-files/29024-${_pkgname}-${pkgver}.tar.gz")
-md5sums=('1c18d9227bac57a910e2a7b2e18870d8')
+md5sums=('8b6684e693bf1af604dec8fab837447b')
 
 build() {
   cd "$srcdir"/$_pkgname-$pkgver
@@ -47,6 +47,6 @@ build() {
 }
 
 package() {
-	cd "$srcdir"/$_pkgname-$pkgver
-	make DESTDIR="$pkgdir" install
+  cd "$srcdir"/$_pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 }
diff --git a/libre/spectrwm-libre/PKGBUILD b/libre/spectrwm-libre/PKGBUILD
index d873da4f7..27758d8a0 100644
--- a/libre/spectrwm-libre/PKGBUILD
+++ b/libre/spectrwm-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id$
+# $Id: PKGBUILD 92647 2013-06-10 15:12:25Z bpiotrowski $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
 
 _pkgname=spectrwm
 pkgname=spectrwm-libre
-pkgver=2.2.0
+pkgver=2.3.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')
@@ -21,7 +21,7 @@ backup=(etc/spectrwm.conf)
 source=(http://opensource.conformal.com/snapshots/$_pkgname/$_pkgname-$pkgver.tgz \
 	LICENSE \
         baraction.sh)
-md5sums=('c572727b5fb9fe3674c03a7e51d191c4'
+md5sums=('7698a5b219fdabad07a76ef45b1360d1'
          'a67cfe51079481e5b0eab1ad371379e3'
          '950d663692e1da56e0ac864c6c3ed80e')
 
@@ -56,8 +56,8 @@ package() {
   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"
+  #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"
diff --git a/libre/stuntrally-data-libre/PKGBUILD b/libre/stuntrally-data-libre/PKGBUILD
new file mode 100644
index 000000000..fd5d175be
--- /dev/null
+++ b/libre/stuntrally-data-libre/PKGBUILD
@@ -0,0 +1,72 @@
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+pkgname=stuntrally-data-libre
+_pkgname=stuntrally-data
+pkgver=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=('d987e8c05ed1f3f54468e75e2c1f68a9a4c59ceefa7429130d4f800b28821ae0'
+            'a1ab9b11d9f5b6c4aa8e5a9028f5994e21446d96fda5762e427365e21cfe3d0e'
+            '8cf24da76bed18fd03a3166ba8b8da93be87a7e49b8aebe4135b8e0b1a36eb8a')
+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
new file mode 100644
index 000000000..f7f176a77
--- /dev/null
+++ b/libre/stuntrally-data-libre/libre.patch
@@ -0,0 +1,72 @@
+diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
+index eb7fc89..d1b670f 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 RTShaderLib 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 RTShaderLib 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
index f9907d3f4..01505c5d2 100644
--- a/libre/syslinux/PKGBUILD
+++ b/libre/syslinux/PKGBUILD
@@ -1,14 +1,13 @@
-# $Id: PKGBUILD 187808 2013-06-06 07:51:31Z tpowa $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname=syslinux
-pkgver=5.10
-pkgrel=3
+pkgver=4.07
+pkgrel=1.1
 arch=('i686' 'x86_64')
 pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE (Parabola rebranded)"
-url="http://www.syslinux.org"
+url="http://syslinux.zytor.com/"
 license=('GPL2')
 depends=('perl' 'glibc')
 optdepends=('perl-passwd-md5:  For md5pass'
@@ -25,11 +24,11 @@ source=(http://www.kernel.org/pub/linux/utils/boot/syslinux/$pkgname-${pkgver}.t
         syslinux.cfg
         syslinux-install_update
         splash.png)
-md5sums=('8f51d6a5d2730f534ba90e71f3347bff'
-         '25af85a05e7b212b7fb8b7587175e492'
-         'e5a69630e3f7083aad2d14362b6117b3'
-         '4450792e13a0270c1b89bb6a66ce2fbc'
-         'befd0e7c38a03442b791f2a530b4dd2d')
+md5sums=('9ff6e1b94efab931fb4717b600d88779'
+         '1528c376e43f0eaccaa80d8ad1bc13b4'
+         'a43bd903face611bcc148522265dfe6c'
+         '8559fb3daf3afa8688600d8a38118918'
+         'cb46ca47c6b6323127d908440057d98f')
 
 build() {
   # Do not try to build syslinux with our default LDFLAGS, it will fail
@@ -46,10 +45,8 @@ build() {
 
 package() {
   cd "$srcdir"/$pkgname-${pkgver}
-  make INSTALLROOT="$pkgdir" AUXDIR=/usr/lib/syslinux install
+  make INSTALLROOT="$pkgdir" SBINDIR=/usr/bin AUXDIR=/usr/lib/syslinux install
 
-  # install docs
-  cp -ar "$srcdir"/$pkgname-${pkgver}/doc "$pkgdir"/usr/share/
   # Install the default configuration
   install -D -m644 "$srcdir"/syslinux.cfg "$pkgdir"/boot/syslinux/syslinux.cfg
   # Install Parabola splash
@@ -57,7 +54,4 @@ package() {
   # Install the installation and update script
   # This script is maintained at git://gist.github.com/772138.git
   install -D -m755 "$srcdir"/syslinux-install_update "$pkgdir"/usr/bin/syslinux-install_update
-  # move extlinux binary to /usr/bin
-  mv "$pkgdir"/sbin/extlinux "$pkgdir"/usr/bin/extlinux
-  rmdir "$pkgdir"/sbin
 }
diff --git a/libre/syslinux/splash.png b/libre/syslinux/splash.png
index f94067681..eac14536b 100644
--- a/libre/syslinux/splash.png
+++ b/libre/syslinux/splash.png
diff --git a/libre/syslinux/splash.xcf b/libre/syslinux/splash.xcf
new file mode 100644
index 000000000..c27d04445
--- /dev/null
+++ b/libre/syslinux/splash.xcf
diff --git a/libre/syslinux/syslinux-dont-build-dos-windows-targets.patch b/libre/syslinux/syslinux-dont-build-dos-windows-targets.patch
index 54151ab87..2b86ab828 100644
--- a/libre/syslinux/syslinux-dont-build-dos-windows-targets.patch
+++ b/libre/syslinux/syslinux-dont-build-dos-windows-targets.patch
@@ -4,9 +4,9 @@ diff -Nur syslinux-4.02.orig//Makefile syslinux-4.02//Makefile
 @@ -54,7 +54,7 @@
  # files that depend only on the B phase, but may have to be regenerated
  # for "make installer".
- BSUBDIRS = codepage com32 lzo core memdisk mbr memdump gpxe sample \
--	   diag libinstaller dos win32 win64 dosutil txt
-+	   libinstaller txt
+ BSUBDIRS = codepage com32 lzo core memdisk modules mbr memdump gpxe sample \
+-	   diag libinstaller dos win32 win64 dosutil
++	   libinstaller
  ITARGET  =
  IOBJECTS = $(ITARGET) \
  	utils/gethostip utils/isohybrid utils/mkdiskimage \
diff --git a/libre/syslinux/syslinux-install_update b/libre/syslinux/syslinux-install_update
index 47d4d88be..34fe8e916 100644
--- a/libre/syslinux/syslinux-install_update
+++ b/libre/syslinux/syslinux-install_update
@@ -30,8 +30,8 @@ libpath="/usr/lib/syslinux"
 bootpath="/boot/syslinux"
 extlinux="/usr/bin/extlinux"
 
-core_modules=(ldlinux.c32)
 autoupdate_file=/boot/syslinux/SYSLINUX_AUTOUPDATE
+com32_files=(menu.c32 vesamenu.c32 chain.c32 hdt.c32 reboot.c32 poweroff.com)
 pciids_file=/usr/share/hwdata/pci.ids
 
 ## Helper functions ##
@@ -294,10 +294,9 @@ install_mbr() {
 }
 
 _install() {
-    # Copy all com32 files to /boot
-    for file in "${libpath}"/*.c32; do
-        file=${file##*/}
-        # Symlink files if /boot resides on the same partition as root
+    # Copy files to /boot
+    for file in "${com32_files[@]}"; do
+        # Symlink files even if links exist
         if [[ "$boot" = root ]]; then
             ln -s "${libpath#$CHROOT}/$file" "$bootpath/$file" &> /dev/null
         elif [[ "$boot" = boot ]]; then
@@ -305,8 +304,8 @@ _install() {
         fi
     done
 
-    # Copy / Symlink pci.ids if pci.ids exists on the FS
-    if [[ -f $pciids_file ]]; then
+    # Copy / Symlink pci.ids if we copy the com32 module and if pci.ids exists in the FS
+    if check_is_in "hdt.c32" "${com32_files[@]}" && [[ -f $pciids_file ]]; then 
         if [[ "$boot" = root ]]; then
             ln -s "$pciids_file" "$bootpath/pci.ids" &> /dev/null
         elif [[ "$boot" = boot ]]; then
@@ -332,10 +331,10 @@ _install() {
 }
 
 update() {
-    # Update c32 files in /boot, if /boot is not on same fs
+    # Update any com and c32 files in /boot
     if [[ "$boot" = boot ]]; then
-        for file in "$bootpath"/*.c32; do
-            file=${file##*/}
+        for file in "$bootpath"/*.{c32,com}; do
+            file=$(basename "$file")
             cp "$libpath/$file" "$bootpath/$file" &> /dev/null
         done
         if [[ -f "$bootpath/pci.ids" ]]; then
@@ -343,17 +342,6 @@ update() {
         fi
     fi
 
-    # Ensure core modules exist and if not install them
-    for file in "${core_modules[@]}"; do
-        if [[ ! -f $bootpath/$file ]]; then
-            if [[  "$boot" = root ]]; then
-                ln -s "${libpath#$CHROOT}/$file" "$bootpath/$file" &> /dev/null
-            elif [[ "$boot" = boot ]]; then
-                cp "$libpath/$file" "$bootpath/$file"
-            fi
-        fi
-    done
-
     if device_is_raid $bootpart; then
         echo "Detected RAID on /boot - installing Syslinux with --raid"
         "$extlinux" --update "$bootpath" -r &> /dev/null
diff --git a/libre/syslinux/syslinux.cfg b/libre/syslinux/syslinux.cfg
index e4f8d8e28..e7199438f 100644
--- a/libre/syslinux/syslinux.cfg
+++ b/libre/syslinux/syslinux.cfg
@@ -7,6 +7,7 @@
 #   * chain.c32 - chainload MBRs, partition boot sectors, Windows bootloaders
 #   * hdt.c32 - hardware detection tool
 #   * reboot.c32 - reboots the system
+#   * poweroff.com - shutdown the system
 #
 # To Use: Copy the respective files from /usr/lib/syslinux to /boot/syslinux.
 # If /usr and /boot are on the same file system, symlink the files instead
@@ -32,15 +33,15 @@ 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       30;44   #40ffffff #a0000000 std
-MENU COLOR title        1;36;44 #9033ccff #a0000000 std
-MENU COLOR sel          7;37;40 #e0ffffff #20ffffff all
-MENU COLOR unsel        37;44   #50ffffff #a0000000 std
-MENU COLOR help         37;40   #c0ffffff #a0000000 std
-MENU COLOR timeout_msg  37;40   #80ffffff #00000000 std
-MENU COLOR timeout      1;37;40 #c0ffffff #00000000 std
-MENU COLOR msg07        37;40   #90ffffff #a0000000 std
-MENU COLOR tabmsg       31;40   #30ffffff #00000000 std
+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
 #
@@ -49,21 +50,21 @@ MENU COLOR tabmsg       31;40   #30ffffff #00000000 std
 #-*
 
 LABEL parabola
-    MENU LABEL Parabola GNU/Linux-libre
-    LINUX ../vmlinuz-linux-libre
-    APPEND root=/dev/sda3 ro
-    INITRD ../initramfs-linux-libre.img
+	MENU LABEL Parabola GNU/Linux-libre
+	LINUX ../vmlinuz-linux-libre
+	APPEND root=/dev/sda3 rw
+	INITRD ../initramfs-linux-libre.img
 
 LABEL parabolafallback
-    MENU LABEL Parabola GNU/Linux-libre Fallback
-    LINUX ../vmlinuz-linux-libre
-    APPEND root=/dev/sda3 ro
-    INITRD ../initramfs-linux-libre-fallback.img
+	MENU LABEL Parabola GNU/Linux-libre Fallback
+	LINUX ../vmlinuz-linux-libre
+	APPEND root=/dev/sda3 rw
+	INITRD ../initramfs-linux-libre-fallback.img
 
 # If you want Memtest on syslinux, use this LABEL section to launch it (install the memtest86+ package)
-#    LABEL memtest
-#    MENU LABEL Memtest86+
-#    LINUX ../memtest86+/memtest.bin
+#	LABEL memtest
+#	MENU LABEL Memtest86+
+#	LINUX ../memtest86+/memtest.bin
 
 LABEL hdt
         MENU LABEL HDT (Hardware Detection Tool)
@@ -72,3 +73,7 @@ LABEL hdt
 LABEL reboot
         MENU LABEL Reboot
         COM32 reboot.c32
+ 
+LABEL off
+        MENU LABEL Power Off
+        COMBOOT poweroff.com
diff --git a/libre/syslinux/syslinux.install b/libre/syslinux/syslinux.install
index 19caa1026..89dbf4e86 100644
--- a/libre/syslinux/syslinux.install
+++ b/libre/syslinux/syslinux.install
@@ -8,19 +8,6 @@ post_install() {
 post_upgrade() {
   # auto-update syslinux if /boot/syslinux/SYSLINUX_AUTOUPDATE exists
   /usr/bin/syslinux-install_update -s
-  # update to 5.01 message
-  if [ "$(vercmp $2 5.01)" -lt 0 ]; then
-      echo "If you used syslinux-install_update to install syslinux:"
-      echo "==> If you want to use syslinux with menu and all modules please rerun" 
-      echo "==>   # /usr/bin/syslinux-install_update -i -a -m"
-      echo ""
-      echo "If you manually installed syslinux:"
-      echo "==> Please copy or symlink all .c32 modules to your /boot/syslinux directory."
-      echo "==> If (/ and /boot on seperate fs):"
-      echo "==>   # cp /usr/lib/syslinux/*.c32 /boot/syslinux"
-      echo "==> If (/ and /boot on same fs):"
-      echo "==>   # ln -s /usr/lib/syslinux/*.c32 /boot/syslinux"
-  fi
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD
index a002aa3f7..b35911f2c 100644
--- a/libre/texlive-bin-libre/PKGBUILD
+++ b/libre/texlive-bin-libre/PKGBUILD
@@ -1,16 +1,18 @@
-# $Id: PKGBUILD 185904 2013-05-19 18:27:14Z remy $
+# $Id: PKGBUILD 193968 2013-09-09 10:10:47Z remy $
 # Maintainer: Rémy Oudompheng <remy@archlinux.org>
 # Contributor: francois <francois.archlinux.org>
 # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
 # Contributor (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname=texlive-bin-libre
-pkgver=2012.0
-pkgrel=12
+pkgver=2013.30973
+pkgrel=4
 pkgdesc="TeX Live binaries, without biber binaries (Parabola rebranded)"
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('t1lib' 'gd' 'poppler>=0.22.0' 'libsigsegv' 'zziplib' 'libpng' 'libjpeg' 'freetype2')
+depends=('cairo' 'pixman' 'graphite' 't1lib' 'gd' 'poppler>=0.24.0'
+         'libsigsegv' 'zziplib' 'libpng' 'libjpeg' 'freetype2'
+         'icu' 'harfbuzz' 'harfbuzz-icu')
 makedepends=('perl' 'clisp' 'ffcall')
 optdepends=('ed: for texconfig')
 provides=('lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam' 'texlive-bin')
@@ -19,34 +21,11 @@ replaces=('texlive-bin')
 options=('!libtool' '!strip')
 url='http://tug.org/texlive/'
 install="texlive.install"
-source=('texmf.cnf'
-        'fix-fontforge-encoding.patch'
-        '09-texlive-fonts.conf'
-        'poppler-0.20.patch'
-        'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-20120623.tar.xz'
-        'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-texmf-20120623.tar.xz'
-        'luatex-r4449-radical-rule-thickness.patch'
+source=('fix-fontforge-encoding.patch'
+        "http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-${pkgver}.tar.xz"
 )
-backup=(etc/texmf/web2c/texmf.cnf \
-    etc/texmf/chktex/chktexrc \
-	etc/texmf/dvipdfm/config/config \
-	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=('220a4f4cc0d915bf8fcbcb553dcee1ae'
-         'bfb9716aa00c86c08cd31e5b32edeb98'
-         '393a4bf67adc7ca5df2b386759d1a637'
-         'e3a664d5a7f0923f35060fe9d25d2573'
-         'ac2c3c3aa765581f8504e21a5edbfb9f'
-         'f315a860158cfc952c82a6d759961024'
-         '5190f3295eb9a604c5f17f5bd607299b')
+md5sums=('bfb9716aa00c86c08cd31e5b32edeb98'
+         '0a8ffd5c0002a080a4202057b1f106c6')
 
 build() {
    cd "$srcdir"
@@ -57,12 +36,7 @@ build() {
    fi
 
    # this patch removes spurious error message with locale "xx_YY.utf8"
-   patch -Np0 -i fix-fontforge-encoding.patch
-   # fix build with poppler >= 0.20
-   patch -Np0 -i poppler-0.20.patch
-   # fix radical rule thickness regression in Luatex
-   # http://tex.stackexchange.com/q/61952/729
-   patch -Np0 -i luatex-r4449-radical-rule-thickness.patch
+   #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
    #############################################################
@@ -98,7 +72,11 @@ build() {
      --with-system-poppler \
      --with-system-xpdf \
      --with-system-freetype2 \
-     --without-system-graphite \
+     --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 \
@@ -117,64 +95,6 @@ build() {
 
 package() {
    cd "$srcdir"
-   #############################################################
-   ### install texmf tree
-   echo "-------------------------------------------------------"
-   echo "--> installing the texmf tree"
-   echo "-------------------------------------------------------"
-   install -m755 -d "$pkgdir"/usr/share
-   cp -r texmf "$pkgdir"/usr/share/
-   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/dvipdfm/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/
-   # move man files to /usr/share/man
-   for i in 1 5; do
-     install -d -m755 "$pkgdir"/usr/share/man/man$i
-     mv "$pkgdir"/usr/share/texmf/doc/man/man$i/*.$i "$pkgdir"/usr/share/man/man$i/
-   done
-   # move info files to /usr/share/info
-   install -d -m755 "$pkgdir"/usr/share/info
-   mv "$pkgdir"/usr/share/texmf/doc/info/*.info "$pkgdir"/usr/share/info/
-   rm -rf "$pkgdir"/usr/share/texmf/doc/{man,info}
-   # copy config files to $TEXMFCONFIG tree
-   cp -a "$pkgdir"/usr/share/texmf/chktex/chktexrc \
-     	"$pkgdir"/etc/texmf/chktex/
-   cp -a "$pkgdir"/usr/share/texmf/web2c/mktex.cnf \
-   	  "$pkgdir"/etc/texmf/web2c/
-   cp -a "$pkgdir"/usr/share/texmf/web2c/updmap.cfg \
-   	  "$pkgdir"/etc/texmf/web2c/
-   cp -a "$pkgdir"/usr/share/texmf/web2c/fmtutil.cnf \
-   	  "$pkgdir"/etc/texmf/web2c/
-   cp -a "$pkgdir"/usr/share/texmf/dvips/config/config.ps \
-   	  "$pkgdir"/etc/texmf/dvips/config/
-   cp -a "$pkgdir"/usr/share/texmf/dvipdfm/config/config \
-   	  "$pkgdir"/etc/texmf/dvipdfm/config/
-   cp -a "$pkgdir"/usr/share/texmf/dvipdfmx/dvipdfmx.cfg \
-   	  "$pkgdir"/etc/texmf/dvipdfmx/
-   cp -a "$pkgdir"/usr/share/texmf/tex/generic/config/pdftexconfig.tex \
-   	  "$pkgdir"/etc/texmf/tex/generic/config/
-   cp -a "$pkgdir"/usr/share/texmf/tex/generic/config/language.dat \
-   	  "$pkgdir"/etc/texmf/tex/generic/config/
-   cp -a "$pkgdir"/usr/share/texmf/tex/generic/config/language.def \
-   	  "$pkgdir"/etc/texmf/tex/generic/config/
-   cp -a "$pkgdir"/usr/share/texmf/ttf2pk/ttf2pk.cfg \
-   	  "$pkgdir"/etc/texmf/ttf2pk/
-   cp -a "$pkgdir"/usr/share/texmf/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
-   # Don't list formats which need removed packages to work.
-   sed -i '/csplain\|mex\|jadetex/d' "$pkgdir"/etc/texmf/web2c/fmtutil.cnf
 
    #############################################################
    ### install
@@ -189,61 +109,104 @@ package() {
    make DESTDIR="${pkgdir}" texmf="$pkgdir"/usr/share/texmf install
    rm -rf "${pkgdir}"/usr/{texmf,share/texmf-dist}
 
-   # replace upstream texmf.cnf with ours
-   rm -f "$pkgdir"/usr/share/texmf/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/web2c/texmf.cnf
-   # fix location of TEXMFCACHE for luatools
-   sed -i 's#texlive2010#texlive#' "$pkgdir"/usr/share/texmf/web2c/texmfcnf.lua
-   ## remove aleph from fmtutil.cnf
-   sed -i -e '/aleph/d' "$pkgdir"/usr/share/texmf/web2c/fmtutil.cnf
-
    ## install Perl libraries
    mkdir -p "$pkgdir"/usr/share/tlpkg/TeXLive
    install -m644 "${srcdir}"/source/utils/biber/TeXLive/*.pm "${pkgdir}/usr/share/tlpkg/TeXLive"
 
-   # create symlinks for formats 
-   echo "--> Create symlinks for TeX formats ..."
-   PATH="$PATH:${pkgdir}/usr/bin" texlinks -f "$pkgdir"/usr/share/texmf/web2c/fmtutil.cnf "$pkgdir"/usr/bin/
+   ## 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
-cmap2enc
+chkweb
+context
 ctanify
 ctanupload
+ctxtools
 de-macro
+deweb
 dosepsbin
+dtxgen
+dvi2fax
 dviasm
+dvired
+e2pall
 epstopdf
 findhyph
-font2afm
+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
@@ -259,27 +222,49 @@ pdfjam-slides6up
 pdfjoin
 pdfnup
 pdfpun
-pfm2kpx
+pfarrei
 pkfix
 pkfix-helper
+ps2eps
+ps2frag
+pslatex
+pstopdf
 purifyeps
 repstopdf
 rpdfcrop
-showglyphs
+rungs
+simpdftex
 sty2dtx
+texconfig
+texconfig-dialog
+texconfig-sys
 texcount
 texdef
 texdiff
 texdirflatten
+texdoc
+texdoctk
+texexec
+texindy
+texlinks
 texliveonfly
 texloganalyser
-typeoutfileinfo
+texmfstart
 thumbpdf
+typeoutfileinfo
+updmap
+updmap-sys
 vpl2ovp
 vpl2vpl
+xindy
 "
    _htmlxml_scripts="ht htcontext htlatex htmex httex httexi htxelatex htxetex mk4ht"
-   _langcjk_scripts="convbkmk updmap-setup-kanji"
+   _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="
@@ -288,7 +273,6 @@ exceltex
 makeglossaries
 pdfannotextractor
 perltex
-ppower4
 ps4pdf
 splitindex
 svn-multi
@@ -302,6 +286,7 @@ vpe"
         ${_core_scripts}       \
         ${_htmlxml_scripts}    \
         ${_langcjk_scripts}    \
+        ${_langcyrillic_scripts} \
         ${_langextra_scripts}  \
         ${_langgreek_scripts}  \
         ${_latexextra_scripts} \
@@ -309,8 +294,8 @@ vpe"
         ${_pictures_scripts}   \
         ${_pstricks_scripts}   \
         ${_science_scripts}    \
-        tlmgr biber; do  # biber is not built from source
-     rm -f "$pkgdir"/usr/bin/$s
+        tlmgr; do
+       ! readlink -e "$pkgdir"/usr/bin/$s && rm "$pkgdir"/usr/bin/$s
    done
    ###################################################################
 }
diff --git a/libre/texlive-bin-libre/texlive.install b/libre/texlive-bin-libre/texlive.install
index 06a40a3b3..96a41bcfc 100644
--- a/libre/texlive-bin-libre/texlive.install
+++ b/libre/texlive-bin-libre/texlive.install
@@ -2,13 +2,16 @@ 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() {
-  echo    ">>> texlive: updating the filename database..."
-  usr/bin/mktexlsr
-  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)"
-
+  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
@@ -17,15 +20,19 @@ post_install() {
 
 post_upgrade() {
   local corename corever _pacout
-  echo    ">>> texlive: updating the filename database..."
-  usr/bin/mktexlsr
+  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
-      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)"
+      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
diff --git a/libre/texlive-core-libre/09-texlive-fonts.conf b/libre/texlive-core-libre/09-texlive-fonts.conf
new file mode 100644
index 000000000..f870fbd7a
--- /dev/null
+++ b/libre/texlive-core-libre/09-texlive-fonts.conf
@@ -0,0 +1,9 @@
+<?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
index fc949d923..03a2f994e 100644
--- a/libre/texlive-core-libre/PKGBUILD
+++ b/libre/texlive-core-libre/PKGBUILD
@@ -4,34 +4,49 @@
 
 pkgname=texlive-core-libre
 _pkgname=texlive-core
-pkgver=2012.29661
-_revnr=${pkgver#2012.}
+pkgver=2013.31589
+_revnr=${pkgver#2013.}
 pkgrel=1
-pkgdesc="TeX Live core distribution, without nonfree add-on packages"
+pkgdesc="TeX Live core distribution, without nonfree add-on packages (Parabola rebranded)"
 license=('GPL')
 arch=(any)
-depends=('texlive-bin-libre')
+depends=('texlive-bin-libre' 'perl')
 optdepends=(
-  'perl:        for many useful tools'
   '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://mirrors.kernel.org/archlinux/other/texlive/$_pkgname-$pkgver-src.zip"
-        "$_pkgname.maps")
+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/tex/context/config/cont-usr.tex)
-md5sums=('4126fad75c577f5b067e612214039c93'
-         '306ab28bb9b070fc3e40d86d28ea7e8e')
+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"
@@ -55,6 +70,9 @@ build() {
 }
 
 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
@@ -67,9 +85,70 @@ package() {
    done
    find texmf-dist -type d -exec install -d -m755 $pkgdir/usr/share/'{}' \;
    find texmf-dist -type f -exec install -m644 '{}' $pkgdir/usr/share/'{}' \;
-   if [[ -d $pkgdir/usr/share/texmf-dist/scripts ]]; then
-     find $pkgdir/usr/share/texmf-dist/scripts -type f -exec chmod a+x '{}' \;
-   fi
+   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
 
@@ -91,16 +170,30 @@ package() {
 
     # 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
-context/perl/mptopdf.pl
 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
@@ -115,7 +208,10 @@ latexdiff/latexdiff.pl
 latexdiff/latexrevise.pl
 latexfileversion/latexfileversion
 latexmk/latexmk.pl
-luaotfload/mkluatexfontdb.lua
+latexpand/latexpand
+ltxfileinfo/ltxfileinfo
+lua2dox/lua2dox_filter
+luaotfload/luaotfload-tool.lua
 match_parens/match_parens
 mf2pt1/mf2pt1.pl
 mkjobtexmf/mkjobtexmf.pl
@@ -133,28 +229,61 @@ 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
-texliveonfly/texliveonfly.py
+xindy/texindy.pl
+xindy/xindy.pl
 "
     install -m755 -d $pkgdir/usr/bin
     for _script in ${_linked_scripts}; do
         _scriptbase=$(basename $_script)
         _scriptbase=${_scriptbase%.*}
-        ln -s /usr/share/texmf-dist/scripts/${_script} ${pkgdir}/usr/bin/${_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.install b/libre/texlive-core-libre/texlive.install
index 14ca7c531..77d4213be 100644
--- a/libre/texlive-core-libre/texlive.install
+++ b/libre/texlive-core-libre/texlive.install
@@ -11,7 +11,7 @@ post_install() {
   cp "$UPDMAP" "$TMPFILE"
   echo    ">>> texlive: regenerating updmap.cfg (custom additions should go"
   echo    "             into /etc/texmf/web2c/updmap-local.cfg"
-  cp usr/share/texmf/web2c/updmap-hdr.cfg $UPDMAP
+  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..."
@@ -33,7 +33,7 @@ post_upgrade() {
   cp "$UPDMAP" "$TMPFILE"
   echo    ">>> texlive: regenerating updmap.cfg (custom additions should go"
   echo    "             into /etc/texmf/web2c/updmap-local.cfg"
-  cp usr/share/texmf/web2c/updmap-hdr.cfg $UPDMAP
+  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..."
diff --git a/libre/texlive-core-libre/texmf.cnf b/libre/texlive-core-libre/texmf.cnf
new file mode 100644
index 000000000..c96c20e39
--- /dev/null
+++ b/libre/texlive-core-libre/texmf.cnf
@@ -0,0 +1,782 @@
+% 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
index cc6dd7509..816556575 100644
--- a/libre/texlive-fontsextra-libre/PKGBUILD
+++ b/libre/texlive-fontsextra-libre/PKGBUILD
@@ -4,8 +4,8 @@
 
 pkgname=texlive-fontsextra-libre
 _pkgname=texlive-fontsextra
-pkgver=2012.29646
-_revnr=${pkgver#2012.}
+pkgver=2013.31570
+_revnr=${pkgver#2013.}
 pkgrel=1
 pkgdesc="TeX Live - all sorts of extra fonts, without nonfree add-on packages"
 license=('GPL')
@@ -16,12 +16,12 @@ replaces=('texlive-fontsextra')
 conflicts=('texlive-fontsextra')
 provides=('texlive-fontsextra')
 url='http://tug.org/texlive/'
-source=("ftp://mirrors.kernel.org/archlinux/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkgname.maps")
+source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkgname.maps")
 options=('!emptydirs')
 options=(!strip)
 install=texlive.install
-md5sums=('25d99fb9897513ceb2ae19f078ad750c'
-         'c57e28ee1d2481b7e14685c70d8e6a51')
+md5sums=('3f519371dd2e22e5b32daa461b89aea2'
+         'f489cc5f762dcdbe6acb11624de7e138')
 
 build() {
    cd "$srcdir"
@@ -55,9 +55,4 @@ package() {
    if [[ -d $pkgdir/usr/share/texmf-dist/scripts ]]; then
      find $pkgdir/usr/share/texmf-dist/scripts -type f -exec chmod a+x '{}' \;
    fi
-   
-   # remove stuff depending on omega/aleph
-   rm -rf $pkgdir/usr/share/texmf-dist/omega
-   find $pkgdir/ -wholename '*ocherokee*' -delete
-   find $pkgdir/ -wholename '*oinuit*' -delete
 }
diff --git a/libre/texlive-fontsextra-libre/texlive-fontsextra.maps b/libre/texlive-fontsextra-libre/texlive-fontsextra.maps
index e76444d08..852afce52 100644
--- a/libre/texlive-fontsextra-libre/texlive-fontsextra.maps
+++ b/libre/texlive-fontsextra-libre/texlive-fontsextra.maps
@@ -18,10 +18,12 @@ 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
@@ -60,14 +62,15 @@ Map dstroke.map
 Map dutchcal.map
 Map epigrafica.map
 Map esvect.map
+Map fbb.map
 Map fdsymbol.map
 Map fge.map
-Map fi4.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
@@ -77,6 +80,7 @@ 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
@@ -85,9 +89,9 @@ Map libertine.map
 Map linearA.map
 Map mathabx.map
 Map mdbch.map
+Map mdgreek.map
 Map mdput.map
 Map mdsymbol.map
-Map mdugm.map
 Map newpx.map
 Map newtx.map
 Map ocrb.map
@@ -101,6 +105,7 @@ Map quattrocento.map
 Map recycle.map
 Map rsfso.map
 Map sansmathaccent.map
+Map sansmathfonts.map
 Map sqrcaps.map
 Map starfont.map
 Map superiors.map
@@ -118,6 +123,7 @@ Map yv2.map
 Map yv3.map
 Map yvo.map
 Map yvt.map
+Map zi4.map
 MixedMap allrunes.map
 MixedMap bbold.map
 MixedMap cmll.map
diff --git a/libre/texlive-fontsextra-libre/texlive.install b/libre/texlive-fontsextra-libre/texlive.install
index 6f81bd4ba..bfd2222a0 100644
--- a/libre/texlive-fontsextra-libre/texlive.install
+++ b/libre/texlive-fontsextra-libre/texlive.install
@@ -11,7 +11,7 @@ post_install() {
   cp "$UPDMAP" "$TMPFILE"
   echo    ">>> texlive: regenerating updmap.cfg (custom additions should go"
   echo    "             into /etc/texmf/web2c/updmap-local.cfg"
-  cp usr/share/texmf/web2c/updmap-hdr.cfg $UPDMAP
+  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..."
@@ -27,7 +27,7 @@ post_upgrade() {
   cp "$UPDMAP" "$TMPFILE"
   echo    ">>> texlive: regenerating updmap.cfg (custom additions should go"
   echo    "             into /etc/texmf/web2c/updmap-local.cfg"
-  cp usr/share/texmf/web2c/updmap-hdr.cfg $UPDMAP
+  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..."
diff --git a/libre/texlive-latexextra-libre/PKGBUILD b/libre/texlive-latexextra-libre/PKGBUILD
index 184adb743..8e1f0998f 100644
--- a/libre/texlive-latexextra-libre/PKGBUILD
+++ b/libre/texlive-latexextra-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 183221 2013-04-18 23:52:31Z remy $
+# $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>
@@ -6,27 +6,30 @@
 
 pkgname=texlive-latexextra-libre
 _pkgname=texlive-latexextra
-pkgver=2012.29701
-_revnr=${pkgver#2012.}
+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')
+depends=('texlive-core'
+         'perl-file-which' # for pdfannotextractor
+        )
 optdepends=(
+  'texlive-genericextra: to use the calctab package'
   'texlive-pictures: to use the package overpic'
-  'openjdk6: for use by ppower4'
+  'jdk7-openjdk: to use pdfannotextractor'
 )
 provides=('texlive-latexextra')
 replaces=('texlive-latexextra')
 conflicts=('texlive-latexextra')
 groups=('texlive-most')
 url='http://tug.org/texlive/'
-source=("ftp://mirrors.kernel.org/archlinux/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkgname.maps")
+source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkgname.maps")
 options=('!emptydirs')
 options=(!strip)
 install=texlive.install
-md5sums=('1b67842cdc5debc80730fced7ce369ce'
+md5sums=('7c9755ca4e104089fab816d805990f6f'
          '9e4825f47dac663dd62c4bfa67899e84')
 
 build() {
@@ -64,19 +67,11 @@ package() {
    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/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/perl/splitindex.pl "$pkgdir"/usr/bin/splitindex
+   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
-   # but ppower4 was a symlink to ppower4.tlu, which was broken, but this is far better:
-   (
-   cat <<"END"
-#!/bin/bash
-java -jar /usr/share/texmf-dist/scripts/ppower4/pp4p.jar $@
-END
-   ) > /tmp/ppower4 
-   install -m755 /tmp/ppower4 "$pkgdir"/usr/bin/
    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.install b/libre/texlive-latexextra-libre/texlive.install
index 3416a2732..befc29143 100644
--- a/libre/texlive-latexextra-libre/texlive.install
+++ b/libre/texlive-latexextra-libre/texlive.install
@@ -11,7 +11,7 @@ post_install() {
   cp "$UPDMAP" "$TMPFILE"
   echo    ">>> texlive: regenerating updmap.cfg (custom additions should go"
   echo    "             into /etc/texmf/web2c/updmap-local.cfg"
-  cp usr/share/texmf/web2c/updmap-hdr.cfg $UPDMAP
+  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..."
@@ -27,7 +27,7 @@ post_upgrade() {
   cp "$UPDMAP" "$TMPFILE"
   echo    ">>> texlive: regenerating updmap.cfg (custom additions should go"
   echo    "             into /etc/texmf/web2c/updmap-local.cfg"
-  cp usr/share/texmf/web2c/updmap-hdr.cfg $UPDMAP
+  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..."
diff --git a/libre/tomoyo-tools-libre/PKGBUILD b/libre/tomoyo-tools-libre/PKGBUILD
new file mode 100644
index 000000000..c3f65109b
--- /dev/null
+++ b/libre/tomoyo-tools-libre/PKGBUILD
@@ -0,0 +1,42 @@
+# $Id: PKGBUILD 96508 2013-08-30 20:31:24Z foutrelis $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Jamie Nguyen <jamie AT tomoyolinux.co.uk>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+_pkgname=tomoyo-tools
+pkgname=tomoyo-tools-libre
+_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')
+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}
+install=tomoyo-tools.install
+source=("http://sourceforge.jp/frs/redir.php?f=/tomoyo/${_file}/${_pkgname}-${_basever}-${_timestamp}.tar.gz")
+md5sums=('8888f83fcb87823d714ff551e8680d0d')
+
+prepare() {
+  cd "${srcdir}/${_pkgname}"
+  sed -i \
+    -e 's|usr/sbin|usr/bin|g' \
+    -e 's|sbin|usr/bin|g' \
+    usr_lib_tomoyo/init_policy.c
+}
+
+build() {
+  cd "${srcdir}/${_pkgname}"
+  make USRSBINDIR=/usr/bin SBINDIR=/usr/bin
+}
+
+package() {
+  cd "${srcdir}/${_pkgname}"
+  make USRSBINDIR=/usr/bin SBINDIR=/usr/bin INSTALLDIR="${pkgdir}" install
+}
diff --git a/libre/tomoyo-tools-libre/tomoyo-tools.install b/libre/tomoyo-tools-libre/tomoyo-tools.install
new file mode 100644
index 000000000..c23df1212
--- /dev/null
+++ b/libre/tomoyo-tools-libre/tomoyo-tools.install
@@ -0,0 +1,11 @@
+post_install () {
+  echo
+  echo " * To enable TOMOYO Linux, append 'security=tomoyo TOMOYO_trigger=/usr/bin/init' 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/libre/tp_smapi-libre-lts/PKGBUILD b/libre/tp_smapi-libre-lts/PKGBUILD
index f726d9a8c..c915f1b4c 100644
--- a/libre/tp_smapi-libre-lts/PKGBUILD
+++ b/libre/tp_smapi-libre-lts/PKGBUILD
@@ -10,15 +10,15 @@
 
 pkgname=tp_smapi-libre-lts
 _pkgname=tp_smapi
-_extramodules=/usr/lib/modules/extramodules-3.0-LIBRE-LTS
+_extramodules=/usr/lib/modules/extramodules-3.10-LIBRE-LTS
 pkgver=0.41
-pkgrel=12
+pkgrel=13
 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'
 license=('GPL')
-depends=('linux-libre-lts>=3.0' 'linux-libre-lts<3.1')
-makedepends=('linux-libre-lts-headers>=3.0' 'linux-libre-lts-headers<3.1')
+depends=('linux-libre-lts>=3.10' 'linux-libre-lts<3.11')
+makedepends=('linux-libre-lts-headers>=3.10' 'linux-libre-lts-headers<3.11')
 replaces=('tp_smapi-lts')
 conflicts=('tp_smapi-lts')
 provides=("tp_smapi-lts=${pkgver}")
diff --git a/libre/tp_smapi-libre-lts/tp_smapi-lts.install b/libre/tp_smapi-libre-lts/tp_smapi-lts.install
index 2723fead7..58c23092e 100644
--- a/libre/tp_smapi-libre-lts/tp_smapi-lts.install
+++ b/libre/tp_smapi-libre-lts/tp_smapi-lts.install
@@ -1,4 +1,4 @@
-extramodules=/usr/lib/modules/extramodules-3.0-LIBRE-LTS
+extramodules=/usr/lib/modules/extramodules-3.10-LIBRE-LTS
 
 post_install() {
   depmod -v $(< "$extramodules/version") &>/dev/null
diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD
index 4dd77dda3..7988d6860 100644
--- a/libre/tp_smapi-libre/PKGBUILD
+++ b/libre/tp_smapi-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91724 2013-05-26 15:41:39Z tpowa $
+# $Id: PKGBUILD 97210 2013-09-15 11:33:59Z tpowa $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: xduugu
 # Contributor: nh2
@@ -12,13 +12,13 @@
 _pkgname=tp_smapi
 pkgname=tp_smapi-libre
 pkgver=0.41
-pkgrel=22
+pkgrel=35
 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'
 license=('GPL')
-depends=('linux-libre>=3.9' 'linux-libre<3.10')
-makedepends=('linux-libre-headers>=3.9' 'linux-libre-headers<3.10')
+depends=('linux-libre>=3.11' 'linux-libre<3.12')
+makedepends=('linux-libre-headers>=3.11' 'linux-libre-headers<3.12')
 replaces=("${_pkgname}")
 conflicts=("${_pkgname}")
 provides=("${_pkgname}=${pkgver}")
diff --git a/libre/tp_smapi-libre/tp_smapi.install b/libre/tp_smapi-libre/tp_smapi.install
index 49d1bf656..e145576ad 100644
--- a/libre/tp_smapi-libre/tp_smapi.install
+++ b/libre/tp_smapi-libre/tp_smapi.install
@@ -1,4 +1,4 @@
-extramodules=/usr/lib/modules/extramodules-3.9-LIBRE
+extramodules=/usr/lib/modules/extramodules-3.11-LIBRE
 
 post_install() {
   depmod -v $(< "$extramodules/version") &>/dev/null
diff --git a/libre/unar/PKGBUILD b/libre/unar/PKGBUILD
index 8fe6b165c..1ca533b9b 100644
--- a/libre/unar/PKGBUILD
+++ b/libre/unar/PKGBUILD
@@ -3,17 +3,17 @@
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname=unar
-pkgver=1.6
-pkgrel=2
+pkgver=1.7
+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' 'gcc-libs' 'zlib')
 makedepends=('gcc-objc')
-replaces=("unarchiver")
-conflicts=("unarchiver" 'icu<51')
-provides=("unarchiver")
+replaces=('unarchiver' 'unrar')
+conflicts=('unarchiver' 'unrar' 'icu<51')
+provides=('unarchiver' 'unrar')
 source=("http://theunarchiver.googlecode.com/files/${pkgname}${pkgver}_src.zip"
         "native_obj_exceptions.patch")
 
@@ -39,5 +39,5 @@ package() {
 }
 
 # vim:set ts=2 sw=2 et:
-md5sums=('bab77e196569f8f571f29c14e2d78daa'
+md5sums=('c714bbd0b51f5c1d27044c229528c286'
          '4fa4ecc6e4ba14d3b6952d064e728511')
diff --git a/libre/usermin/PKGBUILD b/libre/usermin/PKGBUILD
index 9225de264..6f7eab297 100644
--- a/libre/usermin/PKGBUILD
+++ b/libre/usermin/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 185710 2013-05-17 13:08:03Z tpowa $
+# $Id: PKGBUILD 193449 2013-08-20 10:13:15Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=usermin
-pkgver=1.550
+pkgver=1.560
 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)
@@ -124,6 +124,6 @@ package() {
   #install license
   install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/usermin/LICENCE
 }
-md5sums=('ba764af4b40a7e11be69985e19a81562'
+md5sums=('155af20dc957aca8a05bfd69d7ccf23a'
          'a5bd5e5ee779f8a3cf3d776ca77ee36e'
          'ec37a79f948f778224550930d2a7ca07')
diff --git a/libre/vhba-module-libre/60-vhba.rules b/libre/vhba-module-libre/60-vhba.rules
index e4de1dca7..39ae3a4ec 100644
--- a/libre/vhba-module-libre/60-vhba.rules
+++ b/libre/vhba-module-libre/60-vhba.rules
@@ -1,13 +1 @@
-ACTION=="remove", GOTO="vhba_end"
-KERNEL!="vhba_ctl", GOTO="vhba_end"
-
-NAME="vhba_ctl", MODE="0660", OWNER="root", GROUP="cdemu"
-
-TEST=="/sys/fs/cgroup/systemd", GOTO="vhba_uaccess"
-TAG+="udev-acl"
-GOTO="vhba_end"
-
-LABEL="vhba_uaccess"
-TAG+="uaccess"
-
-LABEL="vhba_end"
+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 b1f8c6ffb..c743ac53e 100644
--- a/libre/vhba-module-libre/PKGBUILD
+++ b/libre/vhba-module-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91726 2013-05-26 15:41:55Z tpowa $
+# $Id: PKGBUILD 97212 2013-09-15 11:34:24Z tpowa $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Charles Lindsay <charles@chaoslizard.org>
@@ -6,14 +6,14 @@
 
 _pkgname=vhba-module
 pkgname=vhba-module-libre
-pkgver=20120422
-_extramodules=extramodules-3.9-LIBRE
-pkgrel=25
+pkgver=20130607
+_extramodules=extramodules-3.11-LIBRE
+pkgrel=14
 pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cdemu.sourceforge.net/"
 license=('GPL')
-depends=('linux-libre>=3.9' 'linux-libre<3.10')
+depends=('linux-libre>=3.11' 'linux-libre<3.12')
 makedepends=('linux-libre-headers')
 options=(!makeflags)
 install=$_pkgname.install
@@ -22,28 +22,24 @@ conflicts=('vhba-module')
 provides=("vhba-module=$pkgver")
 source=("http://downloads.sourceforge.net/cdemu/$_pkgname-$pkgver.tar.bz2"
         '60-vhba.rules')
-md5sums=('d97372da1d270d1605742b2995fb6678'
-         'b5e82d0160e7a181219b67c1794d5c27')
+md5sums=('92a681e4665aa85a8335d00395a61697'
+         '4dc37dc348b5a2c83585829bde790dcc')
 
 build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
+  cd $_pkgname-$pkgver
   _kernver="$(cat /usr/lib/modules/$_extramodules/version)"
-
   make KDIR=/usr/lib/modules/$_kernver/build
 }
 
 package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  install -Dm644 vhba.ko \
-    "$pkgdir/usr/lib/modules/$_extramodules/vhba.ko"
-
-  sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extramodules'/" \
-    "$startdir/vhba-module.install"
-
-  install -Dm644 "$srcdir/60-vhba.rules" \
-	  "$pkgdir/usr/lib/udev/rules.d/60-vhba.rules"
+  cd $_pkgname-$pkgver
+  install -Dm644 vhba.ko "$pkgdir/usr/lib/modules/$_extramodules/vhba.ko"
+  install -Dm644 ../60-vhba.rules "$pkgdir/usr/lib/udev/rules.d/60-vhba.rules"
+
+  cd $startdir
+  cp -f $install ${install}.pkg
+  true && install=${install}.pkg
+  sed -i "s/EXTRAMODULES=.*/EXTRAMODULES=$_extramodules/" $install
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/libre/vhba-module-libre/vhba-module.install b/libre/vhba-module-libre/vhba-module.install
index 88b96f7b4..793cffd8d 100644
--- a/libre/vhba-module-libre/vhba-module.install
+++ b/libre/vhba-module-libre/vhba-module.install
@@ -1,6 +1,7 @@
+EXTRAMODULES=
+
 _updatemod() {
   echo "  > Updating module dependencies..."
-  EXTRAMODULES='extramodules-3.9-LIBRE'
   depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD
index 175c9c49f..1d985f296 100644
--- a/libre/virtualbox-libre-modules-lts/PKGBUILD
+++ b/libre/virtualbox-libre-modules-lts/PKGBUILD
@@ -1,26 +1,28 @@
-# $Id$
+# $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): Jorge López <jorginho@lavabit.com>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# 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.12
-pkgrel=3
+pkgver=4.2.16
+pkgrel=1.1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
-makedepends=('linux-libre-lts-headers'
+makedepends=('linux-libre-lts'
+             'linux-libre-lts-headers'
              "virtualbox-libre-host-dkms>=$pkgver"
              "virtualbox-libre-guest-dkms>=$pkgver"
              'expac'
+             'sed'
              'bc')
 
 build() {
-  _kernver=$(expac -Q '%v' linux-libre-lts-headers)-LIBRE-LTS
-
+  _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
@@ -33,9 +35,8 @@ build() {
 }
 
 package_virtualbox-libre-host-modules-lts(){
-  _kernver=$(expac -Q '%v' linux-libre-lts-headers)-LIBRE-LTS
-  _extraver=extramodules-${_kernver%.*}-LIBRE-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')
@@ -44,17 +45,16 @@ package_virtualbox-libre-host-modules-lts(){
   provides=("virtualbox-host-modules-lts=$pkgver" "virtualbox-libre-host-modules=$pkgver")
   install=virtualbox-libre-host-modules-lts.install
 
-  install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
   cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module"
-  install -m644 * "$pkgdir/usr/lib/modules/$_extraver"
+  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/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-libre-host-modules-lts.install"
+  sed -ie "s/VERSION='.*'/VERSION='$_kernver'/" "$startdir/virtualbox-libre-host-modules-lts.install"
 }
 
 package_virtualbox-libre-guest-modules-lts(){
-  _kernver=$(expac -Q '%v' linux-libre-lts-headers)-LIBRE-LTS
-  _extraver=extramodules-${_kernver%.*}-LIBRE-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)")
@@ -64,11 +64,11 @@ package_virtualbox-libre-guest-modules-lts(){
   provides=("virtualbox-guest-modules-lts=$pkgver" "virtualbox-libre-host-modules=$pkgver")
   install=virtualbox-libre-guest-modules-lts.install
 
-  install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
   cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module"
-  install -m644 * "$pkgdir/usr/lib/modules/$_extraver"
+  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/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-libre-guest-modules-lts.install"
+  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/virtualbox-libre-guest-modules-lts.install b/libre/virtualbox-libre-modules-lts/virtualbox-libre-guest-modules-lts.install
index 54a052390..923bd68e3 100644
--- a/libre/virtualbox-libre-modules-lts/virtualbox-libre-guest-modules-lts.install
+++ b/libre/virtualbox-libre-modules-lts/virtualbox-libre-guest-modules-lts.install
@@ -1,16 +1,21 @@
-EXTRAMODULES='extramodules-3.0-LIBRE-LTS'
+_depmod() {
+  EXTRAMODULES='extramodules-3.0-LIBRE-LTS'
+  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
 
 post_install() {
-cat << EOF
+  cat << EOF
 ===> You may want to load vboxguest, vboxsf and vboxvideo
 EOF
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+  _depmod
 }
 
 post_upgrade() {
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+  _depmod
 }
 
 post_remove() {
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+  _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
index 4503996e8..97212dba1 100644
--- a/libre/virtualbox-libre-modules-lts/virtualbox-libre-host-modules-lts.install
+++ b/libre/virtualbox-libre-modules-lts/virtualbox-libre-host-modules-lts.install
@@ -1,18 +1,23 @@
-EXTRAMODULES='extramodules-3.0-LIBRE-LTS'
+_depmod() {
+  EXTRAMODULES='extramodules-3.0-LIBRE-LTS'
+  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
 
 post_install() {
-cat << EOF
+  cat << EOF
 ===> You must load vboxdrv module before starting VirtualBox:
 ===> # modprobe vboxdrv
 EOF
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+  _depmod
 }
 
 post_upgrade() {
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-    echo 'In order to use the new version, reload all virtualbox modules manually.'
+  _depmod
+  echo 'In order to use the new version, reload all virtualbox modules manually.'
 }
 
 post_remove() {
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+  _depmod
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD
index a6c22c177..e7278298b 100644
--- a/libre/virtualbox-libre-modules/PKGBUILD
+++ b/libre/virtualbox-libre-modules/PKGBUILD
@@ -1,24 +1,27 @@
-# $Id: PKGBUILD 91728 2013-05-26 15:42:12Z tpowa $
+# $Id: PKGBUILD 94381 2013-07-22 13:58:51Z tpowa $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
+# Maintainer: Sébastien Luttringer
 # Maintainer (Parabola): Jorge López <jorginho@lavabit.com>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgbase=virtualbox-libre-modules
 pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules')
-pkgver=4.2.12
-pkgrel=6
+pkgver=4.2.16
+pkgrel=3
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
-makedepends=('linux-libre'
-             'linux-libre-headers'
+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)
@@ -38,7 +41,7 @@ package_virtualbox-libre-host-modules(){
   _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.9' 'linux-libre<3.10')
+  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')
@@ -57,7 +60,7 @@ package_virtualbox-libre-guest-modules(){
   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.9' 'linux-libre<3.10')
+  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')
diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install
index 9a98c5752..eb1707471 100644
--- a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install
+++ b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install
@@ -1,18 +1,21 @@
-VERSION='3.9.4-1-LIBRE'
+_depmod() {
+  EXTRAMODULES='extramodules-3.10-LIBRE'
+  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
 
 post_install() {
-cat << EOF
+  cat << EOF
 ===> You may want to load vboxguest, vboxsf and vboxvideo
 EOF
-  depmod $VERSION
+  _depmod
 }
 
 post_upgrade() {
-  depmod $VERSION
+  _depmod
 }
 
 post_remove() {
-  depmod $VERSION
+  _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
index f0ca024ed..df643c9a6 100644
--- a/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install
+++ b/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install
@@ -1,20 +1,23 @@
-VERSION='3.9.4-1-LIBRE'
+_depmod() {
+  EXTRAMODULES='extramodules-3.10-LIBRE'
+  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
 
 post_install() {
-cat << EOF
+  cat << EOF
 ===> You must load vboxdrv module before starting VirtualBox:
 ===> # modprobe vboxdrv
 EOF
-  depmod $VERSION
+  _depmod
 }
 
 post_upgrade() {
-  depmod $VERSION
+  _depmod
   echo 'In order to use the new version, reload all virtualbox modules manually.'
 }
 
 post_remove() {
-  depmod $VERSION
+  _depmod
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index b7b1988f9..cab223c30 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90797 2013-05-14 00:31:45Z seblu $
+# $Id: PKGBUILD 93521 2013-07-05 00:32:42Z seblu $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -13,8 +13,8 @@ pkgname=('virtualbox-libre'
          'virtualbox-libre-guest-dkms'
          'virtualbox-libre-sdk'
          'virtualbox-libre-guest-utils')
-pkgver=4.2.12
-pkgrel=3
+pkgver=4.2.16
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -25,7 +25,7 @@ makedepends=('alsa-lib'
              'dev86'
              'device-mapper'
              'glu'
-             'gsoap'
+             'gsoap-legacy'
              'iasl'
              'jdk7-openjdk'
              'libidl2'
@@ -58,7 +58,6 @@ source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.ta
         'vboxweb.service'
         '001-vboxdrv-reference.patch'
         '002-change_default_driver_dir.patch'
-        '003-gcc-48.patch'
         '004-system-xorg.patch'
         'os_blag_64.png'
         'os_blag.png'
@@ -80,7 +79,7 @@ source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.ta
         'os_venenux.png'
         'libre.patch'
         'free-distros.patch')
-md5sums=('654e45054ae6589452508d37403dc800'
+md5sums=('c4a36e2099a317f4715cd3861cdae238'
          '5f85710e0b8606de967716ded7b2d351'
          'ed1341881437455d9735875ddf455fbe'
          '58d6e5bb4b4c1c6f3f0b3daa6aaeed03'
@@ -88,7 +87,6 @@ md5sums=('654e45054ae6589452508d37403dc800'
          'bc9efed88e0469cd7fc460d5a5cd7b4b'
          'f4e4c7895ede9c524109589bf16ae660'
          '97e193f050574dd272a38e5ee5ebe62b'
-         '7cf8611ae5850b86323b690e430eeed7'
          '4da461f8c90caa123b47c62479f426b4'
          '8538dba8686d7449cb481c9bae9d722a'
          '545c925b46f2ac95e5f8ae407fad101a'
@@ -108,8 +106,8 @@ md5sums=('654e45054ae6589452508d37403dc800'
          'c7951fe6888d939f3a7d0dafe477e82b'
          '4da8eeb2ece7e475fc7a0d1003da26c6'
          '5e4187af59726d71c5be48d0cd816c34'
-         '17fca4ba3a751c8a1db19b92b1820462'
-         '50387fba578646a9d29de3f917a199d2')
+         '9e0b199059faa3f99def5b0ba6e74009'
+         '1e2274facace125e6c2c8fcd7966fca7')
 
 prepare() {
     cd "VirtualBox-$pkgver"
@@ -135,7 +133,7 @@ prepare() {
     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 free distros icons
+ ## 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
@@ -317,7 +315,7 @@ package_virtualbox-libre-guest-utils(){
 
     source "VirtualBox-$pkgver/env.sh"
     pushd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
-    install -d "$pkgdir"/{usr/bin,sbin}
+    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
diff --git a/libre/virtualbox-libre/free-distros.patch b/libre/virtualbox-libre/free-distros.patch
index 913fe7039..025a2b9f4 100644
--- a/libre/virtualbox-libre/free-distros.patch
+++ b/libre/virtualbox-libre/free-distros.patch
@@ -1,8 +1,8 @@
 diff --git a/src/VBox/Main/src-all/Global.cpp b/src/VBox/Main/src-all/Global.cpp
-index 8c6ab79..1e048d9 100644
+index 2cd5a81..f234d58 100644
 --- a/src/VBox/Main/src-all/Global.cpp
 +++ b/src/VBox/Main/src-all/Global.cpp
-@@ -33,285 +33,361 @@ const Global::OSType Global::sOSTypes[] =
+@@ -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 },
@@ -78,6 +78,14 @@ index 8c6ab79..1e048d9 100644
 -      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,
@@ -376,6 +384,14 @@ index 8c6ab79..1e048d9 100644
 +      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,
@@ -496,7 +512,7 @@ index 8c6ab79..1e048d9 100644
  #ifdef VBOX_WITH_RAW_RING1
        VBOXOSTYPE_QNX,             VBOXOSHINT_NONE,
  #else
-@@ -319,7 +395,7 @@ const Global::OSType Global::sOSTypes[] =
+@@ -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  },
@@ -506,53 +522,15 @@ index 8c6ab79..1e048d9 100644
          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 b335043..59ee885 100644
+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,46 +44,32 @@ struct osTypePattern
+@@ -44,10 +44,80 @@ struct osTypePattern
  
  static const osTypePattern gs_OSTypePattern[] =
  {
 -    /* DOS: */
 -    { QRegExp("DOS", Qt::CaseInsensitive), "DOS" },
--
--    /* Windows: */
--    { QRegExp("Wi.*98", Qt::CaseInsensitive), "Windows98" },
--    { QRegExp("Wi.*95", Qt::CaseInsensitive), "Windows95" },
--    { QRegExp("Wi.*Me", Qt::CaseInsensitive), "WindowsMe" },
--    { QRegExp("(Wi.*NT)|(NT4)", Qt::CaseInsensitive), "WindowsNT4" },
--    { QRegExp("((Wi.*XP)|(\\bXP\\b)).*64", Qt::CaseInsensitive), "WindowsXP_64" },
--    { QRegExp("(Wi.*XP)|(\\bXP\\b)", Qt::CaseInsensitive), "WindowsXP" },
--    { QRegExp("((Wi.*2003)|(W2K3)).*64", Qt::CaseInsensitive), "Windows2003_64" },
--    { QRegExp("(Wi.*2003)|(W2K3)", Qt::CaseInsensitive), "Windows2003" },
--    { QRegExp("((Wi.*V)|(Vista)).*64", Qt::CaseInsensitive), "WindowsVista_64" },
--    { QRegExp("(Wi.*V)|(Vista)", Qt::CaseInsensitive), "WindowsVista" },
--    { QRegExp("(Wi.*2012)|(W2K12)", Qt::CaseInsensitive), "Windows2012_64" },
--    { QRegExp("((Wi.*2008)|(W2K8)).*64", Qt::CaseInsensitive), "Windows2008_64" },
--    { QRegExp("(Wi.*2008)|(W2K8)", Qt::CaseInsensitive), "Windows2008" },
--    { QRegExp("(Wi.*2000)|(W2K)", Qt::CaseInsensitive), "Windows2000" },
--    { QRegExp("(Wi.*7.*64)|(W7.*64)", Qt::CaseInsensitive), "Windows7_64" },
--    { QRegExp("(Wi.*7)|(W7)", Qt::CaseInsensitive), "Windows7" },
--    { QRegExp("(Wi.*8.*64)|(W8.*64)", Qt::CaseInsensitive), "Windows8_64" },
--    { 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: */
 +    /* Code names for free GNU/Linux distributions */
 +    { QRegExp("((Taranis)|(Dagda)|(Brigantia)).*64", Qt::CaseInsensitive), "Trisquel_64" },
 +    { QRegExp("(Taranis)|(Dagda)|(Brigantia)", Qt::CaseInsensitive), "Trisquel" },
@@ -579,31 +557,39 @@ index b335043..59ee885 100644
 +    { 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)).*64", Qt::CaseInsensitive), "Ubuntu_64" },
-     { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)|(quantal)", Qt::CaseInsensitive), "Ubuntu" },
-     { QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(jessie)|(sid)).*64", Qt::CaseInsensitive), "Debian_64" },
-@@ -91,7 +77,7 @@ static const osTypePattern gs_OSTypePattern[] =
-     { 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" },
++    { 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: */
+-    /* 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" },
-@@ -116,15 +102,52 @@ static const osTypePattern gs_OSTypePattern[] =
-     { 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("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 */
@@ -620,40 +606,74 @@ index b335043..59ee885 100644
 +
 +    /* 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" },
-+    { QRegExp("(Wi.*NT)|(NT4)", Qt::CaseInsensitive), "WindowsNT4" },
-+    { QRegExp("((Wi.*XP)|(\\bXP\\b)).*64", Qt::CaseInsensitive), "WindowsXP_64" },
-+    { QRegExp("(Wi.*XP)|(\\bXP\\b)", Qt::CaseInsensitive), "WindowsXP" },
-+    { QRegExp("((Wi.*2003)|(W2K3)).*64", Qt::CaseInsensitive), "Windows2003_64" },
-+    { QRegExp("(Wi.*2003)|(W2K3)", Qt::CaseInsensitive), "Windows2003" },
-+    { QRegExp("((Wi.*V)|(Vista)).*64", Qt::CaseInsensitive), "WindowsVista_64" },
-+    { QRegExp("(Wi.*V)|(Vista)", Qt::CaseInsensitive), "WindowsVista" },
-+    { QRegExp("(Wi.*2012)|(W2K12)", Qt::CaseInsensitive), "Windows2012_64" },
-+    { QRegExp("((Wi.*2008)|(W2K8)).*64", Qt::CaseInsensitive), "Windows2008_64" },
-+    { QRegExp("(Wi.*2008)|(W2K8)", Qt::CaseInsensitive), "Windows2008" },
-+    { QRegExp("(Wi.*2000)|(W2K)", Qt::CaseInsensitive), "Windows2000" },
-+    { QRegExp("(Wi.*7.*64)|(W7.*64)", Qt::CaseInsensitive), "Windows7_64" },
-+    { QRegExp("(Wi.*7)|(W7)", Qt::CaseInsensitive), "Windows7" },
-+    { QRegExp("(Wi.*8.*64)|(W8.*64)", Qt::CaseInsensitive), "Windows8_64" },
-+    { QRegExp("(Wi.*8)|(W8)", Qt::CaseInsensitive), "Windows8" },
-+    { QRegExp("Wi.*3", Qt::CaseInsensitive), "Windows31" },
-+    { QRegExp("Wi", Qt::CaseInsensitive), "WindowsXP" },
-+    { 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" },
-+    { 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" },
+     { 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" },
-@@ -137,6 +160,8 @@ static const osTypePattern gs_OSTypePattern[] =
+@@ -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" },
@@ -662,7 +682,7 @@ index b335043..59ee885 100644
      { QRegExp("Ot", Qt::CaseInsensitive), "Other" },
  };
  
-@@ -231,11 +256,13 @@ UIWizardNewVMPageBasic1::UIWizardNewVMPageBasic1(const QString &strGroup)
+@@ -233,11 +258,13 @@ UIWizardNewVMPageBasic1::UIWizardNewVMPageBasic1(const QString &strGroup)
      /* Create widgets: */
      QVBoxLayout *pMainLayout = new QVBoxLayout(this);
      {
diff --git a/libre/virtualbox-libre/libre.patch b/libre/virtualbox-libre/libre.patch
index 75a5ed22f..7f236a678 100644
--- a/libre/virtualbox-libre/libre.patch
+++ b/libre/virtualbox-libre/libre.patch
@@ -1051,18 +1051,18 @@ diff -Nur VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIAct
  
  #ifdef VBOX_WITH_DEBUGGER_GUI
      /* 'Debugger' menu actions: */
-diff -Nur VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp
---- VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp	2013-04-12 07:38:01.000000000 -0300
-+++ VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp	2013-05-24 11:27:14.723176263 -0300
-@@ -651,7 +651,6 @@
+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));
- }
  
- void UIMachineLogic::prepareActionConnections()
-@@ -705,8 +704,6 @@
+     /* 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)));
diff --git a/libre/webmin/PKGBUILD b/libre/webmin/PKGBUILD
index 6fae3ff41..cd16179bc 100644
--- a/libre/webmin/PKGBUILD
+++ b/libre/webmin/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 185708 2013-05-17 13:04:19Z tpowa $
+# $Id: PKGBUILD 193451 2013-08-20 10:13:52Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=webmin
-pkgver=1.630
+pkgver=1.650
 pkgrel=1
 pkgdesc="a web-based interface for system administration (Parabola rebranded)"
 arch=(i686 x86_64 mips64el)
@@ -210,7 +210,7 @@ package() {
   # install license
   install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/webmin/LICENCE
 }
-md5sums=('c52551ed405fcb67ea9d383ac6a32658'
+md5sums=('b4d6370698fdd5e9ba930583ba0d10a3'
          'b0b3e3fb231a12e60165b6b4d604dcfa'
-         'bfebb75bb94029b48c46b7f1ba1aa811'
-         '458ef48fc471b70d38883753ec7211de')
+         'c86518037449e0fc0c60fc24537ea038'
+         'fc29ecb6a5cd8c278abe054e60381095')
diff --git a/libre/xarchiver-libre/PKGBUILD b/libre/xarchiver-libre/PKGBUILD
index 87d775d4e..9c0c0729c 100644
--- a/libre/xarchiver-libre/PKGBUILD
+++ b/libre/xarchiver-libre/PKGBUILD
@@ -5,7 +5,7 @@
 _pkgname=xarchiver
 pkgname=xarchiver-libre
 pkgver=0.5.2
-pkgrel=5
+pkgrel=5.1
 pkgdesc="GTK+ frontend to various command line archivers"
 arch=('i686' 'x86_64')
 url="http://xarchiver.sourceforge.net"
@@ -21,7 +21,7 @@ optdepends=('tar: TAR support'
             'bzip2: BZIP2 support'
             'zip: ZIP support'
             'unzip: ZIP support'
-            'ununrar: RAR support'
+            'unar: RAR support'
             'p7zip: 7z support'
             'arj: ARJ support'
             'lha: LHA support'
diff --git a/libre/xbmc-libre/ChangeLog b/libre/xbmc-libre/ChangeLog
new file mode 100644
index 000000000..66ae97e3b
--- /dev/null
+++ b/libre/xbmc-libre/ChangeLog
@@ -0,0 +1,69 @@
+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
new file mode 100644
index 000000000..cb48c5d90
--- /dev/null
+++ b/libre/xbmc-libre/PKGBUILD
@@ -0,0 +1,116 @@
+# $Id: PKGBUILD 94534 2013-07-26 12:25:32Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Brad Fanella <bradfanella@archlinux.us>
+# Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
+# Contributor: Zeqadious <zeqadious.at.gmail.dot.com>
+# Contributor: BlackIkeEagle < ike DOT devolder AT gmail DOT com >
+
+_prefix=/usr
+
+_pkgname=xbmc
+pkgname=xbmc-libre
+pkgver=12.2
+pkgrel=5
+pkgdesc="A software media player and entertainment hub for digital media, with libarchive recommendation"
+arch=('i686' 'x86_64')
+url="http://xbmc.org"
+license=('GPL' 'custom')
+depends=('libpulse' 'hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva'
+	 'libpng' 'libcdio' 'yajl' 'libmariadbclient' 'libjpeg-turbo' 'libsamplerate'
+	 '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')
+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'
+	    'pulseaudio: pulseaudio support'
+	    'lirc-libre: remote controller support'
+	    'udisks: automount external drives'
+	    'upower: used to trigger suspend functionality'
+	    'libarchive: access compressed files without unpacking them'
+	    'xorg-xinit: autostart xbmc')
+install="${_pkgname}.install"
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz"
+	"xbmc.service")
+md5sums=('489f3877decae4e265ece54f9eaef0ba'
+         '76fae229ebc3bcfaab7e7f27e4fb51f5')
+
+build() {
+  cd "${srcdir}/xbmc-$pkgver"
+
+  # fix lsb_release dependency
+  sed -i -e 's:/usr/bin/lsb_release -d:cat /etc/arch-release:' xbmc/utils/SystemInfo.cpp
+  sed -i -e 's:#include <libsmbclient.h>:#include <samba-4.0/libsmbclient.h>:' xbmc/filesystem/{SmbFile,SMBDirectory}.cpp
+
+  # Bootstrapping XBMC
+  ./bootstrap
+
+  # Configuring XBMC
+  export PYTHON_VERSION=2  # external python v2
+  ./configure --prefix=$_prefix --exec-prefix=$_prefix \
+    --disable-debug \
+    --enable-optimizations \
+    --enable-gl \
+    --enable-sdl \
+    --enable-vaapi \
+    --enable-vdpau \
+    --enable-xvba \
+    --enable-joystick \
+    --enable-xrandr \
+    --enable-rsxs \
+    --enable-projectm \
+    --enable-x11 \
+    --enable-pulse \
+    --enable-rtmp \
+    --enable-samba \
+    --enable-nfs \
+    --enable-afpclient \
+    --enable-airplay \
+    --enable-airtunes \
+    --enable-ffmpeg-libvorbis \
+    --enable-dvdcss \
+    --disable-hal \
+    --enable-avahi \
+    --enable-webserver \
+    --enable-optical-drive \
+    --enable-libbluray \
+    --enable-texturepacker \
+    --enable-udev \
+    --enable-libusb \
+    --enable-libcec \
+    --enable-external-libraries \
+    --disable-external-ffmpeg
+  # Now (finally) build
+  make
+}
+
+package() {
+  cd "${srcdir}/xbmc-$pkgver"
+  # Running make install
+  make DESTDIR="${pkgdir}" install
+
+  # run feh with python2
+  sed -i -e 's/python/python2/g' ${pkgdir}${_prefix}/bin/xbmc
+
+  # lsb_release fix
+  sed -i -e 's/which lsb_release &> \/dev\/null/\[ -f \/etc\/arch-release ]/g' "${pkgdir}${_prefix}/bin/xbmc"
+  sed -i -e "s/lsb_release -a 2> \/dev\/null | sed -e 's\/\^\/    \/'/cat \/etc\/arch-release/g" "${pkgdir}${_prefix}/bin/xbmc"
+
+  # Tools
+  install -D -m 0755 "${srcdir}/xbmc-$pkgver/xbmc-xrandr" "${pkgdir}${_prefix}/share/xbmc/xbmc-xrandr"
+  install -D -m 0755 "${srcdir}/xbmc-$pkgver/tools/TexturePacker/TexturePacker" "${pkgdir}${_prefix}/share/xbmc/"
+
+  # Licenses
+  install -d -m 0755 "${pkgdir}${_prefix}/share/licenses/${_pkgname}"
+  for licensef in LICENSE.GPL copying.txt; do
+    mv "${pkgdir}${_prefix}/share/doc/xbmc/${licensef}" "${pkgdir}${_prefix}/share/licenses/${_pkgname}"
+  done
+
+  # systemd stuff
+  install -Dm0644 $srcdir/xbmc.service $pkgdir/usr/lib/systemd/system/xbmc.service
+}
+# vim:set ts=2 sw=2 et:
diff --git a/libre/xbmc-libre/xbmc.install b/libre/xbmc-libre/xbmc.install
new file mode 100644
index 000000000..b104b33e8
--- /dev/null
+++ b/libre/xbmc-libre/xbmc.install
@@ -0,0 +1,16 @@
+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
+  usermod -a -G xbmc,audio,video,power,network,optical,storage,disk xbmc
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+  echo "You may want to remove xbmc user and group"
+}
diff --git a/libre/xbmc-libre/xbmc.service b/libre/xbmc-libre/xbmc.service
new file mode 100644
index 000000000..431582f1b
--- /dev/null
+++ b/libre/xbmc-libre/xbmc.service
@@ -0,0 +1,13 @@
+[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 -- :0 -nolisten tcp
+Restart = always
+
+[Install]
+WantedBy = multi-user.target
diff --git a/libre/xorg-fonts-type1-libre/PKGBUILD b/libre/xorg-fonts-type1-libre/PKGBUILD
index 3e52ef85a..4904a4477 100644
--- a/libre/xorg-fonts-type1-libre/PKGBUILD
+++ b/libre/xorg-fonts-type1-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 71695 2010-03-08 13:31:38Z jgc $
+# $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=1
-pkgdesc="X.org Type1 fonts without Adobe fonts"
+pkgrel=2
+pkgdesc="X.org Type1 fonts, without nonfree fonts"
 arch=(any)
 license=('custom')
 url="http://xorg.freedesktop.org/"
@@ -20,15 +20,25 @@ md5sums=('27c55f6a938e7153c59fb551b2f491f9'
 
 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/Type1 || return 1
-      make || return 1
-      make DESTDIR="${pkgdir}" install || return 1
-      install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${dir%-*}" || return 1
+        --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
diff --git a/libre/xscreensaver-libre/PKGBUILD b/libre/xscreensaver-libre/PKGBUILD
index 96c0f3537..1dc040d92 100644
--- a/libre/xscreensaver-libre/PKGBUILD
+++ b/libre/xscreensaver-libre/PKGBUILD
@@ -1,37 +1,38 @@
-# $Id: PKGBUILD 177534 2013-02-07 02:39:51Z eric $
+# $Id: PKGBUILD 190799 2013-07-16 22:56:09Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=xscreensaver
 pkgname=xscreensaver-libre
-pkgver=5.21
+pkgver=5.22
 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=('libxxf86vm' 'libglade' 'glu' 'xorg-appres' 'libxmu' \
-         'perl-libwww' 'perl-http-message')
-makedepends=('bc' 'libxpm' 'gdm' 'mesa')
+depends=('libglade' '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 \
-        add-electricsheep.diff xscreensaver.pam LICENSE)
-sha1sums=('cc44ddc538ad5b59ff851f70e8a48633763ff077'
-          '677496218b81a42d90bee400026e94dd87fb8ffb'
-          '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
+        xscreensaver-add-electricsheep.diff LICENSE)
+sha1sums=('b1d7f97d9b60d9c68c0f3e019cad885f5c7bd6ec'
+          'e8dc57b6471fb3867ee099304ac6bf628351cb98'
           '4209ea586b204fd1d81c382a0522c654f9fd9134')
 
-build() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  patch -p0 -i "${srcdir}/add-electricsheep.diff"
-  
-  # Deleting dmsc.asm file due that don't have source code supplied
+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 \
@@ -40,10 +41,10 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
+  cd ${_pkgname}-${pkgver}
+  install -d "${pkgdir}/etc/pam.d"
   make install_prefix="${pkgdir}" install
   install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
-  install -D -m644 ../xscreensaver.pam "${pkgdir}/etc/pam.d/xscreensaver"
   chmod 755 "${pkgdir}/usr/bin/xscreensaver"
   echo "NotShowIn=KDE;GNOME;" >> "${pkgdir}/usr/share/applications/xscreensaver-properties.desktop"
 }
diff --git a/libre/xscreensaver-libre/add-electricsheep.diff b/libre/xscreensaver-libre/add-electricsheep.diff
deleted file mode 100644
index 18b4dea97..000000000
--- a/libre/xscreensaver-libre/add-electricsheep.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- driver/XScreenSaver.ad.in-orig	2009-10-17 02:19:06.000000000 -0400
-+++ driver/XScreenSaver.ad.in	2009-10-17 02:21:16.000000000 -0400
-@@ -347,7 +347,8 @@
- @GL_KLUDGE@ GL: 				rubikblocks -root			    \n\
- @GL_KLUDGE@ GL: 				companioncube -root			    \n\
- @GL_KLUDGE@ GL: 				hilbert -root				    \n\
--@GL_KLUDGE@ GL: 				tronbit -root				    \n
-+@GL_KLUDGE@ GL: 				tronbit -root				    \n\
-+				electricsheep --root 1				    \n
- 
- 
- 
diff --git a/libre/xscreensaver-libre/xscreensaver-add-electricsheep.diff b/libre/xscreensaver-libre/xscreensaver-add-electricsheep.diff
new file mode 100644
index 000000000..0c5c3ff40
--- /dev/null
+++ b/libre/xscreensaver-libre/xscreensaver-add-electricsheep.diff
@@ -0,0 +1,10 @@
+--- 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/xscreensaver-libre/xscreensaver.pam b/libre/xscreensaver-libre/xscreensaver.pam
deleted file mode 100644
index b4d80c21f..000000000
--- a/libre/xscreensaver-libre/xscreensaver.pam
+++ /dev/null
@@ -1 +0,0 @@
-auth		required	pam_unix_auth.so
diff --git a/libre/xsp/PKGBUILD b/libre/xsp/PKGBUILD
index 1692357e7..02e172c8f 100644
--- a/libre/xsp/PKGBUILD
+++ b/libre/xsp/PKGBUILD
@@ -1,19 +1,23 @@
-# $Id$
+# $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=2.10.2
-pkgrel=4.1
-pkgdesc="A simple webserver based on mono - provides ASP.NET support, Parabola rebranded"
-arch=(i686 x86_64 mips64el)
+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>=2.10.2' 'sqlite')
+depends=('mono' 'sqlite')
 options=(!makeflags)
 install=${pkgname}.install
-source=(http://download.mono-project.com/sources/xsp/xsp-2.10.2.tar.bz2
-        ${pkgname}.rc.d ${pkgname}.conf.d ${pkgname}.webapp ${pkgname}.service)
+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
@@ -23,8 +27,9 @@ build() {
  # 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 || return 1
+  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
@@ -43,12 +48,6 @@ package(){
   rm -rf ${pkgdir}/usr/share
   chown -R http:http ${pkgdir}/srv/http/html/${pkgname}
 
- # install a deamon
-  install -D -m755 ${srcdir}/${pkgname}.rc.d \
-    ${pkgdir}/etc/rc.d/${pkgname}
- # install a deamon configurationfile
-  install -D -m644 ${srcdir}/$pkgname.conf.d \
-    ${pkgdir}/etc/conf.d/${pkgname}
  # install a xsp configuration home
   install -D -m644 ${srcdir}/${pkgname}.webapp \
     ${pkgdir}/etc/${pkgname}/${pkgname}.webapp
@@ -57,8 +56,3 @@ package(){
   install -D -m644 ${srcdir}/${pkgname}.service \
     ${pkgdir}/usr/lib/systemd/system/xsp.service
 }
-md5sums=('4fe62fc95ad5dc136d8a7f3299d523b6'
-         '9575bd7d6f64d51ba05bdd6370665858'
-         'b2063679d9c77a9e7b2d90d1fee76608'
-         'c917c07f68b945691506c29750db482f'
-         '9d83bd36d209f8d36a11dfbc4fa50819')
diff --git a/libre/your-freedom_emu/PKGBUILD b/libre/your-freedom_emu/PKGBUILD
new file mode 100644
index 000000000..30ace4a38
--- /dev/null
+++ b/libre/your-freedom_emu/PKGBUILD
@@ -0,0 +1,24 @@
+# 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
new file mode 100644
index 000000000..cd39eb3e8
--- /dev/null
+++ b/libre/your-freedom_emu/your-freedom_emu.install
@@ -0,0 +1,27 @@
+
+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/bitlbee-libre-nonprism/PKGBUILD b/nonprism/bitlbee-libre-nonprism/PKGBUILD
new file mode 100644
index 000000000..e48667d52
--- /dev/null
+++ b/nonprism/bitlbee-libre-nonprism/PKGBUILD
@@ -0,0 +1,71 @@
+# $Id$
+
+# 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
+pkgrel=3
+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=('21e17f082c776566429603b1e8c966983a75ac9e'
+          'ec1a3efff09b9fc3d3e52560d8cdbe23186c819f'
+          '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 \
+    --purple=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
new file mode 100644
index 000000000..aa5a81a70
--- /dev/null
+++ b/nonprism/bitlbee-libre-nonprism/bitlbee.install
@@ -0,0 +1,15 @@
+post_install() {
+	getent group bitlbee &>/dev/null || groupadd -r -g 65 bitlbee >/dev/null
+	getent passwd bitlbee &>/dev/null || useradd -r -u 65 -g bitlbee -d /var/lib/bitlbee -s /bin/false -c bitlbee bitlbee >/dev/null
+	systemd-tmpfiles --create bitlbee.conf
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	getent passwd bitlbee &>/dev/null && userdel bitlbee >/dev/null
+	getent group bitlbee &>/dev/null && groupdel bitlbee >/dev/null
+	true
+}
diff --git a/nonprism/bitlbee-libre-nonprism/bitlbee.tmpfiles b/nonprism/bitlbee-libre-nonprism/bitlbee.tmpfiles
new file mode 100644
index 000000000..da72a0a79
--- /dev/null
+++ b/nonprism/bitlbee-libre-nonprism/bitlbee.tmpfiles
@@ -0,0 +1 @@
+d /run/bitlbee 0755 bitlbee bitlbee - -
diff --git a/nonprism/bitlbee-libre-nonprism/xinetd b/nonprism/bitlbee-libre-nonprism/xinetd
new file mode 100644
index 000000000..68d5663b3
--- /dev/null
+++ b/nonprism/bitlbee-libre-nonprism/xinetd
@@ -0,0 +1,12 @@
+service bitlbee
+{
+        type = UNLISTED
+        socket_type = stream
+        protocol = tcp
+        wait = no
+        user = bitlbee
+	group = bitlbee
+        server = /usr/bin/bitlbee
+        port = 6667
+        disable = yes
+}
diff --git a/nonprism/bti-nonprism/PKGBUILD b/nonprism/bti-nonprism/PKGBUILD
new file mode 100644
index 000000000..378664976
--- /dev/null
+++ b/nonprism/bti-nonprism/PKGBUILD
@@ -0,0 +1,40 @@
+# $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
new file mode 100644
index 000000000..009c26d1e
--- /dev/null
+++ b/nonprism/bti-nonprism/nonprism.patch
@@ -0,0 +1,443 @@
+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
new file mode 100644
index 000000000..1863e006b
--- /dev/null
+++ b/nonprism/centerim-nonprism/PKGBUILD
@@ -0,0 +1,48 @@
+# $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
new file mode 100644
index 000000000..43c732966
--- /dev/null
+++ b/nonprism/centerim-nonprism/nonprism.patch
@@ -0,0 +1,14 @@
+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
new file mode 100644
index 000000000..cf5c374b0
--- /dev/null
+++ b/nonprism/choqok-nonprism/PKGBUILD
@@ -0,0 +1,58 @@
+# $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
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/nonprism/choqok-nonprism/choqok.install
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/nonprism/claws-mail-libre-nonprism/PKGBUILD b/nonprism/claws-mail-libre-nonprism/PKGBUILD
new file mode 100644
index 000000000..099b6e1a0
--- /dev/null
+++ b/nonprism/claws-mail-libre-nonprism/PKGBUILD
@@ -0,0 +1,76 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+
+_pkgname=claws-mail
+pkgname=$_pkgname-libre-nonprism
+pkgver=3.9.2
+pkgrel=3.1
+pkgdesc='A GTK+ based e-mail client, without nonfree PalmOS handheld devices and libgdata support'
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL3')
+url="http://www.$_pkgname.org"
+depends=('gtk2' 'gnutls' 'startup-notification' 'enchant'
+         'gpgme' 'libetpan>=1.1-4' 'libsm' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils')
+makedepends=('compface' '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")
+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 \
+    --disable-gdata-plugin
+    #--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/nonprism/claws-mail-libre-nonprism/claws-mail.install b/nonprism/claws-mail-libre-nonprism/claws-mail.install
new file mode 100644
index 000000000..4d2f155d4
--- /dev/null
+++ b/nonprism/claws-mail-libre-nonprism/claws-mail.install
@@ -0,0 +1,16 @@
+post_install() {
+  echo "install \"html2ps\" from AUR to add support for printing html mails with fancy plugin"
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
+}
+
+post_remove() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
+}
+
diff --git a/nonprism/empathy-nonprism/PKGBUILD b/nonprism/empathy-nonprism/PKGBUILD
new file mode 100644
index 000000000..50c3fa399
--- /dev/null
+++ b/nonprism/empathy-nonprism/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id: PKGBUILD 194415 2013-09-16 09:02:51Z jgc $
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+
+_pkgname=empathy
+pkgname=empathy-nonprism
+pkgver=3.8.4
+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 webkitgtk3 telepathy-farstream telepathy-glib telepathy-logger telepathy-mission-control)
+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:0:3}/$_pkgname-$pkgver.tar.xz)
+sha256sums=('cbc4934ce838e3d697616b5c36b070d2fc4fc57f84fd654c2f2cb2b8b650f5c9')
+
+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
new file mode 100644
index 000000000..4c5b64313
--- /dev/null
+++ b/nonprism/empathy-nonprism/empathy.install
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 000000000..010f3eb7b
--- /dev/null
+++ b/nonprism/eog-plugins-nonprism/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id$
+# 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.8.1
+pkgrel=2
+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=('5cf8dab5b6622b9e712da4094185112cc84baa96f2775cc76bf654b1c443cfb9')
+
+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
new file mode 100644
index 000000000..24072f316
--- /dev/null
+++ b/nonprism/eog-plugins-nonprism/eog-plugins.install
@@ -0,0 +1,11 @@
+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
new file mode 100644
index 000000000..96caee984
--- /dev/null
+++ b/nonprism/evolution-data-server-nonprism/PKGBUILD
@@ -0,0 +1,40 @@
+
+_pkgname=evolution-data-server
+pkgname=evolution-data-server-nonprism
+pkgver=3.8.5
+pkgrel=1
+pkgdesc="Centralized access to appointments and contacts without libgdata support"
+arch=(i686 x86_64)
+depends=(nss krb5 libical db libxml2 libsoup gtk3 libsecret gcr)
+makedepends=(intltool gperf gobject-introspection vala python2 gnome-common)
+options=('!libtool')
+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=('73c4ecfed65651cc72966b90081d7b72f9b42573585bc89797efea65ccfdbd2a')
+
+
+build() {
+  cd "$_pkgname-$pkgver"
+  autoreconf -fi
+  ./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-goa \
+      --disable-google \
+      --disable-weather \
+      --enable-vala-bindings --disable-uoa PYTHON=python2
+  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
new file mode 100644
index 000000000..e75920e11
--- /dev/null
+++ b/nonprism/evolution-data-server-nonprism/evolution-data-server.install
@@ -0,0 +1,11 @@
+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
new file mode 100644
index 000000000..d91e396f5
--- /dev/null
+++ b/nonprism/gnome-online-accounts-nonprism/PKGBUILD
@@ -0,0 +1,42 @@
+# $Id: PKGBUILD 193763 2013-08-30 13:15:23Z 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.8.3
+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=('webkitgtk3' 'json-glib' 'libnotify' 'rest' 'hicolor-icon-theme' 'libsecret')
+makedepends=('intltool' 'libxslt' 'gobject-introspection' 'docbook-xsl')
+provides=("$_pkgname=$pkgver")
+conflicts=$_pkgname
+replaces=($_pkgname $pkgname-coherence)
+options=(!libtool)
+install=$_pkgname.install
+source=(http://download.gnome.org/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz)
+sha256sums=('9e5e55c5097b8d7c32c0dfb7d94448795c627723b133e8edd0b846adde63a44b')
+ 
+build() {
+  cd $_pkgname-$pkgver
+  ./configure --prefix=/usr --libexec=/usr/lib/gnome-online-accounts \
+    --disable-google \
+    --enable-owncloud \
+    --disable-facebook \
+    --disable-windows-live \
+    --disable-exchange \
+    --disable-flickr \
+    --enable-imap-smtp \
+    --disable-kerberos
+  make
+}
+
+package() {
+  cd $_pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/nonprism/gnome-online-accounts-nonprism/gnome-online-accounts.install b/nonprism/gnome-online-accounts-nonprism/gnome-online-accounts.install
new file mode 100644
index 000000000..525ecff63
--- /dev/null
+++ b/nonprism/gnome-online-accounts-nonprism/gnome-online-accounts.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/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
new file mode 100644
index 000000000..bd4532a4f
--- /dev/null
+++ b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
@@ -0,0 +1,71 @@
+# $Id: PKGBUILD 194033 2013-09-10 12:51:41Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+_pkgname=kdenetwork-kopete
+pkgname=kdenetwork-kopete-libre-nonprism
+pkgver=4.11.1
+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' 'libotr3' '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"
+        'libotr3.patch'
+        'mediastreamer29.patch'
+        'libre-nonprism.patch')
+sha1sums=('1dd677e6fd4335e6d0bb906f4c981395ca204e12'
+          '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384'
+          '317683a5c2acd0a0058c5ab42f6006e9db511ef3'
+          '3c46e5c80ef0cd3f6fe9fb6d5cb8c252c6792208')
+
+prepare() {
+  cd kopete-${pkgver}
+  patch -p2 -i "${srcdir}"/libotr3.patch
+  patch -p1 -i "${srcdir}"/mediastreamer29.patch
+  # 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
+}
+
+build() {
+  mkdir 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
new file mode 100644
index 000000000..5495fb1b5
--- /dev/null
+++ b/nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork-kopete.install
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork.install b/nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork.install
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/libotr3.patch b/nonprism/kdenetwork-kopete-libre-nonprism/libotr3.patch
new file mode 100644
index 000000000..1e96c98d6
--- /dev/null
+++ b/nonprism/kdenetwork-kopete-libre-nonprism/libotr3.patch
@@ -0,0 +1,71 @@
+diff -urN a/kopete/cmake/modules/FindLibOTR.cmake b/kopete/cmake/modules/FindLibOTR.cmake
+--- a/kopete/cmake/modules/FindLibOTR.cmake	2012-08-12 18:08:59.000000000 -0600
++++ b/kopete/cmake/modules/FindLibOTR.cmake	2012-11-09 12:14:24.251450904 -0700
+@@ -13,13 +13,13 @@
+     SET(LIBOTR_FIND_QUIETLY TRUE)
+ ENDIF (LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY)
+ 
+-FIND_PATH(LIBOTR_INCLUDE_DIR libotr/version.h)
++FIND_PATH(LIBOTR_INCLUDE_DIR libotr3/version.h)
+ 
+-FIND_LIBRARY(LIBOTR_LIBRARY NAMES otr libotr)
++FIND_LIBRARY(LIBOTR_LIBRARY NAMES otr3 libotr3)
+ 
+-# Determine version information from libotr/version.h
++# Determine version information from libotr3/version.h
+ IF( LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY )
+-  EXECUTE_PROCESS(COMMAND grep "OTRL_VERSION" "${LIBOTR_INCLUDE_DIR}/libotr/version.h" OUTPUT_VARIABLE output)
++  EXECUTE_PROCESS(COMMAND grep "OTRL_VERSION" "${LIBOTR_INCLUDE_DIR}/libotr3/version.h" OUTPUT_VARIABLE output)
+   STRING(REGEX MATCH "OTRL_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+" LIBOTR_VERSION "${output}")
+   STRING(REGEX REPLACE "^OTRL_VERSION \"" "" LIBOTR_VERSION "${LIBOTR_VERSION}")
+   # Check if version is at least 3.2.0
+diff -urN a/kopete/plugins/otr/authenticationwizard.h b/kopete/plugins/otr/authenticationwizard.h
+--- a/kopete/plugins/otr/authenticationwizard.h	2012-08-12 18:09:00.000000000 -0600
++++ b/kopete/plugins/otr/authenticationwizard.h	2012-11-09 12:15:11.181265336 -0700
+@@ -26,7 +26,7 @@
+   */
+ 
+ extern "C"{
+-#include "libotr/proto.h"
++#include "libotr3/proto.h"
+ }
+ 
+ #include "kopetechatsession.h"
+diff -urN a/kopete/plugins/otr/otrlchatinterface.h b/kopete/plugins/otr/otrlchatinterface.h
+--- a/kopete/plugins/otr/otrlchatinterface.h	2012-08-12 18:09:00.000000000 -0600
++++ b/kopete/plugins/otr/otrlchatinterface.h	2012-11-09 12:16:10.141032744 -0700
+@@ -36,10 +36,10 @@
+ #include "authenticationwizard.h"
+ 
+ extern "C" {
+-#include <libotr/privkey.h>
+-#include <libotr/proto.h>
+-#include <libotr/message.h>
+-#include <libotr/userstate.h>
++#include <libotr3/privkey.h>
++#include <libotr3/proto.h>
++#include <libotr3/message.h>
++#include <libotr3/userstate.h>
+ }
+ 
+ 
+diff -urN a/kopete/plugins/otr/otrlconfinterface.h b/kopete/plugins/otr/otrlconfinterface.h
+--- a/kopete/plugins/otr/otrlconfinterface.h	2012-08-12 18:09:00.000000000 -0600
++++ b/kopete/plugins/otr/otrlconfinterface.h	2012-11-09 12:15:56.961084991 -0700
+@@ -32,11 +32,11 @@
+ #include <kopetechatsession.h>
+ 
+ extern "C" {
+-#include <libotr/privkey.h>
+-#include <libotr/proto.h>
+-#include <libotr/message.h>
+-#include <libotr/userstate.h>
+-#include <libotr/context.h>
++#include <libotr3/privkey.h>
++#include <libotr3/proto.h>
++#include <libotr3/message.h>
++#include <libotr3/userstate.h>
++#include <libotr3/context.h>
+ }
+ 
+ class KOPETE_OTR_SHARED_EXPORT OtrlConfInterface : public QObject
diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/libre-nonprism.patch b/nonprism/kdenetwork-kopete-libre-nonprism/libre-nonprism.patch
new file mode 100644
index 000000000..b6915cbb5
--- /dev/null
+++ b/nonprism/kdenetwork-kopete-libre-nonprism/libre-nonprism.patch
@@ -0,0 +1,110 @@
+diff --git a/doc/index.docbook b/doc/index.docbook
+index 1576dc9..daf7170 100644
+--- a/doc/index.docbook
++++ b/doc/index.docbook
+@@ -20,7 +20,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)
+@@ -112,15 +111,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>
+@@ -174,13 +165,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>New</guibutton> to display the <interface>Account Wizard</interface>.</para>
+ <para>The <interface>Account Wizard</interface> helps you create an &im; account.  After the <guilabel>Introduction</guilabel> 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>
+@@ -256,7 +247,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>
+@@ -699,47 +690,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>
+@@ -1120,7 +1081,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/kdenetwork-kopete-libre-nonprism/mediastreamer29.patch b/nonprism/kdenetwork-kopete-libre-nonprism/mediastreamer29.patch
new file mode 100644
index 000000000..eb0b2297e
--- /dev/null
+++ b/nonprism/kdenetwork-kopete-libre-nonprism/mediastreamer29.patch
@@ -0,0 +1,22 @@
+diff --git a/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc b/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
+index 88fdbd1..57c6c05 100644
+--- a/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
++++ b/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
+@@ -200,7 +200,7 @@ bool LinphoneVoiceChannel::SetSendCodecs(const std::vector<AudioCodec>& codecs)
+       LOG(LS_INFO) << "Using " << i->name << "/" << i->clockrate;
+       pt_ = i->id;
+       audio_stream_ = audio_stream_start(&av_profile, -1, "localhost", port1, i->id, 250, 0); /* -1 means that function will choose some free port */
+-      port2 = rtp_session_get_local_port(audio_stream_->session);
++      port2 = rtp_session_get_local_port(audio_stream_->ms.session);
+       first = false;
+     }
+   }
+@@ -211,7 +211,7 @@ bool LinphoneVoiceChannel::SetSendCodecs(const std::vector<AudioCodec>& codecs)
+     // working with a buggy client; let's try PCMU.
+     LOG(LS_WARNING) << "Received empty list of codces; using PCMU/8000";
+     audio_stream_ = audio_stream_start(&av_profile, -1, "localhost", port1, 0, 250, 0); /* -1 means that function will choose some free port */
+-    port2 = rtp_session_get_local_port(audio_stream_->session);
++    port2 = rtp_session_get_local_port(audio_stream_->ms.session);
+   }
+ 
+   return true;
diff --git a/nonprism/kdepim-runtime-nonprism/PKGBUILD b/nonprism/kdepim-runtime-nonprism/PKGBUILD
new file mode 100644
index 000000000..79f9b9221
--- /dev/null
+++ b/nonprism/kdepim-runtime-nonprism/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id: PKGBUILD 194033 2013-09-10 12:51:41Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Pierre Schmitz <pierre@archlinux.de>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+
+_pkgname=kdepim-runtime
+pkgname=kdepim-runtime-nonprism
+pkgver=4.11.1
+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=('a61c1b4cafe16b88213c8cf2f4f64b38a20ed74d')
+
+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
new file mode 100644
index 000000000..c77e68041
--- /dev/null
+++ b/nonprism/kdepim-runtime-nonprism/kdepim-runtime.install
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 000000000..ccf2a9af6
--- /dev/null
+++ b/nonprism/pidgin-nonprism/PKGBUILD
@@ -0,0 +1,131 @@
+# $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'
+            '54c185493f7139768e316b989a5d23aa9d46662bf69026a92efbf69ad7d00973')
+
+prepare() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  msg 'remove nonfree services'
+  patch -Np1 -i $srcdir/nonprism.patch
+  #rm -vrf libpurple/protocols/{gg,jabber/google,msn,mxit,myspace,novell,oscar,yahoo}
+  #rm -v pidgin/pixmaps/protocols/16/{aim,facebook,gadu-gadu,google-talk,icq,msn,mxit,myspace,novell,yahoo}.png
+  #rm -v pidgin/pixmaps/protocols/16/scalable/{aim,gadu-gadu,icq,msn,novell,yahoo}.svg
+  #rm -v pidgin/pixmaps/protocols/22/{aim,facebook,gadu-gadu,google-talk,icq,msn,mxit,myspace,novell,yahoo}.png
+  #rm -v pidgin/pixmaps/protocols/22/scalable/{aim,gadu-gadu,icq,msn,novell,yahoo}.svg
+  #rm -v pidgin/pixmaps/protocols/48/{aim,facebook,gadu-gadu,icq,msn,mxit,myspace,novell,yahoo}.png
+  #rm -v pidgin/pixmaps/protocols/scalable/{aim,gadu-gadu,google-talk,icq,msn,mxit,novell,yahoo}.svg
+  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
+    make
+}
+
+package_pidgin-nonprism(){
+  pkgdesc="Multi-protocol instant messaging client"
+  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"
+}
+
+package_libpurple-nonprism(){
+  pkgdesc="IM library extracted from Pidgin"
+  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"
+  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-b.patch b/nonprism/pidgin-nonprism/nonprism-b.patch
new file mode 100644
index 000000000..8e64b73d5
--- /dev/null
+++ b/nonprism/pidgin-nonprism/nonprism-b.patch
@@ -0,0 +1,5623 @@
+diff -Nur pidgin-2.10.7/config.h.in pidgin-2.10.7-nonprism/config.h.in
+--- pidgin-2.10.7/config.h.in	2013-02-11 07:17:16.000000000 -0200
++++ pidgin-2.10.7-nonprism/config.h.in	2013-08-16 22:16:16.833531712 -0300
+@@ -151,9 +151,6 @@
+ /* Define to 1 if you have the `db' library (-ldb). */
+ #undef HAVE_LIBDB
+ 
+-/* Define to 1 if you have libgadu. */
+-#undef HAVE_LIBGADU
+-
+ /* Define to 1 if you have the `nsl' library (-lnsl). */
+ #undef HAVE_LIBNSL
+ 
+diff -Nur pidgin-2.10.7/configure pidgin-2.10.7-nonprism/configure
+--- pidgin-2.10.7/configure	2013-02-11 07:17:26.000000000 -0200
++++ pidgin-2.10.7-nonprism/configure	2013-08-27 16:47:16.890662082 -0300
+@@ -716,45 +716,23 @@
+ STATIC_LINK_LIBS
+ STATIC_ZEPHYR_FALSE
+ STATIC_ZEPHYR_TRUE
+-STATIC_YAHOO_FALSE
+-STATIC_YAHOO_TRUE
+ STATIC_SIMPLE_FALSE
+ STATIC_SIMPLE_TRUE
+ STATIC_SILC_FALSE
+ STATIC_SILC_TRUE
+-STATIC_SAMETIME_FALSE
+-STATIC_SAMETIME_TRUE
+-STATIC_OSCAR_FALSE
+-STATIC_OSCAR_TRUE
+-STATIC_NOVELL_FALSE
+-STATIC_NOVELL_TRUE
+-STATIC_MXIT_FALSE
+-STATIC_MXIT_TRUE
+-STATIC_MYSPACE_FALSE
+-STATIC_MYSPACE_TRUE
+-STATIC_MSN_FALSE
+-STATIC_MSN_TRUE
+ STATIC_JABBER_FALSE
+ STATIC_JABBER_TRUE
+ STATIC_IRC_FALSE
+ STATIC_IRC_TRUE
+-STATIC_GG_FALSE
+-STATIC_GG_TRUE
+ STATIC_BONJOUR_FALSE
+ STATIC_BONJOUR_TRUE
+ STATIC_PRPLS
+ DISTRIB_FALSE
+ DISTRIB_TRUE
+-USE_INTERNAL_LIBGADU_FALSE
+-USE_INTERNAL_LIBGADU_TRUE
+-GADU_LIBS
+-GADU_CFLAGS
+ SILC_LIBS
+ SILC_CFLAGS
+ AVAHI_LIBS
+ AVAHI_CFLAGS
+-MEANWHILE_LIBS
+-MEANWHILE_CFLAGS
+ IDN_LIBS
+ IDN_CFLAGS
+ USE_VV_FALSE
+@@ -1021,14 +999,11 @@
+ enable_farstream
+ enable_vv
+ enable_idn
+-enable_meanwhile
+ enable_avahi
+ with_avahi_client_includes
+ with_avahi_client_libs
+ with_silc_includes
+ with_silc_libs
+-with_gadu_includes
+-with_gadu_libs
+ enable_distrib
+ with_static_prpls
+ with_dynamic_prpls
+@@ -1100,14 +1075,10 @@
+ FARSTREAM_LIBS
+ IDN_CFLAGS
+ IDN_LIBS
+-MEANWHILE_CFLAGS
+-MEANWHILE_LIBS
+ AVAHI_CFLAGS
+ AVAHI_LIBS
+ SILC_CFLAGS
+ SILC_LIBS
+-GADU_CFLAGS
+-GADU_LIBS
+ DBUS_CFLAGS
+ DBUS_LIBS
+ NETWORKMANAGER_CFLAGS
+@@ -1773,8 +1744,6 @@
+   --disable-farstream     compile without farstream support
+   --disable-vv            compile without voice and video support
+   --disable-idn           compile without IDN support
+-  --disable-meanwhile     compile without meanwhile (required for Sametime
+-                          support)
+   --disable-avahi         compile without avahi (required for Bonjour support)
+ 
+   --disable-plugins       compile without plugin support
+@@ -1826,9 +1795,6 @@
+   --with-silc-includes=DIR
+                           compile the SILC plugin against includes in DIR
+   --with-silc-libs=DIR    compile the SILC plugin against the SILC libs in DIR
+-  --with-gadu-includes=DIR
+-                          compile the Gadu-Gadu plugin against includes in DIR
+-  --with-gadu-libs=DIR    compile the Gadu-Gadu plugin against the libs in DIR
+   --with-static-prpls     Link to certain protocols statically
+   --with-dynamic-prpls    specify which protocols to build dynamically
+   --with-krb4=PREFIX      compile Zephyr plugin with Kerberos 4 support
+@@ -1905,17 +1871,11 @@
+               linker flags for FARSTREAM, overriding pkg-config
+   IDN_CFLAGS  C compiler flags for IDN, overriding pkg-config
+   IDN_LIBS    linker flags for IDN, overriding pkg-config
+-  MEANWHILE_CFLAGS
+-              C compiler flags for MEANWHILE, overriding pkg-config
+-  MEANWHILE_LIBS
+-              linker flags for MEANWHILE, overriding pkg-config
+   AVAHI_CFLAGS
+               C compiler flags for AVAHI, overriding pkg-config
+   AVAHI_LIBS  linker flags for AVAHI, overriding pkg-config
+   SILC_CFLAGS C compiler flags for SILC, overriding pkg-config
+   SILC_LIBS   linker flags for SILC, overriding pkg-config
+-  GADU_CFLAGS C compiler flags for GADU, overriding pkg-config
+-  GADU_LIBS   linker flags for GADU, overriding pkg-config
+   DBUS_CFLAGS C compiler flags for DBUS, overriding pkg-config
+   DBUS_LIBS   linker flags for DBUS, overriding pkg-config
+   NETWORKMANAGER_CFLAGS
+@@ -18487,105 +18447,6 @@
+ fi
+ fi
+ 
+-# Check whether --enable-meanwhile was given.
+-if test "${enable_meanwhile+set}" = set; then :
+-  enableval=$enable_meanwhile; enable_meanwhile="$enableval"
+-else
+-  enable_meanwhile="yes"
+-fi
+-
+-if test "x$enable_meanwhile" = "xyes"; then
+-
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MEANWHILE" >&5
+-$as_echo_n "checking for MEANWHILE... " >&6; }
+-
+-if test -n "$MEANWHILE_CFLAGS"; then
+-    pkg_cv_MEANWHILE_CFLAGS="$MEANWHILE_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"meanwhile >= 1.0.0 meanwhile < 2.0.0\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "meanwhile >= 1.0.0 meanwhile < 2.0.0") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_MEANWHILE_CFLAGS=`$PKG_CONFIG --cflags "meanwhile >= 1.0.0 meanwhile < 2.0.0" 2>/dev/null`
+-		      test "x$?" != "x0" && pkg_failed=yes
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-if test -n "$MEANWHILE_LIBS"; then
+-    pkg_cv_MEANWHILE_LIBS="$MEANWHILE_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"meanwhile >= 1.0.0 meanwhile < 2.0.0\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "meanwhile >= 1.0.0 meanwhile < 2.0.0") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_MEANWHILE_LIBS=`$PKG_CONFIG --libs "meanwhile >= 1.0.0 meanwhile < 2.0.0" 2>/dev/null`
+-		      test "x$?" != "x0" && pkg_failed=yes
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+-        _pkg_short_errors_supported=yes
+-else
+-        _pkg_short_errors_supported=no
+-fi
+-        if test $_pkg_short_errors_supported = yes; then
+-	        MEANWHILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "meanwhile >= 1.0.0 meanwhile < 2.0.0" 2>&1`
+-        else
+-	        MEANWHILE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "meanwhile >= 1.0.0 meanwhile < 2.0.0" 2>&1`
+-        fi
+-	# Put the nasty error message in config.log where it belongs
+-	echo "$MEANWHILE_PKG_ERRORS" >&5
+-
+-
+-		have_meanwhile="no"
+-		if test "x$force_deps" = "xyes" ; then
+-			as_fn_error $? "
+-Meanwhile development headers not found.
+-Use --disable-meanwhile if you do not need meanwhile (Sametime) support.
+-" "$LINENO" 5
+-		fi
+-elif test $pkg_failed = untried; then
+-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-		have_meanwhile="no"
+-		if test "x$force_deps" = "xyes" ; then
+-			as_fn_error $? "
+-Meanwhile development headers not found.
+-Use --disable-meanwhile if you do not need meanwhile (Sametime) support.
+-" "$LINENO" 5
+-		fi
+-else
+-	MEANWHILE_CFLAGS=$pkg_cv_MEANWHILE_CFLAGS
+-	MEANWHILE_LIBS=$pkg_cv_MEANWHILE_LIBS
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-		have_meanwhile="yes"
+-
+-fi
+-fi
+-
+-
+-
+ # Check whether --enable-avahi was given.
+ if test "${enable_avahi+set}" = set; then :
+   enableval=$enable_avahi; enable_avahi="$enableval"
+@@ -19207,267 +19068,6 @@
+ fi
+ 
+ 
+-# Check whether --with-gadu-includes was given.
+-if test "${with_gadu_includes+set}" = set; then :
+-  withval=$with_gadu_includes; ac_gadu_includes="$withval"
+-else
+-  ac_gadu_includes="no"
+-fi
+-
+-
+-# Check whether --with-gadu-libs was given.
+-if test "${with_gadu_libs+set}" = set; then :
+-  withval=$with_gadu_libs; ac_gadu_libs="$withval"
+-else
+-  ac_gadu_libs="no"
+-fi
+-
+-GADU_CFLAGS=""
+-GADU_LIBS=""
+-if test -n "$with_gadu_includes" || test -n "$with_gadu_libs"; then
+-	gadu_manual_check="yes"
+-else
+-	gadu_manual_check="no"
+-fi
+-if test "x$gadu_manual_check" = "xno"; then
+-
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GADU" >&5
+-$as_echo_n "checking for GADU... " >&6; }
+-
+-if test -n "$GADU_CFLAGS"; then
+-    pkg_cv_GADU_CFLAGS="$GADU_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgadu >= 1.11.0\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "libgadu >= 1.11.0") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_GADU_CFLAGS=`$PKG_CONFIG --cflags "libgadu >= 1.11.0" 2>/dev/null`
+-		      test "x$?" != "x0" && pkg_failed=yes
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-if test -n "$GADU_LIBS"; then
+-    pkg_cv_GADU_LIBS="$GADU_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgadu >= 1.11.0\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "libgadu >= 1.11.0") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_GADU_LIBS=`$PKG_CONFIG --libs "libgadu >= 1.11.0" 2>/dev/null`
+-		      test "x$?" != "x0" && pkg_failed=yes
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+-        _pkg_short_errors_supported=yes
+-else
+-        _pkg_short_errors_supported=no
+-fi
+-        if test $_pkg_short_errors_supported = yes; then
+-	        GADU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libgadu >= 1.11.0" 2>&1`
+-        else
+-	        GADU_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libgadu >= 1.11.0" 2>&1`
+-        fi
+-	# Put the nasty error message in config.log where it belongs
+-	echo "$GADU_PKG_ERRORS" >&5
+-
+-
+-		gadu_includes="no"
+-
+-elif test $pkg_failed = untried; then
+-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-		gadu_includes="no"
+-
+-else
+-	GADU_CFLAGS=$pkg_cv_GADU_CFLAGS
+-	GADU_LIBS=$pkg_cv_GADU_LIBS
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-		gadu_includes="yes"
+-		gadu_libs="yes"
+-
+-fi
+-else
+-	if test "$ac_gadu_includes" != "no"; then
+-		GADU_CFLAGS="-I$ac_gadu_includes"
+-	fi
+-	CPPFLAGS_save="$CPPFLAGS"
+-	CPPFLAGS="$CPPFLAGS $GADU_CFLAGS"
+-	ac_fn_c_check_header_mongrel "$LINENO" "libgadu.h" "ac_cv_header_libgadu_h" "$ac_includes_default"
+-if test "x$ac_cv_header_libgadu_h" = xyes; then :
+-  gadu_includes=yes
+-fi
+-
+-
+-	CPPFLAGS="$CPPFLAGS_save"
+-
+-	if test "$ac_gadu_libs" != "no"; then
+-		GADU_LIBS="-L$ac_gadu_libs"
+-	fi
+-	GADU_LIBS="$GADU_LIBS -lgadu"
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gg_libgadu_version in -lgadu" >&5
+-$as_echo_n "checking for gg_libgadu_version in -lgadu... " >&6; }
+-if ${ac_cv_lib_gadu_gg_libgadu_version+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lgadu $GADU_LIBS $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char gg_libgadu_version ();
+-int
+-main ()
+-{
+-return gg_libgadu_version ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_gadu_gg_libgadu_version=yes
+-else
+-  ac_cv_lib_gadu_gg_libgadu_version=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gadu_gg_libgadu_version" >&5
+-$as_echo "$ac_cv_lib_gadu_gg_libgadu_version" >&6; }
+-if test "x$ac_cv_lib_gadu_gg_libgadu_version" = xyes; then :
+-  gadu_libs=yes
+-fi
+-
+-fi
+-GADU_CFLAGS=`echo $GADU_CFLAGS |$sedpath 's/-Wall//'`
+-
+-if test "x$gadu_libs" = "xyes"; then
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libgadu GPL compatibility" >&5
+-$as_echo_n "checking for libgadu GPL compatibility... " >&6; }
+-	CPPFLAGS_save="$CPPFLAGS"
+-	CPPFLAGS="$CPPFLAGS $GADU_CFLAGS"
+-	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <libgadu.h>
+-int
+-main ()
+-{
+-
+-#if defined(__GG_LIBGADU_HAVE_OPENSSL) || defined(GG_CONFIG_HAVE_OPENSSL)
+-#error "libgadu is not compatible with the GPL when compiled with OpenSSL support."
+-#endif
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-
+-		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <libgadu.h>
+-int
+-main ()
+-{
+-
+-#if GG_DEFAULT_PROTOCOL_VERSION < 0x2e
+-#error "Your libgadu version is too old. libpurple requires 1.11.0 or higher."
+-#endif
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-
+-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-$as_echo "#define HAVE_LIBGADU 1" >>confdefs.h
+-
+-
+-else
+-
+-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-			echo
+-			echo
+-			echo "Your supplied copy of libgadu is too old."
+-			echo "Install version 1.11.0 or newer."
+-			echo "Then rerun this ./configure"
+-			echo
+-			echo "Falling back to using our own copy of libgadu"
+-			echo
+-			GADU_LIBS=""
+-			GADU_CFLAGS=""
+-			gadu_libs=no
+-
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-
+-else
+-
+-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-		echo
+-		echo
+-		echo "libgadu is not compatible with the GPL when compiled with OpenSSL support."
+-		echo "To compile against system libgadu, please recompile libgadu using:"
+-		echo "./autogen.sh --disable-libgadu-openssl --disable-static --enable-shared"
+-		echo "Then rerun this ./configure"
+-		echo
+-		echo "Falling back to using our own copy of libgadu"
+-		echo
+-		GADU_LIBS=""
+-		GADU_CFLAGS=""
+-		gadu_libs=no
+-
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-	CPPFLAGS="$CPPFLAGS_save"
+-fi
+-
+- if test "x$gadu_libs" != "xyes"; then
+-  USE_INTERNAL_LIBGADU_TRUE=
+-  USE_INTERNAL_LIBGADU_FALSE='#'
+-else
+-  USE_INTERNAL_LIBGADU_TRUE='#'
+-  USE_INTERNAL_LIBGADU_FALSE=
+-fi
+-
+-
+-if test "x$gadu_libs" = "x"; then
+-	gadu_libs=no
+-fi
+-
+ 
+ 
+ 
+@@ -19500,10 +19100,7 @@
+ fi
+ 
+ if test "x$STATIC_PRPLS" = "xall" ; then
+-	STATIC_PRPLS="bonjour gg irc jabber msn myspace mxit novell oscar sametime silc simple yahoo zephyr"
+-fi
+-if test "x$have_meanwhile" != "xyes" ; then
+-	STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/sametime//'`
++	STATIC_PRPLS="bonjour irc jabber silc simple zephyr"
+ fi
+ if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then
+ 	STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/bonjour//'`
+@@ -19519,46 +19116,22 @@
+ extern_init=
+ load_proto=
+ for i in $STATIC_PRPLS ; do
+-			if test \( "x$i" = "xoscar" -o "x$i" = "xaim" -o "x$i" = "xicq" \) -a "x$static_oscar" != "xyes"; then
+-		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/oscar/liboscar.la"
+-		extern_init="$extern_init extern gboolean purple_init_aim_plugin();"
+-		extern_init="$extern_init extern gboolean purple_init_icq_plugin();"
+-		load_proto="$load_proto purple_init_aim_plugin();"
+-		load_proto="$load_proto purple_init_icq_plugin();"
+-	elif test "x$i" = "xyahoo"; then
+-		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/yahoo/libymsg.la"
+-		extern_init="$extern_init extern gboolean purple_init_yahoo_plugin();"
+-		extern_init="$extern_init extern gboolean purple_init_yahoojp_plugin();"
+-		load_proto="$load_proto purple_init_yahoo_plugin();"
+-		load_proto="$load_proto purple_init_yahoojp_plugin();"
++	if test "x$i" = "xsilc"; then
++		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.la"
++	elif test "x$i" = "xsilc10"; then
++		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/libsilcpurple.la"
+ 	else
+-		if test "x$i" = "xsilc"; then
+-			STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.la"
+-		elif test "x$i" = "xsilc10"; then
+-			STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/libsilcpurple.la"
+-		else
+-			STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib$i.la"
+-		fi
+-		extern_init="$extern_init extern gboolean purple_init_${i}_plugin();"
+-		load_proto="$load_proto purple_init_${i}_plugin();"
++		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib$i.la"
+ 	fi
++	extern_init="$extern_init extern gboolean purple_init_${i}_plugin();"
++	load_proto="$load_proto purple_init_${i}_plugin();"
+ 	case $i in
+ 		bonjour)	static_bonjour=yes ;;
+-		gg)			static_gg=yes ;;
+ 		irc)		static_irc=yes ;;
+ 		jabber)		static_jabber=yes ;;
+-		msn)		static_msn=yes ;;
+-		myspace)	static_myspace=yes ;;
+-		mxit)		static_mxit=yes ;;
+-		novell)		static_novell=yes ;;
+-		oscar)		static_oscar=yes ;;
+-		aim)		static_oscar=yes ;;
+-		icq)		static_oscar=yes ;;
+-		sametime)	static_sametime=yes ;;
+ 		silc)		static_silc=yes ;;
+ 		silc10)		static_silc=yes ;;
+ 		simple)		static_simple=yes ;;
+-		yahoo)		static_yahoo=yes ;;
+ 		zephyr)		static_zephyr=yes ;;
+ 		*)			echo "Invalid static protocol $i!!" ; exit 1 ;;
+ 	esac
+@@ -19571,14 +19144,6 @@
+   STATIC_BONJOUR_FALSE=
+ fi
+ 
+- if test "x$static_gg" = "xyes"; then
+-  STATIC_GG_TRUE=
+-  STATIC_GG_FALSE='#'
+-else
+-  STATIC_GG_TRUE='#'
+-  STATIC_GG_FALSE=
+-fi
+-
+  if test "x$static_irc" = "xyes"; then
+   STATIC_IRC_TRUE=
+   STATIC_IRC_FALSE='#'
+@@ -19595,54 +19160,6 @@
+   STATIC_JABBER_FALSE=
+ fi
+ 
+- if test "x$static_msn" = "xyes"; then
+-  STATIC_MSN_TRUE=
+-  STATIC_MSN_FALSE='#'
+-else
+-  STATIC_MSN_TRUE='#'
+-  STATIC_MSN_FALSE=
+-fi
+-
+- if test "x$static_myspace" = "xyes"; then
+-  STATIC_MYSPACE_TRUE=
+-  STATIC_MYSPACE_FALSE='#'
+-else
+-  STATIC_MYSPACE_TRUE='#'
+-  STATIC_MYSPACE_FALSE=
+-fi
+-
+- if test "x$static_mxit" = "xyes"; then
+-  STATIC_MXIT_TRUE=
+-  STATIC_MXIT_FALSE='#'
+-else
+-  STATIC_MXIT_TRUE='#'
+-  STATIC_MXIT_FALSE=
+-fi
+-
+- if test "x$static_novell" = "xyes"; then
+-  STATIC_NOVELL_TRUE=
+-  STATIC_NOVELL_FALSE='#'
+-else
+-  STATIC_NOVELL_TRUE='#'
+-  STATIC_NOVELL_FALSE=
+-fi
+-
+- if test "x$static_oscar" = "xyes"; then
+-  STATIC_OSCAR_TRUE=
+-  STATIC_OSCAR_FALSE='#'
+-else
+-  STATIC_OSCAR_TRUE='#'
+-  STATIC_OSCAR_FALSE=
+-fi
+-
+- if test "x$static_sametime" = "xyes" -a "x$have_meanwhile" = "xyes"; then
+-  STATIC_SAMETIME_TRUE=
+-  STATIC_SAMETIME_FALSE='#'
+-else
+-  STATIC_SAMETIME_TRUE='#'
+-  STATIC_SAMETIME_FALSE=
+-fi
+-
+  if test "x$static_silc" = "xyes" -a "x$have_silc" = "xyes"; then
+   STATIC_SILC_TRUE=
+   STATIC_SILC_FALSE='#'
+@@ -19659,14 +19176,6 @@
+   STATIC_SIMPLE_FALSE=
+ fi
+ 
+- if test "x$static_yahoo" = "xyes"; then
+-  STATIC_YAHOO_TRUE=
+-  STATIC_YAHOO_FALSE='#'
+-else
+-  STATIC_YAHOO_TRUE='#'
+-  STATIC_YAHOO_FALSE=
+-fi
+-
+  if test "x$static_zephyr" = "xyes"; then
+   STATIC_ZEPHYR_TRUE=
+   STATIC_ZEPHYR_FALSE='#'
+@@ -19689,10 +19198,7 @@
+ fi
+ 
+ if test "x$DYNAMIC_PRPLS" = "xall" ; then
+-	DYNAMIC_PRPLS="bonjour gg irc jabber msn myspace mxit novell oscar sametime silc simple yahoo zephyr"
+-fi
+-if test "x$have_meanwhile" != "xyes"; then
+-	DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/sametime//'`
++	DYNAMIC_PRPLS="bonjour irc jabber silc simple zephyr"
+ fi
+ if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then
+ 	DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/bonjour//'`
+@@ -19707,22 +19213,12 @@
+ for i in $DYNAMIC_PRPLS ; do
+ 	case $i in
+ 		bonjour)	dynamic_bonjour=yes ;;
+-		gg)			dynamic_gg=yes ;;
+ 		irc)		dynamic_irc=yes ;;
+ 		jabber)		dynamic_jabber=yes ;;
+-		msn)		dynamic_msn=yes ;;
+-		myspace)	dynamic_myspace=yes ;;
+-		mxit)		dynamic_mxit=yes ;;
+-		novell)		dynamic_novell=yes ;;
+ 		null)		dynamic_null=yes ;;
+-		oscar)		dynamic_oscar=yes ;;
+-		aim)		dynamic_oscar=yes ;;
+-		icq)		dynamic_oscar=yes ;;
+-		sametime)	dynamic_sametime=yes ;;
+ 		silc)		dynamic_silc=yes ;;
+ 		silc10)		dynamic_silc=yes ;;
+ 		simple)		dynamic_simple=yes ;;
+-		yahoo)		dynamic_yahoo=yes ;;
+ 		zephyr)		dynamic_zephyr=yes ;;
+ 		*)			echo "Invalid dynamic protocol $i!!" ; exit 1 ;;
+ 	esac
+@@ -21001,7 +20497,7 @@
+ fi
+ 
+ 
+-msg_ssl="None. MSN, Yahoo!, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!"
++msg_ssl="None."
+ looked_for_gnutls="no"
+ if test "x$enable_gnutls" != "xno"; then
+ 	enable_gnutls="no"
+@@ -21871,19 +21367,17 @@
+ 	as_fn_error $? "
+ Neither GnuTLS or NSS SSL development headers found.
+ Use --disable-nss --disable-gnutls if you do not need SSL support.
+-MSN, Yahoo!, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!
++
+ " "$LINENO" 5
+ elif test "x$looked_for_gnutls" = "xyes" -a "x$force_deps" = "xyes" ; then
+ 	as_fn_error $? "
+ GnuTLS SSL development headers not found.
+ Use --disable-gnutls if you do not need SSL support.
+-MSN, Yahoo!, Novell Groupwise and Google Talk will not work without SSL support.
+ " "$LINENO" 5
+ elif test "x$looked_for_nss" = "xyes" -a "x$force_deps" = "xyes" ; then
+ 	as_fn_error $? "
+ NSS SSL development headers not found.
+ Use --disable-nss if you do not need SSL support.
+-MSN, Yahoo!, Novell Groupwise and Google Talk will not work without SSL support.
+ " "$LINENO" 5
+ fi
+ 
+@@ -23176,7 +22670,7 @@
+ fi
+ 
+ 
+-ac_config_files="$ac_config_files Makefile Doxyfile doc/Makefile doc/pidgin.1 doc/finch.1 m4macros/Makefile pidgin.apspec pidgin/Makefile pidgin/pidgin.pc pidgin/pidgin-uninstalled.pc pidgin/pidgin-2.pc pidgin/pidgin-2-uninstalled.pc pidgin/pixmaps/Makefile pidgin/pixmaps/emotes/default/24/Makefile pidgin/pixmaps/emotes/none/Makefile pidgin/pixmaps/emotes/small/16/Makefile pidgin/plugins/Makefile pidgin/plugins/cap/Makefile pidgin/plugins/disco/Makefile pidgin/plugins/gestures/Makefile pidgin/plugins/gevolution/Makefile pidgin/plugins/musicmessaging/Makefile pidgin/plugins/perl/Makefile pidgin/plugins/perl/common/Makefile.PL pidgin/plugins/ticker/Makefile libpurple/ciphers/Makefile libpurple/example/Makefile libpurple/gconf/Makefile libpurple/purple.pc libpurple/purple-uninstalled.pc libpurple/purple-2.pc libpurple/purple-2-uninstalled.pc libpurple/plugins/Makefile libpurple/plugins/mono/Makefile libpurple/plugins/mono/api/Makefile libpurple/plugins/mono/loader/Makefile libpurple/plugins/perl/Makefile libpurple/plugins/perl/common/Makefile.PL libpurple/plugins/ssl/Makefile libpurple/plugins/tcl/Makefile libpurple/Makefile libpurple/protocols/Makefile libpurple/protocols/bonjour/Makefile libpurple/protocols/gg/Makefile libpurple/protocols/irc/Makefile libpurple/protocols/jabber/Makefile libpurple/protocols/msn/Makefile libpurple/protocols/myspace/Makefile libpurple/protocols/mxit/Makefile libpurple/protocols/novell/Makefile libpurple/protocols/null/Makefile libpurple/protocols/oscar/Makefile libpurple/protocols/sametime/Makefile libpurple/protocols/silc/Makefile libpurple/protocols/silc10/Makefile libpurple/protocols/simple/Makefile libpurple/protocols/yahoo/Makefile libpurple/protocols/zephyr/Makefile libpurple/tests/Makefile libpurple/purple.h libpurple/version.h share/sounds/Makefile share/ca-certs/Makefile finch/finch.pc finch/Makefile finch/libgnt/Makefile finch/libgnt/gnt.pc finch/libgnt/wms/Makefile finch/plugins/Makefile po/Makefile.in pidgin.spec"
++ac_config_files="$ac_config_files Makefile Doxyfile doc/Makefile doc/pidgin.1 doc/finch.1 m4macros/Makefile pidgin.apspec pidgin/Makefile pidgin/pidgin.pc pidgin/pidgin-uninstalled.pc pidgin/pidgin-2.pc pidgin/pidgin-2-uninstalled.pc pidgin/pixmaps/Makefile pidgin/pixmaps/emotes/default/24/Makefile pidgin/pixmaps/emotes/none/Makefile pidgin/pixmaps/emotes/small/16/Makefile pidgin/plugins/Makefile pidgin/plugins/cap/Makefile pidgin/plugins/disco/Makefile pidgin/plugins/gestures/Makefile pidgin/plugins/gevolution/Makefile pidgin/plugins/musicmessaging/Makefile pidgin/plugins/perl/Makefile pidgin/plugins/perl/common/Makefile.PL pidgin/plugins/ticker/Makefile libpurple/ciphers/Makefile libpurple/example/Makefile libpurple/gconf/Makefile libpurple/purple.pc libpurple/purple-uninstalled.pc libpurple/purple-2.pc libpurple/purple-2-uninstalled.pc libpurple/plugins/Makefile libpurple/plugins/mono/Makefile libpurple/plugins/mono/api/Makefile libpurple/plugins/mono/loader/Makefile libpurple/plugins/perl/Makefile libpurple/plugins/perl/common/Makefile.PL libpurple/plugins/ssl/Makefile libpurple/plugins/tcl/Makefile libpurple/Makefile libpurple/protocols/Makefile libpurple/protocols/bonjour/Makefile libpurple/protocols/irc/Makefile libpurple/protocols/jabber/Makefile libpurple/protocols/null/Makefile libpurple/protocols/silc/Makefile libpurple/protocols/silc10/Makefile libpurple/protocols/simple/Makefile libpurple/protocols/zephyr/Makefile libpurple/tests/Makefile libpurple/purple.h libpurple/version.h share/sounds/Makefile share/ca-certs/Makefile finch/finch.pc finch/Makefile finch/libgnt/Makefile finch/libgnt/gnt.pc finch/libgnt/wms/Makefile finch/plugins/Makefile po/Makefile.in pidgin.spec"
+ 
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+@@ -23344,10 +22838,6 @@
+   as_fn_error $? "conditional \"USE_VV\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+-if test -z "${USE_INTERNAL_LIBGADU_TRUE}" && test -z "${USE_INTERNAL_LIBGADU_FALSE}"; then
+-  as_fn_error $? "conditional \"USE_INTERNAL_LIBGADU\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+ if test -z "${DISTRIB_TRUE}" && test -z "${DISTRIB_FALSE}"; then
+   as_fn_error $? "conditional \"DISTRIB\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+@@ -23356,10 +22846,6 @@
+   as_fn_error $? "conditional \"STATIC_BONJOUR\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+-if test -z "${STATIC_GG_TRUE}" && test -z "${STATIC_GG_FALSE}"; then
+-  as_fn_error $? "conditional \"STATIC_GG\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+ if test -z "${STATIC_IRC_TRUE}" && test -z "${STATIC_IRC_FALSE}"; then
+   as_fn_error $? "conditional \"STATIC_IRC\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+@@ -23368,30 +22854,6 @@
+   as_fn_error $? "conditional \"STATIC_JABBER\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+-if test -z "${STATIC_MSN_TRUE}" && test -z "${STATIC_MSN_FALSE}"; then
+-  as_fn_error $? "conditional \"STATIC_MSN\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+-if test -z "${STATIC_MYSPACE_TRUE}" && test -z "${STATIC_MYSPACE_FALSE}"; then
+-  as_fn_error $? "conditional \"STATIC_MYSPACE\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+-if test -z "${STATIC_MXIT_TRUE}" && test -z "${STATIC_MXIT_FALSE}"; then
+-  as_fn_error $? "conditional \"STATIC_MXIT\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+-if test -z "${STATIC_NOVELL_TRUE}" && test -z "${STATIC_NOVELL_FALSE}"; then
+-  as_fn_error $? "conditional \"STATIC_NOVELL\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+-if test -z "${STATIC_OSCAR_TRUE}" && test -z "${STATIC_OSCAR_FALSE}"; then
+-  as_fn_error $? "conditional \"STATIC_OSCAR\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+-if test -z "${STATIC_SAMETIME_TRUE}" && test -z "${STATIC_SAMETIME_FALSE}"; then
+-  as_fn_error $? "conditional \"STATIC_SAMETIME\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+ if test -z "${STATIC_SILC_TRUE}" && test -z "${STATIC_SILC_FALSE}"; then
+   as_fn_error $? "conditional \"STATIC_SILC\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+@@ -23400,10 +22862,6 @@
+   as_fn_error $? "conditional \"STATIC_SIMPLE\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+-if test -z "${STATIC_YAHOO_TRUE}" && test -z "${STATIC_YAHOO_FALSE}"; then
+-  as_fn_error $? "conditional \"STATIC_YAHOO\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+ if test -z "${STATIC_ZEPHYR_TRUE}" && test -z "${STATIC_ZEPHYR_FALSE}"; then
+   as_fn_error $? "conditional \"STATIC_ZEPHYR\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+@@ -24425,20 +23883,12 @@
+     "libpurple/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/Makefile" ;;
+     "libpurple/protocols/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/Makefile" ;;
+     "libpurple/protocols/bonjour/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/bonjour/Makefile" ;;
+-    "libpurple/protocols/gg/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/gg/Makefile" ;;
+     "libpurple/protocols/irc/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/irc/Makefile" ;;
+     "libpurple/protocols/jabber/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/jabber/Makefile" ;;
+-    "libpurple/protocols/msn/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/msn/Makefile" ;;
+-    "libpurple/protocols/myspace/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/myspace/Makefile" ;;
+-    "libpurple/protocols/mxit/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/mxit/Makefile" ;;
+-    "libpurple/protocols/novell/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/novell/Makefile" ;;
+     "libpurple/protocols/null/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/null/Makefile" ;;
+-    "libpurple/protocols/oscar/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/oscar/Makefile" ;;
+-    "libpurple/protocols/sametime/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/sametime/Makefile" ;;
+     "libpurple/protocols/silc/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/silc/Makefile" ;;
+     "libpurple/protocols/silc10/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/silc10/Makefile" ;;
+     "libpurple/protocols/simple/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/simple/Makefile" ;;
+-    "libpurple/protocols/yahoo/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/yahoo/Makefile" ;;
+     "libpurple/protocols/zephyr/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/zephyr/Makefile" ;;
+     "libpurple/tests/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/tests/Makefile" ;;
+     "libpurple/purple.h") CONFIG_FILES="$CONFIG_FILES libpurple/purple.h" ;;
+@@ -25863,7 +25313,6 @@
+ echo Build with Cyrus SASL support. : $enable_cyrus_sasl
+ echo Use kerberos 4 with zephyr.... : $kerberos
+ echo Use external libzephyr........ : $zephyr
+-echo Use external libgadu.......... : $gadu_libs
+ echo Install pixmaps............... : $enable_pixmaps
+ echo Old tray icon compatibility... : $enable_traycompat
+ echo Install translations.......... : $enable_i18n
+diff -Nur pidgin-2.10.7/configure.ac pidgin-2.10.7-nonprism/configure.ac
+--- pidgin-2.10.7/configure.ac	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/configure.ac	2013-08-16 23:44:41.800496326 -0300
+@@ -854,28 +854,6 @@
+ fi
+ 
+ dnl #######################################################################
+-dnl # Check for Meanwhile headers (for Sametime)
+-dnl #######################################################################
+-AC_ARG_ENABLE(meanwhile,
+-	[AC_HELP_STRING([--disable-meanwhile],
+-		[compile without meanwhile (required for Sametime support)])],
+-	enable_meanwhile="$enableval", enable_meanwhile="yes")
+-if test "x$enable_meanwhile" = "xyes"; then
+-	PKG_CHECK_MODULES(MEANWHILE, [meanwhile >= 1.0.0 meanwhile < 2.0.0], [
+-		have_meanwhile="yes"
+-	], [
+-		have_meanwhile="no"
+-		if test "x$force_deps" = "xyes" ; then
+-			AC_MSG_ERROR([
+-Meanwhile development headers not found.
+-Use --disable-meanwhile if you do not need meanwhile (Sametime) support.
+-])
+-		fi])
+-fi
+-AC_SUBST(MEANWHILE_CFLAGS)
+-AC_SUBST(MEANWHILE_LIBS)
+-
+-dnl #######################################################################
+ dnl # Check for Native Avahi headers (for Bonjour)
+ dnl #######################################################################
+ AC_ARG_ENABLE(avahi,
+@@ -1020,100 +998,6 @@
+ 	CPPFLAGS="$CPPFLAGS_save"
+ fi
+ 
+-dnl #######################################################################
+-dnl # Check for Gadu-Gadu client includes and libraries
+-dnl #######################################################################
+-AC_ARG_WITH(gadu-includes, [AC_HELP_STRING([--with-gadu-includes=DIR], [compile the Gadu-Gadu plugin against includes in DIR])], [ac_gadu_includes="$withval"], [ac_gadu_includes="no"])
+-AC_ARG_WITH(gadu-libs, [AC_HELP_STRING([--with-gadu-libs=DIR], [compile the Gadu-Gadu plugin against the libs in DIR])], [ac_gadu_libs="$withval"], [ac_gadu_libs="no"])
+-GADU_CFLAGS=""
+-GADU_LIBS=""
+-if test -n "$with_gadu_includes" || test -n "$with_gadu_libs"; then
+-	gadu_manual_check="yes"
+-else
+-	gadu_manual_check="no"
+-fi
+-if test "x$gadu_manual_check" = "xno"; then
+-	PKG_CHECK_MODULES(GADU, [libgadu >= 1.11.0], [
+-		gadu_includes="yes"
+-		gadu_libs="yes"
+-	], [
+-		gadu_includes="no"
+-	])
+-else
+-	if test "$ac_gadu_includes" != "no"; then
+-		GADU_CFLAGS="-I$ac_gadu_includes"
+-	fi
+-	CPPFLAGS_save="$CPPFLAGS"
+-	CPPFLAGS="$CPPFLAGS $GADU_CFLAGS"
+-	AC_CHECK_HEADER(libgadu.h, [gadu_includes=yes])
+-	CPPFLAGS="$CPPFLAGS_save"
+-
+-	if test "$ac_gadu_libs" != "no"; then
+-		GADU_LIBS="-L$ac_gadu_libs"
+-	fi
+-	GADU_LIBS="$GADU_LIBS -lgadu"
+-	AC_CHECK_LIB(gadu, gg_libgadu_version, [gadu_libs=yes], , $GADU_LIBS)
+-fi
+-GADU_CFLAGS=`echo $GADU_CFLAGS |$sedpath 's/-Wall//'`
+-
+-if test "x$gadu_libs" = "xyes"; then
+-	AC_MSG_CHECKING(for libgadu GPL compatibility)
+-	CPPFLAGS_save="$CPPFLAGS"
+-	CPPFLAGS="$CPPFLAGS $GADU_CFLAGS"
+-	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <libgadu.h>]], [[
+-#if defined(__GG_LIBGADU_HAVE_OPENSSL) || defined(GG_CONFIG_HAVE_OPENSSL)
+-#error "libgadu is not compatible with the GPL when compiled with OpenSSL support."
+-#endif
+-	]])], [
+-		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <libgadu.h>]], [[
+-#if GG_DEFAULT_PROTOCOL_VERSION < 0x2e
+-#error "Your libgadu version is too old. libpurple requires 1.11.0 or higher."
+-#endif
+-		]])], [
+-			AC_MSG_RESULT(yes)
+-			AC_DEFINE([HAVE_LIBGADU], [1],
+-				[Define to 1 if you have libgadu.])
+-		], [
+-			AC_MSG_RESULT(no)
+-			echo
+-			echo
+-			echo "Your supplied copy of libgadu is too old."
+-			echo "Install version 1.11.0 or newer."
+-			echo "Then rerun this ./configure"
+-			echo
+-			echo "Falling back to using our own copy of libgadu"
+-			echo
+-			GADU_LIBS=""
+-			GADU_CFLAGS=""
+-			gadu_libs=no
+-		])
+-	], [
+-		AC_MSG_RESULT(no)
+-		echo
+-		echo
+-		echo "libgadu is not compatible with the GPL when compiled with OpenSSL support."
+-		echo "To compile against system libgadu, please recompile libgadu using:"
+-		echo "./autogen.sh --disable-libgadu-openssl --disable-static --enable-shared"
+-		echo "Then rerun this ./configure"
+-		echo
+-		echo "Falling back to using our own copy of libgadu"
+-		echo
+-		GADU_LIBS=""
+-		GADU_CFLAGS=""
+-		gadu_libs=no
+-	])
+-	CPPFLAGS="$CPPFLAGS_save"
+-fi
+-
+-AM_CONDITIONAL(USE_INTERNAL_LIBGADU, test "x$gadu_libs" != "xyes")
+-
+-if test "x$gadu_libs" = "x"; then
+-	gadu_libs=no
+-fi
+-
+-AC_SUBST(GADU_LIBS)
+-AC_SUBST(GADU_CFLAGS)
+-
+ AC_ARG_ENABLE(distrib,,,enable_distrib=no)
+ AM_CONDITIONAL(DISTRIB, test "x$enable_distrib" = "xyes")
+ DYNAMIC_PRPLS=all
+@@ -1123,10 +1007,7 @@
+ fi
+ 
+ if test "x$STATIC_PRPLS" = "xall" ; then
+-	STATIC_PRPLS="bonjour gg irc jabber msn myspace mxit novell oscar sametime silc simple yahoo zephyr"
+-fi
+-if test "x$have_meanwhile" != "xyes" ; then
+-	STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/sametime//'`
++	STATIC_PRPLS="bonjour irc jabber silc simple zephyr"
+ fi
+ if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then
+ 	STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/bonjour//'`
+@@ -1143,64 +1024,31 @@
+ load_proto=
+ for i in $STATIC_PRPLS ; do
+ 	dnl Ugly special case for "libsilcpurple.la":
+-	dnl ... and Ugly special case for multi-protocol oscar and yahoo
+-	if test \( "x$i" = "xoscar" -o "x$i" = "xaim" -o "x$i" = "xicq" \) -a "x$static_oscar" != "xyes"; then
+-		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/oscar/liboscar.la"
+-		extern_init="$extern_init extern gboolean purple_init_aim_plugin();"
+-		extern_init="$extern_init extern gboolean purple_init_icq_plugin();"
+-		load_proto="$load_proto purple_init_aim_plugin();"
+-		load_proto="$load_proto purple_init_icq_plugin();"
+-	elif test "x$i" = "xyahoo"; then
+-		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/yahoo/libymsg.la"
+-		extern_init="$extern_init extern gboolean purple_init_yahoo_plugin();"
+-		extern_init="$extern_init extern gboolean purple_init_yahoojp_plugin();"
+-		load_proto="$load_proto purple_init_yahoo_plugin();"
+-		load_proto="$load_proto purple_init_yahoojp_plugin();"
++	if test "x$i" = "xsilc"; then
++		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.la"
++	elif test "x$i" = "xsilc10"; then
++		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/libsilcpurple.la"
+ 	else
+-		if test "x$i" = "xsilc"; then
+-			STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.la"
+-		elif test "x$i" = "xsilc10"; then
+-			STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/libsilcpurple.la"
+-		else
+-			STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib$i.la"
+-		fi
+-		extern_init="$extern_init extern gboolean purple_init_${i}_plugin();"
+-		load_proto="$load_proto purple_init_${i}_plugin();"
++		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib$i.la"
+ 	fi
++	extern_init="$extern_init extern gboolean purple_init_${i}_plugin();"
++	load_proto="$load_proto purple_init_${i}_plugin();"
+ 	case $i in
+ 		bonjour)	static_bonjour=yes ;;
+-		gg)			static_gg=yes ;;
+ 		irc)		static_irc=yes ;;
+ 		jabber)		static_jabber=yes ;;
+-		msn)		static_msn=yes ;;
+-		myspace)	static_myspace=yes ;;
+-		mxit)		static_mxit=yes ;;
+-		novell)		static_novell=yes ;;
+-		oscar)		static_oscar=yes ;;
+-		aim)		static_oscar=yes ;;
+-		icq)		static_oscar=yes ;;
+-		sametime)	static_sametime=yes ;;
+ 		silc)		static_silc=yes ;;
+ 		silc10)		static_silc=yes ;;
+ 		simple)		static_simple=yes ;;
+-		yahoo)		static_yahoo=yes ;;
+ 		zephyr)		static_zephyr=yes ;;
+ 		*)			echo "Invalid static protocol $i!!" ; exit 1 ;;
+ 	esac
+ done
+ AM_CONDITIONAL(STATIC_BONJOUR, test "x$static_bonjour" = "xyes")
+-AM_CONDITIONAL(STATIC_GG, test "x$static_gg" = "xyes")
+ AM_CONDITIONAL(STATIC_IRC, test "x$static_irc" = "xyes")
+ AM_CONDITIONAL(STATIC_JABBER, test "x$static_jabber" = "xyes")
+-AM_CONDITIONAL(STATIC_MSN, test "x$static_msn" = "xyes")
+-AM_CONDITIONAL(STATIC_MYSPACE, test "x$static_myspace" = "xyes")
+-AM_CONDITIONAL(STATIC_MXIT, test "x$static_mxit" = "xyes")
+-AM_CONDITIONAL(STATIC_NOVELL, test "x$static_novell" = "xyes")
+-AM_CONDITIONAL(STATIC_OSCAR, test "x$static_oscar" = "xyes")
+-AM_CONDITIONAL(STATIC_SAMETIME, test "x$static_sametime" = "xyes" -a "x$have_meanwhile" = "xyes")
+ AM_CONDITIONAL(STATIC_SILC, test "x$static_silc" = "xyes" -a "x$have_silc" = "xyes")
+ AM_CONDITIONAL(STATIC_SIMPLE, test "x$static_simple" = "xyes")
+-AM_CONDITIONAL(STATIC_YAHOO, test "x$static_yahoo" = "xyes")
+ AM_CONDITIONAL(STATIC_ZEPHYR, test "x$static_zephyr" = "xyes")
+ AC_SUBST(STATIC_LINK_LIBS)
+ AC_DEFINE_UNQUOTED(STATIC_PROTO_INIT, $extern_init static void static_proto_init(void) { $load_proto },
+@@ -1208,10 +1056,7 @@
+ 
+ AC_ARG_WITH(dynamic_prpls, [AC_HELP_STRING([--with-dynamic-prpls], [specify which protocols to build dynamically])], [DYNAMIC_PRPLS=`echo $withval | $sedpath 's/,/ /g'`])
+ if test "x$DYNAMIC_PRPLS" = "xall" ; then
+-	DYNAMIC_PRPLS="bonjour gg irc jabber msn myspace mxit novell oscar sametime silc simple yahoo zephyr"
+-fi
+-if test "x$have_meanwhile" != "xyes"; then
+-	DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/sametime//'`
++	DYNAMIC_PRPLS="bonjour irc jabber silc simple zephyr"
+ fi
+ if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then
+ 	DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/bonjour//'`
+@@ -1226,22 +1071,12 @@
+ for i in $DYNAMIC_PRPLS ; do
+ 	case $i in
+ 		bonjour)	dynamic_bonjour=yes ;;
+-		gg)			dynamic_gg=yes ;;
+ 		irc)		dynamic_irc=yes ;;
+ 		jabber)		dynamic_jabber=yes ;;
+-		msn)		dynamic_msn=yes ;;
+-		myspace)	dynamic_myspace=yes ;;
+-		mxit)		dynamic_mxit=yes ;;
+-		novell)		dynamic_novell=yes ;;
+ 		null)		dynamic_null=yes ;;
+-		oscar)		dynamic_oscar=yes ;;
+-		aim)		dynamic_oscar=yes ;;
+-		icq)		dynamic_oscar=yes ;;
+-		sametime)	dynamic_sametime=yes ;;
+ 		silc)		dynamic_silc=yes ;;
+ 		silc10)		dynamic_silc=yes ;;
+ 		simple)		dynamic_simple=yes ;;
+-		yahoo)		dynamic_yahoo=yes ;;
+ 		zephyr)		dynamic_zephyr=yes ;;
+ 		*)			echo "Invalid dynamic protocol $i!!" ; exit 1 ;;
+ 	esac
+@@ -1713,7 +1548,7 @@
+ 	[enable_nss="$enableval"],
+ 	[enable_nss="yes"])
+ 
+-msg_ssl="None. MSN, Yahoo!, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!"
++msg_ssl="None."
+ looked_for_gnutls="no"
+ dnl #
+ dnl # Check for GnuTLS if it's specified.
+@@ -2124,19 +1959,16 @@
+ 	AC_MSG_ERROR([
+ Neither GnuTLS or NSS SSL development headers found.
+ Use --disable-nss --disable-gnutls if you do not need SSL support.
+-MSN, Yahoo!, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!
+ ])
+ elif test "x$looked_for_gnutls" = "xyes" -a "x$force_deps" = "xyes" ; then
+ 	AC_MSG_ERROR([
+ GnuTLS SSL development headers not found.
+ Use --disable-gnutls if you do not need SSL support.
+-MSN, Yahoo!, Novell Groupwise and Google Talk will not work without SSL support.
+ ])
+ elif test "x$looked_for_nss" = "xyes" -a "x$force_deps" = "xyes" ; then
+ 	AC_MSG_ERROR([
+ NSS SSL development headers not found.
+ Use --disable-nss if you do not need SSL support.
+-MSN, Yahoo!, Novell Groupwise and Google Talk will not work without SSL support.
+ ])
+ fi
+ 
+@@ -2577,20 +2409,12 @@
+ 		   libpurple/Makefile
+ 		   libpurple/protocols/Makefile
+ 		   libpurple/protocols/bonjour/Makefile
+-		   libpurple/protocols/gg/Makefile
+ 		   libpurple/protocols/irc/Makefile
+ 		   libpurple/protocols/jabber/Makefile
+-		   libpurple/protocols/msn/Makefile
+-		   libpurple/protocols/myspace/Makefile
+-		   libpurple/protocols/mxit/Makefile
+-		   libpurple/protocols/novell/Makefile
+ 		   libpurple/protocols/null/Makefile
+-		   libpurple/protocols/oscar/Makefile
+-		   libpurple/protocols/sametime/Makefile
+ 		   libpurple/protocols/silc/Makefile
+ 		   libpurple/protocols/silc10/Makefile
+ 		   libpurple/protocols/simple/Makefile
+-		   libpurple/protocols/yahoo/Makefile
+ 		   libpurple/protocols/zephyr/Makefile
+ 		   libpurple/tests/Makefile
+ 		   libpurple/purple.h
+@@ -2635,7 +2459,6 @@
+ echo Build with Cyrus SASL support. : $enable_cyrus_sasl
+ echo Use kerberos 4 with zephyr.... : $kerberos
+ echo Use external libzephyr........ : $zephyr
+-echo Use external libgadu.......... : $gadu_libs
+ echo Install pixmaps............... : $enable_pixmaps
+ echo Old tray icon compatibility... : $enable_traycompat
+ echo Install translations.......... : $enable_i18n
+diff -Nur pidgin-2.10.7/doc/finch.1.in pidgin-2.10.7-nonprism/doc/finch.1.in
+--- pidgin-2.10.7/doc/finch.1.in	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/doc/finch.1.in	2013-08-16 21:01:16.682280145 -0300
+@@ -30,11 +30,8 @@
+ .SH DESCRIPTION
+ .PP
+ \fBfinch\fR is a console-based modular messaging client based on libpurple
+-which is capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC,
+-Novell GroupWise, Lotus Sametime, Zephyr, Gadu-Gadu, and QQ all at once. It has
++which is capable of connecting to XMPP, IRC, SILC and Zephyr all at once. It has
+ many common features found in other clients, as well as many unique features.
+-Finch is not endorsed by or affiliated with America Online, ICQ, Microsoft, or
+-Yahoo.
+ 
+ .SH OPTIONS
+ The following options are provided by \fBfinch\fR using the standard GNU
+diff -Nur pidgin-2.10.7/doc/funniest_home_convos.txt pidgin-2.10.7-nonprism/doc/funniest_home_convos.txt
+--- pidgin-2.10.7/doc/funniest_home_convos.txt	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/doc/funniest_home_convos.txt	2013-08-16 23:08:16.148841464 -0300
+@@ -301,8 +301,6 @@
+ ---
+ 
+ 18:33:26 <NoName> hello there
+-18:34:03 <NoName> I just wanted to share some bevavior that I think its kinda of
+-                  unsafe when using GAIM with yahoo messenges accounts
+ 18:34:43 <NoName> Whenever you transfer files between users, no receiving
+                   confirmation is requested, the file gets transfered
+                   automatically
+diff -Nur pidgin-2.10.7/doc/pidgin.1.in pidgin-2.10.7-nonprism/doc/pidgin.1.in
+--- pidgin-2.10.7/doc/pidgin.1.in	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/doc/pidgin.1.in	2013-08-16 21:00:30.964181946 -0300
+@@ -29,11 +29,8 @@
+ .SH DESCRIPTION
+ .PP
+ \fBpidgin\fR is a graphical modular messaging client based on libpurple
+-which is capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC,
+-Novell GroupWise, Lotus Sametime, Zephyr, Gadu-Gadu, and QQ all at once. It has
++which is capable of connecting to XMPP, IRC, SILC and Zephyr all at once. It has
+ many common features found in other clients, as well as many unique features.
+-Pidgin is not endorsed by or affiliated with America Online, ICQ, Microsoft, or
+-Yahoo.
+ .PP
+ Pidgin can be extended by plugins written in multiple programming languages and
+ controlled through DBus or \fBpurple-remote\fR.
+diff -Nur pidgin-2.10.7/libpurple/account.c pidgin-2.10.7-nonprism/libpurple/account.c
+--- pidgin-2.10.7/libpurple/account.c	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/account.c	2013-08-16 23:31:48.026518940 -0300
+@@ -482,55 +482,6 @@
+ /*********************************************************************
+  * Reading from disk                                                 *
+  *********************************************************************/
+-static void
+-migrate_yahoo_japan(PurpleAccount *account)
+-{
+-	/* detect a Yahoo! JAPAN account that existed prior to 2.6.0 and convert it
+-	 * to use the new prpl-yahoojp.  Also remove the account-specific settings
+-	 * we no longer need */
+-
+-	if(purple_strequal(purple_account_get_protocol_id(account), "prpl-yahoo")) {
+-		if(purple_account_get_bool(account, "yahoojp", FALSE)) {
+-			const char *serverjp = purple_account_get_string(account, "serverjp", NULL);
+-			const char *xferjp_host = purple_account_get_string(account, "xferjp_host", NULL);
+-
+-			g_return_if_fail(serverjp != NULL);
+-			g_return_if_fail(xferjp_host != NULL);
+-
+-			purple_account_set_string(account, "server", serverjp);
+-			purple_account_set_string(account, "xfer_host", xferjp_host);
+-
+-			purple_account_set_protocol_id(account, "prpl-yahoojp");
+-		}
+-
+-		/* these should always be nuked */
+-		purple_account_remove_setting(account, "yahoojp");
+-		purple_account_remove_setting(account, "serverjp");
+-		purple_account_remove_setting(account, "xferjp_host");
+-
+-	}
+-}
+-
+-static void
+-migrate_icq_server(PurpleAccount *account)
+-{
+-	/* Migrate the login server setting for ICQ accounts.  See
+-	 * 'mtn log --last 1 --no-graph --from b6d7712e90b68610df3bd2d8cbaf46d94c8b3794'
+-	 * for details on the change. */
+-
+-	if(purple_strequal(purple_account_get_protocol_id(account), "prpl-icq")) {
+-		const char *tmp = purple_account_get_string(account, "server", NULL);
+-
+-		/* Non-secure server */
+-		if(purple_strequal(tmp,	"login.messaging.aol.com") ||
+-				purple_strequal(tmp, "login.oscar.aol.com"))
+-			purple_account_set_string(account, "server", "login.icq.com");
+-
+-		/* Secure server */
+-		if(purple_strequal(tmp, "slogin.oscar.aol.com"))
+-			purple_account_set_string(account, "server", "slogin.icq.com");
+-	}
+-}
+ 
+ static void
+ migrate_xmpp_encryption(PurpleAccount *account)
+@@ -615,12 +566,6 @@
+ 		g_free(data);
+ 	}
+ 
+-	/* we do this here because we need access to account settings to determine
+-	 * if we can/should migrate an old Yahoo! JAPAN account */
+-	migrate_yahoo_japan(account);
+-	/* we do this here because we need access to account settings to determine
+-	 * if we can/should migrate an ICQ account's server setting */
+-	migrate_icq_server(account);
+ 	/* we do this here because we need to do it before the user views the
+ 	 * Edit Account dialog. */
+ 	migrate_xmpp_encryption(account);
+@@ -874,7 +819,6 @@
+ 		return NULL;
+ 	}
+ 
+-	ret = purple_account_new(name, _purple_oscar_convert(name, protocol_id)); /* XXX: */
+ 	g_free(name);
+ 	g_free(protocol_id);
+ 
+diff -Nur pidgin-2.10.7/libpurple/blist.c pidgin-2.10.7-nonprism/libpurple/blist.c
+--- pidgin-2.10.7/libpurple/blist.c	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/blist.c	2013-08-16 22:53:19.640535242 -0300
+@@ -466,9 +466,7 @@
+ 
+ 	acct_name = xmlnode_get_attrib(bnode, "account");
+ 	protocol = xmlnode_get_attrib(bnode, "protocol");
+-	protocol = _purple_oscar_convert(acct_name, protocol); /* XXX: Remove */
+ 	proto = xmlnode_get_attrib(bnode, "proto");
+-	proto = _purple_oscar_convert(acct_name, proto); /* XXX: Remove */
+ 
+ 	if (!acct_name || (!proto && !protocol))
+ 		return;
+diff -Nur pidgin-2.10.7/libpurple/buddyicon.c pidgin-2.10.7-nonprism/libpurple/buddyicon.c
+--- pidgin-2.10.7/libpurple/buddyicon.c	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/buddyicon.c	2013-08-16 23:28:49.244233493 -0300
+@@ -1099,18 +1099,6 @@
+ 			{
+ 				PurpleAccount *account = purple_buddy_get_account((PurpleBuddy *)node);
+ 				const char *prpl_id = purple_account_get_protocol_id(account);
+-
+-				if (g_str_equal(prpl_id, "prpl-yahoo") || g_str_equal(prpl_id, "prpl-yahoojp"))
+-				{
+-					int checksum = purple_blist_node_get_int(node, "icon_checksum");
+-					if (checksum != 0)
+-					{
+-						char *checksum_str = g_strdup_printf("%i", checksum);
+-						purple_blist_node_remove_setting(node, "icon_checksum");
+-						purple_blist_node_set_string(node, "icon_checksum", checksum_str);
+-						g_free(checksum_str);
+-					}
+-				}
+ 			}
+ 		}
+ 	}
+diff -Nur pidgin-2.10.7/libpurple/ft.h pidgin-2.10.7-nonprism/libpurple/ft.h
+--- pidgin-2.10.7/libpurple/ft.h	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/ft.h	2013-08-16 22:51:20.590085226 -0300
+@@ -470,8 +470,6 @@
+  * can be used to jump backward in the file if the protocol detects
+  * that some bit of data needs to be resent or has been sent twice.
+  *
+- * It's used for pausing and resuming an oscar file transfer.
+- *
+  * @param xfer       The file transfer.
+  * @param bytes_sent The new current position in the file.  If we're
+  *                   sending a file then this is the byte that we will
+diff -Nur pidgin-2.10.7/libpurple/gaim-compat.h pidgin-2.10.7-nonprism/libpurple/gaim-compat.h
+--- pidgin-2.10.7/libpurple/gaim-compat.h	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/gaim-compat.h	2013-08-16 23:33:16.372629159 -0300
+@@ -2302,16 +2302,8 @@
+ #define gaim_init_ssl_plugin			purple_init_ssl_plugin
+ #define gaim_init_ssl_openssl_plugin	purple_init_ssl_openssl_plugin
+ #define gaim_init_ssl_gnutls_plugin		purple_init_ssl_gnutls_plugin
+-#define gaim_init_gg_plugin				purple_init_gg_plugin
+ #define gaim_init_jabber_plugin			purple_init_jabber_plugin
+-#define gaim_init_sametime_plugin		purple_init_sametime_plugin
+-#define gaim_init_msn_plugin			purple_init_msn_plugin
+-#define gaim_init_novell_plugin			purple_init_novell_plugin
+-#define gaim_init_qq_plugin				purple_init_qq_plugin
+ #define gaim_init_simple_plugin			purple_init_simple_plugin
+-#define gaim_init_yahoo_plugin			purple_init_yahoo_plugin
+ #define gaim_init_zephyr_plugin			purple_init_zephyr_plugin
+-#define gaim_init_aim_plugin			purple_init_aim_plugin
+-#define gaim_init_icq_plugin			purple_init_icq_plugin
+ 
+ #endif /* _GAIM_COMPAT_H_ */
+diff -Nur pidgin-2.10.7/libpurple/internal.h pidgin-2.10.7-nonprism/libpurple/internal.h
+--- pidgin-2.10.7/libpurple/internal.h	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/internal.h	2013-08-17 00:24:37.244172407 -0300
+@@ -43,7 +43,7 @@
+  *
+  * The Singular/Plural/Number ngettext dummy definition below was
+  * taken from an email to the texinfo mailing list by Manuel Guerrero.
+- * Thank you Manuel, and thank you Alex's good friend Google.
++ * Thank you Manuel.
+  */
+ #ifdef ENABLE_NLS
+ #  include <locale.h>
+diff -Nur pidgin-2.10.7/libpurple/media/backend-fs2.c pidgin-2.10.7-nonprism/libpurple/media/backend-fs2.c
+--- pidgin-2.10.7/libpurple/media/backend-fs2.c	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/media/backend-fs2.c	2013-08-17 00:23:19.488440821 -0300
+@@ -1661,18 +1661,6 @@
+ 		g_object_set(G_OBJECT(session->session),
+ 				"no-rtcp-timeout", 0, NULL);
+ 
+-	/*
+-	 * Hack to make x264 work with Gmail video.
+-	 */
+-	if (is_nice && !strcmp(sess_id, "google-video")) {
+-		FsElementAddedNotifier *notifier =
+-				fs_element_added_notifier_new();
+-		g_signal_connect(G_OBJECT(notifier), "element-added",
+-				G_CALLBACK(gst_element_added_cb), NULL);
+-		fs_element_added_notifier_add(notifier,
+-				GST_BIN(priv->conference));
+-	}
+-
+ 	session->id = g_strdup(sess_id);
+ 	session->backend = self;
+ 	session->type = type;
+diff -Nur pidgin-2.10.7/libpurple/plugins/psychic.c pidgin-2.10.7-nonprism/libpurple/plugins/psychic.c
+--- pidgin-2.10.7/libpurple/plugins/psychic.c	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/plugins/psychic.c	2013-08-27 21:18:22.251908751 -0300
+@@ -20,8 +20,7 @@
+ #define PLUGIN_NAME     N_("Psychic Mode")
+ #define PLUGIN_SUMMARY  N_("Psychic mode for incoming conversation")
+ #define PLUGIN_DESC     N_("Causes conversation windows to appear as other" \
+-			   " users begin to message you.  This works for" \
+-			   " AIM, ICQ, XMPP, Sametime, and Yahoo!")
++			   " users begin to message you.  This works for XMPP")
+ #define PLUGIN_AUTHOR   "Christopher O'Brien <siege@preoccupied.net>"
+ 
+ 
+diff -Nur pidgin-2.10.7/libpurple/pounce.c pidgin-2.10.7-nonprism/libpurple/pounce.c
+--- pidgin-2.10.7/libpurple/pounce.c	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/pounce.c	2013-08-16 23:02:20.671021669 -0300
+@@ -409,7 +409,6 @@
+ 		g_free(data->account_name);
+ 		data->account_name = g_strdup(buffer);
+ 		tmp = data->protocol_id;
+-		data->protocol_id = g_strdup(_purple_oscar_convert(buffer, tmp));
+ 		g_free(tmp);
+ 	}
+ 	else if (purple_strequal(element_name, "pouncee")) {
+diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/auth_cyrus.c pidgin-2.10.7-nonprism/libpurple/protocols/jabber/auth_cyrus.c
+--- pidgin-2.10.7/libpurple/protocols/jabber/auth_cyrus.c	2013-02-11 07:16:52.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/auth_cyrus.c	2013-08-17 00:14:13.334946817 -0300
+@@ -320,7 +320,7 @@
+ 		xmlnode_set_namespace(auth, NS_XMPP_SASL);
+ 		xmlnode_set_attrib(auth, "mechanism", js->current_mech);
+ 
+-		xmlnode_set_attrib(auth, "xmlns:ga", "http://www.google.com/talk/protocol/auth");
++		xmlnode_set_attrib(auth, "xmlns:ga", "");
+ 		xmlnode_set_attrib(auth, "ga:client-uses-full-bind-result", "true");
+ 
+ 		if (clientout) {
+diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/auth_plain.c pidgin-2.10.7-nonprism/libpurple/protocols/jabber/auth_plain.c
+--- pidgin-2.10.7/libpurple/protocols/jabber/auth_plain.c	2013-02-11 07:16:52.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/auth_plain.c	2013-08-17 00:19:44.801822370 -0300
+@@ -40,7 +40,7 @@
+ 	auth = xmlnode_new("auth");
+ 	xmlnode_set_namespace(auth, NS_XMPP_SASL);
+ 
+-	xmlnode_set_attrib(auth, "xmlns:ga", "http://www.google.com/talk/protocol/auth");
++	xmlnode_set_attrib(auth, "xmlns:ga", "");
+ 	xmlnode_set_attrib(auth, "ga:client-uses-full-bind-result", "true");
+ 
+ 	response = g_string_new("");
+diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/buddy.c pidgin-2.10.7-nonprism/libpurple/protocols/jabber/buddy.c
+--- pidgin-2.10.7/libpurple/protocols/jabber/buddy.c	2013-02-11 07:16:52.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/buddy.c	2013-08-17 00:22:49.080836449 -0300
+@@ -38,7 +38,6 @@
+ #include "xdata.h"
+ #include "pep.h"
+ #include "adhoccommands.h"
+-#include "google/google.h"
+ 
+ typedef struct {
+ 	long idle_seconds;
+@@ -945,17 +944,7 @@
+ 
+ 	/* Republish our vcard if the photo is different than the server's */
+ 	if (js->initial_avatar_hash && !purple_strequal(vcard_hash, js->initial_avatar_hash)) {
+-		/*
+-		 * Google Talk has developed the behavior that it will not accept
+-		 * a vcard set in the first 10 seconds (or so) of the connection;
+-		 * it returns an error (namespaces trimmed):
+-		 * <error code="500" type="wait"><internal-server-error/></error>.
+-		 */
+-		if (js->googletalk)
+-			js->vcard_timer = purple_timeout_add_seconds(10, set_own_vcard_cb,
+-			                                             js);
+-		else
+-			jabber_set_info(js->gc, purple_account_get_user_info(account));
++		jabber_set_info(js->gc, purple_account_get_user_info(account));
+ 	} else if (vcard_hash) {
+ 		/* A photo is in the vCard. Advertise its hash */
+ 		js->avatar_hash = vcard_hash;
+@@ -1861,13 +1850,6 @@
+ 		                           NULL, NULL);
+ 		m = g_list_append(m, act);
+ 	}
+-
+-	if (js->googletalk) {
+-		act = purple_menu_action_new(_("Initiate _Chat"),
+-		                           PURPLE_CALLBACK(google_buddy_node_chat),
+-		                           NULL, NULL);
+-		m = g_list_append(m, act);
+-	}
+ 
+ 	/*
+ 	 * This if-condition implements parts of XEP-0100: Gateway Interaction
+diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/disco.c pidgin-2.10.7-nonprism/libpurple/protocols/jabber/disco.c
+--- pidgin-2.10.7/libpurple/protocols/jabber/disco.c	2013-02-11 07:16:52.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/disco.c	2013-08-27 22:49:34.275219711 -0300
+@@ -30,9 +30,6 @@
+ #include "adhoccommands.h"
+ #include "buddy.h"
+ #include "disco.h"
+-#include "google/google.h"
+-#include "google/gmail.h"
+-#include "google/jingleinfo.h"
+ #include "iq.h"
+ #include "jabber.h"
+ #include "jingle/jingle.h"
+@@ -142,44 +139,6 @@
+ 					xmlnode_set_attrib(feature, "var", feat->namespace);
+ 				}
+ 			}
+-#ifdef USE_VV
+-		} else if (g_str_equal(node, CAPS0115_NODE "#" "voice-v1")) {
+-			/*
+-			 * HUGE HACK! We advertise this ext (see jabber_presence_create_js
+-			 * where we add <c/> to the <presence/>) for the Google Talk
+-			 * clients that don't actually check disco#info features.
+-			 *
+-			 * This specific feature is redundant but is what
+-			 * node='http://mail.google.com/xmpp/client/caps', ver='1.1'
+-			 * advertises as 'voice-v1'.
+-			 */
+-			xmlnode *feature = xmlnode_new_child(query, "feature");
+-			xmlnode_set_attrib(feature, "var", NS_GOOGLE_VOICE);
+-		} else if (g_str_equal(node, CAPS0115_NODE "#" "video-v1")) {
+-			/*
+-			 * HUGE HACK! We advertise this ext (see jabber_presence_create_js
+-			 * where we add <c/> to the <presence/>) for the Google Talk
+-			 * clients that don't actually check disco#info features.
+-			 *
+-			 * This specific feature is redundant but is what
+-			 * node='http://mail.google.com/xmpp/client/caps', ver='1.1'
+-			 * advertises as 'video-v1'.
+-			 */
+-			xmlnode *feature = xmlnode_new_child(query, "feature");
+-			xmlnode_set_attrib(feature, "var", NS_GOOGLE_VIDEO);
+-		} else if (g_str_equal(node, CAPS0115_NODE "#" "camera-v1")) {
+-			/*
+-			 * HUGE HACK! We advertise this ext (see jabber_presence_create_js
+-			 * where we add <c/> to the <presence/>) for the Google Talk
+-			 * clients that don't actually check disco#info features.
+-			 *
+-			 * This specific feature is redundant but is what
+-			 * node='http://mail.google.com/xmpp/client/caps', ver='1.1'
+-			 * advertises as 'camera-v1'.
+-			 */
+-			xmlnode *feature = xmlnode_new_child(query, "feature");
+-			xmlnode_set_attrib(feature, "var", NS_GOOGLE_CAMERA);
+-#endif
+ 		} else {
+ 			xmlnode *error, *inf;
+ 
+@@ -419,7 +378,7 @@
+ 
+ }
+ 
+-/* should probably share this code with google.c, or maybe from 2.7.0
++/* maybe from 2.7.0
+  introduce an abstracted hostname -> IP function in dns.c */
+ static void
+ jabber_disco_stun_lookup_cb(GSList *hosts, gpointer data,
+@@ -538,16 +497,7 @@
+ 
+ 		g_free(js->server_name);
+ 		js->server_name = g_strdup(name);
+-		if (!strcmp(name, "Google Talk")) {
+-			purple_debug_info("jabber", "Google Talk!\n");
+-			js->googletalk = TRUE;
+-
+-			/* autodiscover stun and relays */
+-			if (purple_network_get_stun_ip() == NULL ||
+-		    	purple_strequal(purple_network_get_stun_ip(), "")) {
+-				jabber_google_send_jingle_info(js);
+-			}
+-		} else if (purple_network_get_stun_ip() == NULL ||
++		if (purple_network_get_stun_ip() == NULL ||
+ 		    purple_strequal(purple_network_get_stun_ip(), "")) {
+ 			js->srv_query_data =
+ 				purple_srv_resolve_account(
+@@ -565,12 +515,7 @@
+ 		if (!var)
+ 			continue;
+ 
+-		if (!strcmp(NS_GOOGLE_MAIL_NOTIFY, var)) {
+-			js->server_caps |= JABBER_CAP_GMAIL_NOTIFY;
+-			jabber_gmail_init(js);
+-		} else if (!strcmp(NS_GOOGLE_ROSTER, var)) {
+-			js->server_caps |= JABBER_CAP_GOOGLE_ROSTER;
+-		} else if (!strcmp("http://jabber.org/protocol/commands", var)) {
++		if (!strcmp("http://jabber.org/protocol/commands", var)) {
+ 			js->server_caps |= JABBER_CAP_ADHOC;
+ 		} else if (!strcmp(NS_SIMPLE_BLOCKING, var)) {
+ 			js->server_caps |= JABBER_CAP_BLOCKING;
+diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/iq.c pidgin-2.10.7-nonprism/libpurple/protocols/jabber/iq.c
+--- pidgin-2.10.7/libpurple/protocols/jabber/iq.c       2013-02-11 07:16:52.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/iq.c      2013-08-17 00:19:05.943958296 -0300
+@@ -28,10 +28,6 @@
+ 
+ #include "buddy.h"
+ #include "disco.h"
+-#include "google/gmail.h"
+-#include "google/google.h"
+-#include "google/jingleinfo.h"
+-#include "google/google_session.h"
+ #include "iq.h"
+ #include "jingle/jingle.h"
+ #include "oob.h"
+@@ -461,13 +457,7 @@
+ 	signal_iq_handlers = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
+ 
+ 	jabber_iq_register_handler("jingle", JINGLE, jingle_parse);
+-	jabber_iq_register_handler("mailbox", NS_GOOGLE_MAIL_NOTIFY,
+-			jabber_gmail_poke);
+-	jabber_iq_register_handler("new-mail", NS_GOOGLE_MAIL_NOTIFY,
+-			jabber_gmail_poke);
+ 	jabber_iq_register_handler("ping", NS_PING, jabber_ping_parse);
+-	jabber_iq_register_handler("query", NS_GOOGLE_JINGLE_INFO,
+-			jabber_google_handle_jingle_info);
+ 	jabber_iq_register_handler("query", NS_BYTESTREAMS,
+ 			jabber_bytestreams_parse);
+ 	jabber_iq_register_handler("query", NS_DISCO_INFO, jabber_disco_info_parse);
+@@ -481,8 +471,6 @@
+ 	jabber_iq_register_handler("query", "jabber:iq:version",
+ 			jabber_iq_version_parse);
+ #ifdef USE_VV
+-	jabber_iq_register_handler("session", NS_GOOGLE_SESSION,
+-		jabber_google_session_parse);
+ #endif
+ 	jabber_iq_register_handler("block", NS_SIMPLE_BLOCKING, jabber_blocklist_parse_push);
+ 	jabber_iq_register_handler("unblock", NS_SIMPLE_BLOCKING, jabber_blocklist_parse_push);
+diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/jabber.c pidgin-2.10.7-nonprism/libpurple/protocols/jabber/jabber.c
+--- pidgin-2.10.7/libpurple/protocols/jabber/jabber.c	2013-02-11 07:16:52.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/jabber.c	2013-08-27 23:23:55.191865468 -0300
+@@ -51,9 +51,6 @@
+ #include "chat.h"
+ #include "data.h"
+ #include "disco.h"
+-#include "google/google.h"
+-#include "google/google_roster.h"
+-#include "google/google_session.h"
+ #include "ibb.h"
+ #include "iq.h"
+ #include "jutil.h"
+@@ -1003,9 +1000,6 @@
+ 	js->stun_ip = NULL;
+ 	js->stun_port = 0;
+ 	js->stun_query = NULL;
+-	js->google_relay_token = NULL;
+-	js->google_relay_host = NULL;
+-	js->google_relay_requests = NULL;
+ 
+ 	/* if we are idle, set idle-ness on the stream (this could happen if we get
+ 		disconnected and the reconnects while being idle. I don't think it makes
+@@ -1679,8 +1673,6 @@
+ 	}
+ 	g_free(js->server_name);
+ 	g_free(js->certificate_CN);
+-	g_free(js->gmail_last_time);
+-	g_free(js->gmail_last_tid);
+ 	g_free(js->old_msg);
+ 	g_free(js->old_avatarhash);
+ 	g_free(js->old_artist);
+@@ -1709,21 +1701,6 @@
+ 		js->stun_query = NULL;
+ 	}
+ 
+-	/* remove Google relay-related stuff */
+-	g_free(js->google_relay_token);
+-	g_free(js->google_relay_host);
+-	if (js->google_relay_requests) {
+-		while (js->google_relay_requests) {
+-			PurpleUtilFetchUrlData *url_data =
+-				(PurpleUtilFetchUrlData *) js->google_relay_requests->data;
+-			purple_util_fetch_url_cancel(url_data);
+-			g_free(url_data);
+-			js->google_relay_requests =
+-				g_list_delete_link(js->google_relay_requests,
+-					js->google_relay_requests);
+-		}
+-	}
+-
+ 	g_free(js);
+ 
+ 	gc->proto_data = NULL;
+@@ -1916,12 +1893,6 @@
+ 	if (js == NULL)
+ 		return;
+ 
+-	if (js->server_caps & JABBER_CAP_GOOGLE_ROSTER)
+-	{
+-		jabber_google_roster_add_deny(js, who);
+-		return;
+-	}
+-
+ 	if (!(js->server_caps & JABBER_CAP_BLOCKING))
+ 	{
+ 		purple_notify_error(NULL, _("Server doesn't support blocking"),
+@@ -1952,12 +1923,6 @@
+ 	if (js == NULL)
+ 		return;
+ 
+-	if (js->server_caps & JABBER_CAP_GOOGLE_ROSTER)
+-	{
+-		jabber_google_roster_rem_deny(js, who);
+-		return;
+-	}
+-
+ 	if (!(js->server_caps & JABBER_CAP_BLOCKING))
+ 		return;
+ 
+@@ -3310,13 +3275,7 @@
+ 		jbr = jabber_buddy_find_resource(jb, resource);
+ 		g_free(resource);
+ 
+-		if (type & PURPLE_MEDIA_AUDIO &&
+-			!jabber_resource_has_capability(jbr,
+-			JINGLE_APP_RTP_SUPPORT_AUDIO) &&
+-			jabber_resource_has_capability(jbr, NS_GOOGLE_VOICE))
+-			return jabber_google_session_initiate(js, who, type);
+-		else
+-			return jingle_rtp_initiate_media(js, who, type);
++		return jingle_rtp_initiate_media(js, who, type);
+ 	}
+ 
+ 	jb = jabber_buddy_find(js, who, FALSE);
+@@ -3500,11 +3459,6 @@
+ 				caps |= PURPLE_MEDIA_CAPS_MODIFY_SESSION |
+ 						PURPLE_MEDIA_CAPS_CHANGE_DIRECTION;
+ 		}
+-		if (jabber_resource_has_capability(jbr, NS_GOOGLE_VOICE)) {
+-			caps |= PURPLE_MEDIA_CAPS_AUDIO;
+-			if (jabber_resource_has_capability(jbr, NS_GOOGLE_VIDEO))
+-				caps |= PURPLE_MEDIA_CAPS_AUDIO_VIDEO;
+-		}
+ 
+ 		total |= caps;
+ 	}
+@@ -3869,10 +3823,6 @@
+ 	jabber_add_feature(JINGLE, 0);
+ 
+ #ifdef USE_VV
+-	jabber_add_feature(NS_GOOGLE_PROTOCOL_SESSION, jabber_audio_enabled);
+-	jabber_add_feature(NS_GOOGLE_VOICE, jabber_audio_enabled);
+-	jabber_add_feature(NS_GOOGLE_VIDEO, jabber_video_enabled);
+-	jabber_add_feature(NS_GOOGLE_CAMERA, jabber_video_enabled);
+ 	jabber_add_feature(JINGLE_APP_RTP, 0);
+ 	jabber_add_feature(JINGLE_APP_RTP_SUPPORT_AUDIO, jabber_audio_enabled);
+ 	jabber_add_feature(JINGLE_APP_RTP_SUPPORT_VIDEO, jabber_video_enabled);
+diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/jabber.h pidgin-2.10.7-nonprism/libpurple/protocols/jabber/jabber.h
+--- pidgin-2.10.7/libpurple/protocols/jabber/jabber.h	2013-02-11 07:16:52.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/jabber.h	2013-08-17 00:10:38.778345348 -0300
+@@ -36,12 +36,6 @@
+ 	JABBER_CAP_IQ_SEARCH      = 1 << 7,
+ 	JABBER_CAP_IQ_REGISTER    = 1 << 8,
+ 
+-	/* Google Talk extensions:
+-	 * http://code.google.com/apis/talk/jep_extensions/extensions.html
+-	 */
+-	JABBER_CAP_GMAIL_NOTIFY   = 1 << 9,
+-	JABBER_CAP_GOOGLE_ROSTER  = 1 << 10,
+-
+ 	JABBER_CAP_PING			  = 1 << 11,
+ 	JABBER_CAP_ADHOC		  = 1 << 12,
+ 	JABBER_CAP_BLOCKING       = 1 << 13,
+@@ -195,12 +189,8 @@
+ 	gboolean reinit;
+ 
+ 	JabberCapabilities server_caps;
+-	gboolean googletalk;
+ 	char *server_name;
+ 
+-	char *gmail_last_time;
+-	char *gmail_last_tid;
+-
+ 	char *serverFQDN;
+ 
+ #ifdef HAVE_CYRUS_SASL
+@@ -276,12 +266,6 @@
+ 	gchar *stun_ip;
+ 	int stun_port;
+ 	PurpleDnsQueryData *stun_query;
+-
+-	/* stuff for Google's relay handling */
+-	gchar *google_relay_token;
+-	gchar *google_relay_host;
+-	GList *google_relay_requests; /* the HTTP requests to get */
+-												/* relay info */
+ };
+ 
+ typedef gboolean (JabberFeatureEnabled)(JabberStream *js, const gchar *namespace);
+diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/jingle/jingle.c pidgin-2.10.7-nonprism/libpurple/protocols/jabber/jingle/jingle.c
+--- pidgin-2.10.7/libpurple/protocols/jabber/jingle/jingle.c	2013-02-11 07:16:52.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/jingle/jingle.c	2013-08-17 00:17:51.991679891 -0300
+@@ -486,13 +486,11 @@
+ 
+ 		if (has_account_stun) {
+ 			purple_debug_info("jabber",
+-				"setting param stun-ip for stream using Google auto-config: %s\n",
+ 				js->stun_ip);
+ 			params[next_index].name = "stun-ip";
+ 			g_value_init(&params[next_index].value, G_TYPE_STRING);
+ 			g_value_set_string(&params[next_index].value, js->stun_ip);
+ 			purple_debug_info("jabber",
+-				"setting param stun-port for stream using Google auto-config: %d\n",
+ 				js->stun_port);
+ 			next_index++;
+ 			params[next_index].name = "stun-port";
+diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/jingle/jingle.h pidgin-2.10.7-nonprism/libpurple/protocols/jabber/jingle/jingle.h
+--- pidgin-2.10.7/libpurple/protocols/jabber/jingle/jingle.h	2013-02-11 07:16:52.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/jingle/jingle.h	2013-08-27 23:02:43.456476444 -0300
+@@ -79,8 +79,7 @@
+ void jingle_terminate_sessions(JabberStream *js);
+ 
+ #ifdef USE_VV
+-/* create a GParam array given autoconfigured STUN (and later perhaps TURN).
+-	if google_talk is TRUE, set compatability mode to GOOGLE_TALK */
++/* create a GParam array given autoconfigured STUN (and later perhaps TURN).*/
+ GParameter *jingle_get_params(JabberStream *js, const gchar *relay_ip,
+ 	guint relay_udp, guint relay_tcp, guint relay_ssltcp,
+     const gchar *relay_username, const gchar *relay_password, guint *num_params);
+diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/libxmpp.c pidgin-2.10.7-nonprism/libpurple/protocols/jabber/libxmpp.c
+--- pidgin-2.10.7/libpurple/protocols/jabber/libxmpp.c	2013-02-11 07:16:52.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/libxmpp.c	2013-08-17 00:13:06.222881329 -0300
+@@ -41,7 +41,6 @@
+ #include "si.h"
+ #include "message.h"
+ #include "presence.h"
+-#include "google/google.h"
+ #include "pep.h"
+ #include "usermood.h"
+ #include "usertune.h"
+diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/Makefile.am pidgin-2.10.7-nonprism/libpurple/protocols/jabber/Makefile.am
+--- pidgin-2.10.7/libpurple/protocols/jabber/Makefile.am	2013-02-11 07:16:52.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/Makefile.am	2013-08-17 00:18:17.592468560 -0300
+@@ -27,20 +27,6 @@
+ 			  data.h \
+ 			  disco.c \
+ 			  disco.h \
+-			  google/gmail.c \
+-			  google/gmail.h \
+-			  google/google.c \
+-			  google/google.h \
+-			  google/google_presence.c \
+-			  google/google_presence.h \
+-			  google/google_roster.c \
+-			  google/google_roster.h \
+-			  google/google_session.c \
+-			  google/google_session.h \
+-			  google/jingleinfo.c \
+-			  google/jingleinfo.h \
+-			  google/relay.c \
+-			  google/relay.h \
+ 			  ibb.c \
+ 			  ibb.h \
+ 			  iq.c \
+diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/Makefile.in pidgin-2.10.7-nonprism/libpurple/protocols/jabber/Makefile.in
+--- pidgin-2.10.7/libpurple/protocols/jabber/Makefile.in	2013-02-11 07:17:20.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/Makefile.in	2013-08-17 00:12:44.605549467 -0300
+@@ -104,12 +104,7 @@
+ 	auth.h auth_digest_md5.c auth_digest_md5.h auth_plain.c \
+ 	auth_scram.c auth_scram.h buddy.c buddy.h bosh.c bosh.h caps.c \
+ 	caps.h chat.c chat.h data.c data.h disco.c disco.h \
+-	google/gmail.c google/gmail.h google/google.c google/google.h \
+-	google/google_presence.c google/google_presence.h \
+-	google/google_roster.c google/google_roster.h \
+-	google/google_session.c google/google_session.h \
+-	google/jingleinfo.c google/jingleinfo.h google/relay.c \
+-	google/relay.h ibb.c ibb.h iq.c iq.h jabber.c jabber.h \
++	ibb.c ibb.h iq.c iq.h jabber.c jabber.h \
+ 	jingle/jingle.c jingle/jingle.h jingle/content.c \
+ 	jingle/content.h jingle/iceudp.c jingle/iceudp.h \
+ 	jingle/rawudp.c jingle/rawudp.h jingle/rtp.c jingle/rtp.h \
+@@ -126,9 +121,7 @@
+ 	libjabber_la-auth_scram.lo libjabber_la-buddy.lo \
+ 	libjabber_la-bosh.lo libjabber_la-caps.lo libjabber_la-chat.lo \
+ 	libjabber_la-data.lo libjabber_la-disco.lo \
+-	libjabber_la-gmail.lo libjabber_la-google.lo \
+-	libjabber_la-google_presence.lo libjabber_la-google_roster.lo \
+-	libjabber_la-google_session.lo libjabber_la-jingleinfo.lo \
++	libjabber_la-jingleinfo.lo \
+ 	libjabber_la-relay.lo libjabber_la-ibb.lo libjabber_la-iq.lo \
+ 	libjabber_la-jabber.lo libjabber_la-jingle.lo \
+ 	libjabber_la-content.lo libjabber_la-iceudp.lo \
+@@ -244,8 +237,6 @@
+ FARSTREAM_CFLAGS = @FARSTREAM_CFLAGS@
+ FARSTREAM_LIBS = @FARSTREAM_LIBS@
+ FGREP = @FGREP@
+-GADU_CFLAGS = @GADU_CFLAGS@
+-GADU_LIBS = @GADU_LIBS@
+ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+@@ -307,8 +298,6 @@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+ MANIFEST_TOOL = @MANIFEST_TOOL@
+-MEANWHILE_CFLAGS = @MEANWHILE_CFLAGS@
+-MEANWHILE_LIBS = @MEANWHILE_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO_CFLAGS = @MONO_CFLAGS@
+@@ -457,13 +446,8 @@
+ JABBERSOURCES = adhoccommands.c adhoccommands.h auth.c auth.h \
+ 	auth_digest_md5.c auth_digest_md5.h auth_plain.c auth_scram.c \
+ 	auth_scram.h buddy.c buddy.h bosh.c bosh.h caps.c caps.h \
+-	chat.c chat.h data.c data.h disco.c disco.h google/gmail.c \
+-	google/gmail.h google/google.c google/google.h \
+-	google/google_presence.c google/google_presence.h \
+-	google/google_roster.c google/google_roster.h \
+-	google/google_session.c google/google_session.h \
+-	google/jingleinfo.c google/jingleinfo.h google/relay.c \
+-	google/relay.h ibb.c ibb.h iq.c iq.h jabber.c jabber.h \
++	chat.c chat.h data.c data.h disco.c disco.h \
++	ibb.c ibb.h iq.c iq.h jabber.c jabber.h \
+ 	jingle/jingle.c jingle/jingle.h jingle/content.c \
+ 	jingle/content.h jingle/iceudp.c jingle/iceudp.h \
+ 	jingle/rawudp.c jingle/rawudp.h jingle/rtp.c jingle/rtp.h \
+@@ -600,11 +584,6 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_la-content.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_la-data.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_la-disco.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_la-gmail.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_la-google.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_la-google_presence.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_la-google_roster.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_la-google_session.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_la-ibb.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_la-iceudp.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_la-iq.Plo@am__quote@
+@@ -731,55 +710,6 @@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -c -o libjabber_la-disco.lo `test -f 'disco.c' || echo '$(srcdir)/'`disco.c
+ 
+-libjabber_la-gmail.lo: google/gmail.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -MT libjabber_la-gmail.lo -MD -MP -MF $(DEPDIR)/libjabber_la-gmail.Tpo -c -o libjabber_la-gmail.lo `test -f 'google/gmail.c' || echo '$(srcdir)/'`google/gmail.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libjabber_la-gmail.Tpo $(DEPDIR)/libjabber_la-gmail.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='google/gmail.c' object='libjabber_la-gmail.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -c -o libjabber_la-gmail.lo `test -f 'google/gmail.c' || echo '$(srcdir)/'`google/gmail.c
+-
+-libjabber_la-google.lo: google/google.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -MT libjabber_la-google.lo -MD -MP -MF $(DEPDIR)/libjabber_la-google.Tpo -c -o libjabber_la-google.lo `test -f 'google/google.c' || echo '$(srcdir)/'`google/google.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libjabber_la-google.Tpo $(DEPDIR)/libjabber_la-google.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='google/google.c' object='libjabber_la-google.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -c -o libjabber_la-google.lo `test -f 'google/google.c' || echo '$(srcdir)/'`google/google.c
+-
+-libjabber_la-google_presence.lo: google/google_presence.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -MT libjabber_la-google_presence.lo -MD -MP -MF $(DEPDIR)/libjabber_la-google_presence.Tpo -c -o libjabber_la-google_presence.lo `test -f 'google/google_presence.c' || echo '$(srcdir)/'`google/google_presence.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libjabber_la-google_presence.Tpo $(DEPDIR)/libjabber_la-google_presence.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='google/google_presence.c' object='libjabber_la-google_presence.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -c -o libjabber_la-google_presence.lo `test -f 'google/google_presence.c' || echo '$(srcdir)/'`google/google_presence.c
+-
+-libjabber_la-google_roster.lo: google/google_roster.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -MT libjabber_la-google_roster.lo -MD -MP -MF $(DEPDIR)/libjabber_la-google_roster.Tpo -c -o libjabber_la-google_roster.lo `test -f 'google/google_roster.c' || echo '$(srcdir)/'`google/google_roster.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libjabber_la-google_roster.Tpo $(DEPDIR)/libjabber_la-google_roster.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='google/google_roster.c' object='libjabber_la-google_roster.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -c -o libjabber_la-google_roster.lo `test -f 'google/google_roster.c' || echo '$(srcdir)/'`google/google_roster.c
+-
+-libjabber_la-google_session.lo: google/google_session.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -MT libjabber_la-google_session.lo -MD -MP -MF $(DEPDIR)/libjabber_la-google_session.Tpo -c -o libjabber_la-google_session.lo `test -f 'google/google_session.c' || echo '$(srcdir)/'`google/google_session.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libjabber_la-google_session.Tpo $(DEPDIR)/libjabber_la-google_session.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='google/google_session.c' object='libjabber_la-google_session.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -c -o libjabber_la-google_session.lo `test -f 'google/google_session.c' || echo '$(srcdir)/'`google/google_session.c
+-
+-libjabber_la-jingleinfo.lo: google/jingleinfo.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -MT libjabber_la-jingleinfo.lo -MD -MP -MF $(DEPDIR)/libjabber_la-jingleinfo.Tpo -c -o libjabber_la-jingleinfo.lo `test -f 'google/jingleinfo.c' || echo '$(srcdir)/'`google/jingleinfo.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libjabber_la-jingleinfo.Tpo $(DEPDIR)/libjabber_la-jingleinfo.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='google/jingleinfo.c' object='libjabber_la-jingleinfo.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -c -o libjabber_la-jingleinfo.lo `test -f 'google/jingleinfo.c' || echo '$(srcdir)/'`google/jingleinfo.c
+-
+-libjabber_la-relay.lo: google/relay.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -MT libjabber_la-relay.lo -MD -MP -MF $(DEPDIR)/libjabber_la-relay.Tpo -c -o libjabber_la-relay.lo `test -f 'google/relay.c' || echo '$(srcdir)/'`google/relay.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libjabber_la-relay.Tpo $(DEPDIR)/libjabber_la-relay.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='google/relay.c' object='libjabber_la-relay.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -c -o libjabber_la-relay.lo `test -f 'google/relay.c' || echo '$(srcdir)/'`google/relay.c
+-
+ libjabber_la-ibb.lo: ibb.c
+ @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -MT libjabber_la-ibb.lo -MD -MP -MF $(DEPDIR)/libjabber_la-ibb.Tpo -c -o libjabber_la-ibb.lo `test -f 'ibb.c' || echo '$(srcdir)/'`ibb.c
+ @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libjabber_la-ibb.Tpo $(DEPDIR)/libjabber_la-ibb.Plo
+diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/message.c pidgin-2.10.7-nonprism/libpurple/protocols/jabber/message.c
+--- pidgin-2.10.7/libpurple/protocols/jabber/message.c	2013-02-11 07:16:52.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/message.c	2013-08-17 00:20:08.115874207 -0300
+@@ -30,7 +30,6 @@
+ #include "buddy.h"
+ #include "chat.h"
+ #include "data.h"
+-#include "google/google.h"
+ #include "message.h"
+ #include "xmlnode.h"
+ #include "pep.h"
+@@ -151,11 +150,6 @@
+ 			jbr->thread_id = g_strdup(jbr->thread_id);
+ 		}
+ 
+-		if (jm->js->googletalk && jm->xhtml == NULL) {
+-			char *tmp = jm->body;
+-			jm->body = jabber_google_format_to_html(jm->body);
+-			g_free(tmp);
+-		}
+ 		serv_got_im(gc, jm->from, jm->xhtml ? jm->xhtml : jm->body, 0, jm->sent);
+ 	}
+ 
+diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/namespaces.h pidgin-2.10.7-nonprism/libpurple/protocols/jabber/namespaces.h
+--- pidgin-2.10.7/libpurple/protocols/jabber/namespaces.h	2013-02-11 07:16:52.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/namespaces.h	2013-08-17 00:11:17.449534779 -0300
+@@ -95,18 +95,4 @@
+ /* XEP-0264 File Transfer Thumbnails (Thumbs) */
+ #define NS_THUMBS "urn:xmpp:thumbs:0"
+ 
+-/* Google extensions */
+-#define NS_GOOGLE_CAMERA "http://www.google.com/xmpp/protocol/camera/v1"
+-#define NS_GOOGLE_VIDEO "http://www.google.com/xmpp/protocol/video/v1"
+-#define NS_GOOGLE_VOICE "http://www.google.com/xmpp/protocol/voice/v1"
+-#define NS_GOOGLE_JINGLE_INFO "google:jingleinfo"
+-
+-#define NS_GOOGLE_MAIL_NOTIFY "google:mail:notify"
+-#define NS_GOOGLE_ROSTER "google:roster"
+-
+-#define NS_GOOGLE_PROTOCOL_SESSION "http://www.google.com/xmpp/protocol/session"
+-#define NS_GOOGLE_SESSION "http://www.google.com/session"
+-#define NS_GOOGLE_SESSION_PHONE "http://www.google.com/session/phone"
+-#define NS_GOOGLE_SESSION_VIDEO "http://www.google.com/session/video"
+-
+ #endif /* PURPLE_JABBER_NAMESPACES_H_ */
+diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/presence.c pidgin-2.10.7-nonprism/libpurple/protocols/jabber/presence.c
+--- pidgin-2.10.7/libpurple/protocols/jabber/presence.c	2013-02-11 07:16:52.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/presence.c	2013-08-17 00:16:58.436696950 -0300
+@@ -34,8 +34,6 @@
+ 
+ #include "buddy.h"
+ #include "chat.h"
+-#include "google/google.h"
+-#include "google/google_presence.h"
+ #include "presence.h"
+ #include "iq.h"
+ #include "jutil.h"
+@@ -208,9 +206,6 @@
+ 	/* changing the buzz state has to trigger a re-broadcasting of the presence for caps */
+ 
+ 	tune = purple_presence_get_status(p, "tune");
+-	if (js->googletalk && !stripped && purple_status_is_active(tune)) {
+-		stripped = jabber_google_presence_outgoing(tune);
+-	}
+ 
+ #define CHANGED(a,b) ((!a && b) || (a && a[0] == '\0' && b && b[0] != '\0') || \
+ 					  (a && !b) || (a && a[0] != '\0' && b && b[0] == '\0') || (a && b && strcmp(a,b)))
+@@ -361,11 +356,6 @@
+ #ifdef USE_VV
+ 	/*
+ 	 * MASSIVE HUGE DISGUSTING HACK
+-	 * This is a huge hack. As far as I can tell, Google Talk's gmail client
+-	 * doesn't bother to check the actual features we advertise; they
+-	 * just assume that if we specify a 'voice-v1' ext (ignoring that
+-	 * these are to be assigned no semantic value), we support receiving voice
+-	 * calls.
+ 	 *
+ 	 * Ditto for 'video-v1'.
+ 	 */
+@@ -883,7 +873,6 @@
+ 
+ 	jbr = jabber_buddy_find_resource(presence->jb, NULL);
+ 	if (jbr) {
+-		jabber_google_presence_incoming(js, buddy_name, jbr);
+ 		purple_prpl_got_user_status(account, buddy_name,
+ 				jabber_buddy_state_get_status_id(jbr->state),
+ 				"priority", jbr->priority,
+diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/roster.c pidgin-2.10.7-nonprism/libpurple/protocols/jabber/roster.c
+--- pidgin-2.10.7/libpurple/protocols/jabber/roster.c	2013-02-11 07:16:52.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/roster.c	2013-08-17 00:09:16.245807467 -0300
+@@ -27,8 +27,6 @@
+ 
+ #include "buddy.h"
+ #include "chat.h"
+-#include "google/google.h"
+-#include "google/google_roster.h"
+ #include "presence.h"
+ #include "roster.h"
+ #include "iq.h"
+@@ -83,11 +81,6 @@
+ 	iq = jabber_iq_new_query(js, JABBER_IQ_GET, "jabber:iq:roster");
+ 	query = xmlnode_get_child(iq->node, "query");
+ 
+-	if (js->server_caps & JABBER_CAP_GOOGLE_ROSTER) {
+-		xmlnode_set_attrib(query, "xmlns:gr", NS_GOOGLE_ROSTER);
+-		xmlnode_set_attrib(query, "gr:ext", "2");
+-	}
+-
+ 	jabber_iq_set_callback(iq, roster_request_cb, NULL);
+ 	jabber_iq_send(iq);
+ }
+@@ -244,10 +237,6 @@
+ 		} else {
+ 			GSList *groups = NULL;
+ 
+-			if (js->server_caps & JABBER_CAP_GOOGLE_ROSTER)
+-				if (!jabber_google_roster_incoming(js, item))
+-					continue;
+-
+ 			for(group = xmlnode_get_child(item, "group"); group; group = xmlnode_get_next_twin(group)) {
+ 				char *group_name = xmlnode_get_data(group);
+ 
+@@ -349,11 +338,6 @@
+ 
+ 	g_slist_free(groups);
+ 
+-	if (js->server_caps & JABBER_CAP_GOOGLE_ROSTER) {
+-		jabber_google_roster_outgoing(js, query, item);
+-		xmlnode_set_attrib(query, "xmlns:gr", NS_GOOGLE_ROSTER);
+-		xmlnode_set_attrib(query, "gr:ext", "2");
+-	}
+ 	jabber_iq_send(iq);
+ }
+ 
+diff -Nur pidgin-2.10.7/libpurple/protocols/Makefile.am pidgin-2.10.7-nonprism/libpurple/protocols/Makefile.am
+--- pidgin-2.10.7/libpurple/protocols/Makefile.am	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/Makefile.am	2013-08-16 22:37:55.011207011 -0300
+@@ -1,5 +1,5 @@
+ EXTRA_DIST = Makefile.mingw
+ 
+-DIST_SUBDIRS = bonjour gg irc jabber msn myspace mxit novell null oscar sametime silc silc10 simple yahoo zephyr
++DIST_SUBDIRS = bonjour irc jabber null silc silc10 simple zephyr
+ 
+ SUBDIRS = $(DYNAMIC_PRPLS) $(STATIC_PRPLS)
+diff -Nur pidgin-2.10.7/libpurple/protocols/Makefile.in pidgin-2.10.7-nonprism/libpurple/protocols/Makefile.in
+--- pidgin-2.10.7/libpurple/protocols/Makefile.in	2013-02-11 07:17:19.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/Makefile.in	2013-08-16 23:50:36.651423353 -0300
+@@ -160,8 +160,6 @@
+ FARSTREAM_CFLAGS = @FARSTREAM_CFLAGS@
+ FARSTREAM_LIBS = @FARSTREAM_LIBS@
+ FGREP = @FGREP@
+-GADU_CFLAGS = @GADU_CFLAGS@
+-GADU_LIBS = @GADU_LIBS@
+ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+@@ -223,8 +221,6 @@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+ MANIFEST_TOOL = @MANIFEST_TOOL@
+-MEANWHILE_CFLAGS = @MEANWHILE_CFLAGS@
+-MEANWHILE_LIBS = @MEANWHILE_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO_CFLAGS = @MONO_CFLAGS@
+@@ -365,7 +361,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ EXTRA_DIST = Makefile.mingw
+-DIST_SUBDIRS = bonjour gg irc jabber msn myspace mxit novell null oscar sametime silc silc10 simple yahoo zephyr
++DIST_SUBDIRS = bonjour irc jabber null silc silc10 simple zephyr
+ SUBDIRS = $(DYNAMIC_PRPLS) $(STATIC_PRPLS)
+ all: all-recursive
+ 
+diff -Nur pidgin-2.10.7/libpurple/prpl.h pidgin-2.10.7-nonprism/libpurple/prpl.h
+--- pidgin-2.10.7/libpurple/prpl.h	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/prpl.h	2013-08-16 22:29:46.145754932 -0300
+@@ -161,15 +161,11 @@
+ 
+ 	/**
+ 	 * Notify on new mail.
+-	 *
+-	 * MSN and Yahoo notify you when you have new mail.
+ 	 */
+ 	OPT_PROTO_MAIL_CHECK = 0x00000020,
+ 
+ 	/**
+ 	 * Images in IMs.
+-	 *
+-	 * Oscar lets you send images in direct IMs.
+ 	 */
+ 	OPT_PROTO_IM_IMAGE = 0x00000040,
+ 
+@@ -184,16 +180,13 @@
+ 	/**
+ 	 * Allows font size to be specified in sane point size
+ 	 *
+-	 * Probably just XMPP and Y!M
++	 * Probably just XMPP
+ 	 */
+ 	OPT_PROTO_USE_POINTSIZE = 0x00000100,
+ 
+ 	/**
+ 	 * Set the Register button active even when the username has not
+ 	 * been specified.
+-	 *
+-	 * Gadu-Gadu doesn't need a username to register new account (because
+-	 * usernames are assigned by the server).
+ 	 */
+ 	OPT_PROTO_REGISTER_NOSCREENNAME = 0x00000200,
+ 
+@@ -467,9 +460,7 @@
+ 	void (*convo_closed)(PurpleConnection *, const char *who);
+ 
+ 	/**
+-	 *  Convert the username @a who to its canonical form.  (For example,
+-	 *  AIM treats "fOo BaR" and "foobar" as the same user; this function
+-	 *  should return the same normalized string for both of those.)
++	 *  Convert the username @a who to its canonical form.
+ 	 */
+ 	const char *(*normalize)(const PurpleAccount *, const char *who);
+ 
+@@ -923,7 +914,7 @@
+  * @param who Whose attention to request.
+  * @param type_code An index into the prpl's attention_types list determining the type
+  *        of the attention request command to send. 0 if prpl only defines one
+- *        (for example, Yahoo and MSN), but some protocols define more (MySpaceIM).
++ *        , but some protocols define more.
+  *
+  * Note that you can't send arbitrary PurpleAttentionType's, because there is
+  * only a fixed set of attention commands.
+diff -Nur pidgin-2.10.7/libpurple/purple-url-handler pidgin-2.10.7-nonprism/libpurple/purple-url-handler
+--- pidgin-2.10.7/libpurple/purple-url-handler	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/purple-url-handler	2013-08-16 21:16:42.951304560 -0300
+@@ -117,70 +117,6 @@
+ def addbuddy(account, screenname, group="", alias=""):
+     cpurple.PurpleBlistRequestAddBuddy(account, screenname, group, alias)
+ 
+-
+-def aim(uri):
+-    protocol = "prpl-aim"
+-    match = re.match(r"^aim:([^?]*)(\?(.*))", uri)
+-    if not match:
+-        print "Invalid aim URI: %s" % uri
+-        return
+-
+-    command = urllib.unquote_plus(match.group(1))
+-    paramstring = match.group(3)
+-    params = {}
+-    if paramstring:
+-        for param in paramstring.split("&"):
+-            key, value = extendlist(param.split("=", 1), 2, "")
+-            params[key] = urllib.unquote_plus(value)
+-    accountname = params.get("account", "")
+-    screenname = params.get("screenname", "")
+-
+-    account = findaccount(protocol, accountname)
+-
+-    if command.lower() == "goim":
+-        goim(account, screenname, params.get("message"))
+-    elif command.lower() == "gochat":
+-        gochat(account, params)
+-    elif command.lower() == "addbuddy":
+-        addbuddy(account, screenname, params.get("group", ""))
+-
+-def gg(uri):
+-    protocol = "prpl-gg"
+-    match = re.match(r"^gg:(.*)", uri)
+-    if not match:
+-        print "Invalid gg URI: %s" % uri
+-        return
+-
+-    screenname = urllib.unquote_plus(match.group(1))
+-    account = findaccount(protocol)
+-    goim(account, screenname)
+-
+-def icq(uri):
+-    protocol = "prpl-icq"
+-    match = re.match(r"^icq:([^?]*)(\?(.*))", uri)
+-    if not match:
+-        print "Invalid icq URI: %s" % uri
+-        return
+-
+-    command = urllib.unquote_plus(match.group(1))
+-    paramstring = match.group(3)
+-    params = {}
+-    if paramstring:
+-        for param in paramstring.split("&"):
+-            key, value = extendlist(param.split("=", 1), 2, "")
+-            params[key] = urllib.unquote_plus(value)
+-    accountname = params.get("account", "")
+-    screenname = params.get("screenname", "")
+-
+-    account = findaccount(protocol, accountname)
+-
+-    if command.lower() == "goim":
+-        goim(account, screenname, params.get("message"))
+-    elif command.lower() == "gochat":
+-        gochat(account, params)
+-    elif command.lower() == "addbuddy":
+-        addbuddy(account, screenname, params.get("group", ""))
+-
+ def irc(uri):
+     protocol = "prpl-irc"
+     match = re.match(r"^irc:(//([^/]*))?/?([^?]*)(\?(.*))?", uri)
+@@ -221,34 +157,6 @@
+                 channel = "#" + channel
+             gochat(account, {"server": server, "channel": channel, "password": params.get("key", "")}, params.get("msg"))
+ 
+-def msnim(uri):
+-    protocol = "prpl-msn"
+-    match = re.match(r"^msnim:([^?]*)(\?(.*))", uri)
+-    if not match:
+-        print "Invalid msnim URI: %s" % uri
+-        return
+-
+-    command = urllib.unquote_plus(match.group(1))
+-    paramstring = match.group(3)
+-    params = {}
+-    if paramstring:
+-        for param in paramstring.split("&"):
+-            key, value = extendlist(param.split("=", 1), 2, "")
+-            params[key] = urllib.unquote_plus(value)
+-    screenname = params.get("contact", "")
+-
+-    account = findaccount(protocol)
+-
+-    if command.lower() == "chat":
+-        goim(account, screenname)
+-    elif command.lower() == "add":
+-        addbuddy(account, screenname)
+-
+-def myim(uri):
+-        protocol = "prpl-myspace"
+-        print "TODO: send uri: ", uri
+-        assert False, "Not implemented"
+-
+ def sip(uri):
+     protocol = "prpl-simple"
+     match = re.match(r"^sip:(.*)", uri)
+@@ -300,57 +208,6 @@
+     else:
+         goim(account, screenname)
+ 
+-def gtalk(uri):
+-    protocol = "prpl-jabber"
+-    match = re.match(r"^gtalk:([^?]*)(\?(.*))", uri)
+-    if not match:
+-        print "Invalid gtalk URI: %s" % uri
+-        return
+-
+-    command = urllib.unquote_plus(match.group(1))
+-    paramstring = match.group(3)
+-    params = {}
+-    if paramstring:
+-        for param in paramstring.split("&"):
+-            key, value = extendlist(param.split("=", 1), 2, "")
+-            params[key] = urllib.unquote_plus(value)
+-    accountname = params.get("from_jid", "")
+-    jid = params.get("jid", "")
+-
+-    account = findaccount(protocol, accountname)
+-
+-    if command.lower() == "chat":
+-        goim(account, jid)
+-    elif command.lower() == "call":
+-        # XXX V&V prompt to establish call
+-        goim(account, jid)
+-
+-def ymsgr(uri):
+-    protocol = "prpl-yahoo"
+-    match = re.match(r"^ymsgr:([^?]*)(\?([^&]*)(&(.*))?)", uri)
+-    if not match:
+-        print "Invalid ymsgr URI: %s" % uri
+-        return
+-
+-    command = urllib.unquote_plus(match.group(1))
+-    screenname = urllib.unquote_plus(match.group(3))
+-    paramstring = match.group(5)
+-    params = {}
+-    if paramstring:
+-        for param in paramstring.split("&"):
+-            key, value = extendlist(param.split("=", 1), 2, "")
+-            params[key] = urllib.unquote_plus(value)
+-
+-    account = findaccount(protocol)
+-
+-    if command.lower() == "sendim":
+-        goim(account, screenname, params.get("m"))
+-    elif command.lower() == "chat":
+-        gochat(account, {"room": screenname})
+-    elif command.lower() == "addfriend":
+-        addbuddy(account, screenname)
+-
+-
+ def main(argv=sys.argv):
+     if len(argv) != 2 or argv[1] == "--help" or argv[1] == "-h":
+         print "Usage: %s URI" % argv[0]
+diff -Nur pidgin-2.10.7/libpurple/savedstatuses.c pidgin-2.10.7-nonprism/libpurple/savedstatuses.c
+--- pidgin-2.10.7/libpurple/savedstatuses.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/savedstatuses.c	2013-08-16 22:52:44.582754543 -0300
+@@ -387,7 +387,6 @@
+ 		const char *protocol;
+ 		acct_name = xmlnode_get_data(node);
+ 		protocol = xmlnode_get_attrib(node, "protocol");
+-		protocol = _purple_oscar_convert(acct_name, protocol); /* XXX: Remove */
+ 		if ((acct_name != NULL) && (protocol != NULL))
+ 			ret->account = purple_accounts_find(acct_name, protocol);
+ 		g_free(acct_name);
+diff -Nur pidgin-2.10.7/libpurple/server.h pidgin-2.10.7-nonprism/libpurple/server.h
+--- pidgin-2.10.7/libpurple/server.h	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/server.h	2013-08-16 23:30:04.149920853 -0300
+@@ -69,7 +69,7 @@
+  * @param who Whose attention to request.
+  * @param type_code An index into the prpl's attention_types list determining the type
+  * 	of the attention request command to send. 0 if prpl only defines one
+- * 	(for example, Yahoo and MSN), but some protocols define more (MySpaceIM).
++ * 	, but some protocols define more.
+  *
+  * Note that you can't send arbitrary PurpleAttentionType's, because there is
+  * only a fixed set of attention commands.
+diff -Nur pidgin-2.10.7/libpurple/status.h pidgin-2.10.7-nonprism/libpurple/status.h
+--- pidgin-2.10.7/libpurple/status.h	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/status.h	2013-08-16 22:52:22.542054119 -0300
+@@ -43,8 +43,7 @@
+  * one of your AIM buddies has set himself as "away."  You have a
+  * PurpleBuddy node for this person in your buddy list.  Purple wants
+  * to mark this buddy as "away," so it creates a new PurpleStatus.
+- * The PurpleStatus has its PurpleStatusType set to the "away" state
+- * for the oscar PRPL.  The PurpleStatus also contains the buddy's
++ * The PurpleStatus also contains the buddy's
+  * away message.  PurpleStatuses are sometimes saved, depending on
+  * the context.  The current PurpleStatuses associated with each of
+  * your accounts are saved so that the next time you start Purple,
+diff -Nur pidgin-2.10.7/libpurple/tests/check_libpurple.c pidgin-2.10.7-nonprism/libpurple/tests/check_libpurple.c
+--- pidgin-2.10.7/libpurple/tests/check_libpurple.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/tests/check_libpurple.c	2013-08-16 22:55:33.731462302 -0300
+@@ -88,8 +88,6 @@
+ 	srunner_add_suite(sr, jabber_digest_md5_suite());
+ 	srunner_add_suite(sr, jabber_jutil_suite());
+ 	srunner_add_suite(sr, jabber_scram_suite());
+-	srunner_add_suite(sr, oscar_util_suite());
+-	srunner_add_suite(sr, yahoo_util_suite());
+ 	srunner_add_suite(sr, util_suite());
+ 	srunner_add_suite(sr, xmlnode_suite());
+ 
+diff -Nur pidgin-2.10.7/libpurple/tests/Makefile.am pidgin-2.10.7-nonprism/libpurple/tests/Makefile.am
+--- pidgin-2.10.7/libpurple/tests/Makefile.am	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/tests/Makefile.am	2013-08-16 22:56:03.189064778 -0300
+@@ -14,8 +14,6 @@
+ 		test_jabber_digest_md5.c \
+ 		test_jabber_jutil.c \
+ 		test_jabber_scram.c \
+-		test_oscar_util.c \
+-		test_yahoo_util.c \
+ 		test_util.c \
+ 		test_xmlnode.c \
+ 		$(top_builddir)/libpurple/util.h
+@@ -31,8 +29,6 @@
+ 
+ check_libpurple_LDADD=\
+ 		$(top_builddir)/libpurple/protocols/jabber/libjabber.la \
+-		$(top_builddir)/libpurple/protocols/oscar/liboscar.la \
+-		$(top_builddir)/libpurple/protocols/yahoo/libymsg.la \
+ 		$(top_builddir)/libpurple/libpurple.la \
+         @CHECK_LIBS@ \
+ 		$(GLIB_LIBS)
+diff -Nur pidgin-2.10.7/libpurple/tests/Makefile.in pidgin-2.10.7-nonprism/libpurple/tests/Makefile.in
+--- pidgin-2.10.7/libpurple/tests/Makefile.in	2013-02-11 07:17:23.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/tests/Makefile.in	2013-08-16 23:53:20.713146759 -0300
+@@ -65,8 +65,8 @@
+ CONFIG_CLEAN_VPATH_FILES =
+ am__check_libpurple_SOURCES_DIST = check_libpurple.c tests.h \
+ 	test_cipher.c test_jabber_caps.c test_jabber_digest_md5.c \
+-	test_jabber_jutil.c test_jabber_scram.c test_oscar_util.c \
+-	test_yahoo_util.c test_util.c test_xmlnode.c \
++	test_jabber_jutil.c test_jabber_scram.c \
++	 test_util.c test_xmlnode.c \
+ 	$(top_builddir)/libpurple/util.h
+ @HAVE_CHECK_TRUE@am_check_libpurple_OBJECTS =  \
+ @HAVE_CHECK_TRUE@	check_libpurple-check_libpurple.$(OBJEXT) \
+@@ -75,15 +75,11 @@
+ @HAVE_CHECK_TRUE@	check_libpurple-test_jabber_digest_md5.$(OBJEXT) \
+ @HAVE_CHECK_TRUE@	check_libpurple-test_jabber_jutil.$(OBJEXT) \
+ @HAVE_CHECK_TRUE@	check_libpurple-test_jabber_scram.$(OBJEXT) \
+-@HAVE_CHECK_TRUE@	check_libpurple-test_oscar_util.$(OBJEXT) \
+-@HAVE_CHECK_TRUE@	check_libpurple-test_yahoo_util.$(OBJEXT) \
+ @HAVE_CHECK_TRUE@	check_libpurple-test_util.$(OBJEXT) \
+ @HAVE_CHECK_TRUE@	check_libpurple-test_xmlnode.$(OBJEXT)
+ check_libpurple_OBJECTS = $(am_check_libpurple_OBJECTS)
+ am__DEPENDENCIES_1 =
+ @HAVE_CHECK_TRUE@check_libpurple_DEPENDENCIES = $(top_builddir)/libpurple/protocols/jabber/libjabber.la \
+-@HAVE_CHECK_TRUE@	$(top_builddir)/libpurple/protocols/oscar/liboscar.la \
+-@HAVE_CHECK_TRUE@	$(top_builddir)/libpurple/protocols/yahoo/libymsg.la \
+ @HAVE_CHECK_TRUE@	$(top_builddir)/libpurple/libpurple.la \
+ @HAVE_CHECK_TRUE@	$(am__DEPENDENCIES_1)
+ AM_V_lt = $(am__v_lt_@AM_V@)
+@@ -177,8 +173,6 @@
+ FARSTREAM_CFLAGS = @FARSTREAM_CFLAGS@
+ FARSTREAM_LIBS = @FARSTREAM_LIBS@
+ FGREP = @FGREP@
+-GADU_CFLAGS = @GADU_CFLAGS@
+-GADU_LIBS = @GADU_LIBS@
+ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+@@ -240,8 +234,6 @@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+ MANIFEST_TOOL = @MANIFEST_TOOL@
+-MEANWHILE_CFLAGS = @MEANWHILE_CFLAGS@
+-MEANWHILE_LIBS = @MEANWHILE_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO_CFLAGS = @MONO_CFLAGS@
+@@ -389,8 +381,6 @@
+ @HAVE_CHECK_TRUE@		test_jabber_digest_md5.c \
+ @HAVE_CHECK_TRUE@		test_jabber_jutil.c \
+ @HAVE_CHECK_TRUE@		test_jabber_scram.c \
+-@HAVE_CHECK_TRUE@		test_oscar_util.c \
+-@HAVE_CHECK_TRUE@		test_yahoo_util.c \
+ @HAVE_CHECK_TRUE@		test_util.c \
+ @HAVE_CHECK_TRUE@		test_xmlnode.c \
+ @HAVE_CHECK_TRUE@		$(top_builddir)/libpurple/util.h
+@@ -406,8 +396,6 @@
+ 
+ @HAVE_CHECK_TRUE@check_libpurple_LDADD = \
+ @HAVE_CHECK_TRUE@		$(top_builddir)/libpurple/protocols/jabber/libjabber.la \
+-@HAVE_CHECK_TRUE@		$(top_builddir)/libpurple/protocols/oscar/liboscar.la \
+-@HAVE_CHECK_TRUE@		$(top_builddir)/libpurple/protocols/yahoo/libymsg.la \
+ @HAVE_CHECK_TRUE@		$(top_builddir)/libpurple/libpurple.la \
+ @HAVE_CHECK_TRUE@        @CHECK_LIBS@ \
+ @HAVE_CHECK_TRUE@		$(GLIB_LIBS)
+@@ -471,10 +459,8 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_jabber_digest_md5.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_jabber_jutil.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_jabber_scram.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_oscar_util.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_util.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_xmlnode.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_yahoo_util.Po@am__quote@
+ 
+ .c.o:
+ @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@@ -581,34 +567,6 @@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -c -o check_libpurple-test_jabber_scram.obj `if test -f 'test_jabber_scram.c'; then $(CYGPATH_W) 'test_jabber_scram.c'; else $(CYGPATH_W) '$(srcdir)/test_jabber_scram.c'; fi`
+ 
+-check_libpurple-test_oscar_util.o: test_oscar_util.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -MT check_libpurple-test_oscar_util.o -MD -MP -MF $(DEPDIR)/check_libpurple-test_oscar_util.Tpo -c -o check_libpurple-test_oscar_util.o `test -f 'test_oscar_util.c' || echo '$(srcdir)/'`test_oscar_util.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/check_libpurple-test_oscar_util.Tpo $(DEPDIR)/check_libpurple-test_oscar_util.Po
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test_oscar_util.c' object='check_libpurple-test_oscar_util.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -c -o check_libpurple-test_oscar_util.o `test -f 'test_oscar_util.c' || echo '$(srcdir)/'`test_oscar_util.c
+-
+-check_libpurple-test_oscar_util.obj: test_oscar_util.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -MT check_libpurple-test_oscar_util.obj -MD -MP -MF $(DEPDIR)/check_libpurple-test_oscar_util.Tpo -c -o check_libpurple-test_oscar_util.obj `if test -f 'test_oscar_util.c'; then $(CYGPATH_W) 'test_oscar_util.c'; else $(CYGPATH_W) '$(srcdir)/test_oscar_util.c'; fi`
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/check_libpurple-test_oscar_util.Tpo $(DEPDIR)/check_libpurple-test_oscar_util.Po
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test_oscar_util.c' object='check_libpurple-test_oscar_util.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -c -o check_libpurple-test_oscar_util.obj `if test -f 'test_oscar_util.c'; then $(CYGPATH_W) 'test_oscar_util.c'; else $(CYGPATH_W) '$(srcdir)/test_oscar_util.c'; fi`
+-
+-check_libpurple-test_yahoo_util.o: test_yahoo_util.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -MT check_libpurple-test_yahoo_util.o -MD -MP -MF $(DEPDIR)/check_libpurple-test_yahoo_util.Tpo -c -o check_libpurple-test_yahoo_util.o `test -f 'test_yahoo_util.c' || echo '$(srcdir)/'`test_yahoo_util.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/check_libpurple-test_yahoo_util.Tpo $(DEPDIR)/check_libpurple-test_yahoo_util.Po
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test_yahoo_util.c' object='check_libpurple-test_yahoo_util.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -c -o check_libpurple-test_yahoo_util.o `test -f 'test_yahoo_util.c' || echo '$(srcdir)/'`test_yahoo_util.c
+-
+-check_libpurple-test_yahoo_util.obj: test_yahoo_util.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -MT check_libpurple-test_yahoo_util.obj -MD -MP -MF $(DEPDIR)/check_libpurple-test_yahoo_util.Tpo -c -o check_libpurple-test_yahoo_util.obj `if test -f 'test_yahoo_util.c'; then $(CYGPATH_W) 'test_yahoo_util.c'; else $(CYGPATH_W) '$(srcdir)/test_yahoo_util.c'; fi`
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/check_libpurple-test_yahoo_util.Tpo $(DEPDIR)/check_libpurple-test_yahoo_util.Po
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test_yahoo_util.c' object='check_libpurple-test_yahoo_util.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -c -o check_libpurple-test_yahoo_util.obj `if test -f 'test_yahoo_util.c'; then $(CYGPATH_W) 'test_yahoo_util.c'; else $(CYGPATH_W) '$(srcdir)/test_yahoo_util.c'; fi`
+-
+ check_libpurple-test_util.o: test_util.c
+ @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -MT check_libpurple-test_util.o -MD -MP -MF $(DEPDIR)/check_libpurple-test_util.Tpo -c -o check_libpurple-test_util.o `test -f 'test_util.c' || echo '$(srcdir)/'`test_util.c
+ @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/check_libpurple-test_util.Tpo $(DEPDIR)/check_libpurple-test_util.Po
+diff -Nur pidgin-2.10.7/libpurple/tests/test_jabber_caps.c pidgin-2.10.7-nonprism/libpurple/tests/test_jabber_caps.c
+--- pidgin-2.10.7/libpurple/tests/test_jabber_caps.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/tests/test_jabber_caps.c	2013-08-17 00:25:08.235128437 -0300
+@@ -33,7 +33,7 @@
+ START_TEST(test_calculate_caps)
+ {
+ 	assert_caps_calculate_match("sha1", "GNjxthSckUNvAIoCCJFttjl6VL8=",
+-	"<query xmlns='http://jabber.org/protocol/disco#info' node='http://tkabber.jabber.ru/#GNjxthSckUNvAIoCCJFttjl6VL8='><identity category='client' type='pc' name='Tkabber'/><x xmlns='jabber:x:data' type='result'><field var='FORM_TYPE' type='hidden'><value>urn:xmpp:dataforms:softwareinfo</value></field><field var='software'><value>Tkabber</value></field><field var='software_version'><value> ( 8.5.5 )</value></field><field var='os'><value>ATmega640-16AU</value></field><field var='os_version'><value/></field></x><feature var='games:board'/><feature var='google:mail:notify'/><feature var='http://jabber.org/protocol/activity'/><feature var='http://jabber.org/protocol/bytestreams'/><feature var='http://jabber.org/protocol/chatstates'/><feature var='http://jabber.org/protocol/commands'/><feature var='http://jabber.org/protocol/commands'/><feature var='http://jabber.org/protocol/disco#info'/><feature var='http://jabber.org/protocol/disco#items'/><feature var='http://jabber.org/protocol/feature-neg'/><feature var='http://jabber.org/protocol/geoloc'/><feature var='http://jabber.org/protocol/ibb'/><feature var='http://jabber.org/protocol/iqibb'/><feature var='http://jabber.org/protocol/mood'/><feature var='http://jabber.org/protocol/muc'/><feature var='http://jabber.org/protocol/mute#ancestor'/><feature var='http://jabber.org/protocol/mute#editor'/><feature var='http://jabber.org/protocol/rosterx'/><feature var='http://jabber.org/protocol/si'/><feature var='http://jabber.org/protocol/si/profile/file-transfer'/><feature var='http://jabber.org/protocol/tune'/><feature var='jabber:iq:avatar'/><feature var='jabber:iq:browse'/><feature var='jabber:iq:dtcp'/><feature var='jabber:iq:filexfer'/><feature var='jabber:iq:ibb'/><feature var='jabber:iq:inband'/><feature var='jabber:iq:jidlink'/><feature var='jabber:iq:last'/><feature var='jabber:iq:oob'/><feature var='jabber:iq:privacy'/><feature var='jabber:iq:time'/><feature var='jabber:iq:version'/><feature var='jabber:x:data'/><feature var='jabber:x:event'/><feature var='jabber:x:oob'/><feature var='urn:xmpp:ping'/><feature var='urn:xmpp:receipts'/><feature var='urn:xmpp:time'/></query>");
++	"<query xmlns='http://jabber.org/protocol/disco#info' node='http://tkabber.jabber.ru/#GNjxthSckUNvAIoCCJFttjl6VL8='><identity category='client' type='pc' name='Tkabber'/><x xmlns='jabber:x:data' type='result'><field var='FORM_TYPE' type='hidden'><value>urn:xmpp:dataforms:softwareinfo</value></field><field var='software'><value>Tkabber</value></field><field var='software_version'><value> ( 8.5.5 )</value></field><field var='os'><value>ATmega640-16AU</value></field><field var='os_version'><value/></field></x><feature var='games:board'/><feature var='http://jabber.org/protocol/activity'/><feature var='http://jabber.org/protocol/bytestreams'/><feature var='http://jabber.org/protocol/chatstates'/><feature var='http://jabber.org/protocol/commands'/><feature var='http://jabber.org/protocol/commands'/><feature var='http://jabber.org/protocol/disco#info'/><feature var='http://jabber.org/protocol/disco#items'/><feature var='http://jabber.org/protocol/feature-neg'/><feature var='http://jabber.org/protocol/geoloc'/><feature var='http://jabber.org/protocol/ibb'/><feature var='http://jabber.org/protocol/iqibb'/><feature var='http://jabber.org/protocol/mood'/><feature var='http://jabber.org/protocol/muc'/><feature var='http://jabber.org/protocol/mute#ancestor'/><feature var='http://jabber.org/protocol/mute#editor'/><feature var='http://jabber.org/protocol/rosterx'/><feature var='http://jabber.org/protocol/si'/><feature var='http://jabber.org/protocol/si/profile/file-transfer'/><feature var='http://jabber.org/protocol/tune'/><feature var='jabber:iq:avatar'/><feature var='jabber:iq:browse'/><feature var='jabber:iq:dtcp'/><feature var='jabber:iq:filexfer'/><feature var='jabber:iq:ibb'/><feature var='jabber:iq:inband'/><feature var='jabber:iq:jidlink'/><feature var='jabber:iq:last'/><feature var='jabber:iq:oob'/><feature var='jabber:iq:privacy'/><feature var='jabber:iq:time'/><feature var='jabber:iq:version'/><feature var='jabber:x:data'/><feature var='jabber:x:event'/><feature var='jabber:x:oob'/><feature var='urn:xmpp:ping'/><feature var='urn:xmpp:receipts'/><feature var='urn:xmpp:time'/></query>");
+ }
+ END_TEST
+ 
+diff -Nur pidgin-2.10.7/libpurple/tests/test_jabber_jutil.c pidgin-2.10.7-nonprism/libpurple/tests/test_jabber_jutil.c
+--- pidgin-2.10.7/libpurple/tests/test_jabber_jutil.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/tests/test_jabber_jutil.c	2013-08-27 22:53:21.524229291 -0300
+@@ -99,19 +99,19 @@
+ 
+ START_TEST(test_jabber_id_new)
+ {
+-	assert_valid_jid("gmail.com");
+-	assert_valid_jid("gmail.com/Test");
+-	assert_valid_jid("gmail.com/Test@");
+-	assert_valid_jid("gmail.com/@");
+-	assert_valid_jid("gmail.com/Test@alkjaweflkj");
+-	assert_valid_jid("mark.doliner@gmail.com");
+-	assert_valid_jid("mark.doliner@gmail.com/Test12345");
+-	assert_valid_jid("mark.doliner@gmail.com/Test@12345");
+-	assert_valid_jid("mark.doliner@gmail.com/Te/st@12@//345");
++	assert_valid_jid("mail.com");
++	assert_valid_jid("mail.com/Test");
++	assert_valid_jid("mail.com/Test@");
++	assert_valid_jid("mail.com/@");
++	assert_valid_jid("mail.com/Test@alkjaweflkj");
++	assert_valid_jid("mark.doliner@mail.com");
++	assert_valid_jid("mark.doliner@mail.com/Test12345");
++	assert_valid_jid("mark.doliner@mail.com/Test@12345");
++	assert_valid_jid("mark.doliner@mail.com/Te/st@12@//345");
+ 	assert_valid_jid("わいど@conference.jabber.org");
+ 	assert_valid_jid("まりるーむ@conference.jabber.org");
+-	assert_valid_jid("mark.doliner@gmail.com/まりるーむ");
+-	assert_valid_jid("mark.doliner@gmail/stuff.org");
++	assert_valid_jid("mark.doliner@mail.com/まりるーむ");
++	assert_valid_jid("mark.doliner@mail/stuff.org");
+ 	assert_valid_jid("stuart@nödåtXäYZ.se");
+ 	assert_valid_jid("stuart@nödåtXäYZ.se/まりるーむ");
+ 	assert_valid_jid("mark.doliner@わいど.org");
+@@ -123,17 +123,17 @@
+ 	assert_valid_jid("pa=ul@10.0.42.230");
+ 	assert_valid_jid("pa,ul@10.0.42.230");
+ 
+-	assert_invalid_jid("@gmail.com");
+-	assert_invalid_jid("@@gmail.com");
+-	assert_invalid_jid("mark.doliner@@gmail.com/Test12345");
+-	assert_invalid_jid("mark@doliner@gmail.com/Test12345");
+-	assert_invalid_jid("@gmail.com/Test@12345");
++	assert_invalid_jid("@mail.com");
++	assert_invalid_jid("@@mail.com");
++	assert_invalid_jid("mark.doliner@@mail.com/Test12345");
++	assert_invalid_jid("mark@doliner@mail.com/Test12345");
++	assert_invalid_jid("@mail.com/Test@12345");
+ 	assert_invalid_jid("/Test@12345");
+ 	assert_invalid_jid("mark.doliner@");
+ 	assert_invalid_jid("mark.doliner/");
+-	assert_invalid_jid("mark.doliner@gmail_stuff.org");
+-	assert_invalid_jid("mark.doliner@gmail[stuff.org");
+-	assert_invalid_jid("mark.doliner@gmail\\stuff.org");
++	assert_invalid_jid("mark.doliner@mail_stuff.org");
++	assert_invalid_jid("mark.doliner@mail[stuff.org");
++	assert_invalid_jid("mark.doliner@mail\\stuff.org");
+ 	assert_invalid_jid("paul@[::1]124");
+ 	assert_invalid_jid("paul@2[::1]124/as");
+ 	assert_invalid_jid("paul@まつ.おおかみ/\x01");
+diff -Nur pidgin-2.10.7/libpurple/tests/tests.h pidgin-2.10.7-nonprism/libpurple/tests/tests.h
+--- pidgin-2.10.7/libpurple/tests/tests.h	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/tests/tests.h	2013-08-16 22:56:18.999567027 -0300
+@@ -13,8 +13,6 @@
+ Suite * jabber_digest_md5_suite(void);
+ Suite * jabber_jutil_suite(void);
+ Suite * jabber_scram_suite(void);
+-Suite * oscar_util_suite(void);
+-Suite * yahoo_util_suite(void);
+ Suite * util_suite(void);
+ Suite * xmlnode_suite(void);
+ 
+diff -Nur pidgin-2.10.7/libpurple/util.c pidgin-2.10.7-nonprism/libpurple/util.c
+--- pidgin-2.10.7/libpurple/util.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/util.c	2013-08-16 23:29:38.062434329 -0300
+@@ -3451,8 +3451,7 @@
+  *       is set to TRUE if this URL is https, otherwise it is set to
+  *       FALSE.  But that change will break the API.
+  *
+- *       This is important for Yahoo! web messenger login.  They now
+- *       force https login, and if you access the web messenger login
++ *       They now force https login, and if you access the web messenger login
+  *       page via http then it redirects you to the https version, but
+  *       purple_util_fetch_url() ignores the "https" and attempts to
+  *       fetch the URL via http again, which gets redirected again.
+@@ -4943,18 +4942,6 @@
+ 	return buf;
+ }
+ 
+-const char *_purple_oscar_convert(const char *act, const char *protocol)
+-{
+-	if (act && purple_strequal(protocol, "prpl-oscar")) {
+-		int i;
+-		for (i = 0; act[i] != '\0'; i++)
+-			if (!isdigit(act[i]))
+-				return "prpl-aim";
+-		return "prpl-icq";
+-	}
+-	return protocol;
+-}
+-
+ void purple_restore_default_signal_handlers(void)
+ {
+ #ifndef _WIN32
+diff -Nur pidgin-2.10.7/libpurple/util.h pidgin-2.10.7-nonprism/libpurple/util.h
+--- pidgin-2.10.7/libpurple/util.h	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/util.h	2013-08-16 23:31:12.535403448 -0300
+@@ -456,8 +456,7 @@
+ /**
+  * Extracts a field of data from HTML.
+  *
+- * This is a scary function. See protocols/msn/msn.c and
+- * protocols/yahoo/yahoo_profile.c for example usage.
++ * This is a scary function.
+  *
+  * @param str            The string to parse.
+  * @param len            The size of str.
+@@ -1450,16 +1449,6 @@
+ const char *purple_escape_filename(const char *str);
+ 
+ /**
+- * This is added temporarily to assist the split of oscar into aim and icq.
+- * This should not be used by plugins.
+- *
+- * @deprecated This function should not be used in new code and should be
+- *             removed in 3.0.0.  The aim/icq prpl split happened a long
+- *             time ago, and we don't need to keep migrating old data.
+- */
+-const char *_purple_oscar_convert(const char *act, const char *protocol);
+-
+-/**
+  * Restore default signal handlers for signals which might reasonably have
+  * handlers. This should be called by a fork()'d child process, since child processes
+  * inherit the handlers of the parent.
+diff -Nur pidgin-2.10.7/pidgin/gtkaccount.c pidgin-2.10.7-nonprism/pidgin/gtkaccount.c
+--- pidgin-2.10.7/pidgin/gtkaccount.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtkaccount.c	2013-08-27 22:45:35.495576079 -0300
+@@ -563,16 +563,11 @@
+ 		if (value == NULL)
+ 			value = purple_account_user_split_get_default_value(split);
+ 
+-		/* Google Talk default domain hackery! */
+ 		menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(dialog->protocol_menu));
+ 		item = gtk_menu_get_active(GTK_MENU(menu));
+-		if (value == NULL && g_object_get_data(G_OBJECT(item), "fakegoogle") &&
++		if (value == NULL && g_object_get_data(G_OBJECT(item), "") &&
+ 			!strcmp(purple_account_user_split_get_text(split), _("Domain")))
+-			value = "gmail.com";
+-
+-		if (value == NULL && g_object_get_data(G_OBJECT(item), "fakefacebook") &&
+-			!strcmp(purple_account_user_split_get_text(split), _("Domain")))
+-			value = "chat.facebook.com";
++			value = "";
+ 
+ 		if (value != NULL)
+ 			gtk_entry_set_text(GTK_ENTRY(entry), value);
+@@ -925,10 +920,6 @@
+ 				model = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_POINTER);
+ 				opt_entry->widget = combo = gtk_combo_box_new_with_model(GTK_TREE_MODEL(model));
+ 
+-				if (g_object_get_data(G_OBJECT(item), "fakefacebook") &&
+-					!strcmp(opt_entry->setting, "connection_security"))
+-					str_value = "opportunistic_tls";
+-
+ 				/* Loop through list of PurpleKeyValuePair items */
+ 				for (node = list; node != NULL; node = node->next) {
+ 					if (node->data != NULL) {
+diff -Nur pidgin-2.10.7/pidgin/gtkblist.c pidgin-2.10.7-nonprism/pidgin/gtkblist.c
+--- pidgin-2.10.7/pidgin/gtkblist.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtkblist.c	2013-08-16 23:10:16.549286879 -0300
+@@ -2126,10 +2126,6 @@
+ 	char *temp_vcard;
+ 	char *s, *c;
+ 	char *alias    = NULL;
+-	GList *aims    = NULL;
+-	GList *icqs    = NULL;
+-	GList *yahoos  = NULL;
+-	GList *msns    = NULL;
+ 	GList *jabbers = NULL;
+ 
+ 	s = temp_vcard = g_strdup(vcard);
+@@ -2168,24 +2164,14 @@
+ 		/* We only want to worry about a few fields here. */
+ 		if (!strcmp(field, "FN"))
+ 			alias = g_strdup(value);
+-		else if (!strcmp(field, "X-AIM") || !strcmp(field, "X-ICQ") ||
+-				 !strcmp(field, "X-YAHOO") || !strcmp(field, "X-MSN") ||
+-				 !strcmp(field, "X-JABBER"))
++		else if (!strcmp(field, "X-JABBER"))
+ 		{
+ 			char **values = g_strsplit(value, ":", 0);
+ 			char **im;
+ 
+ 			for (im = values; *im != NULL; im++)
+ 			{
+-				if (!strcmp(field, "X-AIM"))
+-					aims = g_list_append(aims, g_strdup(*im));
+-				else if (!strcmp(field, "X-ICQ"))
+-					icqs = g_list_append(icqs, g_strdup(*im));
+-				else if (!strcmp(field, "X-YAHOO"))
+-					yahoos = g_list_append(yahoos, g_strdup(*im));
+-				else if (!strcmp(field, "X-MSN"))
+-					msns = g_list_append(msns, g_strdup(*im));
+-				else if (!strcmp(field, "X-JABBER"))
++				if (!strcmp(field, "X-JABBER"))
+ 					jabbers = g_list_append(jabbers, g_strdup(*im));
+ 			}
+ 
+@@ -2195,18 +2181,13 @@
+ 
+ 	g_free(temp_vcard);
+ 
+-	if (aims == NULL && icqs == NULL && yahoos == NULL &&
+-		msns == NULL && jabbers == NULL)
++	if (jabbers == NULL)
+ 	{
+ 		g_free(alias);
+ 
+ 		return FALSE;
+ 	}
+ 
+-	add_buddies_from_vcard("prpl-aim",    group, aims,    alias);
+-	add_buddies_from_vcard("prpl-icq",    group, icqs,    alias);
+-	add_buddies_from_vcard("prpl-yahoo",  group, yahoos,  alias);
+-	add_buddies_from_vcard("prpl-msn",    group, msns,    alias);
+ 	add_buddies_from_vcard("prpl-jabber", group, jabbers, alias);
+ 
+ 	g_free(alias);
+diff -Nur pidgin-2.10.7/pidgin/gtkdialogs.c pidgin-2.10.7-nonprism/pidgin/gtkdialogs.c
+--- pidgin-2.10.7/pidgin/gtkdialogs.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtkdialogs.c	2013-08-16 21:37:21.863154130 -0300
+@@ -615,16 +615,6 @@
+ #endif
+ #endif
+ 
+-#if defined(_WIN32) || defined(USE_INTERNAL_LIBGADU)
+-	g_string_append(str, "    <b>Gadu-Gadu library (libgadu):</b> Internal<br/>");
+-#else
+-#ifdef HAVE_LIBGADU
+-	g_string_append(str, "    <b>Gadu-Gadu library (libgadu):</b> Enabled<br/>");
+-#else
+-	g_string_append(str, "    <b>Gadu-Gadu library (libgadu):</b> Disabled<br/>");
+-#endif
+-#endif
+-
+ #ifdef USE_GTKSPELL
+ 	g_string_append(str, "    <b>GtkSpell:</b> Enabled<br/>");
+ #else
+diff -Nur pidgin-2.10.7/pidgin/gtkimhtml.c pidgin-2.10.7-nonprism/pidgin/gtkimhtml.c
+--- pidgin-2.10.7/pidgin/gtkimhtml.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtkimhtml.c	2013-08-16 22:59:51.862994429 -0300
+@@ -2440,7 +2440,6 @@
+ static gboolean smooth_scroll_cb(gpointer data);
+ 
+ /*
+- <KingAnt> marv: The two IM image functions in oscar are purple_odc_send_im and purple_odc_incoming
+ 
+ 
+ [19:58] <Robot101> marv: images go into the imgstore, a refcounted... well.. hash. :)
+diff -Nur pidgin-2.10.7/pidgin/gtknotify.c pidgin-2.10.7-nonprism/pidgin/gtknotify.c
+--- pidgin-2.10.7/pidgin/gtknotify.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtknotify.c	2013-08-27 23:37:23.037593200 -0300
+@@ -1263,10 +1263,6 @@
+ 			command = g_strdup_printf("xdg-open %s", escaped);
+ 		g_free(tmp);
+ 	}
+-	else if (purple_running_osx() == TRUE)
+-	{
+-		command = g_strdup_printf("open %s", escaped);
+-	}
+ 	else if (!strcmp(web_browser, "epiphany") ||
+ 		!strcmp(web_browser, "galeon"))
+ 	{
+@@ -1289,30 +1285,31 @@
+ 	{
+ 		command = g_strdup_printf("kfmclient openURL %s", escaped);
+ 		/*
+-		 * Does Konqueror have options to open in new tab
++		 * Does Konqueror-libre have options to open in new tab
+ 		 * and/or current window?
+ 		 */
+ 	}
+-	else if (!strcmp(web_browser, "mozilla") ||
+-			 !strcmp(web_browser, "mozilla-firebird") ||
+-			 !strcmp(web_browser, "firefox") ||
+-			 !strcmp(web_browser, "seamonkey"))
++	else if (!strcmp(web_browser, "iceweasel") ||
++			 !strcmp(web_browser, "icecat") ||
++			 !strcmp(web_browser, "iceape"))
+ 	{
+ 		char *args = "";
+ 
+ 		command = g_strdup_printf("%s %s", web_browser, escaped);
+ 
+ 		/*
+-		 * Firefox 0.9 and higher require a "-a firefox" option when
++		 * Iceweasel-libre 0.9 and higher require a "-a iceweasel" option when
+ 		 * using -remote commands.  This breaks older versions of
+ 		 * mozilla.  So we include this other handly little string
+-		 * when calling firefox.  If the API for remote calls changes
+-		 * any more in firefox then firefox should probably be split
++		 * when calling iceweasel.  If the API for remote calls changes
++		 * any more in iceweasel then iceweasel should probably be split
+ 		 * apart from mozilla-firebird and mozilla... but this is good
+ 		 * for now.
+ 		 */
+-		if (!strcmp(web_browser, "firefox"))
+-			args = "-a firefox";
++		if (!strcmp(web_browser, "iceweasel"))
++			args = "-a iceweasel";
++		else if (!strcmp(web_browser, "icecat"))
++			args = "-a icecat";
+ 
+ 		if (place == PIDGIN_BROWSER_NEW_WINDOW)
+ 			remote_command = g_strdup_printf("%s %s -remote "
+@@ -1327,58 +1324,12 @@
+ 											 "openURL(%s)",
+ 											 web_browser, args, escaped);
+ 	}
+-	else if (!strcmp(web_browser, "netscape"))
+-	{
+-		command = g_strdup_printf("netscape %s", escaped);
+-
+-		if (place == PIDGIN_BROWSER_NEW_WINDOW)
+-		{
+-			remote_command = g_strdup_printf("netscape -remote "
+-											 "openURL(%s,new-window)",
+-											 escaped);
+-		}
+-		else if (place == PIDGIN_BROWSER_CURRENT)
+-		{
+-			remote_command = g_strdup_printf("netscape -remote "
+-											 "openURL(%s)", escaped);
+-		}
+-	}
+-	else if (!strcmp(web_browser, "opera"))
+-	{
+-		if (place == PIDGIN_BROWSER_NEW_WINDOW)
+-			command = g_strdup_printf("opera -newwindow %s", escaped);
+-		else if (place == PIDGIN_BROWSER_NEW_TAB)
+-			command = g_strdup_printf("opera -newpage %s", escaped);
+-		else if (place == PIDGIN_BROWSER_CURRENT)
+-		{
+-			remote_command = g_strdup_printf("opera -remote "
+-											 "openURL(%s)", escaped);
+-			command = g_strdup_printf("opera %s", escaped);
+-		}
+-		else
+-			command = g_strdup_printf("opera %s", escaped);
+-
+-	}
+-	else if (!strcmp(web_browser, "google-chrome"))
+-	{
+-		/* Google Chrome doesn't have command-line arguments that control the
+-		 * opening of links from external calls.  This is controlled solely from
+-		 * a preference within Google Chrome. */
+-		command = g_strdup_printf("google-chrome %s", escaped);
+-	}
+-	else if (!strcmp(web_browser, "chrome"))
+-	{
+-		/* Chromium doesn't have command-line arguments that control the
+-		 * opening of links from external calls.  This is controlled solely from
+-		 * a preference within Chromium. */
+-		command = g_strdup_printf("chrome %s", escaped);
+-	}
+-	else if (!strcmp(web_browser, "chromium-browser"))
++	else if (!strcmp(web_browser, "chromium"))
+ 	{
+-		/* Chromium doesn't have command-line arguments that control the
++		/* Chromium-libre doesn't have command-line arguments that control the
+ 		 * opening of links from external calls.  This is controlled solely from
+-		 * a preference within Chromium. */
+-		command = g_strdup_printf("chromium-browser %s", escaped);
++		 * a preference within Chromium-libre. */
++		command = g_strdup_printf("chromium %s", escaped);
+ 	}
+ 	else if (!strcmp(web_browser, "custom"))
+ 	{
+diff -Nur pidgin-2.10.7/pidgin/gtkprefs.c pidgin-2.10.7-nonprism/pidgin/gtkprefs.c
+--- pidgin-2.10.7/pidgin/gtkprefs.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtkprefs.c	2013-08-27 22:55:58.523782666 -0300
+@@ -1851,24 +1851,15 @@
+ 
+ 	/* Sorted reverse alphabetically */
+ 	static const struct browser possible_browsers[] = {
+-		{N_("Seamonkey"), "seamonkey"},
+-		{N_("Opera"), "opera"},
+-		{N_("Netscape"), "netscape"},
+-		{N_("Mozilla"), "mozilla"},
+-		{N_("Konqueror"), "kfmclient"},
+-		{N_("Google Chrome"), "google-chrome"},
+-		/* Do not move the line below.  Code below expects gnome-open to be in
+-		 * this list immediately after xdg-open! */
++		{N_("Iceape-libre"), "iceape"},
++		{N_("Konqueror-libre"), "kfmclient"},
+ 		{N_("Desktop Default"), "xdg-open"},
+ 		{N_("GNOME Default"), "gnome-open"},
+-		{N_("Galeon"), "galeon"},
+-		{N_("Firefox"), "firefox"},
+-		{N_("Firebird"), "mozilla-firebird"},
+-		{N_("Epiphany"), "epiphany"},
+-		/* Translators: please do not translate "chromium-browser" here! */
+-		{N_("Chromium (chromium-browser)"), "chromium-browser"},
+-		/* Translators: please do not translate "chrome" here! */
+-		{N_("Chromium (chrome)"), "chrome"}
++		{N_("Iceweasel-libre"), "iceweasel"},
++		{N_("Icecat"), "icecat"},
++		{N_("Epiphany-libre"), "epiphany"},
++		/* Translators: please do not translate "chromium" here! */
++		{N_("Chromium-libre (chromium)"), "chromium"},
+ 	};
+ 	static const int num_possible_browsers = G_N_ELEMENTS(possible_browsers);
+ 
+diff -Nur pidgin-2.10.7/pidgin/gtkutils.c pidgin-2.10.7-nonprism/pidgin/gtkutils.c
+--- pidgin-2.10.7/pidgin/gtkutils.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/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 -Nur pidgin-2.10.7/pidgin/gtkwhiteboard.c pidgin-2.10.7-nonprism/pidgin/gtkwhiteboard.c
+--- pidgin-2.10.7/pidgin/gtkwhiteboard.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtkwhiteboard.c	2013-08-16 23:25:21.614375960 -0300
+@@ -339,13 +339,10 @@
+ 	 */
+ 	/* XXXX because otherwise gettext will see this string, even though it's
+ 	 * in an #if 0 block. Remove the XXXX if you want to use this code.
+-	 * But, it really shouldn't be a Yahoo-specific string. ;) */
++	 */
+ 	purple_conv_im_write(PURPLE_CONV_IM(conv), "", XXXX_("Sent Doodle request."),
+ 					   PURPLE_MESSAGE_NICK | PURPLE_MESSAGE_RECV, time(NULL));
+ 
+-	yahoo_doodle_command_send_request(gc, to);
+-	yahoo_doodle_command_send_ready(gc, to);
+-
+ 	/* Insert this 'session' in the list.  At this point, it's only a requested
+ 	 * session.
+ 	 */
+@@ -554,15 +551,13 @@
+ 	if(event->button == 1 && pixmap != NULL)
+ 	{
+ 		/* If the brush was never moved, express two sets of two deltas That's a
+-		 * 'point,' but not for Yahoo!
++		 * 'point,'
+ 		 */
+ 		/* if((event->x == LastX) && (event->y == LastY)) */
+ 		if(MotionCount == 0)
+ 		{
+ 			int index;
+ 
+-			/* For Yahoo!, a (0 0) indicates the end of drawing */
+-			/* FIXME: Yahoo Doodle specific! */
+ 			for(index = 0; index < 2; index++)
+ 			{
+ 				draw_list = g_list_append(draw_list, 0);
+diff -Nur pidgin-2.10.7/pidgin/gtkwhiteboard.h pidgin-2.10.7-nonprism/pidgin/gtkwhiteboard.h
+--- pidgin-2.10.7/pidgin/gtkwhiteboard.h	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtkwhiteboard.h	2013-08-27 23:28:41.018759351 -0300
+@@ -37,8 +37,7 @@
+ #define BRUSH_STATE_DOWN    1
+ #define BRUSH_STATE_MOTION  2
+ 
+-/* XXX: This seems duplicated with the Yahoo! Doodle prpl code.
+- * XXX: How should they work together? */
++/* XXX: How should they work together? */
+ #define PALETTE_NUM_COLORS  7
+ 
+ /**
+diff -Nur pidgin-2.10.7/pidgin/Makefile.am pidgin-2.10.7-nonprism/pidgin/Makefile.am
+--- pidgin-2.10.7/pidgin/Makefile.am	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/Makefile.am	2013-08-16 21:03:34.936610745 -0300
+@@ -160,10 +160,6 @@
+ 	$(GTK_LIBS) \
+ 	$(top_builddir)/libpurple/libpurple.la
+ 
+-if USE_INTERNAL_LIBGADU
+-INTGG_CFLAGS = -DUSE_INTERNAL_LIBGADU
+-endif
+-
+ AM_CPPFLAGS = \
+ 	-DDATADIR=\"$(datadir)\" \
+ 	-DLIBDIR=\"$(libdir)/pidgin/\" \
+@@ -179,6 +175,5 @@
+ 	$(GTK_CFLAGS) \
+ 	$(DBUS_CFLAGS) \
+ 	$(GTKSPELL_CFLAGS) \
+-	$(LIBXML_CFLAGS) \
+-	$(INTGG_CFLAGS)
++	$(LIBXML_CFLAGS)
+ endif  # ENABLE_GTK
+diff -Nur pidgin-2.10.7/pidgin/Makefile.in pidgin-2.10.7-nonprism/pidgin/Makefile.in
+--- pidgin-2.10.7/pidgin/Makefile.in	2013-02-11 07:17:23.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/Makefile.in	2013-08-16 23:56:44.729405978 -0300
+@@ -286,8 +286,6 @@
+ FARSTREAM_CFLAGS = @FARSTREAM_CFLAGS@
+ FARSTREAM_LIBS = @FARSTREAM_LIBS@
+ FGREP = @FGREP@
+-GADU_CFLAGS = @GADU_CFLAGS@
+-GADU_LIBS = @GADU_LIBS@
+ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+@@ -349,8 +347,6 @@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+ MANIFEST_TOOL = @MANIFEST_TOOL@
+-MEANWHILE_CFLAGS = @MEANWHILE_CFLAGS@
+-MEANWHILE_LIBS = @MEANWHILE_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO_CFLAGS = @MONO_CFLAGS@
+@@ -645,7 +641,6 @@
+ @ENABLE_GTK_TRUE@	$(GTK_LIBS) \
+ @ENABLE_GTK_TRUE@	$(top_builddir)/libpurple/libpurple.la
+ 
+-@ENABLE_GTK_TRUE@@USE_INTERNAL_LIBGADU_TRUE@INTGG_CFLAGS = -DUSE_INTERNAL_LIBGADU
+ @ENABLE_GTK_TRUE@AM_CPPFLAGS = \
+ @ENABLE_GTK_TRUE@	-DDATADIR=\"$(datadir)\" \
+ @ENABLE_GTK_TRUE@	-DLIBDIR=\"$(libdir)/pidgin/\" \
+diff -Nur pidgin-2.10.7/pidgin/pixmaps/emotes/default/24/default.theme.in pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/default/24/default.theme.in
+--- pidgin-2.10.7/pidgin/pixmaps/emotes/default/24/default.theme.in	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/default/24/default.theme.in	2013-08-16 23:13:41.759061988 -0300
+@@ -28,8 +28,7 @@
+ 
+ 
+ [XMPP]
+-# Following XEP-0038 + GTalk + our default set, in default set order
+-# The GTalk strings come from ticket #3307.
++# Following XEP-0038 + our default set, in default set order
+ happy.png           :)      :-)     =)
+ excited.png         :-D     :-d     :D      :d      =D      =d
+ sad.png             :-(     :(
+@@ -47,7 +46,7 @@
+ foot-in-mouth.png   :-!
+ shout.png           >:o     >:O
+ 
+-# Following XEP-0038 + GTalk
++# Following XEP-0038
+ angry.png           >:-(    >:(     X-(    x-(
+ good.png            :yes:
+ bad.png             :no:
+@@ -75,515 +74,3 @@
+ ! skywalker.png     C:-)    c:-)    C:)     c:)
+ ! monkey.png        :-(|)   :(|)    8-|)
+ ! cyclops.png       O-)     o-)
+-
+-
+-# Following AIM 6.1
+-[AIM]
+-happy.png           :-)     :)
+-wink.png            ;-)     ;)
+-sad.png             :-(     :(
+-tongue.png          :P      :p      :-P     :-p
+-shocked.png         =-O
+-kiss.png            :-*
+-shout.png           >:o
+-excited.png         :-D     :D
+-moneymouth.png      :-$
+-foot-in-mouth.png   :-!
+-embarrassed.png     :-[
+-angel.png           O:-)
+-thinking.png        :-\\    :-/
+-crying.png          :'(
+-shut-mouth.png      :-X
+-glasses-cool.png    8-)
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)   :(|)    8-|)
+-! cyclops.png       O-)     o-)
+-
+-
+-# Following Windows Live Messenger 8.1
+-[MSN]
+-happy.png           :)      :-)
+-excited.png         :D      :d      :-D     :-d
+-wink.png            ;)      ;-)
+-shocked.png         :-O     :-o     :O      :o
+-tongue.png          :-P     :P      :-p     :p
+-glasses-cool.png    (H)     (h)
+-angry.png           :@      :-@
+-embarrassed.png     :$      :-$
+-confused.png        :S      :s      :-S     :-s
+-sad.png             :(      :-(
+-crying.png          :'(
+-neutral.png         :|      :-|
+-devil.png           (6)
+-angel.png           (A)     (a)
+-in_love.png         (L)     (l)
+-love-over.png       (U)     (u)
+-msn.png             (M)     (m)
+-cat.png             (@)
+-dog.png             (&)
+-moon.png            (S)
+-star.png            (*)
+-film.png            (~)
+-musical-note.png    (8)
+-mail.png            (E)     (e)
+-rose.png            (F)     (f)
+-rose-dead.png       (W)     (w)
+-clock.png           (O)     (o)
+-kiss.png            (K)     (k)
+-present.png         (G)     (g)
+-cake.png            (^)
+-camera.png          (P)     (p)
+-lamp.png            (I)     (i)
+-coffee.png          (C)     (c)
+-phone.png           (T)     (t)
+-hug-left.png        ({)
+-hug-right.png       (})
+-beer.png            (B)     (b)
+-drink.png           (D)     (d)
+-boy.png             (Z)     (z)
+-girl.png            (X)     (x)
+-good.png            (Y)     (y)
+-bad.png             (N)     (n)
+-vampire.png         :[      :-[
+-goat.png            (nah)
+-sun.png             (#)
+-rainbow.png         (R)     (r)
+-quiet.png           :-#
+-teeth.png           8o|
+-glasses-nerdy.png   8-|
+-sarcastic.png       ^o)
+-secret.png          :-*
+-sick.png            +o(
+-snail.png           (sn)
+-turtle.png          (tu)
+-plate.png           (pl)
+-bowl.png            (||)
+-pizza.png           (pi)
+-soccerball.png      (so)
+-car.png             (au)
+-airplane.png        (ap)
+-umbrella.png        (um)
+-island.png          (ip)
+-computer.png        (co)
+-mobile.png          (mp)
+-brb.png             (brb)
+-rain.png            (st)
+-highfive.png        (h5)
+-coins.png           (mo)
+-sheep.png           (bah)
+-dont-know.png       :^)
+-thinking.png        *-)
+-thunder.png         (li)
+-party.png           <:o)
+-eyeroll.png         8-)
+-sleepy.png          |-) 
+-bunny.png           ('.')
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)   :(|)    8-|)
+-! cyclops.png       O-)     o-)
+-
+-# Hidden MSN emotes
+-cigarette.png      	(ci)    (CI)
+-handcuffs.png       (%)
+-console.png			(xx)    (XX)
+-fingers-crossed.png	(yn)    (YN)
+-
+-
+-# Following QQ 2006
+-[QQ]
+-shocked.png         /:O      /jy       /surprised
+-curl-lip.png        /:~      /pz       /curl_lip
+-desire.png          /:*      /se       /desire
+-dazed.png           /:|      /dazed
+-party.png           /8-)     /dy       /revel
+-crying.png          /:<      /ll       /cry
+-bashful.png         /:$      /hx       /bashful
+-shut-mouth.png      /:X      /bz       /shut_mouth
+-sleeping.png        /:Z      /shui     /sleep
+-weep.png            /:'(     /dk       /weep
+-embarrassed.png     /:-|     /gg       /embarassed
+-pissed-off.png      /:@      /fn       /pissed_off
+-act-up.png          /:P      /tp       /act_up
+-excited.png         /:D      /cy       /toothy_smile
+-happy.png           /:)      /wx       /small_smile
+-sad.png             /:(      /ng       /sad
+-glasses-cool.png    /:+      /kuk      /cool
+-doctor.png          /:#      /feid     /SARS
+-silly.png           /:Q      /zk       /crazy
+-sick.png            /:T      /tu       /vomit
+-snicker.png         /;p      /tx       /titter
+-cute.png            /;-D     /ka       /cute
+-disdain.png         /;d      /by       /disdain
+-arrogant.png        /;o      /am       /arrogant
+-starving.png        /:g      /jie      /starving
+-sleepy.png          /|-)     /kun      /sleepy
+-terror.png          /:!      /jk       /terror
+-hot.png             /:L      /sweat
+-smirk.png           /:>      /hanx     /smirk
+-soldier.png         /:;      /db       /soldier
+-struggle.png        /;f      /fendou   /struggle
+-curse.png           /:-S     /zhm      /curse
+-question.png        /?       /yiw      /question
+-quiet.png           /;x      /xu       /shh
+-hypnotized.png      /;@      /yun      /dizzy
+-excruciating.png    /:8      /zhem     /excrutiating
+-freaked-out.png     /;!      /shuai    /freaked_out
+-skeleton.png        /!!!     /kl       /skeleton
+-hammer.png          /xx      /qiao     /hammer
+-bye.png             /bye     /zj       /bye
+-go-away.png         /go      /shan     /go
+-afraid.png          /shake   /fad      /shake
+-amorous.png         /love    /aiq      /love
+-jump.png            /jump    /tiao     /jump
+-search.png          /find    /zhao     /search
+-lashes.png          /&       /mm       /beautiful_eyebrows
+-pig.png             /pig     /zt       /pig
+-cat.png             /cat     /mm       /cat
+-dog.png             /dog     /xg       /dog
+-hug-left.png        /hug     /yb       /hug
+-coins.png           /$       /qianc    /money
+-lamp.png            /!       /dp       /lightbulb
+-bowl.png            /cup     /bei      /cup
+-cake.png            /cake    /dg       /cake
+-thunder.png         /li      /shd      /lightning
+-bomb.png            /bome    /zhd      /bomb
+-knife.png           /kn      /dao      /knife
+-soccerball.png      /footb   /zq       /soccer
+-musical-note.png    /music   /yy       /music
+-poop.png            /shit    /bb       /shit
+-coffee.png          /coffee  /kf       /coffee
+-hungry.png          /eat     /fan      /eat
+-pill.png            /pill    /yw       /pill
+-rose.png            /rose    /mg       /rose
+-wilt.png            /fade    /dx       /wilt
+-kiss.png            /kiss    /wen      /kiss
+-in_love.png         /heart   /xin      /heart
+-love-over.png       /break   /xs       /broken_heart
+-meeting.png         /meeting /hy       /meeting
+-present.png         /gift    /lw       /gift
+-phone.png           /phone   /dh       /phone
+-clock.png           /time    /sj       /time
+-mail.png            /email   /yj       /email
+-tv.png              /TV      /ds       /TV
+-sun.png             /sun     /ty       /sun
+-moon.png            /moon    /yl       /moon
+-good.png            /strong  /qiang    /thumbs_up
+-bad.png             /weak    /ruo      /thumbs_down
+-handshake.png       /share   /ws       /handshake
+-victory.png         /v       /shl      /victory
+-beauty.png          /<J>     /mn       /beauty
+-qq.png              /<QQ>    /qz       /qq
+-blowkiss.png        /<L>     /fw       /blow_kiss
+-angry.png           /<O>     /oh       /angry
+-liquor.png          /<B>     /bj       /baijiu
+-can.png             /<U>     /qsh      /soda
+-watermelon.png      /<W>     /xigua    /watermelon
+-rain.png            /<!!>    /xy       /rain
+-cloudy.png          /<~>     /duoy     /cloudy
+-snowman.png         /<Z>     /xr       /snowman
+-star.png            /<*>     /xixing   /star
+-girl.png            /<00>    /nv       /woman
+-boy.png             /<11>    /nan      /man
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)   :(|)    8-|)
+-! cyclops.png       O-)     o-)
+-
+-
+-# Following ICQ 6.0
+-[ICQ]
+-happy.png           :-)     :)
+-neutral.png         :-$
+-sad.png             :-(     :(
+-shocked.png         =-O
+-wink.png            ;-)     ;)
+-tongue.png          :-P     :P      :-p     :p
+-music.png           [:-}
+-laugh.png           *JOKINGLY*
+-sleeping.png        *TIRED*
+-crying.png          :'(    :'-(
+-sick.png            :-!
+-kissed.png          *KISSED*
+-stop.png            *STOP*
+-kiss.png            :-{} :-*
+-kissing.png         *KISSING* 
+-victory.png         *YAHOO*
+-silly.png           %)
+-embarrassed.png     :-[
+-devil.png           ]:->
+-angel.png           O:-)
+-rose.png            @}->--
+-shut-mouth.png      :-X     :X      :-x     :x
+-bomb.png            @=
+-thinking.png        :-\\    :-/
+-good.png            *THUMBS\ UP*
+-shout.png           >:o     >:O     :-@
+-beer.png            *DRINK*
+-excited.png         :-D     :D
+-glasses-cool.png    8-)
+-amorous.png         *IN\ LOVE*
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)   :(|)    8-|)
+-! cyclops.png       O-)     o-)
+-
+-
+-# Following Yahoo! Messenger 8.1
+-[Yahoo]
+-happy.png           :)      :-)
+-question.png        :-/     :-\\
+-shocked.png         :-O     :O      :-o     :o 
+-devil.png           >:)
+-angel.png           O:-)    o:-)    0:-)
+-sick.png            :-&
+-sleepy.png          (:|
+-hypnotized.png      @-)
+-on-the-phone.png    :)]
+-sad.png             :(      :-(
+-amorous.png         :x      :-x     :X      :-X
+-angry.png           X-(     x-(     X(      x(
+-crying.png          :((
+-glasses-nerdy.png   :-B     :-b
+-quiet.png           :-$
+-drool.png           =P~     =p~
+-lying.png           :^O     :^o
+-call-me.png         :-c
+-wink.png            ;)      ;-)
+-embarrassed.png     :">
+-mean.png            :->     :>
+-laugh.png           :))     :-))
+-bye.png             =;
+-arrogant.png        [-(
+-thinking.png        :-?
+-waiting.png         :-w     :-W
+-at-wits-end.png     ~x(     ~X(
+-excited.png         :D      :-D     :d      :-d
+-tongue.png          :-P     :P      :-p     :p
+-glasses-cool.png    B-)     b-)
+-neutral.png         :|      :-|
+-sleeping.png        I-)     i-)     |-)
+-clown.png           :o)     :O)
+-doh.png             #-o     #-O
+-weep.png            :-<
+-go-away.png         :-h
+-lashes.png          ;;)
+-kiss.png            :-*     :*
+-confused.png        :-S     :-s
+-sarcastic.png       /:)
+-eyeroll.png         8-|
+-silly.png           8-}
+-clap.png            =D>     =d>
+-mad-tongue.png      >:P     >:p
+-time-out.png        :-t     :-T
+-hug-left.png        >:D<    >:d<
+-love-over.png       =((
+-hot.png             #:-S    #:-s
+-rotfl.png           =)) :-j :-J 
+-loser.png           L-)     l-)
+-party.png           <:-P    <:-p
+-nervous.png         :-SS	:-Ss	:-sS	:-ss
+-cowboy.png          <):)
+-desire.png          8->
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)   :(|)    8-|)
+-! cyclops.png       O-)     o-)
+-
+-# Hidden Yahoo emotes
+-alien.png           =:)     >-)
+-beat-up.png         b-(     B-(
+-chicken.png         ~:>
+-coffee.png          ~o)     ~O)
+-cow.png             3:-O    3:-o
+-dance.png           \\:D/   \\:d/
+-rose.png            @};-
+-dont-know.png       :-L     :-l
+-skeleton.png        8-X     8-x
+-lamp.png            *-:)
+-monkey.png          :(|)
+-coins.png           $-)
+-peace.png           :)>-
+-pig.png             :@)
+-pray.png            [-o<    [-O<
+-pumpkin.png         (~~)
+-shame.png           [-X     [-x
+-flag.png            **==
+-clover.png          %%-
+-musical-note.png    :-"
+-giggle.png          ;))
+-worship.png         ^:)^
+-star.png            (*)
+-waving.png          >:/
+-talktohand.png      :-@
+-
+-# Only available after activating the Yahoo! Fighter IMVironment
+-male-fighter1.png   o->     O->
+-male-fighter2.png   o=>     O=>
+-female-fighter.png  o-+     O-+
+-yin-yang.png        (%)
+-
+-# Following Yahoo! Messenger 8.1
+-[Yahoo JAPAN]
+-happy.png           :)      :-)
+-question.png        :-/     :-\\
+-shocked.png         :-O     :O      :-o     :o 
+-devil.png           >:)
+-angel.png           O:-)    o:-)    0:-)
+-sick.png            :-&
+-sleepy.png          (:|
+-hypnotized.png      @-)
+-on-the-phone.png    :)]
+-sad.png             :(      :-(
+-amorous.png         :x      :-x     :X      :-X
+-angry.png           X-(     x-(     X(      x(
+-crying.png          :((
+-glasses-nerdy.png   :-B     :-b
+-quiet.png           :-$
+-drool.png           =P~     =p~
+-lying.png           :^O     :^o
+-call-me.png         :-c
+-wink.png            ;)      ;-)
+-embarrassed.png     :">
+-mean.png            :->     :>
+-laugh.png           :))     :-))
+-bye.png             =;
+-arrogant.png        [-(
+-thinking.png        :-?
+-waiting.png         :-w     :-W
+-at-wits-end.png     ~x(     ~X(
+-excited.png         :D      :-D     :d      :-d
+-tongue.png          :-P     :P      :-p     :p
+-glasses-cool.png    B-)     b-)
+-neutral.png         :|      :-|
+-sleeping.png        I-)     i-)     |-)
+-clown.png           :o)     :O)
+-doh.png             #-o     #-O
+-weep.png            :-<
+-go-away.png         :-h
+-lashes.png          ;;)
+-kiss.png            :-*     :*
+-confused.png        :-S     :-s
+-sarcastic.png       /:)
+-eyeroll.png         8-|
+-silly.png           8-}
+-clap.png            =D>     =d>
+-mad-tongue.png      >:P     >:p
+-time-out.png        :-t     :-T
+-hug-left.png        >:D<    >:d<
+-love-over.png       =((
+-hot.png             #:-S    #:-s
+-rotfl.png           =)) :-j :-J 
+-loser.png           L-)     l-)
+-party.png           <:-P    <:-p
+-nervous.png         :-SS       :-Ss    :-sS    :-ss
+-cowboy.png          <):)
+-desire.png          8->
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)  :(|)
+-
+-# Hidden Yahoo emotes
+-alien.png           =:)     >-)
+-beat-up.png         b-(     B-(
+-chicken.png         ~:>
+-coffee.png          ~o)     ~O)
+-cow.png             3:-O    3:-o
+-dance.png           \\:D/   \\:d/
+-rose.png            @};-
+-dont-know.png       :-L     :-l
+-skeleton.png        8-X     8-x
+-lamp.png            *-:)
+-monkey.png          :(|)
+-coins.png           $-)
+-peace.png           :)>-
+-pig.png             :@)
+-pray.png            [-o<    [-O<
+-pumpkin.png         (~~)
+-shame.png           [-X     [-x
+-flag.png            **==
+-clover.png          %%-
+-musical-note.png    :-"
+-giggle.png          ;))
+-worship.png         ^:)^
+-star.png            (*)
+-waving.png          >:/
+-talktohand.png      :-@
+-
+-# Only available after activating the Yahoo! Fighter IMVironment
+-male-fighter1.png   o->     O->
+-male-fighter2.png   o=>     O=>
+-female-fighter.png  o-+     O-+
+-yin-yang.png        (%)
+-
+-
+-# Following MySpaceIM Beta 1.0.697.0
+-[MySpaceIM]
+-excited.png  	    :D      :-D
+-devil.png	    }:)
+-confused.png	    :Z
+-glasses-nerdy.png   B)
+-bulgy-eyes.png	    %)
+-freaked-out.png	    :E
+-happy.png	    :)      :-)
+-amorous.png	    :X
+-laugh.png	    :))
+-mohawk.png	    -:
+-mad-tongue.png	    X(
+-messed.png	    X)
+-glasses-nerdy.png   Q)
+-doh.png		    :G
+-pirate.png	    P)
+-shocked.png	    :O
+-sidefrown.png	    :{
+-sinister.png	    :B
+-smirk.png	    :,
+-neutral.png	    :|
+-tongue.png	    :P      :p
+-pissed-off.png	    B|
+-wink.png	    ;-)     ;)
+-sad.png		    :[
+-kiss.png            :x
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)   :(|)    8-|)
+-! cyclops.png       O-)     o-)
+-
+-
+-# MXit standard emoticons
+-[MXit]
+-happy.png           :-)     :)
+-sad.png             :-(     :(
+-wink.png            ;-)     ;)
+-excited.png         :-D     :D     :->      :>
+-neutral.png         :-|     :|
+-shocked.png         :-O     :O
+-tongue.png          :-P     :P
+-embarrassed.png     :-$     :$
+-glasses-cool.png    8-)
+-in_love.png         (H)
+-rose.png            (F)
+-### Added in v3.0
+-boy.png             (m)
+-girl.png            (f)
+-star.png            (*)
+-chilli.png          (c)
+-kiss.png            (x)
+-lamp.png            (i)
+-pissed-off.png      :e      :-e
+-shut-mouth.png      :-x     :x
+-thunder.png         (z)
+-coffee.png          (U)
+-mrgreen.png         (G)
+-### Added in v5.0
+-sick.png            :o(
+-excruciating.png    :-{     :{
+-amorous.png         :-}     :}
+-eyeroll.png         8-o     8o
+-crying.png          :'(
+-thinking.png        :-?     :?
+-drool.png           :-~     :~
+-sleeping.png        :-z     :z
+-lying.png           :L)
+-glasses-nerdy.png   8-|     8|
+-pirate.png          P-)
+-### Added in v5.9.7
+-bored.png           :-[     :[
+-cold.png            :-<     :<
+-confused.png        :-,     :,
+-hungry.png          :-C     :C
+-stressed.png        :-s     :s
+diff -Nur pidgin-2.10.7/pidgin/pixmaps/emotes/default/24/theme pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/default/24/theme
+--- pidgin-2.10.7/pidgin/pixmaps/emotes/default/24/theme	2013-02-11 07:17:58.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/default/24/theme	2013-08-16 23:15:55.929941297 -0300
+@@ -28,8 +28,7 @@
+ 
+ 
+ [XMPP]
+-# Following XEP-0038 + GTalk + our default set, in default set order
+-# The GTalk strings come from ticket #3307.
++# Following XEP-0038 + our default set, in default set order
+ happy.png           :)      :-)     =)
+ excited.png         :-D     :-d     :D      :d      =D      =d
+ sad.png             :-(     :(
+@@ -47,7 +46,7 @@
+ foot-in-mouth.png   :-!
+ shout.png           >:o     >:O
+ 
+-# Following XEP-0038 + GTalk
++# Following XEP-0038
+ angry.png           >:-(    >:(     X-(    x-(
+ good.png            :yes:
+ bad.png             :no:
+@@ -75,515 +74,3 @@
+ ! skywalker.png     C:-)    c:-)    C:)     c:)
+ ! monkey.png        :-(|)   :(|)    8-|)
+ ! cyclops.png       O-)     o-)
+-
+-
+-# Following AIM 6.1
+-[AIM]
+-happy.png           :-)     :)
+-wink.png            ;-)     ;)
+-sad.png             :-(     :(
+-tongue.png          :P      :p      :-P     :-p
+-shocked.png         =-O
+-kiss.png            :-*
+-shout.png           >:o
+-excited.png         :-D     :D
+-moneymouth.png      :-$
+-foot-in-mouth.png   :-!
+-embarrassed.png     :-[
+-angel.png           O:-)
+-thinking.png        :-\\    :-/
+-crying.png          :'(
+-shut-mouth.png      :-X
+-glasses-cool.png    8-)
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)   :(|)    8-|)
+-! cyclops.png       O-)     o-)
+-
+-
+-# Following Windows Live Messenger 8.1
+-[MSN]
+-happy.png           :)      :-)
+-excited.png         :D      :d      :-D     :-d
+-wink.png            ;)      ;-)
+-shocked.png         :-O     :-o     :O      :o
+-tongue.png          :-P     :P      :-p     :p
+-glasses-cool.png    (H)     (h)
+-angry.png           :@      :-@
+-embarrassed.png     :$      :-$
+-confused.png        :S      :s      :-S     :-s
+-sad.png             :(      :-(
+-crying.png          :'(
+-neutral.png         :|      :-|
+-devil.png           (6)
+-angel.png           (A)     (a)
+-in_love.png         (L)     (l)
+-love-over.png       (U)     (u)
+-msn.png             (M)     (m)
+-cat.png             (@)
+-dog.png             (&)
+-moon.png            (S)
+-star.png            (*)
+-film.png            (~)
+-musical-note.png    (8)
+-mail.png            (E)     (e)
+-rose.png            (F)     (f)
+-rose-dead.png       (W)     (w)
+-clock.png           (O)     (o)
+-kiss.png            (K)     (k)
+-present.png         (G)     (g)
+-cake.png            (^)
+-camera.png          (P)     (p)
+-lamp.png            (I)     (i)
+-coffee.png          (C)     (c)
+-phone.png           (T)     (t)
+-hug-left.png        ({)
+-hug-right.png       (})
+-beer.png            (B)     (b)
+-drink.png           (D)     (d)
+-boy.png             (Z)     (z)
+-girl.png            (X)     (x)
+-good.png            (Y)     (y)
+-bad.png             (N)     (n)
+-vampire.png         :[      :-[
+-goat.png            (nah)
+-sun.png             (#)
+-rainbow.png         (R)     (r)
+-quiet.png           :-#
+-teeth.png           8o|
+-glasses-nerdy.png   8-|
+-sarcastic.png       ^o)
+-secret.png          :-*
+-sick.png            +o(
+-snail.png           (sn)
+-turtle.png          (tu)
+-plate.png           (pl)
+-bowl.png            (||)
+-pizza.png           (pi)
+-soccerball.png      (so)
+-car.png             (au)
+-airplane.png        (ap)
+-umbrella.png        (um)
+-island.png          (ip)
+-computer.png        (co)
+-mobile.png          (mp)
+-brb.png             (brb)
+-rain.png            (st)
+-highfive.png        (h5)
+-coins.png           (mo)
+-sheep.png           (bah)
+-dont-know.png       :^)
+-thinking.png        *-)
+-thunder.png         (li)
+-party.png           <:o)
+-eyeroll.png         8-)
+-sleepy.png          |-) 
+-bunny.png           ('.')
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)   :(|)    8-|)
+-! cyclops.png       O-)     o-)
+-
+-# Hidden MSN emotes
+-cigarette.png      	(ci)    (CI)
+-handcuffs.png       (%)
+-console.png			(xx)    (XX)
+-fingers-crossed.png	(yn)    (YN)
+-
+-
+-# Following QQ 2006
+-[QQ]
+-shocked.png         /:O      /jy       /surprised
+-curl-lip.png        /:~      /pz       /curl_lip
+-desire.png          /:*      /se       /desire
+-dazed.png           /:|      /dazed
+-party.png           /8-)     /dy       /revel
+-crying.png          /:<      /ll       /cry
+-bashful.png         /:$      /hx       /bashful
+-shut-mouth.png      /:X      /bz       /shut_mouth
+-sleeping.png        /:Z      /shui     /sleep
+-weep.png            /:'(     /dk       /weep
+-embarrassed.png     /:-|     /gg       /embarassed
+-pissed-off.png      /:@      /fn       /pissed_off
+-act-up.png          /:P      /tp       /act_up
+-excited.png         /:D      /cy       /toothy_smile
+-happy.png           /:)      /wx       /small_smile
+-sad.png             /:(      /ng       /sad
+-glasses-cool.png    /:+      /kuk      /cool
+-doctor.png          /:#      /feid     /SARS
+-silly.png           /:Q      /zk       /crazy
+-sick.png            /:T      /tu       /vomit
+-snicker.png         /;p      /tx       /titter
+-cute.png            /;-D     /ka       /cute
+-disdain.png         /;d      /by       /disdain
+-arrogant.png        /;o      /am       /arrogant
+-starving.png        /:g      /jie      /starving
+-sleepy.png          /|-)     /kun      /sleepy
+-terror.png          /:!      /jk       /terror
+-hot.png             /:L      /sweat
+-smirk.png           /:>      /hanx     /smirk
+-soldier.png         /:;      /db       /soldier
+-struggle.png        /;f      /fendou   /struggle
+-curse.png           /:-S     /zhm      /curse
+-question.png        /?       /yiw      /question
+-quiet.png           /;x      /xu       /shh
+-hypnotized.png      /;@      /yun      /dizzy
+-excruciating.png    /:8      /zhem     /excrutiating
+-freaked-out.png     /;!      /shuai    /freaked_out
+-skeleton.png        /!!!     /kl       /skeleton
+-hammer.png          /xx      /qiao     /hammer
+-bye.png             /bye     /zj       /bye
+-go-away.png         /go      /shan     /go
+-afraid.png          /shake   /fad      /shake
+-amorous.png         /love    /aiq      /love
+-jump.png            /jump    /tiao     /jump
+-search.png          /find    /zhao     /search
+-lashes.png          /&       /mm       /beautiful_eyebrows
+-pig.png             /pig     /zt       /pig
+-cat.png             /cat     /mm       /cat
+-dog.png             /dog     /xg       /dog
+-hug-left.png        /hug     /yb       /hug
+-coins.png           /$       /qianc    /money
+-lamp.png            /!       /dp       /lightbulb
+-bowl.png            /cup     /bei      /cup
+-cake.png            /cake    /dg       /cake
+-thunder.png         /li      /shd      /lightning
+-bomb.png            /bome    /zhd      /bomb
+-knife.png           /kn      /dao      /knife
+-soccerball.png      /footb   /zq       /soccer
+-musical-note.png    /music   /yy       /music
+-poop.png            /shit    /bb       /shit
+-coffee.png          /coffee  /kf       /coffee
+-hungry.png          /eat     /fan      /eat
+-pill.png            /pill    /yw       /pill
+-rose.png            /rose    /mg       /rose
+-wilt.png            /fade    /dx       /wilt
+-kiss.png            /kiss    /wen      /kiss
+-in_love.png         /heart   /xin      /heart
+-love-over.png       /break   /xs       /broken_heart
+-meeting.png         /meeting /hy       /meeting
+-present.png         /gift    /lw       /gift
+-phone.png           /phone   /dh       /phone
+-clock.png           /time    /sj       /time
+-mail.png            /email   /yj       /email
+-tv.png              /TV      /ds       /TV
+-sun.png             /sun     /ty       /sun
+-moon.png            /moon    /yl       /moon
+-good.png            /strong  /qiang    /thumbs_up
+-bad.png             /weak    /ruo      /thumbs_down
+-handshake.png       /share   /ws       /handshake
+-victory.png         /v       /shl      /victory
+-beauty.png          /<J>     /mn       /beauty
+-qq.png              /<QQ>    /qz       /qq
+-blowkiss.png        /<L>     /fw       /blow_kiss
+-angry.png           /<O>     /oh       /angry
+-liquor.png          /<B>     /bj       /baijiu
+-can.png             /<U>     /qsh      /soda
+-watermelon.png      /<W>     /xigua    /watermelon
+-rain.png            /<!!>    /xy       /rain
+-cloudy.png          /<~>     /duoy     /cloudy
+-snowman.png         /<Z>     /xr       /snowman
+-star.png            /<*>     /xixing   /star
+-girl.png            /<00>    /nv       /woman
+-boy.png             /<11>    /nan      /man
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)   :(|)    8-|)
+-! cyclops.png       O-)     o-)
+-
+-
+-# Following ICQ 6.0
+-[ICQ]
+-happy.png           :-)     :)
+-neutral.png         :-$
+-sad.png             :-(     :(
+-shocked.png         =-O
+-wink.png            ;-)     ;)
+-tongue.png          :-P     :P      :-p     :p
+-music.png           [:-}
+-laugh.png           *JOKINGLY*
+-sleeping.png        *TIRED*
+-crying.png          :'(    :'-(
+-sick.png            :-!
+-kissed.png          *KISSED*
+-stop.png            *STOP*
+-kiss.png            :-{} :-*
+-kissing.png         *KISSING* 
+-victory.png         *YAHOO*
+-silly.png           %)
+-embarrassed.png     :-[
+-devil.png           ]:->
+-angel.png           O:-)
+-rose.png            @}->--
+-shut-mouth.png      :-X     :X      :-x     :x
+-bomb.png            @=
+-thinking.png        :-\\    :-/
+-good.png            *THUMBS\ UP*
+-shout.png           >:o     >:O     :-@
+-beer.png            *DRINK*
+-excited.png         :-D     :D
+-glasses-cool.png    8-)
+-amorous.png         *IN\ LOVE*
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)   :(|)    8-|)
+-! cyclops.png       O-)     o-)
+-
+-
+-# Following Yahoo! Messenger 8.1
+-[Yahoo]
+-happy.png           :)      :-)
+-question.png        :-/     :-\\
+-shocked.png         :-O     :O      :-o     :o 
+-devil.png           >:)
+-angel.png           O:-)    o:-)    0:-)
+-sick.png            :-&
+-sleepy.png          (:|
+-hypnotized.png      @-)
+-on-the-phone.png    :)]
+-sad.png             :(      :-(
+-amorous.png         :x      :-x     :X      :-X
+-angry.png           X-(     x-(     X(      x(
+-crying.png          :((
+-glasses-nerdy.png   :-B     :-b
+-quiet.png           :-$
+-drool.png           =P~     =p~
+-lying.png           :^O     :^o
+-call-me.png         :-c
+-wink.png            ;)      ;-)
+-embarrassed.png     :">
+-mean.png            :->     :>
+-laugh.png           :))     :-))
+-bye.png             =;
+-arrogant.png        [-(
+-thinking.png        :-?
+-waiting.png         :-w     :-W
+-at-wits-end.png     ~x(     ~X(
+-excited.png         :D      :-D     :d      :-d
+-tongue.png          :-P     :P      :-p     :p
+-glasses-cool.png    B-)     b-)
+-neutral.png         :|      :-|
+-sleeping.png        I-)     i-)     |-)
+-clown.png           :o)     :O)
+-doh.png             #-o     #-O
+-weep.png            :-<
+-go-away.png         :-h
+-lashes.png          ;;)
+-kiss.png            :-*     :*
+-confused.png        :-S     :-s
+-sarcastic.png       /:)
+-eyeroll.png         8-|
+-silly.png           8-}
+-clap.png            =D>     =d>
+-mad-tongue.png      >:P     >:p
+-time-out.png        :-t     :-T
+-hug-left.png        >:D<    >:d<
+-love-over.png       =((
+-hot.png             #:-S    #:-s
+-rotfl.png           =)) :-j :-J 
+-loser.png           L-)     l-)
+-party.png           <:-P    <:-p
+-nervous.png         :-SS	:-Ss	:-sS	:-ss
+-cowboy.png          <):)
+-desire.png          8->
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)   :(|)    8-|)
+-! cyclops.png       O-)     o-)
+-
+-# Hidden Yahoo emotes
+-alien.png           =:)     >-)
+-beat-up.png         b-(     B-(
+-chicken.png         ~:>
+-coffee.png          ~o)     ~O)
+-cow.png             3:-O    3:-o
+-dance.png           \\:D/   \\:d/
+-rose.png            @};-
+-dont-know.png       :-L     :-l
+-skeleton.png        8-X     8-x
+-lamp.png            *-:)
+-monkey.png          :(|)
+-coins.png           $-)
+-peace.png           :)>-
+-pig.png             :@)
+-pray.png            [-o<    [-O<
+-pumpkin.png         (~~)
+-shame.png           [-X     [-x
+-flag.png            **==
+-clover.png          %%-
+-musical-note.png    :-"
+-giggle.png          ;))
+-worship.png         ^:)^
+-star.png            (*)
+-waving.png          >:/
+-talktohand.png      :-@
+-
+-# Only available after activating the Yahoo! Fighter IMVironment
+-male-fighter1.png   o->     O->
+-male-fighter2.png   o=>     O=>
+-female-fighter.png  o-+     O-+
+-yin-yang.png        (%)
+-
+-# Following Yahoo! Messenger 8.1
+-[Yahoo JAPAN]
+-happy.png           :)      :-)
+-question.png        :-/     :-\\
+-shocked.png         :-O     :O      :-o     :o 
+-devil.png           >:)
+-angel.png           O:-)    o:-)    0:-)
+-sick.png            :-&
+-sleepy.png          (:|
+-hypnotized.png      @-)
+-on-the-phone.png    :)]
+-sad.png             :(      :-(
+-amorous.png         :x      :-x     :X      :-X
+-angry.png           X-(     x-(     X(      x(
+-crying.png          :((
+-glasses-nerdy.png   :-B     :-b
+-quiet.png           :-$
+-drool.png           =P~     =p~
+-lying.png           :^O     :^o
+-call-me.png         :-c
+-wink.png            ;)      ;-)
+-embarrassed.png     :">
+-mean.png            :->     :>
+-laugh.png           :))     :-))
+-bye.png             =;
+-arrogant.png        [-(
+-thinking.png        :-?
+-waiting.png         :-w     :-W
+-at-wits-end.png     ~x(     ~X(
+-excited.png         :D      :-D     :d      :-d
+-tongue.png          :-P     :P      :-p     :p
+-glasses-cool.png    B-)     b-)
+-neutral.png         :|      :-|
+-sleeping.png        I-)     i-)     |-)
+-clown.png           :o)     :O)
+-doh.png             #-o     #-O
+-weep.png            :-<
+-go-away.png         :-h
+-lashes.png          ;;)
+-kiss.png            :-*     :*
+-confused.png        :-S     :-s
+-sarcastic.png       /:)
+-eyeroll.png         8-|
+-silly.png           8-}
+-clap.png            =D>     =d>
+-mad-tongue.png      >:P     >:p
+-time-out.png        :-t     :-T
+-hug-left.png        >:D<    >:d<
+-love-over.png       =((
+-hot.png             #:-S    #:-s
+-rotfl.png           =)) :-j :-J 
+-loser.png           L-)     l-)
+-party.png           <:-P    <:-p
+-nervous.png         :-SS       :-Ss    :-sS    :-ss
+-cowboy.png          <):)
+-desire.png          8->
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)  :(|)
+-
+-# Hidden Yahoo emotes
+-alien.png           =:)     >-)
+-beat-up.png         b-(     B-(
+-chicken.png         ~:>
+-coffee.png          ~o)     ~O)
+-cow.png             3:-O    3:-o
+-dance.png           \\:D/   \\:d/
+-rose.png            @};-
+-dont-know.png       :-L     :-l
+-skeleton.png        8-X     8-x
+-lamp.png            *-:)
+-monkey.png          :(|)
+-coins.png           $-)
+-peace.png           :)>-
+-pig.png             :@)
+-pray.png            [-o<    [-O<
+-pumpkin.png         (~~)
+-shame.png           [-X     [-x
+-flag.png            **==
+-clover.png          %%-
+-musical-note.png    :-"
+-giggle.png          ;))
+-worship.png         ^:)^
+-star.png            (*)
+-waving.png          >:/
+-talktohand.png      :-@
+-
+-# Only available after activating the Yahoo! Fighter IMVironment
+-male-fighter1.png   o->     O->
+-male-fighter2.png   o=>     O=>
+-female-fighter.png  o-+     O-+
+-yin-yang.png        (%)
+-
+-
+-# Following MySpaceIM Beta 1.0.697.0
+-[MySpaceIM]
+-excited.png  	    :D      :-D
+-devil.png	    }:)
+-confused.png	    :Z
+-glasses-nerdy.png   B)
+-bulgy-eyes.png	    %)
+-freaked-out.png	    :E
+-happy.png	    :)      :-)
+-amorous.png	    :X
+-laugh.png	    :))
+-mohawk.png	    -:
+-mad-tongue.png	    X(
+-messed.png	    X)
+-glasses-nerdy.png   Q)
+-doh.png		    :G
+-pirate.png	    P)
+-shocked.png	    :O
+-sidefrown.png	    :{
+-sinister.png	    :B
+-smirk.png	    :,
+-neutral.png	    :|
+-tongue.png	    :P      :p
+-pissed-off.png	    B|
+-wink.png	    ;-)     ;)
+-sad.png		    :[
+-kiss.png            :x
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)   :(|)    8-|)
+-! cyclops.png       O-)     o-)
+-
+-
+-# MXit standard emoticons
+-[MXit]
+-happy.png           :-)     :)
+-sad.png             :-(     :(
+-wink.png            ;-)     ;)
+-excited.png         :-D     :D     :->      :>
+-neutral.png         :-|     :|
+-shocked.png         :-O     :O
+-tongue.png          :-P     :P
+-embarrassed.png     :-$     :$
+-glasses-cool.png    8-)
+-in_love.png         (H)
+-rose.png            (F)
+-### Added in v3.0
+-boy.png             (m)
+-girl.png            (f)
+-star.png            (*)
+-chilli.png          (c)
+-kiss.png            (x)
+-lamp.png            (i)
+-pissed-off.png      :e      :-e
+-shut-mouth.png      :-x     :x
+-thunder.png         (z)
+-coffee.png          (U)
+-mrgreen.png         (G)
+-### Added in v5.0
+-sick.png            :o(
+-excruciating.png    :-{     :{
+-amorous.png         :-}     :}
+-eyeroll.png         8-o     8o
+-crying.png          :'(
+-thinking.png        :-?     :?
+-drool.png           :-~     :~
+-sleeping.png        :-z     :z
+-lying.png           :L)
+-glasses-nerdy.png   8-|     8|
+-pirate.png          P-)
+-### Added in v5.9.7
+-bored.png           :-[     :[
+-cold.png            :-<     :<
+-confused.png        :-,     :,
+-hungry.png          :-C     :C
+-stressed.png        :-s     :s
+diff -Nur pidgin-2.10.7/pidgin/pixmaps/emotes/small/16/small.theme.in pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/small/16/small.theme.in
+--- pidgin-2.10.7/pidgin/pixmaps/emotes/small/16/small.theme.in	2013-02-11 07:16:54.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/small/16/small.theme.in	2013-08-16 23:19:01.815778718 -0300
+@@ -22,8 +22,7 @@
+ 
+ 
+ [XMPP]
+-# Following XEP-0038 + GTalk + our default set, in default set order
+-# The GTalk strings come from ticket #3307.
++# Following XEP-0038 + our default set, in default set order
+ happy.png           :)      :-)     =)
+ excited.png         :-D     :-d     :D      :d      =D      =d
+ sad.png             :-(     :(
+@@ -38,7 +37,7 @@
+ angel.png           O:-)    o:-)
+ shut-mouth.png      :-X
+ 
+-# Following XEP-0038 + GTalk
++# Following XEP-0038
+ angry.png           >:-(    >:(     X-(    x-(
+ rose.png            @->--   :rose:
+ phone.png           :telephone:
+@@ -53,269 +52,3 @@
+ neutral.png         :|      :-|
+ 
+ # Hidden icons from the default set.
+-
+-
+-# Following AIM 6.1
+-[AIM]
+-happy.png           :-)     :)
+-wink.png            ;-)     ;)
+-sad.png             :-(     :(
+-tongue.png          :P      :p      :-P     :-p
+-shocked.png         =-O
+-kiss.png            :-*
+-excited.png         :-D     :D
+-embarrassed.png     :-[
+-angel.png           O:-)
+-thinking.png        :-\\    :-/
+-crying.png          :'(
+-shut-mouth.png      :-X
+-glasses-cool.png    8-)
+-
+-
+-# Following Windows Live Messenger 8.1
+-[MSN]
+-happy.png           :)      :-)
+-excited.png         :D      :d      :-D     :-d
+-wink.png            ;)      ;-)
+-shocked.png         :-O     :-o     :O      :o
+-tongue.png          :-P     :P      :-p     :p
+-glasses-cool.png    (H)     (h)
+-angry.png           :@      :-@
+-embarrassed.png     :$      :-$
+-confused.png        :S      :s      :-S     :-s
+-sad.png             :(      :-(
+-crying.png          :'(
+-neutral.png         :|      :-|
+-devil.png           (6)
+-angel.png           (A)     (a)
+-in_love.png         (L)     (l)
+-star.png            (*)
+-musical-note.png    (8)
+-rose.png            (F)     (f)
+-kiss.png            (K)     (k)
+-camera.png          (P)     (p)
+-lamp.png            (I)     (i)
+-coffee.png          (C)     (c)
+-phone.png           (T)     (t)
+-hug-left.png        ({)
+-hug-right.png       (})
+-beer.png            (B)     (b)
+-boy.png             (Z)     (z)
+-girl.png            (X)     (x)
+-sarcastic.png       ^o)
+-sick.png            +o(
+-plate.png           (pl)
+-mobile.png          (mp)
+-dont-know.png       :^)
+-thinking.png        *-)
+-thunder.png         (li)
+-party.png           <:o)
+-eyeroll.png         8-)
+-sleepy.png          |-) 
+-
+-# Hidden MSN emotes
+-cigarette.png      	(ci)    (CI)
+-console.png			(xx)    (XX)
+-
+-
+-# Following QQ 2006
+-[QQ]
+-shocked.png         /:O      /jy       /surprised
+-party.png           /8-)     /dy       /revel
+-crying.png          /:<      /ll       /cry
+-shut-mouth.png      /:X      /bz       /shut_mouth
+-sleeping.png        /:Z      /shui     /sleep
+-embarrassed.png     /:-|     /gg       /embarassed
+-pissed-off.png      /:@      /fn       /pissed_off
+-excited.png         /:D      /cy       /toothy_smile
+-happy.png           /:)      /wx       /small_smile
+-sad.png             /:(      /ng       /sad
+-glasses-cool.png    /:+      /kuk      /cool
+-sick.png            /:T      /tu       /vomit
+-sleepy.png          /|-)     /kun      /sleepy
+-hot.png             /:L      /sweat
+-question.png        /?       /yiw      /question
+-excruciating.png    /:8      /zhem     /excrutiating
+-afraid.png          /shake   /fad      /shake
+-amorous.png         /love    /aiq      /love
+-search.png          /find    /zhao     /search
+-hug-left.png        /hug     /yb       /hug
+-lamp.png            /!       /dp       /lightbulb
+-thunder.png         /li      /shd      /lightning
+-musical-note.png    /music   /yy       /music
+-coffee.png          /coffee  /kf       /coffee
+-hungry.png          /eat     /fan      /eat
+-rose.png            /rose    /mg       /rose
+-kiss.png            /kiss    /wen      /kiss
+-in_love.png         /heart   /xin      /heart
+-meeting.png         /meeting /hy       /meeting
+-phone.png           /phone   /dh       /phone
+-tv.png              /TV      /ds       /TV
+-angry.png           /<O>     /oh       /angry
+-girl.png            /<00>    /nv       /woman
+-boy.png             /<11>    /nan      /man
+-
+-
+-# Following ICQ 6.0
+-[ICQ]
+-happy.png           :-)     :)
+-neutral.png         :-$
+-sad.png             :-(     :(
+-shocked.png         =-O
+-wink.png            ;-)     ;)
+-tongue.png          :-P     :P      :-p     :p
+-music.png           [:-}
+-sleeping.png        *TIRED*
+-crying.png          :'(    :'-(
+-sick.png            :-!
+-kiss.png            :-{} :-*
+-embarrassed.png     :-[
+-devil.png           ]:->
+-angel.png           O:-)
+-rose.png            @}->--
+-shut-mouth.png      :-X     :X      :-x     :x
+-thinking.png        :-\\    :-/
+-beer.png            *DRINK*
+-excited.png         :-D     :D
+-glasses-cool.png    8-)
+-amorous.png         *IN\ LOVE*
+-
+-
+-# Following Yahoo! Messenger 8.1
+-[Yahoo]
+-happy.png           :)      :-)
+-question.png        :-/     :-\\
+-shocked.png         :-O     :O      :-o     :o 
+-devil.png           >:)
+-angel.png           O:-)    o:-)    0:-)
+-sick.png            :-&
+-sleepy.png          (:|
+-sad.png             :(      :-(
+-amorous.png         :x      :-x     :X      :-X
+-angry.png           X-(     x-(     X(      x(
+-crying.png          :((
+-drool.png           =P~     =p~
+-lying.png           :^O     :^o
+-wink.png            ;)      ;-)
+-embarrassed.png     :">
+-mean.png            :->     :>
+-thinking.png        :-?
+-excited.png         :D      :-D     :d      :-d
+-tongue.png          :-P     :P      :-p     :p
+-glasses-cool.png    B-)     b-)
+-neutral.png         :|      :-|
+-sleeping.png        I-)     i-)     |-)
+-kiss.png            :-*     :*
+-confused.png        :-S     :-s
+-sarcastic.png       /:)
+-eyeroll.png         8-|
+-hug-left.png        >:D<    >:d<
+-hot.png             #:-S    #:-s
+-party.png           <:-P    <:-p
+-nervous.png         :-SS	:-Ss	:-sS	:-ss
+-
+-# Hidden Yahoo emotes
+-coffee.png          ~o)     ~O)
+-rose.png            @};-
+-dont-know.png       :-L     :-l
+-lamp.png            *-:)
+-shame.png           [-X     [-x
+-musical-note.png    :-"
+-star.png            (*)
+-
+-# Following Yahoo! Messenger 8.1
+-[Yahoo JAPAN]
+-happy.png           :)      :-)
+-question.png        :-/     :-\\
+-shocked.png         :-O     :O      :-o     :o 
+-devil.png           >:)
+-angel.png           O:-)    o:-)    0:-)
+-sick.png            :-&
+-sleepy.png          (:|
+-sad.png             :(      :-(
+-amorous.png         :x      :-x     :X      :-X
+-angry.png           X-(     x-(     X(      x(
+-crying.png          :((
+-wink.png            ;)      ;-)
+-thinking.png        :-?
+-excited.png         :D      :-D     :d      :-d
+-tongue.png          :-P     :P      :-p     :p
+-glasses-cool.png    B-)     b-)
+-neutral.png         :|      :-|
+-sleeping.png        I-)     i-)     |-)
+-kiss.png            :-*     :*
+-confused.png        :-S     :-s
+-sarcastic.png       /:)
+-eyeroll.png         8-|
+-hug-left.png        >:D<    >:d<
+-party.png           <:-P    <:-p
+-
+-# Hidden Yahoo emotes
+-coffee.png          ~o)     ~O)
+-rose.png            @};-
+-dont-know.png       :-L     :-l
+-lamp.png            *-:)
+-shame.png           [-X     [-x
+-musical-note.png    :-"
+-star.png            (*)
+-
+-
+-# Following MySpaceIM Beta 1.0.697.0
+-[MySpaceIM]
+-excited.png  	    :D      :-D
+-devil.png	    }:)
+-confused.png	    :Z
+-happy.png	    :)      :-)
+-amorous.png	    :X
+-pirate.png	    P)
+-shocked.png	    :O
+-neutral.png	    :|
+-tongue.png	    :P      :p
+-pissed-off.png	    B|
+-wink.png	    ;-)     ;)
+-sad.png		    :[
+-kiss.png            :x
+-
+-# MXit standard emoticons
+-[MXit]
+-happy.png           :-)     :)
+-sad.png             :-(     :(
+-wink.png            ;-)     ;)
+-excited.png         :-D     :D     :->      :>
+-neutral.png         :-|     :|
+-shocked.png         :-O     :O
+-tongue.png          :-P     :P
+-embarrassed.png     :-$     :$
+-glasses-cool.png    8-)
+-in_love.png         (H)
+-rose.png            (F)
+-### Added in v3.0
+-boy.png             (m)
+-girl.png            (f)
+-star.png            (*)
+-chilli.png          (c)
+-kiss.png            (x)
+-lamp.png            (i)
+-pissed-off.png      :e      :-e
+-shut-mouth.png      :-x     :x
+-thunder.png         (z)
+-coffee.png          (U)
+-mrgreen.png         (G)
+-### Added in v5.0
+-sick.png            :o(
+-excruciating.png    :-{     :{
+-amorous.png         :-}     :}
+-eyeroll.png         8-o     8o
+-crying.png          :'(
+-thinking.png        :-?     :?
+-drool.png           :-~     :~
+-sleeping.png        :-z     :z
+-lying.png           :L)
+-glasses-nerdy.png   8-|     8|
+-pirate.png          P-)
+-### Added in v5.9.7
+-bored.png           :-[     :[
+-cold.png            :-<     :<
+-confused.png        :-,     :,
+-hungry.png          :-C     :C
+-stressed.png        :-s     :s
+diff -Nur pidgin-2.10.7/pidgin/pixmaps/emotes/small/16/theme pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/small/16/theme
+--- pidgin-2.10.7/pidgin/pixmaps/emotes/small/16/theme	2013-02-11 07:17:58.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/small/16/theme	2013-08-16 23:17:03.828740061 -0300
+@@ -22,8 +22,7 @@
+ 
+ 
+ [XMPP]
+-# Following XEP-0038 + GTalk + our default set, in default set order
+-# The GTalk strings come from ticket #3307.
++# Following XEP-0038 + our default set, in default set order
+ happy.png           :)      :-)     =)
+ excited.png         :-D     :-d     :D      :d      =D      =d
+ sad.png             :-(     :(
+@@ -38,7 +37,7 @@
+ angel.png           O:-)    o:-)
+ shut-mouth.png      :-X
+ 
+-# Following XEP-0038 + GTalk
++# Following XEP-0038
+ angry.png           >:-(    >:(     X-(    x-(
+ rose.png            @->--   :rose:
+ phone.png           :telephone:
+@@ -53,269 +52,3 @@
+ neutral.png         :|      :-|
+ 
+ # Hidden icons from the default set.
+-
+-
+-# Following AIM 6.1
+-[AIM]
+-happy.png           :-)     :)
+-wink.png            ;-)     ;)
+-sad.png             :-(     :(
+-tongue.png          :P      :p      :-P     :-p
+-shocked.png         =-O
+-kiss.png            :-*
+-excited.png         :-D     :D
+-embarrassed.png     :-[
+-angel.png           O:-)
+-thinking.png        :-\\    :-/
+-crying.png          :'(
+-shut-mouth.png      :-X
+-glasses-cool.png    8-)
+-
+-
+-# Following Windows Live Messenger 8.1
+-[MSN]
+-happy.png           :)      :-)
+-excited.png         :D      :d      :-D     :-d
+-wink.png            ;)      ;-)
+-shocked.png         :-O     :-o     :O      :o
+-tongue.png          :-P     :P      :-p     :p
+-glasses-cool.png    (H)     (h)
+-angry.png           :@      :-@
+-embarrassed.png     :$      :-$
+-confused.png        :S      :s      :-S     :-s
+-sad.png             :(      :-(
+-crying.png          :'(
+-neutral.png         :|      :-|
+-devil.png           (6)
+-angel.png           (A)     (a)
+-in_love.png         (L)     (l)
+-star.png            (*)
+-musical-note.png    (8)
+-rose.png            (F)     (f)
+-kiss.png            (K)     (k)
+-camera.png          (P)     (p)
+-lamp.png            (I)     (i)
+-coffee.png          (C)     (c)
+-phone.png           (T)     (t)
+-hug-left.png        ({)
+-hug-right.png       (})
+-beer.png            (B)     (b)
+-boy.png             (Z)     (z)
+-girl.png            (X)     (x)
+-sarcastic.png       ^o)
+-sick.png            +o(
+-plate.png           (pl)
+-mobile.png          (mp)
+-dont-know.png       :^)
+-thinking.png        *-)
+-thunder.png         (li)
+-party.png           <:o)
+-eyeroll.png         8-)
+-sleepy.png          |-) 
+-
+-# Hidden MSN emotes
+-cigarette.png      	(ci)    (CI)
+-console.png			(xx)    (XX)
+-
+-
+-# Following QQ 2006
+-[QQ]
+-shocked.png         /:O      /jy       /surprised
+-party.png           /8-)     /dy       /revel
+-crying.png          /:<      /ll       /cry
+-shut-mouth.png      /:X      /bz       /shut_mouth
+-sleeping.png        /:Z      /shui     /sleep
+-embarrassed.png     /:-|     /gg       /embarassed
+-pissed-off.png      /:@      /fn       /pissed_off
+-excited.png         /:D      /cy       /toothy_smile
+-happy.png           /:)      /wx       /small_smile
+-sad.png             /:(      /ng       /sad
+-glasses-cool.png    /:+      /kuk      /cool
+-sick.png            /:T      /tu       /vomit
+-sleepy.png          /|-)     /kun      /sleepy
+-hot.png             /:L      /sweat
+-question.png        /?       /yiw      /question
+-excruciating.png    /:8      /zhem     /excrutiating
+-afraid.png          /shake   /fad      /shake
+-amorous.png         /love    /aiq      /love
+-search.png          /find    /zhao     /search
+-hug-left.png        /hug     /yb       /hug
+-lamp.png            /!       /dp       /lightbulb
+-thunder.png         /li      /shd      /lightning
+-musical-note.png    /music   /yy       /music
+-coffee.png          /coffee  /kf       /coffee
+-hungry.png          /eat     /fan      /eat
+-rose.png            /rose    /mg       /rose
+-kiss.png            /kiss    /wen      /kiss
+-in_love.png         /heart   /xin      /heart
+-meeting.png         /meeting /hy       /meeting
+-phone.png           /phone   /dh       /phone
+-tv.png              /TV      /ds       /TV
+-angry.png           /<O>     /oh       /angry
+-girl.png            /<00>    /nv       /woman
+-boy.png             /<11>    /nan      /man
+-
+-
+-# Following ICQ 6.0
+-[ICQ]
+-happy.png           :-)     :)
+-neutral.png         :-$
+-sad.png             :-(     :(
+-shocked.png         =-O
+-wink.png            ;-)     ;)
+-tongue.png          :-P     :P      :-p     :p
+-music.png           [:-}
+-sleeping.png        *TIRED*
+-crying.png          :'(    :'-(
+-sick.png            :-!
+-kiss.png            :-{} :-*
+-embarrassed.png     :-[
+-devil.png           ]:->
+-angel.png           O:-)
+-rose.png            @}->--
+-shut-mouth.png      :-X     :X      :-x     :x
+-thinking.png        :-\\    :-/
+-beer.png            *DRINK*
+-excited.png         :-D     :D
+-glasses-cool.png    8-)
+-amorous.png         *IN\ LOVE*
+-
+-
+-# Following Yahoo! Messenger 8.1
+-[Yahoo]
+-happy.png           :)      :-)
+-question.png        :-/     :-\\
+-shocked.png         :-O     :O      :-o     :o 
+-devil.png           >:)
+-angel.png           O:-)    o:-)    0:-)
+-sick.png            :-&
+-sleepy.png          (:|
+-sad.png             :(      :-(
+-amorous.png         :x      :-x     :X      :-X
+-angry.png           X-(     x-(     X(      x(
+-crying.png          :((
+-drool.png           =P~     =p~
+-lying.png           :^O     :^o
+-wink.png            ;)      ;-)
+-embarrassed.png     :">
+-mean.png            :->     :>
+-thinking.png        :-?
+-excited.png         :D      :-D     :d      :-d
+-tongue.png          :-P     :P      :-p     :p
+-glasses-cool.png    B-)     b-)
+-neutral.png         :|      :-|
+-sleeping.png        I-)     i-)     |-)
+-kiss.png            :-*     :*
+-confused.png        :-S     :-s
+-sarcastic.png       /:)
+-eyeroll.png         8-|
+-hug-left.png        >:D<    >:d<
+-hot.png             #:-S    #:-s
+-party.png           <:-P    <:-p
+-nervous.png         :-SS	:-Ss	:-sS	:-ss
+-
+-# Hidden Yahoo emotes
+-coffee.png          ~o)     ~O)
+-rose.png            @};-
+-dont-know.png       :-L     :-l
+-lamp.png            *-:)
+-shame.png           [-X     [-x
+-musical-note.png    :-"
+-star.png            (*)
+-
+-# Following Yahoo! Messenger 8.1
+-[Yahoo JAPAN]
+-happy.png           :)      :-)
+-question.png        :-/     :-\\
+-shocked.png         :-O     :O      :-o     :o 
+-devil.png           >:)
+-angel.png           O:-)    o:-)    0:-)
+-sick.png            :-&
+-sleepy.png          (:|
+-sad.png             :(      :-(
+-amorous.png         :x      :-x     :X      :-X
+-angry.png           X-(     x-(     X(      x(
+-crying.png          :((
+-wink.png            ;)      ;-)
+-thinking.png        :-?
+-excited.png         :D      :-D     :d      :-d
+-tongue.png          :-P     :P      :-p     :p
+-glasses-cool.png    B-)     b-)
+-neutral.png         :|      :-|
+-sleeping.png        I-)     i-)     |-)
+-kiss.png            :-*     :*
+-confused.png        :-S     :-s
+-sarcastic.png       /:)
+-eyeroll.png         8-|
+-hug-left.png        >:D<    >:d<
+-party.png           <:-P    <:-p
+-
+-# Hidden Yahoo emotes
+-coffee.png          ~o)     ~O)
+-rose.png            @};-
+-dont-know.png       :-L     :-l
+-lamp.png            *-:)
+-shame.png           [-X     [-x
+-musical-note.png    :-"
+-star.png            (*)
+-
+-
+-# Following MySpaceIM Beta 1.0.697.0
+-[MySpaceIM]
+-excited.png  	    :D      :-D
+-devil.png	    }:)
+-confused.png	    :Z
+-happy.png	    :)      :-)
+-amorous.png	    :X
+-pirate.png	    P)
+-shocked.png	    :O
+-neutral.png	    :|
+-tongue.png	    :P      :p
+-pissed-off.png	    B|
+-wink.png	    ;-)     ;)
+-sad.png		    :[
+-kiss.png            :x
+-
+-# MXit standard emoticons
+-[MXit]
+-happy.png           :-)     :)
+-sad.png             :-(     :(
+-wink.png            ;-)     ;)
+-excited.png         :-D     :D     :->      :>
+-neutral.png         :-|     :|
+-shocked.png         :-O     :O
+-tongue.png          :-P     :P
+-embarrassed.png     :-$     :$
+-glasses-cool.png    8-)
+-in_love.png         (H)
+-rose.png            (F)
+-### Added in v3.0
+-boy.png             (m)
+-girl.png            (f)
+-star.png            (*)
+-chilli.png          (c)
+-kiss.png            (x)
+-lamp.png            (i)
+-pissed-off.png      :e      :-e
+-shut-mouth.png      :-x     :x
+-thunder.png         (z)
+-coffee.png          (U)
+-mrgreen.png         (G)
+-### Added in v5.0
+-sick.png            :o(
+-excruciating.png    :-{     :{
+-amorous.png         :-}     :}
+-eyeroll.png         8-o     8o
+-crying.png          :'(
+-thinking.png        :-?     :?
+-drool.png           :-~     :~
+-sleeping.png        :-z     :z
+-lying.png           :L)
+-glasses-nerdy.png   8-|     8|
+-pirate.png          P-)
+-### Added in v5.9.7
+-bored.png           :-[     :[
+-cold.png            :-<     :<
+-confused.png        :-,     :,
+-hungry.png          :-C     :C
+-stressed.png        :-s     :s
+diff -Nur pidgin-2.10.7/pidgin/pixmaps/Makefile.am pidgin-2.10.7-nonprism/pidgin/pixmaps/Makefile.am
+--- pidgin-2.10.7/pidgin/pixmaps/Makefile.am	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/pixmaps/Makefile.am	2013-08-17 00:00:17.335924146 -0300
+@@ -204,37 +204,19 @@
+ 		emotes/small/16/scalable/pidgin-emotes.svg
+ 
+ PROTOCOLS_16_SCALABLE = \
+-		protocols/16/scalable/aim.svg \
+ 		protocols/16/scalable/bonjour.svg \
+-		protocols/16/scalable/gadu-gadu.svg \
+-		protocols/16/scalable/novell.svg \
+-		protocols/16/scalable/icq.svg \
+ 		protocols/16/scalable/irc.svg \
+ 		protocols/16/scalable/jabber.svg \
+-		protocols/16/scalable/meanwhile.svg \
+-		protocols/16/scalable/msn.svg \
+ 		protocols/16/scalable/silc.svg \
+ 		protocols/16/scalable/simple.svg \
+-		protocols/16/scalable/yahoo.svg \
+ 		protocols/16/scalable/zephyr.svg
+ 
+ PROTOCOLS_16 = \
+-		protocols/16/aim.png \
+ 		protocols/16/bonjour.png \
+-		protocols/16/facebook.png \
+-		protocols/16/gadu-gadu.png \
+-		protocols/16/google-talk.png \
+-		protocols/16/novell.png \
+-		protocols/16/icq.png \
+ 		protocols/16/irc.png \
+ 		protocols/16/jabber.png \
+-		protocols/16/meanwhile.png \
+-		protocols/16/msn.png \
+-		protocols/16/mxit.png \
+-		protocols/16/myspace.png \
+ 		protocols/16/silc.png \
+ 		protocols/16/simple.png \
+-		protocols/16/yahoo.png \
+ 		protocols/16/zephyr.png
+ 
+ ICONS_16_SCALABLE = \
+@@ -259,72 +241,35 @@
+ ICONS_SCALABLE = icons/hicolor/scalable/apps/pidgin.svg
+ 
+ PROTOCOLS_22_SCALABLE = \
+-		protocols/22/scalable/aim.svg \
+ 		protocols/22/scalable/bonjour.svg \
+-		protocols/22/scalable/gadu-gadu.svg \
+-		protocols/22/scalable/novell.svg \
+-		protocols/22/scalable/icq.svg \
+ 		protocols/22/scalable/irc.svg \
+ 		protocols/22/scalable/jabber.svg \
+-		protocols/22/scalable/meanwhile.svg \
+-		protocols/22/scalable/msn.svg \
+ 		protocols/22/scalable/silc.svg \
+ 		protocols/22/scalable/simple.svg \
+-		protocols/22/scalable/yahoo.svg \
+ 		protocols/22/scalable/zephyr.svg
+ 
+ PROTOCOLS_22 = \
+-		protocols/22/aim.png \
+ 		protocols/22/bonjour.png \
+-		protocols/22/facebook.png \
+-		protocols/22/gadu-gadu.png \
+-		protocols/22/google-talk.png \
+-		protocols/22/novell.png \
+-		protocols/22/icq.png \
+ 		protocols/22/irc.png \
+ 		protocols/22/jabber.png \
+-		protocols/22/meanwhile.png \
+-		protocols/22/msn.png \
+-		protocols/22/mxit.png \
+-		protocols/22/myspace.png \
+ 		protocols/22/silc.png \
+ 		protocols/22/simple.png \
+-		protocols/22/yahoo.png \
+ 		protocols/22/zephyr.png
+ 
+ PROTOCOLS_48 = \
+-		protocols/48/aim.png \
+ 		protocols/48/bonjour.png \
+-		protocols/48/facebook.png \
+-		protocols/48/gadu-gadu.png \
+-		protocols/48/novell.png \
+-		protocols/48/icq.png \
+ 		protocols/48/irc.png \
+ 		protocols/48/jabber.png \
+-		protocols/48/meanwhile.png \
+-		protocols/48/msn.png \
+-		protocols/48/mxit.png \
+-		protocols/48/myspace.png \
+ 		protocols/48/silc.png \
+ 		protocols/48/simple.png \
+-		protocols/48/yahoo.png \
+ 		protocols/48/zephyr.png
+ 
+ PROTOCOLS_SCALABLE = \
+-		protocols/scalable/aim.svg \
+ 		protocols/scalable/bonjour.svg \
+-		protocols/scalable/gadu-gadu.svg \
+-		protocols/scalable/google-talk.svg \
+-		protocols/scalable/novell.svg \
+-		protocols/scalable/icq.svg \
+ 		protocols/scalable/irc.svg \
+ 		protocols/scalable/jabber.svg \
+-		protocols/scalable/meanwhile.svg \
+-		protocols/scalable/msn.svg \
+-		protocols/scalable/mxit.svg \
+ 		protocols/scalable/silc.svg \
+ 		protocols/scalable/simple.svg \
+-		protocols/scalable/yahoo.svg \
+ 		protocols/scalable/zephyr.svg
+ 
+ STATUS_11 = \
+diff -Nur pidgin-2.10.7/pidgin/pixmaps/Makefile.in pidgin-2.10.7-nonprism/pidgin/pixmaps/Makefile.in
+--- pidgin-2.10.7/pidgin/pixmaps/Makefile.in	2013-02-11 07:17:23.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/pixmaps/Makefile.in	2013-08-16 23:59:52.918508551 -0300
+@@ -240,40 +240,19 @@
+ 	emblems/scalable/male.svg emblems/scalable/not-authorized.svg \
+ 	emblems/scalable/secure.svg emblems/scalable/unavailable.svg \
+ 	emblems/scalable/video.svg emblems/scalable/voice.svg \
+-	protocols/16/aim.png protocols/16/bonjour.png \
+-	protocols/16/facebook.png protocols/16/gadu-gadu.png \
+-	protocols/16/google-talk.png protocols/16/novell.png \
+-	protocols/16/icq.png protocols/16/irc.png \
+-	protocols/16/jabber.png protocols/16/meanwhile.png \
+-	protocols/16/msn.png protocols/16/mxit.png \
+-	protocols/16/myspace.png protocols/16/silc.png \
+-	protocols/16/simple.png protocols/16/yahoo.png \
+-	protocols/16/zephyr.png protocols/22/aim.png \
+-	protocols/22/bonjour.png protocols/22/facebook.png \
+-	protocols/22/gadu-gadu.png protocols/22/google-talk.png \
+-	protocols/22/novell.png protocols/22/icq.png \
+-	protocols/22/irc.png protocols/22/jabber.png \
+-	protocols/22/meanwhile.png protocols/22/msn.png \
+-	protocols/22/mxit.png protocols/22/myspace.png \
+-	protocols/22/silc.png protocols/22/simple.png \
+-	protocols/22/yahoo.png protocols/22/zephyr.png \
+-	protocols/48/aim.png protocols/48/bonjour.png \
+-	protocols/48/facebook.png protocols/48/gadu-gadu.png \
+-	protocols/48/novell.png protocols/48/icq.png \
+-	protocols/48/irc.png protocols/48/jabber.png \
+-	protocols/48/meanwhile.png protocols/48/msn.png \
+-	protocols/48/mxit.png protocols/48/myspace.png \
+-	protocols/48/silc.png protocols/48/simple.png \
+-	protocols/48/yahoo.png protocols/48/zephyr.png \
+-	protocols/scalable/aim.svg protocols/scalable/bonjour.svg \
+-	protocols/scalable/gadu-gadu.svg \
+-	protocols/scalable/google-talk.svg \
+-	protocols/scalable/novell.svg protocols/scalable/icq.svg \
+-	protocols/scalable/irc.svg protocols/scalable/jabber.svg \
+-	protocols/scalable/meanwhile.svg protocols/scalable/msn.svg \
+-	protocols/scalable/mxit.svg protocols/scalable/silc.svg \
+-	protocols/scalable/simple.svg protocols/scalable/yahoo.svg \
+-	protocols/scalable/zephyr.svg status/11/available.png \
++	protocols/16/bonjour.png protocols/16/irc.png \
++	protocols/16/jabber.png protocols/16/silc.png \
++	protocols/16/simple.png protocols/16/zephyr.png \
++	protocols/22/bonjour.png protocols/22/irc.png \
++	protocols/22/jabber.png protocols/22/silc.png \
++	protocols/22/simple.png protocols/22/zephyr.png \
++	protocols/48/bonjour.png protocols/48/irc.png \
++	protocols/48/jabber.png protocols/48/silc.png \
++	protocols/48/simple.png protocols/48/zephyr.png \
++	protocols/scalable/bonjour.svg protocols/scalable/irc.svg \
++	protocols/scalable/jabber.svg protocols/scalable/silc.svg \
++	protocols/scalable/simple.svg protocols/scalable/zephyr.svg \
++	status/11/available.png \
+ 	status/11/away.png status/11/busy.png status/11/chat.png \
+ 	status/11/extended-away.png status/11/invisible.png \
+ 	status/11/log-in.png status/11/log-out.png \
+@@ -443,8 +422,6 @@
+ FARSTREAM_CFLAGS = @FARSTREAM_CFLAGS@
+ FARSTREAM_LIBS = @FARSTREAM_LIBS@
+ FGREP = @FGREP@
+-GADU_CFLAGS = @GADU_CFLAGS@
+-GADU_LIBS = @GADU_LIBS@
+ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+@@ -506,8 +483,6 @@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+ MANIFEST_TOOL = @MANIFEST_TOOL@
+-MEANWHILE_CFLAGS = @MEANWHILE_CFLAGS@
+-MEANWHILE_LIBS = @MEANWHILE_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO_CFLAGS = @MONO_CFLAGS@
+@@ -850,37 +825,19 @@
+ @INSTALL_PIXMAPS_TRUE@		emotes/small/16/scalable/pidgin-emotes.svg
+ 
+ @INSTALL_PIXMAPS_TRUE@PROTOCOLS_16_SCALABLE = \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/aim.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/bonjour.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/gadu-gadu.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/novell.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/icq.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/irc.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/jabber.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/meanwhile.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/msn.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/silc.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/simple.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/yahoo.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/zephyr.svg
+ 
+ @INSTALL_PIXMAPS_TRUE@PROTOCOLS_16 = \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/aim.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/16/bonjour.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/facebook.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/gadu-gadu.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/google-talk.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/novell.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/icq.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/16/irc.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/16/jabber.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/meanwhile.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/msn.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/mxit.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/myspace.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/16/silc.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/16/simple.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/yahoo.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/16/zephyr.png
+ 
+ @INSTALL_PIXMAPS_TRUE@ICONS_16_SCALABLE = \
+@@ -899,72 +856,35 @@
+ @INSTALL_PIXMAPS_TRUE@ICONS_48 = icons/hicolor/48x48/apps/pidgin.png
+ @INSTALL_PIXMAPS_TRUE@ICONS_SCALABLE = icons/hicolor/scalable/apps/pidgin.svg
+ @INSTALL_PIXMAPS_TRUE@PROTOCOLS_22_SCALABLE = \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/aim.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/bonjour.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/gadu-gadu.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/novell.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/icq.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/irc.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/jabber.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/meanwhile.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/msn.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/silc.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/simple.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/yahoo.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/zephyr.svg
+ 
+ @INSTALL_PIXMAPS_TRUE@PROTOCOLS_22 = \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/aim.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/22/bonjour.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/facebook.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/gadu-gadu.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/google-talk.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/novell.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/icq.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/22/irc.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/22/jabber.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/meanwhile.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/msn.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/mxit.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/myspace.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/22/silc.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/22/simple.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/yahoo.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/22/zephyr.png
+ 
+ @INSTALL_PIXMAPS_TRUE@PROTOCOLS_48 = \
+-@INSTALL_PIXMAPS_TRUE@		protocols/48/aim.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/48/bonjour.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/48/facebook.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/48/gadu-gadu.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/48/novell.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/48/icq.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/48/irc.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/48/jabber.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/48/meanwhile.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/48/msn.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/48/mxit.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/48/myspace.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/48/silc.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/48/simple.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/48/yahoo.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/48/zephyr.png
+ 
+ @INSTALL_PIXMAPS_TRUE@PROTOCOLS_SCALABLE = \
+-@INSTALL_PIXMAPS_TRUE@		protocols/scalable/aim.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/scalable/bonjour.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/scalable/gadu-gadu.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/scalable/google-talk.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/scalable/novell.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/scalable/icq.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/scalable/irc.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/scalable/jabber.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/scalable/meanwhile.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/scalable/msn.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/scalable/mxit.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/scalable/silc.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/scalable/simple.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/scalable/yahoo.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/scalable/zephyr.svg
+ 
+ @INSTALL_PIXMAPS_TRUE@STATUS_11 = \
+diff -Nur pidgin-2.10.7/pidgin/plugins/disco/xmppdisco.c pidgin-2.10.7-nonprism/pidgin/plugins/disco/xmppdisco.c
+--- pidgin-2.10.7/pidgin/plugins/disco/xmppdisco.c	2013-02-11 07:16:54.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/plugins/disco/xmppdisco.c	2013-08-16 23:39:46.921427463 -0300
+@@ -250,9 +250,6 @@
+ 	const char *from;
+ 	const char *to;
+ } disco_type_mappings[] = {
+-	{ "gadu-gadu", "gadu-gadu" }, /* the prpl is prpl-gg, but list_icon returns "gadu-gadu" */
+-	{ "sametime",  "meanwhile" },
+-	{ "myspaceim", "myspace" },
+ 	{ "xmpp",      "jabber" }, /* prpl-jabber (mentioned in case the prpl is renamed so this line will match) */
+ 	{ NULL,        NULL }
+ };
+diff -Nur pidgin-2.10.7/pidgin/plugins/gevolution/add_buddy_dialog.c pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/add_buddy_dialog.c
+--- pidgin-2.10.7/pidgin/plugins/gevolution/add_buddy_dialog.c	2013-02-11 07:16:54.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/add_buddy_dialog.c	2013-08-16 21:26:56.293625899 -0300
+@@ -288,21 +288,13 @@
+ 	{
+ 		EContact *contact = E_CONTACT(c->data);
+ 		const char *name;
+-		GList *aims, *jabbers, *yahoos, *msns, *icqs, *novells, *ggs;
++		GList *jabbers;
+ 
+ 		name = e_contact_get_const(contact, E_CONTACT_FULL_NAME);
+ 
+-		aims    = e_contact_get(contact, E_CONTACT_IM_AIM);
+ 		jabbers = e_contact_get(contact, E_CONTACT_IM_JABBER);
+-		yahoos  = e_contact_get(contact, E_CONTACT_IM_YAHOO);
+-		msns    = e_contact_get(contact, E_CONTACT_IM_MSN);
+-		icqs    = e_contact_get(contact, E_CONTACT_IM_ICQ);
+-		novells = e_contact_get(contact, E_CONTACT_IM_GROUPWISE);
+-		ggs     = e_contact_get(contact, E_CONTACT_IM_GADUGADU);
+-
+-		if (aims == NULL && jabbers == NULL && yahoos == NULL &&
+-			msns == NULL && icqs == NULL && novells == NULL &&
+-			ggs == NULL)
++
++		if (jabbers == NULL)
+ 		{
+ 			GtkTreeIter iter;
+ 
+@@ -315,13 +307,7 @@
+ 		}
+ 		else
+ 		{
+-			add_ims(dialog, contact, name, aims,    "prpl-aim");
+ 			add_ims(dialog, contact, name, jabbers, "prpl-jabber");
+-			add_ims(dialog, contact, name, yahoos,  "prpl-yahoo");
+-			add_ims(dialog, contact, name, msns,    "prpl-msn");
+-			add_ims(dialog, contact, name, icqs,    "prpl-icq");
+-			add_ims(dialog, contact, name, novells, "prpl-novell");
+-			add_ims(dialog, contact, name, ggs,     "prpl-gg");
+ 		}
+ 	}
+ 
+@@ -367,7 +353,7 @@
+ 	{
+ 		EContact *contact = E_CONTACT(l->data);
+ 		const char *name;
+-		GList *aims, *jabbers, *yahoos, *msns, *icqs, *novells, *ggs;
++		GList *jabbers;
+ 
+ 		name = e_contact_get_const(contact, E_CONTACT_FULL_NAME);
+ 
+@@ -377,17 +363,9 @@
+ 			continue;
+ 		}
+ 
+-		aims    = e_contact_get(contact, E_CONTACT_IM_AIM);
+ 		jabbers = e_contact_get(contact, E_CONTACT_IM_JABBER);
+-		yahoos  = e_contact_get(contact, E_CONTACT_IM_YAHOO);
+-		msns    = e_contact_get(contact, E_CONTACT_IM_MSN);
+-		icqs    = e_contact_get(contact, E_CONTACT_IM_ICQ);
+-		novells = e_contact_get(contact, E_CONTACT_IM_GROUPWISE);
+-		ggs     = e_contact_get(contact, E_CONTACT_IM_GADUGADU);
+-
+-		if (aims == NULL && jabbers == NULL && yahoos == NULL &&
+-			msns == NULL && icqs == NULL && novells == NULL &&
+-			ggs == NULL)
++
++		if (jabbers == NULL)
+ 		{
+ 			GtkTreeIter iter;
+ 
+@@ -400,13 +378,7 @@
+ 		}
+ 		else
+ 		{
+-			add_ims(dialog, contact, name, aims,    "prpl-aim");
+ 			add_ims(dialog, contact, name, jabbers, "prpl-jabber");
+-			add_ims(dialog, contact, name, yahoos,  "prpl-yahoo");
+-			add_ims(dialog, contact, name, msns,    "prpl-msn");
+-			add_ims(dialog, contact, name, icqs,    "prpl-icq");
+-			add_ims(dialog, contact, name, novells, "prpl-novell");
+-			add_ims(dialog, contact, name, ggs,     "prpl-gg");
+ 		}
+ 	}
+ }
+diff -Nur pidgin-2.10.7/pidgin/plugins/gevolution/gevolution.c pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/gevolution.c
+--- pidgin-2.10.7/pidgin/plugins/gevolution/gevolution.c	2013-02-11 07:16:54.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/gevolution.c	2013-08-16 21:14:05.483056049 -0300
+@@ -119,13 +119,7 @@
+ 
+ 	name = e_contact_get_const(contact, E_CONTACT_FULL_NAME);
+ 
+-	update_ims_from_contact(contact, name, "prpl-aim",    E_CONTACT_IM_AIM);
+ 	update_ims_from_contact(contact, name, "prpl-jabber", E_CONTACT_IM_JABBER);
+-	update_ims_from_contact(contact, name, "prpl-yahoo",  E_CONTACT_IM_YAHOO);
+-	update_ims_from_contact(contact, name, "prpl-msn",    E_CONTACT_IM_MSN);
+-	update_ims_from_contact(contact, name, "prpl-icq",    E_CONTACT_IM_ICQ);
+-	update_ims_from_contact(contact, name, "prpl-novell", E_CONTACT_IM_GROUPWISE);
+-	update_ims_from_contact(contact, name, "prpl-gg",     E_CONTACT_IM_GADUGADU);
+ }
+ 
+ static void
+diff -Nur pidgin-2.10.7/pidgin/plugins/gevolution/gevo-util.c pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/gevo-util.c
+--- pidgin-2.10.7/pidgin/plugins/gevolution/gevo-util.c	2013-02-11 07:16:54.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/gevo-util.c	2013-08-16 23:20:45.692374640 -0300
+@@ -99,20 +99,8 @@
+ 
+ 	protocol_id = purple_account_get_protocol_id(account);
+ 
+-	if (!strcmp(protocol_id, "prpl-aim"))
+-		protocol_field = E_CONTACT_IM_AIM;
+-	else if (!strcmp(protocol_id, "prpl-icq"))
+-		protocol_field = E_CONTACT_IM_ICQ;
+-	else if (!strcmp(protocol_id, "prpl-msn"))
+-		protocol_field = E_CONTACT_IM_MSN;
+-	else if (!strcmp(protocol_id, "prpl-yahoo"))
+-		protocol_field = E_CONTACT_IM_YAHOO;
+-	else if (!strcmp(protocol_id, "prpl-jabber"))
++	if (!strcmp(protocol_id, "prpl-jabber"))
+ 		protocol_field = E_CONTACT_IM_JABBER;
+-	else if (!strcmp(protocol_id, "prpl-novell"))
+-		protocol_field = E_CONTACT_IM_GROUPWISE;
+-	else if (!strcmp(protocol_id, "prpl-gg"))
+-		protocol_field = E_CONTACT_IM_GADUGADU;
+ 
+ 	return protocol_field;
+ }
+@@ -169,18 +157,6 @@
+ 	{
+ 		PurpleAccount *account = purple_buddy_get_account(buddy);
+ 		const char *prpl_id = purple_account_get_protocol_id(account);
+-
+-		if (!strcmp(prpl_id, "prpl-msn"))
+-		{
+-			mail = g_strdup(purple_normalize(account,
+-										   purple_buddy_get_name(buddy)));
+-		}
+-		else if (!strcmp(prpl_id, "prpl-yahoo"))
+-		{
+-			mail = g_strdup_printf("%s@yahoo.com",
+-								   purple_normalize(account,
+-												  purple_buddy_get_name(buddy)));
+-		}
+ 	}
+ 
+ 	return mail;
+diff -Nur pidgin-2.10.7/pidgin/plugins/gevolution/new_person_dialog.c pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/new_person_dialog.c
+--- pidgin-2.10.7/pidgin/plugins/gevolution/new_person_dialog.c	2013-02-11 07:16:54.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/new_person_dialog.c	2013-08-16 21:23:26.207116339 -0300
+@@ -141,20 +141,8 @@
+ 		if (*email)
+ 			e_contact_set(contact, E_CONTACT_EMAIL_1, (gpointer)email);
+ 
+-		if (!strcmp(im_service, "prpl-aim"))
+-			field = E_CONTACT_IM_AIM;
+-		else if (!strcmp(im_service, "prpl-icq"))
+-			field = E_CONTACT_IM_ICQ;
+-		else if (!strcmp(im_service, "prpl-yahoo"))
+-			field = E_CONTACT_IM_YAHOO;
+-		else if (!strcmp(im_service, "prpl-jabber"))
++		if (!strcmp(im_service, "prpl-jabber"))
+ 			field = E_CONTACT_IM_JABBER;
+-		else if (!strcmp(im_service, "prpl-msn"))
+-			field = E_CONTACT_IM_MSN;
+-		else if (!strcmp(im_service, "prpl-novell"))
+-			field = E_CONTACT_IM_GROUPWISE;
+-		else if (!strcmp(im_service, "prpl-gg"))
+-			field = E_CONTACT_IM_GADUGADU;
+ 
+ 		if (field > 0)
+ 		{
+diff -Nur pidgin-2.10.7/pidgin.apspec.in pidgin-2.10.7-nonprism/pidgin.apspec.in
+--- pidgin-2.10.7/pidgin.apspec.in	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin.apspec.in	2013-08-16 20:53:14.523862926 -0300
+@@ -14,17 +14,13 @@
+ 
+ [Description]
+ Pidgin allows you to talk to anyone using a variety of messaging protocols,
+-including AIM (Oscar and TOC), ICQ, IRC, Yahoo!, MSN Messenger, XMPP,
+-Gadu-Gadu, and Zephyr. These protocols are implemented using a
++including IRC, XMPP and Zephyr. These protocols are implemented using a
+ modular, easy to use design. To use a protocol, just add an account using the
+ account editor.
+ 
+ Pidgin supports many common features of other clients, as well as many unique
+ features, such as perl scripting, TCL scripting and C plugins.
+ 
+-Pidgin is NOT affiliated with or endorsed by America Online, Inc., Microsoft
+-Corporation, Yahoo! Inc., or ICQ Inc.
+-
+ [BuildPrepare]
+ APBUILD_STATIC="Xss startup-notification-1" prepareBuild --enable-nss --enable-gnutls --enable-binreloc --disable-perl --disable-tcl --disable-gtktest --disable-glibtest --disable-vv  --disable-fortify
+ #APBUILD_STATIC="Xss startup-notification-1" prepareBuild --enable-nss --enable-gnutls --enable-binreloc --disable-perl --disable-tcl --disable-vv
+diff -Nur pidgin-2.10.7/pidgin.desktop.in pidgin-2.10.7-nonprism/pidgin.desktop.in
+--- pidgin-2.10.7/pidgin.desktop.in	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin.desktop.in	2013-08-16 23:07:34.874212867 -0300
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ _Name=Pidgin Internet Messenger
+ _GenericName=Internet Messenger
+-_Comment=Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more
++_Comment=Chat over IM.  Supports IRC, Jabber/XMPP and more
+ Exec=pidgin
+ Icon=pidgin
+ StartupNotify=true
+diff -Nur pidgin-2.10.7/pidgin.spec pidgin-2.10.7-nonprism/pidgin.spec
+--- pidgin-2.10.7/pidgin.spec	2013-02-11 07:17:59.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin.spec	2013-08-17 00:03:18.474815955 -0300
+@@ -34,7 +34,6 @@
+ %{!?_without_startupnotification:BuildRequires: startup-notification-devel}
+ %{?_with_avahi:BuildRequires: avahi-glib-devel}
+ %{!?_without_gtkspell:BuildRequires: gtkspell-devel}
+-%{?_with_meanwhile:BuildRequires: meanwhile-devel}
+ %{?_with_mono:BuildRequires: mono-devel}
+ %{?_with_sasl:BuildRequires: cyrus-sasl-devel >= 2}
+ %{!?_without_silc:BuildRequires: /usr/include/silc/silcclient.h}
+@@ -105,7 +104,6 @@
+ Group:      Applications/Internet
+ Obsoletes:  gaim-silc
+ Obsoletes:  gaim-tcl
+-Obsoletes:  gaim-gadugadu
+ Obsoletes:  pidgin-tcl < 2.0.0
+ Obsoletes:  pidgin-silc < 2.0.0
+ Obsoletes:  libpurple-perl < %{version}
+@@ -131,13 +129,6 @@
+ Requires:   libpurple >= %{apiver}
+ %endif
+ 
+-%if 0%{?_with_meanwhile:1}
+-%package -n libpurple-meanwhile
+-Summary:    Lotus Sametime plugin for Pidgin using the Meanwhile library
+-Group:      Applications/Internet
+-Requires:   libpurple >= %{apiver}
+-%endif
+-
+ %if 0%{?_with_mono:1}
+ %package -n libpurple-mono
+ Summary:    Mono .NET plugin support for Pidgin
+@@ -161,18 +152,14 @@
+ 
+ %description
+ Pidgin allows you to talk to anyone using a variety of messaging
+-protocols including AIM, MSN, Yahoo!, XMPP, Bonjour, Gadu-Gadu,
+-ICQ, IRC, Novell Groupwise, QQ, Lotus Sametime, SILC, Simple and
+-Zephyr.  These protocols are implemented using a modular, easy to
++protocols including XMPP, Bonjour, IRC, SILC, Simple and Zephyr.
++These protocols are implemented using a modular, easy to
+ use design.  To use a protocol, just add an account using the
+ account editor.
+ 
+ Pidgin supports many common features of other clients, as well as many
+ unique features, such as perl scripting, TCL scripting and C plugins.
+ 
+-Pidgin is not affiliated with or endorsed by America Online, Inc.,
+-Microsoft Corporation, Yahoo! Inc., or ICQ Inc.
+-
+ %description devel
+ The pidgin-devel package contains the header files, developer
+ documentation, and libraries required for development of Pidgin scripts
+@@ -182,9 +169,8 @@
+ libpurple contains the core IM support for IM clients such as Pidgin
+ and Finch.
+ 
+-libpurple supports a variety of messaging protocols including AIM, MSN,
+-Yahoo!, XMPP, Bonjour, Gadu-Gadu, ICQ, IRC, Novell Groupwise, QQ,
+-Lotus Sametime, SILC, Simple and Zephyr.
++libpurple supports a variety of messaging protocols including XMPP,
++Bonjour, IRC, SILC, Simple and Zephyr.
+ 
+ %description -n libpurple-devel
+ The libpurple-devel package contains the header files, developer
+@@ -196,11 +182,6 @@
+ Bonjour plugin for Pidgin.
+ %endif
+ 
+-%if 0%{?_with_meanwhile:1}
+-%description -n libpurple-meanwhile
+-Lotus Sametime plugin for Pidgin using the Meanwhile library.
+-%endif
+-
+ %if 0%{?_with_mono:1}
+ %description -n libpurple-mono
+ Mono plugin loader for Pidgin.  This package will allow you to write or
+@@ -236,7 +217,6 @@
+                                     %{!?_with_vv:--disable-vv} \
+                                     %{!?_with_dbus:--disable-dbus} \
+                                     %{!?_with_avahi:--disable-avahi} \
+-                                    %{!?_with_meanwhile:--disable-meanwhile} \
+                                     %{?_without_gstreamer:--disable-gstreamer} \
+                                     %{?_without_gtkspell:--disable-gtkspell} \
+                                     %{?_without_nm:--disable-nm} \
+@@ -258,9 +238,7 @@
+ rm -f $RPM_BUILD_ROOT%{_libdir}/gnt/*.la
+ rm -f $RPM_BUILD_ROOT%{_libdir}/pidgin/*.la
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/*.la
+-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/liboscar.so
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libjabber.so
+-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libymsg.so
+ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+ rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
+ find $RPM_BUILD_ROOT -type f -name '*.a' -exec rm -f {} ';'
+@@ -271,10 +249,6 @@
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libbonjour.so
+ %endif
+ 
+-%if 0%{!?_with_meanwhile:1}
+-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libsametime.so
+-%endif
+-
+ %if 0%{!?_with_mono:1}
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/mono.so
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/*.dll
+@@ -299,7 +273,6 @@
+ find $RPM_BUILD_ROOT%{_libdir}/purple-2 -xtype f -print | \
+         sed "s@^$RPM_BUILD_ROOT@@g" | \
+         grep -v /libbonjour.so | \
+-        grep -v /libsametime.so | \
+         grep -v /mono.so | \
+         grep -v ".dll$" > %{name}-%{version}-purpleplugins
+ 
+@@ -435,13 +408,6 @@
+ %{_libdir}/purple-2/libbonjour.*
+ %endif
+ 
+-%if 0%{?_with_meanwhile:1}
+-%files -n libpurple-meanwhile
+-%defattr(-, root, root)
+-
+-%{_libdir}/purple-2/libsametime.*
+-%endif
+-
+ %if 0%{?_with_mono:1}
+ %files -n libpurple-mono
+ %defattr(-, root, root)
+@@ -492,9 +458,6 @@
+ * Sat Jul 11 2009 Stu Tomlinson <stu@nosnilmot.com>
+ - Update to reflect changes in perl module installation directories
+ 
+-* Mon May 19 2008 Stu Tomlinson <stu@nosnilmot.com>
+-- Fix building without meanwhile support
+-
+ * Fri May 16 2008 Stu Tomlinson <stu@nosnilmot.com>
+ - Add "--without nm" support to build without NetworkManager
+ 
+@@ -586,8 +549,6 @@
+ - Update to reflect renaming to pidgin/libpurple
+ 
+ * Sun Oct  1 2006 Stu Tomlinson <stu@nosnilmot.com>
+-- We can build with internal gadu gadu again, so bring it back into the
+-  main package
+ - Deal with gconf schame uninstallation on package upgrade and removal
+ 
+ * Sun Aug 20 2006 Stu Tomlinson <stu@nosnilmot.com>
+@@ -606,19 +567,14 @@
+ - Source RPM uses tar.bz2 now to save space
+ - Update BuildRequires for new intltool dependencies
+ - Add a --with perlmakehack option to allow builds to succeed on RH9
+-- Add a --with gadugadu to build (separate) gaim-gadugadu package
+ 
+ * Sat Dec 17 2005 Stu Tomlinson <stu@nosnilmot.com>
+ - Add support for beta versions so the subsequent releases are seen as newer
+   by RPM
+-- Split of sametime support to gaim-meanwhile
+ - Use make DESTDIR=... instead of overloading prefix etc. when installing
+ - Default build to include cyrus-sasl support in Jabber
+ - Add --with dbus to build with DBUS support
+ 
+-* Sun Dec 04 2005 Christopher O'Brien <siege@preoccupied.net>
+-- Added obsoletes gaim-meanwhile
+-
+ * Sun Oct 30 2005 Stu Tomlinson <stu@nosnilmot.com>
+ - Add separate gaim-bonjour package if built with --with-howl
+ - Add separate gaim-mono package if built with --with-mono
+diff -Nur pidgin-2.10.7/pidgin.spec.in pidgin-2.10.7-nonprism/pidgin.spec.in
+--- pidgin-2.10.7/pidgin.spec.in	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin.spec.in	2013-08-17 00:07:12.251996234 -0300
+@@ -34,7 +34,6 @@
+ %{!?_without_startupnotification:BuildRequires: startup-notification-devel}
+ %{?_with_avahi:BuildRequires: avahi-glib-devel}
+ %{!?_without_gtkspell:BuildRequires: gtkspell-devel}
+-%{?_with_meanwhile:BuildRequires: meanwhile-devel}
+ %{?_with_mono:BuildRequires: mono-devel}
+ %{?_with_sasl:BuildRequires: cyrus-sasl-devel >= 2}
+ %{!?_without_silc:BuildRequires: /usr/include/silc/silcclient.h}
+@@ -105,7 +104,6 @@
+ Group:      Applications/Internet
+ Obsoletes:  gaim-silc
+ Obsoletes:  gaim-tcl
+-Obsoletes:  gaim-gadugadu
+ Obsoletes:  pidgin-tcl < 2.0.0
+ Obsoletes:  pidgin-silc < 2.0.0
+ Obsoletes:  libpurple-perl < %{version}
+@@ -131,13 +129,6 @@
+ Requires:   libpurple >= %{apiver}
+ %endif
+ 
+-%if 0%{?_with_meanwhile:1}
+-%package -n libpurple-meanwhile
+-Summary:    Lotus Sametime plugin for Pidgin using the Meanwhile library
+-Group:      Applications/Internet
+-Requires:   libpurple >= %{apiver}
+-%endif
+-
+ %if 0%{?_with_mono:1}
+ %package -n libpurple-mono
+ Summary:    Mono .NET plugin support for Pidgin
+@@ -161,18 +152,14 @@
+ 
+ %description
+ Pidgin allows you to talk to anyone using a variety of messaging
+-protocols including AIM, MSN, Yahoo!, XMPP, Bonjour, Gadu-Gadu,
+-ICQ, IRC, Novell Groupwise, QQ, Lotus Sametime, SILC, Simple and
+-Zephyr.  These protocols are implemented using a modular, easy to
++protocols including XMPP, Bonjour, IRC, SILC, Simple and Zephyr.
++These protocols are implemented using a modular, easy to
+ use design.  To use a protocol, just add an account using the
+ account editor.
+ 
+ Pidgin supports many common features of other clients, as well as many
+ unique features, such as perl scripting, TCL scripting and C plugins.
+ 
+-Pidgin is not affiliated with or endorsed by America Online, Inc.,
+-Microsoft Corporation, Yahoo! Inc., or ICQ Inc.
+-
+ %description devel
+ The pidgin-devel package contains the header files, developer
+ documentation, and libraries required for development of Pidgin scripts
+@@ -182,9 +169,8 @@
+ libpurple contains the core IM support for IM clients such as Pidgin
+ and Finch.
+ 
+-libpurple supports a variety of messaging protocols including AIM, MSN,
+-Yahoo!, XMPP, Bonjour, Gadu-Gadu, ICQ, IRC, Novell Groupwise, QQ,
+-Lotus Sametime, SILC, Simple and Zephyr.
++libpurple supports a variety of messaging protocols including XMPP,
++Bonjour, IRC, SILC, Simple and Zephyr.
+ 
+ %description -n libpurple-devel
+ The libpurple-devel package contains the header files, developer
+@@ -196,11 +182,6 @@
+ Bonjour plugin for Pidgin.
+ %endif
+ 
+-%if 0%{?_with_meanwhile:1}
+-%description -n libpurple-meanwhile
+-Lotus Sametime plugin for Pidgin using the Meanwhile library.
+-%endif
+-
+ %if 0%{?_with_mono:1}
+ %description -n libpurple-mono
+ Mono plugin loader for Pidgin.  This package will allow you to write or
+@@ -236,7 +217,6 @@
+                                     %{!?_with_vv:--disable-vv} \
+                                     %{!?_with_dbus:--disable-dbus} \
+                                     %{!?_with_avahi:--disable-avahi} \
+-                                    %{!?_with_meanwhile:--disable-meanwhile} \
+                                     %{?_without_gstreamer:--disable-gstreamer} \
+                                     %{?_without_gtkspell:--disable-gtkspell} \
+                                     %{?_without_nm:--disable-nm} \
+@@ -258,9 +238,7 @@
+ rm -f $RPM_BUILD_ROOT%{_libdir}/gnt/*.la
+ rm -f $RPM_BUILD_ROOT%{_libdir}/pidgin/*.la
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/*.la
+-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/liboscar.so
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libjabber.so
+-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libymsg.so
+ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+ rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
+ find $RPM_BUILD_ROOT -type f -name '*.a' -exec rm -f {} ';'
+@@ -271,10 +249,6 @@
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libbonjour.so
+ %endif
+ 
+-%if 0%{!?_with_meanwhile:1}
+-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libsametime.so
+-%endif
+-
+ %if 0%{!?_with_mono:1}
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/mono.so
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/*.dll
+@@ -299,7 +273,6 @@
+ find $RPM_BUILD_ROOT%{_libdir}/purple-2 -xtype f -print | \
+         sed "s@^$RPM_BUILD_ROOT@@g" | \
+         grep -v /libbonjour.so | \
+-        grep -v /libsametime.so | \
+         grep -v /mono.so | \
+         grep -v ".dll$" > %{name}-%{version}-purpleplugins
+ 
+@@ -435,13 +408,6 @@
+ %{_libdir}/purple-2/libbonjour.*
+ %endif
+ 
+-%if 0%{?_with_meanwhile:1}
+-%files -n libpurple-meanwhile
+-%defattr(-, root, root)
+-
+-%{_libdir}/purple-2/libsametime.*
+-%endif
+-
+ %if 0%{?_with_mono:1}
+ %files -n libpurple-mono
+ %defattr(-, root, root)
+@@ -492,9 +458,6 @@
+ * Sat Jul 11 2009 Stu Tomlinson <stu@nosnilmot.com>
+ - Update to reflect changes in perl module installation directories
+ 
+-* Mon May 19 2008 Stu Tomlinson <stu@nosnilmot.com>
+-- Fix building without meanwhile support
+-
+ * Fri May 16 2008 Stu Tomlinson <stu@nosnilmot.com>
+ - Add "--without nm" support to build without NetworkManager
+ 
+@@ -586,8 +549,6 @@
+ - Update to reflect renaming to pidgin/libpurple
+ 
+ * Sun Oct  1 2006 Stu Tomlinson <stu@nosnilmot.com>
+-- We can build with internal gadu gadu again, so bring it back into the
+-  main package
+ - Deal with gconf schame uninstallation on package upgrade and removal
+ 
+ * Sun Aug 20 2006 Stu Tomlinson <stu@nosnilmot.com>
+@@ -606,19 +567,14 @@
+ - Source RPM uses tar.bz2 now to save space
+ - Update BuildRequires for new intltool dependencies
+ - Add a --with perlmakehack option to allow builds to succeed on RH9
+-- Add a --with gadugadu to build (separate) gaim-gadugadu package
+ 
+ * Sat Dec 17 2005 Stu Tomlinson <stu@nosnilmot.com>
+ - Add support for beta versions so the subsequent releases are seen as newer
+   by RPM
+-- Split of sametime support to gaim-meanwhile
+ - Use make DESTDIR=... instead of overloading prefix etc. when installing
+ - Default build to include cyrus-sasl support in Jabber
+ - Add --with dbus to build with DBUS support
+ 
+-* Sun Dec 04 2005 Christopher O'Brien <siege@preoccupied.net>
+-- Added obsoletes gaim-meanwhile
+-
+ * Sun Oct 30 2005 Stu Tomlinson <stu@nosnilmot.com>
+ - Add separate gaim-bonjour package if built with --with-howl
+ - Add separate gaim-mono package if built with --with-mono
diff --git a/nonprism/pidgin-nonprism/nonprism.patch b/nonprism/pidgin-nonprism/nonprism.patch
new file mode 100644
index 000000000..485bef3c8
--- /dev/null
+++ b/nonprism/pidgin-nonprism/nonprism.patch
@@ -0,0 +1,4930 @@
+diff -Nur pidgin-2.10.7/config.h.in pidgin-2.10.7-nonprism/config.h.in
+--- pidgin-2.10.7/config.h.in	2013-02-11 07:17:16.000000000 -0200
++++ pidgin-2.10.7-nonprism/config.h.in	2013-08-16 22:16:16.833531712 -0300
+@@ -151,9 +151,6 @@
+ /* Define to 1 if you have the `db' library (-ldb). */
+ #undef HAVE_LIBDB
+ 
+-/* Define to 1 if you have libgadu. */
+-#undef HAVE_LIBGADU
+-
+ /* Define to 1 if you have the `nsl' library (-lnsl). */
+ #undef HAVE_LIBNSL
+ 
+diff -Nur pidgin-2.10.7/configure pidgin-2.10.7-nonprism/configure
+--- pidgin-2.10.7/configure	2013-02-11 07:17:26.000000000 -0200
++++ pidgin-2.10.7-nonprism/configure	2013-08-27 16:47:16.890662082 -0300
+@@ -716,45 +716,23 @@
+ STATIC_LINK_LIBS
+ STATIC_ZEPHYR_FALSE
+ STATIC_ZEPHYR_TRUE
+-STATIC_YAHOO_FALSE
+-STATIC_YAHOO_TRUE
+ STATIC_SIMPLE_FALSE
+ STATIC_SIMPLE_TRUE
+ STATIC_SILC_FALSE
+ STATIC_SILC_TRUE
+-STATIC_SAMETIME_FALSE
+-STATIC_SAMETIME_TRUE
+-STATIC_OSCAR_FALSE
+-STATIC_OSCAR_TRUE
+-STATIC_NOVELL_FALSE
+-STATIC_NOVELL_TRUE
+-STATIC_MXIT_FALSE
+-STATIC_MXIT_TRUE
+-STATIC_MYSPACE_FALSE
+-STATIC_MYSPACE_TRUE
+-STATIC_MSN_FALSE
+-STATIC_MSN_TRUE
+ STATIC_JABBER_FALSE
+ STATIC_JABBER_TRUE
+ STATIC_IRC_FALSE
+ STATIC_IRC_TRUE
+-STATIC_GG_FALSE
+-STATIC_GG_TRUE
+ STATIC_BONJOUR_FALSE
+ STATIC_BONJOUR_TRUE
+ STATIC_PRPLS
+ DISTRIB_FALSE
+ DISTRIB_TRUE
+-USE_INTERNAL_LIBGADU_FALSE
+-USE_INTERNAL_LIBGADU_TRUE
+-GADU_LIBS
+-GADU_CFLAGS
+ SILC_LIBS
+ SILC_CFLAGS
+ AVAHI_LIBS
+ AVAHI_CFLAGS
+-MEANWHILE_LIBS
+-MEANWHILE_CFLAGS
+ IDN_LIBS
+ IDN_CFLAGS
+ USE_VV_FALSE
+@@ -1021,14 +999,11 @@
+ enable_farstream
+ enable_vv
+ enable_idn
+-enable_meanwhile
+ enable_avahi
+ with_avahi_client_includes
+ with_avahi_client_libs
+ with_silc_includes
+ with_silc_libs
+-with_gadu_includes
+-with_gadu_libs
+ enable_distrib
+ with_static_prpls
+ with_dynamic_prpls
+@@ -1100,14 +1075,10 @@
+ FARSTREAM_LIBS
+ IDN_CFLAGS
+ IDN_LIBS
+-MEANWHILE_CFLAGS
+-MEANWHILE_LIBS
+ AVAHI_CFLAGS
+ AVAHI_LIBS
+ SILC_CFLAGS
+ SILC_LIBS
+-GADU_CFLAGS
+-GADU_LIBS
+ DBUS_CFLAGS
+ DBUS_LIBS
+ NETWORKMANAGER_CFLAGS
+@@ -1773,8 +1744,6 @@
+   --disable-farstream     compile without farstream support
+   --disable-vv            compile without voice and video support
+   --disable-idn           compile without IDN support
+-  --disable-meanwhile     compile without meanwhile (required for Sametime
+-                          support)
+   --disable-avahi         compile without avahi (required for Bonjour support)
+ 
+   --disable-plugins       compile without plugin support
+@@ -1826,9 +1795,6 @@
+   --with-silc-includes=DIR
+                           compile the SILC plugin against includes in DIR
+   --with-silc-libs=DIR    compile the SILC plugin against the SILC libs in DIR
+-  --with-gadu-includes=DIR
+-                          compile the Gadu-Gadu plugin against includes in DIR
+-  --with-gadu-libs=DIR    compile the Gadu-Gadu plugin against the libs in DIR
+   --with-static-prpls     Link to certain protocols statically
+   --with-dynamic-prpls    specify which protocols to build dynamically
+   --with-krb4=PREFIX      compile Zephyr plugin with Kerberos 4 support
+@@ -1905,17 +1871,11 @@
+               linker flags for FARSTREAM, overriding pkg-config
+   IDN_CFLAGS  C compiler flags for IDN, overriding pkg-config
+   IDN_LIBS    linker flags for IDN, overriding pkg-config
+-  MEANWHILE_CFLAGS
+-              C compiler flags for MEANWHILE, overriding pkg-config
+-  MEANWHILE_LIBS
+-              linker flags for MEANWHILE, overriding pkg-config
+   AVAHI_CFLAGS
+               C compiler flags for AVAHI, overriding pkg-config
+   AVAHI_LIBS  linker flags for AVAHI, overriding pkg-config
+   SILC_CFLAGS C compiler flags for SILC, overriding pkg-config
+   SILC_LIBS   linker flags for SILC, overriding pkg-config
+-  GADU_CFLAGS C compiler flags for GADU, overriding pkg-config
+-  GADU_LIBS   linker flags for GADU, overriding pkg-config
+   DBUS_CFLAGS C compiler flags for DBUS, overriding pkg-config
+   DBUS_LIBS   linker flags for DBUS, overriding pkg-config
+   NETWORKMANAGER_CFLAGS
+@@ -18487,105 +18447,6 @@
+ fi
+ fi
+ 
+-# Check whether --enable-meanwhile was given.
+-if test "${enable_meanwhile+set}" = set; then :
+-  enableval=$enable_meanwhile; enable_meanwhile="$enableval"
+-else
+-  enable_meanwhile="yes"
+-fi
+-
+-if test "x$enable_meanwhile" = "xyes"; then
+-
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MEANWHILE" >&5
+-$as_echo_n "checking for MEANWHILE... " >&6; }
+-
+-if test -n "$MEANWHILE_CFLAGS"; then
+-    pkg_cv_MEANWHILE_CFLAGS="$MEANWHILE_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"meanwhile >= 1.0.0 meanwhile < 2.0.0\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "meanwhile >= 1.0.0 meanwhile < 2.0.0") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_MEANWHILE_CFLAGS=`$PKG_CONFIG --cflags "meanwhile >= 1.0.0 meanwhile < 2.0.0" 2>/dev/null`
+-		      test "x$?" != "x0" && pkg_failed=yes
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-if test -n "$MEANWHILE_LIBS"; then
+-    pkg_cv_MEANWHILE_LIBS="$MEANWHILE_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"meanwhile >= 1.0.0 meanwhile < 2.0.0\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "meanwhile >= 1.0.0 meanwhile < 2.0.0") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_MEANWHILE_LIBS=`$PKG_CONFIG --libs "meanwhile >= 1.0.0 meanwhile < 2.0.0" 2>/dev/null`
+-		      test "x$?" != "x0" && pkg_failed=yes
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+-        _pkg_short_errors_supported=yes
+-else
+-        _pkg_short_errors_supported=no
+-fi
+-        if test $_pkg_short_errors_supported = yes; then
+-	        MEANWHILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "meanwhile >= 1.0.0 meanwhile < 2.0.0" 2>&1`
+-        else
+-	        MEANWHILE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "meanwhile >= 1.0.0 meanwhile < 2.0.0" 2>&1`
+-        fi
+-	# Put the nasty error message in config.log where it belongs
+-	echo "$MEANWHILE_PKG_ERRORS" >&5
+-
+-
+-		have_meanwhile="no"
+-		if test "x$force_deps" = "xyes" ; then
+-			as_fn_error $? "
+-Meanwhile development headers not found.
+-Use --disable-meanwhile if you do not need meanwhile (Sametime) support.
+-" "$LINENO" 5
+-		fi
+-elif test $pkg_failed = untried; then
+-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-		have_meanwhile="no"
+-		if test "x$force_deps" = "xyes" ; then
+-			as_fn_error $? "
+-Meanwhile development headers not found.
+-Use --disable-meanwhile if you do not need meanwhile (Sametime) support.
+-" "$LINENO" 5
+-		fi
+-else
+-	MEANWHILE_CFLAGS=$pkg_cv_MEANWHILE_CFLAGS
+-	MEANWHILE_LIBS=$pkg_cv_MEANWHILE_LIBS
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-		have_meanwhile="yes"
+-
+-fi
+-fi
+-
+-
+-
+ # Check whether --enable-avahi was given.
+ if test "${enable_avahi+set}" = set; then :
+   enableval=$enable_avahi; enable_avahi="$enableval"
+@@ -19207,267 +19068,6 @@
+ fi
+ 
+ 
+-# Check whether --with-gadu-includes was given.
+-if test "${with_gadu_includes+set}" = set; then :
+-  withval=$with_gadu_includes; ac_gadu_includes="$withval"
+-else
+-  ac_gadu_includes="no"
+-fi
+-
+-
+-# Check whether --with-gadu-libs was given.
+-if test "${with_gadu_libs+set}" = set; then :
+-  withval=$with_gadu_libs; ac_gadu_libs="$withval"
+-else
+-  ac_gadu_libs="no"
+-fi
+-
+-GADU_CFLAGS=""
+-GADU_LIBS=""
+-if test -n "$with_gadu_includes" || test -n "$with_gadu_libs"; then
+-	gadu_manual_check="yes"
+-else
+-	gadu_manual_check="no"
+-fi
+-if test "x$gadu_manual_check" = "xno"; then
+-
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GADU" >&5
+-$as_echo_n "checking for GADU... " >&6; }
+-
+-if test -n "$GADU_CFLAGS"; then
+-    pkg_cv_GADU_CFLAGS="$GADU_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgadu >= 1.11.0\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "libgadu >= 1.11.0") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_GADU_CFLAGS=`$PKG_CONFIG --cflags "libgadu >= 1.11.0" 2>/dev/null`
+-		      test "x$?" != "x0" && pkg_failed=yes
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-if test -n "$GADU_LIBS"; then
+-    pkg_cv_GADU_LIBS="$GADU_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgadu >= 1.11.0\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "libgadu >= 1.11.0") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_GADU_LIBS=`$PKG_CONFIG --libs "libgadu >= 1.11.0" 2>/dev/null`
+-		      test "x$?" != "x0" && pkg_failed=yes
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+-        _pkg_short_errors_supported=yes
+-else
+-        _pkg_short_errors_supported=no
+-fi
+-        if test $_pkg_short_errors_supported = yes; then
+-	        GADU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libgadu >= 1.11.0" 2>&1`
+-        else
+-	        GADU_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libgadu >= 1.11.0" 2>&1`
+-        fi
+-	# Put the nasty error message in config.log where it belongs
+-	echo "$GADU_PKG_ERRORS" >&5
+-
+-
+-		gadu_includes="no"
+-
+-elif test $pkg_failed = untried; then
+-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-		gadu_includes="no"
+-
+-else
+-	GADU_CFLAGS=$pkg_cv_GADU_CFLAGS
+-	GADU_LIBS=$pkg_cv_GADU_LIBS
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-		gadu_includes="yes"
+-		gadu_libs="yes"
+-
+-fi
+-else
+-	if test "$ac_gadu_includes" != "no"; then
+-		GADU_CFLAGS="-I$ac_gadu_includes"
+-	fi
+-	CPPFLAGS_save="$CPPFLAGS"
+-	CPPFLAGS="$CPPFLAGS $GADU_CFLAGS"
+-	ac_fn_c_check_header_mongrel "$LINENO" "libgadu.h" "ac_cv_header_libgadu_h" "$ac_includes_default"
+-if test "x$ac_cv_header_libgadu_h" = xyes; then :
+-  gadu_includes=yes
+-fi
+-
+-
+-	CPPFLAGS="$CPPFLAGS_save"
+-
+-	if test "$ac_gadu_libs" != "no"; then
+-		GADU_LIBS="-L$ac_gadu_libs"
+-	fi
+-	GADU_LIBS="$GADU_LIBS -lgadu"
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gg_libgadu_version in -lgadu" >&5
+-$as_echo_n "checking for gg_libgadu_version in -lgadu... " >&6; }
+-if ${ac_cv_lib_gadu_gg_libgadu_version+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lgadu $GADU_LIBS $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char gg_libgadu_version ();
+-int
+-main ()
+-{
+-return gg_libgadu_version ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_gadu_gg_libgadu_version=yes
+-else
+-  ac_cv_lib_gadu_gg_libgadu_version=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gadu_gg_libgadu_version" >&5
+-$as_echo "$ac_cv_lib_gadu_gg_libgadu_version" >&6; }
+-if test "x$ac_cv_lib_gadu_gg_libgadu_version" = xyes; then :
+-  gadu_libs=yes
+-fi
+-
+-fi
+-GADU_CFLAGS=`echo $GADU_CFLAGS |$sedpath 's/-Wall//'`
+-
+-if test "x$gadu_libs" = "xyes"; then
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libgadu GPL compatibility" >&5
+-$as_echo_n "checking for libgadu GPL compatibility... " >&6; }
+-	CPPFLAGS_save="$CPPFLAGS"
+-	CPPFLAGS="$CPPFLAGS $GADU_CFLAGS"
+-	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <libgadu.h>
+-int
+-main ()
+-{
+-
+-#if defined(__GG_LIBGADU_HAVE_OPENSSL) || defined(GG_CONFIG_HAVE_OPENSSL)
+-#error "libgadu is not compatible with the GPL when compiled with OpenSSL support."
+-#endif
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-
+-		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <libgadu.h>
+-int
+-main ()
+-{
+-
+-#if GG_DEFAULT_PROTOCOL_VERSION < 0x2e
+-#error "Your libgadu version is too old. libpurple requires 1.11.0 or higher."
+-#endif
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-
+-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-$as_echo "#define HAVE_LIBGADU 1" >>confdefs.h
+-
+-
+-else
+-
+-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-			echo
+-			echo
+-			echo "Your supplied copy of libgadu is too old."
+-			echo "Install version 1.11.0 or newer."
+-			echo "Then rerun this ./configure"
+-			echo
+-			echo "Falling back to using our own copy of libgadu"
+-			echo
+-			GADU_LIBS=""
+-			GADU_CFLAGS=""
+-			gadu_libs=no
+-
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-
+-else
+-
+-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-		echo
+-		echo
+-		echo "libgadu is not compatible with the GPL when compiled with OpenSSL support."
+-		echo "To compile against system libgadu, please recompile libgadu using:"
+-		echo "./autogen.sh --disable-libgadu-openssl --disable-static --enable-shared"
+-		echo "Then rerun this ./configure"
+-		echo
+-		echo "Falling back to using our own copy of libgadu"
+-		echo
+-		GADU_LIBS=""
+-		GADU_CFLAGS=""
+-		gadu_libs=no
+-
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-	CPPFLAGS="$CPPFLAGS_save"
+-fi
+-
+- if test "x$gadu_libs" != "xyes"; then
+-  USE_INTERNAL_LIBGADU_TRUE=
+-  USE_INTERNAL_LIBGADU_FALSE='#'
+-else
+-  USE_INTERNAL_LIBGADU_TRUE='#'
+-  USE_INTERNAL_LIBGADU_FALSE=
+-fi
+-
+-
+-if test "x$gadu_libs" = "x"; then
+-	gadu_libs=no
+-fi
+-
+ 
+ 
+ 
+@@ -19500,10 +19100,7 @@
+ fi
+ 
+ if test "x$STATIC_PRPLS" = "xall" ; then
+-	STATIC_PRPLS="bonjour gg irc jabber msn myspace mxit novell oscar sametime silc simple yahoo zephyr"
+-fi
+-if test "x$have_meanwhile" != "xyes" ; then
+-	STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/sametime//'`
++	STATIC_PRPLS="bonjour irc jabber silc simple zephyr"
+ fi
+ if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then
+ 	STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/bonjour//'`
+@@ -19519,46 +19116,22 @@
+ extern_init=
+ load_proto=
+ for i in $STATIC_PRPLS ; do
+-			if test \( "x$i" = "xoscar" -o "x$i" = "xaim" -o "x$i" = "xicq" \) -a "x$static_oscar" != "xyes"; then
+-		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/oscar/liboscar.la"
+-		extern_init="$extern_init extern gboolean purple_init_aim_plugin();"
+-		extern_init="$extern_init extern gboolean purple_init_icq_plugin();"
+-		load_proto="$load_proto purple_init_aim_plugin();"
+-		load_proto="$load_proto purple_init_icq_plugin();"
+-	elif test "x$i" = "xyahoo"; then
+-		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/yahoo/libymsg.la"
+-		extern_init="$extern_init extern gboolean purple_init_yahoo_plugin();"
+-		extern_init="$extern_init extern gboolean purple_init_yahoojp_plugin();"
+-		load_proto="$load_proto purple_init_yahoo_plugin();"
+-		load_proto="$load_proto purple_init_yahoojp_plugin();"
++	if test "x$i" = "xsilc"; then
++		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.la"
++	elif test "x$i" = "xsilc10"; then
++		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/libsilcpurple.la"
+ 	else
+-		if test "x$i" = "xsilc"; then
+-			STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.la"
+-		elif test "x$i" = "xsilc10"; then
+-			STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/libsilcpurple.la"
+-		else
+-			STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib$i.la"
+-		fi
+-		extern_init="$extern_init extern gboolean purple_init_${i}_plugin();"
+-		load_proto="$load_proto purple_init_${i}_plugin();"
++		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib$i.la"
+ 	fi
++	extern_init="$extern_init extern gboolean purple_init_${i}_plugin();"
++	load_proto="$load_proto purple_init_${i}_plugin();"
+ 	case $i in
+ 		bonjour)	static_bonjour=yes ;;
+-		gg)			static_gg=yes ;;
+ 		irc)		static_irc=yes ;;
+ 		jabber)		static_jabber=yes ;;
+-		msn)		static_msn=yes ;;
+-		myspace)	static_myspace=yes ;;
+-		mxit)		static_mxit=yes ;;
+-		novell)		static_novell=yes ;;
+-		oscar)		static_oscar=yes ;;
+-		aim)		static_oscar=yes ;;
+-		icq)		static_oscar=yes ;;
+-		sametime)	static_sametime=yes ;;
+ 		silc)		static_silc=yes ;;
+ 		silc10)		static_silc=yes ;;
+ 		simple)		static_simple=yes ;;
+-		yahoo)		static_yahoo=yes ;;
+ 		zephyr)		static_zephyr=yes ;;
+ 		*)			echo "Invalid static protocol $i!!" ; exit 1 ;;
+ 	esac
+@@ -19571,14 +19144,6 @@
+   STATIC_BONJOUR_FALSE=
+ fi
+ 
+- if test "x$static_gg" = "xyes"; then
+-  STATIC_GG_TRUE=
+-  STATIC_GG_FALSE='#'
+-else
+-  STATIC_GG_TRUE='#'
+-  STATIC_GG_FALSE=
+-fi
+-
+  if test "x$static_irc" = "xyes"; then
+   STATIC_IRC_TRUE=
+   STATIC_IRC_FALSE='#'
+@@ -19595,54 +19160,6 @@
+   STATIC_JABBER_FALSE=
+ fi
+ 
+- if test "x$static_msn" = "xyes"; then
+-  STATIC_MSN_TRUE=
+-  STATIC_MSN_FALSE='#'
+-else
+-  STATIC_MSN_TRUE='#'
+-  STATIC_MSN_FALSE=
+-fi
+-
+- if test "x$static_myspace" = "xyes"; then
+-  STATIC_MYSPACE_TRUE=
+-  STATIC_MYSPACE_FALSE='#'
+-else
+-  STATIC_MYSPACE_TRUE='#'
+-  STATIC_MYSPACE_FALSE=
+-fi
+-
+- if test "x$static_mxit" = "xyes"; then
+-  STATIC_MXIT_TRUE=
+-  STATIC_MXIT_FALSE='#'
+-else
+-  STATIC_MXIT_TRUE='#'
+-  STATIC_MXIT_FALSE=
+-fi
+-
+- if test "x$static_novell" = "xyes"; then
+-  STATIC_NOVELL_TRUE=
+-  STATIC_NOVELL_FALSE='#'
+-else
+-  STATIC_NOVELL_TRUE='#'
+-  STATIC_NOVELL_FALSE=
+-fi
+-
+- if test "x$static_oscar" = "xyes"; then
+-  STATIC_OSCAR_TRUE=
+-  STATIC_OSCAR_FALSE='#'
+-else
+-  STATIC_OSCAR_TRUE='#'
+-  STATIC_OSCAR_FALSE=
+-fi
+-
+- if test "x$static_sametime" = "xyes" -a "x$have_meanwhile" = "xyes"; then
+-  STATIC_SAMETIME_TRUE=
+-  STATIC_SAMETIME_FALSE='#'
+-else
+-  STATIC_SAMETIME_TRUE='#'
+-  STATIC_SAMETIME_FALSE=
+-fi
+-
+  if test "x$static_silc" = "xyes" -a "x$have_silc" = "xyes"; then
+   STATIC_SILC_TRUE=
+   STATIC_SILC_FALSE='#'
+@@ -19659,14 +19176,6 @@
+   STATIC_SIMPLE_FALSE=
+ fi
+ 
+- if test "x$static_yahoo" = "xyes"; then
+-  STATIC_YAHOO_TRUE=
+-  STATIC_YAHOO_FALSE='#'
+-else
+-  STATIC_YAHOO_TRUE='#'
+-  STATIC_YAHOO_FALSE=
+-fi
+-
+  if test "x$static_zephyr" = "xyes"; then
+   STATIC_ZEPHYR_TRUE=
+   STATIC_ZEPHYR_FALSE='#'
+@@ -19689,10 +19198,7 @@
+ fi
+ 
+ if test "x$DYNAMIC_PRPLS" = "xall" ; then
+-	DYNAMIC_PRPLS="bonjour gg irc jabber msn myspace mxit novell oscar sametime silc simple yahoo zephyr"
+-fi
+-if test "x$have_meanwhile" != "xyes"; then
+-	DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/sametime//'`
++	DYNAMIC_PRPLS="bonjour irc jabber silc simple zephyr"
+ fi
+ if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then
+ 	DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/bonjour//'`
+@@ -19707,22 +19213,12 @@
+ for i in $DYNAMIC_PRPLS ; do
+ 	case $i in
+ 		bonjour)	dynamic_bonjour=yes ;;
+-		gg)			dynamic_gg=yes ;;
+ 		irc)		dynamic_irc=yes ;;
+ 		jabber)		dynamic_jabber=yes ;;
+-		msn)		dynamic_msn=yes ;;
+-		myspace)	dynamic_myspace=yes ;;
+-		mxit)		dynamic_mxit=yes ;;
+-		novell)		dynamic_novell=yes ;;
+ 		null)		dynamic_null=yes ;;
+-		oscar)		dynamic_oscar=yes ;;
+-		aim)		dynamic_oscar=yes ;;
+-		icq)		dynamic_oscar=yes ;;
+-		sametime)	dynamic_sametime=yes ;;
+ 		silc)		dynamic_silc=yes ;;
+ 		silc10)		dynamic_silc=yes ;;
+ 		simple)		dynamic_simple=yes ;;
+-		yahoo)		dynamic_yahoo=yes ;;
+ 		zephyr)		dynamic_zephyr=yes ;;
+ 		*)			echo "Invalid dynamic protocol $i!!" ; exit 1 ;;
+ 	esac
+@@ -21001,7 +20497,7 @@
+ fi
+ 
+ 
+-msg_ssl="None. MSN, Yahoo!, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!"
++msg_ssl="None."
+ looked_for_gnutls="no"
+ if test "x$enable_gnutls" != "xno"; then
+ 	enable_gnutls="no"
+@@ -21871,19 +21367,17 @@
+ 	as_fn_error $? "
+ Neither GnuTLS or NSS SSL development headers found.
+ Use --disable-nss --disable-gnutls if you do not need SSL support.
+-MSN, Yahoo!, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!
++
+ " "$LINENO" 5
+ elif test "x$looked_for_gnutls" = "xyes" -a "x$force_deps" = "xyes" ; then
+ 	as_fn_error $? "
+ GnuTLS SSL development headers not found.
+ Use --disable-gnutls if you do not need SSL support.
+-MSN, Yahoo!, Novell Groupwise and Google Talk will not work without SSL support.
+ " "$LINENO" 5
+ elif test "x$looked_for_nss" = "xyes" -a "x$force_deps" = "xyes" ; then
+ 	as_fn_error $? "
+ NSS SSL development headers not found.
+ Use --disable-nss if you do not need SSL support.
+-MSN, Yahoo!, Novell Groupwise and Google Talk will not work without SSL support.
+ " "$LINENO" 5
+ fi
+ 
+@@ -23176,7 +22670,7 @@
+ fi
+ 
+ 
+-ac_config_files="$ac_config_files Makefile Doxyfile doc/Makefile doc/pidgin.1 doc/finch.1 m4macros/Makefile pidgin.apspec pidgin/Makefile pidgin/pidgin.pc pidgin/pidgin-uninstalled.pc pidgin/pidgin-2.pc pidgin/pidgin-2-uninstalled.pc pidgin/pixmaps/Makefile pidgin/pixmaps/emotes/default/24/Makefile pidgin/pixmaps/emotes/none/Makefile pidgin/pixmaps/emotes/small/16/Makefile pidgin/plugins/Makefile pidgin/plugins/cap/Makefile pidgin/plugins/disco/Makefile pidgin/plugins/gestures/Makefile pidgin/plugins/gevolution/Makefile pidgin/plugins/musicmessaging/Makefile pidgin/plugins/perl/Makefile pidgin/plugins/perl/common/Makefile.PL pidgin/plugins/ticker/Makefile libpurple/ciphers/Makefile libpurple/example/Makefile libpurple/gconf/Makefile libpurple/purple.pc libpurple/purple-uninstalled.pc libpurple/purple-2.pc libpurple/purple-2-uninstalled.pc libpurple/plugins/Makefile libpurple/plugins/mono/Makefile libpurple/plugins/mono/api/Makefile libpurple/plugins/mono/loader/Makefile libpurple/plugins/perl/Makefile libpurple/plugins/perl/common/Makefile.PL libpurple/plugins/ssl/Makefile libpurple/plugins/tcl/Makefile libpurple/Makefile libpurple/protocols/Makefile libpurple/protocols/bonjour/Makefile libpurple/protocols/gg/Makefile libpurple/protocols/irc/Makefile libpurple/protocols/jabber/Makefile libpurple/protocols/msn/Makefile libpurple/protocols/myspace/Makefile libpurple/protocols/mxit/Makefile libpurple/protocols/novell/Makefile libpurple/protocols/null/Makefile libpurple/protocols/oscar/Makefile libpurple/protocols/sametime/Makefile libpurple/protocols/silc/Makefile libpurple/protocols/silc10/Makefile libpurple/protocols/simple/Makefile libpurple/protocols/yahoo/Makefile libpurple/protocols/zephyr/Makefile libpurple/tests/Makefile libpurple/purple.h libpurple/version.h share/sounds/Makefile share/ca-certs/Makefile finch/finch.pc finch/Makefile finch/libgnt/Makefile finch/libgnt/gnt.pc finch/libgnt/wms/Makefile finch/plugins/Makefile po/Makefile.in pidgin.spec"
++ac_config_files="$ac_config_files Makefile Doxyfile doc/Makefile doc/pidgin.1 doc/finch.1 m4macros/Makefile pidgin.apspec pidgin/Makefile pidgin/pidgin.pc pidgin/pidgin-uninstalled.pc pidgin/pidgin-2.pc pidgin/pidgin-2-uninstalled.pc pidgin/pixmaps/Makefile pidgin/pixmaps/emotes/default/24/Makefile pidgin/pixmaps/emotes/none/Makefile pidgin/pixmaps/emotes/small/16/Makefile pidgin/plugins/Makefile pidgin/plugins/cap/Makefile pidgin/plugins/disco/Makefile pidgin/plugins/gestures/Makefile pidgin/plugins/gevolution/Makefile pidgin/plugins/musicmessaging/Makefile pidgin/plugins/perl/Makefile pidgin/plugins/perl/common/Makefile.PL pidgin/plugins/ticker/Makefile libpurple/ciphers/Makefile libpurple/example/Makefile libpurple/gconf/Makefile libpurple/purple.pc libpurple/purple-uninstalled.pc libpurple/purple-2.pc libpurple/purple-2-uninstalled.pc libpurple/plugins/Makefile libpurple/plugins/mono/Makefile libpurple/plugins/mono/api/Makefile libpurple/plugins/mono/loader/Makefile libpurple/plugins/perl/Makefile libpurple/plugins/perl/common/Makefile.PL libpurple/plugins/ssl/Makefile libpurple/plugins/tcl/Makefile libpurple/Makefile libpurple/protocols/Makefile libpurple/protocols/bonjour/Makefile libpurple/protocols/irc/Makefile libpurple/protocols/jabber/Makefile libpurple/protocols/null/Makefile libpurple/protocols/silc/Makefile libpurple/protocols/silc10/Makefile libpurple/protocols/simple/Makefile libpurple/protocols/zephyr/Makefile libpurple/tests/Makefile libpurple/purple.h libpurple/version.h share/sounds/Makefile share/ca-certs/Makefile finch/finch.pc finch/Makefile finch/libgnt/Makefile finch/libgnt/gnt.pc finch/libgnt/wms/Makefile finch/plugins/Makefile po/Makefile.in pidgin.spec"
+ 
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+@@ -23344,10 +22838,6 @@
+   as_fn_error $? "conditional \"USE_VV\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+-if test -z "${USE_INTERNAL_LIBGADU_TRUE}" && test -z "${USE_INTERNAL_LIBGADU_FALSE}"; then
+-  as_fn_error $? "conditional \"USE_INTERNAL_LIBGADU\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+ if test -z "${DISTRIB_TRUE}" && test -z "${DISTRIB_FALSE}"; then
+   as_fn_error $? "conditional \"DISTRIB\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+@@ -23356,10 +22846,6 @@
+   as_fn_error $? "conditional \"STATIC_BONJOUR\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+-if test -z "${STATIC_GG_TRUE}" && test -z "${STATIC_GG_FALSE}"; then
+-  as_fn_error $? "conditional \"STATIC_GG\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+ if test -z "${STATIC_IRC_TRUE}" && test -z "${STATIC_IRC_FALSE}"; then
+   as_fn_error $? "conditional \"STATIC_IRC\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+@@ -23368,30 +22854,6 @@
+   as_fn_error $? "conditional \"STATIC_JABBER\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+-if test -z "${STATIC_MSN_TRUE}" && test -z "${STATIC_MSN_FALSE}"; then
+-  as_fn_error $? "conditional \"STATIC_MSN\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+-if test -z "${STATIC_MYSPACE_TRUE}" && test -z "${STATIC_MYSPACE_FALSE}"; then
+-  as_fn_error $? "conditional \"STATIC_MYSPACE\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+-if test -z "${STATIC_MXIT_TRUE}" && test -z "${STATIC_MXIT_FALSE}"; then
+-  as_fn_error $? "conditional \"STATIC_MXIT\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+-if test -z "${STATIC_NOVELL_TRUE}" && test -z "${STATIC_NOVELL_FALSE}"; then
+-  as_fn_error $? "conditional \"STATIC_NOVELL\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+-if test -z "${STATIC_OSCAR_TRUE}" && test -z "${STATIC_OSCAR_FALSE}"; then
+-  as_fn_error $? "conditional \"STATIC_OSCAR\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+-if test -z "${STATIC_SAMETIME_TRUE}" && test -z "${STATIC_SAMETIME_FALSE}"; then
+-  as_fn_error $? "conditional \"STATIC_SAMETIME\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+ if test -z "${STATIC_SILC_TRUE}" && test -z "${STATIC_SILC_FALSE}"; then
+   as_fn_error $? "conditional \"STATIC_SILC\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+@@ -23400,10 +22862,6 @@
+   as_fn_error $? "conditional \"STATIC_SIMPLE\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+-if test -z "${STATIC_YAHOO_TRUE}" && test -z "${STATIC_YAHOO_FALSE}"; then
+-  as_fn_error $? "conditional \"STATIC_YAHOO\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+ if test -z "${STATIC_ZEPHYR_TRUE}" && test -z "${STATIC_ZEPHYR_FALSE}"; then
+   as_fn_error $? "conditional \"STATIC_ZEPHYR\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+@@ -24425,20 +23883,12 @@
+     "libpurple/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/Makefile" ;;
+     "libpurple/protocols/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/Makefile" ;;
+     "libpurple/protocols/bonjour/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/bonjour/Makefile" ;;
+-    "libpurple/protocols/gg/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/gg/Makefile" ;;
+     "libpurple/protocols/irc/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/irc/Makefile" ;;
+     "libpurple/protocols/jabber/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/jabber/Makefile" ;;
+-    "libpurple/protocols/msn/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/msn/Makefile" ;;
+-    "libpurple/protocols/myspace/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/myspace/Makefile" ;;
+-    "libpurple/protocols/mxit/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/mxit/Makefile" ;;
+-    "libpurple/protocols/novell/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/novell/Makefile" ;;
+     "libpurple/protocols/null/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/null/Makefile" ;;
+-    "libpurple/protocols/oscar/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/oscar/Makefile" ;;
+-    "libpurple/protocols/sametime/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/sametime/Makefile" ;;
+     "libpurple/protocols/silc/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/silc/Makefile" ;;
+     "libpurple/protocols/silc10/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/silc10/Makefile" ;;
+     "libpurple/protocols/simple/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/simple/Makefile" ;;
+-    "libpurple/protocols/yahoo/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/yahoo/Makefile" ;;
+     "libpurple/protocols/zephyr/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/zephyr/Makefile" ;;
+     "libpurple/tests/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/tests/Makefile" ;;
+     "libpurple/purple.h") CONFIG_FILES="$CONFIG_FILES libpurple/purple.h" ;;
+@@ -25863,7 +25313,6 @@
+ echo Build with Cyrus SASL support. : $enable_cyrus_sasl
+ echo Use kerberos 4 with zephyr.... : $kerberos
+ echo Use external libzephyr........ : $zephyr
+-echo Use external libgadu.......... : $gadu_libs
+ echo Install pixmaps............... : $enable_pixmaps
+ echo Old tray icon compatibility... : $enable_traycompat
+ echo Install translations.......... : $enable_i18n
+diff -Nur pidgin-2.10.7/configure.ac pidgin-2.10.7-nonprism/configure.ac
+--- pidgin-2.10.7/configure.ac	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/configure.ac	2013-08-16 23:44:41.800496326 -0300
+@@ -854,28 +854,6 @@
+ fi
+ 
+ dnl #######################################################################
+-dnl # Check for Meanwhile headers (for Sametime)
+-dnl #######################################################################
+-AC_ARG_ENABLE(meanwhile,
+-	[AC_HELP_STRING([--disable-meanwhile],
+-		[compile without meanwhile (required for Sametime support)])],
+-	enable_meanwhile="$enableval", enable_meanwhile="yes")
+-if test "x$enable_meanwhile" = "xyes"; then
+-	PKG_CHECK_MODULES(MEANWHILE, [meanwhile >= 1.0.0 meanwhile < 2.0.0], [
+-		have_meanwhile="yes"
+-	], [
+-		have_meanwhile="no"
+-		if test "x$force_deps" = "xyes" ; then
+-			AC_MSG_ERROR([
+-Meanwhile development headers not found.
+-Use --disable-meanwhile if you do not need meanwhile (Sametime) support.
+-])
+-		fi])
+-fi
+-AC_SUBST(MEANWHILE_CFLAGS)
+-AC_SUBST(MEANWHILE_LIBS)
+-
+-dnl #######################################################################
+ dnl # Check for Native Avahi headers (for Bonjour)
+ dnl #######################################################################
+ AC_ARG_ENABLE(avahi,
+@@ -1020,100 +998,6 @@
+ 	CPPFLAGS="$CPPFLAGS_save"
+ fi
+ 
+-dnl #######################################################################
+-dnl # Check for Gadu-Gadu client includes and libraries
+-dnl #######################################################################
+-AC_ARG_WITH(gadu-includes, [AC_HELP_STRING([--with-gadu-includes=DIR], [compile the Gadu-Gadu plugin against includes in DIR])], [ac_gadu_includes="$withval"], [ac_gadu_includes="no"])
+-AC_ARG_WITH(gadu-libs, [AC_HELP_STRING([--with-gadu-libs=DIR], [compile the Gadu-Gadu plugin against the libs in DIR])], [ac_gadu_libs="$withval"], [ac_gadu_libs="no"])
+-GADU_CFLAGS=""
+-GADU_LIBS=""
+-if test -n "$with_gadu_includes" || test -n "$with_gadu_libs"; then
+-	gadu_manual_check="yes"
+-else
+-	gadu_manual_check="no"
+-fi
+-if test "x$gadu_manual_check" = "xno"; then
+-	PKG_CHECK_MODULES(GADU, [libgadu >= 1.11.0], [
+-		gadu_includes="yes"
+-		gadu_libs="yes"
+-	], [
+-		gadu_includes="no"
+-	])
+-else
+-	if test "$ac_gadu_includes" != "no"; then
+-		GADU_CFLAGS="-I$ac_gadu_includes"
+-	fi
+-	CPPFLAGS_save="$CPPFLAGS"
+-	CPPFLAGS="$CPPFLAGS $GADU_CFLAGS"
+-	AC_CHECK_HEADER(libgadu.h, [gadu_includes=yes])
+-	CPPFLAGS="$CPPFLAGS_save"
+-
+-	if test "$ac_gadu_libs" != "no"; then
+-		GADU_LIBS="-L$ac_gadu_libs"
+-	fi
+-	GADU_LIBS="$GADU_LIBS -lgadu"
+-	AC_CHECK_LIB(gadu, gg_libgadu_version, [gadu_libs=yes], , $GADU_LIBS)
+-fi
+-GADU_CFLAGS=`echo $GADU_CFLAGS |$sedpath 's/-Wall//'`
+-
+-if test "x$gadu_libs" = "xyes"; then
+-	AC_MSG_CHECKING(for libgadu GPL compatibility)
+-	CPPFLAGS_save="$CPPFLAGS"
+-	CPPFLAGS="$CPPFLAGS $GADU_CFLAGS"
+-	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <libgadu.h>]], [[
+-#if defined(__GG_LIBGADU_HAVE_OPENSSL) || defined(GG_CONFIG_HAVE_OPENSSL)
+-#error "libgadu is not compatible with the GPL when compiled with OpenSSL support."
+-#endif
+-	]])], [
+-		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <libgadu.h>]], [[
+-#if GG_DEFAULT_PROTOCOL_VERSION < 0x2e
+-#error "Your libgadu version is too old. libpurple requires 1.11.0 or higher."
+-#endif
+-		]])], [
+-			AC_MSG_RESULT(yes)
+-			AC_DEFINE([HAVE_LIBGADU], [1],
+-				[Define to 1 if you have libgadu.])
+-		], [
+-			AC_MSG_RESULT(no)
+-			echo
+-			echo
+-			echo "Your supplied copy of libgadu is too old."
+-			echo "Install version 1.11.0 or newer."
+-			echo "Then rerun this ./configure"
+-			echo
+-			echo "Falling back to using our own copy of libgadu"
+-			echo
+-			GADU_LIBS=""
+-			GADU_CFLAGS=""
+-			gadu_libs=no
+-		])
+-	], [
+-		AC_MSG_RESULT(no)
+-		echo
+-		echo
+-		echo "libgadu is not compatible with the GPL when compiled with OpenSSL support."
+-		echo "To compile against system libgadu, please recompile libgadu using:"
+-		echo "./autogen.sh --disable-libgadu-openssl --disable-static --enable-shared"
+-		echo "Then rerun this ./configure"
+-		echo
+-		echo "Falling back to using our own copy of libgadu"
+-		echo
+-		GADU_LIBS=""
+-		GADU_CFLAGS=""
+-		gadu_libs=no
+-	])
+-	CPPFLAGS="$CPPFLAGS_save"
+-fi
+-
+-AM_CONDITIONAL(USE_INTERNAL_LIBGADU, test "x$gadu_libs" != "xyes")
+-
+-if test "x$gadu_libs" = "x"; then
+-	gadu_libs=no
+-fi
+-
+-AC_SUBST(GADU_LIBS)
+-AC_SUBST(GADU_CFLAGS)
+-
+ AC_ARG_ENABLE(distrib,,,enable_distrib=no)
+ AM_CONDITIONAL(DISTRIB, test "x$enable_distrib" = "xyes")
+ DYNAMIC_PRPLS=all
+@@ -1123,10 +1007,7 @@
+ fi
+ 
+ if test "x$STATIC_PRPLS" = "xall" ; then
+-	STATIC_PRPLS="bonjour gg irc jabber msn myspace mxit novell oscar sametime silc simple yahoo zephyr"
+-fi
+-if test "x$have_meanwhile" != "xyes" ; then
+-	STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/sametime//'`
++	STATIC_PRPLS="bonjour irc jabber silc simple zephyr"
+ fi
+ if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then
+ 	STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/bonjour//'`
+@@ -1143,64 +1024,31 @@
+ load_proto=
+ for i in $STATIC_PRPLS ; do
+ 	dnl Ugly special case for "libsilcpurple.la":
+-	dnl ... and Ugly special case for multi-protocol oscar and yahoo
+-	if test \( "x$i" = "xoscar" -o "x$i" = "xaim" -o "x$i" = "xicq" \) -a "x$static_oscar" != "xyes"; then
+-		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/oscar/liboscar.la"
+-		extern_init="$extern_init extern gboolean purple_init_aim_plugin();"
+-		extern_init="$extern_init extern gboolean purple_init_icq_plugin();"
+-		load_proto="$load_proto purple_init_aim_plugin();"
+-		load_proto="$load_proto purple_init_icq_plugin();"
+-	elif test "x$i" = "xyahoo"; then
+-		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/yahoo/libymsg.la"
+-		extern_init="$extern_init extern gboolean purple_init_yahoo_plugin();"
+-		extern_init="$extern_init extern gboolean purple_init_yahoojp_plugin();"
+-		load_proto="$load_proto purple_init_yahoo_plugin();"
+-		load_proto="$load_proto purple_init_yahoojp_plugin();"
++	if test "x$i" = "xsilc"; then
++		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.la"
++	elif test "x$i" = "xsilc10"; then
++		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/libsilcpurple.la"
+ 	else
+-		if test "x$i" = "xsilc"; then
+-			STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.la"
+-		elif test "x$i" = "xsilc10"; then
+-			STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/libsilcpurple.la"
+-		else
+-			STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib$i.la"
+-		fi
+-		extern_init="$extern_init extern gboolean purple_init_${i}_plugin();"
+-		load_proto="$load_proto purple_init_${i}_plugin();"
++		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib$i.la"
+ 	fi
++	extern_init="$extern_init extern gboolean purple_init_${i}_plugin();"
++	load_proto="$load_proto purple_init_${i}_plugin();"
+ 	case $i in
+ 		bonjour)	static_bonjour=yes ;;
+-		gg)			static_gg=yes ;;
+ 		irc)		static_irc=yes ;;
+ 		jabber)		static_jabber=yes ;;
+-		msn)		static_msn=yes ;;
+-		myspace)	static_myspace=yes ;;
+-		mxit)		static_mxit=yes ;;
+-		novell)		static_novell=yes ;;
+-		oscar)		static_oscar=yes ;;
+-		aim)		static_oscar=yes ;;
+-		icq)		static_oscar=yes ;;
+-		sametime)	static_sametime=yes ;;
+ 		silc)		static_silc=yes ;;
+ 		silc10)		static_silc=yes ;;
+ 		simple)		static_simple=yes ;;
+-		yahoo)		static_yahoo=yes ;;
+ 		zephyr)		static_zephyr=yes ;;
+ 		*)			echo "Invalid static protocol $i!!" ; exit 1 ;;
+ 	esac
+ done
+ AM_CONDITIONAL(STATIC_BONJOUR, test "x$static_bonjour" = "xyes")
+-AM_CONDITIONAL(STATIC_GG, test "x$static_gg" = "xyes")
+ AM_CONDITIONAL(STATIC_IRC, test "x$static_irc" = "xyes")
+ AM_CONDITIONAL(STATIC_JABBER, test "x$static_jabber" = "xyes")
+-AM_CONDITIONAL(STATIC_MSN, test "x$static_msn" = "xyes")
+-AM_CONDITIONAL(STATIC_MYSPACE, test "x$static_myspace" = "xyes")
+-AM_CONDITIONAL(STATIC_MXIT, test "x$static_mxit" = "xyes")
+-AM_CONDITIONAL(STATIC_NOVELL, test "x$static_novell" = "xyes")
+-AM_CONDITIONAL(STATIC_OSCAR, test "x$static_oscar" = "xyes")
+-AM_CONDITIONAL(STATIC_SAMETIME, test "x$static_sametime" = "xyes" -a "x$have_meanwhile" = "xyes")
+ AM_CONDITIONAL(STATIC_SILC, test "x$static_silc" = "xyes" -a "x$have_silc" = "xyes")
+ AM_CONDITIONAL(STATIC_SIMPLE, test "x$static_simple" = "xyes")
+-AM_CONDITIONAL(STATIC_YAHOO, test "x$static_yahoo" = "xyes")
+ AM_CONDITIONAL(STATIC_ZEPHYR, test "x$static_zephyr" = "xyes")
+ AC_SUBST(STATIC_LINK_LIBS)
+ AC_DEFINE_UNQUOTED(STATIC_PROTO_INIT, $extern_init static void static_proto_init(void) { $load_proto },
+@@ -1208,10 +1056,7 @@
+ 
+ AC_ARG_WITH(dynamic_prpls, [AC_HELP_STRING([--with-dynamic-prpls], [specify which protocols to build dynamically])], [DYNAMIC_PRPLS=`echo $withval | $sedpath 's/,/ /g'`])
+ if test "x$DYNAMIC_PRPLS" = "xall" ; then
+-	DYNAMIC_PRPLS="bonjour gg irc jabber msn myspace mxit novell oscar sametime silc simple yahoo zephyr"
+-fi
+-if test "x$have_meanwhile" != "xyes"; then
+-	DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/sametime//'`
++	DYNAMIC_PRPLS="bonjour irc jabber silc simple zephyr"
+ fi
+ if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then
+ 	DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/bonjour//'`
+@@ -1226,22 +1071,12 @@
+ for i in $DYNAMIC_PRPLS ; do
+ 	case $i in
+ 		bonjour)	dynamic_bonjour=yes ;;
+-		gg)			dynamic_gg=yes ;;
+ 		irc)		dynamic_irc=yes ;;
+ 		jabber)		dynamic_jabber=yes ;;
+-		msn)		dynamic_msn=yes ;;
+-		myspace)	dynamic_myspace=yes ;;
+-		mxit)		dynamic_mxit=yes ;;
+-		novell)		dynamic_novell=yes ;;
+ 		null)		dynamic_null=yes ;;
+-		oscar)		dynamic_oscar=yes ;;
+-		aim)		dynamic_oscar=yes ;;
+-		icq)		dynamic_oscar=yes ;;
+-		sametime)	dynamic_sametime=yes ;;
+ 		silc)		dynamic_silc=yes ;;
+ 		silc10)		dynamic_silc=yes ;;
+ 		simple)		dynamic_simple=yes ;;
+-		yahoo)		dynamic_yahoo=yes ;;
+ 		zephyr)		dynamic_zephyr=yes ;;
+ 		*)			echo "Invalid dynamic protocol $i!!" ; exit 1 ;;
+ 	esac
+@@ -1713,7 +1548,7 @@
+ 	[enable_nss="$enableval"],
+ 	[enable_nss="yes"])
+ 
+-msg_ssl="None. MSN, Yahoo!, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!"
++msg_ssl="None."
+ looked_for_gnutls="no"
+ dnl #
+ dnl # Check for GnuTLS if it's specified.
+@@ -2124,19 +1959,16 @@
+ 	AC_MSG_ERROR([
+ Neither GnuTLS or NSS SSL development headers found.
+ Use --disable-nss --disable-gnutls if you do not need SSL support.
+-MSN, Yahoo!, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!
+ ])
+ elif test "x$looked_for_gnutls" = "xyes" -a "x$force_deps" = "xyes" ; then
+ 	AC_MSG_ERROR([
+ GnuTLS SSL development headers not found.
+ Use --disable-gnutls if you do not need SSL support.
+-MSN, Yahoo!, Novell Groupwise and Google Talk will not work without SSL support.
+ ])
+ elif test "x$looked_for_nss" = "xyes" -a "x$force_deps" = "xyes" ; then
+ 	AC_MSG_ERROR([
+ NSS SSL development headers not found.
+ Use --disable-nss if you do not need SSL support.
+-MSN, Yahoo!, Novell Groupwise and Google Talk will not work without SSL support.
+ ])
+ fi
+ 
+@@ -2577,20 +2409,12 @@
+ 		   libpurple/Makefile
+ 		   libpurple/protocols/Makefile
+ 		   libpurple/protocols/bonjour/Makefile
+-		   libpurple/protocols/gg/Makefile
+ 		   libpurple/protocols/irc/Makefile
+ 		   libpurple/protocols/jabber/Makefile
+-		   libpurple/protocols/msn/Makefile
+-		   libpurple/protocols/myspace/Makefile
+-		   libpurple/protocols/mxit/Makefile
+-		   libpurple/protocols/novell/Makefile
+ 		   libpurple/protocols/null/Makefile
+-		   libpurple/protocols/oscar/Makefile
+-		   libpurple/protocols/sametime/Makefile
+ 		   libpurple/protocols/silc/Makefile
+ 		   libpurple/protocols/silc10/Makefile
+ 		   libpurple/protocols/simple/Makefile
+-		   libpurple/protocols/yahoo/Makefile
+ 		   libpurple/protocols/zephyr/Makefile
+ 		   libpurple/tests/Makefile
+ 		   libpurple/purple.h
+@@ -2635,7 +2459,6 @@
+ echo Build with Cyrus SASL support. : $enable_cyrus_sasl
+ echo Use kerberos 4 with zephyr.... : $kerberos
+ echo Use external libzephyr........ : $zephyr
+-echo Use external libgadu.......... : $gadu_libs
+ echo Install pixmaps............... : $enable_pixmaps
+ echo Old tray icon compatibility... : $enable_traycompat
+ echo Install translations.......... : $enable_i18n
+diff -Nur pidgin-2.10.7/doc/finch.1.in pidgin-2.10.7-nonprism/doc/finch.1.in
+--- pidgin-2.10.7/doc/finch.1.in	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/doc/finch.1.in	2013-08-16 21:01:16.682280145 -0300
+@@ -30,11 +30,8 @@
+ .SH DESCRIPTION
+ .PP
+ \fBfinch\fR is a console-based modular messaging client based on libpurple
+-which is capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC,
+-Novell GroupWise, Lotus Sametime, Zephyr, Gadu-Gadu, and QQ all at once. It has
++which is capable of connecting to XMPP, IRC, SILC and Zephyr all at once. It has
+ many common features found in other clients, as well as many unique features.
+-Finch is not endorsed by or affiliated with America Online, ICQ, Microsoft, or
+-Yahoo.
+ 
+ .SH OPTIONS
+ The following options are provided by \fBfinch\fR using the standard GNU
+diff -Nur pidgin-2.10.7/doc/funniest_home_convos.txt pidgin-2.10.7-nonprism/doc/funniest_home_convos.txt
+--- pidgin-2.10.7/doc/funniest_home_convos.txt	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/doc/funniest_home_convos.txt	2013-08-16 23:08:16.148841464 -0300
+@@ -301,8 +301,6 @@
+ ---
+ 
+ 18:33:26 <NoName> hello there
+-18:34:03 <NoName> I just wanted to share some bevavior that I think its kinda of
+-                  unsafe when using GAIM with yahoo messenges accounts
+ 18:34:43 <NoName> Whenever you transfer files between users, no receiving
+                   confirmation is requested, the file gets transfered
+                   automatically
+diff -Nur pidgin-2.10.7/doc/pidgin.1.in pidgin-2.10.7-nonprism/doc/pidgin.1.in
+--- pidgin-2.10.7/doc/pidgin.1.in	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/doc/pidgin.1.in	2013-08-16 21:00:30.964181946 -0300
+@@ -29,11 +29,8 @@
+ .SH DESCRIPTION
+ .PP
+ \fBpidgin\fR is a graphical modular messaging client based on libpurple
+-which is capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC,
+-Novell GroupWise, Lotus Sametime, Zephyr, Gadu-Gadu, and QQ all at once. It has
++which is capable of connecting to XMPP, IRC, SILC and Zephyr all at once. It has
+ many common features found in other clients, as well as many unique features.
+-Pidgin is not endorsed by or affiliated with America Online, ICQ, Microsoft, or
+-Yahoo.
+ .PP
+ Pidgin can be extended by plugins written in multiple programming languages and
+ controlled through DBus or \fBpurple-remote\fR.
+diff -Nur pidgin-2.10.7/libpurple/account.c pidgin-2.10.7-nonprism/libpurple/account.c
+--- pidgin-2.10.7/libpurple/account.c	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/account.c	2013-08-16 23:31:48.026518940 -0300
+@@ -482,55 +482,6 @@
+ /*********************************************************************
+  * Reading from disk                                                 *
+  *********************************************************************/
+-static void
+-migrate_yahoo_japan(PurpleAccount *account)
+-{
+-	/* detect a Yahoo! JAPAN account that existed prior to 2.6.0 and convert it
+-	 * to use the new prpl-yahoojp.  Also remove the account-specific settings
+-	 * we no longer need */
+-
+-	if(purple_strequal(purple_account_get_protocol_id(account), "prpl-yahoo")) {
+-		if(purple_account_get_bool(account, "yahoojp", FALSE)) {
+-			const char *serverjp = purple_account_get_string(account, "serverjp", NULL);
+-			const char *xferjp_host = purple_account_get_string(account, "xferjp_host", NULL);
+-
+-			g_return_if_fail(serverjp != NULL);
+-			g_return_if_fail(xferjp_host != NULL);
+-
+-			purple_account_set_string(account, "server", serverjp);
+-			purple_account_set_string(account, "xfer_host", xferjp_host);
+-
+-			purple_account_set_protocol_id(account, "prpl-yahoojp");
+-		}
+-
+-		/* these should always be nuked */
+-		purple_account_remove_setting(account, "yahoojp");
+-		purple_account_remove_setting(account, "serverjp");
+-		purple_account_remove_setting(account, "xferjp_host");
+-
+-	}
+-}
+-
+-static void
+-migrate_icq_server(PurpleAccount *account)
+-{
+-	/* Migrate the login server setting for ICQ accounts.  See
+-	 * 'mtn log --last 1 --no-graph --from b6d7712e90b68610df3bd2d8cbaf46d94c8b3794'
+-	 * for details on the change. */
+-
+-	if(purple_strequal(purple_account_get_protocol_id(account), "prpl-icq")) {
+-		const char *tmp = purple_account_get_string(account, "server", NULL);
+-
+-		/* Non-secure server */
+-		if(purple_strequal(tmp,	"login.messaging.aol.com") ||
+-				purple_strequal(tmp, "login.oscar.aol.com"))
+-			purple_account_set_string(account, "server", "login.icq.com");
+-
+-		/* Secure server */
+-		if(purple_strequal(tmp, "slogin.oscar.aol.com"))
+-			purple_account_set_string(account, "server", "slogin.icq.com");
+-	}
+-}
+ 
+ static void
+ migrate_xmpp_encryption(PurpleAccount *account)
+@@ -615,12 +566,6 @@
+ 		g_free(data);
+ 	}
+ 
+-	/* we do this here because we need access to account settings to determine
+-	 * if we can/should migrate an old Yahoo! JAPAN account */
+-	migrate_yahoo_japan(account);
+-	/* we do this here because we need access to account settings to determine
+-	 * if we can/should migrate an ICQ account's server setting */
+-	migrate_icq_server(account);
+ 	/* we do this here because we need to do it before the user views the
+ 	 * Edit Account dialog. */
+ 	migrate_xmpp_encryption(account);
+@@ -874,7 +819,6 @@
+ 		return NULL;
+ 	}
+ 
+-	ret = purple_account_new(name, _purple_oscar_convert(name, protocol_id)); /* XXX: */
+ 	g_free(name);
+ 	g_free(protocol_id);
+ 
+diff -Nur pidgin-2.10.7/libpurple/blist.c pidgin-2.10.7-nonprism/libpurple/blist.c
+--- pidgin-2.10.7/libpurple/blist.c	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/blist.c	2013-08-16 22:53:19.640535242 -0300
+@@ -466,9 +466,7 @@
+ 
+ 	acct_name = xmlnode_get_attrib(bnode, "account");
+ 	protocol = xmlnode_get_attrib(bnode, "protocol");
+-	protocol = _purple_oscar_convert(acct_name, protocol); /* XXX: Remove */
+ 	proto = xmlnode_get_attrib(bnode, "proto");
+-	proto = _purple_oscar_convert(acct_name, proto); /* XXX: Remove */
+ 
+ 	if (!acct_name || (!proto && !protocol))
+ 		return;
+diff -Nur pidgin-2.10.7/libpurple/buddyicon.c pidgin-2.10.7-nonprism/libpurple/buddyicon.c
+--- pidgin-2.10.7/libpurple/buddyicon.c	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/buddyicon.c	2013-08-16 23:28:49.244233493 -0300
+@@ -1099,18 +1099,6 @@
+ 			{
+ 				PurpleAccount *account = purple_buddy_get_account((PurpleBuddy *)node);
+ 				const char *prpl_id = purple_account_get_protocol_id(account);
+-
+-				if (g_str_equal(prpl_id, "prpl-yahoo") || g_str_equal(prpl_id, "prpl-yahoojp"))
+-				{
+-					int checksum = purple_blist_node_get_int(node, "icon_checksum");
+-					if (checksum != 0)
+-					{
+-						char *checksum_str = g_strdup_printf("%i", checksum);
+-						purple_blist_node_remove_setting(node, "icon_checksum");
+-						purple_blist_node_set_string(node, "icon_checksum", checksum_str);
+-						g_free(checksum_str);
+-					}
+-				}
+ 			}
+ 		}
+ 	}
+diff -Nur pidgin-2.10.7/libpurple/ft.h pidgin-2.10.7-nonprism/libpurple/ft.h
+--- pidgin-2.10.7/libpurple/ft.h	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/ft.h	2013-08-16 22:51:20.590085226 -0300
+@@ -470,8 +470,6 @@
+  * can be used to jump backward in the file if the protocol detects
+  * that some bit of data needs to be resent or has been sent twice.
+  *
+- * It's used for pausing and resuming an oscar file transfer.
+- *
+  * @param xfer       The file transfer.
+  * @param bytes_sent The new current position in the file.  If we're
+  *                   sending a file then this is the byte that we will
+diff -Nur pidgin-2.10.7/libpurple/gaim-compat.h pidgin-2.10.7-nonprism/libpurple/gaim-compat.h
+--- pidgin-2.10.7/libpurple/gaim-compat.h	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/gaim-compat.h	2013-08-16 23:33:16.372629159 -0300
+@@ -2302,16 +2302,8 @@
+ #define gaim_init_ssl_plugin			purple_init_ssl_plugin
+ #define gaim_init_ssl_openssl_plugin	purple_init_ssl_openssl_plugin
+ #define gaim_init_ssl_gnutls_plugin		purple_init_ssl_gnutls_plugin
+-#define gaim_init_gg_plugin				purple_init_gg_plugin
+ #define gaim_init_jabber_plugin			purple_init_jabber_plugin
+-#define gaim_init_sametime_plugin		purple_init_sametime_plugin
+-#define gaim_init_msn_plugin			purple_init_msn_plugin
+-#define gaim_init_novell_plugin			purple_init_novell_plugin
+-#define gaim_init_qq_plugin				purple_init_qq_plugin
+ #define gaim_init_simple_plugin			purple_init_simple_plugin
+-#define gaim_init_yahoo_plugin			purple_init_yahoo_plugin
+ #define gaim_init_zephyr_plugin			purple_init_zephyr_plugin
+-#define gaim_init_aim_plugin			purple_init_aim_plugin
+-#define gaim_init_icq_plugin			purple_init_icq_plugin
+ 
+ #endif /* _GAIM_COMPAT_H_ */
+diff -Nur pidgin-2.10.7/libpurple/internal.h pidgin-2.10.7-nonprism/libpurple/internal.h
+--- pidgin-2.10.7/libpurple/internal.h	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/internal.h	2013-08-17 00:24:37.244172407 -0300
+@@ -43,7 +43,7 @@
+  *
+  * The Singular/Plural/Number ngettext dummy definition below was
+  * taken from an email to the texinfo mailing list by Manuel Guerrero.
+- * Thank you Manuel, and thank you Alex's good friend Google.
++ * Thank you Manuel.
+  */
+ #ifdef ENABLE_NLS
+ #  include <locale.h>
+diff -Nur pidgin-2.10.7/libpurple/media/backend-fs2.c pidgin-2.10.7-nonprism/libpurple/media/backend-fs2.c
+--- pidgin-2.10.7/libpurple/media/backend-fs2.c	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/media/backend-fs2.c	2013-08-17 00:23:19.488440821 -0300
+@@ -1661,18 +1661,6 @@
+ 		g_object_set(G_OBJECT(session->session),
+ 				"no-rtcp-timeout", 0, NULL);
+ 
+-	/*
+-	 * Hack to make x264 work with Gmail video.
+-	 */
+-	if (is_nice && !strcmp(sess_id, "google-video")) {
+-		FsElementAddedNotifier *notifier =
+-				fs_element_added_notifier_new();
+-		g_signal_connect(G_OBJECT(notifier), "element-added",
+-				G_CALLBACK(gst_element_added_cb), NULL);
+-		fs_element_added_notifier_add(notifier,
+-				GST_BIN(priv->conference));
+-	}
+-
+ 	session->id = g_strdup(sess_id);
+ 	session->backend = self;
+ 	session->type = type;
+diff -Nur pidgin-2.10.7/libpurple/plugins/psychic.c pidgin-2.10.7-nonprism/libpurple/plugins/psychic.c
+--- pidgin-2.10.7/libpurple/plugins/psychic.c	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/plugins/psychic.c	2013-08-27 21:18:22.251908751 -0300
+@@ -20,8 +20,7 @@
+ #define PLUGIN_NAME     N_("Psychic Mode")
+ #define PLUGIN_SUMMARY  N_("Psychic mode for incoming conversation")
+ #define PLUGIN_DESC     N_("Causes conversation windows to appear as other" \
+-			   " users begin to message you.  This works for" \
+-			   " AIM, ICQ, XMPP, Sametime, and Yahoo!")
++			   " users begin to message you.  This works for XMPP")
+ #define PLUGIN_AUTHOR   "Christopher O'Brien <siege@preoccupied.net>"
+ 
+ 
+diff -Nur pidgin-2.10.7/libpurple/pounce.c pidgin-2.10.7-nonprism/libpurple/pounce.c
+--- pidgin-2.10.7/libpurple/pounce.c	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/pounce.c	2013-08-16 23:02:20.671021669 -0300
+@@ -409,7 +409,6 @@
+ 		g_free(data->account_name);
+ 		data->account_name = g_strdup(buffer);
+ 		tmp = data->protocol_id;
+-		data->protocol_id = g_strdup(_purple_oscar_convert(buffer, tmp));
+ 		g_free(tmp);
+ 	}
+ 	else if (purple_strequal(element_name, "pouncee")) {
+diff -Nur pidgin-2.10.7/libpurple/protocols/Makefile.am pidgin-2.10.7-nonprism/libpurple/protocols/Makefile.am
+--- pidgin-2.10.7/libpurple/protocols/Makefile.am	2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/Makefile.am	2013-08-16 22:37:55.011207011 -0300
+@@ -1,5 +1,5 @@
+ EXTRA_DIST = Makefile.mingw
+ 
+-DIST_SUBDIRS = bonjour gg irc jabber msn myspace mxit novell null oscar sametime silc silc10 simple yahoo zephyr
++DIST_SUBDIRS = bonjour irc jabber null silc silc10 simple zephyr
+ 
+ SUBDIRS = $(DYNAMIC_PRPLS) $(STATIC_PRPLS)
+diff -Nur pidgin-2.10.7/libpurple/protocols/Makefile.in pidgin-2.10.7-nonprism/libpurple/protocols/Makefile.in
+--- pidgin-2.10.7/libpurple/protocols/Makefile.in	2013-02-11 07:17:19.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/Makefile.in	2013-08-16 23:50:36.651423353 -0300
+@@ -160,8 +160,6 @@
+ FARSTREAM_CFLAGS = @FARSTREAM_CFLAGS@
+ FARSTREAM_LIBS = @FARSTREAM_LIBS@
+ FGREP = @FGREP@
+-GADU_CFLAGS = @GADU_CFLAGS@
+-GADU_LIBS = @GADU_LIBS@
+ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+@@ -223,8 +221,6 @@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+ MANIFEST_TOOL = @MANIFEST_TOOL@
+-MEANWHILE_CFLAGS = @MEANWHILE_CFLAGS@
+-MEANWHILE_LIBS = @MEANWHILE_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO_CFLAGS = @MONO_CFLAGS@
+@@ -365,7 +361,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ EXTRA_DIST = Makefile.mingw
+-DIST_SUBDIRS = bonjour gg irc jabber msn myspace mxit novell null oscar sametime silc silc10 simple yahoo zephyr
++DIST_SUBDIRS = bonjour irc jabber null silc silc10 simple zephyr
+ SUBDIRS = $(DYNAMIC_PRPLS) $(STATIC_PRPLS)
+ all: all-recursive
+ 
+diff -Nur pidgin-2.10.7/libpurple/prpl.h pidgin-2.10.7-nonprism/libpurple/prpl.h
+--- pidgin-2.10.7/libpurple/prpl.h	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/prpl.h	2013-08-16 22:29:46.145754932 -0300
+@@ -161,15 +161,11 @@
+ 
+ 	/**
+ 	 * Notify on new mail.
+-	 *
+-	 * MSN and Yahoo notify you when you have new mail.
+ 	 */
+ 	OPT_PROTO_MAIL_CHECK = 0x00000020,
+ 
+ 	/**
+ 	 * Images in IMs.
+-	 *
+-	 * Oscar lets you send images in direct IMs.
+ 	 */
+ 	OPT_PROTO_IM_IMAGE = 0x00000040,
+ 
+@@ -184,16 +180,13 @@
+ 	/**
+ 	 * Allows font size to be specified in sane point size
+ 	 *
+-	 * Probably just XMPP and Y!M
++	 * Probably just XMPP
+ 	 */
+ 	OPT_PROTO_USE_POINTSIZE = 0x00000100,
+ 
+ 	/**
+ 	 * Set the Register button active even when the username has not
+ 	 * been specified.
+-	 *
+-	 * Gadu-Gadu doesn't need a username to register new account (because
+-	 * usernames are assigned by the server).
+ 	 */
+ 	OPT_PROTO_REGISTER_NOSCREENNAME = 0x00000200,
+ 
+@@ -467,9 +460,7 @@
+ 	void (*convo_closed)(PurpleConnection *, const char *who);
+ 
+ 	/**
+-	 *  Convert the username @a who to its canonical form.  (For example,
+-	 *  AIM treats "fOo BaR" and "foobar" as the same user; this function
+-	 *  should return the same normalized string for both of those.)
++	 *  Convert the username @a who to its canonical form.
+ 	 */
+ 	const char *(*normalize)(const PurpleAccount *, const char *who);
+ 
+@@ -923,7 +914,7 @@
+  * @param who Whose attention to request.
+  * @param type_code An index into the prpl's attention_types list determining the type
+  *        of the attention request command to send. 0 if prpl only defines one
+- *        (for example, Yahoo and MSN), but some protocols define more (MySpaceIM).
++ *        , but some protocols define more.
+  *
+  * Note that you can't send arbitrary PurpleAttentionType's, because there is
+  * only a fixed set of attention commands.
+diff -Nur pidgin-2.10.7/libpurple/purple-url-handler pidgin-2.10.7-nonprism/libpurple/purple-url-handler
+--- pidgin-2.10.7/libpurple/purple-url-handler	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/purple-url-handler	2013-08-16 21:16:42.951304560 -0300
+@@ -117,70 +117,6 @@
+ def addbuddy(account, screenname, group="", alias=""):
+     cpurple.PurpleBlistRequestAddBuddy(account, screenname, group, alias)
+ 
+-
+-def aim(uri):
+-    protocol = "prpl-aim"
+-    match = re.match(r"^aim:([^?]*)(\?(.*))", uri)
+-    if not match:
+-        print "Invalid aim URI: %s" % uri
+-        return
+-
+-    command = urllib.unquote_plus(match.group(1))
+-    paramstring = match.group(3)
+-    params = {}
+-    if paramstring:
+-        for param in paramstring.split("&"):
+-            key, value = extendlist(param.split("=", 1), 2, "")
+-            params[key] = urllib.unquote_plus(value)
+-    accountname = params.get("account", "")
+-    screenname = params.get("screenname", "")
+-
+-    account = findaccount(protocol, accountname)
+-
+-    if command.lower() == "goim":
+-        goim(account, screenname, params.get("message"))
+-    elif command.lower() == "gochat":
+-        gochat(account, params)
+-    elif command.lower() == "addbuddy":
+-        addbuddy(account, screenname, params.get("group", ""))
+-
+-def gg(uri):
+-    protocol = "prpl-gg"
+-    match = re.match(r"^gg:(.*)", uri)
+-    if not match:
+-        print "Invalid gg URI: %s" % uri
+-        return
+-
+-    screenname = urllib.unquote_plus(match.group(1))
+-    account = findaccount(protocol)
+-    goim(account, screenname)
+-
+-def icq(uri):
+-    protocol = "prpl-icq"
+-    match = re.match(r"^icq:([^?]*)(\?(.*))", uri)
+-    if not match:
+-        print "Invalid icq URI: %s" % uri
+-        return
+-
+-    command = urllib.unquote_plus(match.group(1))
+-    paramstring = match.group(3)
+-    params = {}
+-    if paramstring:
+-        for param in paramstring.split("&"):
+-            key, value = extendlist(param.split("=", 1), 2, "")
+-            params[key] = urllib.unquote_plus(value)
+-    accountname = params.get("account", "")
+-    screenname = params.get("screenname", "")
+-
+-    account = findaccount(protocol, accountname)
+-
+-    if command.lower() == "goim":
+-        goim(account, screenname, params.get("message"))
+-    elif command.lower() == "gochat":
+-        gochat(account, params)
+-    elif command.lower() == "addbuddy":
+-        addbuddy(account, screenname, params.get("group", ""))
+-
+ def irc(uri):
+     protocol = "prpl-irc"
+     match = re.match(r"^irc:(//([^/]*))?/?([^?]*)(\?(.*))?", uri)
+@@ -221,34 +157,6 @@
+                 channel = "#" + channel
+             gochat(account, {"server": server, "channel": channel, "password": params.get("key", "")}, params.get("msg"))
+ 
+-def msnim(uri):
+-    protocol = "prpl-msn"
+-    match = re.match(r"^msnim:([^?]*)(\?(.*))", uri)
+-    if not match:
+-        print "Invalid msnim URI: %s" % uri
+-        return
+-
+-    command = urllib.unquote_plus(match.group(1))
+-    paramstring = match.group(3)
+-    params = {}
+-    if paramstring:
+-        for param in paramstring.split("&"):
+-            key, value = extendlist(param.split("=", 1), 2, "")
+-            params[key] = urllib.unquote_plus(value)
+-    screenname = params.get("contact", "")
+-
+-    account = findaccount(protocol)
+-
+-    if command.lower() == "chat":
+-        goim(account, screenname)
+-    elif command.lower() == "add":
+-        addbuddy(account, screenname)
+-
+-def myim(uri):
+-        protocol = "prpl-myspace"
+-        print "TODO: send uri: ", uri
+-        assert False, "Not implemented"
+-
+ def sip(uri):
+     protocol = "prpl-simple"
+     match = re.match(r"^sip:(.*)", uri)
+@@ -300,57 +208,6 @@
+     else:
+         goim(account, screenname)
+ 
+-def gtalk(uri):
+-    protocol = "prpl-jabber"
+-    match = re.match(r"^gtalk:([^?]*)(\?(.*))", uri)
+-    if not match:
+-        print "Invalid gtalk URI: %s" % uri
+-        return
+-
+-    command = urllib.unquote_plus(match.group(1))
+-    paramstring = match.group(3)
+-    params = {}
+-    if paramstring:
+-        for param in paramstring.split("&"):
+-            key, value = extendlist(param.split("=", 1), 2, "")
+-            params[key] = urllib.unquote_plus(value)
+-    accountname = params.get("from_jid", "")
+-    jid = params.get("jid", "")
+-
+-    account = findaccount(protocol, accountname)
+-
+-    if command.lower() == "chat":
+-        goim(account, jid)
+-    elif command.lower() == "call":
+-        # XXX V&V prompt to establish call
+-        goim(account, jid)
+-
+-def ymsgr(uri):
+-    protocol = "prpl-yahoo"
+-    match = re.match(r"^ymsgr:([^?]*)(\?([^&]*)(&(.*))?)", uri)
+-    if not match:
+-        print "Invalid ymsgr URI: %s" % uri
+-        return
+-
+-    command = urllib.unquote_plus(match.group(1))
+-    screenname = urllib.unquote_plus(match.group(3))
+-    paramstring = match.group(5)
+-    params = {}
+-    if paramstring:
+-        for param in paramstring.split("&"):
+-            key, value = extendlist(param.split("=", 1), 2, "")
+-            params[key] = urllib.unquote_plus(value)
+-
+-    account = findaccount(protocol)
+-
+-    if command.lower() == "sendim":
+-        goim(account, screenname, params.get("m"))
+-    elif command.lower() == "chat":
+-        gochat(account, {"room": screenname})
+-    elif command.lower() == "addfriend":
+-        addbuddy(account, screenname)
+-
+-
+ def main(argv=sys.argv):
+     if len(argv) != 2 or argv[1] == "--help" or argv[1] == "-h":
+         print "Usage: %s URI" % argv[0]
+diff -Nur pidgin-2.10.7/libpurple/savedstatuses.c pidgin-2.10.7-nonprism/libpurple/savedstatuses.c
+--- pidgin-2.10.7/libpurple/savedstatuses.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/savedstatuses.c	2013-08-16 22:52:44.582754543 -0300
+@@ -387,7 +387,6 @@
+ 		const char *protocol;
+ 		acct_name = xmlnode_get_data(node);
+ 		protocol = xmlnode_get_attrib(node, "protocol");
+-		protocol = _purple_oscar_convert(acct_name, protocol); /* XXX: Remove */
+ 		if ((acct_name != NULL) && (protocol != NULL))
+ 			ret->account = purple_accounts_find(acct_name, protocol);
+ 		g_free(acct_name);
+diff -Nur pidgin-2.10.7/libpurple/server.h pidgin-2.10.7-nonprism/libpurple/server.h
+--- pidgin-2.10.7/libpurple/server.h	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/server.h	2013-08-16 23:30:04.149920853 -0300
+@@ -69,7 +69,7 @@
+  * @param who Whose attention to request.
+  * @param type_code An index into the prpl's attention_types list determining the type
+  * 	of the attention request command to send. 0 if prpl only defines one
+- * 	(for example, Yahoo and MSN), but some protocols define more (MySpaceIM).
++ * 	, but some protocols define more.
+  *
+  * Note that you can't send arbitrary PurpleAttentionType's, because there is
+  * only a fixed set of attention commands.
+diff -Nur pidgin-2.10.7/libpurple/status.h pidgin-2.10.7-nonprism/libpurple/status.h
+--- pidgin-2.10.7/libpurple/status.h	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/status.h	2013-08-16 22:52:22.542054119 -0300
+@@ -43,8 +43,7 @@
+  * one of your AIM buddies has set himself as "away."  You have a
+  * PurpleBuddy node for this person in your buddy list.  Purple wants
+  * to mark this buddy as "away," so it creates a new PurpleStatus.
+- * The PurpleStatus has its PurpleStatusType set to the "away" state
+- * for the oscar PRPL.  The PurpleStatus also contains the buddy's
++ * The PurpleStatus also contains the buddy's
+  * away message.  PurpleStatuses are sometimes saved, depending on
+  * the context.  The current PurpleStatuses associated with each of
+  * your accounts are saved so that the next time you start Purple,
+diff -Nur pidgin-2.10.7/libpurple/tests/check_libpurple.c pidgin-2.10.7-nonprism/libpurple/tests/check_libpurple.c
+--- pidgin-2.10.7/libpurple/tests/check_libpurple.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/tests/check_libpurple.c	2013-08-16 22:55:33.731462302 -0300
+@@ -88,8 +88,6 @@
+ 	srunner_add_suite(sr, jabber_digest_md5_suite());
+ 	srunner_add_suite(sr, jabber_jutil_suite());
+ 	srunner_add_suite(sr, jabber_scram_suite());
+-	srunner_add_suite(sr, oscar_util_suite());
+-	srunner_add_suite(sr, yahoo_util_suite());
+ 	srunner_add_suite(sr, util_suite());
+ 	srunner_add_suite(sr, xmlnode_suite());
+ 
+diff -Nur pidgin-2.10.7/libpurple/tests/Makefile.am pidgin-2.10.7-nonprism/libpurple/tests/Makefile.am
+--- pidgin-2.10.7/libpurple/tests/Makefile.am	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/tests/Makefile.am	2013-08-16 22:56:03.189064778 -0300
+@@ -14,8 +14,6 @@
+ 		test_jabber_digest_md5.c \
+ 		test_jabber_jutil.c \
+ 		test_jabber_scram.c \
+-		test_oscar_util.c \
+-		test_yahoo_util.c \
+ 		test_util.c \
+ 		test_xmlnode.c \
+ 		$(top_builddir)/libpurple/util.h
+@@ -31,8 +29,6 @@
+ 
+ check_libpurple_LDADD=\
+ 		$(top_builddir)/libpurple/protocols/jabber/libjabber.la \
+-		$(top_builddir)/libpurple/protocols/oscar/liboscar.la \
+-		$(top_builddir)/libpurple/protocols/yahoo/libymsg.la \
+ 		$(top_builddir)/libpurple/libpurple.la \
+         @CHECK_LIBS@ \
+ 		$(GLIB_LIBS)
+diff -Nur pidgin-2.10.7/libpurple/tests/Makefile.in pidgin-2.10.7-nonprism/libpurple/tests/Makefile.in
+--- pidgin-2.10.7/libpurple/tests/Makefile.in	2013-02-11 07:17:23.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/tests/Makefile.in	2013-08-16 23:53:20.713146759 -0300
+@@ -65,8 +65,8 @@
+ CONFIG_CLEAN_VPATH_FILES =
+ am__check_libpurple_SOURCES_DIST = check_libpurple.c tests.h \
+ 	test_cipher.c test_jabber_caps.c test_jabber_digest_md5.c \
+-	test_jabber_jutil.c test_jabber_scram.c test_oscar_util.c \
+-	test_yahoo_util.c test_util.c test_xmlnode.c \
++	test_jabber_jutil.c test_jabber_scram.c \
++	 test_util.c test_xmlnode.c \
+ 	$(top_builddir)/libpurple/util.h
+ @HAVE_CHECK_TRUE@am_check_libpurple_OBJECTS =  \
+ @HAVE_CHECK_TRUE@	check_libpurple-check_libpurple.$(OBJEXT) \
+@@ -75,15 +75,11 @@
+ @HAVE_CHECK_TRUE@	check_libpurple-test_jabber_digest_md5.$(OBJEXT) \
+ @HAVE_CHECK_TRUE@	check_libpurple-test_jabber_jutil.$(OBJEXT) \
+ @HAVE_CHECK_TRUE@	check_libpurple-test_jabber_scram.$(OBJEXT) \
+-@HAVE_CHECK_TRUE@	check_libpurple-test_oscar_util.$(OBJEXT) \
+-@HAVE_CHECK_TRUE@	check_libpurple-test_yahoo_util.$(OBJEXT) \
+ @HAVE_CHECK_TRUE@	check_libpurple-test_util.$(OBJEXT) \
+ @HAVE_CHECK_TRUE@	check_libpurple-test_xmlnode.$(OBJEXT)
+ check_libpurple_OBJECTS = $(am_check_libpurple_OBJECTS)
+ am__DEPENDENCIES_1 =
+ @HAVE_CHECK_TRUE@check_libpurple_DEPENDENCIES = $(top_builddir)/libpurple/protocols/jabber/libjabber.la \
+-@HAVE_CHECK_TRUE@	$(top_builddir)/libpurple/protocols/oscar/liboscar.la \
+-@HAVE_CHECK_TRUE@	$(top_builddir)/libpurple/protocols/yahoo/libymsg.la \
+ @HAVE_CHECK_TRUE@	$(top_builddir)/libpurple/libpurple.la \
+ @HAVE_CHECK_TRUE@	$(am__DEPENDENCIES_1)
+ AM_V_lt = $(am__v_lt_@AM_V@)
+@@ -177,8 +173,6 @@
+ FARSTREAM_CFLAGS = @FARSTREAM_CFLAGS@
+ FARSTREAM_LIBS = @FARSTREAM_LIBS@
+ FGREP = @FGREP@
+-GADU_CFLAGS = @GADU_CFLAGS@
+-GADU_LIBS = @GADU_LIBS@
+ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+@@ -240,8 +234,6 @@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+ MANIFEST_TOOL = @MANIFEST_TOOL@
+-MEANWHILE_CFLAGS = @MEANWHILE_CFLAGS@
+-MEANWHILE_LIBS = @MEANWHILE_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO_CFLAGS = @MONO_CFLAGS@
+@@ -389,8 +381,6 @@
+ @HAVE_CHECK_TRUE@		test_jabber_digest_md5.c \
+ @HAVE_CHECK_TRUE@		test_jabber_jutil.c \
+ @HAVE_CHECK_TRUE@		test_jabber_scram.c \
+-@HAVE_CHECK_TRUE@		test_oscar_util.c \
+-@HAVE_CHECK_TRUE@		test_yahoo_util.c \
+ @HAVE_CHECK_TRUE@		test_util.c \
+ @HAVE_CHECK_TRUE@		test_xmlnode.c \
+ @HAVE_CHECK_TRUE@		$(top_builddir)/libpurple/util.h
+@@ -406,8 +396,6 @@
+ 
+ @HAVE_CHECK_TRUE@check_libpurple_LDADD = \
+ @HAVE_CHECK_TRUE@		$(top_builddir)/libpurple/protocols/jabber/libjabber.la \
+-@HAVE_CHECK_TRUE@		$(top_builddir)/libpurple/protocols/oscar/liboscar.la \
+-@HAVE_CHECK_TRUE@		$(top_builddir)/libpurple/protocols/yahoo/libymsg.la \
+ @HAVE_CHECK_TRUE@		$(top_builddir)/libpurple/libpurple.la \
+ @HAVE_CHECK_TRUE@        @CHECK_LIBS@ \
+ @HAVE_CHECK_TRUE@		$(GLIB_LIBS)
+@@ -471,10 +459,8 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_jabber_digest_md5.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_jabber_jutil.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_jabber_scram.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_oscar_util.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_util.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_xmlnode.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_yahoo_util.Po@am__quote@
+ 
+ .c.o:
+ @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@@ -581,34 +567,6 @@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -c -o check_libpurple-test_jabber_scram.obj `if test -f 'test_jabber_scram.c'; then $(CYGPATH_W) 'test_jabber_scram.c'; else $(CYGPATH_W) '$(srcdir)/test_jabber_scram.c'; fi`
+ 
+-check_libpurple-test_oscar_util.o: test_oscar_util.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -MT check_libpurple-test_oscar_util.o -MD -MP -MF $(DEPDIR)/check_libpurple-test_oscar_util.Tpo -c -o check_libpurple-test_oscar_util.o `test -f 'test_oscar_util.c' || echo '$(srcdir)/'`test_oscar_util.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/check_libpurple-test_oscar_util.Tpo $(DEPDIR)/check_libpurple-test_oscar_util.Po
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test_oscar_util.c' object='check_libpurple-test_oscar_util.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -c -o check_libpurple-test_oscar_util.o `test -f 'test_oscar_util.c' || echo '$(srcdir)/'`test_oscar_util.c
+-
+-check_libpurple-test_oscar_util.obj: test_oscar_util.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -MT check_libpurple-test_oscar_util.obj -MD -MP -MF $(DEPDIR)/check_libpurple-test_oscar_util.Tpo -c -o check_libpurple-test_oscar_util.obj `if test -f 'test_oscar_util.c'; then $(CYGPATH_W) 'test_oscar_util.c'; else $(CYGPATH_W) '$(srcdir)/test_oscar_util.c'; fi`
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/check_libpurple-test_oscar_util.Tpo $(DEPDIR)/check_libpurple-test_oscar_util.Po
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test_oscar_util.c' object='check_libpurple-test_oscar_util.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -c -o check_libpurple-test_oscar_util.obj `if test -f 'test_oscar_util.c'; then $(CYGPATH_W) 'test_oscar_util.c'; else $(CYGPATH_W) '$(srcdir)/test_oscar_util.c'; fi`
+-
+-check_libpurple-test_yahoo_util.o: test_yahoo_util.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -MT check_libpurple-test_yahoo_util.o -MD -MP -MF $(DEPDIR)/check_libpurple-test_yahoo_util.Tpo -c -o check_libpurple-test_yahoo_util.o `test -f 'test_yahoo_util.c' || echo '$(srcdir)/'`test_yahoo_util.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/check_libpurple-test_yahoo_util.Tpo $(DEPDIR)/check_libpurple-test_yahoo_util.Po
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test_yahoo_util.c' object='check_libpurple-test_yahoo_util.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -c -o check_libpurple-test_yahoo_util.o `test -f 'test_yahoo_util.c' || echo '$(srcdir)/'`test_yahoo_util.c
+-
+-check_libpurple-test_yahoo_util.obj: test_yahoo_util.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -MT check_libpurple-test_yahoo_util.obj -MD -MP -MF $(DEPDIR)/check_libpurple-test_yahoo_util.Tpo -c -o check_libpurple-test_yahoo_util.obj `if test -f 'test_yahoo_util.c'; then $(CYGPATH_W) 'test_yahoo_util.c'; else $(CYGPATH_W) '$(srcdir)/test_yahoo_util.c'; fi`
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/check_libpurple-test_yahoo_util.Tpo $(DEPDIR)/check_libpurple-test_yahoo_util.Po
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test_yahoo_util.c' object='check_libpurple-test_yahoo_util.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -c -o check_libpurple-test_yahoo_util.obj `if test -f 'test_yahoo_util.c'; then $(CYGPATH_W) 'test_yahoo_util.c'; else $(CYGPATH_W) '$(srcdir)/test_yahoo_util.c'; fi`
+-
+ check_libpurple-test_util.o: test_util.c
+ @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -MT check_libpurple-test_util.o -MD -MP -MF $(DEPDIR)/check_libpurple-test_util.Tpo -c -o check_libpurple-test_util.o `test -f 'test_util.c' || echo '$(srcdir)/'`test_util.c
+ @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/check_libpurple-test_util.Tpo $(DEPDIR)/check_libpurple-test_util.Po
+diff -Nur pidgin-2.10.7/libpurple/tests/test_jabber_caps.c pidgin-2.10.7-nonprism/libpurple/tests/test_jabber_caps.c
+--- pidgin-2.10.7/libpurple/tests/test_jabber_caps.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/tests/test_jabber_caps.c	2013-08-17 00:25:08.235128437 -0300
+@@ -33,7 +33,7 @@
+ START_TEST(test_calculate_caps)
+ {
+ 	assert_caps_calculate_match("sha1", "GNjxthSckUNvAIoCCJFttjl6VL8=",
+-	"<query xmlns='http://jabber.org/protocol/disco#info' node='http://tkabber.jabber.ru/#GNjxthSckUNvAIoCCJFttjl6VL8='><identity category='client' type='pc' name='Tkabber'/><x xmlns='jabber:x:data' type='result'><field var='FORM_TYPE' type='hidden'><value>urn:xmpp:dataforms:softwareinfo</value></field><field var='software'><value>Tkabber</value></field><field var='software_version'><value> ( 8.5.5 )</value></field><field var='os'><value>ATmega640-16AU</value></field><field var='os_version'><value/></field></x><feature var='games:board'/><feature var='google:mail:notify'/><feature var='http://jabber.org/protocol/activity'/><feature var='http://jabber.org/protocol/bytestreams'/><feature var='http://jabber.org/protocol/chatstates'/><feature var='http://jabber.org/protocol/commands'/><feature var='http://jabber.org/protocol/commands'/><feature var='http://jabber.org/protocol/disco#info'/><feature var='http://jabber.org/protocol/disco#items'/><feature var='http://jabber.org/protocol/feature-neg'/><feature var='http://jabber.org/protocol/geoloc'/><feature var='http://jabber.org/protocol/ibb'/><feature var='http://jabber.org/protocol/iqibb'/><feature var='http://jabber.org/protocol/mood'/><feature var='http://jabber.org/protocol/muc'/><feature var='http://jabber.org/protocol/mute#ancestor'/><feature var='http://jabber.org/protocol/mute#editor'/><feature var='http://jabber.org/protocol/rosterx'/><feature var='http://jabber.org/protocol/si'/><feature var='http://jabber.org/protocol/si/profile/file-transfer'/><feature var='http://jabber.org/protocol/tune'/><feature var='jabber:iq:avatar'/><feature var='jabber:iq:browse'/><feature var='jabber:iq:dtcp'/><feature var='jabber:iq:filexfer'/><feature var='jabber:iq:ibb'/><feature var='jabber:iq:inband'/><feature var='jabber:iq:jidlink'/><feature var='jabber:iq:last'/><feature var='jabber:iq:oob'/><feature var='jabber:iq:privacy'/><feature var='jabber:iq:time'/><feature var='jabber:iq:version'/><feature var='jabber:x:data'/><feature var='jabber:x:event'/><feature var='jabber:x:oob'/><feature var='urn:xmpp:ping'/><feature var='urn:xmpp:receipts'/><feature var='urn:xmpp:time'/></query>");
++	"<query xmlns='http://jabber.org/protocol/disco#info' node='http://tkabber.jabber.ru/#GNjxthSckUNvAIoCCJFttjl6VL8='><identity category='client' type='pc' name='Tkabber'/><x xmlns='jabber:x:data' type='result'><field var='FORM_TYPE' type='hidden'><value>urn:xmpp:dataforms:softwareinfo</value></field><field var='software'><value>Tkabber</value></field><field var='software_version'><value> ( 8.5.5 )</value></field><field var='os'><value>ATmega640-16AU</value></field><field var='os_version'><value/></field></x><feature var='games:board'/><feature var='http://jabber.org/protocol/activity'/><feature var='http://jabber.org/protocol/bytestreams'/><feature var='http://jabber.org/protocol/chatstates'/><feature var='http://jabber.org/protocol/commands'/><feature var='http://jabber.org/protocol/commands'/><feature var='http://jabber.org/protocol/disco#info'/><feature var='http://jabber.org/protocol/disco#items'/><feature var='http://jabber.org/protocol/feature-neg'/><feature var='http://jabber.org/protocol/geoloc'/><feature var='http://jabber.org/protocol/ibb'/><feature var='http://jabber.org/protocol/iqibb'/><feature var='http://jabber.org/protocol/mood'/><feature var='http://jabber.org/protocol/muc'/><feature var='http://jabber.org/protocol/mute#ancestor'/><feature var='http://jabber.org/protocol/mute#editor'/><feature var='http://jabber.org/protocol/rosterx'/><feature var='http://jabber.org/protocol/si'/><feature var='http://jabber.org/protocol/si/profile/file-transfer'/><feature var='http://jabber.org/protocol/tune'/><feature var='jabber:iq:avatar'/><feature var='jabber:iq:browse'/><feature var='jabber:iq:dtcp'/><feature var='jabber:iq:filexfer'/><feature var='jabber:iq:ibb'/><feature var='jabber:iq:inband'/><feature var='jabber:iq:jidlink'/><feature var='jabber:iq:last'/><feature var='jabber:iq:oob'/><feature var='jabber:iq:privacy'/><feature var='jabber:iq:time'/><feature var='jabber:iq:version'/><feature var='jabber:x:data'/><feature var='jabber:x:event'/><feature var='jabber:x:oob'/><feature var='urn:xmpp:ping'/><feature var='urn:xmpp:receipts'/><feature var='urn:xmpp:time'/></query>");
+ }
+ END_TEST
+ 
+diff -Nur pidgin-2.10.7/libpurple/tests/test_jabber_jutil.c pidgin-2.10.7-nonprism/libpurple/tests/test_jabber_jutil.c
+--- pidgin-2.10.7/libpurple/tests/test_jabber_jutil.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/tests/test_jabber_jutil.c	2013-08-27 22:53:21.524229291 -0300
+@@ -99,19 +99,19 @@
+ 
+ START_TEST(test_jabber_id_new)
+ {
+-	assert_valid_jid("gmail.com");
+-	assert_valid_jid("gmail.com/Test");
+-	assert_valid_jid("gmail.com/Test@");
+-	assert_valid_jid("gmail.com/@");
+-	assert_valid_jid("gmail.com/Test@alkjaweflkj");
+-	assert_valid_jid("mark.doliner@gmail.com");
+-	assert_valid_jid("mark.doliner@gmail.com/Test12345");
+-	assert_valid_jid("mark.doliner@gmail.com/Test@12345");
+-	assert_valid_jid("mark.doliner@gmail.com/Te/st@12@//345");
++	assert_valid_jid("mail.com");
++	assert_valid_jid("mail.com/Test");
++	assert_valid_jid("mail.com/Test@");
++	assert_valid_jid("mail.com/@");
++	assert_valid_jid("mail.com/Test@alkjaweflkj");
++	assert_valid_jid("mark.doliner@mail.com");
++	assert_valid_jid("mark.doliner@mail.com/Test12345");
++	assert_valid_jid("mark.doliner@mail.com/Test@12345");
++	assert_valid_jid("mark.doliner@mail.com/Te/st@12@//345");
+ 	assert_valid_jid("わいど@conference.jabber.org");
+ 	assert_valid_jid("まりるーむ@conference.jabber.org");
+-	assert_valid_jid("mark.doliner@gmail.com/まりるーむ");
+-	assert_valid_jid("mark.doliner@gmail/stuff.org");
++	assert_valid_jid("mark.doliner@mail.com/まりるーむ");
++	assert_valid_jid("mark.doliner@mail/stuff.org");
+ 	assert_valid_jid("stuart@nödåtXäYZ.se");
+ 	assert_valid_jid("stuart@nödåtXäYZ.se/まりるーむ");
+ 	assert_valid_jid("mark.doliner@わいど.org");
+@@ -123,17 +123,17 @@
+ 	assert_valid_jid("pa=ul@10.0.42.230");
+ 	assert_valid_jid("pa,ul@10.0.42.230");
+ 
+-	assert_invalid_jid("@gmail.com");
+-	assert_invalid_jid("@@gmail.com");
+-	assert_invalid_jid("mark.doliner@@gmail.com/Test12345");
+-	assert_invalid_jid("mark@doliner@gmail.com/Test12345");
+-	assert_invalid_jid("@gmail.com/Test@12345");
++	assert_invalid_jid("@mail.com");
++	assert_invalid_jid("@@mail.com");
++	assert_invalid_jid("mark.doliner@@mail.com/Test12345");
++	assert_invalid_jid("mark@doliner@mail.com/Test12345");
++	assert_invalid_jid("@mail.com/Test@12345");
+ 	assert_invalid_jid("/Test@12345");
+ 	assert_invalid_jid("mark.doliner@");
+ 	assert_invalid_jid("mark.doliner/");
+-	assert_invalid_jid("mark.doliner@gmail_stuff.org");
+-	assert_invalid_jid("mark.doliner@gmail[stuff.org");
+-	assert_invalid_jid("mark.doliner@gmail\\stuff.org");
++	assert_invalid_jid("mark.doliner@mail_stuff.org");
++	assert_invalid_jid("mark.doliner@mail[stuff.org");
++	assert_invalid_jid("mark.doliner@mail\\stuff.org");
+ 	assert_invalid_jid("paul@[::1]124");
+ 	assert_invalid_jid("paul@2[::1]124/as");
+ 	assert_invalid_jid("paul@まつ.おおかみ/\x01");
+diff -Nur pidgin-2.10.7/libpurple/tests/tests.h pidgin-2.10.7-nonprism/libpurple/tests/tests.h
+--- pidgin-2.10.7/libpurple/tests/tests.h	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/tests/tests.h	2013-08-16 22:56:18.999567027 -0300
+@@ -13,8 +13,6 @@
+ Suite * jabber_digest_md5_suite(void);
+ Suite * jabber_jutil_suite(void);
+ Suite * jabber_scram_suite(void);
+-Suite * oscar_util_suite(void);
+-Suite * yahoo_util_suite(void);
+ Suite * util_suite(void);
+ Suite * xmlnode_suite(void);
+ 
+diff -Nur pidgin-2.10.7/libpurple/util.c pidgin-2.10.7-nonprism/libpurple/util.c
+--- pidgin-2.10.7/libpurple/util.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/util.c	2013-08-16 23:29:38.062434329 -0300
+@@ -3451,8 +3451,7 @@
+  *       is set to TRUE if this URL is https, otherwise it is set to
+  *       FALSE.  But that change will break the API.
+  *
+- *       This is important for Yahoo! web messenger login.  They now
+- *       force https login, and if you access the web messenger login
++ *       They now force https login, and if you access the web messenger login
+  *       page via http then it redirects you to the https version, but
+  *       purple_util_fetch_url() ignores the "https" and attempts to
+  *       fetch the URL via http again, which gets redirected again.
+@@ -4943,18 +4942,6 @@
+ 	return buf;
+ }
+ 
+-const char *_purple_oscar_convert(const char *act, const char *protocol)
+-{
+-	if (act && purple_strequal(protocol, "prpl-oscar")) {
+-		int i;
+-		for (i = 0; act[i] != '\0'; i++)
+-			if (!isdigit(act[i]))
+-				return "prpl-aim";
+-		return "prpl-icq";
+-	}
+-	return protocol;
+-}
+-
+ void purple_restore_default_signal_handlers(void)
+ {
+ #ifndef _WIN32
+diff -Nur pidgin-2.10.7/libpurple/util.h pidgin-2.10.7-nonprism/libpurple/util.h
+--- pidgin-2.10.7/libpurple/util.h	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/util.h	2013-08-16 23:31:12.535403448 -0300
+@@ -456,8 +456,7 @@
+ /**
+  * Extracts a field of data from HTML.
+  *
+- * This is a scary function. See protocols/msn/msn.c and
+- * protocols/yahoo/yahoo_profile.c for example usage.
++ * This is a scary function.
+  *
+  * @param str            The string to parse.
+  * @param len            The size of str.
+@@ -1450,16 +1449,6 @@
+ const char *purple_escape_filename(const char *str);
+ 
+ /**
+- * This is added temporarily to assist the split of oscar into aim and icq.
+- * This should not be used by plugins.
+- *
+- * @deprecated This function should not be used in new code and should be
+- *             removed in 3.0.0.  The aim/icq prpl split happened a long
+- *             time ago, and we don't need to keep migrating old data.
+- */
+-const char *_purple_oscar_convert(const char *act, const char *protocol);
+-
+-/**
+  * Restore default signal handlers for signals which might reasonably have
+  * handlers. This should be called by a fork()'d child process, since child processes
+  * inherit the handlers of the parent.
+diff -Nur pidgin-2.10.7/pidgin/gtkaccount.c pidgin-2.10.7-nonprism/pidgin/gtkaccount.c
+--- pidgin-2.10.7/pidgin/gtkaccount.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtkaccount.c	2013-08-27 22:45:35.495576079 -0300
+@@ -563,16 +563,11 @@
+ 		if (value == NULL)
+ 			value = purple_account_user_split_get_default_value(split);
+ 
+-		/* Google Talk default domain hackery! */
+ 		menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(dialog->protocol_menu));
+ 		item = gtk_menu_get_active(GTK_MENU(menu));
+-		if (value == NULL && g_object_get_data(G_OBJECT(item), "fakegoogle") &&
++		if (value == NULL && g_object_get_data(G_OBJECT(item), "") &&
+ 			!strcmp(purple_account_user_split_get_text(split), _("Domain")))
+-			value = "gmail.com";
+-
+-		if (value == NULL && g_object_get_data(G_OBJECT(item), "fakefacebook") &&
+-			!strcmp(purple_account_user_split_get_text(split), _("Domain")))
+-			value = "chat.facebook.com";
++			value = "";
+ 
+ 		if (value != NULL)
+ 			gtk_entry_set_text(GTK_ENTRY(entry), value);
+@@ -925,10 +920,6 @@
+ 				model = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_POINTER);
+ 				opt_entry->widget = combo = gtk_combo_box_new_with_model(GTK_TREE_MODEL(model));
+ 
+-				if (g_object_get_data(G_OBJECT(item), "fakefacebook") &&
+-					!strcmp(opt_entry->setting, "connection_security"))
+-					str_value = "opportunistic_tls";
+-
+ 				/* Loop through list of PurpleKeyValuePair items */
+ 				for (node = list; node != NULL; node = node->next) {
+ 					if (node->data != NULL) {
+diff -Nur pidgin-2.10.7/pidgin/gtkblist.c pidgin-2.10.7-nonprism/pidgin/gtkblist.c
+--- pidgin-2.10.7/pidgin/gtkblist.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtkblist.c	2013-08-16 23:10:16.549286879 -0300
+@@ -2126,10 +2126,6 @@
+ 	char *temp_vcard;
+ 	char *s, *c;
+ 	char *alias    = NULL;
+-	GList *aims    = NULL;
+-	GList *icqs    = NULL;
+-	GList *yahoos  = NULL;
+-	GList *msns    = NULL;
+ 	GList *jabbers = NULL;
+ 
+ 	s = temp_vcard = g_strdup(vcard);
+@@ -2168,24 +2164,14 @@
+ 		/* We only want to worry about a few fields here. */
+ 		if (!strcmp(field, "FN"))
+ 			alias = g_strdup(value);
+-		else if (!strcmp(field, "X-AIM") || !strcmp(field, "X-ICQ") ||
+-				 !strcmp(field, "X-YAHOO") || !strcmp(field, "X-MSN") ||
+-				 !strcmp(field, "X-JABBER"))
++		else if (!strcmp(field, "X-JABBER"))
+ 		{
+ 			char **values = g_strsplit(value, ":", 0);
+ 			char **im;
+ 
+ 			for (im = values; *im != NULL; im++)
+ 			{
+-				if (!strcmp(field, "X-AIM"))
+-					aims = g_list_append(aims, g_strdup(*im));
+-				else if (!strcmp(field, "X-ICQ"))
+-					icqs = g_list_append(icqs, g_strdup(*im));
+-				else if (!strcmp(field, "X-YAHOO"))
+-					yahoos = g_list_append(yahoos, g_strdup(*im));
+-				else if (!strcmp(field, "X-MSN"))
+-					msns = g_list_append(msns, g_strdup(*im));
+-				else if (!strcmp(field, "X-JABBER"))
++				if (!strcmp(field, "X-JABBER"))
+ 					jabbers = g_list_append(jabbers, g_strdup(*im));
+ 			}
+ 
+@@ -2195,18 +2181,13 @@
+ 
+ 	g_free(temp_vcard);
+ 
+-	if (aims == NULL && icqs == NULL && yahoos == NULL &&
+-		msns == NULL && jabbers == NULL)
++	if (jabbers == NULL)
+ 	{
+ 		g_free(alias);
+ 
+ 		return FALSE;
+ 	}
+ 
+-	add_buddies_from_vcard("prpl-aim",    group, aims,    alias);
+-	add_buddies_from_vcard("prpl-icq",    group, icqs,    alias);
+-	add_buddies_from_vcard("prpl-yahoo",  group, yahoos,  alias);
+-	add_buddies_from_vcard("prpl-msn",    group, msns,    alias);
+ 	add_buddies_from_vcard("prpl-jabber", group, jabbers, alias);
+ 
+ 	g_free(alias);
+diff -Nur pidgin-2.10.7/pidgin/gtkdialogs.c pidgin-2.10.7-nonprism/pidgin/gtkdialogs.c
+--- pidgin-2.10.7/pidgin/gtkdialogs.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtkdialogs.c	2013-08-16 21:37:21.863154130 -0300
+@@ -615,16 +615,6 @@
+ #endif
+ #endif
+ 
+-#if defined(_WIN32) || defined(USE_INTERNAL_LIBGADU)
+-	g_string_append(str, "    <b>Gadu-Gadu library (libgadu):</b> Internal<br/>");
+-#else
+-#ifdef HAVE_LIBGADU
+-	g_string_append(str, "    <b>Gadu-Gadu library (libgadu):</b> Enabled<br/>");
+-#else
+-	g_string_append(str, "    <b>Gadu-Gadu library (libgadu):</b> Disabled<br/>");
+-#endif
+-#endif
+-
+ #ifdef USE_GTKSPELL
+ 	g_string_append(str, "    <b>GtkSpell:</b> Enabled<br/>");
+ #else
+diff -Nur pidgin-2.10.7/pidgin/gtkimhtml.c pidgin-2.10.7-nonprism/pidgin/gtkimhtml.c
+--- pidgin-2.10.7/pidgin/gtkimhtml.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtkimhtml.c	2013-08-16 22:59:51.862994429 -0300
+@@ -2440,7 +2440,6 @@
+ static gboolean smooth_scroll_cb(gpointer data);
+ 
+ /*
+- <KingAnt> marv: The two IM image functions in oscar are purple_odc_send_im and purple_odc_incoming
+ 
+ 
+ [19:58] <Robot101> marv: images go into the imgstore, a refcounted... well.. hash. :)
+diff -Nur pidgin-2.10.7/pidgin/gtknotify.c pidgin-2.10.7-nonprism/pidgin/gtknotify.c
+--- pidgin-2.10.7/pidgin/gtknotify.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtknotify.c	2013-08-27 23:37:23.037593200 -0300
+@@ -1263,10 +1263,6 @@
+ 			command = g_strdup_printf("xdg-open %s", escaped);
+ 		g_free(tmp);
+ 	}
+-	else if (purple_running_osx() == TRUE)
+-	{
+-		command = g_strdup_printf("open %s", escaped);
+-	}
+ 	else if (!strcmp(web_browser, "epiphany") ||
+ 		!strcmp(web_browser, "galeon"))
+ 	{
+@@ -1289,30 +1285,31 @@
+ 	{
+ 		command = g_strdup_printf("kfmclient openURL %s", escaped);
+ 		/*
+-		 * Does Konqueror have options to open in new tab
++		 * Does Konqueror-libre have options to open in new tab
+ 		 * and/or current window?
+ 		 */
+ 	}
+-	else if (!strcmp(web_browser, "mozilla") ||
+-			 !strcmp(web_browser, "mozilla-firebird") ||
+-			 !strcmp(web_browser, "firefox") ||
+-			 !strcmp(web_browser, "seamonkey"))
++	else if (!strcmp(web_browser, "iceweasel") ||
++			 !strcmp(web_browser, "icecat") ||
++			 !strcmp(web_browser, "iceape"))
+ 	{
+ 		char *args = "";
+ 
+ 		command = g_strdup_printf("%s %s", web_browser, escaped);
+ 
+ 		/*
+-		 * Firefox 0.9 and higher require a "-a firefox" option when
++		 * Iceweasel-libre 0.9 and higher require a "-a iceweasel" option when
+ 		 * using -remote commands.  This breaks older versions of
+ 		 * mozilla.  So we include this other handly little string
+-		 * when calling firefox.  If the API for remote calls changes
+-		 * any more in firefox then firefox should probably be split
++		 * when calling iceweasel.  If the API for remote calls changes
++		 * any more in iceweasel then iceweasel should probably be split
+ 		 * apart from mozilla-firebird and mozilla... but this is good
+ 		 * for now.
+ 		 */
+-		if (!strcmp(web_browser, "firefox"))
+-			args = "-a firefox";
++		if (!strcmp(web_browser, "iceweasel"))
++			args = "-a iceweasel";
++		else if (!strcmp(web_browser, "icecat"))
++			args = "-a icecat";
+ 
+ 		if (place == PIDGIN_BROWSER_NEW_WINDOW)
+ 			remote_command = g_strdup_printf("%s %s -remote "
+@@ -1327,58 +1324,12 @@
+ 											 "openURL(%s)",
+ 											 web_browser, args, escaped);
+ 	}
+-	else if (!strcmp(web_browser, "netscape"))
+-	{
+-		command = g_strdup_printf("netscape %s", escaped);
+-
+-		if (place == PIDGIN_BROWSER_NEW_WINDOW)
+-		{
+-			remote_command = g_strdup_printf("netscape -remote "
+-											 "openURL(%s,new-window)",
+-											 escaped);
+-		}
+-		else if (place == PIDGIN_BROWSER_CURRENT)
+-		{
+-			remote_command = g_strdup_printf("netscape -remote "
+-											 "openURL(%s)", escaped);
+-		}
+-	}
+-	else if (!strcmp(web_browser, "opera"))
+-	{
+-		if (place == PIDGIN_BROWSER_NEW_WINDOW)
+-			command = g_strdup_printf("opera -newwindow %s", escaped);
+-		else if (place == PIDGIN_BROWSER_NEW_TAB)
+-			command = g_strdup_printf("opera -newpage %s", escaped);
+-		else if (place == PIDGIN_BROWSER_CURRENT)
+-		{
+-			remote_command = g_strdup_printf("opera -remote "
+-											 "openURL(%s)", escaped);
+-			command = g_strdup_printf("opera %s", escaped);
+-		}
+-		else
+-			command = g_strdup_printf("opera %s", escaped);
+-
+-	}
+-	else if (!strcmp(web_browser, "google-chrome"))
+-	{
+-		/* Google Chrome doesn't have command-line arguments that control the
+-		 * opening of links from external calls.  This is controlled solely from
+-		 * a preference within Google Chrome. */
+-		command = g_strdup_printf("google-chrome %s", escaped);
+-	}
+-	else if (!strcmp(web_browser, "chrome"))
+-	{
+-		/* Chromium doesn't have command-line arguments that control the
+-		 * opening of links from external calls.  This is controlled solely from
+-		 * a preference within Chromium. */
+-		command = g_strdup_printf("chrome %s", escaped);
+-	}
+-	else if (!strcmp(web_browser, "chromium-browser"))
++	else if (!strcmp(web_browser, "chromium"))
+ 	{
+-		/* Chromium doesn't have command-line arguments that control the
++		/* Chromium-libre doesn't have command-line arguments that control the
+ 		 * opening of links from external calls.  This is controlled solely from
+-		 * a preference within Chromium. */
+-		command = g_strdup_printf("chromium-browser %s", escaped);
++		 * a preference within Chromium-libre. */
++		command = g_strdup_printf("chromium %s", escaped);
+ 	}
+ 	else if (!strcmp(web_browser, "custom"))
+ 	{
+diff -Nur pidgin-2.10.7/pidgin/gtkprefs.c pidgin-2.10.7-nonprism/pidgin/gtkprefs.c
+--- pidgin-2.10.7/pidgin/gtkprefs.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtkprefs.c	2013-08-27 22:55:58.523782666 -0300
+@@ -1851,24 +1851,15 @@
+ 
+ 	/* Sorted reverse alphabetically */
+ 	static const struct browser possible_browsers[] = {
+-		{N_("Seamonkey"), "seamonkey"},
+-		{N_("Opera"), "opera"},
+-		{N_("Netscape"), "netscape"},
+-		{N_("Mozilla"), "mozilla"},
+-		{N_("Konqueror"), "kfmclient"},
+-		{N_("Google Chrome"), "google-chrome"},
+-		/* Do not move the line below.  Code below expects gnome-open to be in
+-		 * this list immediately after xdg-open! */
++		{N_("Iceape-libre"), "iceape"},
++		{N_("Konqueror-libre"), "kfmclient"},
+ 		{N_("Desktop Default"), "xdg-open"},
+ 		{N_("GNOME Default"), "gnome-open"},
+-		{N_("Galeon"), "galeon"},
+-		{N_("Firefox"), "firefox"},
+-		{N_("Firebird"), "mozilla-firebird"},
+-		{N_("Epiphany"), "epiphany"},
+-		/* Translators: please do not translate "chromium-browser" here! */
+-		{N_("Chromium (chromium-browser)"), "chromium-browser"},
+-		/* Translators: please do not translate "chrome" here! */
+-		{N_("Chromium (chrome)"), "chrome"}
++		{N_("Iceweasel-libre"), "iceweasel"},
++		{N_("Icecat"), "icecat"},
++		{N_("Epiphany-libre"), "epiphany"},
++		/* Translators: please do not translate "chromium" here! */
++		{N_("Chromium-libre (chromium)"), "chromium"},
+ 	};
+ 	static const int num_possible_browsers = G_N_ELEMENTS(possible_browsers);
+ 
+diff -Nur pidgin-2.10.7/pidgin/gtkutils.c pidgin-2.10.7-nonprism/pidgin/gtkutils.c
+--- pidgin-2.10.7/pidgin/gtkutils.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/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 -Nur pidgin-2.10.7/pidgin/gtkwhiteboard.c pidgin-2.10.7-nonprism/pidgin/gtkwhiteboard.c
+--- pidgin-2.10.7/pidgin/gtkwhiteboard.c	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtkwhiteboard.c	2013-08-16 23:25:21.614375960 -0300
+@@ -339,13 +339,10 @@
+ 	 */
+ 	/* XXXX because otherwise gettext will see this string, even though it's
+ 	 * in an #if 0 block. Remove the XXXX if you want to use this code.
+-	 * But, it really shouldn't be a Yahoo-specific string. ;) */
++	 */
+ 	purple_conv_im_write(PURPLE_CONV_IM(conv), "", XXXX_("Sent Doodle request."),
+ 					   PURPLE_MESSAGE_NICK | PURPLE_MESSAGE_RECV, time(NULL));
+ 
+-	yahoo_doodle_command_send_request(gc, to);
+-	yahoo_doodle_command_send_ready(gc, to);
+-
+ 	/* Insert this 'session' in the list.  At this point, it's only a requested
+ 	 * session.
+ 	 */
+@@ -554,15 +551,13 @@
+ 	if(event->button == 1 && pixmap != NULL)
+ 	{
+ 		/* If the brush was never moved, express two sets of two deltas That's a
+-		 * 'point,' but not for Yahoo!
++		 * 'point,'
+ 		 */
+ 		/* if((event->x == LastX) && (event->y == LastY)) */
+ 		if(MotionCount == 0)
+ 		{
+ 			int index;
+ 
+-			/* For Yahoo!, a (0 0) indicates the end of drawing */
+-			/* FIXME: Yahoo Doodle specific! */
+ 			for(index = 0; index < 2; index++)
+ 			{
+ 				draw_list = g_list_append(draw_list, 0);
+diff -Nur pidgin-2.10.7/pidgin/gtkwhiteboard.h pidgin-2.10.7-nonprism/pidgin/gtkwhiteboard.h
+--- pidgin-2.10.7/pidgin/gtkwhiteboard.h	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtkwhiteboard.h	2013-08-27 23:28:41.018759351 -0300
+@@ -37,8 +37,7 @@
+ #define BRUSH_STATE_DOWN    1
+ #define BRUSH_STATE_MOTION  2
+ 
+-/* XXX: This seems duplicated with the Yahoo! Doodle prpl code.
+- * XXX: How should they work together? */
++/* XXX: How should they work together? */
+ #define PALETTE_NUM_COLORS  7
+ 
+ /**
+diff -Nur pidgin-2.10.7/pidgin/Makefile.am pidgin-2.10.7-nonprism/pidgin/Makefile.am
+--- pidgin-2.10.7/pidgin/Makefile.am	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/Makefile.am	2013-08-16 21:03:34.936610745 -0300
+@@ -160,10 +160,6 @@
+ 	$(GTK_LIBS) \
+ 	$(top_builddir)/libpurple/libpurple.la
+ 
+-if USE_INTERNAL_LIBGADU
+-INTGG_CFLAGS = -DUSE_INTERNAL_LIBGADU
+-endif
+-
+ AM_CPPFLAGS = \
+ 	-DDATADIR=\"$(datadir)\" \
+ 	-DLIBDIR=\"$(libdir)/pidgin/\" \
+@@ -179,6 +175,5 @@
+ 	$(GTK_CFLAGS) \
+ 	$(DBUS_CFLAGS) \
+ 	$(GTKSPELL_CFLAGS) \
+-	$(LIBXML_CFLAGS) \
+-	$(INTGG_CFLAGS)
++	$(LIBXML_CFLAGS)
+ endif  # ENABLE_GTK
+diff -Nur pidgin-2.10.7/pidgin/Makefile.in pidgin-2.10.7-nonprism/pidgin/Makefile.in
+--- pidgin-2.10.7/pidgin/Makefile.in	2013-02-11 07:17:23.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/Makefile.in	2013-08-16 23:56:44.729405978 -0300
+@@ -286,8 +286,6 @@
+ FARSTREAM_CFLAGS = @FARSTREAM_CFLAGS@
+ FARSTREAM_LIBS = @FARSTREAM_LIBS@
+ FGREP = @FGREP@
+-GADU_CFLAGS = @GADU_CFLAGS@
+-GADU_LIBS = @GADU_LIBS@
+ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+@@ -349,8 +347,6 @@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+ MANIFEST_TOOL = @MANIFEST_TOOL@
+-MEANWHILE_CFLAGS = @MEANWHILE_CFLAGS@
+-MEANWHILE_LIBS = @MEANWHILE_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO_CFLAGS = @MONO_CFLAGS@
+@@ -645,7 +641,6 @@
+ @ENABLE_GTK_TRUE@	$(GTK_LIBS) \
+ @ENABLE_GTK_TRUE@	$(top_builddir)/libpurple/libpurple.la
+ 
+-@ENABLE_GTK_TRUE@@USE_INTERNAL_LIBGADU_TRUE@INTGG_CFLAGS = -DUSE_INTERNAL_LIBGADU
+ @ENABLE_GTK_TRUE@AM_CPPFLAGS = \
+ @ENABLE_GTK_TRUE@	-DDATADIR=\"$(datadir)\" \
+ @ENABLE_GTK_TRUE@	-DLIBDIR=\"$(libdir)/pidgin/\" \
+diff -Nur pidgin-2.10.7/pidgin/pixmaps/emotes/default/24/default.theme.in pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/default/24/default.theme.in
+--- pidgin-2.10.7/pidgin/pixmaps/emotes/default/24/default.theme.in	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/default/24/default.theme.in	2013-08-16 23:13:41.759061988 -0300
+@@ -28,8 +28,7 @@
+ 
+ 
+ [XMPP]
+-# Following XEP-0038 + GTalk + our default set, in default set order
+-# The GTalk strings come from ticket #3307.
++# Following XEP-0038 + our default set, in default set order
+ happy.png           :)      :-)     =)
+ excited.png         :-D     :-d     :D      :d      =D      =d
+ sad.png             :-(     :(
+@@ -47,7 +46,7 @@
+ foot-in-mouth.png   :-!
+ shout.png           >:o     >:O
+ 
+-# Following XEP-0038 + GTalk
++# Following XEP-0038
+ angry.png           >:-(    >:(     X-(    x-(
+ good.png            :yes:
+ bad.png             :no:
+@@ -75,515 +74,3 @@
+ ! skywalker.png     C:-)    c:-)    C:)     c:)
+ ! monkey.png        :-(|)   :(|)    8-|)
+ ! cyclops.png       O-)     o-)
+-
+-
+-# Following AIM 6.1
+-[AIM]
+-happy.png           :-)     :)
+-wink.png            ;-)     ;)
+-sad.png             :-(     :(
+-tongue.png          :P      :p      :-P     :-p
+-shocked.png         =-O
+-kiss.png            :-*
+-shout.png           >:o
+-excited.png         :-D     :D
+-moneymouth.png      :-$
+-foot-in-mouth.png   :-!
+-embarrassed.png     :-[
+-angel.png           O:-)
+-thinking.png        :-\\    :-/
+-crying.png          :'(
+-shut-mouth.png      :-X
+-glasses-cool.png    8-)
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)   :(|)    8-|)
+-! cyclops.png       O-)     o-)
+-
+-
+-# Following Windows Live Messenger 8.1
+-[MSN]
+-happy.png           :)      :-)
+-excited.png         :D      :d      :-D     :-d
+-wink.png            ;)      ;-)
+-shocked.png         :-O     :-o     :O      :o
+-tongue.png          :-P     :P      :-p     :p
+-glasses-cool.png    (H)     (h)
+-angry.png           :@      :-@
+-embarrassed.png     :$      :-$
+-confused.png        :S      :s      :-S     :-s
+-sad.png             :(      :-(
+-crying.png          :'(
+-neutral.png         :|      :-|
+-devil.png           (6)
+-angel.png           (A)     (a)
+-in_love.png         (L)     (l)
+-love-over.png       (U)     (u)
+-msn.png             (M)     (m)
+-cat.png             (@)
+-dog.png             (&)
+-moon.png            (S)
+-star.png            (*)
+-film.png            (~)
+-musical-note.png    (8)
+-mail.png            (E)     (e)
+-rose.png            (F)     (f)
+-rose-dead.png       (W)     (w)
+-clock.png           (O)     (o)
+-kiss.png            (K)     (k)
+-present.png         (G)     (g)
+-cake.png            (^)
+-camera.png          (P)     (p)
+-lamp.png            (I)     (i)
+-coffee.png          (C)     (c)
+-phone.png           (T)     (t)
+-hug-left.png        ({)
+-hug-right.png       (})
+-beer.png            (B)     (b)
+-drink.png           (D)     (d)
+-boy.png             (Z)     (z)
+-girl.png            (X)     (x)
+-good.png            (Y)     (y)
+-bad.png             (N)     (n)
+-vampire.png         :[      :-[
+-goat.png            (nah)
+-sun.png             (#)
+-rainbow.png         (R)     (r)
+-quiet.png           :-#
+-teeth.png           8o|
+-glasses-nerdy.png   8-|
+-sarcastic.png       ^o)
+-secret.png          :-*
+-sick.png            +o(
+-snail.png           (sn)
+-turtle.png          (tu)
+-plate.png           (pl)
+-bowl.png            (||)
+-pizza.png           (pi)
+-soccerball.png      (so)
+-car.png             (au)
+-airplane.png        (ap)
+-umbrella.png        (um)
+-island.png          (ip)
+-computer.png        (co)
+-mobile.png          (mp)
+-brb.png             (brb)
+-rain.png            (st)
+-highfive.png        (h5)
+-coins.png           (mo)
+-sheep.png           (bah)
+-dont-know.png       :^)
+-thinking.png        *-)
+-thunder.png         (li)
+-party.png           <:o)
+-eyeroll.png         8-)
+-sleepy.png          |-) 
+-bunny.png           ('.')
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)   :(|)    8-|)
+-! cyclops.png       O-)     o-)
+-
+-# Hidden MSN emotes
+-cigarette.png      	(ci)    (CI)
+-handcuffs.png       (%)
+-console.png			(xx)    (XX)
+-fingers-crossed.png	(yn)    (YN)
+-
+-
+-# Following QQ 2006
+-[QQ]
+-shocked.png         /:O      /jy       /surprised
+-curl-lip.png        /:~      /pz       /curl_lip
+-desire.png          /:*      /se       /desire
+-dazed.png           /:|      /dazed
+-party.png           /8-)     /dy       /revel
+-crying.png          /:<      /ll       /cry
+-bashful.png         /:$      /hx       /bashful
+-shut-mouth.png      /:X      /bz       /shut_mouth
+-sleeping.png        /:Z      /shui     /sleep
+-weep.png            /:'(     /dk       /weep
+-embarrassed.png     /:-|     /gg       /embarassed
+-pissed-off.png      /:@      /fn       /pissed_off
+-act-up.png          /:P      /tp       /act_up
+-excited.png         /:D      /cy       /toothy_smile
+-happy.png           /:)      /wx       /small_smile
+-sad.png             /:(      /ng       /sad
+-glasses-cool.png    /:+      /kuk      /cool
+-doctor.png          /:#      /feid     /SARS
+-silly.png           /:Q      /zk       /crazy
+-sick.png            /:T      /tu       /vomit
+-snicker.png         /;p      /tx       /titter
+-cute.png            /;-D     /ka       /cute
+-disdain.png         /;d      /by       /disdain
+-arrogant.png        /;o      /am       /arrogant
+-starving.png        /:g      /jie      /starving
+-sleepy.png          /|-)     /kun      /sleepy
+-terror.png          /:!      /jk       /terror
+-hot.png             /:L      /sweat
+-smirk.png           /:>      /hanx     /smirk
+-soldier.png         /:;      /db       /soldier
+-struggle.png        /;f      /fendou   /struggle
+-curse.png           /:-S     /zhm      /curse
+-question.png        /?       /yiw      /question
+-quiet.png           /;x      /xu       /shh
+-hypnotized.png      /;@      /yun      /dizzy
+-excruciating.png    /:8      /zhem     /excrutiating
+-freaked-out.png     /;!      /shuai    /freaked_out
+-skeleton.png        /!!!     /kl       /skeleton
+-hammer.png          /xx      /qiao     /hammer
+-bye.png             /bye     /zj       /bye
+-go-away.png         /go      /shan     /go
+-afraid.png          /shake   /fad      /shake
+-amorous.png         /love    /aiq      /love
+-jump.png            /jump    /tiao     /jump
+-search.png          /find    /zhao     /search
+-lashes.png          /&       /mm       /beautiful_eyebrows
+-pig.png             /pig     /zt       /pig
+-cat.png             /cat     /mm       /cat
+-dog.png             /dog     /xg       /dog
+-hug-left.png        /hug     /yb       /hug
+-coins.png           /$       /qianc    /money
+-lamp.png            /!       /dp       /lightbulb
+-bowl.png            /cup     /bei      /cup
+-cake.png            /cake    /dg       /cake
+-thunder.png         /li      /shd      /lightning
+-bomb.png            /bome    /zhd      /bomb
+-knife.png           /kn      /dao      /knife
+-soccerball.png      /footb   /zq       /soccer
+-musical-note.png    /music   /yy       /music
+-poop.png            /shit    /bb       /shit
+-coffee.png          /coffee  /kf       /coffee
+-hungry.png          /eat     /fan      /eat
+-pill.png            /pill    /yw       /pill
+-rose.png            /rose    /mg       /rose
+-wilt.png            /fade    /dx       /wilt
+-kiss.png            /kiss    /wen      /kiss
+-in_love.png         /heart   /xin      /heart
+-love-over.png       /break   /xs       /broken_heart
+-meeting.png         /meeting /hy       /meeting
+-present.png         /gift    /lw       /gift
+-phone.png           /phone   /dh       /phone
+-clock.png           /time    /sj       /time
+-mail.png            /email   /yj       /email
+-tv.png              /TV      /ds       /TV
+-sun.png             /sun     /ty       /sun
+-moon.png            /moon    /yl       /moon
+-good.png            /strong  /qiang    /thumbs_up
+-bad.png             /weak    /ruo      /thumbs_down
+-handshake.png       /share   /ws       /handshake
+-victory.png         /v       /shl      /victory
+-beauty.png          /<J>     /mn       /beauty
+-qq.png              /<QQ>    /qz       /qq
+-blowkiss.png        /<L>     /fw       /blow_kiss
+-angry.png           /<O>     /oh       /angry
+-liquor.png          /<B>     /bj       /baijiu
+-can.png             /<U>     /qsh      /soda
+-watermelon.png      /<W>     /xigua    /watermelon
+-rain.png            /<!!>    /xy       /rain
+-cloudy.png          /<~>     /duoy     /cloudy
+-snowman.png         /<Z>     /xr       /snowman
+-star.png            /<*>     /xixing   /star
+-girl.png            /<00>    /nv       /woman
+-boy.png             /<11>    /nan      /man
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)   :(|)    8-|)
+-! cyclops.png       O-)     o-)
+-
+-
+-# Following ICQ 6.0
+-[ICQ]
+-happy.png           :-)     :)
+-neutral.png         :-$
+-sad.png             :-(     :(
+-shocked.png         =-O
+-wink.png            ;-)     ;)
+-tongue.png          :-P     :P      :-p     :p
+-music.png           [:-}
+-laugh.png           *JOKINGLY*
+-sleeping.png        *TIRED*
+-crying.png          :'(    :'-(
+-sick.png            :-!
+-kissed.png          *KISSED*
+-stop.png            *STOP*
+-kiss.png            :-{} :-*
+-kissing.png         *KISSING* 
+-victory.png         *YAHOO*
+-silly.png           %)
+-embarrassed.png     :-[
+-devil.png           ]:->
+-angel.png           O:-)
+-rose.png            @}->--
+-shut-mouth.png      :-X     :X      :-x     :x
+-bomb.png            @=
+-thinking.png        :-\\    :-/
+-good.png            *THUMBS\ UP*
+-shout.png           >:o     >:O     :-@
+-beer.png            *DRINK*
+-excited.png         :-D     :D
+-glasses-cool.png    8-)
+-amorous.png         *IN\ LOVE*
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)   :(|)    8-|)
+-! cyclops.png       O-)     o-)
+-
+-
+-# Following Yahoo! Messenger 8.1
+-[Yahoo]
+-happy.png           :)      :-)
+-question.png        :-/     :-\\
+-shocked.png         :-O     :O      :-o     :o 
+-devil.png           >:)
+-angel.png           O:-)    o:-)    0:-)
+-sick.png            :-&
+-sleepy.png          (:|
+-hypnotized.png      @-)
+-on-the-phone.png    :)]
+-sad.png             :(      :-(
+-amorous.png         :x      :-x     :X      :-X
+-angry.png           X-(     x-(     X(      x(
+-crying.png          :((
+-glasses-nerdy.png   :-B     :-b
+-quiet.png           :-$
+-drool.png           =P~     =p~
+-lying.png           :^O     :^o
+-call-me.png         :-c
+-wink.png            ;)      ;-)
+-embarrassed.png     :">
+-mean.png            :->     :>
+-laugh.png           :))     :-))
+-bye.png             =;
+-arrogant.png        [-(
+-thinking.png        :-?
+-waiting.png         :-w     :-W
+-at-wits-end.png     ~x(     ~X(
+-excited.png         :D      :-D     :d      :-d
+-tongue.png          :-P     :P      :-p     :p
+-glasses-cool.png    B-)     b-)
+-neutral.png         :|      :-|
+-sleeping.png        I-)     i-)     |-)
+-clown.png           :o)     :O)
+-doh.png             #-o     #-O
+-weep.png            :-<
+-go-away.png         :-h
+-lashes.png          ;;)
+-kiss.png            :-*     :*
+-confused.png        :-S     :-s
+-sarcastic.png       /:)
+-eyeroll.png         8-|
+-silly.png           8-}
+-clap.png            =D>     =d>
+-mad-tongue.png      >:P     >:p
+-time-out.png        :-t     :-T
+-hug-left.png        >:D<    >:d<
+-love-over.png       =((
+-hot.png             #:-S    #:-s
+-rotfl.png           =)) :-j :-J 
+-loser.png           L-)     l-)
+-party.png           <:-P    <:-p
+-nervous.png         :-SS	:-Ss	:-sS	:-ss
+-cowboy.png          <):)
+-desire.png          8->
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)   :(|)    8-|)
+-! cyclops.png       O-)     o-)
+-
+-# Hidden Yahoo emotes
+-alien.png           =:)     >-)
+-beat-up.png         b-(     B-(
+-chicken.png         ~:>
+-coffee.png          ~o)     ~O)
+-cow.png             3:-O    3:-o
+-dance.png           \\:D/   \\:d/
+-rose.png            @};-
+-dont-know.png       :-L     :-l
+-skeleton.png        8-X     8-x
+-lamp.png            *-:)
+-monkey.png          :(|)
+-coins.png           $-)
+-peace.png           :)>-
+-pig.png             :@)
+-pray.png            [-o<    [-O<
+-pumpkin.png         (~~)
+-shame.png           [-X     [-x
+-flag.png            **==
+-clover.png          %%-
+-musical-note.png    :-"
+-giggle.png          ;))
+-worship.png         ^:)^
+-star.png            (*)
+-waving.png          >:/
+-talktohand.png      :-@
+-
+-# Only available after activating the Yahoo! Fighter IMVironment
+-male-fighter1.png   o->     O->
+-male-fighter2.png   o=>     O=>
+-female-fighter.png  o-+     O-+
+-yin-yang.png        (%)
+-
+-# Following Yahoo! Messenger 8.1
+-[Yahoo JAPAN]
+-happy.png           :)      :-)
+-question.png        :-/     :-\\
+-shocked.png         :-O     :O      :-o     :o 
+-devil.png           >:)
+-angel.png           O:-)    o:-)    0:-)
+-sick.png            :-&
+-sleepy.png          (:|
+-hypnotized.png      @-)
+-on-the-phone.png    :)]
+-sad.png             :(      :-(
+-amorous.png         :x      :-x     :X      :-X
+-angry.png           X-(     x-(     X(      x(
+-crying.png          :((
+-glasses-nerdy.png   :-B     :-b
+-quiet.png           :-$
+-drool.png           =P~     =p~
+-lying.png           :^O     :^o
+-call-me.png         :-c
+-wink.png            ;)      ;-)
+-embarrassed.png     :">
+-mean.png            :->     :>
+-laugh.png           :))     :-))
+-bye.png             =;
+-arrogant.png        [-(
+-thinking.png        :-?
+-waiting.png         :-w     :-W
+-at-wits-end.png     ~x(     ~X(
+-excited.png         :D      :-D     :d      :-d
+-tongue.png          :-P     :P      :-p     :p
+-glasses-cool.png    B-)     b-)
+-neutral.png         :|      :-|
+-sleeping.png        I-)     i-)     |-)
+-clown.png           :o)     :O)
+-doh.png             #-o     #-O
+-weep.png            :-<
+-go-away.png         :-h
+-lashes.png          ;;)
+-kiss.png            :-*     :*
+-confused.png        :-S     :-s
+-sarcastic.png       /:)
+-eyeroll.png         8-|
+-silly.png           8-}
+-clap.png            =D>     =d>
+-mad-tongue.png      >:P     >:p
+-time-out.png        :-t     :-T
+-hug-left.png        >:D<    >:d<
+-love-over.png       =((
+-hot.png             #:-S    #:-s
+-rotfl.png           =)) :-j :-J 
+-loser.png           L-)     l-)
+-party.png           <:-P    <:-p
+-nervous.png         :-SS       :-Ss    :-sS    :-ss
+-cowboy.png          <):)
+-desire.png          8->
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)  :(|)
+-
+-# Hidden Yahoo emotes
+-alien.png           =:)     >-)
+-beat-up.png         b-(     B-(
+-chicken.png         ~:>
+-coffee.png          ~o)     ~O)
+-cow.png             3:-O    3:-o
+-dance.png           \\:D/   \\:d/
+-rose.png            @};-
+-dont-know.png       :-L     :-l
+-skeleton.png        8-X     8-x
+-lamp.png            *-:)
+-monkey.png          :(|)
+-coins.png           $-)
+-peace.png           :)>-
+-pig.png             :@)
+-pray.png            [-o<    [-O<
+-pumpkin.png         (~~)
+-shame.png           [-X     [-x
+-flag.png            **==
+-clover.png          %%-
+-musical-note.png    :-"
+-giggle.png          ;))
+-worship.png         ^:)^
+-star.png            (*)
+-waving.png          >:/
+-talktohand.png      :-@
+-
+-# Only available after activating the Yahoo! Fighter IMVironment
+-male-fighter1.png   o->     O->
+-male-fighter2.png   o=>     O=>
+-female-fighter.png  o-+     O-+
+-yin-yang.png        (%)
+-
+-
+-# Following MySpaceIM Beta 1.0.697.0
+-[MySpaceIM]
+-excited.png  	    :D      :-D
+-devil.png	    }:)
+-confused.png	    :Z
+-glasses-nerdy.png   B)
+-bulgy-eyes.png	    %)
+-freaked-out.png	    :E
+-happy.png	    :)      :-)
+-amorous.png	    :X
+-laugh.png	    :))
+-mohawk.png	    -:
+-mad-tongue.png	    X(
+-messed.png	    X)
+-glasses-nerdy.png   Q)
+-doh.png		    :G
+-pirate.png	    P)
+-shocked.png	    :O
+-sidefrown.png	    :{
+-sinister.png	    :B
+-smirk.png	    :,
+-neutral.png	    :|
+-tongue.png	    :P      :p
+-pissed-off.png	    B|
+-wink.png	    ;-)     ;)
+-sad.png		    :[
+-kiss.png            :x
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)   :(|)    8-|)
+-! cyclops.png       O-)     o-)
+-
+-
+-# MXit standard emoticons
+-[MXit]
+-happy.png           :-)     :)
+-sad.png             :-(     :(
+-wink.png            ;-)     ;)
+-excited.png         :-D     :D     :->      :>
+-neutral.png         :-|     :|
+-shocked.png         :-O     :O
+-tongue.png          :-P     :P
+-embarrassed.png     :-$     :$
+-glasses-cool.png    8-)
+-in_love.png         (H)
+-rose.png            (F)
+-### Added in v3.0
+-boy.png             (m)
+-girl.png            (f)
+-star.png            (*)
+-chilli.png          (c)
+-kiss.png            (x)
+-lamp.png            (i)
+-pissed-off.png      :e      :-e
+-shut-mouth.png      :-x     :x
+-thunder.png         (z)
+-coffee.png          (U)
+-mrgreen.png         (G)
+-### Added in v5.0
+-sick.png            :o(
+-excruciating.png    :-{     :{
+-amorous.png         :-}     :}
+-eyeroll.png         8-o     8o
+-crying.png          :'(
+-thinking.png        :-?     :?
+-drool.png           :-~     :~
+-sleeping.png        :-z     :z
+-lying.png           :L)
+-glasses-nerdy.png   8-|     8|
+-pirate.png          P-)
+-### Added in v5.9.7
+-bored.png           :-[     :[
+-cold.png            :-<     :<
+-confused.png        :-,     :,
+-hungry.png          :-C     :C
+-stressed.png        :-s     :s
+diff -Nur pidgin-2.10.7/pidgin/pixmaps/emotes/default/24/theme pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/default/24/theme
+--- pidgin-2.10.7/pidgin/pixmaps/emotes/default/24/theme	2013-02-11 07:17:58.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/default/24/theme	2013-08-16 23:15:55.929941297 -0300
+@@ -28,8 +28,7 @@
+ 
+ 
+ [XMPP]
+-# Following XEP-0038 + GTalk + our default set, in default set order
+-# The GTalk strings come from ticket #3307.
++# Following XEP-0038 + our default set, in default set order
+ happy.png           :)      :-)     =)
+ excited.png         :-D     :-d     :D      :d      =D      =d
+ sad.png             :-(     :(
+@@ -47,7 +46,7 @@
+ foot-in-mouth.png   :-!
+ shout.png           >:o     >:O
+ 
+-# Following XEP-0038 + GTalk
++# Following XEP-0038
+ angry.png           >:-(    >:(     X-(    x-(
+ good.png            :yes:
+ bad.png             :no:
+@@ -75,515 +74,3 @@
+ ! skywalker.png     C:-)    c:-)    C:)     c:)
+ ! monkey.png        :-(|)   :(|)    8-|)
+ ! cyclops.png       O-)     o-)
+-
+-
+-# Following AIM 6.1
+-[AIM]
+-happy.png           :-)     :)
+-wink.png            ;-)     ;)
+-sad.png             :-(     :(
+-tongue.png          :P      :p      :-P     :-p
+-shocked.png         =-O
+-kiss.png            :-*
+-shout.png           >:o
+-excited.png         :-D     :D
+-moneymouth.png      :-$
+-foot-in-mouth.png   :-!
+-embarrassed.png     :-[
+-angel.png           O:-)
+-thinking.png        :-\\    :-/
+-crying.png          :'(
+-shut-mouth.png      :-X
+-glasses-cool.png    8-)
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)   :(|)    8-|)
+-! cyclops.png       O-)     o-)
+-
+-
+-# Following Windows Live Messenger 8.1
+-[MSN]
+-happy.png           :)      :-)
+-excited.png         :D      :d      :-D     :-d
+-wink.png            ;)      ;-)
+-shocked.png         :-O     :-o     :O      :o
+-tongue.png          :-P     :P      :-p     :p
+-glasses-cool.png    (H)     (h)
+-angry.png           :@      :-@
+-embarrassed.png     :$      :-$
+-confused.png        :S      :s      :-S     :-s
+-sad.png             :(      :-(
+-crying.png          :'(
+-neutral.png         :|      :-|
+-devil.png           (6)
+-angel.png           (A)     (a)
+-in_love.png         (L)     (l)
+-love-over.png       (U)     (u)
+-msn.png             (M)     (m)
+-cat.png             (@)
+-dog.png             (&)
+-moon.png            (S)
+-star.png            (*)
+-film.png            (~)
+-musical-note.png    (8)
+-mail.png            (E)     (e)
+-rose.png            (F)     (f)
+-rose-dead.png       (W)     (w)
+-clock.png           (O)     (o)
+-kiss.png            (K)     (k)
+-present.png         (G)     (g)
+-cake.png            (^)
+-camera.png          (P)     (p)
+-lamp.png            (I)     (i)
+-coffee.png          (C)     (c)
+-phone.png           (T)     (t)
+-hug-left.png        ({)
+-hug-right.png       (})
+-beer.png            (B)     (b)
+-drink.png           (D)     (d)
+-boy.png             (Z)     (z)
+-girl.png            (X)     (x)
+-good.png            (Y)     (y)
+-bad.png             (N)     (n)
+-vampire.png         :[      :-[
+-goat.png            (nah)
+-sun.png             (#)
+-rainbow.png         (R)     (r)
+-quiet.png           :-#
+-teeth.png           8o|
+-glasses-nerdy.png   8-|
+-sarcastic.png       ^o)
+-secret.png          :-*
+-sick.png            +o(
+-snail.png           (sn)
+-turtle.png          (tu)
+-plate.png           (pl)
+-bowl.png            (||)
+-pizza.png           (pi)
+-soccerball.png      (so)
+-car.png             (au)
+-airplane.png        (ap)
+-umbrella.png        (um)
+-island.png          (ip)
+-computer.png        (co)
+-mobile.png          (mp)
+-brb.png             (brb)
+-rain.png            (st)
+-highfive.png        (h5)
+-coins.png           (mo)
+-sheep.png           (bah)
+-dont-know.png       :^)
+-thinking.png        *-)
+-thunder.png         (li)
+-party.png           <:o)
+-eyeroll.png         8-)
+-sleepy.png          |-) 
+-bunny.png           ('.')
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)   :(|)    8-|)
+-! cyclops.png       O-)     o-)
+-
+-# Hidden MSN emotes
+-cigarette.png      	(ci)    (CI)
+-handcuffs.png       (%)
+-console.png			(xx)    (XX)
+-fingers-crossed.png	(yn)    (YN)
+-
+-
+-# Following QQ 2006
+-[QQ]
+-shocked.png         /:O      /jy       /surprised
+-curl-lip.png        /:~      /pz       /curl_lip
+-desire.png          /:*      /se       /desire
+-dazed.png           /:|      /dazed
+-party.png           /8-)     /dy       /revel
+-crying.png          /:<      /ll       /cry
+-bashful.png         /:$      /hx       /bashful
+-shut-mouth.png      /:X      /bz       /shut_mouth
+-sleeping.png        /:Z      /shui     /sleep
+-weep.png            /:'(     /dk       /weep
+-embarrassed.png     /:-|     /gg       /embarassed
+-pissed-off.png      /:@      /fn       /pissed_off
+-act-up.png          /:P      /tp       /act_up
+-excited.png         /:D      /cy       /toothy_smile
+-happy.png           /:)      /wx       /small_smile
+-sad.png             /:(      /ng       /sad
+-glasses-cool.png    /:+      /kuk      /cool
+-doctor.png          /:#      /feid     /SARS
+-silly.png           /:Q      /zk       /crazy
+-sick.png            /:T      /tu       /vomit
+-snicker.png         /;p      /tx       /titter
+-cute.png            /;-D     /ka       /cute
+-disdain.png         /;d      /by       /disdain
+-arrogant.png        /;o      /am       /arrogant
+-starving.png        /:g      /jie      /starving
+-sleepy.png          /|-)     /kun      /sleepy
+-terror.png          /:!      /jk       /terror
+-hot.png             /:L      /sweat
+-smirk.png           /:>      /hanx     /smirk
+-soldier.png         /:;      /db       /soldier
+-struggle.png        /;f      /fendou   /struggle
+-curse.png           /:-S     /zhm      /curse
+-question.png        /?       /yiw      /question
+-quiet.png           /;x      /xu       /shh
+-hypnotized.png      /;@      /yun      /dizzy
+-excruciating.png    /:8      /zhem     /excrutiating
+-freaked-out.png     /;!      /shuai    /freaked_out
+-skeleton.png        /!!!     /kl       /skeleton
+-hammer.png          /xx      /qiao     /hammer
+-bye.png             /bye     /zj       /bye
+-go-away.png         /go      /shan     /go
+-afraid.png          /shake   /fad      /shake
+-amorous.png         /love    /aiq      /love
+-jump.png            /jump    /tiao     /jump
+-search.png          /find    /zhao     /search
+-lashes.png          /&       /mm       /beautiful_eyebrows
+-pig.png             /pig     /zt       /pig
+-cat.png             /cat     /mm       /cat
+-dog.png             /dog     /xg       /dog
+-hug-left.png        /hug     /yb       /hug
+-coins.png           /$       /qianc    /money
+-lamp.png            /!       /dp       /lightbulb
+-bowl.png            /cup     /bei      /cup
+-cake.png            /cake    /dg       /cake
+-thunder.png         /li      /shd      /lightning
+-bomb.png            /bome    /zhd      /bomb
+-knife.png           /kn      /dao      /knife
+-soccerball.png      /footb   /zq       /soccer
+-musical-note.png    /music   /yy       /music
+-poop.png            /shit    /bb       /shit
+-coffee.png          /coffee  /kf       /coffee
+-hungry.png          /eat     /fan      /eat
+-pill.png            /pill    /yw       /pill
+-rose.png            /rose    /mg       /rose
+-wilt.png            /fade    /dx       /wilt
+-kiss.png            /kiss    /wen      /kiss
+-in_love.png         /heart   /xin      /heart
+-love-over.png       /break   /xs       /broken_heart
+-meeting.png         /meeting /hy       /meeting
+-present.png         /gift    /lw       /gift
+-phone.png           /phone   /dh       /phone
+-clock.png           /time    /sj       /time
+-mail.png            /email   /yj       /email
+-tv.png              /TV      /ds       /TV
+-sun.png             /sun     /ty       /sun
+-moon.png            /moon    /yl       /moon
+-good.png            /strong  /qiang    /thumbs_up
+-bad.png             /weak    /ruo      /thumbs_down
+-handshake.png       /share   /ws       /handshake
+-victory.png         /v       /shl      /victory
+-beauty.png          /<J>     /mn       /beauty
+-qq.png              /<QQ>    /qz       /qq
+-blowkiss.png        /<L>     /fw       /blow_kiss
+-angry.png           /<O>     /oh       /angry
+-liquor.png          /<B>     /bj       /baijiu
+-can.png             /<U>     /qsh      /soda
+-watermelon.png      /<W>     /xigua    /watermelon
+-rain.png            /<!!>    /xy       /rain
+-cloudy.png          /<~>     /duoy     /cloudy
+-snowman.png         /<Z>     /xr       /snowman
+-star.png            /<*>     /xixing   /star
+-girl.png            /<00>    /nv       /woman
+-boy.png             /<11>    /nan      /man
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)   :(|)    8-|)
+-! cyclops.png       O-)     o-)
+-
+-
+-# Following ICQ 6.0
+-[ICQ]
+-happy.png           :-)     :)
+-neutral.png         :-$
+-sad.png             :-(     :(
+-shocked.png         =-O
+-wink.png            ;-)     ;)
+-tongue.png          :-P     :P      :-p     :p
+-music.png           [:-}
+-laugh.png           *JOKINGLY*
+-sleeping.png        *TIRED*
+-crying.png          :'(    :'-(
+-sick.png            :-!
+-kissed.png          *KISSED*
+-stop.png            *STOP*
+-kiss.png            :-{} :-*
+-kissing.png         *KISSING* 
+-victory.png         *YAHOO*
+-silly.png           %)
+-embarrassed.png     :-[
+-devil.png           ]:->
+-angel.png           O:-)
+-rose.png            @}->--
+-shut-mouth.png      :-X     :X      :-x     :x
+-bomb.png            @=
+-thinking.png        :-\\    :-/
+-good.png            *THUMBS\ UP*
+-shout.png           >:o     >:O     :-@
+-beer.png            *DRINK*
+-excited.png         :-D     :D
+-glasses-cool.png    8-)
+-amorous.png         *IN\ LOVE*
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)   :(|)    8-|)
+-! cyclops.png       O-)     o-)
+-
+-
+-# Following Yahoo! Messenger 8.1
+-[Yahoo]
+-happy.png           :)      :-)
+-question.png        :-/     :-\\
+-shocked.png         :-O     :O      :-o     :o 
+-devil.png           >:)
+-angel.png           O:-)    o:-)    0:-)
+-sick.png            :-&
+-sleepy.png          (:|
+-hypnotized.png      @-)
+-on-the-phone.png    :)]
+-sad.png             :(      :-(
+-amorous.png         :x      :-x     :X      :-X
+-angry.png           X-(     x-(     X(      x(
+-crying.png          :((
+-glasses-nerdy.png   :-B     :-b
+-quiet.png           :-$
+-drool.png           =P~     =p~
+-lying.png           :^O     :^o
+-call-me.png         :-c
+-wink.png            ;)      ;-)
+-embarrassed.png     :">
+-mean.png            :->     :>
+-laugh.png           :))     :-))
+-bye.png             =;
+-arrogant.png        [-(
+-thinking.png        :-?
+-waiting.png         :-w     :-W
+-at-wits-end.png     ~x(     ~X(
+-excited.png         :D      :-D     :d      :-d
+-tongue.png          :-P     :P      :-p     :p
+-glasses-cool.png    B-)     b-)
+-neutral.png         :|      :-|
+-sleeping.png        I-)     i-)     |-)
+-clown.png           :o)     :O)
+-doh.png             #-o     #-O
+-weep.png            :-<
+-go-away.png         :-h
+-lashes.png          ;;)
+-kiss.png            :-*     :*
+-confused.png        :-S     :-s
+-sarcastic.png       /:)
+-eyeroll.png         8-|
+-silly.png           8-}
+-clap.png            =D>     =d>
+-mad-tongue.png      >:P     >:p
+-time-out.png        :-t     :-T
+-hug-left.png        >:D<    >:d<
+-love-over.png       =((
+-hot.png             #:-S    #:-s
+-rotfl.png           =)) :-j :-J 
+-loser.png           L-)     l-)
+-party.png           <:-P    <:-p
+-nervous.png         :-SS	:-Ss	:-sS	:-ss
+-cowboy.png          <):)
+-desire.png          8->
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)   :(|)    8-|)
+-! cyclops.png       O-)     o-)
+-
+-# Hidden Yahoo emotes
+-alien.png           =:)     >-)
+-beat-up.png         b-(     B-(
+-chicken.png         ~:>
+-coffee.png          ~o)     ~O)
+-cow.png             3:-O    3:-o
+-dance.png           \\:D/   \\:d/
+-rose.png            @};-
+-dont-know.png       :-L     :-l
+-skeleton.png        8-X     8-x
+-lamp.png            *-:)
+-monkey.png          :(|)
+-coins.png           $-)
+-peace.png           :)>-
+-pig.png             :@)
+-pray.png            [-o<    [-O<
+-pumpkin.png         (~~)
+-shame.png           [-X     [-x
+-flag.png            **==
+-clover.png          %%-
+-musical-note.png    :-"
+-giggle.png          ;))
+-worship.png         ^:)^
+-star.png            (*)
+-waving.png          >:/
+-talktohand.png      :-@
+-
+-# Only available after activating the Yahoo! Fighter IMVironment
+-male-fighter1.png   o->     O->
+-male-fighter2.png   o=>     O=>
+-female-fighter.png  o-+     O-+
+-yin-yang.png        (%)
+-
+-# Following Yahoo! Messenger 8.1
+-[Yahoo JAPAN]
+-happy.png           :)      :-)
+-question.png        :-/     :-\\
+-shocked.png         :-O     :O      :-o     :o 
+-devil.png           >:)
+-angel.png           O:-)    o:-)    0:-)
+-sick.png            :-&
+-sleepy.png          (:|
+-hypnotized.png      @-)
+-on-the-phone.png    :)]
+-sad.png             :(      :-(
+-amorous.png         :x      :-x     :X      :-X
+-angry.png           X-(     x-(     X(      x(
+-crying.png          :((
+-glasses-nerdy.png   :-B     :-b
+-quiet.png           :-$
+-drool.png           =P~     =p~
+-lying.png           :^O     :^o
+-call-me.png         :-c
+-wink.png            ;)      ;-)
+-embarrassed.png     :">
+-mean.png            :->     :>
+-laugh.png           :))     :-))
+-bye.png             =;
+-arrogant.png        [-(
+-thinking.png        :-?
+-waiting.png         :-w     :-W
+-at-wits-end.png     ~x(     ~X(
+-excited.png         :D      :-D     :d      :-d
+-tongue.png          :-P     :P      :-p     :p
+-glasses-cool.png    B-)     b-)
+-neutral.png         :|      :-|
+-sleeping.png        I-)     i-)     |-)
+-clown.png           :o)     :O)
+-doh.png             #-o     #-O
+-weep.png            :-<
+-go-away.png         :-h
+-lashes.png          ;;)
+-kiss.png            :-*     :*
+-confused.png        :-S     :-s
+-sarcastic.png       /:)
+-eyeroll.png         8-|
+-silly.png           8-}
+-clap.png            =D>     =d>
+-mad-tongue.png      >:P     >:p
+-time-out.png        :-t     :-T
+-hug-left.png        >:D<    >:d<
+-love-over.png       =((
+-hot.png             #:-S    #:-s
+-rotfl.png           =)) :-j :-J 
+-loser.png           L-)     l-)
+-party.png           <:-P    <:-p
+-nervous.png         :-SS       :-Ss    :-sS    :-ss
+-cowboy.png          <):)
+-desire.png          8->
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)  :(|)
+-
+-# Hidden Yahoo emotes
+-alien.png           =:)     >-)
+-beat-up.png         b-(     B-(
+-chicken.png         ~:>
+-coffee.png          ~o)     ~O)
+-cow.png             3:-O    3:-o
+-dance.png           \\:D/   \\:d/
+-rose.png            @};-
+-dont-know.png       :-L     :-l
+-skeleton.png        8-X     8-x
+-lamp.png            *-:)
+-monkey.png          :(|)
+-coins.png           $-)
+-peace.png           :)>-
+-pig.png             :@)
+-pray.png            [-o<    [-O<
+-pumpkin.png         (~~)
+-shame.png           [-X     [-x
+-flag.png            **==
+-clover.png          %%-
+-musical-note.png    :-"
+-giggle.png          ;))
+-worship.png         ^:)^
+-star.png            (*)
+-waving.png          >:/
+-talktohand.png      :-@
+-
+-# Only available after activating the Yahoo! Fighter IMVironment
+-male-fighter1.png   o->     O->
+-male-fighter2.png   o=>     O=>
+-female-fighter.png  o-+     O-+
+-yin-yang.png        (%)
+-
+-
+-# Following MySpaceIM Beta 1.0.697.0
+-[MySpaceIM]
+-excited.png  	    :D      :-D
+-devil.png	    }:)
+-confused.png	    :Z
+-glasses-nerdy.png   B)
+-bulgy-eyes.png	    %)
+-freaked-out.png	    :E
+-happy.png	    :)      :-)
+-amorous.png	    :X
+-laugh.png	    :))
+-mohawk.png	    -:
+-mad-tongue.png	    X(
+-messed.png	    X)
+-glasses-nerdy.png   Q)
+-doh.png		    :G
+-pirate.png	    P)
+-shocked.png	    :O
+-sidefrown.png	    :{
+-sinister.png	    :B
+-smirk.png	    :,
+-neutral.png	    :|
+-tongue.png	    :P      :p
+-pissed-off.png	    B|
+-wink.png	    ;-)     ;)
+-sad.png		    :[
+-kiss.png            :x
+-! skywalker.png     C:-)    c:-)    C:)     c:)
+-! monkey.png        :-(|)   :(|)    8-|)
+-! cyclops.png       O-)     o-)
+-
+-
+-# MXit standard emoticons
+-[MXit]
+-happy.png           :-)     :)
+-sad.png             :-(     :(
+-wink.png            ;-)     ;)
+-excited.png         :-D     :D     :->      :>
+-neutral.png         :-|     :|
+-shocked.png         :-O     :O
+-tongue.png          :-P     :P
+-embarrassed.png     :-$     :$
+-glasses-cool.png    8-)
+-in_love.png         (H)
+-rose.png            (F)
+-### Added in v3.0
+-boy.png             (m)
+-girl.png            (f)
+-star.png            (*)
+-chilli.png          (c)
+-kiss.png            (x)
+-lamp.png            (i)
+-pissed-off.png      :e      :-e
+-shut-mouth.png      :-x     :x
+-thunder.png         (z)
+-coffee.png          (U)
+-mrgreen.png         (G)
+-### Added in v5.0
+-sick.png            :o(
+-excruciating.png    :-{     :{
+-amorous.png         :-}     :}
+-eyeroll.png         8-o     8o
+-crying.png          :'(
+-thinking.png        :-?     :?
+-drool.png           :-~     :~
+-sleeping.png        :-z     :z
+-lying.png           :L)
+-glasses-nerdy.png   8-|     8|
+-pirate.png          P-)
+-### Added in v5.9.7
+-bored.png           :-[     :[
+-cold.png            :-<     :<
+-confused.png        :-,     :,
+-hungry.png          :-C     :C
+-stressed.png        :-s     :s
+diff -Nur pidgin-2.10.7/pidgin/pixmaps/emotes/small/16/small.theme.in pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/small/16/small.theme.in
+--- pidgin-2.10.7/pidgin/pixmaps/emotes/small/16/small.theme.in	2013-02-11 07:16:54.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/small/16/small.theme.in	2013-08-16 23:19:01.815778718 -0300
+@@ -22,8 +22,7 @@
+ 
+ 
+ [XMPP]
+-# Following XEP-0038 + GTalk + our default set, in default set order
+-# The GTalk strings come from ticket #3307.
++# Following XEP-0038 + our default set, in default set order
+ happy.png           :)      :-)     =)
+ excited.png         :-D     :-d     :D      :d      =D      =d
+ sad.png             :-(     :(
+@@ -38,7 +37,7 @@
+ angel.png           O:-)    o:-)
+ shut-mouth.png      :-X
+ 
+-# Following XEP-0038 + GTalk
++# Following XEP-0038
+ angry.png           >:-(    >:(     X-(    x-(
+ rose.png            @->--   :rose:
+ phone.png           :telephone:
+@@ -53,269 +52,3 @@
+ neutral.png         :|      :-|
+ 
+ # Hidden icons from the default set.
+-
+-
+-# Following AIM 6.1
+-[AIM]
+-happy.png           :-)     :)
+-wink.png            ;-)     ;)
+-sad.png             :-(     :(
+-tongue.png          :P      :p      :-P     :-p
+-shocked.png         =-O
+-kiss.png            :-*
+-excited.png         :-D     :D
+-embarrassed.png     :-[
+-angel.png           O:-)
+-thinking.png        :-\\    :-/
+-crying.png          :'(
+-shut-mouth.png      :-X
+-glasses-cool.png    8-)
+-
+-
+-# Following Windows Live Messenger 8.1
+-[MSN]
+-happy.png           :)      :-)
+-excited.png         :D      :d      :-D     :-d
+-wink.png            ;)      ;-)
+-shocked.png         :-O     :-o     :O      :o
+-tongue.png          :-P     :P      :-p     :p
+-glasses-cool.png    (H)     (h)
+-angry.png           :@      :-@
+-embarrassed.png     :$      :-$
+-confused.png        :S      :s      :-S     :-s
+-sad.png             :(      :-(
+-crying.png          :'(
+-neutral.png         :|      :-|
+-devil.png           (6)
+-angel.png           (A)     (a)
+-in_love.png         (L)     (l)
+-star.png            (*)
+-musical-note.png    (8)
+-rose.png            (F)     (f)
+-kiss.png            (K)     (k)
+-camera.png          (P)     (p)
+-lamp.png            (I)     (i)
+-coffee.png          (C)     (c)
+-phone.png           (T)     (t)
+-hug-left.png        ({)
+-hug-right.png       (})
+-beer.png            (B)     (b)
+-boy.png             (Z)     (z)
+-girl.png            (X)     (x)
+-sarcastic.png       ^o)
+-sick.png            +o(
+-plate.png           (pl)
+-mobile.png          (mp)
+-dont-know.png       :^)
+-thinking.png        *-)
+-thunder.png         (li)
+-party.png           <:o)
+-eyeroll.png         8-)
+-sleepy.png          |-) 
+-
+-# Hidden MSN emotes
+-cigarette.png      	(ci)    (CI)
+-console.png			(xx)    (XX)
+-
+-
+-# Following QQ 2006
+-[QQ]
+-shocked.png         /:O      /jy       /surprised
+-party.png           /8-)     /dy       /revel
+-crying.png          /:<      /ll       /cry
+-shut-mouth.png      /:X      /bz       /shut_mouth
+-sleeping.png        /:Z      /shui     /sleep
+-embarrassed.png     /:-|     /gg       /embarassed
+-pissed-off.png      /:@      /fn       /pissed_off
+-excited.png         /:D      /cy       /toothy_smile
+-happy.png           /:)      /wx       /small_smile
+-sad.png             /:(      /ng       /sad
+-glasses-cool.png    /:+      /kuk      /cool
+-sick.png            /:T      /tu       /vomit
+-sleepy.png          /|-)     /kun      /sleepy
+-hot.png             /:L      /sweat
+-question.png        /?       /yiw      /question
+-excruciating.png    /:8      /zhem     /excrutiating
+-afraid.png          /shake   /fad      /shake
+-amorous.png         /love    /aiq      /love
+-search.png          /find    /zhao     /search
+-hug-left.png        /hug     /yb       /hug
+-lamp.png            /!       /dp       /lightbulb
+-thunder.png         /li      /shd      /lightning
+-musical-note.png    /music   /yy       /music
+-coffee.png          /coffee  /kf       /coffee
+-hungry.png          /eat     /fan      /eat
+-rose.png            /rose    /mg       /rose
+-kiss.png            /kiss    /wen      /kiss
+-in_love.png         /heart   /xin      /heart
+-meeting.png         /meeting /hy       /meeting
+-phone.png           /phone   /dh       /phone
+-tv.png              /TV      /ds       /TV
+-angry.png           /<O>     /oh       /angry
+-girl.png            /<00>    /nv       /woman
+-boy.png             /<11>    /nan      /man
+-
+-
+-# Following ICQ 6.0
+-[ICQ]
+-happy.png           :-)     :)
+-neutral.png         :-$
+-sad.png             :-(     :(
+-shocked.png         =-O
+-wink.png            ;-)     ;)
+-tongue.png          :-P     :P      :-p     :p
+-music.png           [:-}
+-sleeping.png        *TIRED*
+-crying.png          :'(    :'-(
+-sick.png            :-!
+-kiss.png            :-{} :-*
+-embarrassed.png     :-[
+-devil.png           ]:->
+-angel.png           O:-)
+-rose.png            @}->--
+-shut-mouth.png      :-X     :X      :-x     :x
+-thinking.png        :-\\    :-/
+-beer.png            *DRINK*
+-excited.png         :-D     :D
+-glasses-cool.png    8-)
+-amorous.png         *IN\ LOVE*
+-
+-
+-# Following Yahoo! Messenger 8.1
+-[Yahoo]
+-happy.png           :)      :-)
+-question.png        :-/     :-\\
+-shocked.png         :-O     :O      :-o     :o 
+-devil.png           >:)
+-angel.png           O:-)    o:-)    0:-)
+-sick.png            :-&
+-sleepy.png          (:|
+-sad.png             :(      :-(
+-amorous.png         :x      :-x     :X      :-X
+-angry.png           X-(     x-(     X(      x(
+-crying.png          :((
+-drool.png           =P~     =p~
+-lying.png           :^O     :^o
+-wink.png            ;)      ;-)
+-embarrassed.png     :">
+-mean.png            :->     :>
+-thinking.png        :-?
+-excited.png         :D      :-D     :d      :-d
+-tongue.png          :-P     :P      :-p     :p
+-glasses-cool.png    B-)     b-)
+-neutral.png         :|      :-|
+-sleeping.png        I-)     i-)     |-)
+-kiss.png            :-*     :*
+-confused.png        :-S     :-s
+-sarcastic.png       /:)
+-eyeroll.png         8-|
+-hug-left.png        >:D<    >:d<
+-hot.png             #:-S    #:-s
+-party.png           <:-P    <:-p
+-nervous.png         :-SS	:-Ss	:-sS	:-ss
+-
+-# Hidden Yahoo emotes
+-coffee.png          ~o)     ~O)
+-rose.png            @};-
+-dont-know.png       :-L     :-l
+-lamp.png            *-:)
+-shame.png           [-X     [-x
+-musical-note.png    :-"
+-star.png            (*)
+-
+-# Following Yahoo! Messenger 8.1
+-[Yahoo JAPAN]
+-happy.png           :)      :-)
+-question.png        :-/     :-\\
+-shocked.png         :-O     :O      :-o     :o 
+-devil.png           >:)
+-angel.png           O:-)    o:-)    0:-)
+-sick.png            :-&
+-sleepy.png          (:|
+-sad.png             :(      :-(
+-amorous.png         :x      :-x     :X      :-X
+-angry.png           X-(     x-(     X(      x(
+-crying.png          :((
+-wink.png            ;)      ;-)
+-thinking.png        :-?
+-excited.png         :D      :-D     :d      :-d
+-tongue.png          :-P     :P      :-p     :p
+-glasses-cool.png    B-)     b-)
+-neutral.png         :|      :-|
+-sleeping.png        I-)     i-)     |-)
+-kiss.png            :-*     :*
+-confused.png        :-S     :-s
+-sarcastic.png       /:)
+-eyeroll.png         8-|
+-hug-left.png        >:D<    >:d<
+-party.png           <:-P    <:-p
+-
+-# Hidden Yahoo emotes
+-coffee.png          ~o)     ~O)
+-rose.png            @};-
+-dont-know.png       :-L     :-l
+-lamp.png            *-:)
+-shame.png           [-X     [-x
+-musical-note.png    :-"
+-star.png            (*)
+-
+-
+-# Following MySpaceIM Beta 1.0.697.0
+-[MySpaceIM]
+-excited.png  	    :D      :-D
+-devil.png	    }:)
+-confused.png	    :Z
+-happy.png	    :)      :-)
+-amorous.png	    :X
+-pirate.png	    P)
+-shocked.png	    :O
+-neutral.png	    :|
+-tongue.png	    :P      :p
+-pissed-off.png	    B|
+-wink.png	    ;-)     ;)
+-sad.png		    :[
+-kiss.png            :x
+-
+-# MXit standard emoticons
+-[MXit]
+-happy.png           :-)     :)
+-sad.png             :-(     :(
+-wink.png            ;-)     ;)
+-excited.png         :-D     :D     :->      :>
+-neutral.png         :-|     :|
+-shocked.png         :-O     :O
+-tongue.png          :-P     :P
+-embarrassed.png     :-$     :$
+-glasses-cool.png    8-)
+-in_love.png         (H)
+-rose.png            (F)
+-### Added in v3.0
+-boy.png             (m)
+-girl.png            (f)
+-star.png            (*)
+-chilli.png          (c)
+-kiss.png            (x)
+-lamp.png            (i)
+-pissed-off.png      :e      :-e
+-shut-mouth.png      :-x     :x
+-thunder.png         (z)
+-coffee.png          (U)
+-mrgreen.png         (G)
+-### Added in v5.0
+-sick.png            :o(
+-excruciating.png    :-{     :{
+-amorous.png         :-}     :}
+-eyeroll.png         8-o     8o
+-crying.png          :'(
+-thinking.png        :-?     :?
+-drool.png           :-~     :~
+-sleeping.png        :-z     :z
+-lying.png           :L)
+-glasses-nerdy.png   8-|     8|
+-pirate.png          P-)
+-### Added in v5.9.7
+-bored.png           :-[     :[
+-cold.png            :-<     :<
+-confused.png        :-,     :,
+-hungry.png          :-C     :C
+-stressed.png        :-s     :s
+diff -Nur pidgin-2.10.7/pidgin/pixmaps/emotes/small/16/theme pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/small/16/theme
+--- pidgin-2.10.7/pidgin/pixmaps/emotes/small/16/theme	2013-02-11 07:17:58.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/small/16/theme	2013-08-16 23:17:03.828740061 -0300
+@@ -22,8 +22,7 @@
+ 
+ 
+ [XMPP]
+-# Following XEP-0038 + GTalk + our default set, in default set order
+-# The GTalk strings come from ticket #3307.
++# Following XEP-0038 + our default set, in default set order
+ happy.png           :)      :-)     =)
+ excited.png         :-D     :-d     :D      :d      =D      =d
+ sad.png             :-(     :(
+@@ -38,7 +37,7 @@
+ angel.png           O:-)    o:-)
+ shut-mouth.png      :-X
+ 
+-# Following XEP-0038 + GTalk
++# Following XEP-0038
+ angry.png           >:-(    >:(     X-(    x-(
+ rose.png            @->--   :rose:
+ phone.png           :telephone:
+@@ -53,269 +52,3 @@
+ neutral.png         :|      :-|
+ 
+ # Hidden icons from the default set.
+-
+-
+-# Following AIM 6.1
+-[AIM]
+-happy.png           :-)     :)
+-wink.png            ;-)     ;)
+-sad.png             :-(     :(
+-tongue.png          :P      :p      :-P     :-p
+-shocked.png         =-O
+-kiss.png            :-*
+-excited.png         :-D     :D
+-embarrassed.png     :-[
+-angel.png           O:-)
+-thinking.png        :-\\    :-/
+-crying.png          :'(
+-shut-mouth.png      :-X
+-glasses-cool.png    8-)
+-
+-
+-# Following Windows Live Messenger 8.1
+-[MSN]
+-happy.png           :)      :-)
+-excited.png         :D      :d      :-D     :-d
+-wink.png            ;)      ;-)
+-shocked.png         :-O     :-o     :O      :o
+-tongue.png          :-P     :P      :-p     :p
+-glasses-cool.png    (H)     (h)
+-angry.png           :@      :-@
+-embarrassed.png     :$      :-$
+-confused.png        :S      :s      :-S     :-s
+-sad.png             :(      :-(
+-crying.png          :'(
+-neutral.png         :|      :-|
+-devil.png           (6)
+-angel.png           (A)     (a)
+-in_love.png         (L)     (l)
+-star.png            (*)
+-musical-note.png    (8)
+-rose.png            (F)     (f)
+-kiss.png            (K)     (k)
+-camera.png          (P)     (p)
+-lamp.png            (I)     (i)
+-coffee.png          (C)     (c)
+-phone.png           (T)     (t)
+-hug-left.png        ({)
+-hug-right.png       (})
+-beer.png            (B)     (b)
+-boy.png             (Z)     (z)
+-girl.png            (X)     (x)
+-sarcastic.png       ^o)
+-sick.png            +o(
+-plate.png           (pl)
+-mobile.png          (mp)
+-dont-know.png       :^)
+-thinking.png        *-)
+-thunder.png         (li)
+-party.png           <:o)
+-eyeroll.png         8-)
+-sleepy.png          |-) 
+-
+-# Hidden MSN emotes
+-cigarette.png      	(ci)    (CI)
+-console.png			(xx)    (XX)
+-
+-
+-# Following QQ 2006
+-[QQ]
+-shocked.png         /:O      /jy       /surprised
+-party.png           /8-)     /dy       /revel
+-crying.png          /:<      /ll       /cry
+-shut-mouth.png      /:X      /bz       /shut_mouth
+-sleeping.png        /:Z      /shui     /sleep
+-embarrassed.png     /:-|     /gg       /embarassed
+-pissed-off.png      /:@      /fn       /pissed_off
+-excited.png         /:D      /cy       /toothy_smile
+-happy.png           /:)      /wx       /small_smile
+-sad.png             /:(      /ng       /sad
+-glasses-cool.png    /:+      /kuk      /cool
+-sick.png            /:T      /tu       /vomit
+-sleepy.png          /|-)     /kun      /sleepy
+-hot.png             /:L      /sweat
+-question.png        /?       /yiw      /question
+-excruciating.png    /:8      /zhem     /excrutiating
+-afraid.png          /shake   /fad      /shake
+-amorous.png         /love    /aiq      /love
+-search.png          /find    /zhao     /search
+-hug-left.png        /hug     /yb       /hug
+-lamp.png            /!       /dp       /lightbulb
+-thunder.png         /li      /shd      /lightning
+-musical-note.png    /music   /yy       /music
+-coffee.png          /coffee  /kf       /coffee
+-hungry.png          /eat     /fan      /eat
+-rose.png            /rose    /mg       /rose
+-kiss.png            /kiss    /wen      /kiss
+-in_love.png         /heart   /xin      /heart
+-meeting.png         /meeting /hy       /meeting
+-phone.png           /phone   /dh       /phone
+-tv.png              /TV      /ds       /TV
+-angry.png           /<O>     /oh       /angry
+-girl.png            /<00>    /nv       /woman
+-boy.png             /<11>    /nan      /man
+-
+-
+-# Following ICQ 6.0
+-[ICQ]
+-happy.png           :-)     :)
+-neutral.png         :-$
+-sad.png             :-(     :(
+-shocked.png         =-O
+-wink.png            ;-)     ;)
+-tongue.png          :-P     :P      :-p     :p
+-music.png           [:-}
+-sleeping.png        *TIRED*
+-crying.png          :'(    :'-(
+-sick.png            :-!
+-kiss.png            :-{} :-*
+-embarrassed.png     :-[
+-devil.png           ]:->
+-angel.png           O:-)
+-rose.png            @}->--
+-shut-mouth.png      :-X     :X      :-x     :x
+-thinking.png        :-\\    :-/
+-beer.png            *DRINK*
+-excited.png         :-D     :D
+-glasses-cool.png    8-)
+-amorous.png         *IN\ LOVE*
+-
+-
+-# Following Yahoo! Messenger 8.1
+-[Yahoo]
+-happy.png           :)      :-)
+-question.png        :-/     :-\\
+-shocked.png         :-O     :O      :-o     :o 
+-devil.png           >:)
+-angel.png           O:-)    o:-)    0:-)
+-sick.png            :-&
+-sleepy.png          (:|
+-sad.png             :(      :-(
+-amorous.png         :x      :-x     :X      :-X
+-angry.png           X-(     x-(     X(      x(
+-crying.png          :((
+-drool.png           =P~     =p~
+-lying.png           :^O     :^o
+-wink.png            ;)      ;-)
+-embarrassed.png     :">
+-mean.png            :->     :>
+-thinking.png        :-?
+-excited.png         :D      :-D     :d      :-d
+-tongue.png          :-P     :P      :-p     :p
+-glasses-cool.png    B-)     b-)
+-neutral.png         :|      :-|
+-sleeping.png        I-)     i-)     |-)
+-kiss.png            :-*     :*
+-confused.png        :-S     :-s
+-sarcastic.png       /:)
+-eyeroll.png         8-|
+-hug-left.png        >:D<    >:d<
+-hot.png             #:-S    #:-s
+-party.png           <:-P    <:-p
+-nervous.png         :-SS	:-Ss	:-sS	:-ss
+-
+-# Hidden Yahoo emotes
+-coffee.png          ~o)     ~O)
+-rose.png            @};-
+-dont-know.png       :-L     :-l
+-lamp.png            *-:)
+-shame.png           [-X     [-x
+-musical-note.png    :-"
+-star.png            (*)
+-
+-# Following Yahoo! Messenger 8.1
+-[Yahoo JAPAN]
+-happy.png           :)      :-)
+-question.png        :-/     :-\\
+-shocked.png         :-O     :O      :-o     :o 
+-devil.png           >:)
+-angel.png           O:-)    o:-)    0:-)
+-sick.png            :-&
+-sleepy.png          (:|
+-sad.png             :(      :-(
+-amorous.png         :x      :-x     :X      :-X
+-angry.png           X-(     x-(     X(      x(
+-crying.png          :((
+-wink.png            ;)      ;-)
+-thinking.png        :-?
+-excited.png         :D      :-D     :d      :-d
+-tongue.png          :-P     :P      :-p     :p
+-glasses-cool.png    B-)     b-)
+-neutral.png         :|      :-|
+-sleeping.png        I-)     i-)     |-)
+-kiss.png            :-*     :*
+-confused.png        :-S     :-s
+-sarcastic.png       /:)
+-eyeroll.png         8-|
+-hug-left.png        >:D<    >:d<
+-party.png           <:-P    <:-p
+-
+-# Hidden Yahoo emotes
+-coffee.png          ~o)     ~O)
+-rose.png            @};-
+-dont-know.png       :-L     :-l
+-lamp.png            *-:)
+-shame.png           [-X     [-x
+-musical-note.png    :-"
+-star.png            (*)
+-
+-
+-# Following MySpaceIM Beta 1.0.697.0
+-[MySpaceIM]
+-excited.png  	    :D      :-D
+-devil.png	    }:)
+-confused.png	    :Z
+-happy.png	    :)      :-)
+-amorous.png	    :X
+-pirate.png	    P)
+-shocked.png	    :O
+-neutral.png	    :|
+-tongue.png	    :P      :p
+-pissed-off.png	    B|
+-wink.png	    ;-)     ;)
+-sad.png		    :[
+-kiss.png            :x
+-
+-# MXit standard emoticons
+-[MXit]
+-happy.png           :-)     :)
+-sad.png             :-(     :(
+-wink.png            ;-)     ;)
+-excited.png         :-D     :D     :->      :>
+-neutral.png         :-|     :|
+-shocked.png         :-O     :O
+-tongue.png          :-P     :P
+-embarrassed.png     :-$     :$
+-glasses-cool.png    8-)
+-in_love.png         (H)
+-rose.png            (F)
+-### Added in v3.0
+-boy.png             (m)
+-girl.png            (f)
+-star.png            (*)
+-chilli.png          (c)
+-kiss.png            (x)
+-lamp.png            (i)
+-pissed-off.png      :e      :-e
+-shut-mouth.png      :-x     :x
+-thunder.png         (z)
+-coffee.png          (U)
+-mrgreen.png         (G)
+-### Added in v5.0
+-sick.png            :o(
+-excruciating.png    :-{     :{
+-amorous.png         :-}     :}
+-eyeroll.png         8-o     8o
+-crying.png          :'(
+-thinking.png        :-?     :?
+-drool.png           :-~     :~
+-sleeping.png        :-z     :z
+-lying.png           :L)
+-glasses-nerdy.png   8-|     8|
+-pirate.png          P-)
+-### Added in v5.9.7
+-bored.png           :-[     :[
+-cold.png            :-<     :<
+-confused.png        :-,     :,
+-hungry.png          :-C     :C
+-stressed.png        :-s     :s
+diff -Nur pidgin-2.10.7/pidgin/pixmaps/Makefile.am pidgin-2.10.7-nonprism/pidgin/pixmaps/Makefile.am
+--- pidgin-2.10.7/pidgin/pixmaps/Makefile.am	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/pixmaps/Makefile.am	2013-08-17 00:00:17.335924146 -0300
+@@ -204,37 +204,19 @@
+ 		emotes/small/16/scalable/pidgin-emotes.svg
+ 
+ PROTOCOLS_16_SCALABLE = \
+-		protocols/16/scalable/aim.svg \
+ 		protocols/16/scalable/bonjour.svg \
+-		protocols/16/scalable/gadu-gadu.svg \
+-		protocols/16/scalable/novell.svg \
+-		protocols/16/scalable/icq.svg \
+ 		protocols/16/scalable/irc.svg \
+ 		protocols/16/scalable/jabber.svg \
+-		protocols/16/scalable/meanwhile.svg \
+-		protocols/16/scalable/msn.svg \
+ 		protocols/16/scalable/silc.svg \
+ 		protocols/16/scalable/simple.svg \
+-		protocols/16/scalable/yahoo.svg \
+ 		protocols/16/scalable/zephyr.svg
+ 
+ PROTOCOLS_16 = \
+-		protocols/16/aim.png \
+ 		protocols/16/bonjour.png \
+-		protocols/16/facebook.png \
+-		protocols/16/gadu-gadu.png \
+-		protocols/16/google-talk.png \
+-		protocols/16/novell.png \
+-		protocols/16/icq.png \
+ 		protocols/16/irc.png \
+ 		protocols/16/jabber.png \
+-		protocols/16/meanwhile.png \
+-		protocols/16/msn.png \
+-		protocols/16/mxit.png \
+-		protocols/16/myspace.png \
+ 		protocols/16/silc.png \
+ 		protocols/16/simple.png \
+-		protocols/16/yahoo.png \
+ 		protocols/16/zephyr.png
+ 
+ ICONS_16_SCALABLE = \
+@@ -259,72 +241,35 @@
+ ICONS_SCALABLE = icons/hicolor/scalable/apps/pidgin.svg
+ 
+ PROTOCOLS_22_SCALABLE = \
+-		protocols/22/scalable/aim.svg \
+ 		protocols/22/scalable/bonjour.svg \
+-		protocols/22/scalable/gadu-gadu.svg \
+-		protocols/22/scalable/novell.svg \
+-		protocols/22/scalable/icq.svg \
+ 		protocols/22/scalable/irc.svg \
+ 		protocols/22/scalable/jabber.svg \
+-		protocols/22/scalable/meanwhile.svg \
+-		protocols/22/scalable/msn.svg \
+ 		protocols/22/scalable/silc.svg \
+ 		protocols/22/scalable/simple.svg \
+-		protocols/22/scalable/yahoo.svg \
+ 		protocols/22/scalable/zephyr.svg
+ 
+ PROTOCOLS_22 = \
+-		protocols/22/aim.png \
+ 		protocols/22/bonjour.png \
+-		protocols/22/facebook.png \
+-		protocols/22/gadu-gadu.png \
+-		protocols/22/google-talk.png \
+-		protocols/22/novell.png \
+-		protocols/22/icq.png \
+ 		protocols/22/irc.png \
+ 		protocols/22/jabber.png \
+-		protocols/22/meanwhile.png \
+-		protocols/22/msn.png \
+-		protocols/22/mxit.png \
+-		protocols/22/myspace.png \
+ 		protocols/22/silc.png \
+ 		protocols/22/simple.png \
+-		protocols/22/yahoo.png \
+ 		protocols/22/zephyr.png
+ 
+ PROTOCOLS_48 = \
+-		protocols/48/aim.png \
+ 		protocols/48/bonjour.png \
+-		protocols/48/facebook.png \
+-		protocols/48/gadu-gadu.png \
+-		protocols/48/novell.png \
+-		protocols/48/icq.png \
+ 		protocols/48/irc.png \
+ 		protocols/48/jabber.png \
+-		protocols/48/meanwhile.png \
+-		protocols/48/msn.png \
+-		protocols/48/mxit.png \
+-		protocols/48/myspace.png \
+ 		protocols/48/silc.png \
+ 		protocols/48/simple.png \
+-		protocols/48/yahoo.png \
+ 		protocols/48/zephyr.png
+ 
+ PROTOCOLS_SCALABLE = \
+-		protocols/scalable/aim.svg \
+ 		protocols/scalable/bonjour.svg \
+-		protocols/scalable/gadu-gadu.svg \
+-		protocols/scalable/google-talk.svg \
+-		protocols/scalable/novell.svg \
+-		protocols/scalable/icq.svg \
+ 		protocols/scalable/irc.svg \
+ 		protocols/scalable/jabber.svg \
+-		protocols/scalable/meanwhile.svg \
+-		protocols/scalable/msn.svg \
+-		protocols/scalable/mxit.svg \
+ 		protocols/scalable/silc.svg \
+ 		protocols/scalable/simple.svg \
+-		protocols/scalable/yahoo.svg \
+ 		protocols/scalable/zephyr.svg
+ 
+ STATUS_11 = \
+diff -Nur pidgin-2.10.7/pidgin/pixmaps/Makefile.in pidgin-2.10.7-nonprism/pidgin/pixmaps/Makefile.in
+--- pidgin-2.10.7/pidgin/pixmaps/Makefile.in	2013-02-11 07:17:23.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/pixmaps/Makefile.in	2013-08-16 23:59:52.918508551 -0300
+@@ -240,40 +240,19 @@
+ 	emblems/scalable/male.svg emblems/scalable/not-authorized.svg \
+ 	emblems/scalable/secure.svg emblems/scalable/unavailable.svg \
+ 	emblems/scalable/video.svg emblems/scalable/voice.svg \
+-	protocols/16/aim.png protocols/16/bonjour.png \
+-	protocols/16/facebook.png protocols/16/gadu-gadu.png \
+-	protocols/16/google-talk.png protocols/16/novell.png \
+-	protocols/16/icq.png protocols/16/irc.png \
+-	protocols/16/jabber.png protocols/16/meanwhile.png \
+-	protocols/16/msn.png protocols/16/mxit.png \
+-	protocols/16/myspace.png protocols/16/silc.png \
+-	protocols/16/simple.png protocols/16/yahoo.png \
+-	protocols/16/zephyr.png protocols/22/aim.png \
+-	protocols/22/bonjour.png protocols/22/facebook.png \
+-	protocols/22/gadu-gadu.png protocols/22/google-talk.png \
+-	protocols/22/novell.png protocols/22/icq.png \
+-	protocols/22/irc.png protocols/22/jabber.png \
+-	protocols/22/meanwhile.png protocols/22/msn.png \
+-	protocols/22/mxit.png protocols/22/myspace.png \
+-	protocols/22/silc.png protocols/22/simple.png \
+-	protocols/22/yahoo.png protocols/22/zephyr.png \
+-	protocols/48/aim.png protocols/48/bonjour.png \
+-	protocols/48/facebook.png protocols/48/gadu-gadu.png \
+-	protocols/48/novell.png protocols/48/icq.png \
+-	protocols/48/irc.png protocols/48/jabber.png \
+-	protocols/48/meanwhile.png protocols/48/msn.png \
+-	protocols/48/mxit.png protocols/48/myspace.png \
+-	protocols/48/silc.png protocols/48/simple.png \
+-	protocols/48/yahoo.png protocols/48/zephyr.png \
+-	protocols/scalable/aim.svg protocols/scalable/bonjour.svg \
+-	protocols/scalable/gadu-gadu.svg \
+-	protocols/scalable/google-talk.svg \
+-	protocols/scalable/novell.svg protocols/scalable/icq.svg \
+-	protocols/scalable/irc.svg protocols/scalable/jabber.svg \
+-	protocols/scalable/meanwhile.svg protocols/scalable/msn.svg \
+-	protocols/scalable/mxit.svg protocols/scalable/silc.svg \
+-	protocols/scalable/simple.svg protocols/scalable/yahoo.svg \
+-	protocols/scalable/zephyr.svg status/11/available.png \
++	protocols/16/bonjour.png protocols/16/irc.png \
++	protocols/16/jabber.png protocols/16/silc.png \
++	protocols/16/simple.png protocols/16/zephyr.png \
++	protocols/22/bonjour.png protocols/22/irc.png \
++	protocols/22/jabber.png protocols/22/silc.png \
++	protocols/22/simple.png protocols/22/zephyr.png \
++	protocols/48/bonjour.png protocols/48/irc.png \
++	protocols/48/jabber.png protocols/48/silc.png \
++	protocols/48/simple.png protocols/48/zephyr.png \
++	protocols/scalable/bonjour.svg protocols/scalable/irc.svg \
++	protocols/scalable/jabber.svg protocols/scalable/silc.svg \
++	protocols/scalable/simple.svg protocols/scalable/zephyr.svg \
++	status/11/available.png \
+ 	status/11/away.png status/11/busy.png status/11/chat.png \
+ 	status/11/extended-away.png status/11/invisible.png \
+ 	status/11/log-in.png status/11/log-out.png \
+@@ -443,8 +422,6 @@
+ FARSTREAM_CFLAGS = @FARSTREAM_CFLAGS@
+ FARSTREAM_LIBS = @FARSTREAM_LIBS@
+ FGREP = @FGREP@
+-GADU_CFLAGS = @GADU_CFLAGS@
+-GADU_LIBS = @GADU_LIBS@
+ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+@@ -506,8 +483,6 @@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+ MANIFEST_TOOL = @MANIFEST_TOOL@
+-MEANWHILE_CFLAGS = @MEANWHILE_CFLAGS@
+-MEANWHILE_LIBS = @MEANWHILE_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO_CFLAGS = @MONO_CFLAGS@
+@@ -850,37 +825,19 @@
+ @INSTALL_PIXMAPS_TRUE@		emotes/small/16/scalable/pidgin-emotes.svg
+ 
+ @INSTALL_PIXMAPS_TRUE@PROTOCOLS_16_SCALABLE = \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/aim.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/bonjour.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/gadu-gadu.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/novell.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/icq.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/irc.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/jabber.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/meanwhile.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/msn.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/silc.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/simple.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/yahoo.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/16/scalable/zephyr.svg
+ 
+ @INSTALL_PIXMAPS_TRUE@PROTOCOLS_16 = \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/aim.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/16/bonjour.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/facebook.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/gadu-gadu.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/google-talk.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/novell.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/icq.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/16/irc.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/16/jabber.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/meanwhile.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/msn.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/mxit.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/myspace.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/16/silc.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/16/simple.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/16/yahoo.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/16/zephyr.png
+ 
+ @INSTALL_PIXMAPS_TRUE@ICONS_16_SCALABLE = \
+@@ -899,72 +856,35 @@
+ @INSTALL_PIXMAPS_TRUE@ICONS_48 = icons/hicolor/48x48/apps/pidgin.png
+ @INSTALL_PIXMAPS_TRUE@ICONS_SCALABLE = icons/hicolor/scalable/apps/pidgin.svg
+ @INSTALL_PIXMAPS_TRUE@PROTOCOLS_22_SCALABLE = \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/aim.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/bonjour.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/gadu-gadu.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/novell.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/icq.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/irc.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/jabber.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/meanwhile.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/msn.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/silc.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/simple.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/yahoo.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/22/scalable/zephyr.svg
+ 
+ @INSTALL_PIXMAPS_TRUE@PROTOCOLS_22 = \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/aim.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/22/bonjour.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/facebook.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/gadu-gadu.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/google-talk.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/novell.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/icq.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/22/irc.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/22/jabber.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/meanwhile.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/msn.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/mxit.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/myspace.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/22/silc.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/22/simple.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/22/yahoo.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/22/zephyr.png
+ 
+ @INSTALL_PIXMAPS_TRUE@PROTOCOLS_48 = \
+-@INSTALL_PIXMAPS_TRUE@		protocols/48/aim.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/48/bonjour.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/48/facebook.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/48/gadu-gadu.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/48/novell.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/48/icq.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/48/irc.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/48/jabber.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/48/meanwhile.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/48/msn.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/48/mxit.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/48/myspace.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/48/silc.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/48/simple.png \
+-@INSTALL_PIXMAPS_TRUE@		protocols/48/yahoo.png \
+ @INSTALL_PIXMAPS_TRUE@		protocols/48/zephyr.png
+ 
+ @INSTALL_PIXMAPS_TRUE@PROTOCOLS_SCALABLE = \
+-@INSTALL_PIXMAPS_TRUE@		protocols/scalable/aim.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/scalable/bonjour.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/scalable/gadu-gadu.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/scalable/google-talk.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/scalable/novell.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/scalable/icq.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/scalable/irc.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/scalable/jabber.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/scalable/meanwhile.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/scalable/msn.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/scalable/mxit.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/scalable/silc.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/scalable/simple.svg \
+-@INSTALL_PIXMAPS_TRUE@		protocols/scalable/yahoo.svg \
+ @INSTALL_PIXMAPS_TRUE@		protocols/scalable/zephyr.svg
+ 
+ @INSTALL_PIXMAPS_TRUE@STATUS_11 = \
+diff -Nur pidgin-2.10.7/pidgin/plugins/disco/xmppdisco.c pidgin-2.10.7-nonprism/pidgin/plugins/disco/xmppdisco.c
+--- pidgin-2.10.7/pidgin/plugins/disco/xmppdisco.c	2013-02-11 07:16:54.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/plugins/disco/xmppdisco.c	2013-08-16 23:39:46.921427463 -0300
+@@ -250,9 +250,6 @@
+ 	const char *from;
+ 	const char *to;
+ } disco_type_mappings[] = {
+-	{ "gadu-gadu", "gadu-gadu" }, /* the prpl is prpl-gg, but list_icon returns "gadu-gadu" */
+-	{ "sametime",  "meanwhile" },
+-	{ "myspaceim", "myspace" },
+ 	{ "xmpp",      "jabber" }, /* prpl-jabber (mentioned in case the prpl is renamed so this line will match) */
+ 	{ NULL,        NULL }
+ };
+diff -Nur pidgin-2.10.7/pidgin/plugins/gevolution/add_buddy_dialog.c pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/add_buddy_dialog.c
+--- pidgin-2.10.7/pidgin/plugins/gevolution/add_buddy_dialog.c	2013-02-11 07:16:54.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/add_buddy_dialog.c	2013-08-16 21:26:56.293625899 -0300
+@@ -288,21 +288,13 @@
+ 	{
+ 		EContact *contact = E_CONTACT(c->data);
+ 		const char *name;
+-		GList *aims, *jabbers, *yahoos, *msns, *icqs, *novells, *ggs;
++		GList *jabbers;
+ 
+ 		name = e_contact_get_const(contact, E_CONTACT_FULL_NAME);
+ 
+-		aims    = e_contact_get(contact, E_CONTACT_IM_AIM);
+ 		jabbers = e_contact_get(contact, E_CONTACT_IM_JABBER);
+-		yahoos  = e_contact_get(contact, E_CONTACT_IM_YAHOO);
+-		msns    = e_contact_get(contact, E_CONTACT_IM_MSN);
+-		icqs    = e_contact_get(contact, E_CONTACT_IM_ICQ);
+-		novells = e_contact_get(contact, E_CONTACT_IM_GROUPWISE);
+-		ggs     = e_contact_get(contact, E_CONTACT_IM_GADUGADU);
+-
+-		if (aims == NULL && jabbers == NULL && yahoos == NULL &&
+-			msns == NULL && icqs == NULL && novells == NULL &&
+-			ggs == NULL)
++
++		if (jabbers == NULL)
+ 		{
+ 			GtkTreeIter iter;
+ 
+@@ -315,13 +307,7 @@
+ 		}
+ 		else
+ 		{
+-			add_ims(dialog, contact, name, aims,    "prpl-aim");
+ 			add_ims(dialog, contact, name, jabbers, "prpl-jabber");
+-			add_ims(dialog, contact, name, yahoos,  "prpl-yahoo");
+-			add_ims(dialog, contact, name, msns,    "prpl-msn");
+-			add_ims(dialog, contact, name, icqs,    "prpl-icq");
+-			add_ims(dialog, contact, name, novells, "prpl-novell");
+-			add_ims(dialog, contact, name, ggs,     "prpl-gg");
+ 		}
+ 	}
+ 
+@@ -367,7 +353,7 @@
+ 	{
+ 		EContact *contact = E_CONTACT(l->data);
+ 		const char *name;
+-		GList *aims, *jabbers, *yahoos, *msns, *icqs, *novells, *ggs;
++		GList *jabbers;
+ 
+ 		name = e_contact_get_const(contact, E_CONTACT_FULL_NAME);
+ 
+@@ -377,17 +363,9 @@
+ 			continue;
+ 		}
+ 
+-		aims    = e_contact_get(contact, E_CONTACT_IM_AIM);
+ 		jabbers = e_contact_get(contact, E_CONTACT_IM_JABBER);
+-		yahoos  = e_contact_get(contact, E_CONTACT_IM_YAHOO);
+-		msns    = e_contact_get(contact, E_CONTACT_IM_MSN);
+-		icqs    = e_contact_get(contact, E_CONTACT_IM_ICQ);
+-		novells = e_contact_get(contact, E_CONTACT_IM_GROUPWISE);
+-		ggs     = e_contact_get(contact, E_CONTACT_IM_GADUGADU);
+-
+-		if (aims == NULL && jabbers == NULL && yahoos == NULL &&
+-			msns == NULL && icqs == NULL && novells == NULL &&
+-			ggs == NULL)
++
++		if (jabbers == NULL)
+ 		{
+ 			GtkTreeIter iter;
+ 
+@@ -400,13 +378,7 @@
+ 		}
+ 		else
+ 		{
+-			add_ims(dialog, contact, name, aims,    "prpl-aim");
+ 			add_ims(dialog, contact, name, jabbers, "prpl-jabber");
+-			add_ims(dialog, contact, name, yahoos,  "prpl-yahoo");
+-			add_ims(dialog, contact, name, msns,    "prpl-msn");
+-			add_ims(dialog, contact, name, icqs,    "prpl-icq");
+-			add_ims(dialog, contact, name, novells, "prpl-novell");
+-			add_ims(dialog, contact, name, ggs,     "prpl-gg");
+ 		}
+ 	}
+ }
+diff -Nur pidgin-2.10.7/pidgin/plugins/gevolution/gevolution.c pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/gevolution.c
+--- pidgin-2.10.7/pidgin/plugins/gevolution/gevolution.c	2013-02-11 07:16:54.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/gevolution.c	2013-08-16 21:14:05.483056049 -0300
+@@ -119,13 +119,7 @@
+ 
+ 	name = e_contact_get_const(contact, E_CONTACT_FULL_NAME);
+ 
+-	update_ims_from_contact(contact, name, "prpl-aim",    E_CONTACT_IM_AIM);
+ 	update_ims_from_contact(contact, name, "prpl-jabber", E_CONTACT_IM_JABBER);
+-	update_ims_from_contact(contact, name, "prpl-yahoo",  E_CONTACT_IM_YAHOO);
+-	update_ims_from_contact(contact, name, "prpl-msn",    E_CONTACT_IM_MSN);
+-	update_ims_from_contact(contact, name, "prpl-icq",    E_CONTACT_IM_ICQ);
+-	update_ims_from_contact(contact, name, "prpl-novell", E_CONTACT_IM_GROUPWISE);
+-	update_ims_from_contact(contact, name, "prpl-gg",     E_CONTACT_IM_GADUGADU);
+ }
+ 
+ static void
+diff -Nur pidgin-2.10.7/pidgin/plugins/gevolution/gevo-util.c pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/gevo-util.c
+--- pidgin-2.10.7/pidgin/plugins/gevolution/gevo-util.c	2013-02-11 07:16:54.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/gevo-util.c	2013-08-16 23:20:45.692374640 -0300
+@@ -99,20 +99,8 @@
+ 
+ 	protocol_id = purple_account_get_protocol_id(account);
+ 
+-	if (!strcmp(protocol_id, "prpl-aim"))
+-		protocol_field = E_CONTACT_IM_AIM;
+-	else if (!strcmp(protocol_id, "prpl-icq"))
+-		protocol_field = E_CONTACT_IM_ICQ;
+-	else if (!strcmp(protocol_id, "prpl-msn"))
+-		protocol_field = E_CONTACT_IM_MSN;
+-	else if (!strcmp(protocol_id, "prpl-yahoo"))
+-		protocol_field = E_CONTACT_IM_YAHOO;
+-	else if (!strcmp(protocol_id, "prpl-jabber"))
++	if (!strcmp(protocol_id, "prpl-jabber"))
+ 		protocol_field = E_CONTACT_IM_JABBER;
+-	else if (!strcmp(protocol_id, "prpl-novell"))
+-		protocol_field = E_CONTACT_IM_GROUPWISE;
+-	else if (!strcmp(protocol_id, "prpl-gg"))
+-		protocol_field = E_CONTACT_IM_GADUGADU;
+ 
+ 	return protocol_field;
+ }
+@@ -169,18 +157,6 @@
+ 	{
+ 		PurpleAccount *account = purple_buddy_get_account(buddy);
+ 		const char *prpl_id = purple_account_get_protocol_id(account);
+-
+-		if (!strcmp(prpl_id, "prpl-msn"))
+-		{
+-			mail = g_strdup(purple_normalize(account,
+-										   purple_buddy_get_name(buddy)));
+-		}
+-		else if (!strcmp(prpl_id, "prpl-yahoo"))
+-		{
+-			mail = g_strdup_printf("%s@yahoo.com",
+-								   purple_normalize(account,
+-												  purple_buddy_get_name(buddy)));
+-		}
+ 	}
+ 
+ 	return mail;
+diff -Nur pidgin-2.10.7/pidgin/plugins/gevolution/new_person_dialog.c pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/new_person_dialog.c
+--- pidgin-2.10.7/pidgin/plugins/gevolution/new_person_dialog.c	2013-02-11 07:16:54.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/new_person_dialog.c	2013-08-16 21:23:26.207116339 -0300
+@@ -141,20 +141,8 @@
+ 		if (*email)
+ 			e_contact_set(contact, E_CONTACT_EMAIL_1, (gpointer)email);
+ 
+-		if (!strcmp(im_service, "prpl-aim"))
+-			field = E_CONTACT_IM_AIM;
+-		else if (!strcmp(im_service, "prpl-icq"))
+-			field = E_CONTACT_IM_ICQ;
+-		else if (!strcmp(im_service, "prpl-yahoo"))
+-			field = E_CONTACT_IM_YAHOO;
+-		else if (!strcmp(im_service, "prpl-jabber"))
++		if (!strcmp(im_service, "prpl-jabber"))
+ 			field = E_CONTACT_IM_JABBER;
+-		else if (!strcmp(im_service, "prpl-msn"))
+-			field = E_CONTACT_IM_MSN;
+-		else if (!strcmp(im_service, "prpl-novell"))
+-			field = E_CONTACT_IM_GROUPWISE;
+-		else if (!strcmp(im_service, "prpl-gg"))
+-			field = E_CONTACT_IM_GADUGADU;
+ 
+ 		if (field > 0)
+ 		{
+diff -Nur pidgin-2.10.7/pidgin.apspec.in pidgin-2.10.7-nonprism/pidgin.apspec.in
+--- pidgin-2.10.7/pidgin.apspec.in	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin.apspec.in	2013-08-16 20:53:14.523862926 -0300
+@@ -14,17 +14,13 @@
+ 
+ [Description]
+ Pidgin allows you to talk to anyone using a variety of messaging protocols,
+-including AIM (Oscar and TOC), ICQ, IRC, Yahoo!, MSN Messenger, XMPP,
+-Gadu-Gadu, and Zephyr. These protocols are implemented using a
++including IRC, XMPP and Zephyr. These protocols are implemented using a
+ modular, easy to use design. To use a protocol, just add an account using the
+ account editor.
+ 
+ Pidgin supports many common features of other clients, as well as many unique
+ features, such as perl scripting, TCL scripting and C plugins.
+ 
+-Pidgin is NOT affiliated with or endorsed by America Online, Inc., Microsoft
+-Corporation, Yahoo! Inc., or ICQ Inc.
+-
+ [BuildPrepare]
+ APBUILD_STATIC="Xss startup-notification-1" prepareBuild --enable-nss --enable-gnutls --enable-binreloc --disable-perl --disable-tcl --disable-gtktest --disable-glibtest --disable-vv  --disable-fortify
+ #APBUILD_STATIC="Xss startup-notification-1" prepareBuild --enable-nss --enable-gnutls --enable-binreloc --disable-perl --disable-tcl --disable-vv
+diff -Nur pidgin-2.10.7/pidgin.desktop.in pidgin-2.10.7-nonprism/pidgin.desktop.in
+--- pidgin-2.10.7/pidgin.desktop.in	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin.desktop.in	2013-08-16 23:07:34.874212867 -0300
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ _Name=Pidgin Internet Messenger
+ _GenericName=Internet Messenger
+-_Comment=Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more
++_Comment=Chat over IM.  Supports IRC, Jabber/XMPP and more
+ Exec=pidgin
+ Icon=pidgin
+ StartupNotify=true
+diff -Nur pidgin-2.10.7/pidgin.spec pidgin-2.10.7-nonprism/pidgin.spec
+--- pidgin-2.10.7/pidgin.spec	2013-02-11 07:17:59.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin.spec	2013-08-17 00:03:18.474815955 -0300
+@@ -34,7 +34,6 @@
+ %{!?_without_startupnotification:BuildRequires: startup-notification-devel}
+ %{?_with_avahi:BuildRequires: avahi-glib-devel}
+ %{!?_without_gtkspell:BuildRequires: gtkspell-devel}
+-%{?_with_meanwhile:BuildRequires: meanwhile-devel}
+ %{?_with_mono:BuildRequires: mono-devel}
+ %{?_with_sasl:BuildRequires: cyrus-sasl-devel >= 2}
+ %{!?_without_silc:BuildRequires: /usr/include/silc/silcclient.h}
+@@ -105,7 +104,6 @@
+ Group:      Applications/Internet
+ Obsoletes:  gaim-silc
+ Obsoletes:  gaim-tcl
+-Obsoletes:  gaim-gadugadu
+ Obsoletes:  pidgin-tcl < 2.0.0
+ Obsoletes:  pidgin-silc < 2.0.0
+ Obsoletes:  libpurple-perl < %{version}
+@@ -131,13 +129,6 @@
+ Requires:   libpurple >= %{apiver}
+ %endif
+ 
+-%if 0%{?_with_meanwhile:1}
+-%package -n libpurple-meanwhile
+-Summary:    Lotus Sametime plugin for Pidgin using the Meanwhile library
+-Group:      Applications/Internet
+-Requires:   libpurple >= %{apiver}
+-%endif
+-
+ %if 0%{?_with_mono:1}
+ %package -n libpurple-mono
+ Summary:    Mono .NET plugin support for Pidgin
+@@ -161,18 +152,14 @@
+ 
+ %description
+ Pidgin allows you to talk to anyone using a variety of messaging
+-protocols including AIM, MSN, Yahoo!, XMPP, Bonjour, Gadu-Gadu,
+-ICQ, IRC, Novell Groupwise, QQ, Lotus Sametime, SILC, Simple and
+-Zephyr.  These protocols are implemented using a modular, easy to
++protocols including XMPP, Bonjour, IRC, SILC, Simple and Zephyr.
++These protocols are implemented using a modular, easy to
+ use design.  To use a protocol, just add an account using the
+ account editor.
+ 
+ Pidgin supports many common features of other clients, as well as many
+ unique features, such as perl scripting, TCL scripting and C plugins.
+ 
+-Pidgin is not affiliated with or endorsed by America Online, Inc.,
+-Microsoft Corporation, Yahoo! Inc., or ICQ Inc.
+-
+ %description devel
+ The pidgin-devel package contains the header files, developer
+ documentation, and libraries required for development of Pidgin scripts
+@@ -182,9 +169,8 @@
+ libpurple contains the core IM support for IM clients such as Pidgin
+ and Finch.
+ 
+-libpurple supports a variety of messaging protocols including AIM, MSN,
+-Yahoo!, XMPP, Bonjour, Gadu-Gadu, ICQ, IRC, Novell Groupwise, QQ,
+-Lotus Sametime, SILC, Simple and Zephyr.
++libpurple supports a variety of messaging protocols including XMPP,
++Bonjour, IRC, SILC, Simple and Zephyr.
+ 
+ %description -n libpurple-devel
+ The libpurple-devel package contains the header files, developer
+@@ -196,11 +182,6 @@
+ Bonjour plugin for Pidgin.
+ %endif
+ 
+-%if 0%{?_with_meanwhile:1}
+-%description -n libpurple-meanwhile
+-Lotus Sametime plugin for Pidgin using the Meanwhile library.
+-%endif
+-
+ %if 0%{?_with_mono:1}
+ %description -n libpurple-mono
+ Mono plugin loader for Pidgin.  This package will allow you to write or
+@@ -236,7 +217,6 @@
+                                     %{!?_with_vv:--disable-vv} \
+                                     %{!?_with_dbus:--disable-dbus} \
+                                     %{!?_with_avahi:--disable-avahi} \
+-                                    %{!?_with_meanwhile:--disable-meanwhile} \
+                                     %{?_without_gstreamer:--disable-gstreamer} \
+                                     %{?_without_gtkspell:--disable-gtkspell} \
+                                     %{?_without_nm:--disable-nm} \
+@@ -258,9 +238,7 @@
+ rm -f $RPM_BUILD_ROOT%{_libdir}/gnt/*.la
+ rm -f $RPM_BUILD_ROOT%{_libdir}/pidgin/*.la
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/*.la
+-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/liboscar.so
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libjabber.so
+-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libymsg.so
+ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+ rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
+ find $RPM_BUILD_ROOT -type f -name '*.a' -exec rm -f {} ';'
+@@ -271,10 +249,6 @@
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libbonjour.so
+ %endif
+ 
+-%if 0%{!?_with_meanwhile:1}
+-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libsametime.so
+-%endif
+-
+ %if 0%{!?_with_mono:1}
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/mono.so
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/*.dll
+@@ -299,7 +273,6 @@
+ find $RPM_BUILD_ROOT%{_libdir}/purple-2 -xtype f -print | \
+         sed "s@^$RPM_BUILD_ROOT@@g" | \
+         grep -v /libbonjour.so | \
+-        grep -v /libsametime.so | \
+         grep -v /mono.so | \
+         grep -v ".dll$" > %{name}-%{version}-purpleplugins
+ 
+@@ -435,13 +408,6 @@
+ %{_libdir}/purple-2/libbonjour.*
+ %endif
+ 
+-%if 0%{?_with_meanwhile:1}
+-%files -n libpurple-meanwhile
+-%defattr(-, root, root)
+-
+-%{_libdir}/purple-2/libsametime.*
+-%endif
+-
+ %if 0%{?_with_mono:1}
+ %files -n libpurple-mono
+ %defattr(-, root, root)
+@@ -492,9 +458,6 @@
+ * Sat Jul 11 2009 Stu Tomlinson <stu@nosnilmot.com>
+ - Update to reflect changes in perl module installation directories
+ 
+-* Mon May 19 2008 Stu Tomlinson <stu@nosnilmot.com>
+-- Fix building without meanwhile support
+-
+ * Fri May 16 2008 Stu Tomlinson <stu@nosnilmot.com>
+ - Add "--without nm" support to build without NetworkManager
+ 
+@@ -586,8 +549,6 @@
+ - Update to reflect renaming to pidgin/libpurple
+ 
+ * Sun Oct  1 2006 Stu Tomlinson <stu@nosnilmot.com>
+-- We can build with internal gadu gadu again, so bring it back into the
+-  main package
+ - Deal with gconf schame uninstallation on package upgrade and removal
+ 
+ * Sun Aug 20 2006 Stu Tomlinson <stu@nosnilmot.com>
+@@ -606,19 +567,14 @@
+ - Source RPM uses tar.bz2 now to save space
+ - Update BuildRequires for new intltool dependencies
+ - Add a --with perlmakehack option to allow builds to succeed on RH9
+-- Add a --with gadugadu to build (separate) gaim-gadugadu package
+ 
+ * Sat Dec 17 2005 Stu Tomlinson <stu@nosnilmot.com>
+ - Add support for beta versions so the subsequent releases are seen as newer
+   by RPM
+-- Split of sametime support to gaim-meanwhile
+ - Use make DESTDIR=... instead of overloading prefix etc. when installing
+ - Default build to include cyrus-sasl support in Jabber
+ - Add --with dbus to build with DBUS support
+ 
+-* Sun Dec 04 2005 Christopher O'Brien <siege@preoccupied.net>
+-- Added obsoletes gaim-meanwhile
+-
+ * Sun Oct 30 2005 Stu Tomlinson <stu@nosnilmot.com>
+ - Add separate gaim-bonjour package if built with --with-howl
+ - Add separate gaim-mono package if built with --with-mono
+diff -Nur pidgin-2.10.7/pidgin.spec.in pidgin-2.10.7-nonprism/pidgin.spec.in
+--- pidgin-2.10.7/pidgin.spec.in	2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin.spec.in	2013-08-17 00:07:12.251996234 -0300
+@@ -34,7 +34,6 @@
+ %{!?_without_startupnotification:BuildRequires: startup-notification-devel}
+ %{?_with_avahi:BuildRequires: avahi-glib-devel}
+ %{!?_without_gtkspell:BuildRequires: gtkspell-devel}
+-%{?_with_meanwhile:BuildRequires: meanwhile-devel}
+ %{?_with_mono:BuildRequires: mono-devel}
+ %{?_with_sasl:BuildRequires: cyrus-sasl-devel >= 2}
+ %{!?_without_silc:BuildRequires: /usr/include/silc/silcclient.h}
+@@ -105,7 +104,6 @@
+ Group:      Applications/Internet
+ Obsoletes:  gaim-silc
+ Obsoletes:  gaim-tcl
+-Obsoletes:  gaim-gadugadu
+ Obsoletes:  pidgin-tcl < 2.0.0
+ Obsoletes:  pidgin-silc < 2.0.0
+ Obsoletes:  libpurple-perl < %{version}
+@@ -131,13 +129,6 @@
+ Requires:   libpurple >= %{apiver}
+ %endif
+ 
+-%if 0%{?_with_meanwhile:1}
+-%package -n libpurple-meanwhile
+-Summary:    Lotus Sametime plugin for Pidgin using the Meanwhile library
+-Group:      Applications/Internet
+-Requires:   libpurple >= %{apiver}
+-%endif
+-
+ %if 0%{?_with_mono:1}
+ %package -n libpurple-mono
+ Summary:    Mono .NET plugin support for Pidgin
+@@ -161,18 +152,14 @@
+ 
+ %description
+ Pidgin allows you to talk to anyone using a variety of messaging
+-protocols including AIM, MSN, Yahoo!, XMPP, Bonjour, Gadu-Gadu,
+-ICQ, IRC, Novell Groupwise, QQ, Lotus Sametime, SILC, Simple and
+-Zephyr.  These protocols are implemented using a modular, easy to
++protocols including XMPP, Bonjour, IRC, SILC, Simple and Zephyr.
++These protocols are implemented using a modular, easy to
+ use design.  To use a protocol, just add an account using the
+ account editor.
+ 
+ Pidgin supports many common features of other clients, as well as many
+ unique features, such as perl scripting, TCL scripting and C plugins.
+ 
+-Pidgin is not affiliated with or endorsed by America Online, Inc.,
+-Microsoft Corporation, Yahoo! Inc., or ICQ Inc.
+-
+ %description devel
+ The pidgin-devel package contains the header files, developer
+ documentation, and libraries required for development of Pidgin scripts
+@@ -182,9 +169,8 @@
+ libpurple contains the core IM support for IM clients such as Pidgin
+ and Finch.
+ 
+-libpurple supports a variety of messaging protocols including AIM, MSN,
+-Yahoo!, XMPP, Bonjour, Gadu-Gadu, ICQ, IRC, Novell Groupwise, QQ,
+-Lotus Sametime, SILC, Simple and Zephyr.
++libpurple supports a variety of messaging protocols including XMPP,
++Bonjour, IRC, SILC, Simple and Zephyr.
+ 
+ %description -n libpurple-devel
+ The libpurple-devel package contains the header files, developer
+@@ -196,11 +182,6 @@
+ Bonjour plugin for Pidgin.
+ %endif
+ 
+-%if 0%{?_with_meanwhile:1}
+-%description -n libpurple-meanwhile
+-Lotus Sametime plugin for Pidgin using the Meanwhile library.
+-%endif
+-
+ %if 0%{?_with_mono:1}
+ %description -n libpurple-mono
+ Mono plugin loader for Pidgin.  This package will allow you to write or
+@@ -236,7 +217,6 @@
+                                     %{!?_with_vv:--disable-vv} \
+                                     %{!?_with_dbus:--disable-dbus} \
+                                     %{!?_with_avahi:--disable-avahi} \
+-                                    %{!?_with_meanwhile:--disable-meanwhile} \
+                                     %{?_without_gstreamer:--disable-gstreamer} \
+                                     %{?_without_gtkspell:--disable-gtkspell} \
+                                     %{?_without_nm:--disable-nm} \
+@@ -258,9 +238,7 @@
+ rm -f $RPM_BUILD_ROOT%{_libdir}/gnt/*.la
+ rm -f $RPM_BUILD_ROOT%{_libdir}/pidgin/*.la
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/*.la
+-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/liboscar.so
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libjabber.so
+-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libymsg.so
+ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+ rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
+ find $RPM_BUILD_ROOT -type f -name '*.a' -exec rm -f {} ';'
+@@ -271,10 +249,6 @@
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libbonjour.so
+ %endif
+ 
+-%if 0%{!?_with_meanwhile:1}
+-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libsametime.so
+-%endif
+-
+ %if 0%{!?_with_mono:1}
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/mono.so
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/*.dll
+@@ -299,7 +273,6 @@
+ find $RPM_BUILD_ROOT%{_libdir}/purple-2 -xtype f -print | \
+         sed "s@^$RPM_BUILD_ROOT@@g" | \
+         grep -v /libbonjour.so | \
+-        grep -v /libsametime.so | \
+         grep -v /mono.so | \
+         grep -v ".dll$" > %{name}-%{version}-purpleplugins
+ 
+@@ -435,13 +408,6 @@
+ %{_libdir}/purple-2/libbonjour.*
+ %endif
+ 
+-%if 0%{?_with_meanwhile:1}
+-%files -n libpurple-meanwhile
+-%defattr(-, root, root)
+-
+-%{_libdir}/purple-2/libsametime.*
+-%endif
+-
+ %if 0%{?_with_mono:1}
+ %files -n libpurple-mono
+ %defattr(-, root, root)
+@@ -492,9 +458,6 @@
+ * Sat Jul 11 2009 Stu Tomlinson <stu@nosnilmot.com>
+ - Update to reflect changes in perl module installation directories
+ 
+-* Mon May 19 2008 Stu Tomlinson <stu@nosnilmot.com>
+-- Fix building without meanwhile support
+-
+ * Fri May 16 2008 Stu Tomlinson <stu@nosnilmot.com>
+ - Add "--without nm" support to build without NetworkManager
+ 
+@@ -586,8 +549,6 @@
+ - Update to reflect renaming to pidgin/libpurple
+ 
+ * Sun Oct  1 2006 Stu Tomlinson <stu@nosnilmot.com>
+-- We can build with internal gadu gadu again, so bring it back into the
+-  main package
+ - Deal with gconf schame uninstallation on package upgrade and removal
+ 
+ * Sun Aug 20 2006 Stu Tomlinson <stu@nosnilmot.com>
+@@ -606,19 +567,14 @@
+ - Source RPM uses tar.bz2 now to save space
+ - Update BuildRequires for new intltool dependencies
+ - Add a --with perlmakehack option to allow builds to succeed on RH9
+-- Add a --with gadugadu to build (separate) gaim-gadugadu package
+ 
+ * Sat Dec 17 2005 Stu Tomlinson <stu@nosnilmot.com>
+ - Add support for beta versions so the subsequent releases are seen as newer
+   by RPM
+-- Split of sametime support to gaim-meanwhile
+ - Use make DESTDIR=... instead of overloading prefix etc. when installing
+ - Default build to include cyrus-sasl support in Jabber
+ - Add --with dbus to build with DBUS support
+ 
+-* Sun Dec 04 2005 Christopher O'Brien <siege@preoccupied.net>
+-- Added obsoletes gaim-meanwhile
+-
+ * Sun Oct 30 2005 Stu Tomlinson <stu@nosnilmot.com>
+ - Add separate gaim-bonjour package if built with --with-howl
+ - Add separate gaim-mono package if built with --with-mono
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
new file mode 100644
index 000000000..abffa20b8
--- /dev/null
+++ b/nonprism/pidgin-nonprism/pidgin-2.10.7-link-libirc-to-libsasl2.patch
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 000000000..1a05f573e
--- /dev/null
+++ b/nonprism/pidgin-nonprism/pidgin.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/nonprism/your-privacy/PKGBUILD b/nonprism/your-privacy/PKGBUILD
new file mode 100644
index 000000000..3dbc1c733
--- /dev/null
+++ b/nonprism/your-privacy/PKGBUILD
@@ -0,0 +1,25 @@
+# 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
new file mode 100644
index 000000000..965fdbf43
--- /dev/null
+++ b/nonprism/your-privacy/your-privacy.install
@@ -0,0 +1,30 @@
+
+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/ams/PKGBUILD b/pcr/ams/PKGBUILD
deleted file mode 100644
index 75a5062a7..000000000
--- a/pcr/ams/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# Maintainer : Guest One <theguestone at gmail dot com>
-
-_name=alsamodular
-pkgname=ams
-pkgver=2.0.1
-pkgrel=1
-pkgdesc="Alsa Modular Synth is a realtime modular synthesizer and effect processor"
-arch=('i686')
-url="http://alsamodular.sourceforge.net/"
-license=('GPL')
-depends=('qt4' 'clalsadrv' 'ladspa' 'jack')
-makedepends=('fftw')
-optdepends=('swh-plugins: Steve Harris plugins'
-            'cmt: Computer Music Toolkit plugins')
-install="$pkgname.install"
-source=("http://downloads.sourceforge.net/project/$_name/$_name/$pkgver/$pkgname-$pkgver.tar.bz2"
-        "$pkgname.desktop" "$pkgname.png")
-md5sums=('0d41bd5aac066aa98be45fd7ab12d35f'
-         'ffa277cffd52254f0297cbc2f200767e'
-         '0349171d5431f1c6e56085f080eb8c68')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # DSO link flag
-  export LIBS=" -ldl"
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR=$pkgdir/ install
-
-  # desktop file
-  install -Dm644 ../$pkgname.desktop \
-    "$pkgdir/usr/share/applications/$pkgname.desktop"
-
-  # icon
-  install -Dm644 ../$pkgname.png \
-    "$pkgdir/usr/share/pixmaps/$pkgname.png"
-}
diff --git a/pcr/ams/ams.desktop b/pcr/ams/ams.desktop
deleted file mode 100644
index 4761ab9fc..000000000
--- a/pcr/ams/ams.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Alsa Modular Synth
-Comment=Realtime modular synthesizer and effect processor
-Exec=ams
-Icon=ams
-Terminal=false
-Categories=Application;AudioVideo;AudioVideo;Qt;X-Jack;X-Sound;
-StartupNotify=true
\ No newline at end of file
diff --git a/pcr/ams/ams.png b/pcr/ams/ams.png
deleted file mode 100644
index d3a8dfe49..000000000
--- a/pcr/ams/ams.png
+++ /dev/null
diff --git a/pcr/amsynth/PKGBUILD b/pcr/amsynth/PKGBUILD
index 1cd3cccf6..7142d6c9f 100644
--- a/pcr/amsynth/PKGBUILD
+++ b/pcr/amsynth/PKGBUILD
@@ -1,26 +1,25 @@
 # Maintainer : Guest One <theguestone at gmail dot com>
 
 pkgname=amsynth
-pkgver=1.3.2
-pkgrel=2
+pkgver=1.4.0
+pkgrel=1
 pkgdesc="Analogue Modeling SYNTHesizer"
 arch=('i686' 'x86_64')
-url="http://code.google.com/p/amsynth/"
+url="http://code.google.com/p/$pkgname/"
 license=('GPL')
-depends=('gtkmm' 'jack' 'liblo')
-makedepends=('desktop-file-utils' 'dssi' 'libtool' 'ladspa')
+depends=('gtkmm' 'jack' 'liblo' 'ladspa')
+makedepends=('desktop-file-utils' 'dssi' 'libtool')
 install="$pkgname.install"
-source=("http://amsynth.googlecode.com/files/amSynth-$pkgver.tar.gz")
-md5sums=('991329e433bb8c496f9ca5158faf0bca')
+source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.gz")
+md5sums=('9193d334c89996cf44e98422e03318bb')
 
 build() {
-  cd "$srcdir/amSynth-$pkgver"
-  libtoolize
+  cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "$srcdir/amSynth-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir/" install
 }
diff --git a/pcr/android-udev/PKGBUILD b/pcr/android-udev/PKGBUILD
new file mode 100644
index 000000000..10fe60934
--- /dev/null
+++ b/pcr/android-udev/PKGBUILD
@@ -0,0 +1,26 @@
+# 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
new file mode 100644
index 000000000..dcb1ebc20
--- /dev/null
+++ b/pcr/android-udev/android-udev.install
@@ -0,0 +1,12 @@
+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/asterisk/PKGBUILD b/pcr/asterisk/PKGBUILD
new file mode 100644
index 000000000..01bc1ae6e
--- /dev/null
+++ b/pcr/asterisk/PKGBUILD
@@ -0,0 +1,95 @@
+# 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
new file mode 100644
index 000000000..b7c1a71f7
--- /dev/null
+++ b/pcr/asterisk/asterisk.install
@@ -0,0 +1,15 @@
+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/social/asterisk/asterisk.logrotated b/pcr/asterisk/asterisk.logrotated
index f03d0acd3..f03d0acd3 100644
--- a/social/asterisk/asterisk.logrotated
+++ b/pcr/asterisk/asterisk.logrotated
diff --git a/pcr/asterisk/asterisk.service b/pcr/asterisk/asterisk.service
new file mode 100644
index 000000000..789a1adda
--- /dev/null
+++ b/pcr/asterisk/asterisk.service
@@ -0,0 +1,20 @@
+[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
new file mode 100644
index 000000000..6f1042e8a
--- /dev/null
+++ b/pcr/asterisk/asterisk.tmpfile
@@ -0,0 +1 @@
+d /run/asterisk 0755 asterisk asterisk -
diff --git a/pcr/audio-entropyd/PKGBUILD b/pcr/audio-entropyd/PKGBUILD
new file mode 100644
index 000000000..c691c0128
--- /dev/null
+++ b/pcr/audio-entropyd/PKGBUILD
@@ -0,0 +1,29 @@
+# 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
new file mode 100644
index 000000000..feff7cae4
--- /dev/null
+++ b/pcr/audio-entropyd/audio-entropyd.service
@@ -0,0 +1,10 @@
+[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/bibletime/PKGBUILD b/pcr/bibletime/PKGBUILD
new file mode 100644
index 000000000..3a2941623
--- /dev/null
+++ b/pcr/bibletime/PKGBUILD
@@ -0,0 +1,39 @@
+# 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
new file mode 100644
index 000000000..ad97d7bab
--- /dev/null
+++ b/pcr/bibletime/bibletime.install
@@ -0,0 +1,13 @@
+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/blender-addon-ogre/PKGBUILD b/pcr/blender-addon-ogre/PKGBUILD
new file mode 100644
index 000000000..4baf8ca39
--- /dev/null
+++ b/pcr/blender-addon-ogre/PKGBUILD
@@ -0,0 +1,31 @@
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+
+_bldname=blender
+_bldver=2.68
+_bldep=9
+
+_pkgname=ogre
+pkgname=$_bldname-addon-$_pkgname
+pkgver=0.6.0
+pkgrel=2
+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/chiliproject/PKGBUILD b/pcr/chiliproject/PKGBUILD
deleted file mode 100644
index 4f933934a..000000000
--- a/pcr/chiliproject/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-pkgname=chiliproject
-pkgver=3.3.0
-pkgrel=1
-pkgdesc="Chiliproject is a fork of Redmine, a flexible project management web application written using Ruby on Rails."
-arch=('any')
-url="https://www.chiliproject.org"
-license=('GPL2')
-depends=('ruby' 'ruby-bundler' 'mysql' 'libxml2' 'libxslt' 'imagemagick' 'pkg-config')
-provides=('chiliproject')
-backup=('var/lib/chiliproject/config/database.yml'
-       'var/lib/chiliproject/config/configuration.yml')
-makedepends=('glibc')
-optdepends=('git: Git repository browsing'
-            'subversion>=1.3.0: Subversion repository browsing'
-            'darcs: Darcs repository browsing'
-            'bzr: Bazaar repository browsing'
-            'mercurial: Mercurial repository browsing')
-options=()
-install=chiliproject.install
-source=("https://www.chiliproject.org/attachments/download/360/chiliproject-$pkgver.tar.gz")
-md5sums=('4fa4a825cf0cd91d7495180a19bc4c11')
-
-build() {
-	return 0
-}
-
-package() {
-	cd "$srcdir/chiliproject-$pkgver"
-
-	# install in /var/lib
-	_instdir="$pkgdir/var/lib/chiliproject"
-	mkdir -p ${_instdir}
-	cp -ra . ${_instdir}
-
-	# create required directories
-	mkdir -p "${_instdir}/public/plugin_assets"
-}
-
-# vim:set ts=4 sw=4 et:
diff --git a/pcr/chiliproject/chiliproject.install b/pcr/chiliproject/chiliproject.install
deleted file mode 100644
index cb4622f09..000000000
--- a/pcr/chiliproject/chiliproject.install
+++ /dev/null
@@ -1,17 +0,0 @@
-adjust_perms(){
-  chown -R http:http "/var/lib/chiliproject" 1>/dev/null
-  for dir in /var/lib/chiliproject/{files,log,tmp,public/plugin_assets}; do
-    chown -R http:http "$dir" 1>/dev/null
-    chmod -R 755 "$dir" 1>/dev/null
-  done
-}
-
-post_install() {
-  adjust_perms
-  echo 'take a look at https://wiki.archlinux.org/index.php?title=Chiliproject for further setup instructions.'
-}
-
-post_upgrade() {
-  adjust_perms
-  echo 'take a look at https://wiki.archlinux.org/index.php?title=Chiliproject for further setup instructions.'
-}
diff --git a/pcr/cinepaint-lts/PKGBUILD b/pcr/cinepaint-lts/PKGBUILD
index c680ac904..da085729f 100644
--- a/pcr/cinepaint-lts/PKGBUILD
+++ b/pcr/cinepaint-lts/PKGBUILD
@@ -1,7 +1,7 @@
 # $Id$
 # Maintainer: tobias [tobias.archlinux.org]
 # Contributor: tobias [tobias.justdreams.de]
-# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
 pkgname=cinepaint-lts
 pkgver=1.0
diff --git a/pcr/cjdns-git/PKGBUILD b/pcr/cjdns-git/PKGBUILD
new file mode 100644
index 000000000..2e9646006
--- /dev/null
+++ b/pcr/cjdns-git/PKGBUILD
@@ -0,0 +1,77 @@
+# 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
new file mode 100644
index 000000000..5e9e1a64c
--- /dev/null
+++ b/pcr/cjdns-git/cjdns-git.install
@@ -0,0 +1,21 @@
+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/clalsadrv/PKGBUILD b/pcr/clalsadrv/PKGBUILD
deleted file mode 100644
index bd7f89c05..000000000
--- a/pcr/clalsadrv/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Maintainer: Guest One <theguestone at gmail dot com>
-# patch taken from https://aur.archlinux.org/packages/clalsadrv/
-pkgname=clalsadrv
-pkgver=2.0.0
-pkgrel=1
-pkgdesc="Audio library for aeolus, aliki, ams, jaaa and japa."
-arch=('i686')
-url="http://kokkinizita.linuxaudio.org/linuxaudio/index.html"
-license=('GPL')
-depends=('alsa-lib')
-install=${pkgname}.install
-source=(http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${pkgver}.tar.bz2 ${pkgname}.patch)
-md5sums=('be123e1701e4b6c6300907df949bd71c'
-         'cc5a4abbc49590dfbbf942ebfd966b70')
-build() {
-  cd "${pkgname}-${pkgver}/libs"
-  patch < ${srcdir}/${pkgname}.patch
-  make DESTDIR=${pkgdir} PREFIX=/usr LIBDIR=lib 
-}
-
-package(){
-  cd "${pkgname}-${pkgver}/libs"
-  make DESTDIR=${pkgdir} PREFIX=/usr LIBDIR=lib install
-}
diff --git a/pcr/clalsadrv/clalsadrv.install b/pcr/clalsadrv/clalsadrv.install
deleted file mode 100644
index 21117d5a8..000000000
--- a/pcr/clalsadrv/clalsadrv.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-ldconfig
-echo "==> ran ldconfig"
-}
-
-post_upgrade() {
-post_install
-}
-
-post_remove() {
-post_install
-}
diff --git a/pcr/clalsadrv/clalsadrv.patch b/pcr/clalsadrv/clalsadrv.patch
deleted file mode 100644
index 5081f42fb..000000000
--- a/pcr/clalsadrv/clalsadrv.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.orig	2010-03-15 12:58:40.862423046 +0100
-+++ Makefile	2010-03-15 12:59:01.578587306 +0100
-@@ -47,7 +47,6 @@
- install:	$(CLALSADRV_MIN)
- 	install -Dm 644 $(CLALSADRV_H)   $(DESTDIR)$(PREFIX)/include/$(CLALSADRV_H)
- 	install -Dm 755 $(CLALSADRV_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(CLALSADRV_MIN)
--	/sbin/ldconfig $(PREFIX)/$(LIBDIR)
- 	ln -sf $(CLALSADRV_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(CLALSADRV_SO)
- 
- clean:
diff --git a/pcr/cluster-glue/PKGBUILD b/pcr/cluster-glue/PKGBUILD
deleted file mode 100644
index 684efe7c2..000000000
--- a/pcr/cluster-glue/PKGBUILD
+++ /dev/null
@@ -1,242 +0,0 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-
-pkgname=cluster-glue
-_pkgname1=${pkgname::7}
-_pkgname2=${pkgname:8}
-_pkgname=${_pkgname1^}_${_pkgname2^}
-pkgver=1.0.11
-pkgrel=11
-pkgdesc='Set of libraries, tools and utilities suitable for the Heartbeat/Pacemaker cluster stack (Linux-HA)'
-arch=(
-  i686
-  x86_64
-  mips64el
-)
-group=linux-ha
-url=http://$group.org/wiki/$_pkgname
-license=(
-  GPL2
-  LGPL2.1
-)
-depends=(
-  curl
-  dbus-glib
-  glib2
-  libaio
-  libesmtp
-  libltdl
-  libnet
-  libxml2
-  net-snmp
-  openhpi
-  openipmi
-  openssh
-  python
-  util-linux
-  #vacm !!Is VA-Cluster Manager abandonware? - http://vacm.sourceforge.net/ - ver 2.0.5a - 2001/10/03!!
-)
-optdepends=net-tools
-makedepends=(
-  help2man
-  libxslt
-  lynx
-  net-tools
-  openssh
-  valgrind
-  w3m
-)
-options=(!libtool)
-provides=(ha-$_pkgname2)
-conflicts=ha-$_pkgname2
-replaces=ha-$_pkgname2
-install=$pkgname.install
-source=http://hg.$group.org/$_pkgname2/archive/$_pkgname2-$pkgver.tar.bz2
-sha512sums=35ac8ac555c39f24c11e3a768cc50eba051fe617edf4cdc0429dac73f45a472f144cfe6ec5faff575606f2b04ff76a2f732556d848b61410c2683d93ba928413
-
-prepare() {
-  export _CLUSTER_USER=hacluster
-  export _CLUSTER_GROUP=haclient
-  _DGID=666
-  _DUID=666
-
-  #verify the cluster user and group
-  if ! getent group $_CLUSTER_GROUP >/dev/null;then
-    msg 'BEFORE COMPILE THIS SOFTWARE YOU MUST CREATE A CLUSTER GROUP, EXECUTE AS ROOT:'
-    echo -e "# groupadd -r -g $_DGID $_CLUSTER_GROUP\n"
-    _EXITCODE=1
-  fi
-  if ! getent passwd $_CLUSTER_USER >/dev/null;then
-    msg 'BEFORE COMPILE THIS SOFTWARE YOU MUST CREATE A CLUSTER USER, EXECUTE AS ROOT:'
-    echo -e "# useradd -r -g $_CLUSTER_GROUP -u $_DUID -d /var/lib/heartbeat/cores/$_CLUSTER_USER -s /sbin/nologin -c \"cluster user\" $_CLUSTER_USER\n"
-    _EXITCODE=1
-  fi
-  if [[ $_EXITCODE -eq 1 ]] ;then
-    return 1
-  fi
-
-  cd $srcdir/Reusable-${_pkgname1^}-Components-$_pkgname2--$_pkgname2-$pkgver
-  sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|;
-          s| -O0||;
-          s|AM_INIT_AUTOMAKE($PACKAGE_NAME, $PACKAGE_VERSION)|AM_INIT_AUTOMAKE|;
-          s|${localstatedir}/lock ${localstatedir}/spool/lock ${localstatedir}/spool/locks ${localstatedir}/lock|/run/lock|;
-          s|/sbin:/usr/sbin:/usr/local/sbin:/usr/local/bin|/usr/bin|;
-         ' configure.ac
-  sed -i 's|INCLUDES|AM_CPPFLAGS|;
-         ' $(grep -rl INCLUDES | grep Makefile.am)
-
-  # fixing path
-  sed -i 's|bin/sh|usr/bin/bash|;
-         ' $(grep -rl bin/sh)
-  sed -i 's| /bin| /usr/bin|;
-         ' $(grep -rl ' /bin')
-  sed -i 's| /sbin| /usr/bin|;
-         ' $(grep -rl ' /sbin')
-  sed -i 's|usr/sbin|usr/bin|;
-         ' $(grep -rl usr/sbin)
-  #sed -i 's|/lib64|/lib|;
-  #       ' $(grep -rl /lib64)
-  #sed -i 's|usr/libexec|usr/lib|;
-  #       ' $(grep -rl usr/libexec)
-  sed -i 's|var/lock|run/lock|;
-         ' $(grep -rl var/lock)
-  sed -i 's|var/run|run|;
-         ' $(grep -rl var/run)
-
-  # remove Open Source term
-  sed -i 's|Open Source / ||;
-          s|open source / ||;
-          s|Open Source|Free Software|;
-          s|open source|free software|;
-          s|Free Software Development Lab|Open Source Development Lab|;
-         ' $(grep -ril 'open source')
-  sed -i 's|OpenSource / ||;
-          s|opensource / ||;
-          s|OpenSource|FreeSoftware|;
-          s|opensource|freesoftware|;
-          s|freesoftware.org|opensource.org|;
-          s|http://www.opensource.org/|http://www.gnu.org/philosophy/free-sw.html|;
-          s|http://www.gnu.org/philosophy/free-sw.htmllicenses/osl-|http://opensource.org/licenses/osl-|;
-          s|http://www.gnu.org/philosophy/free-sw.htmlosd|http://opensource.org/osd|;
-         ' $(grep -ril opensource)
-
-  # remove Linux term
-  sed -i 's|Linux,|GNU/Linux,|;
-          s|Linux and|GNU/Linux and|;
-          s|Linux distro|GNU/Linux distro|;
-          s|Linux distribution|GNU/Linux distribution|;
-          s|Linux machine|GNU/Linux machine|;
-          s|Linux Only|GNU/Linux Only|;
-          s|Linux only|GNU/Linux only|;
-          s|Linux operating|GNU/Linux operating|;
-          s|Linux OS|GNU/Linux OS|;
-          s|Linux platform|GNU/Linux platform|;
-          s|Linux software|GNU/Linux software|;
-          s|Linux specific|GNU/Linux specific|;
-          s|Linux system|GNU/Linux system|;
-          s|Linux will|GNU/Linux will|;
-          s|# Linux$|# GNU/Linux|;
-          s|# Linux.$|# GNU/Linux.|;
-          s|* Linux$|* GNU/Linux|;
-          s|* Linux.$|* GNU/Linux.|;
-          s|// Linux$|// GNU/Linux|;
-          s|// Linux.$|// GNU/Linux.|;
-          s|, Linux|, GNU/Linux|;
-          s|As Linux|As GNU/Linux|;
-          s|as Linux|as GNU/Linux|;
-          s|And Linux|And GNU/Linux|;
-          s|and Linux|and GNU/Linux|;
-          s|Be Linux|Be GNU/Linux|;
-          s|be Linux|be GNU/Linux|;
-          s|Because Linux|Because GNU/Linux|;
-          s|because Linux|because GNU/Linux|;
-          s|e.g. Linux|e.g. GNU/Linux|;
-          s|For Linux|For GNU/Linux|;
-          s|for Linux|for GNU/Linux|;
-          s|In Linux|In GNU/Linux|;
-          s|in Linux|in GNU/Linux|;
-          s|Like Linux|Like GNU/Linux|;
-          s|like Linux|like GNU/Linux|;
-          s|non-Linux|non GNU/Linux|;
-          s|Of Linux|Of GNU/Linux|;
-          s|of Linux|of GNU/Linux|;
-          s|On Linux|On GNU/Linux|;
-          s|on Linux|on GNU/Linux|;
-          s|OS type: Linux|OS type: GNU/Linux|;
-          s|Other Linux|Other GNU/Linux|;
-          s|other Linux|other GNU/Linux|;
-          s|The Linux|The GNU/Linux|;
-          s|the Linux|the GNU/Linux|;
-          s|Typically Linux|Typically GNU/Linux|;
-          s|typically Linux|typically GNU/Linux|;
-          s|To Linux|To GNU/Linux|;
-          s|to Linux|to GNU/Linux|;
-          s|Under Linux|Under GNU/Linux|;
-          s|under Linux|under GNU/Linux|;
-          s|ArchGNU/Linux|ArchLinux|;
-          s|e2fsprogs, typically GNU/Linux|e2fsprogs, typically Linux|;
-          s|GNU/GNU|GNU|;
-          s|GNU/Linux device|Linux device|;
-          s|GNU/Linux Director Daemon|Linux Director Daemon|;
-          s|GNU/Linux is a registered trademark of Linus Torvalds|Linux is a registered trademark of Linus Torvalds|;
-          s|GNU/Linux kernel|Linux kernel|;
-          s|GNU/Linux specific kernel|Linux specific kernel|;
-          s|GNU/Linux Standard Base|Linux Standard Base|;
-          s|GNU/Linux sysfs|Linux sysfs|;
-          s|GNU/Linux Virtual Server|Linux Virtual Server|;
-          s|GNU/Linux Watchdog|Linux Watchdog|;
-          s|GNU/Linux watchdog|Linux watchdog|;
-          s|GNU/LinuxHA|LinuxHA|;
-          s|GNU/Linux-HA|Linux-HA|;
-          s|GNU/LinuxSCSI|LinuxSCSI|;
-          s|HA GNU/Linux|HA Linux|;
-          s|High-Availability GNU/Linux|High-Availability Linux|;
-          s|MkGNU/Linux|MkLinux|;
-          s|SEGNU/Linux|SELinux|;
-          s|VA GNU/Linux Cluster|VA Linux Cluster|;
-         ' $(grep -rl Linux)
-}
-
-build() {
-  cd $srcdir/Reusable-${_pkgname1^}-Components-$_pkgname2--$_pkgname2-$pkgver
-  setarch $CARCH ./autogen.sh
-  setarch $CARCH ./configure --prefix=/usr\
-    --disable-ansi\
-    --disable-fatal-warnings\
-    --disable-static\
-    --enable-doc\
-    --enable-libnet\
-    --enable-upstart\
-    --libdir=/usr/lib\
-    --localstatedir=/var\
-    --sbindir=/usr/bin\
-    --sysconfdir=/etc\
-    --with-daemon-group=haclient\
-    --with-daemon-user=hacluster\
-    --with-ocf-root=/usr/lib/ocf
-  setarch $CARCH make
-}
-
-package() {
-  cd $srcdir/Reusable-${_pkgname1^}-Components-$_pkgname2--$_pkgname2-$pkgver
-  setarch $CARCH make DESTDIR=$pkgdir install
-
-  rm $pkgdir/etc/rc.d/logd && rmdir $pkgdir/etc{/rc.d,}
-
-  install -d $pkgdir/usr/lib/systemd/system
-  echo '[Unit]'                                   >  $pkgdir/usr/lib/systemd/system/ha_log.service
-  echo 'Description=Startup script logd service'  >> $pkgdir/usr/lib/systemd/system/ha_log.service
-  echo 'Requires=network.target remote-fs.target' >> $pkgdir/usr/lib/systemd/system/ha_log.service
-  echo ''                                         >> $pkgdir/usr/lib/systemd/system/ha_log.service
-  echo '[Service]'                                >> $pkgdir/usr/lib/systemd/system/ha_log.service
-  echo 'Type=forking'                             >> $pkgdir/usr/lib/systemd/system/ha_log.service
-  echo 'ExecStart=/usr/lib/heartbeat/ha_logd'     >> $pkgdir/usr/lib/systemd/system/ha_log.service
-  echo ''                                         >> $pkgdir/usr/lib/systemd/system/ha_log.service
-  echo '[Install]'                                >> $pkgdir/usr/lib/systemd/system/ha_log.service
-  echo 'WantedBy=multi-user.target'               >> $pkgdir/usr/lib/systemd/system/ha_log.service
-
-  msg 'AFTER COMPILE THIS SOFTWARE YOU MUST DELETE A CLUSTER USER AND A CLUSTER GROUP, EXECUTE AS ROOT:'
-  echo -e "# userdel $_CLUSTER_USER"
-  echo -e "# groupdel $_CLUSTER_GROUP"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/cluster-glue/cluster-glue.install b/pcr/cluster-glue/cluster-glue.install
deleted file mode 100644
index 05e2160d3..000000000
--- a/pcr/cluster-glue/cluster-glue.install
+++ /dev/null
@@ -1,17 +0,0 @@
-_CLUSTER_USER=hacluster
-_CLUSTER_GROUP=haclient
-_DGID=666
-_DUID=666
-
-pre_install() {
-	getent group $_CLUSTER_GROUP >/dev/null || groupadd -r -g $_DGID $_CLUSTER_GROUP
-	getent passwd $_CLUSTER_USER >/dev/null || useradd -r -g $_CLUSTER_GROUP -u $_DUID -d /var/lib/heartbeat/cores/hacluster -s /sbin/nologin -c 'cluster user' $_CLUSTER_USER
-}
-
-post_install() {
-	echo -e 'Now you must install ha-resourceagent, ha-heartbeat and ha-pacemaker'
-}
-post_remove() {
-	echo -e "Deleting user $_CLUSTER_USER and group $_CLUSTER_GROUP"
-	userdel $_CLUSTER_USER && groupdel $_CLUSTER_GROUP
-}
diff --git a/pcr/clusterit/LICENSE b/pcr/clusterit/LICENSE
deleted file mode 100644
index b4aaeb75c..000000000
--- a/pcr/clusterit/LICENSE
+++ /dev/null
@@ -1 +0,0 @@
-ClusterIt is Free software, with a standard BSD-style License. You are encouraged to download this, work with it, enhance it, or whatever suits your needs. Redistribution can take place if the license stays intact.
diff --git a/pcr/clusterit/PKGBUILD b/pcr/clusterit/PKGBUILD
deleted file mode 100644
index c325a003b..000000000
--- a/pcr/clusterit/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-pkgname=clusterit
-pkgver=2.5
-pkgrel=1
-pkgdesc='Tools to make a cluster of computers'
-arch=(
-  i686
-  x86_64
-  mips64el
-)
-license=BSD
-url=http://www.sourceforge.net/projects/$pkgname
-depends=(
-  libx11
-  sh
-)
-conflicts=synce-librapi
-source=(
-  http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
-  LICENSE
-)
-sha512sums=(
-  7efb0aa55c9581151ec73405d4e69df2d4258ee4c6b254a29bab95a7b90c4d645387db0d7c884eda6d7a861ce25bea27136df4af1990e5401a1b2a3d035999fc
-  65884310aad16ed4d10da24e87016710f12cb9dd8e8a6531d702a3194a18fa6b6a58b340cd98193f24c964d402b5ded1f19c9bb008d6c3957a2409d622da22d8
-)
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  setarch $CARCH ./configure --prefix=/usr
-  setarch $CARCH make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  setarch $CARCH make DESTDIR=$pkgdir install
-
-  install -d $pkgdir/usr/share/licenses/$pkgname
-  install -Dm644 $srcdir/LICENSE $pkgdir/usr/share/licenses/$pkgname
-}
-
-
diff --git a/pcr/collada-dom/PKGBUILD b/pcr/collada-dom/PKGBUILD
index ebcc90448..7fceb3678 100644
--- a/pcr/collada-dom/PKGBUILD
+++ b/pcr/collada-dom/PKGBUILD
@@ -2,14 +2,14 @@
 
 pkgname=collada-dom
 pkgver=2.4.0
-pkgrel=1
+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=(
-  i686
-  x86_64
   mips64el
+  x86_64
+  i686
 )
 depends=(
   boost-libs
@@ -26,23 +26,23 @@ sha512sums=4c8cdc159acc89564b46615a0bc73a5ba84a1a5aa41d38661cd0e33a705ce5fd032e9
 prepare() {
   cd $srcdir/$pkgname-$pkgver-libsrc
 
-  [[ -d build ]] && rm -r build
-  mkdir build
+  [[ -d build ]] && rm -vr build
+  mkdir -v build
 }
 
 build() {
   cd $srcdir/$pkgname-$pkgver-libsrc/build
-  setarch $CARCH cmake .. -DCMAKE_INSTALL_PREFIX=/usr
-  setarch $CARCH make
+  cmake .. -DCMAKE_INSTALL_PREFIX=/usr
+  make
 }
 
 package() {
   cd $srcdir/$pkgname-$pkgver-libsrc/build
-  setarch $CARCH make DESTDIR=$pkgdir install
+  make DESTDIR=$pkgdir install
 
   a=$pkgdir/usr/share/licenses/$pkgname
 
-  install -d $a && cp -a ../{dom/license.txt,License_Folder/license_e.txt} $a
+  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
index d43b73c0e..e2131a3d5 100644
--- a/pcr/command-not-found/PKGBUILD
+++ b/pcr/command-not-found/PKGBUILD
@@ -1,47 +1,32 @@
+# Maintainer: Aurelien Desbrieres <aurelien@cwb.io>
+# Contributor: Diogo Leal <estranho@diogoleal.com>
+# Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
 # Contributor: Matthias Maennich <arch@maennich.net>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
 
 pkgname=command-not-found
-pkgver=0.4.4
+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=('GPL')
+license=('GPL3')
 depends=('boost-libs' 'tdb' 'libarchive' 'wget')
-makedepends=('boost' 'tdb' 'cmake' 'git')
-source=('install')
-md5sums=('2ea3c216fb0b7f8449f0225ece33210c')
+makedepends=('boost' 'cmake')
 install='install'
 
-_gitrepo="https://github.com/metti/$pkgname.git"
+source=("libre://$pkgname-$pkgver.tar.gz")
+mksource=("$pkgname-$pkgver::git+https://github.com/metti/$pkgname.git#tag=v${pkgver}")
+mkmd5sums=('SKIP')
 
 build() {
-    cd $srcdir
-    msg "Connecting to the GIT server ..."
-
-    if [[ -d $srcdir/$pkgname ]] ; then
-        cd $pkgname
-        git fetch origin
-    else
-        git clone $_gitrepo
-        cd $pkgname
-    fi
-
-    git checkout v$pkgver
-
-    msg "GIT checkout done"
-
-    mkdir -p $srcdir/build
-    cd $srcdir/build
-
-    cmake -D CMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="" $srcdir/$pkgname/src
-    make
-
+  cd "$srcdir/$pkgname-$pkgver"
+  cmake -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_PREFIX="" src
+  make
 }
 
 package(){
-    cd $srcdir/build
-
-    make DESTDIR=$pkgdir install
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
+
+md5sums=('c055522251b2c58b9c6e0d0f0df481c0')
diff --git a/pcr/command-not-found/install b/pcr/command-not-found/install
index 26f49fa50..50e601258 100644
--- a/pcr/command-not-found/install
+++ b/pcr/command-not-found/install
@@ -7,8 +7,7 @@ post_upgrade() {
 }
 
 pre_remove() {
-  rm -rf /var/lib/cnf/*.db
-  rm -rf /var/lib/cnf/*.tdb
+  rm -f /var/lib/cnf/*.{db,tbd}
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/pcr/corosync/PKGBUILD b/pcr/corosync/PKGBUILD
deleted file mode 100644
index e176cb112..000000000
--- a/pcr/corosync/PKGBUILD
+++ /dev/null
@@ -1,63 +0,0 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-pkgname=corosync
-_pkgflag=lts
-pkgver=2.3.0
-pkgrel=2
-pkgdesc='Cluster engine for nodal communication systems with additional features for implementing high availability within applications'
-arch=(
-  i686
-  x86_64
-  mips64el
-)
-url=http://www.$pkgname.org
-license=BSD
-depends=(
-  libqb
-  libstatgrab
-  net-snmp
-  nss
-)
-makedepends=doxygen
-conflicts=$pkgname-$_pkgflag
-options=(!libtool)
-source=http://$pkgname.org/download/$pkgname-$pkgver.tar.gz
-sha512sums=cd2ff5182f0d4827a10d50a211aa073e3d544bf7b98f9b0c834243c0d2cd5446d7950021cb1a21fc16f4951c8b2acf4b75c0b0c72d815b7d67dcba71623d2e51
-
-prepare() {
-  cd $srcdir/$pkgname-$pkgver
-}
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  setarch $CARCH ./configure --prefix=/usr\
-    --datarootdir=/usr/share\
-    --disable-coverage\
-    --disable-fatal-warnings\
-    --disable-rdma\
-    --disable-static\
-    --enable-augeas\
-    --enable-dbus\
-    --enable-monitoring\
-    --enable-qdevices\
-    --enable-secure-build\
-    --enable-shared\
-    --enable-snmp\
-    --enable-systemd\
-    --enable-testagents\
-    --enable-watchdog\
-    --enable-xmlconf\
-    --libdir=/usr/lib\
-    --localstatedir=/var\
-    --sysconfdir=/etc\
-    --with-initddir=/etc/rc.d\
-    --with-systemddir=/usr/lib/systemd/system
-  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/cpptest/PKGBUILD b/pcr/cpptest/PKGBUILD
new file mode 100644
index 000000000..df08feb00
--- /dev/null
+++ b/pcr/cpptest/PKGBUILD
@@ -0,0 +1,24 @@
+# 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/culmus-latex/PKGBUILD b/pcr/culmus-latex/PKGBUILD
new file mode 100644
index 000000000..8562f2fb5
--- /dev/null
+++ b/pcr/culmus-latex/PKGBUILD
@@ -0,0 +1,21 @@
+#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
new file mode 100644
index 000000000..4c6529865
--- /dev/null
+++ b/pcr/culmus-latex/culmus-latex.install
@@ -0,0 +1,22 @@
+
+## 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
new file mode 100644
index 000000000..3d1a5f567
--- /dev/null
+++ b/pcr/culmus/PKGBUILD
@@ -0,0 +1,44 @@
+# 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
new file mode 100644
index 000000000..d303cbb09
--- /dev/null
+++ b/pcr/culmus/culmus-0.121-fontconfig_fix.patch
@@ -0,0 +1,203 @@
+--- 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
new file mode 100644
index 000000000..1376ca5ce
--- /dev/null
+++ b/pcr/culmus/culmus.install
@@ -0,0 +1,41 @@
+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/darcsver/PKGBUILD b/pcr/darcsver/PKGBUILD
new file mode 100644
index 000000000..e93250680
--- /dev/null
+++ b/pcr/darcsver/PKGBUILD
@@ -0,0 +1,26 @@
+# 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/debootstrap-libre/PKGBUILD b/pcr/debootstrap-libre/PKGBUILD
new file mode 100644
index 000000000..b4ea8c09f
--- /dev/null
+++ b/pcr/debootstrap-libre/PKGBUILD
@@ -0,0 +1,53 @@
+# Maintainer: André Silva <emulatorman@lavabit.com>
+
+_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/debootstrap.install b/pcr/debootstrap-libre/debootstrap.install
index 85a99f160..3da2f1d22 100644
--- a/pcr/debootstrap/debootstrap.install
+++ b/pcr/debootstrap-libre/debootstrap.install
@@ -1,7 +1,7 @@
 post_install() {
   if [ "$(uname -m)" = "x86_64" ]; then
     darch="amd64"
-  elif [ "$(uname -m)" = "i386" ]; then
+  elif [ "$(uname -m)" = "i686" ]; then
     darch="i386"
   else
     darch="mips64el"
diff --git a/pcr/debootstrap/metad b/pcr/debootstrap-libre/gnewsense
index 8d14c0ed9..884ac88a0 100644
--- a/pcr/debootstrap/metad
+++ b/pcr/debootstrap-libre/gnewsense
@@ -1,13 +1,4 @@
-case $SUITE in
-    parkes|metad)
-        default_mirror http://archive.gnewsense.org/gnewsense-three/gnewsense/
-    ;;
-    deltah)
-        default_mirror http://archive.gnewsense.org/gnewsense
-    ;;
-esac
-
-
+default_mirror http://archive.gnewsense.org/gnewsense-three/gnewsense
 mirror_style release
 download_style apt
 finddebs_style from-indices
diff --git a/pcr/debootstrap/trisquel b/pcr/debootstrap-libre/trisquel
index 7efa062f9..7efa062f9 100644
--- a/pcr/debootstrap/trisquel
+++ b/pcr/debootstrap-libre/trisquel
diff --git a/pcr/debootstrap/PKGBUILD b/pcr/debootstrap/PKGBUILD
deleted file mode 100644
index e46a7d0b1..000000000
--- a/pcr/debootstrap/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: André Silva <emulatorman@lavabit.com>
-
-pkgname=debootstrap
-pkgver=1.0.48
-pkgrel=1
-pkgdesc="A tool used to create a gNewSense or Trisquel base system from scratch, without requiring the availability of dpkg or apt"
-arch=('any')
-license=('GPL')
-url="http://packages.debian.org/sid/debootstrap"
-depends=('wget')
-source=("http://ftp.debian.org/debian/pool/main/d/${pkgname}/${pkgname}_${pkgver}_all.deb"
-        'metad'
-        'trisquel')
-install="debootstrap.install"
-md5sums=('f75ae43204ed273c7a95c12a5a2f715a'
-         '4425300ca68d60fb60a6d699e153a519'
-         'b020aa8426e70a6024c8e76312c17d78')
-
-package(){
-  tar -xzf "$srcdir/data.tar.gz" -C "$pkgdir/"
-
-  # doesn't work with gpg 2.x, patch to point to gpg1v
-  sed 's/gpgv/gpg1v/g;' -i "$pkgdir/usr/sbin/debootstrap" "$pkgdir/usr/share/debootstrap/functions"
-
-  # add gNewSense script
-  install -m644  metad        "$pkgdir/usr/share/debootstrap/scripts"
-
-  # create gNewSense symlinks
-  ln -s metad "$pkgdir/usr/share/debootstrap/scripts/deltah"
-  ln -s metad "$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/dirt/PKGBUILD b/pcr/dirt/PKGBUILD
new file mode 100644
index 000000000..d269b41f8
--- /dev/null
+++ b/pcr/dirt/PKGBUILD
@@ -0,0 +1,23 @@
+# 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/drumgizmo/PKGBUILD b/pcr/drumgizmo/PKGBUILD
new file mode 100644
index 000000000..d423a6f82
--- /dev/null
+++ b/pcr/drumgizmo/PKGBUILD
@@ -0,0 +1,26 @@
+# 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
index 4a55012f6..2f2841e11 100644
--- a/pcr/drumkv1/PKGBUILD
+++ b/pcr/drumkv1/PKGBUILD
@@ -1,17 +1,16 @@
-# Maintainer: Guest One <theguestone at gmail dot com>
 
 pkgname=drumkv1
-pkgver=0.3.3
+pkgver=0.3.4
 pkgrel=1
 pkgdesc="An old-school drum-kit sampler"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 url="http://$pkgname.sourceforge.net/$pkgname-index.html"
 license=('GPL')
 groups=('lv2-plugins')
-depends=('jack' 'liblo' 'lv2' 'qt4')
+depends=('jack' 'liblo' 'lv2' 'qt4' 'shared-mime-info')
 install="$pkgname.install"
 source=("http://download.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('d7c7270fdd01552b74eead36dd638ea4')
+md5sums=('d94b9c5b21bfdbf0f57cf811273b1fcd')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/pcr/drumkv1/drumkv1.install b/pcr/drumkv1/drumkv1.install
index 029294d67..ec1a84bbb 100644
--- a/pcr/drumkv1/drumkv1.install
+++ b/pcr/drumkv1/drumkv1.install
@@ -1,5 +1,6 @@
 post_install() {
   xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+  update-mime-database usr/share/mime
   update-desktop-database -q
 }
 
diff --git a/pcr/econnman/PKGBUILD b/pcr/econnman/PKGBUILD
new file mode 100644
index 000000000..a6419abc0
--- /dev/null
+++ b/pcr/econnman/PKGBUILD
@@ -0,0 +1,31 @@
+# Maintainer: Doug Newgard <scimmia22 at outlook dot com>
+
+pkgname=econnman
+pkgver=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')
+
+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
+
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+}
+
diff --git a/~lukeshu/emacs-lucid/PKGBUILD b/pcr/emacs-lucid/PKGBUILD
index ebc49645d..f88607e0a 100644
--- a/~lukeshu/emacs-lucid/PKGBUILD
+++ b/pcr/emacs-lucid/PKGBUILD
@@ -1,29 +1,36 @@
-# $Id: PKGBUILD 169743 2012-10-27 23:41:39Z eric $
+# $Id: PKGBUILD 192474 2013-08-12 20:25:41Z eric $
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 # Maintainer (Arch): Juergen Hoetzel <juergen@archlinux.org>
-# Contributor (Arch): Renchi Raju <renchi@green.tam.uiuc.edu>
+# Contributor: Renchi Raju <renchi@green.tam.uiuc.edu>
 
 _pkgname=emacs
 pkgname=emacs-lucid
-pkgver=24.2
-pkgrel=2
-pkgdesc="The extensible, customizable, self-documenting real-time display editor (lucid tooklit instead of GTK3)"
-
-provides=("$_pkgname=$pkgver")
-conflicts=("$_pkgname")
-
+pkgver=24.3
+pkgrel=4
+pkgdesc="The extensible, customizable, self-documenting real-time display editor"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/emacs/emacs.html"
 license=('GPL3')
-depends=('librsvg' 'gpm' 'giflib' 'm17n-lib' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick')
+depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick')
 install=emacs.install
-source=(ftp://ftp.gnu.org/gnu/emacs/$_pkgname-$pkgver.tar.bz2{,.sig})
-md5sums=('1676803a50e8adc817fdaaebb9234f14' 'ca1766337f419ef827dd96d1ff78f158')
+source=(ftp://ftp.gnu.org/gnu/emacs/$_pkgname-$pkgver.tar.xz{,.sig}
+        emacs-24.3-giflib5.patch)
+md5sums=('ea9ed000ca165280265aabb55b9afbd7'
+         'SKIP'
+         '560cdf463299e059c5fadf474bcba218')
 
+pkgdesc+=", with the Lucid X11 toolkit"
+provides=("$_pkgname=$pkgver")
+conflicts=("$_pkgname")
+
+prepare() {
+  cd $_pkgname-$pkgver
+  patch -Np0 -i ../emacs-24.3-giflib5.patch
+}
 
 build() {
   cd "$srcdir"/$_pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
+  ac_cv_lib_gif_EGifPutExtensionLast=yes ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
     --localstatedir=/var --with-x-toolkit=lucid --with-xft
   make
 }
@@ -35,10 +42,10 @@ package() {
   # remove conflict with ctags package
   mv "$pkgdir"/usr/bin/{ctags,ctags.emacs}
   mv "$pkgdir"/usr/share/man/man1/{ctags.1.gz,ctags.emacs.1}
-  # fix all the 777 perms on directories
-  find "$pkgdir"/usr/share/emacs -type d -exec chmod 755 {} \;
+  # remove conflict with texinfo
+  rm "$pkgdir"/usr/share/info/info.info.gz
   # fix user/root permissions on usr/share files
-  find "$pkgdir"/usr/share/emacs -exec chown root:root {} \;
+  find "$pkgdir"/usr/share/emacs/$pkgver -exec chown root:root {} \;
   # fix perms on /var/games
   chmod 775 "$pkgdir"/var/games
   chmod 775 "$pkgdir"/var/games/emacs
diff --git a/pcr/emacs-lucid/emacs-24.3-giflib5.patch b/pcr/emacs-lucid/emacs-24.3-giflib5.patch
new file mode 100644
index 000000000..b8571abb2
--- /dev/null
+++ b/pcr/emacs-lucid/emacs-24.3-giflib5.patch
@@ -0,0 +1,26 @@
+--- 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/~lukeshu/emacs-lucid/emacs.install b/pcr/emacs-lucid/emacs.install
index d84f1de14..6712f44ba 100644
--- a/~lukeshu/emacs-lucid/emacs.install
+++ b/pcr/emacs-lucid/emacs.install
@@ -1,11 +1,11 @@
 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 eshell eudc flymake
-forms gnus idlwave info mairix-el message mh-e newsticker nxml-mode
+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 tramp url vip viper widget woman)
+speedbar srecode tramp url vip viper widget wisent woman)
 
 post_install() {
   gtk-update-icon-cache -q -t -f ${ICON_PATH}
@@ -13,7 +13,7 @@ post_install() {
 
   [[ -x usr/bin/install-info ]] || return 0
   for f in ${INFO_FILES[@]}; do
-    install-info ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null
+    install-info ${INFO_DIR}/$f.info.gz ${INFO_DIR}/dir 2> /dev/null
   done
 }
 
@@ -27,6 +27,6 @@ pre_remove() {
 
   [[ -x usr/bin/install-info ]] || return 0
   for f in ${INFO_FILES[@]}; do
-    install-info --delete ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null
+    install-info --delete ${INFO_DIR}/$f.info.gz ${INFO_DIR}/dir 2> /dev/null
   done
 }
diff --git a/pcr/etckeeper/PKGBUILD b/pcr/etckeeper/PKGBUILD
index 163c320db..09a5d4d15 100644
--- a/pcr/etckeeper/PKGBUILD
+++ b/pcr/etckeeper/PKGBUILD
@@ -1,13 +1,12 @@
-# Maintainer (Parabola): Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 # Maintainer (AUR): Buce <dmbuce@gmail.com>
 # Contributor: Danie Roux <accounts@danieroux.com>
-
-# This requires makepkg newer than 4.0.3, which at this time means from git
+# Contributor: Diogo Leal <estranho@diogoleal.com>
 
 pkgname=etckeeper
-pkgver=0.64
-pkgdesc="collection of tools to let /etc be stored in a git, hg, bzr or darcs repository."
-url="http://kitenet.net/~joey/code/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
@@ -16,28 +15,28 @@ 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=("etckeeper-$pkgver::git://git.kitenet.net/etckeeper#tag=${pkgver}"
-        etckeeper-pacman.patch
-        etckeeper-archlinux.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/etckeeper-$pkgver"
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-  # add pacman support to list-to `list-installed`
-  patch -p0 -i "$srcdir/etckeeper-pacman.patch"
+  # 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/etckeeper-archlinux.conf" build
+  make CONFFILE="${srcdir}/${pkgname}-archlinux.conf" build
 }
 
 package() {
-  cd "$srcdir/etckeeper-$pkgver"
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-  make CONFFILE="$srcdir/etckeeper-archlinux.conf" DESTDIR=$pkgdir install
+  make CONFFILE="${srcdir}/${pkgname}-archlinux.conf" DESTDIR="$pkgdir" install
 }
 
-md5sums=('SKIP'
+md5sums=('74be692fdb2d3352324e9332a270635d'
          'f1f00bf9331d1ef7f29b0ac29cdfcbda'
          '99d8d2838f49fa0f2f21c9e37948100d')
diff --git a/pcr/ffmpeg-static/PKGBUILD b/pcr/ffmpeg-static/PKGBUILD
deleted file mode 100644
index 1e5634fb6..000000000
--- a/pcr/ffmpeg-static/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id$
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Contributor: Paul Mattal <paul@archlinux.org>
-# Maintainer (Parabola): Márcio Silva    <coadde@lavabit.com>
-
-pkgname=ffmpeg-static
-pkgver=1.0
-pkgrel=2
-epoch=1
-pkgdesc='Complete and free Internet live audio and video broadcasting solution for GNU/Linux, with static library'
-arch=(i686 x86_64 mips64el)
-url=http://${pkgname%-static}.org/
-license=(GPL)
-depends=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex v4l-utils x264 xvidcore zlib)
-makedepends=(yasm libvdpau)
-provides=(${pkgname%-static})
-conflicts=(${pkgname%-static})
-source=(http://${pkgname%-static}.org/releases/${pkgname%-static}-$pkgver.tar.bz2)
-md5sums=(3ed526cea20c1bffb5a37f7730f710bd)
-
-build() {
-  cd ${pkgname%-static}-$pkgver
-
-  ./configure \
-    --prefix=/usr \
-    --enable-libmp3lame \
-    --enable-libvorbis \
-    --enable-libxvid \
-    --enable-libx264 \
-    --enable-libvpx \
-    --enable-libtheora \
-    --enable-libgsm \
-    --enable-libspeex \
-    --enable-postproc \
-    --enable-shared \
-    --enable-x11grab \
-    --enable-libopencore_amrnb \
-    --enable-libopencore_amrwb \
-    --enable-libschroedinger \
-    --enable-libopenjpeg \
-    --enable-librtmp \
-    --enable-libpulse \
-    --enable-libv4l2 \
-    --enable-gpl \
-    --enable-version3 \
-    --enable-runtime-cpudetect \
-    --disable-debug \
-    --enable-static
-  make
-  make tools/qt-faststart
-  make doc/ff{mpeg,play,server}.1
-}
-
-package() {
-  cd ${pkgname%-static}-$pkgver
-  make DESTDIR="$pkgdir" install install-man
-  install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/freetuxtv/PKGBUILD b/pcr/freetuxtv/PKGBUILD
new file mode 100644
index 000000000..be9eb6759
--- /dev/null
+++ b/pcr/freetuxtv/PKGBUILD
@@ -0,0 +1,24 @@
+# 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/ganglia/PKGBUILD b/pcr/ganglia/PKGBUILD
index 3a2e54dd8..efa005071 100644
--- a/pcr/ganglia/PKGBUILD
+++ b/pcr/ganglia/PKGBUILD
@@ -1,9 +1,9 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
 
 pkgname=ganglia
 pkgver=3.6.0
-pkgrel=1
-pkgdesc='Scalable distributed monitoring system for high-performance computing systems such as clusters and Grids'
+pkgrel=4
+pkgdesc='Scalable distributed monitoring system for high-performance computing systems such as clusters and Grids.'
 arch=(
   i686
   x86_64
@@ -18,41 +18,35 @@ depends=(
   python2
   rrdtool
 )
+install=$pkgname.install
 options=(!libtool)
 optdepends="$pkgname-web: Web frontend"
 backup=(
-  etc/gmond.conf
-  etc/gmetad.conf
+  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
 )
-source=http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
-sha512sums=2a05d37787f1440c0c4aa91cdf0f4f4cb39c840b3b0fdcd6fe58cfb5892a75f81d36f6191c83c17558c37154298268df74fa255d2c940a8b84a7bf3ddb102394
 
 prepare() {
   cd $srcdir/$pkgname-$pkgver
+
   #sed -i 's|sapi/embed/php_embed.h|php/sapi/embed/php_embed.h|' configure
-  touch gm{on,eta}d/gm{on,eta}d.service.in
 
-  echo '[Unit]'                                        >  gmetad/gmetad.service.in
-  echo 'Description=Ganglia Meta Daemon'               >> gmetad/gmetad.service.in
-  echo 'After=network.target'                          >> gmetad/gmetad.service.in
-  echo ''                                              >> gmetad/gmetad.service.in
-  echo '[Service]'                                     >> gmetad/gmetad.service.in
-  echo 'Type=forking'                                  >> gmetad/gmetad.service.in
-  echo 'PIDFile=/run/gmetad.pid'                       >> gmetad/gmetad.service.in
-  echo 'ExecStart=/usr/sbin/gmetad -p /run/gmetad.pid' >> gmetad/gmetad.service.in
-  echo ''                                              >> gmetad/gmetad.service.in
-  echo '[Install]'                                     >> gmetad/gmetad.service.in
-  echo 'WantedBy=multi-user.target'                    >> gmetad/gmetad.service.in
+  sed -i 's|nobody|ganglia|' gmetad/gmetad.conf.in
 
-  echo '[Unit]'                                         >  gmond/gmond.service.in
-  echo 'Description=Ganglia Monitor Daemon'             >> gmond/gmond.service.in
-  echo 'After=network.target'                           >> gmond/gmond.service.in
-  echo ''                                               >> gmond/gmond.service.in
-  echo '[Service]'                                      >> gmond/gmond.service.in
-  echo 'ExecStart=/usr/sbin/gmond -f -p /run/gmond.pid' >> gmond/gmond.service.in
-  echo ''                                               >> gmond/gmond.service.in
-  echo '[Install]'                                      >> gmond/gmond.service.in
-  echo 'WantedBy=multi-user.target'                     >> gmond/gmond.service.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() {
@@ -60,13 +54,16 @@ build() {
   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\
-    --sysconfdir=/etc
+    --sbindir=/usr/bin\
+    --sysconfdir=/etc/ganglia
 #    --enable-php\
+#    --enable-setgid=ganglia\
   setarch $CARCH make
 }
 
@@ -77,5 +74,5 @@ package() {
   mkdir $pkgdir/usr/lib/$pkgname/python_modules
 
   msg2 'Generating default gmond.conf'
-  ./gmond/gmond --default_config > $pkgdir/etc/gmond.conf
+  ./gmond/gmond --default_config > $pkgdir/etc/ganglia/gmond.conf
 }
diff --git a/pcr/ganglia/ganglia.install b/pcr/ganglia/ganglia.install
new file mode 100644
index 000000000..6a196af1f
--- /dev/null
+++ b/pcr/ganglia/ganglia.install
@@ -0,0 +1,24 @@
+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
new file mode 100644
index 000000000..a721c2b4c
--- /dev/null
+++ b/pcr/ganglia/gmetad.service.in
@@ -0,0 +1,11 @@
+[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
new file mode 100644
index 000000000..5cbd31629
--- /dev/null
+++ b/pcr/ganglia/gmond.service.in
@@ -0,0 +1,9 @@
+[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-lts/PKGBUILD b/pcr/gcc-lts/PKGBUILD
new file mode 100644
index 000000000..b1280fad9
--- /dev/null
+++ b/pcr/gcc-lts/PKGBUILD
@@ -0,0 +1,299 @@
+# $Id: PKGBUILD 186915 2013-05-31 23:25:14Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+
+# 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=3
+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/~brendan/guile/guile.install b/pcr/gcc-lts/gcc-ada.install
index ed113ab8f..df0553a4f 100644
--- a/~brendan/guile/guile.install
+++ b/pcr/gcc-lts/gcc-ada.install
@@ -1,11 +1,10 @@
 infodir=usr/share/info
-filelist=(guile.info
-          r5rs.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 $infodir/dir 2> /dev/null
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
   done
 }
 
@@ -16,8 +15,6 @@ post_upgrade() {
 pre_remove() {
   [ -x usr/bin/install-info ] || return 0
   for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
   done
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/gcc-lts/gcc-fortran.install b/pcr/gcc-lts/gcc-fortran.install
new file mode 100644
index 000000000..b15d89a97
--- /dev/null
+++ b/pcr/gcc-lts/gcc-fortran.install
@@ -0,0 +1,16 @@
+infodir=usr/share/info
+file="gfortran.info"
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+}
diff --git a/pcr/gcc-lts/gcc-go.install b/pcr/gcc-lts/gcc-go.install
new file mode 100644
index 000000000..7dc50dee5
--- /dev/null
+++ b/pcr/gcc-lts/gcc-go.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(gccgo.info)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/pcr/gcc-lts/gcc-libs.install b/pcr/gcc-lts/gcc-libs.install
new file mode 100644
index 000000000..23553b8f0
--- /dev/null
+++ b/pcr/gcc-lts/gcc-libs.install
@@ -0,0 +1,16 @@
+infodir=usr/share/info
+filelist=(libgomp.info libquadmath.info)
+
+post_upgrade() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/pcr/gcc-lts/gcc.install b/pcr/gcc-lts/gcc.install
new file mode 100644
index 000000000..3407a5e1f
--- /dev/null
+++ b/pcr/gcc-lts/gcc.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.info)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/pcr/gimp-art/PKGBUILD b/pcr/gimp-art/PKGBUILD
index 11c3b191b..cd38b329d 100644
--- a/pcr/gimp-art/PKGBUILD
+++ b/pcr/gimp-art/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
 
 pkgname=gimp-art
 pkgver=2.8.2
diff --git a/pcr/gimp-art/gimp-splash-artwork.license b/pcr/gimp-art/gimp-splash-artwork.license
index 64267a6c0..0f060c013 100644
--- a/pcr/gimp-art/gimp-splash-artwork.license
+++ b/pcr/gimp-art/gimp-splash-artwork.license
@@ -1,7 +1,7 @@
 GIMP LIBRE SPLASH LICENSE
 
-Logo and Effects is created by Zé Lara <ze.lara@adinet.com.uy> and Márcio Silva <coadde@adinet.com.uy>
-Idea by André Silva <andre.paulista@adinet.com.uy>
+Logo and Effects is created by Zé Lara <ze.miguel.lara@gmail.com> and Márcio Silva <coadde@lavabit.com>
+Idea by André Silva <emulatorman@lavabit.com>
 
 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,
@@ -10,4 +10,4 @@ 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
\ No newline at end of file
+https://upload.wikimedia.org/wikipedia/commons/8/8b/Sangeno.jpg
diff --git a/pcr/gitflow/PKGBUILD b/pcr/gitflow/PKGBUILD
new file mode 100644
index 000000000..b62042262
--- /dev/null
+++ b/pcr/gitflow/PKGBUILD
@@ -0,0 +1,34 @@
+# 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/gnuhealth/PKGBUILD b/pcr/gnuhealth/PKGBUILD
index 695062e5b..3eaee88d0 100644
--- a/pcr/gnuhealth/PKGBUILD
+++ b/pcr/gnuhealth/PKGBUILD
@@ -1,13 +1,13 @@
-# Maintainer: SpepS <dreamspepser at yahoo dot it>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer: André Silva <emulatorman@lavabit.com>
+# Contributor: SpepS <dreamspepser at yahoo dot it>
 
 pkgname=gnuhealth
-pkgver=1.8.1
-pkgrel=3
+pkgver=2.0.0
+pkgrel=1
 pkgdesc="A free Health and Hospital Information System"
-arch=(any)
-url="http://health.gnu.org/"
-license=('GPL3')
+arch=any
+url=http://health.gnu.org/
+license=GPL3
 depends=(
           postgresql
           pygtk
@@ -26,33 +26,48 @@ depends=(
           trytond-country
           trytond-stock-lot
 )
-source=("http://ftp.gnu.org/gnu/health/$pkgname-$pkgver.tar.gz")
-md5sums=('d3837242011df1d39ce7a0f1d6e6a46a')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # python2 fixes
-  export PYTHON=python2
-
-  # mv man file
-  mv health/man .
-
-  ./configure --prefix=/usr
-}
+source=http://ftp.gnu.org/gnu/health/$pkgname-$pkgver.tar.gz
+sha512sums=5d528fe4a20a2b237f32d023f44e898a012f47f9ba83611f71fba386990bf98dbbdb1fb9c5b78dd5a3b65c6fe9b2fe4e7e472fec90cab009e5b8e31b1f31ceeb
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make MANTARGET="$pkgdir/usr/share/man/man1" \
-       DESTDIR="$pkgdir/" install
+  MODULES=(
+           health 
+           health_calendar 
+           health_genetics
+           health_gyneco
+           health_history 
+           health_icd10
+           health_icd10pcs
+           health_icu
+           health_inpatient
+           health_inpatient_calendar
+           health_lab
+           health_lifestyle
+           health_mdg6
+           health_ntd
+           health_ntd_chagas
+           health_nursing
+           health_pediatrics
+           health_profile
+           health_qrcodes
+           health_reporting
+           health_services
+           health_socioeconomics
+           health_stock
+           health_surgery
+           health_who_essential_medicines
+  )
 
-  # man
-  install -Dm644 man/$pkgname.1 \
-    "$pkgdir/usr/share/man/man1/$pkgname.1"
+  # build gnuhealth modules
+    for module in ${MODULES[@]}
+    do
+      cd $srcdir/$pkgname-$pkgver/$module
+      python2 setup.py install --root=$pkgdir
+    done
 
-  # python2 fix
-  sed -i 's/env python/&2/' \
-    `grep -rl 'env python' "$pkgdir"`
-}
+  # put gnuhealth manual to man folder
+    cd "$srcdir/$pkgname-$pkgver"
 
-# vim:set ts=2 sw=2 et:
+    install -Dm644 health/man/$pkgname.1 \
+      $pkgdir/usr/share/man/man1/$pkgname.1
+}
diff --git a/pcr/heartbeat/PKGBUILD b/pcr/heartbeat/PKGBUILD
deleted file mode 100644
index f9ee9254b..000000000
--- a/pcr/heartbeat/PKGBUILD
+++ /dev/null
@@ -1,202 +0,0 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-
-pkgname=heartbeat
-pkgver=3.0.5
-_pkgver=${pkgver::1}_${pkgver:2:1}
-pkgrel=10
-pkgdesc='Daemon that provides cluster infrastructure services to its clients (Linux-HA)'
-arch=(
-  i686
-  x86_64
-  mips64el
-)
-group=linux-ha
-url=http://$group.org/wiki/${pkgname^}
-license=(
-  GPL2
-  lGPL2.1
-)
-depends=(
-  gnutls
-  cluster-glue
-)
-optdepends=net-tools
-makedepends=(
-  docbook-xsl
-  libxslt
-  lynx
-  net-tools
-  openssh
-  swig
-  valgrind
-  w3m
-)
-options=(!libtool)
-provides=(ha-$pkgname)
-conflicts=ha-$pkgname
-replaces=ha-$pkgname
-source=http://hg.$group.org/$pkgname-STABLE_$_pkgver/archive/STABLE-$pkgver.tar.bz2
-sha512sums=e38083b87c56a72eb8925ac42adeabb92618608e92218a63960ec0d0bca264f92a8e9c3ebfb0589cc4538da1a82b268b5cc9ee5a51ed33057c969e694e16b27d
-
-prepare() {
-  cd $srcdir/${pkgname^}-3-0-STABLE-$pkgver
-
-  mv configure.{in,ac}
-
-  sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|;
-          s|AM_INIT_AUTOMAKE(heartbeat, $HAPKGVERSION)|AM_INIT_AUTOMAKE|;
-         ' configure.ac
-  sed -i "s|AC_INIT(GNUmakefile)|AC_INIT(heartbeat, $pkgver)|;
-         " configure.ac
-
-  sed -i 's|INCLUDES|AM_CPPFLAGS|;
-         ' $(grep -rl INCLUDES | grep Makefile.am)
-
-  # fixing path
-  sed -i 's|bin/sh|usr/bin/bash|;
-         ' $(grep -rl bin/sh)
-  sed -i 's| /bin| /usr/bin|;
-         ' $(grep -rl ' /bin')
-  sed -i 's| /sbin| /usr/bin|;
-         ' $(grep -rl ' /sbin')
-  sed -i 's|usr/sbin|usr/bin|;
-         ' $(grep -rl usr/sbin)
-  #sed -i 's|/lib64|/lib|;
-  #       ' $(grep -rl /lib64)
-  #sed -i 's|usr/libexec|usr/lib|;
-  #       ' $(grep -rl usr/libexec)
-  sed -i 's|var/lock|run/lock|;
-         ' $(grep -rl var/lock)
-  sed -i 's|var/run|run|;
-         ' $(grep -rl var/run)
-
-  # remove Open Source term
-  sed -i 's|Open Source / ||;
-          s|open source / ||;
-          s|Open Source|Free Software|;
-          s|open source|free software|;
-          s|Free Software Development Lab|Open Source Development Lab|;
-         ' $(grep -ril 'open source')
-  #sed -i 's|OpenSource / ||;
-  #        s|opensource / ||;
-  #        s|OpenSource|FreeSoftware|;
-  #        s|opensource|freesoftware|;
-  #        s|freesoftware.org|opensource.org|;
-  #        s|http://www.opensource.org/|http://www.gnu.org/philosophy/free-sw.html|;
-  #        s|http://www.gnu.org/philosophy/free-sw.htmllicenses/osl-|http://opensource.org/licenses/osl-|;
-  #        s|http://www.gnu.org/philosophy/free-sw.htmlosd|http://opensource.org/osd|;
-  #       ' $(grep -ril opensource)
-
-  # remove Linux term
-  sed -i 's|Linux,|GNU/Linux,|;
-          s|Linux and|GNU/Linux and|;
-          s|Linux distro|GNU/Linux distro|;
-          s|Linux distribution|GNU/Linux distribution|;
-          s|Linux machine|GNU/Linux machine|;
-          s|Linux Only|GNU/Linux Only|;
-          s|Linux only|GNU/Linux only|;
-          s|Linux operating|GNU/Linux operating|;
-          s|Linux OS|GNU/Linux OS|;
-          s|Linux platform|GNU/Linux platform|;
-          s|Linux software|GNU/Linux software|;
-          s|Linux specific|GNU/Linux specific|;
-          s|Linux system|GNU/Linux system|;
-          s|Linux will|GNU/Linux will|;
-          s|# Linux$|# GNU/Linux|;
-          s|# Linux.$|# GNU/Linux.|;
-          s|* Linux$|* GNU/Linux|;
-          s|* Linux.$|* GNU/Linux.|;
-          s|// Linux$|// GNU/Linux|;
-          s|// Linux.$|// GNU/Linux.|;
-          s|, Linux|, GNU/Linux|;
-          s|As Linux|As GNU/Linux|;
-          s|as Linux|as GNU/Linux|;
-          s|And Linux|And GNU/Linux|;
-          s|and Linux|and GNU/Linux|;
-          s|Be Linux|Be GNU/Linux|;
-          s|be Linux|be GNU/Linux|;
-          s|Because Linux|Because GNU/Linux|;
-          s|because Linux|because GNU/Linux|;
-          s|e.g. Linux|e.g. GNU/Linux|;
-          s|For Linux|For GNU/Linux|;
-          s|for Linux|for GNU/Linux|;
-          s|In Linux|In GNU/Linux|;
-          s|in Linux|in GNU/Linux|;
-          s|Like Linux|Like GNU/Linux|;
-          s|like Linux|like GNU/Linux|;
-          s|non-Linux|non GNU/Linux|;
-          s|Of Linux|Of GNU/Linux|;
-          s|of Linux|of GNU/Linux|;
-          s|On Linux|On GNU/Linux|;
-          s|on Linux|on GNU/Linux|;
-          s|OS type: Linux|OS type: GNU/Linux|;
-          s|Other Linux|Other GNU/Linux|;
-          s|other Linux|other GNU/Linux|;
-          s|The Linux|The GNU/Linux|;
-          s|the Linux|the GNU/Linux|;
-          s|Typically Linux|Typically GNU/Linux|;
-          s|typically Linux|typically GNU/Linux|;
-          s|To Linux|To GNU/Linux|;
-          s|to Linux|to GNU/Linux|;
-          s|Under Linux|Under GNU/Linux|;
-          s|under Linux|under GNU/Linux|;
-          /Linux: "mail" offers "-s"./ s|Linux|GNU/Linux|;
-          s|ArchGNU/Linux|ArchLinux|;
-          s|e2fsprogs, typically GNU/Linux|e2fsprogs, typically Linux|;
-          s|GNU/GNU|GNU|;
-          s|GNU/Linux device|Linux device|;
-          s|GNU/Linux Director Daemon|Linux Director Daemon|;
-          s|GNU/Linux is a registered trademark of Linus Torvalds|Linux is a registered trademark of Linus Torvalds|;
-          s|GNU/Linux kernel|Linux kernel|;
-          s|GNU/Linux specific kernel|Linux specific kernel|;
-          s|GNU/Linux Standard Base|Linux Standard Base|;
-          s|GNU/Linux sysfs|Linux sysfs|;
-          s|GNU/Linux Virtual Server|Linux Virtual Server|;
-          s|GNU/Linux Watchdog|Linux Watchdog|;
-          s|GNU/Linux watchdog|Linux watchdog|;
-          s|GNU/LinuxHA|LinuxHA|;
-          s|GNU/Linux-HA|Linux-HA|;
-          s|GNU/LinuxSCSI|LinuxSCSI|;
-          s|HA GNU/Linux|HA Linux|;
-          s|High-Availability GNU/Linux|High-Availability Linux|;
-          s|MkGNU/Linux|MkLinux|;
-          s|SEGNU/Linux|SELinux|;
-          s|VA GNU/Linux Cluster|VA Linux Cluster|;
-          s|ConfigureLinux|ConfigureGNULinux|;
-         ' $(grep -rl Linux)
-}
-
-build() {
-  cd $srcdir/${pkgname^}-3-0-STABLE-$pkgver
-  setarch $CARCH ./bootstrap
-  setarch $CARCH ./configure --prefix=/usr\
-    --disable-fatal-warnings\
-    --disable-static\
-    --enable-valgrind\
-    --libdir=/usr/lib\
-    --localstatedir=/var\
-    --sysconfdir=/etc
-  setarch $CARCH make
-}
-
-package() {
-  cd $srcdir/${pkgname^}-3-0-STABLE-$pkgver
-  setarch $CARCH make DESTDIR=$pkgdir install
-
-  mv $pkgdir/{var/,}run
-  rm $pkgdir/etc/{ha.d/,}rc.d/* && rmdir $pkgdir/etc/{ha.d/,}rc.d
-
-  install -d $pkgdir/usr/lib/systemd/system
-  echo '[Unit]'                                                 >  $pkgdir/usr/lib/systemd/system/$pkgname.service
-  echo 'Description=Startup script high-availability services'  >> $pkgdir/usr/lib/systemd/system/$pkgname.service
-  echo 'Requires=network.target remote-fs.target timers.target' >> $pkgdir/usr/lib/systemd/system/$pkgname.service
-  echo ''                                                       >> $pkgdir/usr/lib/systemd/system/$pkgname.service
-  echo '[Service]'                                              >> $pkgdir/usr/lib/systemd/system/$pkgname.service
-  echo 'Type=forking'                                           >> $pkgdir/usr/lib/systemd/system/$pkgname.service
-  echo 'ExecStart=/usr/lib/heartbeat/heartbeat'                 >> $pkgdir/usr/lib/systemd/system/$pkgname.service
-  echo ''                                                       >> $pkgdir/usr/lib/systemd/system/$pkgname.service
-  echo '[Install]'                                              >> $pkgdir/usr/lib/systemd/system/$pkgname.service
-  echo 'WantedBy=multi-user.target'                             >> $pkgdir/usr/lib/systemd/system/$pkgname.service
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/hiawatha/PKGBUILD b/pcr/hiawatha/PKGBUILD
new file mode 100644
index 000000000..1ea4d6435
--- /dev/null
+++ b/pcr/hiawatha/PKGBUILD
@@ -0,0 +1,117 @@
+# 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
new file mode 100644
index 000000000..efc35f9ff
--- /dev/null
+++ b/pcr/hiawatha/cdcatalog.xml
@@ -0,0 +1,212 @@
+<?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
new file mode 100644
index 000000000..db9cc35bc
--- /dev/null
+++ b/pcr/hiawatha/cdcatalog.xslt
@@ -0,0 +1,24 @@
+<?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
new file mode 100644
index 000000000..1c1d62450
--- /dev/null
+++ b/pcr/hiawatha/hiawatha.conf.sample
@@ -0,0 +1,114 @@
+# 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
new file mode 100644
index 000000000..0ea96ec65
--- /dev/null
+++ b/pcr/hiawatha/hiawatha.install
@@ -0,0 +1,37 @@
+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
new file mode 100644
index 000000000..f7daeb8c7
--- /dev/null
+++ b/pcr/hiawatha/hiawatha.service
@@ -0,0 +1,16 @@
+[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/hiredis/ChangeLog b/pcr/hiredis/ChangeLog
new file mode 100644
index 000000000..fbe55643a
--- /dev/null
+++ b/pcr/hiredis/ChangeLog
@@ -0,0 +1,4 @@
+2013-06-07 Vladimir Tsanev <tsachev@gamil.com>
+    
+    * 0.11.0-1 :
+    Initial PKGBUILD.
diff --git a/pcr/hiredis/PKGBUILD b/pcr/hiredis/PKGBUILD
new file mode 100644
index 000000000..29762e87e
--- /dev/null
+++ b/pcr/hiredis/PKGBUILD
@@ -0,0 +1,33 @@
+# 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/idjc/PKGBUILD b/pcr/idjc/PKGBUILD
index 0de01f4e3..6834d64a6 100644
--- a/pcr/idjc/PKGBUILD
+++ b/pcr/idjc/PKGBUILD
@@ -1,35 +1,41 @@
+# Maintainer: M0Rf30
 # Contributor: Tobias Luther <tobias [at] tonstrom [dot] de>
 # Contributor: GraveDigger
 # Contributor: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=idjc
-pkgver=0.8.8
-pkgrel=1
+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=('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')
+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")
-md5sums=('a14ce4cc8c789fce55c7b98081743a4a')
 
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
 
-    ./configure --prefix=/usr PYTHON="/usr/bin/python2" --disable-libav
-
-    make PYTHON="/usr/bin/python2"
-
+    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}" PYTHON="/usr/bin/python2" install
+    make DESTDIR="${pkgdir}" install
 
     sed -i 's|#! /usr/bin/python22.7|#! /usr/bin/python2|' ${pkgdir}/usr/bin/idjc
 }
+
+md5sums=('99abfe98f13170ab6b1ed17a8f1632e1')
diff --git a/pcr/imagemagick-srv/PKGBUILD b/pcr/imagemagick-srv/PKGBUILD
new file mode 100644
index 000000000..9dc9c4cb2
--- /dev/null
+++ b/pcr/imagemagick-srv/PKGBUILD
@@ -0,0 +1,80 @@
+# $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
new file mode 100644
index 000000000..a5b1a82e2
--- /dev/null
+++ b/pcr/imagemagick-srv/perlmagick.rpath.patch
@@ -0,0 +1,11 @@
+--- 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/jalv/PKGBUILD b/pcr/jalv/PKGBUILD
deleted file mode 100644
index 6100c5902..000000000
--- a/pcr/jalv/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Maintainer: Guest One <theguestone at gmail dot com>
-
-pkgname=jalv
-pkgver=1.4.0
-pkgrel=1
-pkgdesc="Run an LV2 plugin as a JACK application"
-arch=('i686')
-url="http://drobilla.net/software/$pkgname/"
-license=('custom:ISC')
-depends=('lilv' 'suil')
-makedepends=('python2' 'qt4' 'gtk2' 'gtk3' 'gtkmm')
-optdepends=('qt4: Qt 4.x frontend'
-            'gtk2: Gtk+ 2.x frontend'
-            'gtk3: Gtk+ 3.x frontend'
-            'gtkmm: Gtk++ 2.x frontend')
-source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2")
-md5sums=('23297b15cb541e0b3c5c05a2fdd9bcca')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  python2 waf configure --prefix=/usr
-  python2 waf
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  python2 waf install --destdir="$pkgdir"
-
-  # license
-  install -Dm644 COPYING \
-    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
diff --git a/pcr/kamailio/PKGBUILD b/pcr/kamailio/PKGBUILD
new file mode 100644
index 000000000..3e040a495
--- /dev/null
+++ b/pcr/kamailio/PKGBUILD
@@ -0,0 +1,36 @@
+# 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/kervalasquish-hg/PKGBUILD b/pcr/kervalasquish-hg/PKGBUILD
deleted file mode 100644
index e5e489950..000000000
--- a/pcr/kervalasquish-hg/PKGBUILD
+++ /dev/null
@@ -1,72 +0,0 @@
-# Maintainer: Jorge Araya <jorgean@lavabit.com>
-
-pkgname=kervalasquish-hg
-pkgver=220
-pkgrel=2
-pkgdesc="Free Software DXT compression library, kervala's version"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/libsquish/"
-license=('MIT')
-makedepends=('mercurial' 'gcc-libs' 'cmake')
-provides=('libsquish')
-conflicts=('libsquish'
-           'kervala_libsquish-hg'
-           'kervalasquish-hg')
-
-_hgroot="http://hg.kervala.net"
-_hgrepo="packaging"
-cmakerepo="cmake"
-
-build() {
-  cd "$srcdir"
-  msg "Connecting to Kervala's Mercurial server for libsquish..."
-
-  if [[ -d "$_hgrepo" ]]; then
-    cd "$_hgrepo"
-    hg pull -u
-    msg "The local files are updated."
-  else
-    hg clone "${_hgroot}/${_hgrepo}"
-  fi
-
-  msg "Connecting to Kervala's Mercurial server for cmake modules..."
-
-  if [[ -d $srcdir/$cmakerepo ]]; then
-     cd $srcdir/$cmakerepo
-     hg pull -u
-     msg "The local files are updated."
-  else
-     cd $srcdir
-     hg clone ${_hgroot}/${cmakerepo}
-  fi
-
-  msg "Mercurial checkout done or server timeout"
-  msg "Starting build..."
-
-  if [[ -d $_hgrepo-build ]]; then
-     rm -rf "$srcdir/$_hgrepo-build"
-  fi
-
-  cp -r "$srcdir/$_hgrepo/squish" "$srcdir/$_hgrepo-build"
-
-  if [[ ! -d $_hgrepo-build/CMakeModules ]]; then
-     mkdir "$srcdir/$_hgrepo-build/CMakeModules"
-     cp $srcdir/cmake/modules/common.cmake $srcdir/$_hgrepo-build/CMakeModules/
-  fi
-
-  if [[ -d $srcdir/$_hgrepo-build/build ]]; then
-     rm -rf $srcdir/$_hgrepo-build/build
-  fi
-
-  mkdir "$srcdir/$_hgrepo-build/build"
-  cd "$srcdir/$_hgrepo-build/build"
-  cmake -DCMAKE_INSTALL_PREFIX=/usr ..
-  make
-}
-
-package() {
-  cd "$srcdir/$_hgrepo-build/build"
-  make DESTDIR="${pkgdir}" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/kompozer/PKGBUILD b/pcr/kompozer/PKGBUILD
index 7b556e166..a65fb3e3b 100644
--- a/pcr/kompozer/PKGBUILD
+++ b/pcr/kompozer/PKGBUILD
@@ -1,59 +1,69 @@
-# Contributor: peace4all <markspost at rocketmail dot com>
+# 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=10
+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')
-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')
+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'
+         '4778f967307cf569089daca843de1df9'
          '4852034f99e7943071946e7eedc6c2f5'
          'd5ba90f7fbaed76f77a6d9717e86f3a5'
          'ad3ec5cbc6677dd712b140148398f58f'
-	 '75b0e1cad65dbeb8feedac5d4f52be32'
+         '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
+  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/obj-kompozer"
+  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"
 
-  make DESTDIR=$pkgdir install
-  install -m755 -dD "$pkgdir/usr/share/applications/"
-  install -m644  "$srcdir/kompozer.desktop" "$pkgdir/usr/share/applications/"
+  install -m755 -dD "${pkgdir}/usr/share/applications/"
+  install -m644  "${srcdir}/kompozer.desktop" "${pkgdir}/usr/share/applications/"
 
-  mkdir -p "$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"
+  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/lcmc/PKGBUILD b/pcr/lcmc/PKGBUILD
index 538949f60..6b27ff5f4 100644
--- a/pcr/lcmc/PKGBUILD
+++ b/pcr/lcmc/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
 
 pkgname=lcmc
 pkgver=1.5.1
diff --git a/pcr/libav-builder/PKGBUILD b/pcr/libav-builder/PKGBUILD
deleted file mode 100644
index 5f7168f86..000000000
--- a/pcr/libav-builder/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-static=false
-pkgbase=libav
-if [[ $static == true ]] || [[ $static == 1 ]] || [[ $static == enable ]]; then
-  pkgname=libav-static-builder
-elif [[ $static == false ]] || [[ $static == 0 ]] || [[ $static == disable ]]; then
-  pkgname=libav-builder
-fi
-pkgflag=builder
-pkgver=9.3
-pkgrel=1
-pkgdesc="Link files on /usr/include and /usr/lib dir (ONLY FOR BUILD OTHERS PACKAGES)"
-arch=any
-url="http://$pkgbase.org/"
-license=GPL
-depends=${pkgname%-$pkgflag}=$pkgver
-conflicts=(
-  ffmpeg
-  ffmpeg-static
-)
-if [[ $static == true ]] || [[ $static == 1 ]] || [[ $static == enable ]]; then
-  conflicts+=(
-    ${pkgname%-static-$pkgflag}
-  )
-elif [[ $static == false ]] || [[ $static == 0 ]] || [[ $static == disable ]]; then
-  conflicts+=(
-    ${pkgname%-$pkgflag}-static
-  )
-fi
-
-package() {
-  install -m755 -d $pkgdir/usr/{include,lib{,/pkgconfig}}
-  include_list=$(ls /opt/${pkgname%-$pkgflag}/include)
-  for i in $include_list; do
-    ln -s /opt/${pkgname%-$pkgflag}/include/$i $pkgdir/usr/include
-  done
-  lib_list=$(ls /opt/${pkgname%-$pkgflag}/lib | grep lib)
-  for l in $lib_list; do
-    ln -s /opt/${pkgname%-$pkgflag}/lib/$l $pkgdir/usr/lib
-  done
-  pkgconfig_list=$(ls /opt/${pkgname%-$pkgflag}/lib/pkgconfig)
-  for c in $pkgconfig_list; do
-    ln -s /opt/${pkgname%-$pkgflag}/lib/pkgconfig/$c $pkgdir/usr/lib/pkgconfig
-  done
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/libav/PKGBUILD b/pcr/libav/PKGBUILD
index 05dd756c0..c0fb9e062 100644
--- a/pcr/libav/PKGBUILD
+++ b/pcr/libav/PKGBUILD
@@ -1,30 +1,16 @@
-# $Id$
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Contributor: Paul Mattal <paul@archlinux.org>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
 
-static=false
-pkgbase=libav
-if [[ $static == true ]] || [[ $static == 1 ]] || [[ $static == enable ]]; then
-  pkgname=libav-static
-  pkgflag=-static
-  staticdesc=', with static library'
-elif [[ $static == false ]] || [[ $static == 0 ]] || [[ $static == disable ]]; then
-  pkgname=libav
-fi
-pkgver=9.3
-pkgrel=1
-pkgdesc="Complete and free Internet live audio and video broadcasting solution for GNU/Linux$staticdesc"
+pkgname=libav
+pkgver=9.8
+pkgrel=3
+pkgdesc="Complete and free Internet live audio and video broadcasting solution for GNU/Linux"
 arch=(
-  i686
-  x86_64
   mips64el
+  x86_64
+  i686
 )
-url="http://$pkgbase.org/"
-license=(
-  GPL
-)
+url=http://$pkgname.org/
+license=GPL3
 depends=(
   alsa-lib
   bzip2
@@ -37,7 +23,8 @@ depends=(
   libvorbis
   libvpx
   opencore-amr
-  openjpeg
+  #openjpeg
+  opus
   rtmpdump
   schroedinger
   sdl
@@ -50,30 +37,42 @@ makedepends=(
   yasm
   libvdpau
 )
-source=(
-  http://$pkgbase.org/releases/$pkgbase-$pkgver.tar.gz
-)
-sha512sums=(
-  de3aaa571fed67d22ec2a0c53599af56684afa38445cf67fd09d26c23eeded5a184d045f472d414815d17783b421f937fd3d9565637e20f2050aaaf0081164fe
-)
+source=http://$pkgname.org/releases/$pkgname-$pkgver.tar.gz
+sha512sums=ef7c164fb29d365a236ead927e6355ca9191203dce86f0d0d8251f275ed5be4ab5e3f56a0c51384d7b9e83c3c3ef7ebdee95c9a7ac7b6520eaf25973a2bd20ae
 
 build() {
-  cd $pkgbase-$pkgver
-
-  [[ $static == false ]] && sttcv=disable || sttcv=enable
-
+  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
+  [[ $_static == false ]] && _stf='--disable-static'
   ./configure\
-    --prefix=/opt/$pkgname\
+    $_asm $_stf\
+    --prefix=/usr\
+    --bindir=/opt/$pkgname/bin\
+    --incdir=/opt/$pkgname/include\
+    --libdir=/opt/$pkgname/lib\
+    --shlibdir=/opt/$pkgname/lib\
+    --disable-avserver\
     --disable-debug\
-    --$sttcv-static\
     --enable-avresample\
+    --enable-dxva2\
     --enable-gpl\
     --enable-libfreetype\
     --enable-libgsm\
     --enable-libmp3lame\
     --enable-libopencore_amrnb\
     --enable-libopencore_amrwb\
-    --enable-libopenjpeg\
+    --disable-libopenjpeg\
+    --enable-libopus\
     --enable-libpulse\
     --enable-librtmp\
     --enable-libschroedinger\
@@ -83,31 +82,27 @@ build() {
     --enable-libvpx\
     --enable-libx264\
     --enable-libxvid\
+    --enable-pic\
     --enable-runtime-cpudetect\
     --enable-shared\
+    --enable-vdpau\
     --enable-version3\
     --enable-x11grab
-
-  setarch $CARCH make
-  setarch $CARCH make tools/qt-faststart
-  setarch $CARCH make doc/av{conv,play,server}.1
+  make
+  make tools/qt-faststart
+  make doc/av{conv,play}.1 # doc/avserver.1
 }
 
 package() {
-  cd $pkgbase-$pkgver
-  setarch $CARCH make DESTDIR=$pkgdir install install-man
-  install -m755 -d                              $pkgdir/etc/ld.so.conf.d
-  install -m755 -d                              $pkgdir/usr/bin
-  install -m755 -d                              $pkgdir/usr/share/man/man1
-  install -Dm755 tools/qt-faststart             $pkgdir/opt/$pkgname/bin
-  ln -s /opt/$pkgname/bin/avconv                $pkgdir/usr/bin/avconv$pkgflag
-  ln -s /opt/$pkgname/bin/avplay                $pkgdir/usr/bin/avplay$pkgflag
-  ln -s /opt/$pkgname/bin/avprobe               $pkgdir/usr/bin/avprobe$pkgflag
-  ln -s /opt/$pkgname/bin/qt-faststart          $pkgdir/usr/bin/qt-faststart-$pkgname
-  ln -s /opt/$pkgname/share/man/man1/avconv.1   $pkgdir/usr/share/man/man1/avconv$pkgflag.1
-  ln -s /opt/$pkgname/share/man/man1/avplay.1   $pkgdir/usr/share/man/man1/avplay$pkgflag.1
-  ln -s /opt/$pkgname/share/man/man1/avprobe.1  $pkgdir/usr/share/man/man1/avprobe$pkgflag.1
-  echo /opt/libav$pkgflag/lib                 > $pkgdir/etc/ld.so.conf.d/libav$pkgflag.conf
+  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/libcgroup/PKGBUILD b/pcr/libcgroup/PKGBUILD
new file mode 100644
index 000000000..849a5c128
--- /dev/null
+++ b/pcr/libcgroup/PKGBUILD
@@ -0,0 +1,57 @@
+# 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
new file mode 100644
index 000000000..3e6689d77
--- /dev/null
+++ b/pcr/libcgroup/cgconfig.service
@@ -0,0 +1,17 @@
+[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
new file mode 100644
index 000000000..cd0bf34fb
--- /dev/null
+++ b/pcr/libcgroup/cgrules.service
@@ -0,0 +1,16 @@
+[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
new file mode 100644
index 000000000..a78216add
--- /dev/null
+++ b/pcr/libcgroup/libcgroup.install
@@ -0,0 +1,11 @@
+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/libqb/PKGBUILD b/pcr/libqb/PKGBUILD
index 6b9d7d9d7..85b3ff082 100644
--- a/pcr/libqb/PKGBUILD
+++ b/pcr/libqb/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=libqb
 pkgver=0.14.4
-pkgrel=2
+pkgrel=3
 pkgdesc='Library with the primary purpose of providing high performance client server reusable features'
 arch=(
   i686
@@ -14,7 +14,7 @@ makedepends=(
   splint
 )
 license=LGPL2.1
-options=!libtool
+options=(!libtool)
 url=https://github.com/asalkeld/$pkgname/wiki
 source=https://github.com/asalkeld/$pkgname/archive/v$pkgver.tar.gz
 sha512sums=1377e38d5547eb516b255c0aa0972e858048053202692d7d5ef1c746d79dee2c78eddc29e797215376990f2c776b34261f765858606b59d77f9218fb0dac5977
@@ -25,7 +25,8 @@ build() {
   setarch $CARCH ./configure --prefix=/usr\
     --disable-fatal-warnings\
     --disable-static\
-    --libdir=/usr/lib
+    --libdir=/usr/lib\
+    --sbindir=/usr/bin
   setarch $CARCH make
 }
 
diff --git a/pcr/libquvi-scripts-current/PKGBUILD b/pcr/libquvi-scripts-current/PKGBUILD
new file mode 100644
index 000000000..bce42b0e4
--- /dev/null
+++ b/pcr/libquvi-scripts-current/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 188870 2013-06-23 17:45:51Z heftig $
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+
+pkgname=libquvi-scripts-current
+_pkgname=libquvi-scripts
+provides=(libquvi-scripts)
+pkgver=0.4.18
+pkgrel=1
+pkgdesc='Library for parsing video download links.'
+arch=('any')
+url='http://quvi.sourceforge.net/'
+license=('LGPL')
+depends=('curl' 'lua')
+options=('!libtool')
+source=("http://downloads.sourceforge.net/sourceforge/quvi/${_pkgname}-${pkgver}.tar.xz"{,.sig})
+
+build() {
+  cd "${_pkgname}-${pkgver}"
+  ./configure --prefix=/usr --with-nsfw --with-nlfy
+  make
+}
+
+package() {
+  cd "${_pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
+md5sums=('d36f966974c851d36136c75d462fb319'
+         'SKIP')
diff --git a/pcr/librevpn-git/PKGBUILD b/pcr/librevpn-git/PKGBUILD
new file mode 100644
index 000000000..551a984e2
--- /dev/null
+++ b/pcr/librevpn-git/PKGBUILD
@@ -0,0 +1,145 @@
+# 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
new file mode 100644
index 000000000..71a3a2f7c
--- /dev/null
+++ b/pcr/librevpn/PKGBUILD
@@ -0,0 +1,86 @@
+# 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/libsquish-svn/LICENSE b/pcr/libsquish-svn/LICENSE
new file mode 100644
index 000000000..dd0f22eb9
--- /dev/null
+++ b/pcr/libsquish-svn/LICENSE
@@ -0,0 +1,24 @@
+/* -----------------------------------------------------------------------------
+
+	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
new file mode 100644
index 000000000..17af64a96
--- /dev/null
+++ b/pcr/libsquish-svn/PKGBUILD
@@ -0,0 +1,35 @@
+# 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/libwww-hg/PKGBUILD b/pcr/libwww-hg/PKGBUILD
new file mode 100644
index 000000000..9fc91e231
--- /dev/null
+++ b/pcr/libwww-hg/PKGBUILD
@@ -0,0 +1,36 @@
+# $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/lilo/PKGBUILD b/pcr/lilo/PKGBUILD
new file mode 100644
index 000000000..10d334b05
--- /dev/null
+++ b/pcr/lilo/PKGBUILD
@@ -0,0 +1,47 @@
+# Maintainer: Connor Behan <connor.behan@gmail.com>
+# Contributor: Eric Belanger <eric@archlinux.org>
+# Contributor: judd <jvinet@zeroflux.org>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+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/libre/lilo/lilo.conf b/pcr/lilo/lilo.conf
index 479390df5..479390df5 100644
--- a/libre/lilo/lilo.conf
+++ b/pcr/lilo/lilo.conf
diff --git a/libre/lilo/lilo.install b/pcr/lilo/lilo.install
index 7375fddf8..7375fddf8 100644
--- a/libre/lilo/lilo.install
+++ b/pcr/lilo/lilo.install
diff --git a/~lukeshu/maildirproc/PKGBUILD b/pcr/maildirproc/PKGBUILD
index bb98fa112..0e3becf75 100644
--- a/~lukeshu/maildirproc/PKGBUILD
+++ b/pcr/maildirproc/PKGBUILD
@@ -1,17 +1,21 @@
-# Maintainer: Mick Koch <kchmck@gmail.com>
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (AUR): Mick Koch <kchmck@gmail.com>
 
 pkgname="maildirproc"
 pkgver="0.5.0"
-pkgrel="2"
+pkgrel="3"
 pkgdesc="Sorts mail based on a Python configuration file"
 arch=("any")
 url="http://joel.rosdahl.net/maildirproc/"
-license=("GPL")
+license=("GPL") # GPLv2+
 depends=("python")
 source=("http://joel.rosdahl.net/maildirproc/releases/$pkgname-$pkgver.tar.bz2")
 md5sums=("eaa001f6cd1befee99528ca55da979ca")
 
-build() {
+package() {
   cd "$srcdir/$pkgname-$pkgver"
-  python setup.py install --prefix=/usr --root="$pkgdir" || return 1
+  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
new file mode 100644
index 000000000..545c34a0c
--- /dev/null
+++ b/pcr/maliit-framework/PKGBUILD
@@ -0,0 +1,33 @@
+# Contributor: Jon Nordby <jononor@gmail.com>
+# Maintainer: Jon Nordby <jononor@gmail.com>
+# Maintainer (Parabola): Javier Barcena <javierbuilder@gmail.com>
+# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+
+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
new file mode 100755
index 000000000..08c54ae1b
--- /dev/null
+++ b/pcr/maliit-framework/maliit-framework.install
@@ -0,0 +1,30 @@
+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
new file mode 100644
index 000000000..cdab07003
--- /dev/null
+++ b/pcr/maliit-plugins/PKGBUILD
@@ -0,0 +1,32 @@
+# 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/mathjax/PKGBUILD b/pcr/mathjax/PKGBUILD
new file mode 100644
index 000000000..47f581fa1
--- /dev/null
+++ b/pcr/mathjax/PKGBUILD
@@ -0,0 +1,21 @@
+# Maintainer (Arch): Tianjiao Yin <ytj000@gmail.com>
+# Maintainer (Parabola): Alon Ivtsan <alonivtsan@lavabit.com>
+#taken from https://aur.archlinux.org/packages/mathjax/
+
+pkgname=mathjax
+pkgver=2.1
+pkgrel=1
+pkgdesc='An open source JavaScript display engine for mathematics that works in all modern browsers'
+url='http://www.mathjax.org/'
+arch=('any')
+license=('apache')
+options=('!strip')
+source=('https://github.com/mathjax/MathJax/archive/v2.1.tar.gz')
+
+build() {
+    mkdir -p $pkgdir/usr/share
+    mv $srcdir/MathJax-* $pkgdir/usr/share/mathjax
+}
+
+
+md5sums=('8e7ad1b8f3a69be8ec83f21d3e2a509c')
diff --git a/pcr/mednafen-server/PKGBUILD b/pcr/mednafen-server/PKGBUILD
index 0c7057908..9968dde38 100644
--- a/pcr/mednafen-server/PKGBUILD
+++ b/pcr/mednafen-server/PKGBUILD
@@ -1,26 +1,24 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
 
 pkgname=mednafen-server
+_pkgname=${pkgname%-server}
 pkgver=0.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc='A server multi-system gaming emulator'
-url=http://${pkgname%-server}.sourceforge.net/
-license=(
-  GPL
-)
+url=http://$_pkgname.sourceforge.net/
+license=GPL2
 arch=(
   i686
   x86_64
   mips64el
 )
+backup=etc/$pkgname/standard.conf
 source=(
-  http://downloads.sourceforge.net/project/${pkgname%-server}/Mednafen-Server/$pkgver/$pkgname-$pkgver.tar.gz
-  ${pkgname}d
+  http://downloads.sourceforge.net/project/$_pkgname/${_pkgname^}-Server/$pkgver/$pkgname-$pkgver.tar.gz
   $pkgname.service
 )
 sha512sums=(
   700b2021e5085761b90bb5ee802ff9ccded3cdade76682fe9faa98ebbb0653c9b00baea5baa1c486f850bad606aae33a88e4d9486015babb210648aa0cd4542d
-  55cba761db9c10978a5146e4f92ccce2a645e0566d0744e745b36ede56a0332d1cb1f6c8a09df6a1c01320b539f07ccd7073b2d85eca6b340449a1c3b9761407
   cd3d19b789ec7f62c4b8f5fe0f93e7836fab5406a3416434701caf6404cce02c7223dcb8b82bd1e4b00bdcf4df623f0cd44f850a7f79a7be73e04c0804972700
 )
 
@@ -34,6 +32,5 @@ package() {
   cd $srcdir/$pkgname
   make DESTDIR=$pkgdir install
   install -Dm644 standard.conf            $pkgdir/etc/$pkgname/standard.conf
-  install -Dm644 $srcdir/${pkgname}d      $pkgdir/etc/rc.d/$pkgname
   install -Dm644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service
 }
diff --git a/pcr/mimms/PKGBUILD b/pcr/mimms/PKGBUILD
new file mode 100644
index 000000000..3697c1a3b
--- /dev/null
+++ b/pcr/mimms/PKGBUILD
@@ -0,0 +1,30 @@
+# 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/miniupnpd/PKGBUILD b/pcr/miniupnpd/PKGBUILD
index 57a04c290..5e8e59fd9 100644
--- a/pcr/miniupnpd/PKGBUILD
+++ b/pcr/miniupnpd/PKGBUILD
@@ -1,8 +1,8 @@
 # $Id$
 # Maintainer: fauno <fauno@parabola.nu>
 pkgname=miniupnpd
-pkgver=1.8.20130503
-pkgrel=3
+pkgver=1.8.20130730
+pkgrel=1
 pkgdesc="Lightweight UPnP IGD daemon"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://miniupnp.free.fr"
@@ -12,8 +12,6 @@ depends=('libnfnetlink' 'iptables>=1.4.3' 'net-tools')
 makedepends=('lsb-release')
 source=("http://miniupnp.free.fr/files/$pkgname-$pkgver.tar.gz"
         miniupnpd.systemd)
-md5sums=('484dbda7c428b2d5f3768500a48d3375'
-         '0c3f1777b6c043dd5029092d62896660')
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
@@ -41,3 +39,7 @@ package() {
         cd "$pkgdir"
         mv usr/sbin usr/bin
 }
+sha1sums=('32eed969a6c653d6d5ccd236ee50275c933d020e'
+          '64bf27526bc830d7be98a9bb48e58911afdbe735')
+sha256sums=('919ab6ec719959fff9bdae3f1d83f6a39c43fa4a6d3f2c48077f43729d3d7d43'
+            '2707d028f28fbb28c3a9d13605c9c738e9628f828e22288a8a1492ac93f9ad7c')
diff --git a/pcr/mitsuba/PKGBUILD b/pcr/mitsuba/PKGBUILD
index 219da84fc..0961ef11d 100644
--- a/pcr/mitsuba/PKGBUILD
+++ b/pcr/mitsuba/PKGBUILD
@@ -1,35 +1,40 @@
 # Maintainer: Márcio Silva <coadde@lavabit.com>
 
-pkgname=(
-  mitsuba
-  blender-addon-mitsuba
-)
-_bldname=${pkgname[1]::7}
-_addname=${pkgname[0]}-${_bldname}
-pkgver=0.4.4 # Thu Feb 28 15:00:37 2013 -0800 tag:v0.4.4 rev:1674
-_pkgdat=20130228
-_pkgrev=1674
-_bldver=2.66
-_addver=0.2.1 # Wed Mar 20 01:30:37 2013 +0100 rev:40 ($srcdir/$_addname/${pkgname[0]}/__init__.py:bl_info>version)
+_pkgname=mitsuba
+_pkgver=0.4.4
+_pkgrel=4
+_bldname=blender
+_bldver=2.68
+_bldep=9
+_addname=$_pkgname-$_bldname
 _adddat=20130320
 _addrev=40
-_bldep=7
+_addrel=3
 _pyver=3.3
-pkgrel=1
+
+# Wed Mar 20 01:30:37 2013 +0100 rev:40 ($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=(
-  i686
-  x86_64
   mips64el
+  x86_64
+  i686
 )
-url=https://${pkgname[0]}-renderer.org/
+url=https://www.$_pkgname-renderer.org/
 license=GPL3
 depends=(
   boost-libs
   collada-dom
   glew
   libxxf86vm
-  'openexr=2.0.0'
+  openexr-libre
   qt4
   xerces-c
 )
@@ -44,90 +49,93 @@ makedepends=(
   mercurial
   python
 )
-install=$pkgname.install
 source=(
-  hg+https://${pkgname[0]}-renderer.org/hg/${pkgname[0]}
-  hg+https://${pkgname[0]}-renderer.org/hg/$_addname
-  ${pkgname[1]}.install
+  $_pkgname-$pkgver.tar.bz2::${url}hg/$_pkgname/archive/v$pkgver.tar.bz2
+  $_addname-$_addver.tar.bz2::${url}hg/$_addname/archive/$_addrev.tar.bz2
+)
+sha512sums=(
+  66dcab376a44eeb2fbe808a32ead5b554d777fb2f6a73c43883086b7829e0c697aaeccbb6fbbed9fcb221684a64ccce8be81a78ebcd228316ea12b8f6f3e7f6c
+  c829978a28c7780605662c604450c3d00b8ac958310e26aa7ad02dfb50f1875420e0e85fe0c868e030946c894cb939d18a4589c9e06a169f86eba5948eb2147e
 )
-sha512sums=(SKIP SKIP SKIP)
 
 prepare() {
-  mv $srcdir/${pkgname[1]}.install $startdir
-
-  cd $srcdir/${pkgname[0]}
-
-  [[ -d build ]] && rm -r build
-  mkdir build
-
-  cd $startdir/../srcdest/${pkgname[0]}
-
-  msg "${pkgname[0]}"
-  hg update -c v$pkgver
-  hg log -l 1 -r v$pkgver
-
-  cd $startdir/../srcdest/$_addname
-
-  msg "${pkgname[1]}"
-  hg update -c -r $_addrev
-  hg log -l 1 -r $_addrev
+  cd $srcdir/$_pkgname-v$pkgver
+
+  msg 'renaming wrong OS name'
+  _OS=$(uname -o)
+  [[ $_OS == GNU ]] && sed -i 's|Linux|GNU|I' src/libcore/plugin.cpp
+  [[ $_OS == GNU/Linux ]] && sed -i 's|Linux,|GNU/Linux-libre,|' src/libcore/plugin.cpp
+  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[0]}/build
+  cd $srcdir/$_pkgname-v$pkgver/build
 
-  [[ $CARCH != x86_64 ]] && DMTS_SSE='-DMTS_SSE=OFF'
+  [[ $CARCH == x86_64 ]] && _SSE=ON || _SSE=OFF
+  # i686: MTS_SSE disabled
 
-  setarch $CARCH cmake .. -DCMAKE_INSTALL_PREFIX=/usr\
-    $DMTS_SSE\
+  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
-
-  setarch $CARCH make
+  make
 }
 
 package_mitsuba() {
-  cd $srcdir/${pkgname[0]}/build
-  setarch $CARCH make DESTDIR=$pkgdir install
+  cd $srcdir/$_pkgname-v$pkgver/build
+  make DESTDIR=$pkgdir install
+  install=$_pkgname.install
 
-  #fixing files and folders location
+  msg 'fixing files and folders location'
   a=$pkgdir/usr
-  b=$srcdir/${pkgname[0]}
-  install -d $a/{bin,lib{,/python$_pyver/lib-dynload},share/{applications,{licenses/,}${pkgname[0]},pixmaps}}
-  install -m644 $b/data/linux/${pkgname[0]}.desktop         $a/share/applications
-  install -m644 $b/src/mtsgui/resources/${pkgname[0]}48.png $a/share/pixmaps
-  install -m644 $b/doc/license.txt                          $a/share/licenses/${pkgname[0]}/LICENSE
-  mv $a/{m{itsuba,ts{gui,import,srv,util}},bin}
-  mv $a/lib{${pkgname[0]}-{bidir,core,hw,render}.so,}
-  mv $a/{{data,plugins},share/${pkgname[0]}}
-  mv $a/{python/mitsuba.so,lib/python$_pyver/lib-dynload}
-  mv $a/{sdk/include,}
-  rmdir $a/{python,sdk}
+  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() {
-  _pkgname=${pkgname:14}
-  _pkgver=$pkgver
-  pkgver=$_addver.r$_addrev.v$_bldver
   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>=$(($_bldep-1)):$_bldver"
-    "$_bldname<$_bldep:${_bldver::2}$((${_bldver:2:4}+1))"
+    $_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=
-  install=$pkgname.install
 
-  cd $srcdir/$_addname
+  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/doc/license.txt
+  c=$srcdir/$_pkgname-v$_pkgver/doc/license.txt
 
-  install -d $a && cp -a $_pkgname $a
-  install -d $b && install -m644 $c $b/LICENSE
+  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/blender-addon-mitsuba.install b/pcr/mitsuba/blender-addon-mitsuba.install
deleted file mode 100644
index 41d69870d..000000000
--- a/pcr/mitsuba/blender-addon-mitsuba.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  cat << EOF
-## Please type "/usr/bin" in
-## "Mitsuba Engine Settings" > "Executable path:" option
-## to correct fuction.
-EOF
-}
-
-post_upgrade() {
-  post_install
-}
diff --git a/pcr/monkeysign/PKGBUILD b/pcr/monkeysign/PKGBUILD
new file mode 100644
index 000000000..2e4ab1f3f
--- /dev/null
+++ b/pcr/monkeysign/PKGBUILD
@@ -0,0 +1,24 @@
+# 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
index f83e05741..749cb0c25 100644
--- a/pcr/monkeysphere/PKGBUILD
+++ b/pcr/monkeysphere/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: Olivier Mehani <shtrom-arch@ssji.net>
 # $Id: PKGBUILD 264 2010-11-10 00:57:53Z shtrom $
 pkgname=monkeysphere
-pkgver=0.35
-pkgrel=5
+pkgver=0.36
+pkgrel=1
 pkgdesc="Leverage the OpenPGP web of trust for OpenSSH and Web authentication"
 arch=('any')
 url="http://web.monkeysphere.info/"
@@ -20,17 +20,20 @@ prepare() {
   patch -Ni "${srcdir}/binmerge.patch"
 }
 
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make test
-}
+# Checks fail
+#check() {
+#  cd "$srcdir/$pkgname-$pkgver"
+#
+#  make test
+#}
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
 
   make DESTDIR="$pkgdir/" install
   mkdir -p $pkgdir/var/lib/monkeysphere
-} 
-md5sums=('481ac14c9fdef0ccd1944c593bd4f517'
-         'a8bd35dc7dd58b5952beeecafe5045a7')
+}
+sha1sums=('c4f950346040f7703cb4c6e8b32022f4361d0c9d'
+          '780c2e203980558316b0714c4b2a3ad49be3ea27')
+sha256sums=('6ae4edeff2cc29b6913346e15b61500ea7cc06d761a9f42e67de83b7d2607be7'
+            'e49a1097296b06090010ce5344588f5e4917aeb06a118de920fc58411d2a7cf7')
diff --git a/pcr/msdl/PKGBUILD b/pcr/msdl/PKGBUILD
new file mode 100644
index 000000000..dfcf99c03
--- /dev/null
+++ b/pcr/msdl/PKGBUILD
@@ -0,0 +1,29 @@
+# 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/nevow/PKGBUILD b/pcr/nevow/PKGBUILD
new file mode 100644
index 000000000..956a0cd32
--- /dev/null
+++ b/pcr/nevow/PKGBUILD
@@ -0,0 +1,23 @@
+# 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/nppangband-libre/PKGBUILD b/pcr/nppangband-libre/PKGBUILD
new file mode 100644
index 000000000..eeb59f6fc
--- /dev/null
+++ b/pcr/nppangband-libre/PKGBUILD
@@ -0,0 +1,33 @@
+# 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
new file mode 100644
index 000000000..9de2b0177
--- /dev/null
+++ b/pcr/nppangband-libre/sound.patch
@@ -0,0 +1,241 @@
+# 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/ocsync/PKGBUILD b/pcr/ocsync/PKGBUILD
index 34ce2f62c..cde26af30 100644
--- a/pcr/ocsync/PKGBUILD
+++ b/pcr/ocsync/PKGBUILD
@@ -1,6 +1,7 @@
 # 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 ####
 ##############################################################
@@ -14,28 +15,31 @@ _buildtype="Release"
 ##############################################################
 
 pkgname=ocsync
-pkgver=0.70.5
+pkgver=0.90.0
 pkgrel=1
-pkgdesc="A file synchronizer especially designed for you, the normal user."
+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' 'smbclient' 'libssh')
+depends=('sqlite3' 'iniparser' 'neon')
 makedepends=('cmake')
-#optdepends=('samba: smb support' 'libssh: sftp support')
+optdepends=('libssh: sftp support')
 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=('7c8b6f260cc53d29c4355f6837990329')
+md5sums=('db46cdb4c710a607dfc062ed0a413b35')
 
-# Clean options array to strip pkg if release buildtype is chosen
-if [[ ${_buildtype} == "Release" ]] || [[ ${_buildtype} == "release" ]]; then
-  options=()
+if [[ ! ${_buildtype} == "Release" ]] && [[ ! ${_buildtype} == "release" ]]; then
+  options=(!strip)
 fi
 
-build() {
+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} \
@@ -48,3 +52,4 @@ package() {
   cd ${srcdir}/${pkgname}-${pkgver}-build
   make DESTDIR=${pkgdir} install
 }
+md5sums=('6f1cfe47d6a7741c6e8df8642de52c0f')
diff --git a/pcr/openhpi/PKGBUILD b/pcr/openhpi/PKGBUILD
deleted file mode 100644
index bffcc74ba..000000000
--- a/pcr/openhpi/PKGBUILD
+++ /dev/null
@@ -1,185 +0,0 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-
-pkgname=openhpi
-pkgver=3.2.0
-pkgrel=4
-pkgdesc='Abstracted interface for managing computer hardware, typically chassis and rack based servers'
-arch=(
-  i686
-  x86_64
-  mips64el
-)
-url=http://www.$pkgname.org/
-license=custom
-depends=(
-  libxml2
-  net-snmp
-)
-options=(!libtool)
-source=http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
-sha512sums=5a54ccc2279b3a608e2842dd3b4f01d7d483182ecd33d1d33186247cea15b62f1e0aea4eea1294cd6c3959a25424dc322cca73e516f4c8fd9d3a41a949d087ab
-
-prepare() {
-  cd $srcdir/$pkgname-$pkgver
-
-  _automake=$(automake --version | grep automake | sed 's|automake (GNU automake) ||')
-  sed -i "/am__api_version=/ s|1.12|${_automake::4}|;
-         " $(grep -rl am__api_version=)
-
-  #sed -i 's|INCLUDES|AM_CPPFLAGS|;
-  #       ' $(grep -rl INCLUDES | grep Makefile.am)
-
-  # fixing path
-  sed -i 's|bin/sh|usr/bin/bash|;
-         ' $(grep -rl bin/sh)
-  sed -i 's| /bin| /usr/bin|;
-         ' $(grep -rl ' /bin')
-  sed -i 's| /sbin| /usr/bin|;
-         ' $(grep -rl ' /sbin')
-  sed -i 's|usr/sbin|usr/bin|;
-         ' $(grep -rl usr/sbin)
-  #sed -i 's|/lib64|/lib|;
-  #       ' $(grep -rl /lib64)
-  sed -i 's|usr/libexec|usr/lib|;
-         ' $(grep -rl usr/libexec)
-  sed -i 's|var/lock|run/lock|;
-         ' $(grep -rl var/lock)
-  sed -i 's|var/run|run|;
-         ' $(grep -rl var/run)
-
-  # remove Open Source term
-  #sed -i 's|Open Source / ||;
-  #        s|open source / ||;
-  #        s|Open Source|Free Software|;
-  #        s|open source|free software|;
-  #        s|Free Software Development Lab|Open Source Development Lab|;
-  #       ' $(grep -ril 'open source')
-  #sed -i 's|OpenSource / ||;
-  #        s|opensource / ||;
-  #        s|OpenSource|FreeSoftware|;
-  #        s|opensource|freesoftware|;
-  #        s|freesoftware.org|opensource.org|;
-  #        s|http://www.opensource.org/|http://www.gnu.org/philosophy/free-sw.html|;
-  #        s|http://www.gnu.org/philosophy/free-sw.htmllicenses/osl-|http://opensource.org/licenses/osl-|;
-  #        s|http://www.gnu.org/philosophy/free-sw.htmlosd|http://opensource.org/osd|;
-  #       ' $(grep -ril opensource)
-
-  # remove Linux term
-  sed -i 's|Linux,|GNU/Linux,|;
-          s|Linux and|GNU/Linux and|;
-          s|Linux distro|GNU/Linux distro|;
-          s|Linux distribution|GNU/Linux distribution|;
-          s|Linux machine|GNU/Linux machine|;
-          s|Linux Only|GNU/Linux Only|;
-          s|Linux only|GNU/Linux only|;
-          s|Linux operating|GNU/Linux operating|;
-          s|Linux OS|GNU/Linux OS|;
-          s|Linux platform|GNU/Linux platform|;
-          s|Linux software|GNU/Linux software|;
-          s|Linux specific|GNU/Linux specific|;
-          s|Linux system|GNU/Linux system|;
-          s|Linux will|GNU/Linux will|;
-          s|# Linux$|# GNU/Linux|;
-          s|# Linux.$|# GNU/Linux.|;
-          s|* Linux$|* GNU/Linux|;
-          s|* Linux.$|* GNU/Linux.|;
-          s|// Linux$|// GNU/Linux|;
-          s|// Linux.$|// GNU/Linux.|;
-          s|, Linux|, GNU/Linux|;
-          s|As Linux|As GNU/Linux|;
-          s|as Linux|as GNU/Linux|;
-          s|And Linux|And GNU/Linux|;
-          s|and Linux|and GNU/Linux|;
-          s|Be Linux|Be GNU/Linux|;
-          s|be Linux|be GNU/Linux|;
-          s|Because Linux|Because GNU/Linux|;
-          s|because Linux|because GNU/Linux|;
-          s|e.g. Linux|e.g. GNU/Linux|;
-          s|For Linux|For GNU/Linux|;
-          s|for Linux|for GNU/Linux|;
-          s|In Linux|In GNU/Linux|;
-          s|in Linux|in GNU/Linux|;
-          s|Like Linux|Like GNU/Linux|;
-          s|like Linux|like GNU/Linux|;
-          s|non-Linux|non GNU/Linux|;
-          s|Of Linux|Of GNU/Linux|;
-          s|of Linux|of GNU/Linux|;
-          s|On Linux|On GNU/Linux|;
-          s|on Linux|on GNU/Linux|;
-          s|OS type: Linux|OS type: GNU/Linux|;
-          s|Other Linux|Other GNU/Linux|;
-          s|other Linux|other GNU/Linux|;
-          s|The Linux|The GNU/Linux|;
-          s|the Linux|the GNU/Linux|;
-          s|Typically Linux|Typically GNU/Linux|;
-          s|typically Linux|typically GNU/Linux|;
-          s|To Linux|To GNU/Linux|;
-          s|to Linux|to GNU/Linux|;
-          s|Under Linux|Under GNU/Linux|;
-          s|under Linux|under GNU/Linux|;
-          s|ArchGNU/Linux|ArchLinux|;
-          s|e2fsprogs, typically GNU/Linux|e2fsprogs, typically Linux|;
-          s|GNU/GNU|GNU|;
-          s|GNU/Linux device|Linux device|;
-          s|GNU/Linux Director Daemon|Linux Director Daemon|;
-          s|GNU/Linux is a registered trademark of Linus Torvalds|Linux is a registered trademark of Linus Torvalds|;
-          s|GNU/Linux kernel|Linux kernel|;
-          s|GNU/Linux specific kernel|Linux specific kernel|;
-          s|GNU/Linux Standard Base|Linux Standard Base|;
-          s|GNU/Linux sysfs|Linux sysfs|;
-          s|GNU/Linux Virtual Server|Linux Virtual Server|;
-          s|GNU/Linux Watchdog|Linux Watchdog|;
-          s|GNU/Linux watchdog|Linux watchdog|;
-          s|GNU/LinuxHA|LinuxHA|;
-          s|GNU/Linux-HA|Linux-HA|;
-          s|GNU/LinuxSCSI|LinuxSCSI|;
-          s|HA GNU/Linux|HA Linux|;
-          s|High-Availability GNU/Linux|High-Availability Linux|;
-          s|MkGNU/Linux|MkLinux|;
-          s|SEGNU/Linux|SELinux|;
-          s|VA GNU/Linux Cluster|VA Linux Cluster|;
-         ' $(grep -rl Linux)
-}
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  setarch $CARCH ./configure --prefix=/usr\
-    --disable-static\
-    --enable-clients\
-    --enable-dynamic_simulator\
-    --enable-ilo2_ribcl\
-    --enable-ipmidirect\
-    --enable-man\
-    --enable-oa_soap\
-    --enable-simulator\
-    --enable-slave\
-    --enable-snmp_bc\
-    --enable-sysfs\
-    --enable-test_agent\
-    --enable-watchdog\
-    --localstatedir=/var\
-    --sbindir=/usr/bin\
-    --sysconfdir=/etc
-  setarch $CARCH make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  setarch $CARCH make DESTDIR=$pkgdir install
-
-  rm $pkgdir/etc/init.d/openhpid && rmdir $pkgdir/etc/init.d
-
-  install -d $pkgdir/usr/lib/systemd/system
-  echo '[Unit]'                                                           >  $pkgdir/usr/lib/systemd/system/openhpi.service
-  echo 'Description=Enable OpenHPI service which is provided by openhpid' >> $pkgdir/usr/lib/systemd/system/openhpi.service
-  echo 'After=network.target remote-fs.target'                            >> $pkgdir/usr/lib/systemd/system/openhpi.service
-  echo ''                                                                 >> $pkgdir/usr/lib/systemd/system/openhpi.service
-  echo '[Service]'                                                        >> $pkgdir/usr/lib/systemd/system/openhpi.service
-  echo 'Type=forking'                                                     >> $pkgdir/usr/lib/systemd/system/openhpi.service
-  echo 'ExecStart=/usr/bin/openhpid -c /etc/openhpi/openhpi.conf'         >> $pkgdir/usr/lib/systemd/system/openhpi.service
-  echo ''                                                                 >> $pkgdir/usr/lib/systemd/system/openhpi.service
-  echo '[Install]'                                                        >> $pkgdir/usr/lib/systemd/system/openhpi.service
-  echo 'WantedBy=multi-user.target'                                       >> $pkgdir/usr/lib/systemd/system/openhpi.service
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/openipmi/PKGBUILD b/pcr/openipmi/PKGBUILD
deleted file mode 100644
index cced11d05..000000000
--- a/pcr/openipmi/PKGBUILD
+++ /dev/null
@@ -1,177 +0,0 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-
-pkgname=openipmi
-_pkgname1=${pkgname::4}
-_pkgname2=${pkgname:4}
-_pkgname=${_pkgname1^}${_pkgname2^^}
-pkgver=2.0.19
-_pkgver=${pkgver::3}
-pkgrel=3
-pkgdesc="Allow access to platform information using Intelligent Platform Management Interface (${_pkgname2^^})"
-arch=(
-  i686
-  x86_64
-  mips64el
-)
-url=http://sourceforge.net/projects/$pkgname/
-depends=(
-  glib
-  net-snmp
-  #python2
-  swig
-  tcl
-)
-makedepends=(
-  dia
-  ghostscript-libre
-  texlive-bibtexextra
-)
-options=(!libtool)
-license=(
-  BSD-new
-  GPL2
-  LGPL2.1
-)
-source=http://downloads.sourceforge.net/project/$pkgname/$_pkgname' '$_pkgver' 'Library/$_pkgname-$pkgver.tar.gz
-sha512sums=ee95eb64b7cde3f22c8444a5f8e3172808b0bb9a3a7034c1302c5f568c1cc0852a44ccc836924267b5f9901f7a8a3f4c66272cc0b663aa55689d7529841217cb
-
-prepare() {
-  cd $srcdir/$_pkgname-$pkgver
-
-  #mv configure.{in,ac}
-
-  #_automake=$(automake --version | grep automake | sed 's|automake (GNU automake) ||')
-  #sed -i "/am__api_version=/ s|1.11|${_automake::4}|;
-  #       " $(grep -rl am__api_version=)
-
-  #sed -i "s|AC_INIT(README.Force)|AC_INIT(OpenIPMI, $pkgver|;
-  #       " configure.ac
-  #sed -i 's|AM_INIT_AUTOMAKE(OpenIPMI, ${OPENIPMI_VERSION_MAJOR}.${OPENIPMI_VERSION_MINOR}.${OPENIPMI_VERSION_RELEASE}${OPENIPMI_VERSION_EXTRA})|AM_INIT_AUTOMAKE|;
-  #       ' configure.ac
-
-  # fixing path
-  sed -i 's|bin/sh|usr/bin/bash|;
-         ' $(grep -rl bin/sh)
-  sed -i 's| /bin| /usr/bin|;
-         ' $(grep -rl ' /bin')
-  sed -i 's| /sbin| /usr/bin|;
-         ' $(grep -rl ' /sbin')
-  sed -i 's|usr/sbin|usr/bin|;
-         ' $(grep -rl usr/sbin)
-  #sed -i 's|/lib64|/lib|;
-  #       ' $(grep -rl /lib64)
-  sed -i 's|usr/libexec|usr/lib|;
-         ' $(grep -rl usr/libexec)
-  sed -i 's|var/lock|run/lock|;
-         ' $(grep -rl var/lock)
-  #sed -i 's|var/run|run|;
-  #       ' $(grep -rl var/run)
-
-  # remove Open Source term
-  sed -i 's|Open Source / ||;
-          s|open source / ||;
-          s|Open Source|Free Software|;
-          s|open source|free software|;
-          s|Free Software Development Lab|Open Source Development Lab|;
-         ' $(grep -ril 'open source')
-  #sed -i 's|OpenSource / ||;
-  #        s|opensource / ||;
-  #        s|OpenSource|FreeSoftware|;
-  #        s|opensource|freesoftware|;
-  #        s|freesoftware.org|opensource.org|;
-  #        s|http://www.opensource.org/|http://www.gnu.org/philosophy/free-sw.html|;
-  #        s|http://www.gnu.org/philosophy/free-sw.htmllicenses/osl-|http://opensource.org/licenses/osl-|;
-  #        s|http://www.gnu.org/philosophy/free-sw.htmlosd|http://opensource.org/osd|;
-  #       ' $(grep -ril opensource)
-
-  # remove Linux term
-  sed -i 's|Linux,|GNU/Linux,|;
-          s|Linux and|GNU/Linux and|;
-          s|Linux distro|GNU/Linux distro|;
-          s|Linux distribution|GNU/Linux distribution|;
-          s|Linux machine|GNU/Linux machine|;
-          s|Linux Only|GNU/Linux Only|;
-          s|Linux only|GNU/Linux only|;
-          s|Linux operating|GNU/Linux operating|;
-          s|Linux OS|GNU/Linux OS|;
-          s|Linux platform|GNU/Linux platform|;
-          s|Linux software|GNU/Linux software|;
-          s|Linux specific|GNU/Linux specific|;
-          s|Linux system|GNU/Linux system|;
-          s|Linux will|GNU/Linux will|;
-          s|# Linux$|# GNU/Linux|;
-          s|# Linux.$|# GNU/Linux.|;
-          s|* Linux$|* GNU/Linux|;
-          s|* Linux.$|* GNU/Linux.|;
-          s|// Linux$|// GNU/Linux|;
-          s|// Linux.$|// GNU/Linux.|;
-          s|, Linux|, GNU/Linux|;
-          s|As Linux|As GNU/Linux|;
-          s|as Linux|as GNU/Linux|;
-          s|And Linux|And GNU/Linux|;
-          s|and Linux|and GNU/Linux|;
-          s|Be Linux|Be GNU/Linux|;
-          s|be Linux|be GNU/Linux|;
-          s|Because Linux|Because GNU/Linux|;
-          s|because Linux|because GNU/Linux|;
-          s|e.g. Linux|e.g. GNU/Linux|;
-          s|For Linux|For GNU/Linux|;
-          s|for Linux|for GNU/Linux|;
-          s|In Linux|In GNU/Linux|;
-          s|in Linux|in GNU/Linux|;
-          s|Like Linux|Like GNU/Linux|;
-          s|like Linux|like GNU/Linux|;
-          s|non-Linux|non GNU/Linux|;
-          s|Of Linux|Of GNU/Linux|;
-          s|of Linux|of GNU/Linux|;
-          s|On Linux|On GNU/Linux|;
-          s|on Linux|on GNU/Linux|;
-          s|OS type: Linux|OS type: GNU/Linux|;
-          s|Other Linux|Other GNU/Linux|;
-          s|other Linux|other GNU/Linux|;
-          s|The Linux|The GNU/Linux|;
-          s|the Linux|the GNU/Linux|;
-          s|Typically Linux|Typically GNU/Linux|;
-          s|typically Linux|typically GNU/Linux|;
-          s|To Linux|To GNU/Linux|;
-          s|to Linux|to GNU/Linux|;
-          s|Under Linux|Under GNU/Linux|;
-          s|under Linux|under GNU/Linux|;
-          s|ArchGNU/Linux|ArchLinux|;
-          s|e2fsprogs, typically GNU/Linux|e2fsprogs, typically Linux|;
-          s|GNU/GNU|GNU|;
-          s|GNU/Linux device|Linux device|;
-          s|GNU/Linux Director Daemon|Linux Director Daemon|;
-          s|GNU/Linux is a registered trademark of Linus Torvalds|Linux is a registered trademark of Linus Torvalds|;
-          s|GNU/Linux kernel|Linux kernel|;
-          s|GNU/Linux specific kernel|Linux specific kernel|;
-          s|GNU/Linux Standard Base|Linux Standard Base|;
-          s|GNU/Linux sysfs|Linux sysfs|;
-          s|GNU/Linux Virtual Server|Linux Virtual Server|;
-          s|GNU/Linux Watchdog|Linux Watchdog|;
-          s|GNU/Linux watchdog|Linux watchdog|;
-          s|GNU/LinuxHA|LinuxHA|;
-          s|GNU/Linux-HA|Linux-HA|;
-          s|GNU/LinuxSCSI|LinuxSCSI|;
-          s|HA GNU/Linux|HA Linux|;
-          s|High-Availability GNU/Linux|High-Availability Linux|;
-          s|MkGNU/Linux|MkLinux|;
-          s|SEGNU/Linux|SELinux|;
-          s|VA GNU/Linux Cluster|VA Linux Cluster|;
-         ' $(grep -rl Linux)
-}
-
-build() {
-  cd $srcdir/$_pkgname-$pkgver
-  setarch $CARCH ./configure --prefix=/usr\
-    --disable-static
-  setarch $CARCH make
-}
-
-package() {
-  cd $srcdir/$_pkgname-$pkgver
-  install -d $pkgdir/usr/bin
-  setarch $CARCH make DESTDIR=$pkgdir install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/otf-stix/PKGBUILD b/pcr/otf-stix/PKGBUILD
new file mode 100644
index 000000000..6a9b2d62c
--- /dev/null
+++ b/pcr/otf-stix/PKGBUILD
@@ -0,0 +1,37 @@
+# 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
new file mode 100644
index 000000000..5d66bc226
--- /dev/null
+++ b/pcr/otf-stix/otf-stix.install
@@ -0,0 +1,16 @@
+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
index 69905f40a..ea808c1ef 100644
--- a/pcr/owncloud-client/PKGBUILD
+++ b/pcr/owncloud-client/PKGBUILD
@@ -1,6 +1,7 @@
 # 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 ####
 ##############################################################
@@ -15,31 +16,33 @@ _buildtype="Release"
 
 _name=mirall
 pkgname=owncloud-client
-pkgver=1.2.3
+pkgver=1.4.0
 pkgrel=1
 pkgdesc="ownCloud client based on mirall"
 arch=('i686' 'x86_64')
 url="http://owncloud.org/"
 license=('GPL2')
-depends=('qt4' 'ocsync')
+depends=('qt4' 'ocsync' 'qtkeychain' 'qtwebkit')
 makedepends=('cmake')
+optdepends=('qtkeychain: safe password storage')
 provides=('mirall' 'owncloud-client')
 conflicts=('mirall-git')
 install=owncloud-client.install
 backup=('etc/owncloud-client/sync-exclude.lst')
-source=("http://download.owncloud.com/download/${_name}-${pkgver}.tar.bz2"
-        "${pkgname}.desktop")
-md5sums=('a3aa2cb1b9ccb13c7e8b0ef8a1b539df'
-         'e223d162626c2ff54efebaa90a182d81')
-
-# Clean options array to strip pkg if release buildtype is chosen
-if [[ ${_buildtype} == "Release" ]] || [[ ${_buildtype} == "release" ]]; then
-  options=()
+source=("http://download.owncloud.com/download/${_name}-${pkgver}.tar.bz2")
+md5sums=('05a69082b4e940b4282c2b05344c143a')
+
+
+if [[ ! ${_buildtype} == "Release" ]] && [[ ! ${_buildtype} == "release" ]]; then
+  options=(!strip)
 fi
 
-build() {
+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 \
@@ -55,5 +58,4 @@ build() {
 package() {
   cd ${srcdir}/${_name}-${pkgver}-build
   make DESTDIR=${pkgdir} install
-  install -Dm644 ${srcdir}/${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop
 }
diff --git a/pcr/owncloud-client/owncloud-client.install b/pcr/owncloud-client/owncloud-client.install
index e216754c7..eecc35ccd 100644
--- a/pcr/owncloud-client/owncloud-client.install
+++ b/pcr/owncloud-client/owncloud-client.install
@@ -1,5 +1,5 @@
 post_install() {
-  xdg-icon-resource forceupdate --theme hicolor
+  xdg-icon-resource forceupdate --theme hicolor > /dev/null
 }
 
 post_upgrade() {
diff --git a/pcr/pacemaker/PKGBUILD b/pcr/pacemaker/PKGBUILD
deleted file mode 100644
index 7ee8209ad..000000000
--- a/pcr/pacemaker/PKGBUILD
+++ /dev/null
@@ -1,222 +0,0 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-
-pkgname=pacemaker
-pkgver=1.1.9
-pkgrel=5
-pkgdesc='Cluster resource manager (Linux-HA)'
-arch=(
-  i686
-  x86_64
-  mips64el
-)
-group=linux-ha
-url=http://$group.org/wiki/${pkgname^}
-license=GPL2
-depends=(
-  corosync
-  heartbeat
-  libqb
-  libxslt
-  resource-agent
-  #saxon-he
-)
-makedepends=(
-  asciidoc
-  help2man
-  inkscape
-  lynx
-  openssh
-  valgrind
-  w3m
-)
-options=(!libtool)
-provides=(ha-$pkgname)
-conflicts=ha-$pkgname
-replaces=ha-$pkgname
-source=https://github.com/ClusterLabs/$pkgname/archive/${pkgname^}-$pkgver.tar.gz
-sha512sums=97d13cf722aea9cba1ce344afc3137d9edc15a978d2a7acc44179c4859ecb18f800312caf02c9574b0fab528cd6e2c3e4876a1ffde8a08c2500c0ba816cdf071
-
-prepare() {
-  cd $srcdir/$pkgname-${pkgname^}-$pkgver
-
-  sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|;
-          s|AM_INIT_AUTOMAKE($PACKAGE_NAME, $PACKAGE_VERSION)|AM_INIT_AUTOMAKE|;
-         ' configure.ac
-
-  sed -i 's|INCLUDES|AM_CPPFLAGS|;
-         ' $(grep -rl INCLUDES | grep Makefile.am)
-
-  # fixing path
-  sed -i 's|bin/sh|usr/bin/bash|;
-         ' $(grep -rl bin/sh)
-  sed -i 's| /bin| /usr/bin|;
-         ' $(grep -rl ' /bin')
-  sed -i 's| /sbin| /usr/bin|;
-         ' $(grep -rl ' /sbin')
-  sed -i 's|usr/sbin|usr/bin|;
-         ' $(grep -rl usr/sbin)
-  sed -i 's|/lib64|/lib|;
-         ' $(grep -rl /lib64)
-  sed -i 's|usr/libexec|usr/lib|;
-         ' $(grep -rl usr/libexec)
-  sed -i 's|var/lock|run/lock|;
-         ' $(grep -rl var/lock)
-  sed -i 's|var/run|run|;
-         ' $(grep -rl var/run)
-
-  # remove Open Source term
-  sed -i 's|Open Source / ||;
-          s|open source / ||;
-          s|Open Source|Free Software|;
-          s|open source|free software|;
-          s|Free Software Development Lab|Open Source Development Lab|;
-         ' $(grep -ril 'open source')
-  sed -i 's|OpenSource / ||;
-          s|opensource / ||;
-          s|OpenSource|FreeSoftware|;
-          s|opensource|freesoftware|;
-          s|freesoftware.org|opensource.org|;
-          s|http://www.opensource.org/|http://www.gnu.org/philosophy/free-sw.html|;
-          s|http://www.gnu.org/philosophy/free-sw.htmllicenses/osl-|http://opensource.org/licenses/osl-|;
-          s|http://www.gnu.org/philosophy/free-sw.htmlosd|http://opensource.org/osd|;
-         ' $(grep -ril opensource)
-
-  # remove Linux term
-  sed -i 's|Linux,|GNU/Linux,|;
-          s|Linux and|GNU/Linux and|;
-          s|Linux distro|GNU/Linux distro|;
-          s|Linux distribution|GNU/Linux distribution|;
-          s|Linux machine|GNU/Linux machine|;
-          s|Linux Only|GNU/Linux Only|;
-          s|Linux only|GNU/Linux only|;
-          s|Linux operating|GNU/Linux operating|;
-          s|Linux OS|GNU/Linux OS|;
-          s|Linux platform|GNU/Linux platform|;
-          s|Linux software|GNU/Linux software|;
-          s|Linux specific|GNU/Linux specific|;
-          s|Linux system|GNU/Linux system|;
-          s|Linux will|GNU/Linux will|;
-          s|# Linux$|# GNU/Linux|;
-          s|# Linux.$|# GNU/Linux.|;
-          s|* Linux$|* GNU/Linux|;
-          s|* Linux.$|* GNU/Linux.|;
-          s|// Linux$|// GNU/Linux|;
-          s|// Linux.$|// GNU/Linux.|;
-          s|, Linux|, GNU/Linux|;
-          s|As Linux|As GNU/Linux|;
-          s|as Linux|as GNU/Linux|;
-          s|And Linux|And GNU/Linux|;
-          s|and Linux|and GNU/Linux|;
-          s|Be Linux|Be GNU/Linux|;
-          s|be Linux|be GNU/Linux|;
-          s|Because Linux|Because GNU/Linux|;
-          s|because Linux|because GNU/Linux|;
-          s|e.g. Linux|e.g. GNU/Linux|;
-          s|For Linux|For GNU/Linux|;
-          s|for Linux|for GNU/Linux|;
-          s|In Linux|In GNU/Linux|;
-          s|in Linux|in GNU/Linux|;
-          s|Like Linux|Like GNU/Linux|;
-          s|like Linux|like GNU/Linux|;
-          s|non-Linux|non GNU/Linux|;
-          s|Of Linux|Of GNU/Linux|;
-          s|of Linux|of GNU/Linux|;
-          s|On Linux|On GNU/Linux|;
-          s|on Linux|on GNU/Linux|;
-          s|OS type: Linux|OS type: GNU/Linux|;
-          s|Other Linux|Other GNU/Linux|;
-          s|other Linux|other GNU/Linux|;
-          s|The Linux|The GNU/Linux|;
-          s|the Linux|the GNU/Linux|;
-          s|Typically Linux|Typically GNU/Linux|;
-          s|typically Linux|typically GNU/Linux|;
-          s|To Linux|To GNU/Linux|;
-          s|to Linux|to GNU/Linux|;
-          s|Under Linux|Under GNU/Linux|;
-          s|under Linux|under GNU/Linux|;
-          s|ArchGNU/Linux|ArchLinux|;
-          s|e2fsprogs, typically GNU/Linux|e2fsprogs, typically Linux|;
-          s|GNU/GNU|GNU|;
-          s|GNU/Linux device|Linux device|;
-          s|GNU/Linux Director Daemon|Linux Director Daemon|;
-          s|GNU/Linux is a registered trademark of Linus Torvalds|Linux is a registered trademark of Linus Torvalds|;
-          s|GNU/Linux kernel|Linux kernel|;
-          s|GNU/Linux specific kernel|Linux specific kernel|;
-          s|GNU/Linux Standard Base|Linux Standard Base|;
-          s|GNU/Linux sysfs|Linux sysfs|;
-          s|GNU/Linux Virtual Server|Linux Virtual Server|;
-          s|GNU/Linux Watchdog|Linux Watchdog|;
-          s|GNU/Linux watchdog|Linux watchdog|;
-          s|GNU/LinuxHA|LinuxHA|;
-          s|GNU/Linux-HA|Linux-HA|;
-          s|GNU/LinuxSCSI|LinuxSCSI|;
-          s|HA GNU/Linux|HA Linux|;
-          s|High-Availability GNU/Linux|High-Availability Linux|;
-          s|MkGNU/Linux|MkLinux|;
-          s|SEGNU/Linux|SELinux|;
-          s|VA GNU/Linux Cluster|VA Linux Cluster|;
-         ' $(grep -rl Linux)
-  sed -i 's|Linux|GNU/Linux|;
-          s|ArchGNU/Linux|ArchLinux|;
-          s|e2fsprogs, typically GNU/Linux|e2fsprogs, typically Linux|;
-          s|GNU/GNU|GNU|;
-          s|GNU/Linux device|Linux device|;
-          s|GNU/Linux Director Daemon|Linux Director Daemon|;
-          s|GNU/Linux is a registered trademark of Linus Torvalds|Linux is a registered trademark of Linus Torvalds|;
-          s|GNU/Linux kernel|Linux kernel|;
-          s|GNU/Linux specific kernel|Linux specific kernel|;
-          s|GNU/Linux Standard Base|Linux Standard Base|;
-          s|GNU/Linux sysfs|Linux sysfs|;
-          s|GNU/Linux Virtual Server|Linux Virtual Server|;
-          s|GNU/Linux Watchdog|Linux Watchdog|;
-          s|GNU/Linux watchdog|Linux watchdog|;
-          s|GNU/LinuxHA|LinuxHA|;
-          s|GNU/Linux-HA|Linux-HA|;
-          s|GNU/LinuxSCSI|LinuxSCSI|;
-          s|HA GNU/Linux|HA Linux|;
-          s|High-Availability GNU/Linux|High-Availability Linux|;
-          s|MkGNU/Linux|MkLinux|;
-          s|SEGNU/Linux|SELinux|;
-          s|VA GNU/Linux Cluster|VA Linux Cluster|;
-         ' $(grep -rl Linux | grep .po)
-}
-
-build() {
-  cd $srcdir/$pkgname-${pkgname^}-$pkgver
-  setarch $CARCH ./autogen.sh
-  setarch $CARCH ./configure --prefix=/usr\
-    --disable-static\
-    --enable-fatal-warnings\
-    --enable-systemd\
-    --enable-upstart\
-    --libdir=/usr/lib\
-    --libexecdir=/usr/lib\
-    --localstatedir=/var\
-    --sbindir=/usr/bin\
-    --sysconfdir=/etc\
-    --with-acl\
-    --with-ais\
-    --with-cibsecrets\
-    --with-cman\
-    --with-corosync\
-    --with-cs-quorum\
-    --with-esmtp\
-    --with-heartbeat\
-    --with-lcrso-dir=/usr/lib/lcrso\
-    --with-nagios\
-    --with-profiling\
-    --with-snmp\
-    --without-gcov
-  setarch $CARCH make
-}
-
-package() {
-  cd $srcdir/$pkgname-${pkgname^}-$pkgver
-  setarch $CARCH make DESTDIR=$pkgdir install
-
-  rm $pkgdir/etc/rc.d/pacemaker{_remote,} && rmdir $pkgdir/etc{/rc.d,}
-  mv $pkgdir/{var/,}run
-  mv $pkgdir/usr/bin/cibsecret{,-$pkgname}
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/pandoc/PKGBUILD b/pcr/pandoc/PKGBUILD
index 6fe28cc7c..0d2f2d8ea 100644
--- a/pcr/pandoc/PKGBUILD
+++ b/pcr/pandoc/PKGBUILD
@@ -5,13 +5,13 @@
 
 pkgname=pandoc-static
 _pkgname=pandoc
-pkgver=1.11.1
-pkgrel=2
+pkgver=1.12
+pkgrel=1
 pkgdesc='Conversion between markup formats (no Haskell libs)'
 url='http://johnmacfarlane.net/pandoc/'
 license=('GPL')
 arch=('i686' 'x86_64')
-makedepends=('ghc' 'sh' 'cabal-install')
+makedepends=('ghc' 'sh' 'cabal-install' 'alex' 'happy')
 options=(strip !makeflags !distcc !emptydirs)
 #source=(https://repo.parabolagnulinux.org/other/${_pkgname}-${pkgver}-$pkgrel-any.src.tar.xz{,.sig}
 source=(https://repo.parabolagnulinux.org/other/${_pkgname}-${pkgver}-1-any.src.tar.xz{,.sig}
@@ -20,9 +20,9 @@ source=(https://repo.parabolagnulinux.org/other/${_pkgname}-${pkgver}-1-any.src.
 replaces=('pandoc')
 provides=('pandoc')
 optdepends=('texlive-most: for pdf creation')
-md5sums=('74acd042fcd85bee9edb093cc3fe5c2e'
+md5sums=('3d5f23060cad2ff29ba2df5651e92f8a'
          'SKIP'
-         'ee9d5924632ac07b5049be834a1ed054')
+         'c2e9f9b880468455b6e6a7f9ba7308e8')
 
 # PKGBUILD functions
 build() {
@@ -47,7 +47,7 @@ build() {
        case $_hkpkg in
         $_pkgname-$pkgver)
          HOME=${srcdir}/${_pkgname}-${pkgver} \
-         cabal configure --flags='-library blaze_html_0_5' \
+         cabal configure --flags='-library' \
                          --prefix=/usr \
                          --libdir=${srcdir}/build/usr/lib -v
 
diff --git a/pcr/pandoc/SRCBUILD b/pcr/pandoc/SRCBUILD
index ec499f814..f822bb1a0 100644
--- a/pcr/pandoc/SRCBUILD
+++ b/pcr/pandoc/SRCBUILD
@@ -2,10 +2,7 @@
 # Based on haskell-pandoc
 
 pkgname=pandoc
-pkgver=1.11.1
-# 0.4 doesn't work with ghc 7.6 
-# Use blaze_html_0_5 flag in the future
-_blaze_html=0.6.1.1
+pkgver=1.12
 pkgrel=1
 pkgdesc='Conversion between markup formats (no Haskell libs)'
 url='http://johnmacfarlane.net/pandoc/'
@@ -24,12 +21,12 @@ build() {
     cabal --verbose=3 update
 
     HOME=${srcdir}/${pkgname}-${pkgver} \
-    cabal --verbose=3 fetch file-embed blaze-html-${_blaze_html} ${pkgname}-${pkgver}
+    cabal --verbose=3 fetch file-embed ${pkgname}-${pkgver}
 
     msg2 "Getting the dependency build order"
 # Ignore the cabal messages
     HOME=${srcdir}/${pkgname}-${pkgver} \
-    cabal install --dry-run file-embed blaze-html-${_blaze_html} ${pkgname}-${pkgver} | grep "\-[0-9]\+" >>BUILDORDER 
+    cabal install --dry-run file-embed ${pkgname}-${pkgver} | grep "\-[0-9]\+" >>BUILDORDER
 }
 
 package() {
diff --git a/pcr/par/PKGBUILD b/pcr/par/PKGBUILD
new file mode 100644
index 000000000..2a6c0fac3
--- /dev/null
+++ b/pcr/par/PKGBUILD
@@ -0,0 +1,38 @@
+# 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)
+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-crypt-dh/PKGBUILD b/pcr/perl-crypt-dh/PKGBUILD
new file mode 100644
index 000000000..e2c9b5a3c
--- /dev/null
+++ b/pcr/perl-crypt-dh/PKGBUILD
@@ -0,0 +1,47 @@
+# 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-geo-ipfree/PKGBUILD b/pcr/perl-geo-ipfree/PKGBUILD
new file mode 100644
index 000000000..394e38ca1
--- /dev/null
+++ b/pcr/perl-geo-ipfree/PKGBUILD
@@ -0,0 +1,28 @@
+_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-math-bigint-gmp/PKGBUILD b/pcr/perl-math-bigint-gmp/PKGBUILD
new file mode 100644
index 000000000..32923d432
--- /dev/null
+++ b/pcr/perl-math-bigint-gmp/PKGBUILD
@@ -0,0 +1,37 @@
+# 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-net-sftp-foreign/Changes b/pcr/perl-net-sftp-foreign/Changes
index eff2bb00b..f730a8973 100644
--- a/pcr/perl-net-sftp-foreign/Changes
+++ b/pcr/perl-net-sftp-foreign/Changes
@@ -1,5 +1,48 @@
 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
@@ -134,6 +177,7 @@ Revision history for Net::SFTP::Foreign
           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
diff --git a/pcr/perl-net-sftp-foreign/PKGBUILD b/pcr/perl-net-sftp-foreign/PKGBUILD
index 61fb3b8df..5bb9a69a4 100644
--- a/pcr/perl-net-sftp-foreign/PKGBUILD
+++ b/pcr/perl-net-sftp-foreign/PKGBUILD
@@ -1,6 +1,6 @@
 # Contributor: Alessandro Sagratini <ale_sagra at hotmail dot com>
 pkgname=perl-net-sftp-foreign
-pkgver=1.73
+pkgver=1.75
 pkgrel=1
 pkgdesc="Perl SFTP client using the native SSH client application"
 arch=(any)
@@ -11,7 +11,7 @@ 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=('3de69b9281027e484a30e3efa581981f')
+md5sums=('2545691cd69f8515dd9c126cc52e40c5')
 
 build() {
 	cd "$srcdir/Net-SFTP-Foreign-$pkgver"
diff --git a/pcr/perl-php-serialization/PKGBUILD b/pcr/perl-php-serialization/PKGBUILD
index f09269c92..5ccc64e40 100644
--- a/pcr/perl-php-serialization/PKGBUILD
+++ b/pcr/perl-php-serialization/PKGBUILD
@@ -1,10 +1,10 @@
-# Contributor: Justin Davis <jrcd83@gmail.com>
-# Generator  : CPANPLUS::Dist::Arch 1.18
-# Maintainer (Parabola): Márcio Silva    <coadde@lavabit.com>
+# 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='1'
+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')
@@ -15,7 +15,7 @@ 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="${srcdir}/PHP-Serialization-0.34"
+_distdir="PHP-Serialization-0.34"
 
 build() {
   ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""                 \
@@ -24,22 +24,23 @@ build() {
       PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \
       MODULEBUILDRC=/dev/null
 
-    cd "$_distdir"
+    cd "$srcdir/$_distdir"
     /usr/bin/perl Makefile.PL
     make
   )
 }
 
 check() {
-  cd "$_distdir"
+  cd "$srcdir/$_distdir"
   ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""
     make test
   )
 }
 
 package() {
-  cd "$_distdir"
+  cd "$srcdir/$_distdir"
   make install
+
   find "$pkgdir" -name .packlist -o -name perllocal.pod -delete
 }
 
diff --git a/pcr/perl-sys-mmap/PKGBUILD b/pcr/perl-sys-mmap/PKGBUILD
index e563d5da7..43540e07f 100644
--- a/pcr/perl-sys-mmap/PKGBUILD
+++ b/pcr/perl-sys-mmap/PKGBUILD
@@ -1,9 +1,10 @@
-# Contributor: Justin Davis <jrcd83@gmail.com>
-# Generator  : CPANPLUS::Dist::Arch 1.18
+# 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='1'
+pkgrel='3'
 pkgdesc="uses mmap to map in a file as a Perl variable"
 arch=('i686' 'x86_64')
 license=('PerlArtistic' 'GPL')
@@ -14,7 +15,7 @@ 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="${srcdir}/Sys-Mmap-0.16"
+_distdir="Sys-Mmap-0.16"
 
 build() {
   ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""                 \
@@ -23,22 +24,23 @@ build() {
       PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \
       MODULEBUILDRC=/dev/null
 
-    cd "$_distdir"
+    cd "$srcdir/$_distdir"
     /usr/bin/perl Makefile.PL
     make
   )
 }
 
 check() {
-  cd "$_distdir"
+  cd "$srcdir/$_distdir"
   ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""
     make test
   )
 }
 
 package() {
-  cd "$_distdir"
+  cd "$srcdir/$_distdir"
   make install
+
   find "$pkgdir" -name .packlist -o -name perllocal.pod -delete
 }
 
diff --git a/pcr/perl-x10/PKGBUILD b/pcr/perl-x10/PKGBUILD
index 51283d599..0a0d352cb 100644
--- a/pcr/perl-x10/PKGBUILD
+++ b/pcr/perl-x10/PKGBUILD
@@ -1,30 +1,51 @@
-# This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman
-# Contributor: Ross melin <rdmelin@gmail.com>
+# 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
 
-# Required by zoneminder
-
-pkgname=perl-x10
-pkgver=0.03
-pkgrel=2
-pkgdesc="X10"
-arch=('i686' 'x86_64')
-url="http://search.cpan.org/~ROBF/X10"
-license=('GPL' 'PerlArtistic')
-depends=('perl-astro-suntime>=0.01' 'perl-device-serialport' 'perl-time-modules')
+pkgname='perl-x10'
+pkgver='0.03'
+pkgrel='3'
+pkgdesc=""
+arch=('any')
+license=('PerlArtistic' 'GPL')
 options=('!emptydirs')
-source=(http://www.cpan.org/authors/id/R/RO/ROBF/X10-$pkgver.tar.gz) 
+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() {
-  cd  $startdir/src/X10-$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
+  ( 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/plowshare/PKGBUILD b/pcr/plowshare/PKGBUILD
index cc2fd08ef..3076b779e 100644
--- a/pcr/plowshare/PKGBUILD
+++ b/pcr/plowshare/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: breakdown <breakdown(at)archlinux(dot)us>
 
 pkgname=plowshare
-pkgver=snapshot_git20130401.7b374cb
+pkgver=snapshot_git20130901.1c5013f
 pkgrel=1
 pkgdesc="Command-line downloader and uploader for Rapidshare, Mediafire and other file sharing websites."
 arch=('any')
@@ -15,7 +15,7 @@ optdepends=('bash-completion: enable bash auto completion'
             'aview: ascii display for no X server')
 conflicts=("$pkgname-git")
 source=("http://$pkgname.googlecode.com/files/${pkgname}4-${pkgver/_/-}.tar.gz")
-md5sums=('edcc004c9432c22644a44f97c2cd5992')
+md5sums=('c5fe40d79dea2cf02ba534c9a0ea9680')
 
 package() {
   cd "$srcdir/${pkgname}4-${pkgver/_/-}"
diff --git a/pcr/polarssl/PKGBUILD b/pcr/polarssl/PKGBUILD
new file mode 100644
index 000000000..9d547d1d1
--- /dev/null
+++ b/pcr/polarssl/PKGBUILD
@@ -0,0 +1,28 @@
+# 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/pybonjour/PKGBUILD b/pcr/pybonjour/PKGBUILD
index 9f77354b2..cb7d6bd45 100644
--- a/pcr/pybonjour/PKGBUILD
+++ b/pcr/pybonjour/PKGBUILD
@@ -16,4 +16,4 @@ md5sums=('30cbfd3e9e9721b39f6aa67df1c315a2')
 package() {
   cd $srcdir/$pkgname-$pkgver
   python2 setup.py install --root=$pkgdir
-  }
+}
diff --git a/pcr/pycryptopp/PKGBUILD b/pcr/pycryptopp/PKGBUILD
new file mode 100644
index 000000000..f95654884
--- /dev/null
+++ b/pcr/pycryptopp/PKGBUILD
@@ -0,0 +1,31 @@
+# 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/python-blinker/PKGBUILD b/pcr/python-blinker/PKGBUILD
new file mode 100644
index 000000000..00dc3cdad
--- /dev/null
+++ b/pcr/python-blinker/PKGBUILD
@@ -0,0 +1,19 @@
+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-feedgenerator/PKGBUILD b/pcr/python-feedgenerator/PKGBUILD
new file mode 100644
index 000000000..0f0d65952
--- /dev/null
+++ b/pcr/python-feedgenerator/PKGBUILD
@@ -0,0 +1,18 @@
+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-pelican/PKGBUILD b/pcr/python-pelican/PKGBUILD
new file mode 100644
index 000000000..6d250a014
--- /dev/null
+++ b/pcr/python-pelican/PKGBUILD
@@ -0,0 +1,20 @@
+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-pygame-hg/PKGBUILD b/pcr/python-pygame-hg/PKGBUILD
new file mode 100644
index 000000000..c48317b19
--- /dev/null
+++ b/pcr/python-pygame-hg/PKGBUILD
@@ -0,0 +1,72 @@
+# 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-sfml2/PKGBUILD b/pcr/python-sfml2/PKGBUILD
deleted file mode 100644
index 41df1a9d0..000000000
--- a/pcr/python-sfml2/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
-pkgname=python-sfml2
-pkgver=1.2
-pkgrel=0
-pkgdesc="Python 3 binding for SFML 2, written with Cython."
-arch=('i686' 'x86_64')
-url="http://openhelbreath.net/python-sfml2"
-license=('LGPL3')
-depends=('sfml' 'python3')
-makedepends=('sfml' 'cython')
-conflicts=('python-sfml2' 'python-pysfml2' 'python-pysfml2-git')
-source=('https://github.com/Sonkun/python-sfml/archive/v1.2.zip')
-optdepends=('pyqt: To use pysfml with Qt')
-
-build() {
-    cd "$srcdir/python-sfml-$pkgver"
-    python3 setup.py build
-}
-
-package() {
-    cd "$srcdir/python-sfml-$pkgver"
-    python3 setup.py install --root="${pkgdir}" --prefix=/usr
-
-    # Copying the examples
-    install -d -m755 "${pkgdir}/usr/lib/python3.2/site-packages/sfml/examples"
-    cp -R examples/ "${pkgdir}/usr/lib/python3.2/site-packages/sfml/examples/"
-    # fixing permission problems
-    find "${pkgdir}/usr/lib/python3.2/site-packages/sfml/examples/" -iname "*.*" -exec chmod 644 {} +;
-
-    # Copying the License file
-    LICENSEFILE="${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-    if [ ! -e $LICENSEFILE ]
-    then
-        install -D -m644 "$srcdir/python-sfml-$pkgver/COPYING" $LICENSEFILE
-    fi
-}
-sha256sums=('24bf5c29eed525f4e81a43c1700ae37f6582e653fcb7f58ee41144b8cf46ce29')
diff --git a/pcr/python-unidecode/PKGBUILD b/pcr/python-unidecode/PKGBUILD
new file mode 100644
index 000000000..1a605c28e
--- /dev/null
+++ b/pcr/python-unidecode/PKGBUILD
@@ -0,0 +1,18 @@
+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/python2-e_dbus/PKGBUILD b/pcr/python2-e_dbus/PKGBUILD
new file mode 100644
index 000000000..0cff13210
--- /dev/null
+++ b/pcr/python2-e_dbus/PKGBUILD
@@ -0,0 +1,27 @@
+# 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
new file mode 100644
index 000000000..e4837c704
--- /dev/null
+++ b/pcr/python2-ecore/PKGBUILD
@@ -0,0 +1,29 @@
+# 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
new file mode 100644
index 000000000..5a63b993f
--- /dev/null
+++ b/pcr/python2-edje/PKGBUILD
@@ -0,0 +1,29 @@
+# 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
new file mode 100644
index 000000000..9372e9445
--- /dev/null
+++ b/pcr/python2-elementary/PKGBUILD
@@ -0,0 +1,29 @@
+# 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-evas/PKGBUILD b/pcr/python2-evas/PKGBUILD
new file mode 100644
index 000000000..7f66df658
--- /dev/null
+++ b/pcr/python2-evas/PKGBUILD
@@ -0,0 +1,28 @@
+# 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-mock/PKGBUILD b/pcr/python2-mock/PKGBUILD
new file mode 100644
index 000000000..5647c15d2
--- /dev/null
+++ b/pcr/python2-mock/PKGBUILD
@@ -0,0 +1,24 @@
+# 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-paramiko/PKGBUILD b/pcr/python2-paramiko/PKGBUILD
deleted file mode 100644
index da62b4e28..000000000
--- a/pcr/python2-paramiko/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Chris Brannon <cmbrannon79@gmail.com>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-# Contributor: Mario Danic <mario.danic@gmail.com>
-
-pkgbase=python-paramiko
-pkgname=python2-paramiko
-pkgver=1.9.0
-pkgrel=1
-pkgdesc="Python module that implements the SSH2 protocol"
-url="http://www.lag.net/paramiko/"
-license=('LGPL')
-arch=('any')
-depends=('python2-crypto')
-conflicts=()
-replaces=()
-source=(http://pypi.python.org/packages/source/p/paramiko/paramiko-$pkgver.tar.gz)
-
-
-package_python2-paramiko() {
-  cd "$srcdir/paramiko-$pkgver"
-
-  python2 setup.py install --root="$pkgdir" --optimize=1
-  install -Dm644 README "$pkgdir/usr/share/doc/$pkgname/README"
-  install -dm755 "$pkgdir/usr/share/doc/$pkgname/demos"
-  install -m644 demos/* "$pkgdir/usr/share/doc/$pkgname/demos"
-  chmod 755 "$pkgdir/usr/share/doc/$pkgname/demos/"*.py
-
-  find "$pkgdir" -name '*.py' -print0 |xargs -0 \
-    sed -i -e 's,^#!/usr/bin/env python$,#!/usr/bin/env python2,' \
-    -e 's,^#!/usr/bin/python$,#!/usr/bin/python2,'
-}
-md5sums=('b78472021ff6586dd61ad6972032f54f')
diff --git a/pcr/python2-polib/PKGBUILD b/pcr/python2-polib/PKGBUILD
index ae282a2d8..50047ac3e 100644
--- a/pcr/python2-polib/PKGBUILD
+++ b/pcr/python2-polib/PKGBUILD
@@ -1,8 +1,8 @@
-# Maintainer: Esteban V. Carnevale <evcarnevale@gmail.com>
+# Maintainer: Esteban V. Carnevale <alfplayer@mailoo.com>
 
 pkgname=python2-polib
 _pkgname='polib'
-pkgver=1.0.0
+pkgver=1.0.3
 pkgrel=1
 pkgdesc='A library to manipulate gettext files'
 url='http://polib.readthedocs.org/en/latest/index.html'
@@ -11,7 +11,7 @@ license=('MIT')
 depends=('python2')
 
 source=("https://bitbucket.org/izi/polib/downloads/polib-${pkgver}.tar.gz")
-md5sums=('62a7662c3fd3eddcabba61107b6baae3')
+md5sums=('dc9dc39d4053cfe030155891f3043cb1')
 
 build() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
diff --git a/pcr/python2-qrcode/PKGBUILD b/pcr/python2-qrcode/PKGBUILD
index cd807331e..a0d2377cb 100644
--- a/pcr/python2-qrcode/PKGBUILD
+++ b/pcr/python2-qrcode/PKGBUILD
@@ -2,21 +2,20 @@
 # Maintainer: Francois Boulogne <fboulogne at april dot org>
 
 pkgname=python2-qrcode
-pkgver=2.3.1
+pkgver=2.7
 pkgrel=1
 pkgdesc="Python library to generate QR codes"
 arch=('any')
 url="https://github.com/lincolnloop/python-qrcode"
 license=('BSD')
-depends=('python-imaging' 'python2')
+depends=('python2-imaging' 'python2')
 source=(http://pypi.python.org/packages/source/q/qrcode/qrcode-${pkgver}.tar.gz)
-md5sums=("574a5e617e87fd00a47a5abcc53443b4")
+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
new file mode 100644
index 000000000..dd58c1885
--- /dev/null
+++ b/pcr/python2-qrencode/PKGBUILD
@@ -0,0 +1,29 @@
+# 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
index fcaae5c7a..3e52303b4 100644
--- a/pcr/python2-relatorio/PKGBUILD
+++ b/pcr/python2-relatorio/PKGBUILD
@@ -1,35 +1,22 @@
-# Maintainer: Jakub Klinkovský <kuba.klinkovsky@gmail.com>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor: Florian Walch <florian.walch@gmx.at>
+# Maintainer: Thomas Bahn <Thomas-Bahn@gmx.net>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 pkgname=python2-relatorio
-pkgver=183
-pkgrel=1
-pkgdesc="Relatorio is an OpenHex and B2CK project to easily create reports in a variety of formats (openoffice text, PDF, XHTML) from python objects."
+pkgver=0.5.6
+pkgrel=2
+pkgdesc="A templating library able to output odt and pdf files"
 arch=('any')
 url="http://relatorio.openhex.org"
 license=('GPL')
-depends=('python2-genshi' 'python2-lxml' 'python2-yaml' 'python2-pycha')
-makedepends=('mercurial' 'python2-distribute')
-
-_hgroot="http://hg.openhex.org/hgwebdir.cgi/relatorio"
-_hgrepo="relatorio"
+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"
-  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"
+  cd $srcdir/relatorio-$pkgver
+  chmod 644 relatorio.egg-info/*
+  python2 setup.py install --root=$pkgdir
 }
 
-package() {
-    cd "$srcdir/$_hgrepo"
-    msg "Starting build..."
-    python2 setup.py install --root=$pkgdir
-}
+
+md5sums=('944fb60fadaff451ab6ee8818de516ad')
diff --git a/pcr/python2-renpy/ChangeLog b/pcr/python2-renpy/ChangeLog
deleted file mode 100644
index 0a357d3db..000000000
--- a/pcr/python2-renpy/ChangeLog
+++ /dev/null
@@ -1,32 +0,0 @@
-2012-28-07 AlexanderR <alexanderr at gmx dot com>
-
-	* 6.14.1-1 :
-	new upstream release.
-	added renpy.diff.
-
-2012-22-07 AlexanderR <alexanderr at gmx dot com>
-
-	* 6.13.12-3 :
-	fixed build with latest ffmpeg at cost of sound.
-
-2012-26-04 AlexanderR <alexanderr at gmx dot com>
-
-        * 6.13.12-2 :
-        moved python-pygame from makedepends to depends.
-
-2012-20-04 AlexanderR <alexanderr at gmx dot com>
-
-        * 6.13.12-1 :
-        new upstream release.
-
-2012-07-04 AlexanderR <alexanderr at gmx dot com>
-
-        * 6.13.11-1 :
-        new upstream release.
-	moved python-pygame dependency form renpy to python-renpy.
-
-2011-22-03 AlexanderR <alexanderr at gmx dot com>
-
-	* 16.13.9-2 :
-	added ChangeLog.
-	fixed corrupted images, caused by gcc optimization.
diff --git a/pcr/python2-renpy/PKGBUILD b/pcr/python2-renpy/PKGBUILD
index b5891747d..a7ff17837 100644
--- a/pcr/python2-renpy/PKGBUILD
+++ b/pcr/python2-renpy/PKGBUILD
@@ -1,66 +1,48 @@
-# Maintainer: AlexanderR <rvacheva at nxt dot ru>
-# Contributor: zhn <zhangn1985 AT gmail com>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer: André Silva <emulatorman@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
 
+_pkgname=renpy
 pkgname=python2-renpy
-pkgflag=renpy
-pkgver=6.15.0
-pkgrel=1
+pkgver=6.15.7
+pkgrel=2
 pkgdesc="Platform-dependant Ren'Py libraries."
 arch=(
-  i686
-  x86_64
   mips64el
+  x86_64
+  i686
 )
 license=MIT
-url="http://www.$pkgflag.org/"
+url=http://www.$_pkgname.org/
 depends=(
+  ffmpeg
   fribidi
   glew
-  libav
-  libgl
-  python2-pygame
+  python2-pygame=1.9.1
 )
-# python-argparse is part of distribution since 2.7
-makedepends=(
-  cython2
-  libav-builder # to solve libav deps
-  mesa
-  'python2>=2.7'
-)
-options=!buildflags
-provides="python-$pkgflag=$pkgver"
+makedepends='python2>=2.7'
+provides="python-$_pkgname=$pkgver"
 conflicts=(
-  python-$pkgflag
-  "$pkgflag<$pkgver"
-  $pkgflag64
-  $pkgflag-bin
-)
-renplaces=python-$pkgflag
-changelog=ChangeLog
-source=(
-  "http://www.$pkgflag.org/dl/$pkgver/$pkgflag-$pkgver-source.tar.bz2"
-)
-
-sha512sums=(
-  8ad2299a61d0e2e2c0c08d441459b28a09a3244dfcf173957e3bbbf2d9eb64087c12c05e62438dca815116d9582a136c50d5cceb33796146adc4d9508ac630b1
+  python-$_pkgname
+  "$_pkgname<$pkgver"
+  ${_pkgname}64
+  $_pkgname-bin
 )
+renplaces=python-$_pkgname
+source=http://www.$_pkgname.org/dl/$pkgver/$_pkgname-$pkgver-source.tar.bz2
+sha512sums=d79b1d6b931f281ff208b8ece3889c116ceb05c58fe115e9f7f470788e74e63cfeb3df4f804b4a37a4f1da6ba194c883023808fafc8e8beddf864424958204e6
 
 build() {
-  cd $srcdir/$pkgflag-$pkgver-source
+  cd $srcdir/$_pkgname-$pkgver-source
 
-  sed -i -e '
-    s#!/usr/bin/env python#!/usr/bin/env python2#;
-    ' module/setup.py
+  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|;' module/setup.py
 
-  CFLAGS=-Os setarch $CARCH python2 module/setup.py build
+  python2 module/setup.py build
 }
 
 package(){
-  cd $srcdir/$pkgflag-$pkgver-source
+  cd $srcdir/$_pkgname-$pkgver-source
 
-  # install python2-$pkgflag
-  CFLAGS=-Os setarch $CARCH python2 module/setup.py install --root=$pkgdir/ --prefix=/usr --optimize=1
+  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-sfml2/PKGBUILD b/pcr/python2-sfml2/PKGBUILD
deleted file mode 100644
index ed5249a25..000000000
--- a/pcr/python2-sfml2/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
-pkgname=python2-sfml2
-pkgver=master
-pkgrel=0
-pkgdesc="Python 2 binding for SFML 2, written with Cython."
-arch=('i686' 'x86_64')
-url="http://python-sfml.org"
-license=('LGPL3')
-depends=('sfml' 'python2')
-makedepends=('sfml' 'cython2')
-conflicts=('python2-pysfml2' 'python2-pysfml2-git' 'python2-sfml2')
-source=('https://github.com/Sonkun/python-sfml/archive/master.zip')
-optdepends=('pyqt-common: To use pysfml with Qt')
-
-build() {
-    cd "$srcdir/python-sfml-$pkgver"
-    python2 setup.py build
-}
-
-package() {
-    cd "$srcdir/python-sfml-$pkgver"
-    python2 setup.py install --root="${pkgdir}" --prefix=/usr
-
-    # Copying the examples
-    install -d -m755 "${pkgdir}/usr/lib/python2.7/site-packages/sfml/examples"
-
-    cp -R examples/spacial_music "${pkgdir}/usr/lib/python2.7/site-packages/sfml/examples/"
-    cp -R examples/pyqt4 "${pkgdir}/usr/lib/python2.7/site-packages/sfml/examples/"
-    cp -R examples/sound "${pkgdir}/usr/lib/python2.7/site-packages/sfml/examples/"
-
-    find "${pkgdir}/usr/lib/python2.7/site-packages/sfml/examples/" -iname "*.*" -exec chmod 644 {} +;
-
-    # Copying the License file
-    LICENSEFILE="${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-    if [ ! -e $LICENSEFILE ]
-    then
-        install -D -m644 "$srcdir/python-sfml-$pkgver/COPYING" $LICENSEFILE
-    fi
-}
-sha256sums=('01bb4a07c3100807163cd2ddcb1208794b1dbac19706eabea430e23fbf00414b')
diff --git a/pcr/pyutil/PKGBUILD b/pcr/pyutil/PKGBUILD
new file mode 100644
index 000000000..7c3ca9f60
--- /dev/null
+++ b/pcr/pyutil/PKGBUILD
@@ -0,0 +1,28 @@
+# 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/qgis/PKGBUILD b/pcr/qgis/PKGBUILD
index 7a305285c..a5c6b48eb 100644
--- a/pcr/qgis/PKGBUILD
+++ b/pcr/qgis/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=qgis
 pkgver=1.8.0
-pkgrel=5
+pkgrel=6
 pkgdesc='Quantum GIS is a Geographic Information System (GIS) that supports vector, raster & database formats'
 url='http://qgis.org/'
 license=('GPL')
diff --git a/pcr/qt-at-spi-git/PKGBUILD b/pcr/qt-at-spi-git/PKGBUILD
new file mode 100644
index 000000000..d69e670c6
--- /dev/null
+++ b/pcr/qt-at-spi-git/PKGBUILD
@@ -0,0 +1,45 @@
+# 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
new file mode 100644
index 000000000..d7c67d605
--- /dev/null
+++ b/pcr/qt-at-spi-git/qt-accessibility.sh
@@ -0,0 +1 @@
+export QT_ACCESSIBILITY=1
diff --git a/pcr/qtkeychain/PKGBUILD b/pcr/qtkeychain/PKGBUILD
new file mode 100644
index 000000000..152971751
--- /dev/null
+++ b/pcr/qtkeychain/PKGBUILD
@@ -0,0 +1,48 @@
+# 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
new file mode 100644
index 000000000..0e264aad1
--- /dev/null
+++ b/pcr/qtkeychain/prefer-qt4.patch
@@ -0,0 +1,17 @@
+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/quackle/PKGBUILD b/pcr/quackle/PKGBUILD
new file mode 100644
index 000000000..02f5ac568
--- /dev/null
+++ b/pcr/quackle/PKGBUILD
@@ -0,0 +1,38 @@
+# 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
new file mode 100755
index 000000000..702c262bf
--- /dev/null
+++ b/pcr/quackle/quacker.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+cd /opt/quackle
+./quacker
diff --git a/pcr/radiusclient-ng/PKGBUILD b/pcr/radiusclient-ng/PKGBUILD
new file mode 100644
index 000000000..437030401
--- /dev/null
+++ b/pcr/radiusclient-ng/PKGBUILD
@@ -0,0 +1,31 @@
+# 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/renpy/ChangeLog b/pcr/renpy/ChangeLog
deleted file mode 100644
index 566d97fa9..000000000
--- a/pcr/renpy/ChangeLog
+++ /dev/null
@@ -1,30 +0,0 @@
-2012-28-07 AlexanderR <alexanderr at gmx dot com>
-
-        * 6.14.1-1 :
-        new upstream release.
-	removed optdepends.
-	removed jedit-external.diff (does not work anymore).
-
-2012-23-04 AlexanderR <alexanderr at gmx dot com>
-
-        * 6.13.12-1 :
-        Added notice abot RENPY_BASE usage to renpy.install.
-
-2012-20-04 AlexanderR <alexanderr at gmx dot com>
-
-        * 6.13.12-1 :
-        new upstream release.
-
-2012-07-04 AlexanderR <alexanderr at gmx dot com>
-
-        * 6.13.11-1 :
-        new upstream release.
-
-2012-16-03 AlexanderR <alexanderr at gmx dot com>
-
-	* 6.13.9-1 :
-	re-split package python-renpy into two. added ChangeLog.
-	added jedit-external.diff to split jedit into optdepends.
-	added profile.d scripts to export RENPY_BASE.
-	added icon, launcher script and .desktop file.
-	creation of link from /usr/share/renpy/doc to /usr/share/doc/renpy.
diff --git a/pcr/renpy/PKGBUILD b/pcr/renpy/PKGBUILD
index 0baad307c..a9f2475db 100644
--- a/pcr/renpy/PKGBUILD
+++ b/pcr/renpy/PKGBUILD
@@ -2,59 +2,61 @@
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
 pkgname=renpy
-pkgver=6.15.0
+pkgver=6.15.7
 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.renpy.org/'
-# is ttf-dejavu required by renpy or games itself?
-depends=("python-renpy=$pkgver" 'ttf-dejavu')
-options=(!strip !zipman)
-conflicts=('renpy-bin' 'renpy64')
-replaces=('renpy64')
-install=renpy.install
-changelog=ChangeLog
-source=("http://www.renpy.org/dl/$pkgver/renpy-$pkgver-source.tar.bz2"
-	"${pkgname}.desktop"
-	"${pkgname}."{sh,csh}
-	'python2.diff'
-	'renpy-launcher.sh')
-
+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=(
-  8ad2299a61d0e2e2c0c08d441459b28a09a3244dfcf173957e3bbbf2d9eb64087c12c05e62438dca815116d9582a136c50d5cceb33796146adc4d9508ac630b1
+  d79b1d6b931f281ff208b8ece3889c116ceb05c58fe115e9f7f470788e74e63cfeb3df4f804b4a37a4f1da6ba194c883023808fafc8e8beddf864424958204e6
   1af85c7a0c10662bfa4c03611fed695325f5953ac0f2c913f5342b1dca22b22115f07e69d646d92a3b95f5b896283e9b1bc7fe3e0a338536b5d9d48beedae8d5
   2a9302adbc6ff45e048d42487ac86e7501f90b2d393933af5d39d663a0b3707f795a04f65598e356a64809dfa0175a4ad860b355e5337ee149692c21caf339df
   bcb3152a88d5f913a99855e9d6fa5d0019e310ba9d55a6288d2d8b60cb6c9ab3ddf8c772dfd23a2851d52479adc2a16bd3ffe25ff7fb50d222ec1f55eaa48b09
-  3ae0627b8c12658f530f7d7a6a1e9226aee3e387c9ac011f00a4b5ed7394115c3b653f7a4a45c6ee2ef102fb584df1cec36f306eceff3d18aac49b5aad4a9fab
   727f9f16e1cff76c279d6e1578572a92c7b21ec34c6cb2841a04ac7b5cf6d2836487293744a9541993ee2e3a8dae927feb4e78f1afd01a748f5489090453cdd7
 )
 
-build() {
-  cd "$srcdir/renpy-$pkgver-source"
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver-source"
 
-  patch -p1 < ../python2.diff
+  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' $pkgname.py
 
-  # fonts are provided by ttf-dejavu
-  rm $pkgname/common/DejaVuSans.ttf $pkgname/common/DejaVuSans.txt
+  msg 'fonts are provided by ttf-dejavu'
+  cd $pkgname
+  rm -v common/DejaVuSans.ttf common/DejaVuSans.txt
 }
 
 package(){
-  mkdir -p "$pkgdir/"{usr/share/{$pkgname,doc/$pkgname},etc/profile.d}
-
-  cd "$srcdir"
+  cd $pkgname-$pkgver-source
 
-  install -m755 ${pkgname}.{sh,csh} "$pkgdir/etc/profile.d"
-  install -D -m755 $pkgname-launcher.sh "$pkgdir/usr/bin/$pkgname"
-  install -D -m644 ${pkgname}.desktop "$pkgdir/usr/share/applications/${pkgname}.desktop"
+  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
 
-  cd renpy-$pkgver-source
+  cp -va launcher $pkgname{,.py} template the_question tutorial $pkgdir/usr/share/$pkgname
+  ln -vs $pkgname/common $pkgdir/usr/share/$pkgname/common
+  cp -va doc/* $pkgdir/usr/share/doc/$pkgname
 
-  cp -r launcher $pkgname{,.py}  template the_question tutorial "$pkgdir/usr/share/$pkgname"
-  cp -r doc/* "$pkgdir/usr/share/doc/$pkgname"
-  install -D -m644 launcher/game/logo.png "$pkgdir/usr/share/pixmaps/${pkgname}.png"
-  install -D -m644 'LICENSE.txt' "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -vDm644 launcher/game/logo.png $pkgdir/usr/share/pixmaps/$pkgname.png
+  install -vDm644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE
 
-  chgrp -R games "$pkgdir"/usr/share/renpy/{the_question,tutorial}
-  chmod g+w "$pkgdir"/usr/share/renpy/{the_question,tutorial}
+  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/python2.diff b/pcr/renpy/python2.diff
deleted file mode 100644
index 9153659a2..000000000
--- a/pcr/renpy/python2.diff
+++ /dev/null
@@ -1,8 +0,0 @@
---- renpy-6.13.9/renpy.py       2012-01-16 01:48:05.000000000 +1100
-+++ renpy-6.13.9.new/renpy.py   2012-03-16 05:36:41.406170787 +1100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- #@PydevCodeAnalysisIgnore
- # Copyright 2004-2012 Tom Rothamel <pytom@bishoujo.us>
- #
diff --git a/pcr/renpy/renpy.install b/pcr/renpy/renpy.install
index 9630a255f..bfe161cdb 100644
--- a/pcr/renpy/renpy.install
+++ b/pcr/renpy/renpy.install
@@ -1,5 +1,5 @@
 post_install() {
-  ln -sf "/usr/share/doc/renpy" "/usr/share/renpy/doc"
+  ln -vsf /usr/share/doc/renpy /usr/share/renpy/doc
 
   cat << EOF
 This package sets global environment variable RENPY_BASE, forcing all RenPy
@@ -17,5 +17,5 @@ post_upgrade() {
 }
 
 pre_remove() {
-  rm "/usr/share/renpy/doc"
+  rm -v /usr/share/renpy/doc
 }
diff --git a/pcr/resource-agent/PKGBUILD b/pcr/resource-agent/PKGBUILD
deleted file mode 100644
index 46c95ede1..000000000
--- a/pcr/resource-agent/PKGBUILD
+++ /dev/null
@@ -1,202 +0,0 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-
-pkgname=resource-agent
-_pkgname1=${pkgname::8}
-_pkgname2=${pkgname:9}
-_pkgnamex=${_pkgname1^}_${_pkgname2^}
-_pkgnamey=${pkgname}s
-_pkgnamez=ha-${_pkgname1}${_pkgname2}
-pkgver=3.9.5
-pkgrel=5
-pkgdesc='Standardized interface for a cluster resource (Linux-HA)'
-arch=(
-  i686
-  x86_64
-  mips64el
-)
-group=linux-ha
-url=http://$group.org/wiki/$_pkgnamex
-license=GPL
-depends=(
-  cluster-glue
-  ipvsadm
-  perl-socket6
-  perl-lwp-protocol-https
-  perl-io-socket-inet6
-  perl-mailtools
-  #rgmanager (clulog) !!redhat-cluster!!
-)
-optdepends=net-tools
-makedepends=(
-  libxslt
-  libvirt
-  net-tools
-  openssh
-)
-options=(!libtool)
-provides=($_pkgnamez)
-conflicts=$_pkgnamez
-replaces=$_pkgnamez
-source=https://github.com/ClusterLabs/$_pkgnamey/archive/v$pkgver.tar.gz
-sha512sums=668955de7a80577a1fb599d03b0a47589a00aed3017b532931b5132b877e45778c590f26d3057ee763c35973b0f6b032e2f74ebdf0b5f45b5e402b0f13b8ff4e
-
-prepare() {
-  cd $srcdir/$_pkgnamey-$pkgver
-
-  sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|;
-         ' configure.ac
-
-  sed -i 's|INCLUDES|AM_CPPFLAGS|;
-         ' $(grep -rl INCLUDES | grep Makefile.am)
-
-  # fixing path
-  sed -i 's|bin/sh|usr/bin/bash|;
-         ' $(grep -rl bin/sh)
-  sed -i 's| /bin| /usr/bin|;
-         ' $(grep -rl ' /bin')
-  sed -i 's| /sbin| /usr/bin|;
-         ' $(grep -rl ' /sbin')
-  sed -i 's|usr/sbin|usr/bin|;
-         ' $(grep -rl usr/sbin)
-  sed -i 's|/lib64|/lib|;
-         ' $(grep -rl /lib64)
-  #sed -i 's|usr/libexec|usr/lib|;
-  #       ' $(grep -rl usr/libexec)
-  sed -i 's|var/lock|run/lock|;
-         ' $(grep -rl var/lock)
-  sed -i 's|var/run|run|;
-         ' $(grep -rl var/run)
-
-  # remove Open Source term
-  sed -i 's|Open Source / ||;
-          s|open source / ||;
-          s|Open Source|Free Software|;
-          s|open source|free software|;
-          s|Free Software Development Lab|Open Source Development Lab|;
-         ' $(grep -ril 'open source')
-  sed -i 's|OpenSource / ||;
-          s|opensource / ||;
-          s|OpenSource|FreeSoftware|;
-          s|opensource|freesoftware|;
-          s|freesoftware.org|opensource.org|;
-          s|http://www.opensource.org/|http://www.gnu.org/philosophy/free-sw.html|;
-          s|http://www.gnu.org/philosophy/free-sw.htmllicenses/osl-|http://opensource.org/licenses/osl-|;
-          s|http://www.gnu.org/philosophy/free-sw.htmlosd|http://opensource.org/osd|;
-         ' $(grep -ril opensource)
-
-  # remove Linux term
-  sed -i 's|Linux,|GNU/Linux,|;
-          s|Linux and|GNU/Linux and|;
-          s|Linux distro|GNU/Linux distro|;
-          s|Linux distribution|GNU/Linux distribution|;
-          s|Linux machine|GNU/Linux machine|;
-          s|Linux Only|GNU/Linux Only|;
-          s|Linux only|GNU/Linux only|;
-          s|Linux operating|GNU/Linux operating|;
-          s|Linux OS|GNU/Linux OS|;
-          s|Linux platform|GNU/Linux platform|;
-          s|Linux software|GNU/Linux software|;
-          s|Linux specific|GNU/Linux specific|;
-          s|Linux system|GNU/Linux system|;
-          s|Linux will|GNU/Linux will|;
-          s|# Linux$|# GNU/Linux|;
-          s|# Linux.$|# GNU/Linux.|;
-          s|* Linux$|* GNU/Linux|;
-          s|* Linux.$|* GNU/Linux.|;
-          s|// Linux$|// GNU/Linux|;
-          s|// Linux.$|// GNU/Linux.|;
-          s|, Linux|, GNU/Linux|;
-          s|As Linux|As GNU/Linux|;
-          s|as Linux|as GNU/Linux|;
-          s|And Linux|And GNU/Linux|;
-          s|and Linux|and GNU/Linux|;
-          s|Be Linux|Be GNU/Linux|;
-          s|be Linux|be GNU/Linux|;
-          s|Because Linux|Because GNU/Linux|;
-          s|because Linux|because GNU/Linux|;
-          s|e.g. Linux|e.g. GNU/Linux|;
-          s|For Linux|For GNU/Linux|;
-          s|for Linux|for GNU/Linux|;
-          s|In Linux|In GNU/Linux|;
-          s|in Linux|in GNU/Linux|;
-          s|Like Linux|Like GNU/Linux|;
-          s|like Linux|like GNU/Linux|;
-          s|non-Linux|non GNU/Linux|;
-          s|Of Linux|Of GNU/Linux|;
-          s|of Linux|of GNU/Linux|;
-          s|On Linux|On GNU/Linux|;
-          s|on Linux|on GNU/Linux|;
-          s|OS type: Linux|OS type: GNU/Linux|;
-          s|Other Linux|Other GNU/Linux|;
-          s|other Linux|other GNU/Linux|;
-          s|The Linux|The GNU/Linux|;
-          s|the Linux|the GNU/Linux|;
-          s|Typically Linux|Typically GNU/Linux|;
-          s|typically Linux|typically GNU/Linux|;
-          s|To Linux|To GNU/Linux|;
-          s|to Linux|to GNU/Linux|;
-          s|Under Linux|Under GNU/Linux|;
-          s|under Linux|under GNU/Linux|;
-          s|ArchGNU/Linux|ArchLinux|;
-          s|e2fsprogs, typically GNU/Linux|e2fsprogs, typically Linux|;
-          s|GNU/GNU|GNU|;
-          s|GNU/Linux device|Linux device|;
-          s|GNU/Linux Director Daemon|Linux Director Daemon|;
-          s|GNU/Linux is a registered trademark of Linus Torvalds|Linux is a registered trademark of Linus Torvalds|;
-          s|GNU/Linux kernel|Linux kernel|;
-          s|GNU/Linux specific kernel|Linux specific kernel|;
-          s|GNU/Linux Standard Base|Linux Standard Base|;
-          s|GNU/Linux sysfs|Linux sysfs|;
-          s|GNU/Linux Virtual Server|Linux Virtual Server|;
-          s|GNU/Linux Watchdog|Linux Watchdog|;
-          s|GNU/Linux watchdog|Linux watchdog|;
-          s|GNU/LinuxHA|LinuxHA|;
-          s|GNU/Linux-HA|Linux-HA|;
-          s|GNU/LinuxSCSI|LinuxSCSI|;
-          s|HA GNU/Linux|HA Linux|;
-          s|High-Availability GNU/Linux|High-Availability Linux|;
-          s|MkGNU/Linux|MkLinux|;
-          s|SEGNU/Linux|SELinux|;
-          s|VA GNU/Linux Cluster|VA Linux Cluster|;
-          s|VERSION_STR = "GNU/Linux Director|VERSION_STR = "Linux Director|;
-          / 2.6, the alignment should be / s|GNU/Linux|Linux|;
-          s|Linux-2.4.26-gentoo-r14|GNU/Linux-2.4.26-gentoo-r14|;
-         ' $(grep -rl Linux)
-}
-
-build() {
-  cd $srcdir/$_pkgnamey-$pkgver
-  setarch $CARCH ./autogen.sh
-  setarch $CARCH ./configure --prefix=/usr\
-    --enable-fatal-warnings\
-    --enable-libnet\
-    --libdir=/usr/lib\
-    --localstatedir=/var\
-    --sbindir=/usr/bin\
-    --sysconfdir=/etc\
-    --with-ocf-root=/usr/lib/ocf
-  setarch $CARCH make
-}
-
-package() {
-  cd $srcdir/$_pkgnamey-$pkgver
-  setarch $CARCH make DESTDIR=$pkgdir install
-
-  mv $pkgdir/{var/,}run
-  touch $pkgdir/etc/ha.d/ldirectord.cf
-  rm $pkgdir/etc/rc.d/ldirectord && rmdir $pkgdir/etc/rc.d
-
-  install -d $pkgdir/usr/lib/systemd/system
-  echo '[Unit]'                                                                                               >  $pkgdir/usr/lib/systemd/system/ldirectord.service
-  echo 'Description=Non-heartbeat systems service, that manages the LVS component for TCP/UDP load-balancing' >> $pkgdir/usr/lib/systemd/system/ldirectord.service
-  echo 'Requires=network.target remote-fs.target'                                                             >> $pkgdir/usr/lib/systemd/system/ldirectord.service
-  echo ''                                                                                                     >> $pkgdir/usr/lib/systemd/system/ldirectord.service
-  echo '[Service]'                                                                                            >> $pkgdir/usr/lib/systemd/system/ldirectord.service
-  echo 'Type=forking'                                                                                         >> $pkgdir/usr/lib/systemd/system/ldirectord.service
-  echo 'ExecStart=/usr/bin/ldirectord'                                                                        >> $pkgdir/usr/lib/systemd/system/ldirectord.service
-  echo ''                                                                                                     >> $pkgdir/usr/lib/systemd/system/ldirectord.service
-  echo '[Install]'                                                                                            >> $pkgdir/usr/lib/systemd/system/ldirectord.service
-  echo 'WantedBy=multi-user.target'                                                                           >> $pkgdir/usr/lib/systemd/system/ldirectord.service
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/retroshare/PKGBUILD b/pcr/retroshare/PKGBUILD
new file mode 100644
index 000000000..36bfeb18e
--- /dev/null
+++ b/pcr/retroshare/PKGBUILD
@@ -0,0 +1,148 @@
+# 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
new file mode 100644
index 000000000..0c3f56180
--- /dev/null
+++ b/pcr/retroshare/retroshare.desktop
@@ -0,0 +1,11 @@
+[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
new file mode 100644
index 000000000..e48df1361
--- /dev/null
+++ b/pcr/retroshare/retroshare.install
@@ -0,0 +1,15 @@
+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/PKGBUILD b/pcr/rfc5766-turn-server/PKGBUILD
index 81eb3d14d..c070ad309 100644
--- a/pcr/rfc5766-turn-server/PKGBUILD
+++ b/pcr/rfc5766-turn-server/PKGBUILD
@@ -2,33 +2,27 @@
 
 pkgname=rfc5766-turn-server
 _portname=turnserver
-pkgver=1.8.6.0
+pkgver=2.6.2.1
 pkgrel=1
-epoch=
-pkgdesc="Free open source implementation of TURN and STUN Server"
-arch=('i686' 'x86_64')
+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')
-makedepends=('gcc>=3.4.4' 'make')
-depends=('libevent')
-#no redis headers in redi package
-optdepends=('postgresql-client: to use postgresql' 'libmysqlclient')
+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)
-sha1sums=('155990b95d399542db1bb497f1746c1b9bb290d2')
+source=(https://${pkgname}.googlecode.com/files/${_portname}-$pkgver.tar.gz
+        turn.service stun.service)
 
 build() {
   cd "${srcdir}/$_portname-${pkgver}"
   
-  PREFIX=/usr \
-  MANPREFIX=/usr/share \
-  EXAMPLESDIR="/usr/share/$pkgname/examples" \
-  DOCSDIR="/usr/share/doc/$pkgname" \
-  LIBDIR=/usr/lib \
-  SCHEMADIR="/usr/share/$pkgname" \
-  TURNINCLUDEDIR="/usr/include/turn"
-  ./configure
+  ./configure --prefix=/usr \
+              --manprefix=/usr/share \
+              --examplesdir="/usr/share/$_portname/examples"
 
   make
 }
@@ -40,22 +34,31 @@ check() {
 
 package() {
   cd "${srcdir}/$_portname-${pkgver}"
-  make \
-    PREFIX="$pkgdir/usr" \
-    MANPREFIX="$pkgdir/usr/share" \
-    EXAMPLESDIR="$pkgdir/usr/share/$pkgname/examples" \
-    DOCSDIR="$pkgdir/usr/share/doc/$pkgname" \
-    LIBDIR="$pkgdir/usr/lib" \
-    SCHEMADIR="$pkgdir/usr/share/$pkgname" \
-    TURNINCLUDEDIR="$pkgdir/usr/include/turn" \
-    install
+  make DESTDIR="$pkgdir" install
   
   
-  install -D "$pkgdir/usr/share/$pkgname/examples/etc/turnserver.conf" "$pkgdir/etc/turnserver.conf"
-  install -D "$pkgdir/usr/share/$pkgname/examples/etc/turnuserdb.conf" "$pkgdir/etc/turnuserdb.conf"
+  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
new file mode 100644
index 000000000..bddb6168a
--- /dev/null
+++ b/pcr/rfc5766-turn-server/stun.service
@@ -0,0 +1,10 @@
+[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
new file mode 100644
index 000000000..54cc5f01a
--- /dev/null
+++ b/pcr/rfc5766-turn-server/turn.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=TURN Server
+After=network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/turnserver
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pcr/ruby-bundler/PKGBUILD b/pcr/ruby-bundler/PKGBUILD
index a1fb32449..44a1a883b 100644
--- a/pcr/ruby-bundler/PKGBUILD
+++ b/pcr/ruby-bundler/PKGBUILD
@@ -1,22 +1,24 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 # Contributor: Alexsandr Pavlov <kidoz at mail dot ru>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
-pkgname=ruby-bundler
-_gemname=${pkgname#ruby-}
-pkgver=1.1.5
+_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://gembundler.com"
-license=('MIT')
-depends=('ruby' 'rubygems')
-source=(http://rubygems.org/downloads/${_gemname}-${pkgver}.gem)
-noextract=(${_gemname}-${pkgver}.gem)
-md5sums=('ecced17bc29a761db4ea5ca57b0d8795')
+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
 
-build() {
-  cd "${srcdir}"
-  export HOME=/tmp
-  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
+  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/ruby-yard/PKGBUILD b/pcr/ruby-haml/ruby-yard/PKGBUILD
deleted file mode 100644
index a686f937d..000000000
--- a/pcr/ruby-haml/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/ruby-headers/PKGBUILD b/pcr/ruby-headers/PKGBUILD
index 074205e79..7b20fc288 100644
--- a/pcr/ruby-headers/PKGBUILD
+++ b/pcr/ruby-headers/PKGBUILD
@@ -3,8 +3,8 @@
 
 pkgname=ruby-headers
 _pkgname=ruby
-pkgver=2.0.0_p0
-_pkgver=2.0.0-p0
+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')
@@ -23,4 +23,4 @@ package() {
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
-md5sums=('895c1c581f8d28e8b3bb02472b2ccf6a')
+md5sums=('2f54faea6ee1ca500632ec3c0cb59cb6')
diff --git a/pcr/ruby1-bundler/PKGBUILD b/pcr/ruby1-bundler/PKGBUILD
new file mode 100644
index 000000000..d06f7af08
--- /dev/null
+++ b/pcr/ruby1-bundler/PKGBUILD
@@ -0,0 +1,27 @@
+# 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
new file mode 100644
index 000000000..4a441bc1c
--- /dev/null
+++ b/pcr/ruby1/PKGBUILD
@@ -0,0 +1,84 @@
+# 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
new file mode 100644
index 000000000..3d11de1ec
--- /dev/null
+++ b/pcr/ruby1/gemrc
@@ -0,0 +1,5 @@
+# Read about the gemrc format at http://docs.rubygems.org/read/chapter/11
+
+# --user-install is used to install to $HOME/.gem/ by default since we want to separate
+#                pacman installed gems and gem installed gems
+gem: --user-install
diff --git a/pcr/ruby1/ruby.install b/pcr/ruby1/ruby.install
new file mode 100644
index 000000000..21e9b98a2
--- /dev/null
+++ b/pcr/ruby1/ruby.install
@@ -0,0 +1,22 @@
+#!/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-hg/PKGBUILD b/pcr/ryzom-hg/PKGBUILD
index 8bc928115..0951e474d 100644
--- a/pcr/ryzom-hg/PKGBUILD
+++ b/pcr/ryzom-hg/PKGBUILD
@@ -1,100 +1,50 @@
-# Maintainer:Bjoern Bidar <theodorstormgrade@gmail.com
-#_gui_toolkit=qt # qt or gtk
-_build_server=false # set true to build server (default:false)
-_build_client=true  # set false to don't build client (default:true)
-_CMAKE_COMMON_ARGS=('-DWITH_STATIC=OFF' '-DWITH_NEL_TOOLS=OFF' '-DWITH_NEL_TESTS=OFF' '-DWITH_LUA51=ON'  '-DWITH_NEL_SAMPLES=OFF' '-DWITH_RYZOM_TOOLS=OFF'.) # cmake arguments for server and client
-_CMAKE_SERVER_ARGS=('-DWITH_RYZOM_SERVER=ON' '-DWITH_RYZOM_CLIENT=OFF' '-DWITH_DRIVER_OPENGL=OFF' '-DWITH_DRIVER_OPENAL=OFF' ) # cmake args for building server
-_CMAKE_CLIENT_ARGS=( '-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=ON' ) # cmake args for building client
-if [ $_build_client = true ] ; then
-  true && pkgname=( 'ryzom-client-hg'  )
-fi
-
-if [ $_build_server = true ] ; then
-  true && pkgname=( 'ryzom-client-hg' 'ryzom-server-hg')
-fi 
-pkgbase=ryzom-hg
-pkgname=ryzom-hg
-pkgver=20130331
-pkgrel=1
-pkgdesc="Ryzom is a Free to Play MMORPG . This version is for playing on an official server or launch a server"
+# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
+# Maintainer (aur): Bjoern Bidar <theodorstormgrade@gmail.com>
+
+pkgname='ryzom-hg'
+_hgver=ce26956d3a4a
+pkgver=20130727
+pkgrel=7
+pkgdesc="An awesome free software 3D MMORPG game"
 arch=('i686' 'x86_64')
 url="http://www.ryzom.com/"
 license=('AGPL3')
-depends=('curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2'  'libpng' 'libjpeg' 'rrdtool' 'libwww' 'boost'  'luabind' 'libsquish' 'lua51'  'lua51-sql-mysql') 
-conflicts=('ryzom-client-latest-hg')
-groups=('ryzom')
-makedepends=('mercurial' 'cpptest' 'cmake' 'bison')
-provides=('ryzom')
-source=( 'ryzom.sh' 'ryzom.desktop' )
-md5sums=('a5ca7dfae7b9073f78cd1b0b7380755f'
-         '71d5136d40ec4e76c2ac2b0c9e506aef')
-
-
-
-
-case $_gui_toolkit in
-  qt) _CMAKE_COMMON_ARGS=( ${_CMAKE_COMMON_ARGS_ARGS[*]} '-DWITH_QT=ON' ) ;;
-  gtk) _CMAKE_COMMON_ARGS=( ${_CMAKE_COMMON_ARGS_ARGS[*]} '-DWITH_GTK=ON' ) ;;
-esac 
+depends=('curl' 'hicolor-icon-theme' 'libvorbis' 'libjpeg' 'libwww-hg' 'luabind' 'ryzom-data')
+conflicts=('ryzom')
+makedepends=('mercurial' 'cpptest' 'cmake' 'bison' 'freealut' 'rrdtool' 'boost')
+source=("libre://$pkgname-$pkgver.tar.gz")
 
+mksource=(".$pkgname-$pkgver::hg+https://bitbucket.org/ryzom/ryzomcore#revision=${_hgver}")
 
-_hg_root='https://bitbucket.org/ryzom/ryzomcore'
-_hg_name='ryzomcore' 
-
-prepare() {
-    if [ -d "$_hg_name" ] ; then # fetch sources
-	cd "$_hg_name"
-	hg pull && hg update
-	cd ..
-    else
-	hg clone "$_hg_root"
-    fi
-    
-    msg2 "hg clone done or server timeout"
+mksource() {
+  rm -rf "$srcdir/$pkgname-$pkgver"
+  cp -a "$srcdir/.$pkgname-$pkgver/code" "${srcdir}/${pkgname}-${pkgver}"
 }
+
 build() {
-    cd $_hg_name
-    
-    if [ $_build_client = true ] ; then	
-	mkdir -p "$srcdir/build-client"
-	cd "$srcdir/build-client"
-	msg "client is $_build_client, building client"
-	cmake -b "$srcdir/$_hg_name/code"  ${_CMAKE_COMMON_ARGS_ARGS[*]} ${_CMAKE_CLIENT_ARGS[*]} -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
-	msg "Starting make, to build client"
-	make
-	
-    fi
-   
-    if [ $_build_server = true ] ; then
-	mkdir -p "$srcdir/build-server"
-	cd "$srcdir/build-server"
-	msg "client is $_build_server, building server"
-	cmake -b "$srcdir/$_hg_name/code"  ${_CMAKE_COMMON_ARGS_ARGS[*]} ${_CMAKE_SERVER_ARGS[*]} -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
-	msg "Starting make, to build server"   
-	make	
-    fi
+  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
+  
+  make all
 }
 
-if [ $_build_client = true ] ; then
-    
-    package_ryzom-client-hg() {
-	pkgdesc="Ryzom is a Free to Play MMORPG . This version is for playing on an official server"
-	depends=( 'curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2' 'cmake' 'libpng' 'libjpeg' 'rrdtool' 'bison' 'libwww' 'boost' 'cpptest' 'luabind' 'libsquish' 'lua51'  'lua51-sql-mysql' 'ryzom-data' )
-	cd "$srcdir/build-client"
-	make DESTDIR="$pkgdir/" install
-	install -Dm 644 ${srcdir}/ryzom.desktop ${pkgdir}/usr/share/applications
-	sed -ie 's/\/usr\/bin\/ryzom_client/ryzom/' ${pkgdir}/usr/share/applications/ryzom.desktop # replace ryzom_client with our script
-	install -Dm755  ${srcdir}/ryzom.sh  ${pkgdir}/usr/bin/ryzom	
-    }
-fi
-
-if [ $_build_server = true ] ; then
-    
-    package_ryzom-server-hg() {
-	pkgdesc="Ryzom is a Free to Play MMORPG . This is the version to run a server"
-	cd "$srcdir/build-server"
-	make DESTDIR="$pkgdir/" install	
-    }
-fi
-
+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=('a8c90f3f41fb3d497022a2d14a9aa39352557f5745f97b93d0bed61cebf85402')
diff --git a/pcr/ryzom-hg/ryzom.sh b/pcr/ryzom-hg/ryzom.sh
deleted file mode 100644
index e3cff2c64..000000000
--- a/pcr/ryzom-hg/ryzom.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-if groups | grep games > /dev/null 2>&1 ; then 
-  ryzom_sync 
-  exec ryzom_client
-  
-else 
-  echo "you need to be in games group to run ryzom"
-  exit 1
-fi
diff --git a/pcr/samplv1/PKGBUILD b/pcr/samplv1/PKGBUILD
new file mode 100644
index 000000000..33be54edf
--- /dev/null
+++ b/pcr/samplv1/PKGBUILD
@@ -0,0 +1,30 @@
+
+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
new file mode 100644
index 000000000..ec1a84bbb
--- /dev/null
+++ b/pcr/samplv1/samplv1.install
@@ -0,0 +1,13 @@
+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/setbfree/PKGBUILD b/pcr/setbfree/PKGBUILD
index 1b30f06c2..c17511f47 100644
--- a/pcr/setbfree/PKGBUILD
+++ b/pcr/setbfree/PKGBUILD
@@ -1,10 +1,9 @@
-# Maintainer: Guest One <theguestone at gmail dot com>
 
 pkgname=setbfree
-pkgver=0.7.2
+pkgver=0.7.3
 pkgrel=1
 pkgdesc="A DSP Tonewheel Organ emulator."
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 url="http://setbfree.org/"
 license=('GPL')
 depends=('jack' 'liblo' 'tk' 'desktop-file-utils')
@@ -12,7 +11,7 @@ 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=('7b64947289687cbf71b9e87fdd006f36'
+md5sums=('8b7b077dfb784927c7103948083e1f04'
          '8c2a863562f26856dcff0a456cf36dcf')
 
 build() {
diff --git a/pcr/setuptools_darcs/PKGBUILD b/pcr/setuptools_darcs/PKGBUILD
new file mode 100644
index 000000000..285214db8
--- /dev/null
+++ b/pcr/setuptools_darcs/PKGBUILD
@@ -0,0 +1,29 @@
+# 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
new file mode 100644
index 000000000..c4f3ee7a9
--- /dev/null
+++ b/pcr/shflags/PKGBUILD
@@ -0,0 +1,31 @@
+#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
new file mode 100644
index 000000000..32baa6d2d
--- /dev/null
+++ b/pcr/shocco/PKGBUILD
@@ -0,0 +1,30 @@
+# 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/sipwitch/PKGBUILD b/pcr/sipwitch/PKGBUILD
index 22852780c..eba2bb854 100644
--- a/pcr/sipwitch/PKGBUILD
+++ b/pcr/sipwitch/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Dan Serban
 # Contributors: David Zaragoza, Andrea Scarpino
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname=sipwitch
 pkgver=1.2.4
diff --git a/pcr/spacenav-daemon/PKGBUILD b/pcr/spacenav-daemon/PKGBUILD
new file mode 100644
index 000000000..fb1229ae4
--- /dev/null
+++ b/pcr/spacenav-daemon/PKGBUILD
@@ -0,0 +1,44 @@
+# 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/spacenavd/spacenav.service b/pcr/spacenav-daemon/spacenav.service
index 30e8019e9..30e8019e9 100644
--- a/pcr/spacenavd/spacenav.service
+++ b/pcr/spacenav-daemon/spacenav.service
diff --git a/pcr/spacenav-daemon/spnavrc b/pcr/spacenav-daemon/spnavrc
new file mode 100644
index 000000000..7d19ae03b
--- /dev/null
+++ b/pcr/spacenav-daemon/spnavrc
@@ -0,0 +1,8 @@
+# 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/spacenavd/PKGBUILD b/pcr/spacenavd/PKGBUILD
deleted file mode 100644
index cf8a43c32..000000000
--- a/pcr/spacenavd/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Contributor: Jan Hambrecht <jaham at gmx dot net>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-pkgname=spacenavd
-pkgver=0.5
-pkgrel=2
-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')
-backup=('etc/spnavrc')
-source=(http://downloads.sourceforge.net/spacenav/$pkgname-$pkgver.tar.gz
-        spacenavd
-        spacenav.service)
-
-md5sums=('0bb21da5315bd376aa508157a9455aaa'                                                                                                              
-         '27a739300d4de07920879af2d2bdd47f'
-         'b404c8021254636b861651a7a48d17a6')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=$pkgdir/usr
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
-  # for initscript service
-  install -D -m755 $srcdir/spacenavd $pkgdir/etc/rc.d/spacenavd || return 1
-  # for systend service
-  install -D -m755 $srcdir/spacenav.service $pkgdir/usr/lib/systemd/system/spacenav.service || return 1
-}
diff --git a/pcr/spacenavd/spacenavd b/pcr/spacenavd/spacenavd
deleted file mode 100644
index 61946197c..000000000
--- a/pcr/spacenavd/spacenavd
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-DAEMON=/usr/bin/spacenavd
-
-PID=`pidof -o %PPID $DAEMON`
-case "$1" in
-  start)
-    stat_busy "Starting Spacenavigator Daemon"
-    [ -z "$PID" ] && $DAEMON
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon spacenavd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Spacenavigator Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon spacenavd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/pcr/steadyflow/PKGBUILD b/pcr/steadyflow/PKGBUILD
new file mode 100644
index 000000000..a9381448e
--- /dev/null
+++ b/pcr/steadyflow/PKGBUILD
@@ -0,0 +1,33 @@
+# 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
new file mode 100644
index 000000000..01434bc04
--- /dev/null
+++ b/pcr/steadyflow/steadyflow.install
@@ -0,0 +1,17 @@
+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/strongswan/PKGBUILD b/pcr/strongswan/PKGBUILD
index c6ace77c4..6a53609e9 100644
--- a/pcr/strongswan/PKGBUILD
+++ b/pcr/strongswan/PKGBUILD
@@ -7,8 +7,8 @@
 # Maintainer: dkorzhevin <dkorzhevin at gmail dot com>
 
 pkgname=strongswan
-pkgver=5.0.4
-pkgrel=6
+pkgver=5.1.0
+pkgrel=2
 pkgdesc="open source IPsec implementation"
 url='http://www.strongswan.org'
 license=("GPL")
@@ -19,8 +19,9 @@ 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=('0ab0397b44b197febfd0f89148344035'
+md5sums=('c1cd0a3ba9960f590cae28c8470800e8'
          'cf815adef48a1ffee34517380c731277')
+
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
@@ -38,7 +39,8 @@ build() {
         --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
+        --disable-mysql --disable-ldap \
+        --enable-cmd
 
   make
 }
diff --git a/pcr/supermodel/PKGBUILD b/pcr/supermodel/PKGBUILD
new file mode 100644
index 000000000..fd22bea59
--- /dev/null
+++ b/pcr/supermodel/PKGBUILD
@@ -0,0 +1,38 @@
+# 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
new file mode 100644
index 000000000..9cb93e02c
--- /dev/null
+++ b/pcr/supermodel/multiuser.patch
@@ -0,0 +1,107 @@
+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
new file mode 100644
index 000000000..94ef82c48
--- /dev/null
+++ b/pcr/supermodel/supermodel.install
@@ -0,0 +1,12 @@
+# 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
new file mode 100644
index 000000000..992dd406d
--- /dev/null
+++ b/pcr/supermodel/supermodel.sh
@@ -0,0 +1,12 @@
+#!/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/sword/PKGBUILD b/pcr/sword/PKGBUILD
new file mode 100644
index 000000000..78ab4e646
--- /dev/null
+++ b/pcr/sword/PKGBUILD
@@ -0,0 +1,68 @@
+# 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
new file mode 100644
index 000000000..63fd4433c
--- /dev/null
+++ b/pcr/sword/curl.patch
@@ -0,0 +1,22 @@
+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
new file mode 100644
index 000000000..7957ab2d8
--- /dev/null
+++ b/pcr/sword/multimap.patch
@@ -0,0 +1,39 @@
+--- 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
index 1a96b84f8..2cce2ef0b 100644
--- a/pcr/synthv1/PKGBUILD
+++ b/pcr/synthv1/PKGBUILD
@@ -1,17 +1,16 @@
-# Maintainer: Guest One <theguestone at gmail dot com>
 
 pkgname=synthv1
-pkgver=0.3.3
+pkgver=0.3.4
 pkgrel=1
 pkgdesc="An old-school all-digital 4-oscillator subtractive polyphonic synthesizer with stereo fx"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 url="http://$pkgname.sourceforge.net/$pkgname-index.html"
 license=('GPL')
 groups=('lv2-plugins')
-depends=('jack' 'liblo' 'lv2' 'qt4')
+depends=('jack' 'liblo' 'lv2' 'qt4' 'shared-mime-info')
 install="$pkgname.install"
 source=("http://download.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('18bd21921ee65b718b2feb1d0ab03ac7')
+md5sums=('63ca2f7961bbc708928d2f792e32d166')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/pcr/synthv1/synthv1.install b/pcr/synthv1/synthv1.install
index 029294d67..ec1a84bbb 100644
--- a/pcr/synthv1/synthv1.install
+++ b/pcr/synthv1/synthv1.install
@@ -1,5 +1,6 @@
 post_install() {
   xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+  update-mime-database usr/share/mime
   update-desktop-database -q
 }
 
diff --git a/pcr/tahoe-lafs/PKGBUILD b/pcr/tahoe-lafs/PKGBUILD
new file mode 100644
index 000000000..8ace70679
--- /dev/null
+++ b/pcr/tahoe-lafs/PKGBUILD
@@ -0,0 +1,30 @@
+# 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
new file mode 100644
index 000000000..dfcc0b8ae
--- /dev/null
+++ b/pcr/tahoe-lafs/nodaemon.patch
@@ -0,0 +1,19 @@
+--- 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
new file mode 100644
index 000000000..a8114ba62
--- /dev/null
+++ b/pcr/tanglet/PKGBUILD
@@ -0,0 +1,28 @@
+# 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
new file mode 100644
index 000000000..81f2ba659
--- /dev/null
+++ b/pcr/tanglet/tanglet.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/pcr/textext/LICENSE.txt b/pcr/textext/LICENSE.txt
new file mode 100644
index 000000000..69f5d4720
--- /dev/null
+++ b/pcr/textext/LICENSE.txt
@@ -0,0 +1,28 @@
+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
new file mode 100644
index 000000000..8a1897dc4
--- /dev/null
+++ b/pcr/textext/PKGBUILD
@@ -0,0 +1,22 @@
+# 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/timer_entropyd/PKGBUILD b/pcr/timer_entropyd/PKGBUILD
new file mode 100644
index 000000000..4d5f4437e
--- /dev/null
+++ b/pcr/timer_entropyd/PKGBUILD
@@ -0,0 +1,28 @@
+# 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
new file mode 100644
index 000000000..0bea7398b
--- /dev/null
+++ b/pcr/timer_entropyd/timer_entropyd.service
@@ -0,0 +1,9 @@
+[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
new file mode 100644
index 000000000..ebbd4cc3f
--- /dev/null
+++ b/pcr/tinc-pre/PKGBUILD
@@ -0,0 +1,42 @@
+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
new file mode 100644
index 000000000..069bf4570
--- /dev/null
+++ b/pcr/tinc-pre/tincd@.service
@@ -0,0 +1,10 @@
+[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/tomb/PKGBUILD b/pcr/tomb/PKGBUILD
new file mode 100644
index 000000000..66945cb41
--- /dev/null
+++ b/pcr/tomb/PKGBUILD
@@ -0,0 +1,53 @@
+## 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/social/tomb/tomb.install b/pcr/tomb/tomb.install
index c1ee8b339..c1ee8b339 100644
--- a/social/tomb/tomb.install
+++ b/pcr/tomb/tomb.install
diff --git a/pcr/torque/PKGBUILD b/pcr/torque/PKGBUILD
index 5f469fa5f..850aa3b7d 100644
--- a/pcr/torque/PKGBUILD
+++ b/pcr/torque/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
 
 pkgname=torque
 pkgver=4.2.2
diff --git a/pcr/transmission-remote-cli/PKGBUILD b/pcr/transmission-remote-cli/PKGBUILD
index 5e3699bce..dcabaa642 100644
--- a/pcr/transmission-remote-cli/PKGBUILD
+++ b/pcr/transmission-remote-cli/PKGBUILD
@@ -1,29 +1,25 @@
 # Maintainer: fauno <fauno@kiwwwi.com.ar>
 pkgname=transmission-remote-cli
-pkgver=0.10.4
+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>=2.40: for local transmission management'
+optdepends=('transmission-daemon: for local transmission management'
             'adns-python: Resolve IPs to host names'
-            'python-geoip: Guess which country peers come from')
+            'python2-geoip: Guess which country peers come from')
 conflicts=('transmission-remote-cli-git' "transmission-remote-cli<=20111013")
 replaces=('transmission-remote-cli-git')
-source=(http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-${pkgrel}-any.src.tar.xz
-        python2.patch)
+source=(https://github.com/fagga/${pkgname}/archive/v${pkgver}.tar.gz)
 
-build() {
+package() {
     cd "${srcdir}/${pkgname}"
     msg "Starting make..."
 
-    patch -Np1 -i ${srcdir}/python2.patch
-
 	install -d ${pkgdir}/usr/bin/
 	install -Dm755 transmission-remote-cli.py ${pkgdir}/usr/bin/transmission-remote-cli
 
 }
-md5sums=('b85382bc2e24c5733f9c3833098da668'
-         '6273609fb3a7294328aeaa526b76411c')
+md5sums=('4c13aa8596d35ce5793ea65affa8a6e5')
diff --git a/pcr/triceratops-lv2/PKGBUILD b/pcr/triceratops-lv2/PKGBUILD
index ff02793aa..db8b7b101 100644
--- a/pcr/triceratops-lv2/PKGBUILD
+++ b/pcr/triceratops-lv2/PKGBUILD
@@ -1,16 +1,17 @@
 # Maintainer: Guest One <theguestone at gmail dot com>
 
 pkgname=triceratops-lv2
-pkgver=0.1.6c
+pkgver=0.1.7
 pkgrel=1
 pkgdesc="Polyphonic synthesizer LV2 plugin"
-arch=('i686')
-url="http://sourceforge.net/projects/triceratops/"
+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=('7a0755876c4d3af6f1b4cac899679472')
+md5sums=('b4f058c30b3b218bd21dbaa04430dd8b')
 
 build() {
   cd "$srcdir/$pkgname-v$pkgver"
diff --git a/pcr/trytond-account-invoice/PKGBUILD b/pcr/trytond-account-invoice/PKGBUILD
index 1f2574548..5488733bf 100644
--- a/pcr/trytond-account-invoice/PKGBUILD
+++ b/pcr/trytond-account-invoice/PKGBUILD
@@ -1,18 +1,19 @@
 # Maintainer: Robin Baumgartner <robin@baumgartners.ch>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 pkgname=trytond-account-invoice
 _pkgname=trytond_account_invoice
-pkgver=2.6.3
-_pkgdir=2.6
+pkgver=2.8.1
+_pkgdir=2.8
 pkgrel=1
 pkgdesc="The account_invoice module of the Tryton application platform"
 arch=('any')
 url='http://www.tryton.org/'
 license=('GPL3')
 groups=('trytond-modules')
-depends=('trytond>=2.6' 'trytond-account>=2.6' 'trytond-company>=2.6' 'trytond-party>=2.6' 'trytond-product>=2.6' 'trytond-currency>=2.6' 'trytond-account-product>=2.6')
+depends=('trytond>=2.8' 'trytond-account>=2.8' 'trytond-account-product>=2.8' 'trytond-company>=2.8' 'trytond-currency>=2.8' 'trytond-party>=2.8' 'trytond-product>=2.8')
 makedepends=('python2-distribute')
 source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
-md5sums=("a93b71985bbcb70499019429a3dc4e25")
+md5sums=("0f61e65c235f5b09df1be72851a4f0d4")
 
 package() {
   cd $srcdir/$_pkgname-$pkgver
diff --git a/pcr/trytond-account-product/PKGBUILD b/pcr/trytond-account-product/PKGBUILD
index b8ec822c6..14c5a1ea8 100644
--- a/pcr/trytond-account-product/PKGBUILD
+++ b/pcr/trytond-account-product/PKGBUILD
@@ -1,18 +1,19 @@
 # Maintainer: Robin Baumgartner <robin@baumgartners.ch>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 pkgname=trytond-account-product
 _pkgname=trytond_account_product
-pkgver=2.6.0
-_pkgdir=2.6
+pkgver=2.8.0
+_pkgdir=2.8
 pkgrel=1
 pkgdesc="The account_product module of the Tryton application platform"
 arch=('any')
 url='http://www.tryton.org/'
 license=('GPL3')
 groups=('trytond-modules')
-depends=('trytond>=2.6' 'trytond-account>=2.6' 'trytond-company>=2.6' 'trytond-product>=2.6')
+depends=('trytond>=2.8' 'trytond-account>=2.8' 'trytond-company>=2.8' 'trytond-product>=2.8')
 makedepends=('python2-distribute')
 source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
-md5sums=("7c4ebba0419c62addeb7417c57a84125")
+md5sums=("431a2bdb15e8f84af7de42e571f1c4e5")
 
 package() {
   cd $srcdir/$_pkgname-$pkgver
diff --git a/pcr/trytond-account/PKGBUILD b/pcr/trytond-account/PKGBUILD
index b4c2affb0..9bb9022e5 100644
--- a/pcr/trytond-account/PKGBUILD
+++ b/pcr/trytond-account/PKGBUILD
@@ -1,18 +1,19 @@
 # Maintainer: Robin Baumgartner <robin@baumgartners.ch>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 pkgname=trytond-account
 _pkgname=trytond_account
-pkgver=2.6.3
-_pkgdir=2.6
+pkgver=2.8.1
+_pkgdir=2.8
 pkgrel=1
 pkgdesc="The account module of the Tryton application platform"
 arch=('any')
 url='http://www.tryton.org/'
 license=('GPL3')
 groups=('trytond-modules')
-depends=('trytond>=2.6' 'trytond-company>=2.6' 'trytond-party>=2.6' 'trytond-currency>=2.6')
+depends=('trytond>=2.8' 'trytond-company>=2.8' 'trytond-currency>=2.8' 'trytond-party>=2.8')
 makedepends=('python2-distribute')
 source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
-md5sums=("872c05b5be3d6737575137d827234cfb")
+md5sums=("2cdb5b5e8a3984315d410b550b7ffc1b")
 
 package() {
   cd $srcdir/$_pkgname-$pkgver
diff --git a/pcr/trytond-calendar/PKGBUILD b/pcr/trytond-calendar/PKGBUILD
index db8756171..aa9341c94 100644
--- a/pcr/trytond-calendar/PKGBUILD
+++ b/pcr/trytond-calendar/PKGBUILD
@@ -1,18 +1,19 @@
 # Maintainer: Robin Baumgartner <robin@baumgartners.ch>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 pkgname=trytond-calendar
 _pkgname=trytond_calendar
-pkgver=2.6.1
-_pkgdir=2.6
+pkgver=2.8.0
+_pkgdir=2.8
 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>=2.6')
+depends=('trytond>=2.8')
 makedepends=('python2-distribute')
 source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
-md5sums=("a6612776bf735eb9c68e2a5b3aa8ce83")
+md5sums=("0ea2e2c2d31b44e0072591a42cf63b1a")
 
 package() {
   cd $srcdir/$_pkgname-$pkgver
diff --git a/pcr/trytond-company/PKGBUILD b/pcr/trytond-company/PKGBUILD
index da9e2b27f..548c46f38 100644
--- a/pcr/trytond-company/PKGBUILD
+++ b/pcr/trytond-company/PKGBUILD
@@ -1,18 +1,19 @@
 # Maintainer: Robin Baumgartner <robin@baumgartners.ch>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 pkgname=trytond-company
 _pkgname=trytond_company
-pkgver=2.6.1
-_pkgdir=2.6
+pkgver=2.8.0
+_pkgdir=2.8
 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>=2.6' 'trytond-party>=2.6' 'trytond-currency>=2.6')
+depends=('trytond>=2.8' 'trytond-currency>=2.8' 'trytond-party>=2.8')
 makedepends=('python2-distribute')
 source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
-md5sums=("7f5ad0dab46f3c62c7f03ea5d48684f9")
+md5sums=("6fc6ef3ec24cbe4a486f7b492e67268f")
 
 package() {
   cd $srcdir/$_pkgname-$pkgver
diff --git a/pcr/trytond-country/PKGBUILD b/pcr/trytond-country/PKGBUILD
index 17c06dc33..fa0070eee 100644
--- a/pcr/trytond-country/PKGBUILD
+++ b/pcr/trytond-country/PKGBUILD
@@ -1,18 +1,19 @@
 # Maintainer: Robin Baumgartner <robin@baumgartners.ch>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 pkgname=trytond-country
 _pkgname=trytond_country
-pkgver=2.6.0
-_pkgdir=2.6
+pkgver=2.8.0
+_pkgdir=2.8
 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>=2.6')
+depends=('trytond>=2.8')
 makedepends=('python2-distribute')
 source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
-md5sums=("867338ac91e0130e3b7427e8af9a6c6d")
+md5sums=("b4947b2ab766e7ef2626ed105d9422e8")
 
 package() {
   cd $srcdir/$_pkgname-$pkgver
diff --git a/pcr/trytond-currency/PKGBUILD b/pcr/trytond-currency/PKGBUILD
index 9a21153c0..02dd63565 100644
--- a/pcr/trytond-currency/PKGBUILD
+++ b/pcr/trytond-currency/PKGBUILD
@@ -1,18 +1,19 @@
 # Maintainer: Robin Baumgartner <robin@baumgartners.ch>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 pkgname=trytond-currency
 _pkgname=trytond_currency
-pkgver=2.6.1
-_pkgdir=2.6
+pkgver=2.8.0
+_pkgdir=2.8
 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>=2.6')
+depends=('trytond>=2.8')
 makedepends=('python2-distribute')
 source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
-md5sums=("c38869231a22dd0c80a595c523491412")
+md5sums=("10d98fbf34c90f5d1544f3d28170eefc")
 
 package() {
   cd $srcdir/$_pkgname-$pkgver
diff --git a/pcr/trytond-party/PKGBUILD b/pcr/trytond-party/PKGBUILD
index 1f3b35c6e..0854e8193 100644
--- a/pcr/trytond-party/PKGBUILD
+++ b/pcr/trytond-party/PKGBUILD
@@ -1,18 +1,19 @@
 # Maintainer: Robin Baumgartner <robin@baumgartners.ch>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 pkgname=trytond-party
 _pkgname=trytond_party
-pkgver=2.6.0
-_pkgdir=2.6
+pkgver=2.8.0
+_pkgdir=2.8
 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>=2.6' 'trytond-country>=2.6')
+depends=('trytond>=2.8' 'trytond-country>=2.8')
 makedepends=('python2-distribute')
 source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
-md5sums=("82fc07ffd9bcedc28f5526fe5c6228e6")
+md5sums=("2fbf811a9d82f68889dc0350441423d4")
 
 package() {
   cd $srcdir/$_pkgname-$pkgver
diff --git a/pcr/trytond-product/PKGBUILD b/pcr/trytond-product/PKGBUILD
index de158f436..6271f4ef5 100644
--- a/pcr/trytond-product/PKGBUILD
+++ b/pcr/trytond-product/PKGBUILD
@@ -1,18 +1,19 @@
 # Maintainer: Robin Baumgartner <robin@baumgartners.ch>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 pkgname=trytond-product
 _pkgname=trytond_product
-pkgver=2.6.0
-_pkgdir=2.6
+pkgver=2.8.0
+_pkgdir=2.8
 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>=2.6')
+depends=('trytond>=2.8')
 makedepends=('python2-distribute')
 source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
-md5sums=("84cbc997b557cbf46d74a5958d8ec0a5")
+md5sums=("67cf95a0d68e47365bbdef02b344a5a8")
 
 package() {
   cd $srcdir/$_pkgname-$pkgver
diff --git a/pcr/trytond-stock-lot/PKGBUILD b/pcr/trytond-stock-lot/PKGBUILD
index 01cd34681..4d88cd382 100644
--- a/pcr/trytond-stock-lot/PKGBUILD
+++ b/pcr/trytond-stock-lot/PKGBUILD
@@ -1,18 +1,19 @@
 # Maintainer: Robin Baumgartner <robin@baumgartners.ch>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 pkgname=trytond-stock-lot
 _pkgname=trytond_stock_lot
-pkgver=2.6.0
-_pkgdir=2.6
+pkgver=2.8.0
+_pkgdir=2.8
 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>=2.6' 'trytond-product>=2.6' 'trytond-stock>=2.6')
+depends=('trytond>=2.8' 'trytond-product>=2.8' 'trytond-stock>=2.8')
 makedepends=('python2-distribute')
 source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
-md5sums=("4ca52557e691488e566c7eab3aa0ce5d")
+md5sums=("a4c3379462de7c7af8bb342aedff6360")
 
 package() {
   cd $srcdir/$_pkgname-$pkgver
diff --git a/pcr/trytond-stock/PKGBUILD b/pcr/trytond-stock/PKGBUILD
index 453f931fe..9906ed675 100644
--- a/pcr/trytond-stock/PKGBUILD
+++ b/pcr/trytond-stock/PKGBUILD
@@ -1,18 +1,19 @@
 # Maintainer: Robin Baumgartner <robin@baumgartners.ch>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 pkgname=trytond-stock
 _pkgname=trytond_stock
-pkgver=2.6.1
-_pkgdir=2.6
+pkgver=2.8.1
+_pkgdir=2.8
 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>=2.6' 'trytond-party>=2.6' 'trytond-product>=2.6' 'trytond-company>=2.6' 'trytond-currency>=2.6')
+depends=('trytond>=2.8' 'trytond-company>=2.8' 'trytond-currency>=2.8' 'trytond-party>=2.8' 'trytond-product>=2.8')
 makedepends=('python2-distribute')
 source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
-md5sums=("fd303fc990f9a26de60e0928693461e2")
+md5sums=("5b28b2ec424a0915578d420d0479bd49")
 
 package() {
   cd $srcdir/$_pkgname-$pkgver
diff --git a/pcr/trytond/PKGBUILD b/pcr/trytond/PKGBUILD
index a34a8890f..8a39f898a 100644
--- a/pcr/trytond/PKGBUILD
+++ b/pcr/trytond/PKGBUILD
@@ -1,15 +1,16 @@
 # Contributor: Florian Walch <florian.walch@gmx.at>
 # Maintainer: Robin Baumgartner <robin@baumgartners.ch>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 pkgname=trytond
-pkgver=2.6.3
-_pkgdir=2.6
-pkgrel=2
+pkgver=2.8.1
+_pkgdir=2.8
+pkgrel=1
 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' 'python-lxml' 'python2-egenix-mx-base' 'python2-relatorio>=183' 'python2-genshi>=0.6' 'python2-polib')
-optdepends=('python-psycopg2: support for PostgreSQL database'
+depends=('python2>=2.7' 'python2-lxml' 'python2-relatorio>=0.5.6' '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'
@@ -19,7 +20,7 @@ install="trytond.install"
 source=("http://downloads.tryton.org/$_pkgdir/$pkgname-$pkgver.tar.gz"
         'trytond.install'
         'trytond.service')
-md5sums=('0dd81769fc18fe2d20e83de4f17cb10d'
+md5sums=('622094022c570d3a0c9aa9e786542d55'
          '768e68c01cb5913e36ea89c67fc98038'
          'b1535a8528dfd8f655624bf6faea6985')
 
diff --git a/pcr/ttf-asana-math/PKGBUILD b/pcr/ttf-asana-math/PKGBUILD
new file mode 100644
index 000000000..b8bd85dcc
--- /dev/null
+++ b/pcr/ttf-asana-math/PKGBUILD
@@ -0,0 +1,30 @@
+# Maintainer (Arch): GordonGR <gordongr@freemail.gr>
+# Maintainer (Parabola): Alon Ivtsan <alonivtsan@lavabit.com>
+# taken from https://aur.archlinux.org/packages/ttf-asana-math/
+
+pkgname=ttf-asana-math
+pkgver=000.949
+pkgrel=1
+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")
+md5sums=('d9f9faa296a12a14354d9e83c90f167b'
+         'd7a05892aeed8bbe4b410bf845ce9882'
+         '6ed93967ff0dc6dd9c8d31c17f817a06')
+install=$pkgname.install
+
+build()
+{
+  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/
+}
diff --git a/pcr/ttf-asana-math/ttf-asana-math.install b/pcr/ttf-asana-math/ttf-asana-math.install
new file mode 100644
index 000000000..506595662
--- /dev/null
+++ b/pcr/ttf-asana-math/ttf-asana-math.install
@@ -0,0 +1,11 @@
+ 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/video_entropyd/PKGBUILD b/pcr/video_entropyd/PKGBUILD
new file mode 100644
index 000000000..e096aabdd
--- /dev/null
+++ b/pcr/video_entropyd/PKGBUILD
@@ -0,0 +1,28 @@
+# 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
new file mode 100644
index 000000000..1dfef410a
--- /dev/null
+++ b/pcr/video_entropyd/video_entropyd.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Gathering entropy from video
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/video_entropyd
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pcr/xcftools/PKGBUILD b/pcr/xcftools/PKGBUILD
index 979453d24..414149f85 100644
--- a/pcr/xcftools/PKGBUILD
+++ b/pcr/xcftools/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 pkgname=xcftools
 pkgver=1.0.7
-pkgrel=1
+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=(
diff --git a/pcr/xf86-input-wizardpen/PKGBUILD b/pcr/xf86-input-wizardpen/PKGBUILD
index 4b40ebea2..dfad17f34 100644
--- a/pcr/xf86-input-wizardpen/PKGBUILD
+++ b/pcr/xf86-input-wizardpen/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
 
 pkgname=xf86-input-wizardpen
 _pkgname=${pkgname:11}
diff --git a/pcr/yafaray-git/PKGBUILD b/pcr/yafaray-git/PKGBUILD
deleted file mode 100644
index 1d4b3436c..000000000
--- a/pcr/yafaray-git/PKGBUILD
+++ /dev/null
@@ -1,109 +0,0 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-
-pkgname=(
-  yafaray-git
-  blender-addon-yafaray-git
-)
-_pkgflag=git
-_pkgname=${pkgname[0]%-$_pkgflag}
-_bldname=${pkgname[1]::7}
-_gitname=Core
-_addname=${_bldname^}-Exporter
-pkgver=$(LC_ALL=C date -u +%Y%m%d)
-_pkgver=1.2
-_bldver=2.66
-_bldep=7
-_pyver=3.3
-pkgrel=1
-pkgdesc='A libre software raytracing engine'
-arch=(
-  i686
-  x86_64
-  mips64el
-)
-url="http://www.$_pkgname.org"
-license=LGPL2.1
-depends=(
-  freetype2
-  libjpeg
-  libxml2
-  'openexr=2.0.0'
-)
-optdepends=(
-  'python: Python bindings'
-  'qt4: QT GUI'
-  "${pkgname[1]}: ${_bldname^} addon renderer"
-)
-makedepends=(
-  cmake
-  git
-  python
-  qt4
-  swig
-)
-provides=($_pkgname=$_pkgver)
-conflicts=$_pkgname
-source=(
-  git://github.com/YafaRay/$_gitname.$_pkgflag
-  git://github.com/YafaRay/$_addname.$_pkgflag
-)
-sha512sums=(SKIP SKIP)
-
-prepare() {
-  cd $srcdir/$_gitname
-
-  [[ -d build ]] && rm -r build
-  mkdir build
-}
-
-build() {
-  cd $srcdir/$_gitname/build
-
-  setarch $CARCH cmake .. -DCMAKE_INSTALL_PREFIX=/usr\
-    -DYAF_PY_VERSION=$_pyver\
-    -DYAF_BINDINGS_PY_DIR=/usr/lib/python$_pyver
-
-  setarch $CARCH make
-}
-
-package_yafaray-git() {
-  cd $srcdir/$_gitname/build
-  setarch $CARCH make DESTDIR=$pkgdir install
-}
-
-package_blender-addon-yafaray-git() {
-  pkgver=$pkgver.v$_bldver
-  pkgdesc="A addon for the ${_bldname^} which allows render with YafaRay (built for the $_bldname-libre package)"
-  arch=any
-  depends=(
-    ${pkgname:14}=${pkgver%.v$_bldver}
-    "$_bldname>=$(($_bldep-1)):$_bldver"
-    "$_bldname<$_bldep:${_bldver::2}$((${_bldver:2:4}+1))"
-  )
-  optdepends=''
-  provides=(
-    ${pkgname%-$_pkgflag}=$_pkgver.v$_bldver
-    $_pkgname-$_bldname-exporter=$_pkgver.v$_bldver
-    $_pkgname-$_bldname-exporter-$_pkgflag=$pkgver
-  )
-  conflicts=(
-    ${pkgname%-$_pkgflag}
-    $_pkgname-$_bldname-exporter
-    $_pkgname-$_bldname-exporter-$_pkgflag
-  )
-  replaces=$_pkgname-$_bldname-exporter-$_pkgflag
-
-  cd $srcdir/$_addname
-
-  a=/usr/lib
-  b=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons/$_pkgname/bin
-
-  git checkout-index -a -f --prefix=${b%bin}
-
-  install -d $b
-  ln -sf $a/lib${_pkgname}core.so   $b/lib${_pkgname}core.so
-  ln -sf $a/lib${_pkgname}plugin.so $b/lib${_pkgname}plugin.so
-  ln -sf $a/$_pkgname               $b/plugins
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/yafaray/PKGBUILD b/pcr/yafaray/PKGBUILD
new file mode 100644
index 000000000..458181279
--- /dev/null
+++ b/pcr/yafaray/PKGBUILD
@@ -0,0 +1,112 @@
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+
+_pkgname=yafaray
+_pkgver=1.5
+_pkgrel=3
+_pkgdate=20130510
+_bldname=blender
+_bldver=2.68
+_bldep=9
+_gitname=Core
+_addname=${_bldname^}-Exporter
+_addrel=1
+_adddate=20130623
+_pyver=3.3
+
+# Fri May 10 00:57:12 2013 -0700 - Merge pull request #67 from DarkTide/master // Depth fix for hist on background
+_srcver=44323def5b3866ff601fd401ef2160b80ced8141                                  
+# Sun Jun 23 15:10:57 2013 +0200 - Refine AA changes for SPPM integrator
+_addver=9bcb22e8b8bd9281999ad36c5b22604f671484bb
+
+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=(
+  5045a3de89e0a2d029e8b6ce962eeadeb5587369217d11d42ca79706a65e6ac7b07584f68307f76c90dbaf190af9626e3351e391107a4e763fc9e41d48cfd7a6
+  59322686d0623481b38c531e2a8350cafcf8942eb08df2dfcc8f59657715aa716ca34d473f862291e8a375fccdf717d93898caa3e344cfa1a3e5e760c903d32c
+)
+
+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/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD
new file mode 100644
index 000000000..1f7b10296
--- /dev/null
+++ b/pcr/youtube-dl-current/PKGBUILD
@@ -0,0 +1,32 @@
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+# Maintainer (Parabola): Alon Ivtsan <alonivtsan@lavabit.com>
+# Based on https://www.archlinux.org/packages/community/any/youtube-dl/ 
+
+pkgname=youtube-dl-current
+_pkgname=youtube-dl
+provides=(youtube-dl)
+pkgver=2013.09.20.1
+pkgrel=1
+pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites"
+arch=('any')
+url="http://rg3.github.io/youtube-dl/"
+license=('custom')
+depends=('python')
+makedepends=('python-distribute')
+source=(http://youtube-dl.org/downloads/${pkgver}/${_pkgname}-${pkgver}.tar.gz{,.sig})
+
+prepare() {
+  cd ${_pkgname}
+  sed -i 's|etc/bash_completion.d|share/bash-completion/completions|' setup.py
+}
+
+package() {
+  cd ${_pkgname}
+  python setup.py install --root="${pkgdir}/" --optimize=1
+  mv "${pkgdir}/usr/share/bash-completion/completions/youtube-dl.bash-completion" \
+    "${pkgdir}/usr/share/bash-completion/completions/youtube-dl"
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
+}
+
+md5sums=('ee26e1e7558bd5f411aae9b1bf9e7e47'
+         'SKIP')
diff --git a/pcr/zbar/PKGBUILD b/pcr/zbar/PKGBUILD
new file mode 100644
index 000000000..199fc2bb8
--- /dev/null
+++ b/pcr/zbar/PKGBUILD
@@ -0,0 +1,40 @@
+# 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
new file mode 100644
index 000000000..150b0e695
--- /dev/null
+++ b/pcr/zbar/v4l1.patch
@@ -0,0 +1,24 @@
+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
new file mode 100644
index 000000000..b4373abb8
--- /dev/null
+++ b/pcr/zbase32/PKGBUILD
@@ -0,0 +1,25 @@
+# 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/zfec/PKGBUILD b/pcr/zfec/PKGBUILD
new file mode 100644
index 000000000..0c2487c6b
--- /dev/null
+++ b/pcr/zfec/PKGBUILD
@@ -0,0 +1,26 @@
+# 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/zita-convolver/PKGBUILD b/pcr/zita-convolver/PKGBUILD
deleted file mode 100644
index 5017f144f..000000000
--- a/pcr/zita-convolver/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer : Guest One <theguestone at gmail dot com>
-
-pkgname=zita-convolver
-pkgver=3.1.0
-pkgrel=1
-pkgdesc="Convolution library for aeolus and jconvolver"
-arch=('i686' 'x86_64')
-url="http://kokkinizita.linuxaudio.org/linuxaudio"
-license=('GPL')
-depends=('fftw' 'gcc-libs')
-source=("http://kokkinizita.linuxaudio.org/linuxaudio/downloads/zita-convolver-$pkgver.tar.bz2")
-md5sums=('7e264d0fb0d8ea277cdb4e33d764c68a')
-
-build() {
-  cd "$srcdir/zita-convolver-$pkgver/libs"
-
-  sed -i 's/usr\/local/usr/' Makefile
-  sed -i 's/ldconfig//' Makefile
-
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver/libs"
-
-  make SUFFIX="" PREFIX="$pkgdir/usr" DESTDIR=${PKGDIR} install 
-
-
-  # Another failed attempt at trying to be clever. A simple call to ldconfig might have worked.
-  #  ln -s lib$pkgname.so.$pkgver \
-  #    "$pkgdir/usr/lib/lib$pkgname.so.${pkgver%%.*}"
-  
-  #  ln -s lib${pkgname}.so.$pkgver ${pkgdir}/usr/lib/lib${pkgname}.so
-}
-
-
diff --git a/pcr/zoneminder/PKGBUILD b/pcr/zoneminder/PKGBUILD
index 236ceca01..ede03dd77 100644
--- a/pcr/zoneminder/PKGBUILD
+++ b/pcr/zoneminder/PKGBUILD
@@ -1,3 +1,4 @@
+# Maintainer:  Jacek Burghardt           <jacek@hebe.us>
 # Maintainer:  Vojtech Aschenbrenner     <v@asch.cz>
 # Contributor: Jason Gardner             <buhrietoe@gmail.com>
 # Contributor: Ross melin                <rdmelin@gmail.com>
@@ -6,27 +7,24 @@
 
 # based of debian squeeze package
 
-pkgbase=zoneminder
+_automake=1.14
+
 pkgname=zoneminder
 pkgver=1.25.0
-pkgrel=24
+pkgrel=28
 pkgdesc='Capture, analyse, record and monitor video security cameras'
 arch=(
-  i686
-  x86_64
   mips64el
+  x86_64
+  i686
 )
-backup=(
-  etc/zm.conf
-)
-url="http://www.$pkgbase.com"
-license=(
-  GPL
-)
+backup=etc/zm.conf
+url=http://www.$pkgname.com
+license=GPL2
 depends=(
   apache
   cambozola
-  libav-static
+  ffmpeg
   gnutls
   mariadb
   perl-archive-zip
@@ -47,107 +45,117 @@ depends=(
   php-gd
   php-mcrypt
 )
-makedepends=(
-  netpbm
-)
-optdepends=(
-  netpbm
-)
-install=$pkgbase.install
+makedepends=netpbm
+optdepends=netpbm
+options=(!libtool)
+install=$pkgname.install
 source=(
-  http://www.$pkgbase.com/downloads/ZoneMinder-$pkgver.tar.gz
-  httpd-$pkgbase.conf
-  $pkgbase
-  $pkgbase.service
+  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
-  ab4e1d5ddaf4d9cd53d6ca59d7965902afd6a2dc830fbbafa270736c52c2b3563075fee860bb0276466f96e9dbfb71b259ac45a4ae2e4ead8eaec154a0159eb0
   cfb0eb87a989236c72741a496ddc6a73aa2696e5beaaca4836d3c231ddb24c7ef5e9f65e7afa49674f2115cbfa4a07c75486e1947ce294c816ddbb875f3b99cf
+  7330c179f1e2db815a675560d3d84648be02f7d0292f8cbe21d6033577fe688ed71ad23b5b8c9dc309395b45ebb554f9499e7a4b57091959b69679011fa59044
+  7fc2a4663c3103bef641be065bd7992a2b3dc0699f1b99dc2fdb34c1c48e58686e490d3ade523ef7c8e29b3f04109658eef652c26ff6ee3fb9aee65453bdb6c4
+  8c9e7debcaf60be1c2dda656f95e497f6812d704edc3ca4a1c915a3b3c9dc1749c91d96bc2d60db7d90d5edfd9e2dfc39010dfe4feabfecfffd27f1fffc3d675
 )
 
-build() {
+prepare() {
   cd $srcdir/ZoneMinder-$pkgver
 
-  # ZM_RUNDIR need change to run dir
-  export CPPFLAGS=-D__STDC_CONSTANT_MACROS\
-    OPT_FFMPEG=yes\
-    PATH_FFMPEG=/usr/bin/avconv-static\
-    ZM_LOGDIR=/var/log/$pkgbase\
-    ZM_RUNDIR=/tmp/$pkgbase\
-    ZM_SSL_LIB=gnutls\
-    ZM_TMPDIR=/tmp/$pkgbase
-
-  # Patch for GCC 4.7.x
-  sed -i -e 's/^#include <errno.h>/#include <errno.h>\n#include <unistd.h>/'\
-     src/zm_logger.cpp || read
-  sed -i -e 's/^#include <pthread.h>/#include <pthread.h>\n#include <unistd.h>/'\
-     src/zm_thread.h || read
-
-  # Patch for automake 1.12
-  sed -i -e '/am__api_version=/ s/1.11/1.12/'\
-    configure || read
+  # 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 -e '/ZM_CHECK_FOR_UPDATES/,+1 s/yes/no/'\
-    scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read
+  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 -e '/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 || read
-
-  # Patch for enable video export
-  #sed -i -e '/ZM_OPT_FFMPEG/,+1 s/@OPT_FFMPEG@/yes/;
-  #  /ZM_PATH_FFMPEG/,+1 s/@PATH_FFMPEG@/\/usr\/bin\/avconv-static/'\
-  #  scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read
+  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
-  sed -i -e '/ZM_PATH_SOCKS/,+1 s/TMP/RUN/'\
-    scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read
-
-  # Patch for change ZM name to ZoneMinder
-  sed -i -e '/ZM_WEB_TITLE_PREFIX/,+1 s/"ZM"/"ZoneMinder"/'\
-    scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read
+  # 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 -e "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 || read
+  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 -e '/$max_socket_tries/ s/3/15/'\
-    web/ajax/stream.php || read
-
-  # Patch for wrong "suppported"
-  sed -i -e 's/suppported/supported/'\
-     src/zm_local_camera.cpp || read
-
-  # Patch for type cast in linux-libre kernel 3.5
-  sed -i -e 's/enum v4l2_buf_type type = v4l2_data.fmt.type;/enum v4l2_buf_type type = (v4l2_buf_type)v4l2_data.fmt.type;/'\
-    src/zm_local_camera.cpp || read
-
-  # Patch for drop custom perl install paths
-  sed -i -e '/# Slight hack for non-standard perl install paths/,+10 d;
-    s/^AC_SUBST(ZM_CONFIG,"$SYSCONFDIR\/zm.conf")/AC_SUBST(ZM_CONFIG,"$SYSCONFDIR\/zm.conf")\n\nEXTRA_PERL_LIB="# Include from system perl paths only"\nPERL_MM_PARMS="INSTALLDIRS=vendor"/'\
-    configure.ac
-
-  # Patch for support ffmpeg with <libavutil/mathematics.h> and C library
-  sed -i -e '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
-  sed -i -e '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 wrong install run, tmp and log dir
-  sed -i -e '/ install-data-hook/d;/install-data-hook:/d;/# Yes, you are correct. This is a HACK!/d;
-    /	( cd $(DESTDIR)$(sysconfdir); chown $(webuser):$(webgroup) $(sysconf_DATA); chmod 600 $(sysconf_DATA) )/d;
-    /	( if ! test -e $(ZM_RUNDIR); then mkdir -p $(ZM_RUNDIR); fi; if test "$(ZM_RUNDIR)" != "\/var\/run"; then chown $(webuser):$(webgroup) $(ZM_RUNDIR); chmod u+w $(ZM_RUNDIR); fi )/d;
-    /	( if ! test -e $(ZM_TMPDIR); then mkdir -m 700 -p $(ZM_TMPDIR); fi; if test "$(ZM_TMPDIR)" != "\/tmp"; then chown $(webuser):$(webgroup) $(ZM_TMPDIR); chmod u+w $(ZM_TMPDIR); fi )/d;
-    /	( if ! test -e $(ZM_LOGDIR); then mkdir -p $(ZM_LOGDIR); fi; if test "$(ZM_LOGDIR)" != "\/var\/log"; then chown $(webuser):$(webgroup) $(ZM_LOGDIR); chmod u+w $(ZM_LOGDIR); fi )/,+1 d'\
-    Makefile.{am,in}
+  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\
@@ -156,41 +164,39 @@ build() {
     --sysconfdir=/etc\
     --with-cgidir=/srv/http/cgi-bin\
     --with-extralibs='-L/usr/lib -L/usr/lib/mysql'\
-    --with-ffmpeg=/opt/libav-static\
+    --with-ffmpeg=/usr\
     --with-libarch=lib\
     --with-mysql=/usr\
-    --with-webdir=/srv/http/$pkgbase\
+    --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 -p $pkgdir/{etc/{httpd/conf/extra,rc.d},srv/http/{cgi-bin,$pkgbase},usr/{lib/systemd/system,share/{license/$pkgbase,$pkgbase/db}},var/{cache/$pkgbase,log/$pkgbase}}
-
-  chown -R http.http $pkgdir/{etc/zm.conf,var/{cache/$pkgbase,log/$pkgbase}}
-  chmod 0700 $pkgdir/etc/zm.conf
+  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    $pkgdir/srv/http/$pkgbase/$i $pkgdir/var/cache/$pkgbase/$i
-    ln -s /var/cache/$pkgbase/$i       $pkgdir/srv/http/$pkgbase/$i
-    chown -h http.http                 $pkgdir/srv/http/$pkgbase/$i
+    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 -s /srv/http/cgi-bin                  $pkgdir/srv/http/$pkgbase
-  chown -h http.http                       $pkgdir/srv/http/{cgi-bin,$pkgbase,$pkgbase/cgi-bin}
+  ln -vs /srv/http/cgi-bin                  $pkgdir/srv/http/$pkgname
+  chown -vh http.http                       $pkgdir/srv/http/{cgi-bin,$pkgname,$pkgname/cgi-bin}
 
-  ln -s /usr/share/cambozola/cambozola.jar $pkgdir/srv/http/$pkgbase
+  ln -vs /usr/share/cambozola/cambozola.jar $pkgdir/srv/http/$pkgname
 
-  install -D -m 644 $srcdir/httpd-$pkgbase.conf $pkgdir/etc/httpd/conf/extra
-  install -D -m 644 $srcdir/$pkgbase            $pkgdir/etc/rc.d
-  install -D -m 644 $srcdir/$pkgbase.service    $pkgdir/usr/lib/systemd/system
-  install -D -m 644 COPYING                     $pkgdir/usr/share/license/$pkgbase
-  install -D -m 644 db/zm*.sql                  $pkgdir/usr/share/$pkgbase/db
+  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/sysctl-zoneminder.conf b/pcr/zoneminder/sysctl-zoneminder.conf
new file mode 100644
index 000000000..ec1407dee
--- /dev/null
+++ b/pcr/zoneminder/sysctl-zoneminder.conf
@@ -0,0 +1,3 @@
+# For Zoneminder Monitor
+#kernel.shmall = 524288000
+#kernel.shmmax = 524288000
diff --git a/pcr/zoneminder/zoneminder-1.25-fixwarning.patch b/pcr/zoneminder/zoneminder-1.25-fixwarning.patch
new file mode 100644
index 000000000..0d151d139
--- /dev/null
+++ b/pcr/zoneminder/zoneminder-1.25-fixwarning.patch
@@ -0,0 +1,14 @@
+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
new file mode 100644
index 000000000..90885f1b5
--- /dev/null
+++ b/pcr/zoneminder/zoneminder-1.25-text.patch
@@ -0,0 +1,12 @@
+--- 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
new file mode 100644
index 000000000..99d41ee33
--- /dev/null
+++ b/pcr/zoneminder/zoneminder-1.25.0-ffmpeg.patch
@@ -0,0 +1,130 @@
+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
new file mode 100644
index 000000000..a083c6dbc
--- /dev/null
+++ b/pcr/zoneminder/zoneminder-1.25.0-gcc47.patch
@@ -0,0 +1,33 @@
+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
new file mode 100644
index 000000000..21f197ec6
--- /dev/null
+++ b/pcr/zoneminder/zoneminder-1.25.0-gcrypt.patch
@@ -0,0 +1,86 @@
+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
new file mode 100644
index 000000000..51bc1288d
--- /dev/null
+++ b/pcr/zoneminder/zoneminder-1.25.0-kernel35.patch
@@ -0,0 +1,21 @@
+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
index ecacf6437..66109d5fa 100644
--- a/pcr/zoneminder/zoneminder.install
+++ b/pcr/zoneminder/zoneminder.install
@@ -1,3 +1,4 @@
+#!/usr/bin/bash
 pre_install() {
   set -e
   abort=false
@@ -27,20 +28,20 @@ EOF
 
 post_install() {
   if [[ -d /var/log/zoneminder ]]; then
-    chmod 0755 /var/log/zoneminder
-    chown http.http /var/log/zoneminder
+    chmod -v 0755      /var/log/zoneminder
+    chown -v http.http /var/log/zoneminder
   else
-    mkdir -m 0755 /var/log/zoneminder
-    chown http.http /var/log/zoneminder
+    mkdir -vm 0755      /var/log/zoneminder
+    chown -v  http.http /var/log/zoneminder
   fi
   if [[ -d /tmp/zoneminder ]]; then
-    chmod 0700 /tmp/zoneminder
-    chown http.http /tmp/zoneminder
+    chmod -v 0700      /tmp/zoneminder
+    chown -v http.http /tmp/zoneminder
   else
-    mkdir -m 0700 /tmp/zoneminder
-    chown http.http /tmp/zoneminder
+    mkdir -vm 0700      /tmp/zoneminder
+    chown -v  http.http /tmp/zoneminder
   fi
-  sed -i -e '
+  sed -i '
     /^;extension=mysql.so/ s/^;//;
     /^#extension=mysql.so/ s/^#//;
     /^;extension=mysqli.so/ s/^;//;
@@ -72,8 +73,8 @@ post_install() {
     /^open_basedir/ s/:\/var\/cache\/zoneminder//;
     /^open_basedir/ s/:\/var\/cache\/zoneminder\///;
     /^open_basedir/ s/$/:\/var\/cache\/zoneminder/;
-    ' /etc/php/php.ini || read
-  sed -i -e '
+    ' /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;
@@ -81,12 +82,12 @@ post_install() {
     /^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 || read
+    ' /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):
-==> "rc.d start mysqld" (in initscripts) or "systemctl start mysqld.service" (in systemd)
+==> "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"
@@ -96,6 +97,11 @@ Note for mysql:
 ==> "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"
@@ -126,22 +132,25 @@ 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() {
-  if [[ -d /tmp/zoneminder ]]; then
-    rm -vr /tmp/zoneminder
-  fi
-  sed -i -e '
+  _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 || read
-  sed -i -e '
+    ' /etc/php/php.ini
+  sed -i '
     /^# ZoneMinder/d;
     /Include \/etc\/httpd\/conf\/extra\/httpd-zoneminder.conf/d;
-    ' /etc/httpd/conf/httpd.conf || read
+    ' /etc/httpd/conf/httpd.conf
   cat << EOF
 Note:
 ==> To clean Zoneminder mysql database, run as root (with password):
diff --git a/social/asterisk/PKGBUILD b/social/asterisk/PKGBUILD
deleted file mode 100644
index 896d5bacf..000000000
--- a/social/asterisk/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# Contributor: Alessio Biancalana <dottorblaster@gmail.com>
-
-pkgname=asterisk
-pkgver=10.9.0
-pkgrel=1
-pkgdesc="A complete PBX solution"
-arch=('i686' 'x86_64')
-url="http://www.asterisk.org"
-license=('GPL')
-depends=('alsa-lib' 'speex' 'popt' 'libvorbis' 'curl') 
-makedepends=('postgresql' 'unixodbc' 'sqlite3')
-optdepends=('libpri' 'libss7' 'openr2' 'iksemel')
-backup=(etc/asterisk/asterisk.conf)
-source=(http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-$pkgver.tar.gz \
-	asterisk \
-	asterisk.logrotated)
-install=$pkgname.install
-md5sums=('2fb85dc753584ac13692c27f9749c6cb'
-         '59146273738605f1e011d8e7bed3561a'
-         '486e07a0a1405ea25ec5b1736034653e')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-  make
-}
-
-package(){
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  make DESTDIR=${pkgdir} samples
-
-  (cd ${pkgdir}/etc/asterisk
-#  for i in `ls`; do [ $i = "asterisk.conf" ] || mv $i $i.default; done
-ls -I asterisk.conf | xargs -I '{}' mv '{}' '{}.default')
-#  cp ${srcdir}/modules.conf  modules.conf
-  sed -i -e "s/\/var\/run/\/var\/run\/asterisk/" $startdir/pkg/etc/asterisk/asterisk.conf
-  
-  install -D -m 755 ${srcdir}/asterisk ${pkgdir}/etc/rc.d/asterisk
-  install -D -m 644 ${srcdir}/asterisk.logrotated ${pkgdir}/etc/logrotate.d/asterisk
- }
diff --git a/social/asterisk/asterisk b/social/asterisk/asterisk
deleted file mode 100644
index f823caefc..000000000
--- a/social/asterisk/asterisk
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/asterisk`
-case "$1" in
-  start)
-    stat_busy "Starting Asterisk"
-    [ -z "$PID" ] && cd /var/lib/asterisk && /usr/sbin/asterisk -G asterisk -U asterisk
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon asterisk
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Asterisk"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm -f /var/run/asterisk/asterisk.pid &>/dev/null
-      rm_daemon asterisk
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 2
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/social/asterisk/asterisk.install b/social/asterisk/asterisk.install
deleted file mode 100644
index 1a3b998b7..000000000
--- a/social/asterisk/asterisk.install
+++ /dev/null
@@ -1,38 +0,0 @@
-post_install() {
-  echo -n "adding asterisk system group... "
-  groupadd -g 5060 asterisk && echo "done."
-  echo -n "adding asterisk system user... "
-  useradd -c "Asterisk daemon" -u 5060 -d /var/lib/asterisk -g asterisk -s /bin/false asterisk \
-  && echo "done."
-  passwd -l asterisk &>/dev/null
-  chown -R asterisk:asterisk /var/run/asterisk
-  chown -R asterisk:asterisk /var/log/asterisk
-  chown -R asterisk:asterisk /var/spool/asterisk
-  chown -R asterisk:asterisk /var/lib/asterisk 
-
-cat << EOF
->>>
->>> To get Music on Hold working do pacman -S mpg123
->>> To get the postgresql, unixodbc or sqlite2 modules working
->>> download the respective package and modify modules.conf to reflect
->>> your changes.
->>>
-EOF
-
-}
-
-post_upgrade() {
-  if grep asterisk /etc/passwd &>/dev/null; then 
-    /bin/true
-  else
-    post_install $1
-  fi
-}
-
-post_remove() {
-  echo -n -e "\nremoving asterisk system user... "
-  userdel asterisk && echo "done."
-}
-op=$1
-shift
-$op $* 
diff --git a/social/miniupnpc/PKGBUILD b/social/miniupnpc/PKGBUILD
deleted file mode 100644
index a28b9842f..000000000
--- a/social/miniupnpc/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Contributor: Florian Loitsch <archlinux@florian.loitsch.com>
-pkgname=miniupnpc
-pkgver=1.7.20120830
-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=('c74b24b906e11860005fc425b4979fe6')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  make
-}
-
-package(){
-  cd $srcdir/$pkgname-$pkgver
-  make INSTALLPREFIX=$pkgdir/usr install
-  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/social/openswan/PKGBUILD b/social/openswan/PKGBUILD
deleted file mode 100644
index b60ca8401..000000000
--- a/social/openswan/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# Contributor: Jan Fader <jan.fader@web.de>
-pkgname=openswan
-pkgver=2.6.36
-pkgrel=1
-pkgdesc="Open Source implementation of IPsec for the Linux operating system"
-url="http://www.openswan.org"
-license=('GPL' 'custom')
-arch=('i686' 'x86_64')
-depends=('iproute' 'gmp' 'perl')
-backup=(etc/ipsec.conf \
-        etc/ipsec.d/policies/{block,clear,clear-or-private,private,private-or-clear})
-source=(http://www.openswan.org/download/openswan-$pkgver.tar.gz
-        openswan.rc.d
-        compile.patch)
-
-build() {
-  # Create /etc/rc.d for init script, and license directory
-  mkdir -p $pkgdir/{etc/rc.d,usr/share/licenses/openswan}
-
-  cd $srcdir/openswan-$pkgver
-  patch -p1 -i $srcdir/compile.patch
-
-  # Change install paths to Arch defaults
-  sed -i 's|/usr/local|/usr|;s|libexec/ipsec|lib/openswan|' Makefile.inc
-
-  make USE_XAUTH=true USE_OBJDIR=true programs
-}
-
-package(){
-  cd $srcdir/openswan-$pkgver
-  make DESTDIR=$pkgdir install
-
-  # Change permissions in /var
-  chmod 755 $pkgdir/var/run/pluto
-  
-  # Copy License
-  cp LICENSE $pkgdir/usr/share/licenses/openswan
-  
-  # Install init script
-  install -Dm755 ../openswan.rc.d $pkgdir/etc/rc.d/openswan
-  # fix manpages
-  mv $pkgdir/usr/man $pkgdir/usr/share/
-}
-md5sums=('b3a1733493520bb18729633b62ef8247'
-         '543d84162761b9cc9ec319e938c4dd2a'
-         '5540437bb334873da646e21ac9caa963')
diff --git a/social/openswan/compile.patch b/social/openswan/compile.patch
deleted file mode 100644
index 8ddff67f2..000000000
--- a/social/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/social/openswan/openswan.rc.d b/social/openswan/openswan.rc.d
deleted file mode 100644
index 30bd0d56e..000000000
--- a/social/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/social/sipwitch/PKGBUILD b/social/sipwitch/PKGBUILD
index 8cb84fad5..6ab789ccc 100644
--- a/social/sipwitch/PKGBUILD
+++ b/social/sipwitch/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Dan Serban
 # Contributors: David Zaragoza, Andrea Scarpino
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname=sipwitch
 pkgver=1.2.4
diff --git a/social/tomb/PKGBUILD b/social/tomb/PKGBUILD
deleted file mode 100644
index a0ac0334f..000000000
--- a/social/tomb/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-## PKGBUILD [bash]
-# Maintainer: nignux <nignux@freaknet.org>
-
-pkgname=tomb
-pkgver=1.2
-pkgrel=1
-pkgdesc="Crypto Undertaker, simple tool to manage encrypted storage, from the hashes of the dyne:bolic nesting mechanism."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://tomb.dyne.org"
-license=('GPL3')
-depends=('bc' 'cryptsetup' 'gnupg' 'gtk2' 'libnotify' 'sudo' 'zsh' 'steghide'
-         'dcfldd' 'wipe')
-makedepends=('autoconf')
-provides=('tomb')
-install=${pkgname}.install
-source=(https://github.com/dyne/Tomb/tarball/v1.2)
-md5sums=('30fb11ef26355a1828933b13ee265924')
-
-build() {
-  cd ${srcdir}/dyne-Tomb-ddd9331
-  autoreconf -i
-  ./configure --prefix=/usr
-  make
-}
- 
-package() {
-  cd ${srcdir}/dyne-Tomb-ddd9331
-  make DESTDIR=${pkgdir} install
-}
-
diff --git a/~brendan/guile/PKGBUILD b/~brendan/guile/PKGBUILD
deleted file mode 100644
index af8827563..000000000
--- a/~brendan/guile/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer: Patrick McCarty <pnorcks at gmail dot com>
-# Contributor: Emmanuel 'guinness' Boudreault
-# Parabola Maintainer: Brendan Tildesley (brendyn)
-#
-# This is `guile-devel' from AUR, with very little changes.
-pkgname=guile
-pkgver=2.0.5
-pkgrel=1
-pkgdesc="GNU Ubiquitous Intelligent Language for Extensions - a portable, embeddable Scheme implementation written in C"
-url="http://www.gnu.org/software/guile/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gmp>=4.3.1' 'libtool' 'ncurses>=5.7' 'texinfo'
-         'libunistring' 'gc' 'libffi')
-conflicts=('guile' 'guile-git')
-provides=("guile=$pkgver")
-install=guile.install
-options=('!libtool')
-source=(ftp://ftp.gnu.org/pub/gnu/guile/guile-${pkgver}.tar.gz)
-sha256sums=('2a026ea6cdbc51ca71bcd9787839debfa45ac5db1e26dc00b30ca9b128b10956')
-
-build() {
-  cd "${srcdir}/guile-${pkgver}"
-
-  ./configure --prefix=/usr
-  make LDFLAGS+="-lpthread"
-}
-
-package() {
-  cd "${srcdir}/guile-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/~coadde/cross-binutils/PKGBUILD b/~coadde/cross-binutils/PKGBUILD
new file mode 100644
index 000000000..e1a8985f3
--- /dev/null
+++ b/~coadde/cross-binutils/PKGBUILD
@@ -0,0 +1,406 @@
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+# Contributor: André Silva <emulatorman@lavabit.com>
+
+# 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
new file mode 100644
index 000000000..e2cb3892c
--- /dev/null
+++ b/~coadde/cross-binutils/aarch64-unknown-elf-binutils-multilib.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..7546e29a1
--- /dev/null
+++ b/~coadde/cross-binutils/aarch64-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..6f986cd41
--- /dev/null
+++ b/~coadde/cross-binutils/aarch64-unknown-linux-gnu-binutils-multilib.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..96d20da4a
--- /dev/null
+++ b/~coadde/cross-binutils/aarch64-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..ae71b8f32
--- /dev/null
+++ b/~coadde/cross-binutils/aarch64_be-unknown-elf-binutils-multilib.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..886d38ddc
--- /dev/null
+++ b/~coadde/cross-binutils/aarch64_be-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..21e87d4a6
--- /dev/null
+++ b/~coadde/cross-binutils/aarch64_be-unknown-linux-gnu-binutils-multilib.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..7c040a1d1
--- /dev/null
+++ b/~coadde/cross-binutils/aarch64_be-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..2a5ac8d12
--- /dev/null
+++ b/~coadde/cross-binutils/arm-unknown-eabi-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..f1053cd1e
--- /dev/null
+++ b/~coadde/cross-binutils/arm5tel-unknown-linux-gnueabi.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..fa11d3f92
--- /dev/null
+++ b/~coadde/cross-binutils/arm6l-unknown-linux-gnueabi.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..4e9ca080f
--- /dev/null
+++ b/~coadde/cross-binutils/arm7l-unknown-linux-gnueabi.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..363e4b477
--- /dev/null
+++ b/~coadde/cross-binutils/armeb-unknown-eabi-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..75fa9f797
--- /dev/null
+++ b/~coadde/cross-binutils/armeb-unknown-linux-gnueabi.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..9de0533ee
--- /dev/null
+++ b/~coadde/cross-binutils/binutils.install
@@ -0,0 +1,17 @@
+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
new file mode 100644
index 000000000..572ecca6e
--- /dev/null
+++ b/~coadde/cross-binutils/i386-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..6e4dac15d
--- /dev/null
+++ b/~coadde/cross-binutils/i586-pc-gnu-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..f14abdfaa
--- /dev/null
+++ b/~coadde/cross-binutils/i586-pc-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..1fbfac209
--- /dev/null
+++ b/~coadde/cross-binutils/i686-pc-gnu-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..a0498ff51
--- /dev/null
+++ b/~coadde/cross-binutils/i686-pc-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..f77927c8d
--- /dev/null
+++ b/~coadde/cross-binutils/i786-pc-gnu-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..b6422d2ce
--- /dev/null
+++ b/~coadde/cross-binutils/i786-pc-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..a31a76a41
--- /dev/null
+++ b/~coadde/cross-binutils/ia64-unknown-linux-gnu-binutils-multilib.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..9853a7dce
--- /dev/null
+++ b/~coadde/cross-binutils/ia64-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..c2481ba1f
--- /dev/null
+++ b/~coadde/cross-binutils/lm32-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..e59746dd4
--- /dev/null
+++ b/~coadde/cross-binutils/lm32-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..b45dcea38
--- /dev/null
+++ b/~coadde/cross-binutils/m68k-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..f8dd9a4ad
--- /dev/null
+++ b/~coadde/cross-binutils/mips-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..e24e260f6
--- /dev/null
+++ b/~coadde/cross-binutils/mips64-unknown-elf-binutils-multilib.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..8e5e0a192
--- /dev/null
+++ b/~coadde/cross-binutils/mips64-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..7ae20c93c
--- /dev/null
+++ b/~coadde/cross-binutils/mips64-unknown-linux-gnu-binutils-multilib.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..3da7b37e3
--- /dev/null
+++ b/~coadde/cross-binutils/mips64-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..201c805dd
--- /dev/null
+++ b/~coadde/cross-binutils/mips64el-unknown-elf-binutils-multilib.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..ab338a443
--- /dev/null
+++ b/~coadde/cross-binutils/mips64el-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..cff96a72a
--- /dev/null
+++ b/~coadde/cross-binutils/mips64el-unknown-linux-gnu-binutils-multilib.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..21b4a2af2
--- /dev/null
+++ b/~coadde/cross-binutils/mips64el-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..87c99efcf
--- /dev/null
+++ b/~coadde/cross-binutils/mipsel-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..92833bd5d
--- /dev/null
+++ b/~coadde/cross-binutils/or32-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..8427c5c91
--- /dev/null
+++ b/~coadde/cross-binutils/or32-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..eed9a2c98
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc-unknown-eabi-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..fbd5f0556
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..b7e544e48
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..5667c84e2
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc-unknown-linux-gnueabi-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..0c1b1d7b8
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc64-unknown-eabi-binutils-multilib.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..2e3ca0474
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc64-unknown-eabi-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..4000bde4f
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc64-unknown-elf-binutils-multilib.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..f9d4ff394
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc64-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..15a8c37c5
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc64-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..28e4914c6
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc64-unknown-linux-gnueabi-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..0b6f6c848
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc64le-unknown-eabi-binutils-multilib.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..3798f1bfe
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc64le-unknown-eabi-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..1e30719bf
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc64le-unknown-elf-binutils-multilib.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..891b7f85b
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc64le-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..f8872d8e1
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc64le-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..ae20ca33c
--- /dev/null
+++ b/~coadde/cross-binutils/powerpc64le-unknown-linux-gnueabi-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..850610fc6
--- /dev/null
+++ b/~coadde/cross-binutils/powerpcle-unknown-eabi-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..24e07a7ec
--- /dev/null
+++ b/~coadde/cross-binutils/powerpcle-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..b681acc4b
--- /dev/null
+++ b/~coadde/cross-binutils/powerpcle-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..6559cdd29
--- /dev/null
+++ b/~coadde/cross-binutils/powerpcle-unknown-linux-gnueabi-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..0a583f543
--- /dev/null
+++ b/~coadde/cross-binutils/s390-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..dc576d75e
--- /dev/null
+++ b/~coadde/cross-binutils/s390x-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..20d123559
--- /dev/null
+++ b/~coadde/cross-binutils/sh-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..5843ac274
--- /dev/null
+++ b/~coadde/cross-binutils/sh4-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..f97168df0
--- /dev/null
+++ b/~coadde/cross-binutils/sh4l-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..1f11dabbb
--- /dev/null
+++ b/~coadde/cross-binutils/sh64-unknown-elf-binutils-multilib.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..04ee63c8c
--- /dev/null
+++ b/~coadde/cross-binutils/sh64-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..451eedb44
--- /dev/null
+++ b/~coadde/cross-binutils/sh64-unknown-linux-gnu-binutils-multilib.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..2af6a7268
--- /dev/null
+++ b/~coadde/cross-binutils/sh64-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..6e01ac61e
--- /dev/null
+++ b/~coadde/cross-binutils/sh64l-unknown-elf-binutils-multilib.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..ab95b36ec
--- /dev/null
+++ b/~coadde/cross-binutils/sh64l-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..71c191e1c
--- /dev/null
+++ b/~coadde/cross-binutils/sh64l-unknown-linux-gnu-binutils-multilib.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..cbe5c788a
--- /dev/null
+++ b/~coadde/cross-binutils/sh64l-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..cdb30916b
--- /dev/null
+++ b/~coadde/cross-binutils/shl-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..f3dfca2d3
--- /dev/null
+++ b/~coadde/cross-binutils/sparc-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..d0aff2a85
--- /dev/null
+++ b/~coadde/cross-binutils/sparc64-unknown-linux-gnu-binutils-multilib.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..2d24404e5
--- /dev/null
+++ b/~coadde/cross-binutils/sparc64-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..204d4bfb2
--- /dev/null
+++ b/~coadde/cross-binutils/spu-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..dcf66e30a
--- /dev/null
+++ b/~coadde/cross-binutils/x86_64-unknown-elf-binutils-multilib.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..779e65ab3
--- /dev/null
+++ b/~coadde/cross-binutils/x86_64-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..7c682ba82
--- /dev/null
+++ b/~coadde/cross-binutils/x86_64-unknown-gnu-binutils-multilib.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..102a11fd0
--- /dev/null
+++ b/~coadde/cross-binutils/x86_64-unknown-gnu-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..96140638c
--- /dev/null
+++ b/~coadde/cross-binutils/x86_64-unknown-linux-gnu-binutils-multilib.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..299a9675f
--- /dev/null
+++ b/~coadde/cross-binutils/x86_64-unknown-linux-gnu-binutils.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..643379261
--- /dev/null
+++ b/~coadde/cross-binutils/xtensa-unknown-elf-binutils-ath9k-htc.install
@@ -0,0 +1,16 @@
+_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
new file mode 100644
index 000000000..120b40b1b
--- /dev/null
+++ b/~coadde/cross-binutils/xtensa-unknown-elf-binutils.install
@@ -0,0 +1,16 @@
+_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/libre/mariadb/PKGBUILD b/~coadde/mariadb/PKGBUILD
index a5b733e9f..256b6e9ae 100644
--- a/libre/mariadb/PKGBUILD
+++ b/~coadde/mariadb/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
 falsename=mysql
 _falsename=MySQL
diff --git a/libre/mariadb/mariadb.install b/~coadde/mariadb/mariadb.install
index f56a0dcaa..f56a0dcaa 100644
--- a/libre/mariadb/mariadb.install
+++ b/~coadde/mariadb/mariadb.install
diff --git a/libre/mariadb/mariadbd b/~coadde/mariadb/mariadbd
index 3ae612096..3ae612096 100755
--- a/libre/mariadb/mariadbd
+++ b/~coadde/mariadb/mariadbd
diff --git a/libre/mariadb/my.cnf b/~coadde/mariadb/my.cnf
index 9a41b4fc3..9a41b4fc3 100644
--- a/libre/mariadb/my.cnf
+++ b/~coadde/mariadb/my.cnf
diff --git a/libre/mariadb/mysql.install b/~coadde/mariadb/mysql.install
index 9a4479215..9a4479215 100644
--- a/libre/mariadb/mysql.install
+++ b/~coadde/mariadb/mysql.install
diff --git a/libre/mariadb/mysqld b/~coadde/mariadb/mysqld
index 1ac88a7cc..1ac88a7cc 100644
--- a/libre/mariadb/mysqld
+++ b/~coadde/mariadb/mysqld
diff --git a/~emulatorman/hunspell-gl/PKGBUILD b/~emulatorman/hunspell-gl/PKGBUILD
index 210fda175..8c791a2fe 100644
--- a/~emulatorman/hunspell-gl/PKGBUILD
+++ b/~emulatorman/hunspell-gl/PKGBUILD
@@ -1,5 +1,5 @@
 # Maintainer: Adrián Chaves Fernández (Gallaecio) <adriyetichaves@gmail.com>, 2009-2010.
-# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname=hunspell-gl
 pkgver=2.9b
diff --git a/~emulatorman/raider/PKGBUILD b/~emulatorman/raider/PKGBUILD
index 960164820..c5629e9fc 100644
--- a/~emulatorman/raider/PKGBUILD
+++ b/~emulatorman/raider/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: M.Carreira <arch@carreira.com.pt>
 # Contributor: M.Carreira <arch@carreira.com.pt>
-# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
 pkgname=raider
 pkgver=0.10.0
 pkgrel=1
diff --git a/~emulatorman/xchat-xsys-noaudacious/PKGBUILD b/~emulatorman/xchat-xsys-noaudacious/PKGBUILD
index 977999a38..7ed44c2e3 100644
--- a/~emulatorman/xchat-xsys-noaudacious/PKGBUILD
+++ b/~emulatorman/xchat-xsys-noaudacious/PKGBUILD
@@ -1,5 +1,5 @@
 # Contributor: Gökmen Görgen <gkmngrgn_gmail.com>
-# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
 pkgname=xchat-xsys-noaudacious
 pkgver=2.2.0
 pkgrel=3
diff --git a/~emulatorman/xonotic-data/PKGBUILD b/~emulatorman/xonotic-data/PKGBUILD
index 114954fc3..13f4d5c12 100644
--- a/~emulatorman/xonotic-data/PKGBUILD
+++ b/~emulatorman/xonotic-data/PKGBUILD
@@ -1,7 +1,7 @@
 # $Id: PKGBUILD 35989 2010-12-25 03:22:46Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Alexander Suhoverhov <cy at ngs dot ru>
-# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname=xonotic-data
 pkgver=0.5.0
diff --git a/~emulatorman/xonotic/PKGBUILD b/~emulatorman/xonotic/PKGBUILD
index 236474d3d..a51606cd5 100644
--- a/~emulatorman/xonotic/PKGBUILD
+++ b/~emulatorman/xonotic/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Alexander Suhoverhov <cy at ngs dot ru>
-# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname=xonotic
 pkgver=0.5.0
diff --git a/~fauno/afew/LICENSE b/~fauno/afew/LICENSE
deleted file mode 100644
index aab8c3624..000000000
--- a/~fauno/afew/LICENSE
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# Copyright (c) Justus Winter <4winter@informatik.uni-hamburg.de>
-#
-# 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.
-#
diff --git a/~fauno/afew/PKGBUILD b/~fauno/afew/PKGBUILD
deleted file mode 100644
index 1256ad4d3..000000000
--- a/~fauno/afew/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Maintainer: Kazuo Teramoto <kaz.rag at gmail.com>
-pkgname=afew
-pkgver=2012.07.11
-_gitver=20120711
-pkgrel=1
-pkgdesc="afew is an initial tagging script for notmuch mail"
-arch=(any)
-url="https://github.com/teythoon/afew"
-license=('custom:BSD')
-depends=('python2' 'notmuch' 'dbacl')
-source=("https://repo.parabolagnulinux.org/other/${pkgname}-${_gitver}-${pkgrel}-any.src.tar.gz"
-        'LICENSE')
-
-build() {
-  cd "$srcdir/$pkgname"
-
-  python2 setup.py build
-}
-
-package() {
-  cd "$srcdir/$pkgname"
-  python2 setup.py install --prefix="$pkgdir/usr"
-
-  install -D -m644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:
-md5sums=('99e501fb8f99ec58eccf8c08d572dab2'
-         '295b245540aa61538f9a3556c4be846c')
diff --git a/~fauno/afew/SRCBUILD b/~fauno/afew/SRCBUILD
deleted file mode 100644
index 0ac3b5d75..000000000
--- a/~fauno/afew/SRCBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer: Kazuo Teramoto <kaz.rag at gmail.com>
-pkgname=afew
-pkgver=20120711
-pkgrel=1
-pkgdesc="afew is an initial tagging script for notmuch mail"
-arch=(any)
-url="https://github.com/teythoon/afew"
-license=('custom:BSD')
-makedepends=('git')
-
-_gitroot='https://github.com/teythoon/afew.git'
-_gitname='afew'
-
-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"
-
-}
-
-package() {
-  PKGEXT=${SRCEXT}
-  PKGDEST=${SRCDEST}
-  cp -a ${srcdir}/* ${pkgdir}/
-}
-
-# vim:set ts=2 sw=2 et:
-
diff --git a/~fauno/bibutils-dynamic/PKGBUILD b/~fauno/bibutils-dynamic/PKGBUILD
deleted file mode 100644
index cc8f371a6..000000000
--- a/~fauno/bibutils-dynamic/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Contributor: Ivy Foster <joyfulgirl (at) archlinux (dot) us>
-
-pkgname=bibutils-dynamic
-_basename=bibutils
-pkgver=4.12
-pkgrel=1
-pkgdesc="Bibliography conversion tools, with dynamic libs"
-arch=("i686" "x86_64")
-url="http://www.scripps.edu/~cdputnam/software/bibutils"
-license=('GPL2')
-makedepends=('tcsh')
-provides=('bibutils')
-source=("${url}/${_basename}_${pkgver}_src.tgz")
-md5sums=('395f46393eca8e184652c5e8e1ae83b6')
-
-build() {
-  cd "${srcdir}/${_basename}_$pkgver"
-  ./configure --dynamic \
-              --install-dir ${pkgdir}/usr/bin \
-              --install-lib ${pkgdir}/usr/lib
-  make
-}
-
-package() {
-  install -d ${pkgdir}/usr/{bin,lib}
-  cd "${srcdir}/${_basename}_$pkgver"
-  make install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/~fauno/dbacl/PKGBUILD b/~fauno/dbacl/PKGBUILD
deleted file mode 100644
index a92679444..000000000
--- a/~fauno/dbacl/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer: Kazuo Teramoto <kaz.rag at gmail.com?
-pkgname=dbacl
-pkgver=1.12
-pkgrel=1
-pkgdesc="Digramic Bayesian classifier"
-arch=('i686' 'x86_64')
-url="http://dbacl.sourceforge.net/"
-license=('GPL')
-depends=('gawk' 'perl')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('048d8cf68e277ba2ab5d159dc395a65d')
-sha256sums=('9fcb05a0951527c7b33aeb20735747f84bca88a4e122c93537120d1014f650e9')
-
-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
-  mv "$pkgdir/usr/man" "$pkgdir/usr/share"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/~fauno/distccd-zeroconf/PKGBUILD b/~fauno/distccd-zeroconf/PKGBUILD
deleted file mode 100644
index 2faf6acb3..000000000
--- a/~fauno/distccd-zeroconf/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 59085 2009-11-20 06:29:43Z giovanni $
-# Maintainer: Judd Vinet <jvinet@zeroflux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-
-pkgname=distcc-zeroconf
-_pkgname=distcc
-pkgver=3.1
-pkgrel=1
-pkgdesc="A distributed C, C++, Obj C compiler with zeroconf support"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/distcc/"
-license=('GPL')
-depends=('gcc' 'popt' 'avahi')
-makedepends=('gtk2' 'pkgconfig')
-optdepends=('gtk2: for distccmon-gnome')
-provides=('distcc')
-conflicts=('distcc')
-replaces=('distcc')
-backup=(etc/conf.d/distccd)
-options=(!distcc)
-source=(http://distcc.googlecode.com/files/${_pkgname}-${pkgver}.tar.bz2 
-        distccd 
-        distccd.conf.d)
-md5sums=('a1a9d3853df7133669fffec2a9aab9f3' 
-         '1c918474372c09304772c20c4de484fa'
-         '89aaf6e9072092e283465a14e83f0f94')
-
-build() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-              --with-gtk \
-              --sysconfdir=/etc \
-              --mandir=/usr/share/man \
-              --disable-Werror
-  make
-}
-
-package() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}/" install
-  install -D -m644 ${srcdir}/distccd.conf.d ${pkgdir}/etc/conf.d/distccd
-  install -D -m755 ${srcdir}/distccd ${pkgdir}/etc/rc.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/cpp
-  ln -sf /usr/bin/${_pkgname} ${pkgdir}/usr/lib/${_pkgname}/bin/c++
-}
diff --git a/~fauno/distccd-zeroconf/distccd b/~fauno/distccd-zeroconf/distccd
deleted file mode 100755
index 4702d6820..000000000
--- a/~fauno/distccd-zeroconf/distccd
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-[ -f /etc/conf.d/distccd ] && . /etc/conf.d/distccd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/distccd`
-case "$1" in
-  start)
-    stat_busy "Starting distcc Daemon"
-    [ -z "$PID" ] && /usr/bin/distccd --daemon ${DISTCC_ARGS}
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon distccd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping distcc Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon distccd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/~fauno/distccd-zeroconf/distccd.conf.d b/~fauno/distccd-zeroconf/distccd.conf.d
deleted file mode 100644
index 8f90cb503..000000000
--- a/~fauno/distccd-zeroconf/distccd.conf.d
+++ /dev/null
@@ -1,8 +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="--user nobody --allow 127.0.0.1"
-
diff --git a/~fauno/emerillon/PKGBUILD b/~fauno/emerillon/PKGBUILD
deleted file mode 100644
index 621ed04bb..000000000
--- a/~fauno/emerillon/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Maintainer: Isaac Dupree <id@isaac.cedarswampstudios.org>
-# Contributor: yannsen <ynnsen@gmail.com>
-pkgname=emerillon
-arch=('i686' 'x86_64')
-pkgver=0.1.90
-pkgrel=2
-pkgdesc="OpenStreetMap viewer"
-url="http://projects.gnome.org/emerillon/"
-license=('GPL2')
-depends=('libpeas' 'geoclue' 'libsoup-gnome' 'libchamplain>=0.12.0' 'librest' 'ethos')
-makedepends=('intltool' 'gnome-common' 'vala' 'gtk-doc')
-options=(!libtool)
-install=${pkgname}.install
-source=(http://download.gnome.org/sources/emerillon/0.1/${pkgname}-${pkgver}.tar.xz)
-md5sums=('d740ee4d5fcd7b39fde15e75b4ee7a3a')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  ./configure --prefix=/usr
-  make
-}
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=$pkgdir install
-}
diff --git a/~fauno/emerillon/emerillon.install b/~fauno/emerillon/emerillon.install
deleted file mode 100644
index 77c7018ea..000000000
--- a/~fauno/emerillon/emerillon.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
-}
-
diff --git a/~fauno/ethos/PKGBUILD b/~fauno/ethos/PKGBUILD
deleted file mode 100644
index f05c8fa8b..000000000
--- a/~fauno/ethos/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Contributor: yannsen <ynnsen@gmail.com>
-pkgname=ethos
-pkgver=0.2.2
-pkgrel=6
-arch=('i686' 'x86_64')
-pkgdesc="Plugin framework for GLib"
-url="http://git.dronelabs.com/ethos/about/"
-license="LGPL"
-depends=(python2 gtk2)
-makedepends=(intltool pygtk)
-source=(http://ftp.dronelabs.com/sources/$pkgname/0.2/$pkgname-$pkgver.tar.gz)
-md5sums=('36cf1ef444a224556bba4d441c400300')
-options=(!libtool)
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-}
diff --git a/~fauno/faenza-icon-theme/PKGBUILD b/~fauno/faenza-icon-theme/PKGBUILD
deleted file mode 100644
index 484764c73..000000000
--- a/~fauno/faenza-icon-theme/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Maintainer: Elia Notarangelo <elia.notarangelo AT gmail DOT com>
-# Contributor: Frikilinux <frikilinux at frikilinux.com.ar>
-# Contributor: graysky <graysky AT archlinux DOT us>
-# Contributor: Samsagax <samsagax AT gmail DOT com>
-# Contributor: simongmzlj <simongmzlj AT gmail DOT com>
-
-pkgname=faenza-icon-theme
-pkgver=1.3
-pkgrel=1
-pkgdesc="Icon theme designed for Equinox GTK theme"
-url="http://gnome-look.org/content/show.php/Faenza?content=128143"
-license=('GPL3')
-arch=('any')
-makedepends=()
-options=(!strip)
-source=("http://ppa.launchpad.net/tiheum/equinox/ubuntu/pool/main/f/${pkgname}/${pkgname}_${pkgver}.orig.tar.gz")
-md5sums=('763e0450b0853bd11f04c970ba3fd49f')
-
-package() {
-	cd "${srcdir}"
-	mkdir -p "${pkgdir}"/usr/share/icons
-	cp -rf Faenza{,-Dark,-Darkest,-Darker} "${pkgdir}"/usr/share/icons/
-
-}
-
diff --git a/~fauno/geoclue/PKGBUILD b/~fauno/geoclue/PKGBUILD
deleted file mode 100644
index e370197c7..000000000
--- a/~fauno/geoclue/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# mAINTAIner: Isaac Dupree <id@isaac.cedarswampstudios.org>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor: Kurama <kurama_luka@yahoo.it>
-
-pkgname=geoclue
-pkgver=0.12
-pkgrel=2
-pkgdesc="Modular geoinformation service built on the D-Bus messaging system."
-arch=('i686' 'x86_64')
-url="http://geoclue.freedesktop.org"
-license=('LGPL')
-depends=('gconf')
-makedepends=('gtk-doc' 'libtool')
-source=(http://cgit.freedesktop.org/${pkgname}/snapshot/${pkgname}-${pkgver}.tar.gz)
-
-build() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-#	unset LDFLAGS
-	./autogen.sh --prefix=/usr --libexecdir=/usr/lib
-    find -name 'Makefile' -print0 | xargs -0 sed -i "s/-Werror //" 
-	make
-}
-
-package(){
-	cd ${srcdir}/${pkgname}-${pkgver}
-	make DESTDIR=${pkgdir} install
-}
-md5sums=('684e24d1ff3683953c968fed210b2982')
diff --git a/~fauno/haskell-base64-bytestring/PKGBUILD b/~fauno/haskell-base64-bytestring/PKGBUILD
deleted file mode 100644
index 9943e7e15..000000000
--- a/~fauno/haskell-base64-bytestring/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# custom variables
-_hkgname=base64-bytestring
-_licensefile=LICENSE
-
-# PKGBUILD options/directives
-pkgname=haskell-base64-bytestring
-pkgver=0.1.0.3
-pkgrel=1
-pkgdesc="Fast base64 encoding and deconding for ByteStrings"
-url="https://github.com/bos/base64-bytestring"
-license=("BSD3")
-arch=('i686' 'x86_64')
-makedepends=()
-depends=("ghc=7.0.3-2"
-         "sh"
-         "haskell-bytestring=0.9.1.10")
-options=('strip')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install="${pkgname}.install"
-sha256sums=("a3d76d27f2271c603990d909fed0a4f175628e9c6e19427cc8387dd4c2429234")
-
-# PKGBUILD functions
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-        --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-        --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 ${_licensefile} ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/${_licensefile}
-}
diff --git a/~fauno/haskell-base64-bytestring/haskell-base64-bytestring.install b/~fauno/haskell-base64-bytestring/haskell-base64-bytestring.install
deleted file mode 100644
index 55a35b6d2..000000000
--- a/~fauno/haskell-base64-bytestring/haskell-base64-bytestring.install
+++ /dev/null
@@ -1,26 +0,0 @@
-# custom variables
-pkgname=haskell-base64-bytestring
-HS_DIR=usr/share/haskell/${pkgname}
-
-# functions
-post_install() {
-    ${HS_DIR}/register.sh
-    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_upgrade() {
-    ${HS_DIR}/unregister.sh
-}
-
-post_upgrade() {
-    ${HS_DIR}/register.sh
-    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_remove() {
-    ${HS_DIR}/unregister.sh
-}
-
-post_remove() {
-    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/~fauno/haskell-citeproc-hs/PKGBUILD b/~fauno/haskell-citeproc-hs/PKGBUILD
deleted file mode 100644
index 32f06094b..000000000
--- a/~fauno/haskell-citeproc-hs/PKGBUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-# custom variables
-_hkgname=citeproc-hs
-_licensefile=LICENSE
-
-# PKGBUILD options/directives
-pkgname=haskell-citeproc-hs
-pkgver=0.3.3
-pkgrel=1
-pkgdesc="A Citation Style Language implementation in Haskell"
-url="http://gorgias.mine.nu/repos/citeproc-hs/"
-license=("BSD3")
-arch=('i686' 'x86_64')
-makedepends=()
-depends=("ghc=7.0.3-2"
-         "sh"
-         "haskell-http=4000.1.1"
-         "haskell-bytestring=0.9.1.10"
-         "haskell-containers=0.4.0.0"
-         "haskell-directory=1.1.0.0"
-         "haskell-filepath=1.2.0.0"
-         "haskell-hs-bibutils=4.12"
-         "haskell-json=0.4.4"
-         "haskell-mtl=2.0.1.0"
-         "haskell-network=2.3.0.2"
-         "haskell-old-locale=1.0.0.2"
-         "haskell-pandoc-types=1.8.2"
-         "haskell-parsec=3.1.1"
-         "haskell-syb=0.3"
-         "haskell-time=1.2.0.3"
-         "haskell-utf8-string=0.3.6"
-         "haskell-xml=1.3.9")
-options=('strip')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install="${pkgname}.install"
-sha256sums=("249bc0ec589fc79b098867502732c3c47ce032ad32f82d3280c1ca9373c71f7a")
-
-# PKGBUILD functions
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-        --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-        --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 ${_licensefile} ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/${_licensefile}
-}
diff --git a/~fauno/haskell-citeproc-hs/haskell-citeproc-hs.install b/~fauno/haskell-citeproc-hs/haskell-citeproc-hs.install
deleted file mode 100644
index 6bf4872f1..000000000
--- a/~fauno/haskell-citeproc-hs/haskell-citeproc-hs.install
+++ /dev/null
@@ -1,26 +0,0 @@
-# custom variables
-pkgname=haskell-citeproc-hs
-HS_DIR=usr/share/haskell/${pkgname}
-
-# functions
-post_install() {
-    ${HS_DIR}/register.sh
-    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_upgrade() {
-    ${HS_DIR}/unregister.sh
-}
-
-post_upgrade() {
-    ${HS_DIR}/register.sh
-    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_remove() {
-    ${HS_DIR}/unregister.sh
-}
-
-post_remove() {
-    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/~fauno/haskell-digest/PKGBUILD b/~fauno/haskell-digest/PKGBUILD
deleted file mode 100644
index 724a600af..000000000
--- a/~fauno/haskell-digest/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# custom variables
-_hkgname=digest
-_licensefile=LICENSE
-
-# PKGBUILD options/directives
-pkgname=haskell-digest
-pkgver=0.0.1.0
-pkgrel=1
-pkgdesc="Various cryptographic hashes for bytestrings; CRC32 and Adler32 for now."
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=("BSD3")
-arch=('i686' 'x86_64')
-makedepends=()
-depends=("ghc=7.0.3-2"
-         "sh"
-         "haskell-bytestring=0.9.1.10"
-         "zlib")
-options=('strip')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install="${pkgname}.install"
-sha256sums=("40319762afc05823920126f13cba02b06544ba039e08c3f63db2ed084a9a4edc")
-
-# PKGBUILD functions
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-        --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-        --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 ${_licensefile} ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/${_licensefile}
-}
diff --git a/~fauno/haskell-digest/haskell-digest.install b/~fauno/haskell-digest/haskell-digest.install
deleted file mode 100644
index 7aa8e0003..000000000
--- a/~fauno/haskell-digest/haskell-digest.install
+++ /dev/null
@@ -1,26 +0,0 @@
-# custom variables
-pkgname=haskell-digest
-HS_DIR=usr/share/haskell/${pkgname}
-
-# functions
-post_install() {
-    ${HS_DIR}/register.sh
-    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_upgrade() {
-    ${HS_DIR}/unregister.sh
-}
-
-post_upgrade() {
-    ${HS_DIR}/register.sh
-    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_remove() {
-    ${HS_DIR}/unregister.sh
-}
-
-post_remove() {
-    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/~fauno/haskell-dlist/PKGBUILD b/~fauno/haskell-dlist/PKGBUILD
deleted file mode 100644
index 6b68c97c3..000000000
--- a/~fauno/haskell-dlist/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# custom variables
-_hkgname=dlist
-_licensefile=LICENSE
-
-# PKGBUILD options/directives
-pkgname=haskell-dlist
-pkgver=0.5
-pkgrel=18
-pkgdesc="Differences lists"
-url="http://code.haskell.org/~dons/code/dlist/"
-license=("BSD3")
-arch=('i686' 'x86_64')
-makedepends=()
-depends=("ghc=7.0.3-2" "sh")
-options=('strip')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install="${pkgname}.install"
-sha256sums=("4780e5409eff55bbfdd7470ef802a087a04048c9cd5efe0482c82878292f19ea")
-
-# PKGBUILD functions
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-        --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-        --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 ${_licensefile} ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/${_licensefile}
-}
diff --git a/~fauno/haskell-dlist/haskell-dlist.install b/~fauno/haskell-dlist/haskell-dlist.install
deleted file mode 100644
index f20fb2952..000000000
--- a/~fauno/haskell-dlist/haskell-dlist.install
+++ /dev/null
@@ -1,26 +0,0 @@
-# custom variables
-pkgname=haskell-dlist
-HS_DIR=usr/share/haskell/${pkgname}
-
-# functions
-post_install() {
-    ${HS_DIR}/register.sh
-    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_upgrade() {
-    ${HS_DIR}/unregister.sh
-}
-
-post_upgrade() {
-    ${HS_DIR}/register.sh
-    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_remove() {
-    ${HS_DIR}/unregister.sh
-}
-
-post_remove() {
-    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/~fauno/haskell-hs-bibutils/PKGBUILD b/~fauno/haskell-hs-bibutils/PKGBUILD
deleted file mode 100644
index 46816e9c2..000000000
--- a/~fauno/haskell-hs-bibutils/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# Maintainer: Ivy Foster <joyfulgirl (at) archlinux (dot) # us>
-# Contributor: Alexander Dunlap <alexander.dunlap at gmail # dot com>
-
-_hkgname=hs-bibutils
-pkgname=haskell-hs-bibutils
-pkgver=4.12
-pkgrel=4
-pkgdesc="Haskell bindings to bibutils, the bibliography conversion utilities."
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('GPL')
-arch=('i686' 'x86_64')
-makedepends=()
-depends=('ghc' 'haskell-syb=0.3' 'bibutils-dynamic')
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('4c4647b34246a4d35f1d1cfb10e6720a')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O \
-        --enable-split-objs \
-        --enable-shared \
-        --prefix=/usr \
-        --docdir=/usr/share/doc/${pkgname} \
-        --libsubdir=\$compiler/site-local/\$pkgid \
-        --enable-library-profiling
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r \
-        -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" \
-        unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh \
-        ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install -m744 unregister.sh \
-        ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 \
-        ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html \
-        ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-}
diff --git a/~fauno/haskell-hs-bibutils/haskell-hs-bibutils.install b/~fauno/haskell-hs-bibutils/haskell-hs-bibutils.install
deleted file mode 100644
index 454c6ff37..000000000
--- a/~fauno/haskell-hs-bibutils/haskell-hs-bibutils.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-hs-bibutils
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/~fauno/haskell-json/PKGBUILD b/~fauno/haskell-json/PKGBUILD
deleted file mode 100644
index 2a1da8a47..000000000
--- a/~fauno/haskell-json/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# custom variables
-_hkgname=json
-_licensefile=LICENSE
-
-# PKGBUILD options/directives
-pkgname=haskell-json
-pkgver=0.4.4
-pkgrel=18
-pkgdesc="Support for serialising Haskell to and from JSON"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=("BSD3")
-arch=('i686' 'x86_64')
-makedepends=()
-depends=("ghc=7.0.3-2"
-         "sh"
-         "haskell-array=0.3.0.2"
-         "haskell-bytestring=0.9.1.10"
-         "haskell-containers=0.4.0.0"
-         "haskell-mtl=2.0.1.0"
-         "haskell-parsec=3.1.1"
-         "haskell-pretty=1.0.1.2"
-         "haskell-syb=0.3")
-options=('strip')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install="${pkgname}.install"
-sha256sums=("010157c267e156489771a3a9466f9de74393d9bc82053c1463af8a55caaf5880")
-
-# PKGBUILD functions
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-        --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-        --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 ${_licensefile} ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/${_licensefile}
-}
diff --git a/~fauno/haskell-json/haskell-json.install b/~fauno/haskell-json/haskell-json.install
deleted file mode 100644
index 10d6b7279..000000000
--- a/~fauno/haskell-json/haskell-json.install
+++ /dev/null
@@ -1,26 +0,0 @@
-# custom variables
-pkgname=haskell-json
-HS_DIR=usr/share/haskell/${pkgname}
-
-# functions
-post_install() {
-    ${HS_DIR}/register.sh
-    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_upgrade() {
-    ${HS_DIR}/unregister.sh
-}
-
-post_upgrade() {
-    ${HS_DIR}/register.sh
-    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_remove() {
-    ${HS_DIR}/unregister.sh
-}
-
-post_remove() {
-    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/~fauno/haskell-pandoc-types/PKGBUILD b/~fauno/haskell-pandoc-types/PKGBUILD
deleted file mode 100644
index 954514ebe..000000000
--- a/~fauno/haskell-pandoc-types/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# custom variables
-_hkgname=pandoc-types
-_licensefile=COPYING
-
-# PKGBUILD options/directives
-pkgname=haskell-pandoc-types
-pkgver=1.8.2
-pkgrel=1
-pkgdesc="Types for representing a structured document"
-url="http://johnmacfarlane.net/pandoc"
-license=("GPL")
-arch=('i686' 'x86_64')
-makedepends=()
-depends=("ghc=7.0.3-2"
-         "sh"
-         "haskell-containers=0.4.0.0"
-         "haskell-syb=0.3")
-options=('strip')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install="${pkgname}.install"
-sha256sums=("6a580be1ec25a747db2ee9df1c98b1f3a778493b98e5148bf8ce5ed1289e9013")
-
-# PKGBUILD functions
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-        --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-        --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 ${_licensefile} ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/${_licensefile}
-}
diff --git a/~fauno/haskell-pandoc-types/haskell-pandoc-types.install b/~fauno/haskell-pandoc-types/haskell-pandoc-types.install
deleted file mode 100644
index 34622807c..000000000
--- a/~fauno/haskell-pandoc-types/haskell-pandoc-types.install
+++ /dev/null
@@ -1,26 +0,0 @@
-# custom variables
-pkgname=haskell-pandoc-types
-HS_DIR=usr/share/haskell/${pkgname}
-
-# functions
-post_install() {
-    ${HS_DIR}/register.sh
-    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_upgrade() {
-    ${HS_DIR}/unregister.sh
-}
-
-post_upgrade() {
-    ${HS_DIR}/register.sh
-    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_remove() {
-    ${HS_DIR}/unregister.sh
-}
-
-post_remove() {
-    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/~fauno/haskell-tagsoup/PKGBUILD b/~fauno/haskell-tagsoup/PKGBUILD
deleted file mode 100644
index 0de1f165b..000000000
--- a/~fauno/haskell-tagsoup/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# custom variables
-_hkgname=tagsoup
-_licensefile=LICENSE
-
-# PKGBUILD options/directives
-pkgname=haskell-tagsoup
-pkgver=0.12.3
-pkgrel=1
-pkgdesc="Parsing and extracting information from (possibly malformed) HTML/XML documents"
-url="http://community.haskell.org/~ndm/tagsoup/"
-license=("BSD3")
-arch=('i686' 'x86_64')
-makedepends=()
-depends=("ghc=7.0.3-2"
-         "sh"
-         "haskell-bytestring=0.9.1.10"
-         "haskell-containers=0.4.0.0"
-         "haskell-text=0.11.0.5")
-options=('strip')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install="${pkgname}.install"
-sha256sums=("8bed50b3958a794422563ad93d82fb6d4e806d1884623f35f454ff360d9b8138")
-
-# PKGBUILD functions
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-        --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-        --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 ${_licensefile} ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/${_licensefile}
-}
diff --git a/~fauno/haskell-tagsoup/haskell-tagsoup.install b/~fauno/haskell-tagsoup/haskell-tagsoup.install
deleted file mode 100644
index dc61b4049..000000000
--- a/~fauno/haskell-tagsoup/haskell-tagsoup.install
+++ /dev/null
@@ -1,26 +0,0 @@
-# custom variables
-pkgname=haskell-tagsoup
-HS_DIR=usr/share/haskell/${pkgname}
-
-# functions
-post_install() {
-    ${HS_DIR}/register.sh
-    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_upgrade() {
-    ${HS_DIR}/unregister.sh
-}
-
-post_upgrade() {
-    ${HS_DIR}/register.sh
-    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_remove() {
-    ${HS_DIR}/unregister.sh
-}
-
-post_remove() {
-    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/~fauno/haskell-texmath/PKGBUILD b/~fauno/haskell-texmath/PKGBUILD
deleted file mode 100644
index 95e88912a..000000000
--- a/~fauno/haskell-texmath/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# custom variables
-_hkgname=texmath
-_licensefile=LICENSE
-
-# PKGBUILD options/directives
-pkgname=haskell-texmath
-pkgver=0.5.0.1
-pkgrel=19
-pkgdesc="Conversion of LaTeX math formulas to MathML."
-url="http://github.com/jgm/texmath"
-license=("GPL")
-arch=('i686' 'x86_64')
-makedepends=()
-depends=("ghc=7.0.3-2"
-         "sh"
-         "haskell-containers=0.4.0.0"
-         "haskell-parsec=3.1.1"
-         "haskell-syb=0.3"
-         "haskell-xml=1.3.9")
-options=('strip')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install="${pkgname}.install"
-sha256sums=("bedd883728fbd84bf07c1d1c851440db6d8be6b9e221024533851cd7c21a824f")
-
-# PKGBUILD functions
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-        --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-        --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 ${_licensefile} ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/${_licensefile}
-}
diff --git a/~fauno/haskell-texmath/haskell-texmath.install b/~fauno/haskell-texmath/haskell-texmath.install
deleted file mode 100644
index b95fd0d9f..000000000
--- a/~fauno/haskell-texmath/haskell-texmath.install
+++ /dev/null
@@ -1,26 +0,0 @@
-# custom variables
-pkgname=haskell-texmath
-HS_DIR=usr/share/haskell/${pkgname}
-
-# functions
-post_install() {
-    ${HS_DIR}/register.sh
-    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_upgrade() {
-    ${HS_DIR}/unregister.sh
-}
-
-post_upgrade() {
-    ${HS_DIR}/register.sh
-    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_remove() {
-    ${HS_DIR}/unregister.sh
-}
-
-post_remove() {
-    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/~fauno/haskell-xml/PKGBUILD b/~fauno/haskell-xml/PKGBUILD
deleted file mode 100644
index fc42941b3..000000000
--- a/~fauno/haskell-xml/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# custom variables
-_hkgname=xml
-_licensefile=LICENSE
-
-# PKGBUILD options/directives
-pkgname=haskell-xml
-pkgver=1.3.9
-pkgrel=1
-pkgdesc="A simple XML library."
-url="http://code.galois.com"
-license=("BSD3")
-arch=('i686' 'x86_64')
-makedepends=()
-depends=("ghc=7.0.3-2"
-         "sh"
-         "haskell-bytestring=0.9.1.10")
-options=('strip')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install="${pkgname}.install"
-sha256sums=("821b368d5b06e695f9a3d35e92b3159c500dbe03f0bc04b0229e5da65b99a6eb")
-
-# PKGBUILD functions
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-        --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-        --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 ${_licensefile} ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/${_licensefile}
-}
diff --git a/~fauno/haskell-xml/haskell-xml.install b/~fauno/haskell-xml/haskell-xml.install
deleted file mode 100644
index 741ef9ee0..000000000
--- a/~fauno/haskell-xml/haskell-xml.install
+++ /dev/null
@@ -1,26 +0,0 @@
-# custom variables
-pkgname=haskell-xml
-HS_DIR=usr/share/haskell/${pkgname}
-
-# functions
-post_install() {
-    ${HS_DIR}/register.sh
-    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_upgrade() {
-    ${HS_DIR}/unregister.sh
-}
-
-post_upgrade() {
-    ${HS_DIR}/register.sh
-    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_remove() {
-    ${HS_DIR}/unregister.sh
-}
-
-post_remove() {
-    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/~fauno/haskell-zip-archive/PKGBUILD b/~fauno/haskell-zip-archive/PKGBUILD
deleted file mode 100644
index 0d0d91a11..000000000
--- a/~fauno/haskell-zip-archive/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# custom variables
-_hkgname=zip-archive
-_licensefile=LICENSE
-
-# PKGBUILD options/directives
-pkgname=haskell-zip-archive
-pkgver=0.1.1.7
-pkgrel=20
-pkgdesc="Library for creating and modifying zip archives."
-url="http://github.com/jgm/zip-archive"
-license=("GPL")
-arch=('i686' 'x86_64')
-makedepends=()
-depends=("ghc=7.0.3-2"
-         "haskell-binary=0.5.0.2-8"
-         "haskell-digest=0.0.1.0-1"
-         "haskell-mtl=2.0.1.0-3.1"
-         "haskell-unix=2.4.2.0-2"
-         "haskell-utf8-string=0.3.6-7.2"
-         "haskell-zlib=0.5.3.1-2.1")
-options=('strip')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install="${pkgname}.install"
-sha256sums=("88c096d469d8b4d816dbe15571f2c1e61e31c1cd67f931672240063a51d8a2e0")
-
-# PKGBUILD functions
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-        --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-        --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 ${_licensefile} ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/${_licensefile}
-}
diff --git a/~fauno/haskell-zip-archive/haskell-zip-archive.install b/~fauno/haskell-zip-archive/haskell-zip-archive.install
deleted file mode 100644
index c19836db7..000000000
--- a/~fauno/haskell-zip-archive/haskell-zip-archive.install
+++ /dev/null
@@ -1,26 +0,0 @@
-# custom variables
-pkgname=haskell-zip-archive
-HS_DIR=usr/share/haskell/${pkgname}
-
-# functions
-post_install() {
-    ${HS_DIR}/register.sh
-    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_upgrade() {
-    ${HS_DIR}/unregister.sh
-}
-
-post_upgrade() {
-    ${HS_DIR}/register.sh
-    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_remove() {
-    ${HS_DIR}/unregister.sh
-}
-
-post_remove() {
-    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/~fauno/kyotocabinet/PKGBUILD b/~fauno/kyotocabinet/PKGBUILD
deleted file mode 100644
index 1636bfda0..000000000
--- a/~fauno/kyotocabinet/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Maintainer: Alexander Duscheleit <jinks@archlinux.us>
-# Contributor: Joaquim Pedro (osmano807) <osmano807@gmail.com>
-pkgname=kyotocabinet
-pkgver=1.2.76
-pkgrel=1
-pkgdesc="a modern implementation of DBM in C++"
-arch=('i686' 'x86_64')
-url="http://fallabs.com/kyotocabinet"
-license=('LGPL3')
-makedepends=('gcc>=3.1' 'make' 'pkgconfig' 'zlib')
-depends=('zlib' 'gcc-libs')
-source=("http://fallabs.com/${pkgname}/pkg/${pkgname}-${pkgver}.tar.gz")
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make install DESTDIR="$pkgdir/"
-}
-sha512sums=('278db7b327eb4c21bf0137d9aa14fb67d74d5ce7ed1cb29fc9120d157a60de165ec0cf842903eb7952e8f998045ae585b958977fa973ba0e0773381de71d9f6a')
diff --git a/~fauno/kyototycoon/PKGBUILD b/~fauno/kyototycoon/PKGBUILD
deleted file mode 100644
index af88f6020..000000000
--- a/~fauno/kyototycoon/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Maintainer: Alexander Duscheleit <jinks@archlinux.us>
-pkgname=kyototycoon
-pkgver=0.9.56
-pkgrel=1
-pkgdesc="A lightweight conncurent remote frontend for Kyoto Cabinet."
-arch=('i686' 'x86_64')
-url="http://fallabs.com/kyototycoon"
-license=('GPL3')
-depends=('zlib' 'kyotocabinet')
-source=("http://fallabs.com/${pkgname}/pkg/${pkgname}-${pkgver}.tar.gz")
-sha256sums=('553e4ea83237d9153cc5e17881092cefe0b224687f7ebcc406b061b2f31c75c6')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make install DESTDIR="$pkgdir/"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/~fauno/ldapscripts/PKGBUILD b/~fauno/ldapscripts/PKGBUILD
deleted file mode 100644
index 59080b1cf..000000000
--- a/~fauno/ldapscripts/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-pkgname=ldapscripts
-pkgver=2.0.1
-pkgrel=1
-pkgdesc="Shell scripts that allow to manage POSIX accounts (users, groups, machines) in an LDAP directory"
-arch=('any')
-url="http://contribs.martymac.org/"
-license=('GPL')
-depends=('sharutils')
-source=(http://contribs.martymac.org/ldapscripts/${pkgname}-${pkgver}.tgz)
-md5sums=('212a62b3e808faf8d347429ccd2cef09')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" \
-       ETCDIR=/etc/ldapscripts \
-       MANDIR=/usr/share/man \
-       LIBDIR=/usr/share/ldapscripts \
-       PREFIX=/usr install
-}
diff --git a/~fauno/librest/PKGBUILD b/~fauno/librest/PKGBUILD
deleted file mode 100644
index a66c4559e..000000000
--- a/~fauno/librest/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Contributor: Berseker <berseker86 at gmail dot com>
-
-pkgname=librest
-_realname=rest
-
-pkgver=0.7.10
-pkgrel=1
-pkgdesc="a library to access 'RESTful' web services"
-arch=('i686' 'x86_64')
-url="http://moblin.org/projects/librest/"
-license=('GPL')
-source=(http://ftp.gnome.org/pub/GNOME/sources/rest/0.7/${_realname}-${pkgver}.tar.bz2)
-options=('!libtool')
-depends=('libsoup-gnome' 'libxml2')
-makedepends=('gtk-doc')
-
-build() {
-  cd "$srcdir/${_realname}-${pkgver}"
-
-  ./configure  --prefix=/usr #--without-gnome
-  make
-}
-
-package() {
-  cd "$srcdir/${_realname}-${pkgver}"
-  make DESTDIR="$pkgdir/" install
-}
-md5sums=('f47850d26bfb6148d1a3db9e74426e20')
diff --git a/~fauno/localepurge/PKGBUILD b/~fauno/localepurge/PKGBUILD
deleted file mode 100644
index 263776a01..000000000
--- a/~fauno/localepurge/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Francesco Groccia <frgroccia gmail.com>
-# Contributor: Dincer Celik <dincer@bornovali.com>
-
-pkgname=localepurge
-pkgver=0.6.3
-pkgrel=2
-pkgdesc="Script to remove disk space wasted for unneeded localizations."
-arch=('any')
-url="http://packages.debian.org/source/sid/localepurge"
-license=('GPL')
-backup=('etc/locale.nopurge')
-source=("http://ftp.de.debian.org/debian/pool/main/l/localepurge/${pkgname}_${pkgver}.tar.gz"
-        "http://fgr.bitbucket.org/im/localepurge-arch/${pkgname}.patch"
-        "http://fgr.bitbucket.org/im/localepurge-arch/${pkgname}.8.patch"
-        "http://fgr.bitbucket.org/im/localepurge-arch/${pkgname}.config.patch"
-        "http://fgr.bitbucket.org/im/localepurge-arch/locale.nopurge")
-sha256sums=('02f7e4a8b5919221a736abb3a937dffc48ffd275f0968e56612d518e1e69c30b'
-            '3958818b2d54c9ca32a1974d757c3303b6e8e1b81d4302dfaec8b8a7af54d17d'
-            '3d45b1da93a0fc30dd3ae28d4ef7b319340c5ebaa302f4e375793934262e61fc'
-            '1cf4c0e9651589502f953ae25654e5b5347de18995055adfb7a6d183a1c4c912'
-            'b9c28be93fa47d4f0315972159e501d9eef28bbab7ffe6e8e7c4a13c359f35e8')
-
-build()
-{
-  patch -uN ${srcdir}/${pkgname}/usr/sbin/localepurge < ${srcdir}/localepurge.patch
-  patch -uN ${srcdir}/${pkgname}/debian/localepurge.8 < ${srcdir}/localepurge.8.patch
-  patch -uN ${srcdir}/${pkgname}/debian/localepurge.config < ${srcdir}/localepurge.config.patch
-  install -D -m755 ${srcdir}/${pkgname}/usr/sbin/localepurge ${pkgdir}/usr/sbin/localepurge
-  install -D -m644 ${srcdir}/${pkgname}/debian/localepurge.8 ${pkgdir}/usr/share/man/man8/localepurge.8
-  install -D -m755 ${srcdir}/${pkgname}/debian/localepurge.config ${pkgdir}/usr/sbin/localepurge.config
-  install -D -m644 locale.nopurge ${pkgdir}/etc/locale.nopurge
-  if [ ! -e /var/cache/localepurge/localelist ]; then
-    find /usr/share/locale -maxdepth 1 -type d -name "*" -printf "%f\n" | grep "^[a-z]" | cut -d" " -f1 | sort -u > ${srcdir}/localelist
-  else
-    cp /var/cache/localepurge/localelist ${srcdir}/localelist
-  fi
-  install -D -m644 ${srcdir}/localelist ${pkgdir}/var/cache/localepurge/localelist
-}
diff --git a/~fauno/mips64el-unknown-linux-gnu-binutils/PKGBUILD b/~fauno/mips64el-unknown-linux-gnu-binutils/PKGBUILD
deleted file mode 100644
index 6fc5b1f16..000000000
--- a/~fauno/mips64el-unknown-linux-gnu-binutils/PKGBUILD
+++ /dev/null
@@ -1,62 +0,0 @@
-# $Id: PKGBUILD 60835 2011-12-18 22:14:40Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-_cross=mips64el-unknown-linux-gnu
-pkgname=${_cross}-binutils
-pkgver=2.22
-pkgrel=1
-_date=20111227
-_xprefix=/usr
-pkgdesc="A set of programs to assemble and manipulate binary and object files"
-arch=(i686 x86_64)
-group=('mips64el-devel')
-license=(GPL)
-options=(!libtool)
-url="http://www.gnu.org/software/binutils/"
-depends=('glibc' 'zlib')
-#makedepends=("${_cross}-libtool")
-source=(http://mirrors.kernel.org/archlinux/other/binutils/binutils-${pkgver}_${_date}.tar.bz2)
-md5sums=('c2377089c15bb1a1bfaeca8d0e59dd4d')
-
-build() {
-  cd $srcdir/binutils
-
-  #export PATH=/usr/${_cross}/bin/:$PATH
-
-  [ $NOEXTRACT -eq 1 ] || ./configure --prefix=${_xprefix} \
-	--program-prefix=${_cross}- \
-	--enable-shared \
-	--disable-multilib \
-	--with-lib-path=${_xprefix}/lib/binutils/${_cross} \
-	--disable-nls \
-	--target=${_cross} \
-	--host=${CHOST} \
-	--build=${CHOST} \
-	--with-sysroot=/usr/${CHOST}/${_cross} \
-
-  make configure-host
-  make tooldir=$pkgdir/${_xprefix}
-
-}
-
-package() {
-  cd $srcdir/binutils
-
-  make prefix=$pkgdir/${_xprefix} tooldir=$pkgdir/${_xprefix} install
-
-  mkdir -p $pkgdir/${_xprefix}/lib/binutils/${_cross}
-  cp -v include/libiberty.h $pkgdir/${_xprefix}/lib/binutils/${_cross}
-
-  rm -f $pkgdir/${_xprefix}/man/man1/{dlltool,nlmconv,windres}*
-
-  rm -f $pkgdir/usr/bin/ar
-  rm -f $pkgdir/usr/bin/as
-  rm -f $pkgdir/usr/bin/ld
-  rm -f $pkgdir/usr/bin/nm
-  rm -f $pkgdir/usr/bin/objdump
-  rm -f $pkgdir/usr/bin/ranlib
-  rm -f $pkgdir/usr/bin/strip
-  rm -f $pkgdir/usr/bin/objcopy
-  rm -f $pkgdir/usr/lib/libiberty.a
-  rm -rf $pkgdir/usr/share
-}
diff --git a/~fauno/mips64el-unknown-linux-gnu-gcc-base/PKGBUILD b/~fauno/mips64el-unknown-linux-gnu-gcc-base/PKGBUILD
deleted file mode 100644
index becc02cfe..000000000
--- a/~fauno/mips64el-unknown-linux-gnu-gcc-base/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# $Id: PKGBUILD 60837 2011-12-18 22:34:22Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-_cross=mips64el-unknown-linux-gnu
-pkgname=${_cross}-gcc-base
-pkgver=4.6.2
-pkgrel=1
-pkgdesc="The GNU Compiler Collection"
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-url="http://gcc.gnu.org"
-depends=("${_cross}-binutils" 'libmpc' 'libelf')
-options=(!libtool !emptydirs zipman docs !strip)
-source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-core-${pkgver}.tar.bz2)
-md5sums=('780f614ab18c7a9066dec6387d7490b2')
-
-build() {
-  cd $srcdir/gcc-$pkgver
-
-  export CFLAGS="-O2 -pipe"
-  export CXXFLAGS="-O2 -pipe"
-
-  [ $NOEXTRACT -eq 1 ] || rm -rf build
-  mkdir build
-  cd build
-
-  [ $NOEXTRACT -eq 1 ] || ../configure --prefix=/usr \
-	--target=${_cross} \
-	--host=${CHOST} \
-	--build=${CHOST} \
-	--enable-shared --disable-nls --enable-languages=c --enable-multilib \
-	--with-local-prefix=/usr/lib/${_cross} \
-	--with-as=/usr/bin/${_cross}-as --with-ld=/usr/bin/${_cross}-ld \
-	--with-sysroot=/usr/$CHOST/${_cross}
-
-  make all-gcc all-target-libgcc
-}
-
-package() {
-  cd $srcdir/gcc-$pkgver/build
-
-  export CFLAGS="-O2 -pipe"
-  export CXXFLAGS="-O2 -pipe"
-
-  make DESTDIR=$pkgdir install-gcc install-target-libgcc
-
-  rm -f $pkgdir/usr/share/man/man7/fsf-funding.7*
-  rm -f $pkgdir/usr/share/man/man7/gfdl.7*
-  rm -f $pkgdir/usr/share/man/man7/gpl.7*
-  rm -rf $pkgdir/usr/share/info
-
-  cp -r $pkgdir/usr/libexec/* $pkgdir/usr/lib/
-  rm -rf $pkgdir/usr/libexec
-
-  # strip it manually
-  strip $pkgdir/usr/bin/* 2>/dev/null || true
-  find $pkgdir/usr/lib -type f -exec ${_cross}-strip {} \; 2>/dev/null || true
-}
diff --git a/~fauno/spawn-fcgi-php/PKGBUILD b/~fauno/spawn-fcgi-php/PKGBUILD
deleted file mode 100644
index a49858417..000000000
--- a/~fauno/spawn-fcgi-php/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Contributor: Piotr Rogoża <rogoza dot piotr at gmail dot com>
-pkgname=spawn-fcgi-php
-pkgver=1.1.1
-pkgrel=1
-pkgdesc="script to provide simple cgi-php support for nginx http daemon"
-arch=('any')
-url="http://aur.archlinux.org/packages.php?ID=37439"
-license=('GPL')
-depends=('php-cgi' 'spawn-fcgi')
-backup=('etc/conf.d/spawn-fcgi-php.conf')
-source=(
-  'spawn-fcgi-php'
-  'spawn-fcgi-php.conf'
-  'server.conf.example'
-  'nginx.conf.example'
-  'public_html.conf.example'
-)
-
-build() {
-	# Install script and configuration file
-	install -Dm775 spawn-fcgi-php \
-		${pkgdir}/etc/rc.d/spawn-fcgi-php || return 1 
-	install -Dm664 spawn-fcgi-php.conf \
-		${pkgdir}/etc/conf.d/spawn-fcgi-php.conf || return 1
-
-	# Install examples of configuration
-	install -Dm664 public_html.conf.example \
-		${pkgdir}/etc/nginx/conf/public_html.conf.example || return 1
-	install -Dm644 server.conf.example \
-		${pkgdir}/etc/nginx/conf/server.conf.example || return 1
-  	install -Dm664 nginx.conf.example \
-		${pkgdir}/etc/nginx/conf/nginx.conf.example || return 1
-}
-
-# vim:set ts=2 sw=2 et ft=sh:
-md5sums=('9088c130caebf43902f958c985200811'
-         'a8bfb0b50120c91449c8a08144706c9b'
-         'c02189e88531386cd67d3401924c18ae'
-         '00bf49fc8a0d8c9f6c96305fae8471d4'
-         '9202545dc3701d5933804890312667e6')
diff --git a/~fauno/spawn-fcgi-php/nginx.conf.example b/~fauno/spawn-fcgi-php/nginx.conf.example
deleted file mode 100644
index 35d0868f3..000000000
--- a/~fauno/spawn-fcgi-php/nginx.conf.example
+++ /dev/null
@@ -1,34 +0,0 @@
-user http;
-worker_processes  1;
-
-error_log  logs/error.log;
-
-#pid        logs/nginx.pid;
-
-events {
-    worker_connections  1024;
-}
-
-
-http {
-    include       mime.types;
-    default_type  application/octet-stream;
-
-    sendfile        on;
-    #tcp_nopush     on;
-
-    #keepalive_timeout  0;
-    keepalive_timeout  65;
-
-    #gzip  on;
-
-	# the file with mapping username per port
-	include /etc/nginx/conf/map_user2port.conf;
-	#or only 
-	#include map_user2port.conf
-
-	# Servers configurations ...
-	include server.conf.example;
-		
-    }
-}
diff --git a/~fauno/spawn-fcgi-php/public_html.conf.example b/~fauno/spawn-fcgi-php/public_html.conf.example
deleted file mode 100644
index 74f6c2b4b..000000000
--- a/~fauno/spawn-fcgi-php/public_html.conf.example
+++ /dev/null
@@ -1,16 +0,0 @@
-location ~ ^/~([^/]+)(/?.*)$ {
-	set $username $1;
-    alias /home/$1/public_html/$2;
-    autoindex on; 
-	location ~ \.php {
-		#fastcgi_pass  127.0.0.1:9000;
-		# or for multiusers, one port per user
-		fastcgi_pass  127.0.0.1:$port;
-		# or for unix domain sockets
-		#fastcgi_pass unix:/var/run/spawn-fcgi/spawn-fcgi.$username.sock;
-		fastcgi_index  index.php;
-		fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
-		include /etc/nginx/conf/fastcgi_params;
-	}
-}
-# vi: ft=nginx
diff --git a/~fauno/spawn-fcgi-php/server.conf.example b/~fauno/spawn-fcgi-php/server.conf.example
deleted file mode 100644
index 06160cfb2..000000000
--- a/~fauno/spawn-fcgi-php/server.conf.example
+++ /dev/null
@@ -1,22 +0,0 @@
-server {
-	listen 80;
-	server_name domain.tld;
-	root /srv/http/domain.tld;
-
-	index index.php index.html;
-	
-	access_log logs/access.log;
-	error_log logs/error.log;
-
-	location ~ \.php {
-		# TCP
-		fastcgi_pass  127.0.0.1:9000;
-		# or SOCKET
-		#fastcgi_pass unix:/var/run/spawn-fcgi/spawn-fcgi.sock;
-		fastcgi_index  index.php;
-		fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
-		include /etc/nginx/conf/fastcgi_params;
-	}
-	include public_html.conf.example;
-}
-# vi: ft=nginx
diff --git a/~fauno/spawn-fcgi-php/spawn-fcgi-php b/~fauno/spawn-fcgi-php/spawn-fcgi-php
deleted file mode 100755
index 607ebab8c..000000000
--- a/~fauno/spawn-fcgi-php/spawn-fcgi-php
+++ /dev/null
@@ -1,460 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-NAME=spawn-fcgi-php
-CONF="/etc/conf.d/spawn-fcgi-php.conf"
-#-------------------------------------------------------------------------------
-# Return value for:
-# for check_process
-PROCNOPIDEXIST=-1                               # none process is running and pidfile exist
-PROCNOPIDNO=0                                   # none process is running
-PROCRUNPIDEXIST=1                               # process is running, pidfile exist and has size >0b
-PROCRUNPID0=2                                   # process is running, pidfile has size 0b
-PROCRUNPIDNO=3                                  # process is running, pidfile doesn't exist
-OTHERERROR=255
-# check_daemon
-DAEMONEXIST=0
-DAEMONNOEXIST=1
-#-------------------------------------------------------------------------------
-
-# Reading configuration
-if [ -r "$CONF" ]; then
-	. $CONF
-else
-	stat_fail
-	stat_busy "File $CONF not found"
-	stat_die
-fi
-check_config(){ #{{{
-#===  FUNCTION  ================================================================
-#          NAME:  check_config
-#   DESCRIPTION:  Check configuration file
-#    PARAMETERS:  
-#       RETURNS:  0 if all right
-#===============================================================================
-	# testing DAEMON 
-	if [ ! -x "$DAEMON" ]; then
-		stat_fail
-		stat_busy "File $DAEMON isn't executable"
-		stat_die
-	fi
-	# testing USER and GROUP
-	if [ -z "$USER" -o -z "$GROUP" ]; then
-		stat_fail
-		stat_busy "The variable USER/GROUP isn't defined. I cann't run process $PHPCGI as root."
-		stat_die
-	fi
-	# testing directory of socket
-	if [ -n "$SOCKET" ]; then
-		local sockdir=$(dirname "$SOCKET")
-		if [ ! -d "$sockdir" ]; then
-			mkdir -p "$sockdir"
-		fi
-	fi
-	# testing directory for user's socket
-	if [ -n "$USERSOCKET" ]; then
-		local socksdir=$(dirname "$USERSOCKET")
-		if [ ! -d "$socksdir" ]; then
-			mkdir -p "$socksdir"
-		fi
-	fi
-	# testing directory of pidfile
-	if [ -n "$PIDFILE" ]; then
-		if [ ! -d $(dirname $PIDFILE) ]; then
-			mkdir -p $(dirname $PIDFILE)
-		fi
-	fi
-	# testing the program php-cgi
-	if [ -z "$PHPCGI" ]; then
-		stat_fail
-		stat_busy "The variable PHPCGI isn't defined"
-		stat_die
-	else
-		if [ ! -x "$PHPCGI" ]; then
-			stat_fail
-			stat_busy "The program $PHPCGI isn't executable"
-			stat_die
-		fi
-	fi
-	return 0
-} #}}}
-check_process(){ #{{{
-#===  FUNCTION  ================================================================
-#          NAME:  check_process
-#   DESCRIPTION:  Check that process is alive
-#    PARAMETERS:  name of process and/or pidfile
-#       RETURNS:  look at the beginning of the script
-#===============================================================================
-	local process
-	local pidfile
-	if [ $# -eq 2 ]; then
-		process=$1
-		pidfile=$2
-	elif [ $# -eq 1 ]; then
-		process=$1
-	else
-		return $OTHERERROR
-	fi
-
-	if get_pid $process >/dev/null; then
-		# process is running
-		if [ -s "$pidfile" ]; then
-			return $PROCRUNPIDEXIST
-		elif [ -r "$pidfile" ]; then
-			return $PROCRUNPID0
-		else
-			return $PROCRUNPIDNO
-		fi
-	else
-		# process doesn't runnig
-		if [ -r "$pidfile" ]; then
-			return $PROCNOPIDEXIST
-		else
-			return $PROCNOPIDNO
-		fi
-	fi
-} #}}}
-get_userpid(){ #{{{
-#===  FUNCTION  ================================================================
-#          NAME:  get_userpid
-#   DESCRIPTION:  looking for pid of process belong to user
-#    PARAMETERS:  name of user, name of process
-#       RETURNS:  pid of process or 1 if error
-#===============================================================================
-	local user=$1
-	local process=$2
-	if [ -n "$user" -a -n "$process" ]; then
-		local pid=$(ps aux | \
-			awk -vuser=$user -vprocess=$process \
-			'$1 == user && $8 ~ "s" && $11 == process {print $2}')
-		if [[ "$pid" =~ ^[0-9]+$ ]]; then
-			echo $pid
-		else
-			return 1
-		fi
-	else
-		return 1
-	fi
-} #}}}
-check_daemon(){ #{{{
-#===  FUNCTION  ================================================================
-#          NAME:  check_daemon
-#   DESCRIPTION:  check that daemon exist in directory
-#    PARAMETERS:  name of daemon
-#       RETURNS:  look at the beginning of the script
-#===============================================================================
-	if ck_daemon $NAME; then
-		return $DAEMONEXIST
-	else
-		return $DAEMONEXIST
-	fi
-} #}}}
-start(){ #{{{
-#===  FUNCTION  ================================================================
-#          NAME:  start
-#   DESCRIPTION:  check configuration, if a process is already running and running php-cgi daemon
-#    PARAMETERS:  -
-#       RETURNS:  -
-#===============================================================================
-	stat_busy "Checking configuration"
-	check_config &&
-		stat_done || \
-		stat_die
-
-	stat_busy "Starting server $NAME" #{{{
-	check_process $PHPCGI $PIDFILE
-	local error=$?
-	if [ $error -ge $PROCRUNPIDEXIST -a $error -le $PROCRUNPIDNO ]; then
-		stat_fail
-		case $error in
-			$PROCRUNPIDEXIST)
-				stat_busy "The process $PHP is running"
-				;;
-			$PROCRUNPID0)
-				stat_busy "The process $PHP is running and pidfile has size 0b"
-				;;
-			$PROCRUNPIDNO)
-				stat_busy "The process $PHP is running and pidfile doesn't exist"
-				;;
-		esac
-		stat_die $error
-	elif [ $error -eq $OTHERERROR ]; then
-		stat_fail 
-		stat_busy "Something went wrong..."
-		stat_die $returnvalue
-	fi
-	
-	# run the main daemon
-	$DAEMON $OPTIONS >/dev/null
-	if [ $? -eq 0 ]; then
-		add_daemon $NAME
-		stat_done
-	else
-		stat_die
-	fi
-	#}}}
-	#{{{ start daemons for multiusers
-	if [ -n "$STARTMULTI" ]; then
-		stat_busy "Starting server $NAME for multiusers"
-		gen_all_uid
-		if [ -z "$USERSOCKET" ]; then
-			# Generate file map user 2 port
-			:>$MAPUSER2PORT
-			cat >> $MAPUSER2PORT <<- EOF
-				# Map username to port
-				map \$username \$port {
-				default $PORT;
-
-			EOF
-			local userport=$PORT
-			local uid
-			for uid in ${ALLUID[@]}; do
-				local login=$(uid2login $uid)
-				if [ $? -eq 0 ]; then
-					userport=$((userport+1))
-					echo -e "$login $userport;" >> $MAPUSER2PORT
-					local gid=$(id -g $login)
-					local group=$(gid2group $gid)
-					if [ -n "$USERPIDFILE" ]; then
-						local userpidfile=${USERPIDFILE}.${login}.pid
-					fi
-					USEROPTIONS="-a $IPADDR -p $userport -u $login ${group:+-g $group} -f $PHPCGI -C ${USER_PHP_FCGI_CHILDREN:-1} ${userpidfile:+-P $userpidfile}"
-					$DAEMON $USEROPTIONS &>/dev/null
-					if [ $? -ne 0 ]; then
-						stat_die
-					fi
-				fi
-			done
-			echo '}' >> $MAPUSER2PORT
-			stat_done
-		elif [ -n "$USERSOCKET" ]; then
-			local uid
-			for uid in ${ALLUID[@]}; do
-				local login=$(uid2login $uid)
-				if [ $? -eq 0 ]; then
-					local gid=$(id -g $login)
-					local group=$(gid2group $gid)
-					if [ -n "$USERPIDFILE" ]; then
-						local userpidfile=${USERPIDFILE}.${login}.pid
-					fi
-					local usersocket=${USERSOCKET}.${login}.sock
-					USEROPTIONS="-s ${usersocket} -u $login ${group:+-g $group} -f $PHPCGI -C ${USER_PHP_FCGI_CHILDREN:-1} ${userpidfile:+-P $userpidfile}"
-					$DAEMON $USEROPTIONS &>/dev/null
-					if [ $? -ne 0 ]; then
-						stat_die
-					fi
-				fi
-			done
-			stat_done
-		fi
-	fi
-	#}}}
-} #}}}
-stop(){ #{{{
-#===  FUNCTION  ================================================================
-#          NAME:  stop
-#   DESCRIPTION:  check whether a process is running, stop the daemon php-cgi
-#    PARAMETERS:  -
-#       RETURNS:  -
-#===============================================================================
-	stat_busy "Stopping server $NAME" #{{{
-	# for main daemon
-	if ! get_pid $PHPCGI &>/dev/null; then
-		stat_fail
-		stat_busy "None process $PHPCGI isn't running"
-		stat_die
-	else
-		#process php-cgi is running
-		if [ -s "$PIDFILE" ]; then
-			# pidfile exists
-			kill $(<$PIDFILE)
-			if [ $? -eq 0 ]; then
-				rm -f $PIDFILE
-				rm_daemon $NAME
-				stat_done
-			else
-				stat_die
-			fi
-		else #pidfile doesn't exist
-			if [ -r "$PIDFILE" ]; then
-				#pidfile exists and has size 0b
-				stat_busy "Pidfile $PIDFILE exists and has size 0b.Removing it"
-				rm -f "$PIDFILE" && \
-					stat_done || \
-					stat_fail
-			fi
-			killall -9 $PHPCGI
-			if [ $? -eq 0 ]; then
-				stat_done
-				rm_daemon $NAME
-			else
-				stat_die
-			fi
-		fi
-	fi
-	#}}}
-	#{{{ for multiusers
-	if [ -n "$STARTMULTI" ]; then
-		# waiting to kill the main daemon
-		sleep 1
-		if get_pid $PHPCGI &>/dev/null; then
-			stat_busy "Stopping server $NAME for multiusers"
-			killall $PHPCGI
-			# cleaning pidfiles
-			if [ -n "$USERPIDFILE" ]; then
-				gen_all_uid
-				for UserID in ${ALLUID[@]}; do
-					local login=$(uid2login $UserID)
-					if [ $? -eq 0 ]; then
-						rm -f ${USERPIDFILE}.${login}.pid
-					fi
-				done
-			fi #$USERPIDFILE
-			stat_done
-		fi
-	fi
-	#}}}
-} #}}}
-restart(){ #{{{
-#===  FUNCTION  ================================================================
-#          NAME:  restart
-#   DESCRIPTION:  stop and start service
-#    PARAMETERS:  -
-#       RETURNS:  -
-#===============================================================================
-	stat_busy "Restarting server $NAME"
-	stop
-	sleep 1
-	start
-} #}}}
-status(){ #{{{
-#===  FUNCTION  ================================================================
-#          NAME:  status
-#   DESCRIPTION:  check status of service
-#    PARAMETERS:  -
-#       RETURNS:  -
-#===============================================================================
-	if ! get_pid $PHPCGI>/dev/null; then
-		stat_busy "None process $PHPCGI isn't running"
-		stat_done
-	else
-		stat_busy "Process $PHPCGI is running"
-		stat_done
-		if [ -s "$PIDFILE" ]; then
-			stat_busy "It's spawned by process: $(cat $PIDFILE|tr '\n' ' ')";
-			stat_done
-		elif [ -r "$PIDFILE" ]; then
-			stat_fail
-			stat_busy "Pidfile $PIDFILE exists but has size 0b"
-		else
-			stat_busy "Pidfile $PIDFILE doesn't exist"
-			stat_done
-		fi
-		if [ -n "$STARTMULTI" -a -n "$USERSSTATUS" ]; then
-			gen_all_uid
-			local uid
-			for uid in ${ALLUID[@]}; do 
-				local login=$(uid2login $uid)
-				if [ $? -eq 0 ]; then
-					if [ -n "$USERPIDFILE" ]; then
-						# USERPIDFILE defined
-						local userpidfile=${USERPIDFILE}.${login}.pid
-						if [ -s "$userpidfile" ]; then
-							stat_busy "Process $PHPCGI of user $login is spawned by process: $(cat $userpidfile|tr '\n' ' ')";
-							stat_done
-						fi
-					else
-						local pid=$(get_userpid $login $PHPCGI)
-						if [ $? -eq 0 ]; then
-							stat_busy "Process $PHPCGI for user $login is running and it's spawned by: $pid";
-							stat_done
-						fi
-					fi
-				fi
-			done
-		fi
-	fi
-} #}}}
-uid2login(){ #{{{
-#===  FUNCTION  ================================================================
-#          NAME:  uid2login
-#   DESCRIPTION:  convert uid to username
-#    PARAMETERS:  uid
-#       RETURNS:  name of user for uid
-#===============================================================================
-	local uid=$1
-	if [ ! $uid -gt 0 ]; then
-		return 1
-	fi
-	local username=$(getent passwd | awk -vuid=$uid -F: '$3 == uid {print $1}')
-	if [ -z "$username" ]; then 
-		return 1
-	else
-		echo $username
-	fi
-} #}}}
-gid2group(){ #{{{
-	#===  FUNCTION  ================================================================
-	#          NAME:  uid2group
-	#   DESCRIPTION:  convert gid to name of group
-	#    PARAMETERS:  gid
-	#       RETURNS:  name of group for gid
-	#===============================================================================
-	local gid=$1
-	if [ ! $gid -gt 0 ]; then
-		return 1
-	fi
-	local groupname=$(getent group | awk -vgid=$1 -F: '$3 == gid {print $1}')
-	if [ -z "$groupname" ]; then
-		return 1
-	else
-		echo $groupname
-	fi
-} #}}}
-gen_all_uid(){ #{{{
-#===  FUNCTION  ================================================================
-#          NAME:  gen_all_uid
-#   DESCRIPTION:  Generate array of all UID
-#    PARAMETERS:  -
-#       RETURNS:  -
-#===============================================================================
-	ALLUID=()
-	if [ -n "$RANGEUID" -a ${#RANGEUID[@]} -gt 0 ]; then
-		for line in ${RANGEUID[@]/,/ }; do
-			(( line )) || stat_die # not a number
-			if [[ ${line/-/} != $line ]]; then
-				for ((i=${line%-*}; i<=${line#*-}; i++)); do
-					ALLUID+=($i)
-				done
-			else
-				ALLUID+=($line)
-			fi
-		done
-	elif [ $FIRSTUID -gt 1 -a $LASTUID -gt 1 -a $LASTUID -ge $FIRSTUID ]; then
-		for ((line=FIRSTUID; line<=LASTUID; line++)); do
-			(( line )) || stat_die #not a number
-			ALLUID+=($line)
-		done
-	else
-		echo "Error: Wrong range UID. Change RANGEUID or FIRSTUID and LASTUID"
-		exit 1
-	fi
-} #}}}
-case $1 in
-	start)
-		start
-		;;
-	stop)
-		stop
-		;;
-	restart)
-		restart
-		;;
-	status)
-		status
-		;;
-	*)
-		echo "Usage: $0 start|stop|restart|status"
-esac
diff --git a/~fauno/spawn-fcgi-php/spawn-fcgi-php.conf b/~fauno/spawn-fcgi-php/spawn-fcgi-php.conf
deleted file mode 100644
index d87520c1d..000000000
--- a/~fauno/spawn-fcgi-php/spawn-fcgi-php.conf
+++ /dev/null
@@ -1,60 +0,0 @@
-# vi: ft=sh
-# run PHPCGI as
-USER=http
-GROUP=http
-
-# Name of daemon
-DAEMON="/usr/bin/spawn-fcgi"
-PIDFILE="/var/run/spawn-fcgi-php.pid"
-# spawn the process
-PHPCGI="/usr/bin/php-cgi"
-
-#-------------------------------------------------------------------------------
-#  Options for php-cgi
-#-------------------------------------------------------------------------------
-# (PHP only) Number of children to spawn 
-PHP_FCGI_CHILDREN=4
-# or export PHP_FCGI_CHILDREN
-# PHP FastCGI proccess exit after requests:
-export PHP_FCGI_MAX_REQUESTS=1000
-# Choose ONE of PORT/IPADDR (for TCP) OR SOCKET (for unix domain sockets)
-IPADDR=127.0.0.1
-PORT=9000
-#SOCKET=/var/run/spawn-fcgi/spawn-fcgi.sock
-# Options only for socket
-#MODE=0644
-#SOCKET_USER=other
-#SOCKET_GROUP=other
-
-#-------------------------------------------------------------------------------
-#  Options for spawn-fcgi
-#-------------------------------------------------------------------------------
-# Number of children to fork, defaults to 1.
-SPAWN_FCGI_CHILDREN=1
-
-
-#-------------------------------------------------------------------------------
-# For many users
-#-------------------------------------------------------------------------------
-# Run separate processes for users with UIDs from the range RANGEUID
-# uncomment STARTMULTI if you want this
-STARTMULTI=yes
-# Base user's socket, uncomment to use socket instead IPADDR:USERPORT
-USERSOCKET='/var/run/spawn-fcgi/spawn-fcgi'
-# file with mapping user to port
-MAPUSER2PORT='/etc/nginx/conf/map_user2port.conf'
-# Base user's pidfile
-#USERPIDFILE='/var/run/spawn-fcgi-php'
-# range for UIDs, use the dash for range and split groups by spaces e.g. 1000-1003 1005 1010-1020, use parenthis for all
-RANGEUID=(1000-1001)
-# (PHP only) Number of children to spawn 
-USER_PHP_FCGI_CHILDREN=1
-# for status, comment if you don't want print status for users
-#USERSSTATUS=yes
-
-OPTIONS="-u $USER -g $GROUP -f $PHPCGI -C ${PHP_FCGI_CHILDREN:-4} ${PIDFILE:+-P $PIDFILE} -F ${SPAWN_FCGI_CHILDREN:-1} "
-if [ -n "$SOCKET" ]; then
-	OPTIONS+="-s $SOCKET ${MODE:+-M $MODE} ${SOCKET_USER:+-U $SOCKET_USER} ${SOCKET_GROUP:+-G $SOCKET_GROUP} "
-else
-	OPTIONS+="-a $IPADDR -p $PORT "
-fi
diff --git a/~fauno/sphinx/PKGBUILD b/~fauno/sphinx/PKGBUILD
deleted file mode 100644
index fa5a7935e..000000000
--- a/~fauno/sphinx/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Maintainer: dryes <joswiseman@gmail>
-# Contributor: Dan Serban
-# Contributor: Vishnevsky Roman <aka dot x0x01 at gmail dot com>
-# Contributor: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
-pkgname='sphinx'
-pkgver=2.0.5
-pkgrel=2
-pkgdesc='Free open-source SQL full-text search engine.'
-arch=('i686' 'x86_64')
-url='http://www.sphinxsearch.com/'
-license=('GPL')
-depends=('unixodbc' 'expat' 'libmysqlclient' 'postgresql-libs')
-optdepends=('postgresql')
-backup=('etc/conf.d/sphinx')
-source=("http://sphinxsearch.com/files/${pkgname}-${pkgver}-release.tar.gz" 'sphinx.conf.d' 'sphinx.rc.d')
-
-build() {
-  sed -i '15199,15199 s/x00/x21/' "${srcdir}/${pkgname}-${pkgver}-release/src/searchd.cpp"
-
-  cd "${srcdir}/${pkgname}-${pkgver}-release"
-  ./configure --prefix=/usr --exec-prefix=/usr --localstatedir=/var/lib/sphinx \
-    --sysconfdir=/etc/sphinx --with-pgsql --enable-id64
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}-release"
-
-  make DESTDIR="${pkgdir}" install
-
-  for _f in "${pkgdir}/usr/bin/"*; do
-    ln -s "/usr/bin/${_f##*/}" "${pkgdir}/usr/bin/sphinx-${_f##*/}"
-  done
-
-  install -Dm755 "${srcdir}/sphinx.rc.d" "${pkgdir}/etc/rc.d/sphinx"
-  install -Dm644 "${srcdir}/sphinx.conf.d" "${pkgdir}/etc/conf.d/sphinx"
-}
-
-md5sums=('e71fdb5b0c2911247d48fb30550b9584'
-         '48e3e1857919d26d5104a48caffb531b'
-         'd886222593c6bba891fd3ce982c90c00')
diff --git a/~fauno/sphinx/sphinx.conf.d b/~fauno/sphinx/sphinx.conf.d
deleted file mode 100644
index c809e56fa..000000000
--- a/~fauno/sphinx/sphinx.conf.d
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Arguments to be passed to the sphinx daemon
-#
-
-SPHINX_ARGS=""
diff --git a/~fauno/sphinx/sphinx.rc.d b/~fauno/sphinx/sphinx.rc.d
deleted file mode 100644
index 64c8f01e7..000000000
--- a/~fauno/sphinx/sphinx.rc.d
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/sphinx
-
-PID=$(pidof -o %PPID /usr/bin/sphinx-searchd)
-case $1 in
-start)
-        stat_busy "Starting Sphinx Daemon"
-
-        if [[ -z $PID ]] && /usr/bin/sphinx-searchd $SPHINX_ARGS; then
-
-                PID=$(pidof -o %PPID /usr/bin/sphinx-searchd)
-                echo "$PID" > /var/run/sphinx-searchd.pid
-                add_daemon sphinx
-                stat_done
-        else
-                stat_fail
-                exit 1
-        fi
-        ;;
-
-stop)
-        stat_busy "Stopping Sphinx Daemon"
-        if [[ ! -z $PID ]]  && kill "$PID" &>/dev/null; then
-                rm_daemon sphinx
-                stat_done
-        else
-                stat_fail
-                exit 1
-        fi
-        ;;
-
-restart)
-        $0 stop
-        $0 start
-        ;;
-
-*)
-        echo "Usage: $0 {start|stop|restart}" >&2
-        exit 1
-
-esac
diff --git a/~fauno/vala-notmuch/PKGBUILD b/~fauno/vala-notmuch/PKGBUILD
deleted file mode 100644
index 0e97683a4..000000000
--- a/~fauno/vala-notmuch/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Maintainer: Mark Foxwell fastfret79@archlinux.org.uk
-
-pkgname=vala-notmuch
-pkgver=20120112
-pkgrel=1
-pkgdesc="a notmuch address book in vala"
-url="https://github.com/spaetz/vala-notmuch"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL2')
-makedepends=('vala')
-depends=('notmuch')
-install=vala-notmuch.install
-source=("https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-${pkgrel}-any.src.tar.xz")
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}/src"
-
-  ./make 
-
-} 
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  install -D -m755 src/addrlookup ${pkgdir}/usr/bin/addrlookup
-
-}
-
-# vim:set ts=2 sw=2 et:
-md5sums=('99e264c0cb36e0a0f18048fb2ebd07e0')
-md5sums=('ca73980225368309119cf17ff5b3f3c4')
diff --git a/~fauno/vala-notmuch/SRCBUILD b/~fauno/vala-notmuch/SRCBUILD
deleted file mode 100644
index 89b6c67ba..000000000
--- a/~fauno/vala-notmuch/SRCBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Mark Foxwell fastfret79@archlinux.org.uk
-
-pkgname=vala-notmuch
-pkgver=20120112
-pkgrel=1
-pkgdesc="A notmuch address book in vala"
-url="https://github.com/spaetz/vala-notmuch"
-arch=('any')
-license=('GPL2')
-makedepends=('git')
-
-_gitroot="https://github.com/spaetz/vala-notmuch.git"
-_gitname="${pkgname}"
-
-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"
-
-} 
-
-package() {
-    cd ${pkgdir}
-    export PKGDEST=${SRCDEST}
-    export PKGEXT=.src.tar.xz
-
-    git clone ${srcdir}/${pkgname} ${pkgname}-${pkgver}
-
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/~fauno/vala-notmuch/vala-notmuch.install b/~fauno/vala-notmuch/vala-notmuch.install
deleted file mode 100644
index d1ce89da6..000000000
--- a/~fauno/vala-notmuch/vala-notmuch.install
+++ /dev/null
@@ -1,6 +0,0 @@
-post_install() {
-echo "To use within emacs, add the following to your .emacs:"
-echo "(require 'notmuch-address)"
-echo "(setq notmuch-address-command "/usr/bin/addrlookup")"
-echo "(notmuch-address-message-insinuate)"
-}
diff --git a/~lukeshu/android-udev/.gitignore b/~lukeshu/android-udev/.gitignore
deleted file mode 100644
index 290a3baa3..000000000
--- a/~lukeshu/android-udev/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-aur
\ No newline at end of file
diff --git a/~lukeshu/android-udev/51-android.rules b/~lukeshu/android-udev/51-android.rules
deleted file mode 100644
index 51f80cf54..000000000
--- a/~lukeshu/android-udev/51-android.rules
+++ /dev/null
@@ -1,232 +0,0 @@
-#      Acer
-SUBSYSTEM=="usb", ATTR{idVendor}=="0502", MODE="0666", GROUP="adbusers"
-#      Iconia Tab A500
-SUBSYSTEM=="usb", ATTR{idVendor}=="0502", ATTR{idProduct}=="3325", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0502", ATTR{idProduct}=="3325", SYMLINK+="android_fastboot"
-#      Liquid
-SUBSYSTEM=="usb", ATTR{idVendor}=="0502", ATTR{idProduct}=="3202"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0502", ATTR{idProduct}=="3203", SYMLINK+="android_adb"
-
-#      Archos
-SUBSYSTEM=="usb", ATTR{idVendor}=="0e79", MODE="0666", GROUP="adbusers"
-#      43
-SUBSYSTEM=="usb", ATTR{idVendor}=="0e79", ATTR{idProduct}=="1417", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0e79", ATTR{idProduct}=="1417", SYMLINK+="android_fastboot"
-#      101
-SUBSYSTEM=="usb", ATTR{idVendor}=="0e79", ATTR{idProduct}=="1411", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0e79", ATTR{idProduct}=="1411", SYMLINK+="android_fastboot"
-
-#      Asus
-SUBSYSTEM=="usb", ATTR{idVendor}=="0b05", MODE="0666", GROUP="adbusers"
-
-#      Dell
-SUBSYSTEM=="usb", ATTR{idVendor}=="413c", MODE="0666", GROUP="adbusers"
-
-#      Foxconn
-SUBSYSTEM=="usb", ATTR{idVendor}=="0489", MODE="0666", GROUP="adbusers"
-
-#      Garmin-Asus
-SUBSYSTEM=="usb", ATTR{idVendor}=="091e", MODE="0666", GROUP="adbusers"
-
-#      Google
-SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", MODE="0666", GROUP="adbusers"
-#      NEXUS S
-SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="4e21",
-SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="4e22", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="4e20", SYMLINK+="android_fastboot"
-#      Nexus One
-SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="4e11",
-SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="4e12", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot"
-#      Generic and unspecified debug interface
-SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="d00d", SYMLINK+="android_fastboot"
-
-#      HTC
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", MODE="0666", GROUP="adbusers"
-#      ChaCha
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0cb2", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0cb2", SYMLINK+="android_fastboot"
-#      Desire (Bravo)
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9",
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c87", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot"
-#      Desire HD
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ca2", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot"
-#      Desire Z
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c91", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c91", SYMLINK+="android_fastboot"
-#      Evo Shift
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9",
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ca5", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot"
-#      HD2
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c02", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c02", SYMLINK+="android_fastboot"
-#      Hero H2000
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0001", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0001", SYMLINK+="android_fastboot"
-#      Hero (GSM), Desire
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9",
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c99", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot"
-#      Hero (CDMA)
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9",
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c9a", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot"
-#      Incredible
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9",
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c9e", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot"
-#      Evo 4G, Incredible rev 0002
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9",
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c8d", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot"
-#      MyTouch 4G
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9",
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c96", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot"
-#      Slide
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9",
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0e03", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot"
-#      Tatoo, Dream, ADP1 , G1, Magic
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c01"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c02", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c02", SYMLINK+="android_fastboot"
-#      Vision
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9",
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c91", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot"
-#      Wildfire
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c8b", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c8b", SYMLINK+="android_fastboot"
-
-#      Huawei
-SUBSYSTEM=="usb", ATTR{idVendor}=="12d1", MODE="0666", GROUP="adbusers"
-SUBSYSTEM=="usb", ATTR{idVendor}=="12d1", ATTR{idProduct}=="1038", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="12d1", ATTR{idProduct}=="1038", SYMLINK+="android_fastboot"
-
-#      K-Touch
-SUBSYSTEM=="usb", ATTR{idVendor}=="24e3", MODE="0666", GROUP="adbusers"
-
-#      KT Tech
-SUBSYSTEM=="usb", ATTR{idVendor}=="2116", MODE="0666", GROUP="adbusers"
-
-#      Kyocera
-SUBSYSTEM=="usb", ATTR{idVendor}=="0482", MODE="0666", GROUP="adbusers"
-
-#      Lab126
-SUBSYSTEM=="usb", ATTR{idVendor}=="1949", MODE="0666", GROUP="adbusers"
-#      Amazon Kindle Fire
-SUBSYSTEM=="usb", ATTR{idVendor}=="1949", ATTR{idProduct}=="0006", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="1949", ATTR{idProduct}=="0006", SYMLINK+="android_fastboot"
-
-#      Lenevo
-SUBSYSTEM=="usb", ATTR{idVendor}=="17ef", MODE="0666", GROUP="adbusers"
-
-#      LG
-SUBSYSTEM=="usb", ATTR{idVendor}=="1004", MODE="0666", GROUP="adbusers"
-#      Ally, Vortex, P500
-SUBSYSTEM=="usb", ATTR{idVendor}=="1004", ATTR{idProduct}=="618f"
-SUBSYSTEM=="usb", ATTR{idVendor}=="1004", ATTR{idProduct}=="618e", SYMLINK+="android_adb"
-#      Optimus One
-SUBSYSTEM=="usb", ATTR{idVendor}=="1004", ATTR{idProduct}=="61c5", SYMLINK+="android_adb"
-#      Swift GT540
-SUBSYSTEM=="usb", ATTR{idVendor}=="1004", ATTR{idProduct}=="61b4", SYMLINK+="android_adb"
-
-
-#      Motorola
-SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", MODE="0666", GROUP="adbusers"
-#      CLIQ XT/Quench
-SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="2d66"
-#      Defy/MB525
-SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="428c"
-#      Droid
-SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="41db"
-#      -- Xoom ID 1
-SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="70a8", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="70a8", SYMLINK+="android_fastboot"
-#      -- Xoom ID 2
-SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="70a9", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="70a9", SYMLINK+="android_fastboot"
-
-#      NEC
-SUBSYSTEM=="usb", ATTR{idVendor}=="0409", MODE="0666", GROUP="adbusers"
-
-#      Nook
-SUBSYSTEM=="usb", ATTR{idVendor}=="2080", MODE="0666", GROUP="adbusers"
-
-#      Nvidia
-SUBSYSTEM=="usb", ATTR{idVendor}=="0955", MODE="0666", GROUP="adbusers"
-
-#      OTGV
-SUBSYSTEM=="usb", ATTR{idVendor}=="2257", MODE="0666", GROUP="adbusers"
-
-#      Pantech
-SUBSYSTEM=="usb", ATTR{idVendor}=="10A9", MODE="0666", GROUP="adbusers"
-
-#      Philips
-SUBSYSTEM=="usb", ATTR{idVendor}=="0471", MODE="0666", GROUP="adbusers"
-
-#      PMC-Sierra
-SUBSYSTEM=="usb", ATTR{idVendor}=="04da", MODE="0666", GROUP="adbusers"
-
-#      Qualcomm
-SUBSYSTEM=="usb", ATTR{idVendor}=="05c6", MODE="0666", GROUP="adbusers"
-
-#      SK Telesys
-SUBSYSTEM=="usb", ATTR{idVendor}=="1f53", MODE="0666", GROUP="adbusers"
-
-#      Samsung
-SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", MODE="0666", GROUP="adbusers"
-#      Galaxy i5700
-SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="681c", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="681c", SYMLINK+="android_fastboot"
-#      Galaxy i5800
-SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="681c", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6601", SYMLINK+="android_fastboot"
-SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="68a9", SYMLINK+="libmtp-%k", ENV{ID_MTP_DEVICE}="1", ENV{ID_MEDIA_PLAYER}="1"
-#      Galaxy i7500
-SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6640", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6640", SYMLINK+="android_fastboot"
-#      Galaxy S
-SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6601", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="685d", MODE="0666"
-SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="68c3", MODE="0666"
-#      Galaxy Tab
-SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6877", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6877", SYMLINK+="android_fastboot"
-#      Galaxy Tab 10.1, i9100 S2
-SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6860"
-SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="685e", SYMLINK+="android_adb"
-SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="685e", SYMLINK+="android_fastboot"
-SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6860", SYMLINK+="libmtp-%k", ENV{ID_MTP_DEVICE}="1", ENV{ID_MEDIA_PLAYER}="1"
-
-#      Sharp
-SUBSYSTEM=="usb", ATTR{idVendor}=="04dd", MODE="0666", GROUP="adbusers"
-
-#      Sony Ericsson
-SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", MODE="0666", GROUP="adbusers"
-#      Xperia X10 mini
-SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", ATTR{idProduct}=="3137"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", ATTR{idProduct}=="2137", SYMLINK+="android_adb"
-#      Xperia X10 mini pro
-SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", ATTR{idProduct}=="3138"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", ATTR{idProduct}=="2138", SYMLINK+="android_adb"
-#      Xperia X8
-SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", ATTR{idProduct}=="3149"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", ATTR{idProduct}=="2149", SYMLINK+="android_adb"
-#      Xperia X12
-SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", ATTR{idProduct}=="e14f"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", ATTR{idProduct}=="614f", SYMLINK+="android_adb"
-
-#      Toshiba
-SUBSYSTEM=="usb", ATTR{idVendor}=="0930", MODE="0666", GROUP="adbusers"
-
-#      ZTE
-SUBSYSTEM=="usb", ATTR{idVendor}=="19d2", MODE="0666", GROUP="adbusers"
-#      Blade
-SUBSYSTEM=="usb", ATTR{idVendor}=="19d2", ATTR{idProduct}=="1353",
-SUBSYSTEM=="usb", ATTR{idVendor}=="19d2", ATTR{idProduct}=="1351", SYMLINK+="android_adb"
-
diff --git a/~lukeshu/android-udev/Makefile b/~lukeshu/android-udev/Makefile
deleted file mode 100644
index f20930c66..000000000
--- a/~lukeshu/android-udev/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/make -f
-# Use this script to update the package from AUR.
-# This script depends on:
-#  - coreutils
-#  - pacman
-#  - sed
-#  - wget
-
-default: PHONY all
-all: PHONY 51-android.rules PKGBUILD 
-
-name=android-udev
-
-aur:
-	mkdir $@
-aur/%.tar.gz: | aur
-	cd aur && wget http://aur.archlinux.org/packages/$*/$*.tar.gz
-aur/%: aur/%.tar.gz
-	cd aur && tar xzf $(notdir $<)
-aur/$(name)/%: aur/$(name).tar.gz | aur/$(name)
-	test -f $@ && touch $@
-
-51-android.rules: aur/$(name)/51-android.rules
-	sed -r 's/\s+$$//' < $< > $@
-
-PKGBUILD: aur/$(name)/PKGBUILD 51-android.rules
-	# Update pkg{ver,rel}
-	ver=`grep -m1 pkgver= $<`  ; sed -i "s/pkgver=.*/$$ver/" $@
-	rel=`grep -m1 pkgrel= $<`.1; sed -i "s/pkgrel=.*/$$rel/" $@
-	# Update md5sums
-	sed -i '/md5sums/,$$d' $@
-	makepkg -g >> $@
-
-clean: PHONY
-	rm -rf aur
-maintainerclean: PHONY clean
-	rm -f 51-android.rules
-
-.PHONY: PHONY FORCE
diff --git a/~lukeshu/android-udev/PKGBUILD b/~lukeshu/android-udev/PKGBUILD
deleted file mode 100644
index 6900b46da..000000000
--- a/~lukeshu/android-udev/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Maintainer: M0Rf30 (AUR)
-# Contributor: marlock
-
-pkgname=android-udev
-pkgver=0.8
-pkgrel=1.1
-pkgdesc='Udev rules to for Android devices.'
-arch=('any')
-url="http://developer.android.com/guide/developing/device.html"
-license=('unknown')
-source=('51-android.rules')
-depends=('udev' 'libmtp')
-conflicts=('udev-android-rules')
-install='android-udev.install'
-
-package() {
-  install -d "$pkgdir/etc/udev/rules.d"
-  install -m644 "$srcdir/51-android.rules" "$pkgdir/etc/udev/rules.d/51-android.rules"
-}
-
-md5sums=('909eb7629683efae838c6e9d65966b3b')
diff --git a/~lukeshu/android-udev/android-udev.install b/~lukeshu/android-udev/android-udev.install
deleted file mode 100644
index c861f2b70..000000000
--- a/~lukeshu/android-udev/android-udev.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-getent group adbusers >> /dev/null || /usr/sbin/groupadd adbusers || return 1
-/bin/cat << EOF
-===> In order to use adb, you have to be in the 'adbusers' group
-===> For that, use: gpasswd -a USERNAME adbusers
-EOF
-}
-
-post_upgrade() {
-post_install
-}
-
-post_remove() {
-getent group adbusers &>/dev/null && /usr/sbin/groupdel adbusers
-}
diff --git a/~lukeshu/emacs-lucid/librenamcap b/~lukeshu/emacs-lucid/librenamcap
deleted file mode 100644
index a42ac9e22..000000000
--- a/~lukeshu/emacs-lucid/librenamcap
+++ /dev/null
@@ -1,8 +0,0 @@
-emacs-lucid E: incorrect-owner var/games (root:games)
-emacs-lucid E: incorrect-owner var/games/emacs (root:games)
-emacs-lucid E: incorrect-owner var/games/emacs/snake-scores (root:games)
-emacs-lucid E: incorrect-owner var/games/emacs/tetris-scores (root:games)
-emacs-lucid W: file-in-non-standard-dir var/games/
-emacs-lucid W: file-in-non-standard-dir var/games/emacs/
-emacs-lucid W: file-in-non-standard-dir var/games/emacs/snake-scores
-emacs-lucid W: file-in-non-standard-dir var/games/emacs/tetris-scores
diff --git a/~lukeshu/git-svn-abandon-git/PKGBUILD b/~lukeshu/git-svn-abandon-git/PKGBUILD
index fe9f9990c..8df4de38e 100644
--- a/~lukeshu/git-svn-abandon-git/PKGBUILD
+++ b/~lukeshu/git-svn-abandon-git/PKGBUILD
@@ -2,10 +2,16 @@
 
 _pkgname=git-svn-abandon
 pkgname=$_pkgname-git
+
+pkgver=20100319
+_gitver=42014bf555fdac67c8c82ed69c4733ab9dba0c8a
+
 provides=($_pkgname)
 conflicts=($_pkgname)
-pkgver=20120112
+
+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"
@@ -13,39 +19,23 @@ license=('MIT')
 depends=('git')
 makedepends=('git' 'python-markdown')
 
-_gitroot=https://github.com/nothingmuch/git-svn-abandon.git
-_gitname=$_pkgname
+source=("libre://git-svn-abandon-$_gitver.tar.gz")
+mksource=("git+https://github.com/nothingmuch/git-svn-abandon.git#commit=$_gitver")
 
 build() {
-  cd "$srcdir"
-  msg "Connecting to GIT server...."
-
-  if [[ -d "$_gitname" ]]; then
-    cd "$_gitname" && git pull origin
-    msg "The local files are updated."
-  else
-    git clone "$_gitroot" "$_gitname"
-  fi
-
-  msg "GIT checkout done or server timeout"
-  msg "Starting build..."
-
-  rm -rf "$srcdir/$_gitname-build"
-  git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
-  cd "$srcdir/$_gitname-build"
-
-  #
-  # BUILD HERE
-  #
+  cd "$srcdir/$_pkgname"
   markdown README.mkdn > README.html
 }
 
 package() {
-  cd "$srcdir/$_gitname-build"
+  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/git-svn-abandon/README.md"
-  install -D -m644 README.html "$pkgdir/usr/doc/git-svn-abandon/README.html"
-  install -D -m644 LICENSE     "$pkgdir/usr/licenses/git-svn-abandon/LICENSE"
+  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/~smv/sword-svn/PKGBUILD b/~smv/sword-svn/PKGBUILD
new file mode 100644
index 000000000..b5ddc53f4
--- /dev/null
+++ b/~smv/sword-svn/PKGBUILD
@@ -0,0 +1,35 @@
+# 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
new file mode 100644
index 000000000..699990fec
--- /dev/null
+++ b/~smv/xiphos-svn/PKGBUILD
@@ -0,0 +1,35 @@
+# 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
new file mode 100644
index 000000000..0cbac7465
--- /dev/null
+++ b/~smv/xiphos-svn/xiphos-svn.install
@@ -0,0 +1,12 @@
+post_install() {
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  update-desktop-database -q
+}