Merge remote-tracking branch 'remotes/pgl/master' into HEAD

52 files changed, 1035 insertions, 897 deletions

diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD
index 8caf1d90e..064900004 100644
--- a/libre/audacious-plugins-libre/PKGBUILD
+++ b/libre/audacious-plugins-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 195219 2013-09-28 02:25:20Z bisson $
+# $Id: PKGBUILD 198672 2013-11-01 21:09:24Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: William Rea <sillywilly@gmail.com>
@@ -8,8 +8,8 @@
 
 _pkgname=audacious-plugins
 pkgname=audacious-plugins-libre
-pkgver=3.4.1
-pkgrel=2
+pkgver=3.4.2
+pkgrel=1
 pkgdesc='Plugins for Audacious, without nonfree plugins'
 url='http://audacious-media-player.org/'
 license=('GPL' 'GPL3' 'LGPL' 'custom:BSD')
@@ -61,7 +61,7 @@ optdepends=('alsa-lib: Advanced Linux Sound Arch. output'
             'libcue: CUE playlist format')
 
 source=("http://distfiles.audacious-media-player.org/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('81c36186d1fef7247b6ea890db7c77061965629b')
+sha1sums=('a9e831f4fd4d4c4a1dab11b819fa5ac96ce9fad0')
 
 prepare() {
 	# Retrieve upstream & remove plugin 'psf' due to issues mentioned above.
diff --git a/libre/bfgminer-libre/PKGBUILD b/libre/bfgminer-libre/PKGBUILD
index db92fa191..3559adcf4 100644
--- a/libre/bfgminer-libre/PKGBUILD
+++ b/libre/bfgminer-libre/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 98781 2013-10-18 14:05:15Z tredaelli $
+# $Id: PKGBUILD 99405 2013-10-28 11:43:52Z tredaelli $
 # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor: Andy Weidenbaum <archbaum@gmail.com>
 
 _pkgname=bfgminer
 pkgname=bfgminer-libre
-pkgver=3.3.0
+pkgver=3.4.0
 pkgrel=1
 pkgdesc="Bitcoin miner featuring overclocking, monitoring, fan speed control and remote management. For FPGA/GPU/CPU Bitcoin mining, without nonfree OpenCL recommendation."
 arch=('i686' 'x86_64' 'mips64el')
-depends=('curl' 'jansson' 'libusbx' 'lm_sensors')
+depends=('curl' 'jansson' 'libevent' 'libmicrohttpd' 'libusbx' 'lm_sensors')
 makedepends=('uthash' 'yasm')
 replaces=$_pkgname
 conflicts=$_pkgname
@@ -18,7 +18,7 @@ license=('GPL3')
 options=(!libtool)
 source=(http://luke.dashjr.org/programs/bitcoin/files/$_pkgname/$pkgver/$_pkgname-$pkgver.tbz2
         remove-dangerous-rpath.patch)
-sha256sums=('773435dafb9b13c4450480a7731d024ffb2b7ac34d8511c9325d2a703f339ef6'
+sha256sums=('5367802f303917810236be092a09400c6e105efc348eadcf27bdcea526728d67'
             'd26d07ca23ae25798c4db37cfda1a6a76f22d06e73efab1ddf62b3e1a7eef04c')
 
 prepare() {
@@ -31,7 +31,12 @@ prepare() {
 build() {
   cd "$srcdir"/$_pkgname-$pkgver
 
-  ./configure --prefix=/usr --enable-cpumining --enable-scrypt
+  ./configure	--prefix=/usr \
+	  	--enable-cpumining \
+		--enable-bfsb \
+		--enable-metabank \
+  		--enable-scrypt
+  # --enable-knc (FS#33640)
   make
 }
 
diff --git a/libre/blackbox-libre/PKGBUILD b/libre/blackbox-libre/PKGBUILD
index 1c0c49a15..839ca0d7f 100644
--- a/libre/blackbox-libre/PKGBUILD
+++ b/libre/blackbox-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: PKGBUILD 100133 2013-11-01 20:20:45Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: durbatuluk <dvdscripter@gmail.org>
 # Contributor: Steve Ponsford <sp4d@lavabit.com>
@@ -7,17 +7,16 @@
 _pkgname=blackbox
 pkgname=${_pkgname}-libre
 pkgver=0.70.1
-pkgrel=10.1
-pkgdesc="A window manager for X11 without non-free programs on menu"
-url="http://${_pkgname}wm.sourceforge.net/"
+pkgrel=11
+pkgdesc="A window manager for X11, without nonfree programs on the menu"
+url="http://blackboxwm.sourceforge.net/"
 arch=('i686' 'x86_64')
 depends=('gcc-libs' 'libxft' 'libxext' 'libx11' 'libxt')
-replaces=("${_pkgname}")
-conflicts=("${_pkgname}")
-provides=("${_pkgname}=${pkgver}")
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
 license=('MIT')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/${_pkgname}wm/${_pkgname}-${pkgver}.tar.gz
+source=(http://downloads.sourceforge.net/blackboxwm/$_pkgname-$pkgver.tar.gz
 	gcc4.3.patch
 	bbdock.patch
 	bsetbg-feh.patch
@@ -31,7 +30,7 @@ md5sums=('2d173b95ca5e64ef478c6a5d2deee9df'
          'f4fefa5f25c65c5d9a601e9c14646757')
 
 build() {
-  cd ${srcdir}/${_pkgname}-${pkgver}
+  cd $srcdir/$_pkgname-$pkgver
 
   patch -Np1 -i ../gcc4.3.patch
   patch -Np0 -i ../bbdock.patch
@@ -40,8 +39,11 @@ build() {
 
   ./configure --prefix=/usr --mandir=/usr/share/man
   make
-  make DESTDIR=${pkgdir} install
+}
 
-  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE
-  install -D -m644 ${srcdir}/menu ${pkgdir}/usr/share/${_pkgname}/menu
+package() {
+  cd $srcdir/$_pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+  install -D -m644 LICENSE $pkgdir/usr/share/licenses/$_pkgname/LICENSE
+  install -D -m644 $srcdir/menu $pkgdir/usr/share/$_pkgname/menu
 }
diff --git a/libre/blender-addon-luxrender/PKGBUILD b/libre/blender-addon-luxrender/PKGBUILD
index d3c891067..337cabcda 100644
--- a/libre/blender-addon-luxrender/PKGBUILD
+++ b/libre/blender-addon-luxrender/PKGBUILD
@@ -1,16 +1,16 @@
 # Maintainer: Márcio Silva <coadde@lavabit.com>
 
 _srcname=luxrender
-_pkgver=1.2.1
+_pkgver=1.3
 _bldname=blender
-_bldver=2.68
-_bldep=9
+_bldver=2.69
+_bldep=10
 _pkgname=${_srcname::3}${_bldname::5}25
 _srcver=c9deae0646d0
 
 pkgname=$_bldname-addon-$_srcname
 pkgver=$_pkgver.v$_bldver
-pkgrel=3
+pkgrel=1
 pkgdesc="$_pkgname: A addon for the ${_bldname^} which allows render and export with LuxRender (built for the $_bldname-libre package)"
 arch=any
 url=http://www.$_srcname.net/
diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index 90df03528..359f2a6cf 100644
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -2,8 +2,8 @@
 
 _pkgname=blender
 epoch=10
-_pkgver=2.68a
-pkgrel=3
+_pkgver=2.69
+pkgrel=1
 _jpgver=1.5
 _pyver=3.3
 
@@ -36,7 +36,7 @@ depends=(
   openal
   openexr-libre
   openimageio
-  'opencollada=20130413'
+  'opencollada=20131031'
   opencolorio
   openshadinglanguage
   shared-mime-info
@@ -57,9 +57,10 @@ provides=($_pkgname)
 conflicts=($_pkgname)
 [[ $_spn == true ]] && conflicts+=($_pkgname-libre)
 replaces=$_pkgname
+options=(!strip)
 install=$_pkgname.install
 source=http://download.$_pkgname.org/source/$_pkgname-$pkgver.tar.gz
-sha512sums=ce93779c5cbadf361f08ad0f9d5370d52878f94edc0b113d73711b842169d0e000e1500ece8e534439d94c5983e6ff3f15ca4ccd74db5f21447274c475090019
+sha512sums=f4de1f5a0a7868ee509b57ef65962a6c2af4c2bc7328db6ebe7b8e05f771c06efea92977f7a64433e8383382a33dbd73cb42b2bf872e63410e55c19ddd133142
 
 prepare() {
   cd $srcdir/$_pkgname-$pkgver
@@ -67,16 +68,17 @@ prepare() {
   msg 'renaming wrong OS name'
   _OS=$(uname -o)
   [[ $_OS == GNU ]] && sed -i 's|BUILD_PLATFORM;|"GNU";|' source/creator/buildinfo.c
-  [[ $_OS == GNU/Linux ]] && sed -i 's|BUILD_PLATFORM;|"GNU/Linux-libre";|' source/creator/buildinfo.c
-  sed -i 's|Linux, Mac OS X, Windows and FreeBSD|GNU and GNU/Linux-libre|
-          s|Linux, FreeBSD|GNU, GNU/Linux-libre|
+  [[ $_OS == GNU/Linux ]] && sed -i 's|BUILD_PLATFORM;|"GNU/Linux";|' source/creator/buildinfo.c
+  [[ $_OS == GNU/kFreeBSD ]] && sed -i 's|BUILD_PLATFORM;|"GNU/kFreeBSD";|' source/creator/buildinfo.c
+  sed -i 's|Linux, Mac OS X, Windows and FreeBSD|GNU and BSD|
+          s|Linux, FreeBSD|GNU and BSD|
           s|Unpack the archive, Then run the Blender executable.|Intall from Parabola repo (pacman -S '"$pkgname"'), Then run blender.|
           \|Windows|d;\|Mac OS X|d
           s|The downloaded Blender package includes|The '"${pkgname^}"' package includes|
          ' release/text/readme.html
-  sed -i 's|Linux|GNU/Linux-libre|
+  sed -i 's|Linux|GNU|
          ' release/scripts/{addons/game_engine_save_as_runtime,modules/bl_i18n_utils/utils_rtl}.py
-  sed -i 's| (.so under Linux, .dll under windows...)||
+  sed -i 's| (.so under Linux, .dll under windows...)| (.so under GNU or BSD, .dll under Wine or ReactOS...)|
          ' release/scripts/{addons/ui_translate,modules/bl_i18n_utils}/settings.py
 
   msg 'removing Open Source term'
@@ -135,5 +137,3 @@ package() {
   make DESTDIR=$pkgdir install
   python -m compileall $pkgdir/usr/share/$_pkgname
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD
index 019b33cba..52fd8b73d 100644
--- a/libre/calibre-libre/PKGBUILD
+++ b/libre/calibre-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 99239 2013-10-26 11:48:48Z jelle $
+# $Id: PKGBUILD 100069 2013-11-01 09:01:32Z jelle $
 # Maintainer: jelle van der Waa <jelle@vdwaa.nl>
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
@@ -9,7 +9,7 @@
 
 _pkgname=calibre
 pkgname=calibre-libre
-pkgver=1.8.0
+pkgver=1.9.0
 pkgrel=1
 pkgdesc="Ebook management application, with unar support"
 arch=('i686' 'x86_64' 'mips64el') 
@@ -30,13 +30,10 @@ install=calibre.install
 source=("http://download.calibre-ebook.com/${pkgver}/calibre-${pkgver}.tar.xz"
         'desktop_integration.patch'
         'calibre-mount-helper')
-md5sums=('f1cb722f32f5e3d50fbcd21403e95514'
+md5sums=('69e0262f0e06b7d6384c3a183a44d02f'
          '8353d1878c5a498b3e49eddef473605f'
          '675cd87d41342119827ef706055491e7')
 
-
-
-
 prepare(){
   cd "${srcdir}/${_pkgname}"
   #rm -rf src/{cherrypy,pyPdf}
diff --git a/libre/cgminer-libre/PKGBUILD b/libre/cgminer-libre/PKGBUILD
index fafe50b50..09608d1fa 100644
--- a/libre/cgminer-libre/PKGBUILD
+++ b/libre/cgminer-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 99235 2013-10-26 09:56:23Z fyan $
+# $Id: PKGBUILD 100525 2013-11-05 13:41:39Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: monson <holymonson@gmail.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
@@ -7,45 +7,63 @@
 
 _pkgname=cgminer
 pkgname=cgminer-libre
-pkgver=3.6.6
+pkgver=3.7.2
+#_pkgver=3.6.6
+_pkgver=$pkgver
 pkgrel=1
 pkgdesc="Multi-threaded multi-pool GPU, FPGA and ASIC miner for bitcoin and derivative coins, without nonfree OpenCL recommendation"
 url='http://forum.bitcoin.org/index.php?topic=28402.0'
 license=('GPL3')
 arch=('i686' 'x86_64' 'mips64el')
+depends=('curl' 'mesa-libcl' 'libusbx' 'jansson')
+makedepends=('opencl-headers' 'git')
 replaces=$_pkgname
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
-depends=('curl' 'mesa-libcl' 'libusbx' 'jansson')
-makedepends=('opencl-headers')
-source=("http://ck.kolivas.org/apps/$_pkgname/$_pkgname-${pkgver}.tar.bz2"
+source=("git+https://github.com/ckolivas/${_pkgname}.git#tag=v$_pkgver"
         "$_pkgname.conf.d"
         "$_pkgname.service")
 backup=("etc/conf.d/$_pkgname" "etc/$_pkgname.conf")
 
 [ "$CARCH" == "x86_64" ] && makedepends+=('yasm')
 
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
+prepare() {
+  cd $_pkgname
   # We have latest jansson and libusb - just use them
-  sed "s|ac_subdirs_all='compat/libusb\-1.0\ncompat/jansson-2.5'||" -i ./configure
-  sed 's|subdirs="$subdirs compat/libusb\-1.0"||' -i ./configure
-  sed 's|subdirs="$subdirs compat/jansson\-2.5"||' -i ./configure
-  sed 's|LIBUSB_LIBS="compat/libusb-1.0/libusb/.libs/libusb-1.0.a"|LIBUSB_LIBS=-lusb-1.0|' -i ./configure
-  sed 's|JANSSON_LIBS="compat/jansson-2.5/src/.libs/libjansson.a"|JANSSON_LIBS=-ljansson|' -i ./configure
-  sed 's|compat/Makefile ||' -i ./configure
 
-  sed 's|JANSSON_INCLUDES = -I$(top_srcdir)/compat/jansson-2.5/src||' -i ./Makefile.in
-  sed 's|USBUTILS_INCLUDES = -I$(top_srcdir)/compat/libusb\-1.0/libusb|USBUTILS_INCLUDES = -I/usr/include/libusb-1.0|' -i ./Makefile.in
-  sed 's|SUBDIRS = lib compat ccan|SUBDIRS = lib ccan|' -i ./Makefile.in
+  sed -e 's|^AC_CONFIG_SUBDIRS.*compat/jansson-2\.5.*||' \
+      -e 's|JANSSON_LIBS="compat/jansson-2\.5/src/\.libs/libjansson\.a"|JANSSON_LIBS=-ljansson|' \
+      -e 's|compat/Makefile||' \
+      -i ./configure.ac
+
+  sed -e 's|^JANSSON_INCLUDES= .*||' \
+      -e 's|^USBUTILS_INCLUDES = .*|USBUTILS_INCLUDES = -I/usr/include/libusb-1.0|' \
+      -e 's|^SUBDIRS.*|SUBDIRS = lib ccan|' \
+      -i ./Makefile.am
+
+  #sed "s|ac_subdirs_all='compat/libusb\-1.0\ncompat/jansson-2.5'||" -i ./configure
+  #sed 's|subdirs="$subdirs compat/libusb\-1.0"||' -i ./configure
+  #sed 's|subdirs="$subdirs compat/jansson\-2.5"||' -i ./configure
+  #sed 's|LIBUSB_LIBS="compat/libusb-1.0/libusb/.libs/libusb-1.0.a"|LIBUSB_LIBS=-lusb-1.0|' -i ./configure
+  #sed 's|JANSSON_LIBS="compat/jansson-2.5/src/.libs/libjansson.a"|JANSSON_LIBS=-ljansson|' -i ./configure
+  #sed 's|compat/Makefile ||' -i ./configure
+
+  #sed 's|JANSSON_INCLUDES = .*||' -i ./Makefile.in
+  #sed 's|USBUTILS_INCLUDES = .*|USBUTILS_INCLUDES = -I/usr/include/libusb-1.0|' -i ./Makefile.in
+  #sed 's|SUBDIRS = lib compat ccan|SUBDIRS = lib ccan|' -i ./Makefile.in
 
   rm -r compat
+}
 
+build() {
+  cd $_pkgname
+  
   # Here you may want to use custom CFLAGS
   #export CFLAGS="-O2 -march=native -mtune=native -msse2"
   
-  ./configure \
+  # ./configure \
+
+  ./autogen.sh \
     --prefix=/usr \
     --enable-scrypt \
     --enable-opencl \
@@ -56,6 +74,8 @@ build() {
     --enable-avalon \
     --enable-klondike \
     --enable-bitfury \
+    --enable-hashfast \
+    --enable-knc \
     --with-system-libusb \
     --disable-adl # For license issues
   
@@ -63,7 +83,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd $_pkgname
 
   make DESTDIR="$pkgdir" install
 
@@ -76,6 +96,6 @@ package() {
   install -Dm644 $_pkgname.conf "$pkgdir"/etc/$_pkgname.conf
 }
 
-sha512sums=('1f913118fd3a2757a9fa9b2ffb8f1527109e90626044362ce94bbf93e876448cace189bc6c6e0c28f33d71ecc0488312d60530ef20baadf9894e82891b15171d'
+sha512sums=('SKIP'
             '99c38bc395848f9712ce172343d31f5c60f5d8ac1cfe2f48df8f3ec6c488fc275763a79c5ef36b99f32faa465b5a65284b38e8a63ef9b144075ee13971313b41'
             '3317b60c6b1f14c47d8ee636113ef40a4023ab14054129de80a37947b381fd2b647a7053f4e1bb639efa225a514e862fa531908714c34040dda2d6221dde7f5f')
diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD
index 07761093d..651a1189a 100644
--- a/libre/cups-filters-libre/PKGBUILD
+++ b/libre/cups-filters-libre/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 196334 2013-10-11 15:48:49Z andyrtr $
+# $Id: PKGBUILD 198470 2013-10-30 15:04:07Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=cups-filters-libre
 _pkgname=cups-filters
-pkgver=1.0.40
+pkgver=1.0.41
 pkgrel=1
 pkgdesc="OpenPrinting CUPS Filters, without foomatic-db-nonfree recommendation"
 arch=('i686' 'x86_64')
@@ -16,9 +16,8 @@ optdepends=('ghostscript: for non-PostScript printers to print with CUPS to conv
 	    'foomatic-db-engine: drivers use Ghostscript to convert PostScript to a printable form directly')
 backup=(etc/fonts/conf.d/99pdftoopvp.conf
         etc/cups/cups-browsed.conf)
-options=(!libtool)
 source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz)
-md5sums=('50936e556a2787a85cb14dd859e8f410')
+md5sums=('9065084c7601ce1721cd6f34ca0a4337')
 replaces=("${_pkgname}")
 conflicts=("${_pkgname}")
 provides=("${_pkgname}=${pkgver}")
@@ -44,8 +43,6 @@ check() {
 package() {
   cd $_pkgname-$pkgver
   make DESTDIR="$pkgdir/" install
-  # drop static lib
-  rm -f ${pkgdir}/usr/lib/*.a
   
   # add upstream systemd support file
   install -Dm644 utils/cups-browsed.service ${pkgdir}/usr/lib/systemd/system/cups-browsed.service
diff --git a/libre/icecat-l10n/PKGBUILD b/libre/icecat-l10n/PKGBUILD
index a72bf74c6..939e07019 100644
--- a/libre/icecat-l10n/PKGBUILD
+++ b/libre/icecat-l10n/PKGBUILD
@@ -10,96 +10,7 @@
 # - (optionally) edit PKGBUILD.in
 # - Run 'make'. It will take care of everything else for you.
 
-_langpacks=(
-  ach
-  ak
-  ar
-  as
-  ast
-  be
-  bg
-  bn-BD
-  bn-IN
-  br
-  bs
-  ca
-  cs
-  csb
-  cy
-  da
-  de
-  el
-  en-GB
-  en-US
-  en-ZA
-  eo
-  es-AR
-  es-CL
-  es-ES
-  es-MX
-  et
-  eu
-  fa
-  ff
-  fi
-  fr
-  fy-NL
-  ga-IE
-  gd
-  gl
-  gu-IN
-  he
-  hi-IN
-  hr
-  hu
-  hy-AM
-  id
-  is
-  it
-  ja
-  kk
-  km
-  kn
-  ko
-  ku
-  lg
-  lij
-  lt
-  lv
-  mai
-  mk
-  ml
-  mr
-  nb-NO
-  nl
-  nn-NO
-  nso
-  or
-  pa-IN
-  pl
-  pt-BR
-  pt-PT
-  rm
-  ro
-  ru
-  si
-  sk
-  sl
-  son
-  sq
-  sr
-  sv-SE
-  ta-LK
-  ta
-  te
-  th
-  tr
-  uk
-  vi
-  zh-CN
-  zh-TW
-  zu
-)
+_langpacks=(ach af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de el en-GB en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk km kn ko ku lg lij lt lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta ta-LK te th tr uk vi zh-CN zh-TW zu)
 
 pkgbase=icecat-l10n
 pkgname=(
@@ -107,8 +18,8 @@ pkgname=(
   do echo icecat-l10n-$lang | tr A-Z a-z
   done)
 )
-pkgver=17.0.1
-pkgrel=3
+pkgver=24.0
+pkgrel=1
 pkgdesc='Language packs for GNU IceCat.'
 arch=(
   any
@@ -125,9 +36,14 @@ makedepends=(
   zip
 )
 source=('region.properties')
+#  for lang in ${_langpacks[@]}
+#  do 
+#      source+=(http://ftp.gnu.org/gnu/gnuzilla/lang/${pkgver::2}/$lang.xpi)
+#  done
+
   for lang in ${_langpacks[@]}
   do 
-      source+=(http://ftp.gnu.org/gnu/gnuzilla/lang/${pkgver::4}/$lang.xpi)
+      source+=(http://mirror.lnx.im/icecat/langpacks/$pkgver/$lang.xpi)
   done
 
 noextract=(
@@ -137,7 +53,7 @@ noextract=(
 )
 
 
-_path=/usr/lib/${pkgbase%-l10n}/extensions/
+_path=/usr/lib/${pkgbase%-l10n}/browser/extensions/
 
 build() {
   cd $srcdir
@@ -146,7 +62,7 @@ build() {
   do
       cd $srcdir
       unzip -q $i.xpi -d $i
-      install -Dm644 $srcdir/region.properties $i/chrome/$i/locale/browser-region
+      install -Dm644 $srcdir/region.properties $i/browser/chrome/$i/locale/browser-region
       cd $i
       zip -q -r $srcdir/langpack-$i@firefox.mozilla.org.xpi .
   done
@@ -166,94 +82,92 @@ package_icecat-l10n-$(echo $lang | tr A-Z a-z) () {
 "
 done
 
-sha512sums=(
-  b6ddcf75c0ff8c542851be45147dfe22c1a73c5e4dd59ce6543d5a3e7bba70be3576bd280cbe53f479bfdf5c3839561484b0f9e93ca061bae9ff25990a7e899b
-  f3c627282fa78ef67335fa70671af848f2fff2252db1c4125838bcbfd92c61ae978b9a32885f4b33beac4eb4d8dc3fc034b18703686164a4903c4180de539439
-  d88793ed54794833ec6200d7a1957b68ebe8dd5c1dd6f4d030440919e5ca7f85f84fefd459603d29be57fd6b9d0961356c7760aedaca638bc3b58532ceae8441
-  6f3f6e026bc7d4ac6d6aa9e1ebb5995d663293f9b26190d33de8857cbfd5e6454bbda49bd13d6c6c1dab544ef0f2da0cdec50b1d9fbfb73aa5d66b0a6a67a87c
-  a0f8aec338bd7a36af983bab144fafdb9c9dc9081ceaf31aae443160e68758f3d46a385bc20d4a6767b81d09eeca92e08e0aa79250719e9e1f9d7bbab8137390
-  066d2540fcf97e87e778124d9bd8aa0d624d810d5b034423f43fc77f8579c2006c2a7a519b438a152272ed9db85a3e56ae770f221c7eabdc700368c4788e6108
-  12801164ecebf059c5615480785ce4ce95de5221d05e74bf85f747a62f8954decd372afb829b8d941316bc9115c3b6faf1da6da869d0ce5b09c622043936bf6f
-  aacf7f3713431a4dd5060d475145834c0b9aafb032bdceac9bfee4d3ea0ebe869c86bfec1fb65995b2a531962c40b9df69d4a427e81cf01164891f668c3000ee
-  ce022ddcb8c46d1ecc97187ad025707b33f763b1abed69a8cc33b1b512728267fe67ab45dd19e5f89463328950330db9ea5243df30e0f35acae48c4746211b79
-  560c43e6f684a726c10a547b6f95d511d63837521b6251ab3b5f141c4e9490c925eb049e3c6e29d1eb9bbe066fda9e5671a0aae8715f0946ee941ece77b5968a
-  5bd37933a9026c5af0facb34932a1cbb24b46d16fee9ee2b94313e3c7c6622d5ac0f1afe05b003a39cd9750cfa4f0d1f40455610b52d4c48f1e3ff108c2bdca8
-  37c5d9048f8ef0969a71bf422f9625fa768fac0174046f8cc5922534070eb38a89e467e78013c394702afe4af9045d3977d250bbe0dc26ce5059d5f4c8bce990
-  aaf2b4a0d7a8a9b9d29a212be5c7de43af47b80624e6f2ffc6fd1be80de3840acdb7dc91309bd59a0e1e8c8f510f2ce571d0be5587dcbb55caed32b0c400be5d
-  5db08621ddb5313c2e87e6f0922b66716cd1880eb479ca23ef6dbfcd52c86af2e6954dfb68569aef31061fe4ef0965111fab91f36caa12e01f76749bac0ae625
-  9acf3446c15e95f7f8bd553ce1860fc9d8181eb20472e3e435544ccea96d2305698cf89af4b4bce8a741c1c13f5b590f73912a3ff478fe976a7da02046877a6e
-  0f3cf93dc93f324b5caa4da8fba259164bb6bd58bdd1dc4152304a4000ef84b6191e827fa69a619a32c8edcdd3c66d2307100f6db5e934182862fd53e382ebc2
-  31b7185f3587e3f8cd660510908392e97cd664364fb4e1c538f30fc53012ae2703a4c2542b956099feccecc28d849953cc0259c76ea8b13cac8e2ae4a66091b6
-  5c195f9572eb9134d2616be85b4101ad3b5ca7f2314a061208238e8c22a3dfa4173da8aaae5923875776bc782b0e84c8ca1633e701b16a6a6f0847e99c28a1a6
-  b0825885c0dc76dd2aacf86bb662d6db400d76247c7071b2920f3c0543e6bea6c4d9752aa42abeb02b25195160eb727dce949be2dbd6493b5e4de6afb738f227
-  2e27aebb49e6c4ca3360dd53e240ac03e307442a26690c37e09e185a02531a13077181417bbf64580062820d67cbc5a8d87d297accb2410c85a00655bb74a359
-  e77b3060eddda40956dd6cebc56d2c754e9f9132afe346cbaba4b9f0df33b799c357a61d65cd8d469ae52df1419fbe31e35226c342a43ebbdd1ca09913d733fb
-  5deefc36b86a2bb20804a506df208d5ef87675dcc82b3f2faaa39ca08eb5ae2793a15aff61da7328234f75c67c3aff3c5a56e5cdabcc5e6b7c2225405b9967e1
-  7216d29fb344b7e1ad373cb41f3926a52e6fb7a3ba1313c3b9918ca7e8001d7b285d40d1ca0d06cf38cc29f8d16aabd28dbbdd7cb4270eff4a5357a60bcada11
-  ffbe8caf8b7c38dfe760d7007f9da9cff78c59814572a2bc3f3dbe41b00abae91d1aae54661e19ec5c836b13ae752bdbbda09691485e6f7546335435207f0c51
-  9213b4b91a1849bc1d659bfe97d78ac936204a7b68aaa4294840867950f59276a792b00f278ea2bf078b80ee187a26d1ad94be34beb609f0f321fa102b5c8902
-  4d4c267991aba194aef7fbcba6e4212e095aaf99b7b21255dc3faf770685effb7284eb75d6dec41be685f694736f101a15e7c6a09c877444c73b0c9ecf523a01
-  cf9e06f616d181894f6731587e917fa7b12f2dd89bd388dbfc3ee263595239908be36dc076b448932bd27a58f5fc95c5b8f39d53c0b487973976f036a660e9c3
-  504778df4dc2b19afe617ce506eefc6440931fcaa3f1637f1bbaa43fcc5b1f480d3e5223a3b0a3570dc73b08d6c2b77474b65b90ce9e706d4114431d53293a9e
-  92361116e3faaa39a93ca33e190a3ffb40eefe028ad30feaf2cd62517a4337af74bfebd00a7e0f8ee3dfc9e1b6d9fb69d26c360e4c80edc193c7bcbcbabd86f2
-  3a7ff8e5213d88727ea15fb63ebdbb6c1c53da18b203895f4ec4b4d42b8ce163eeba94c2cbe68407fabbd1290048c75ce8fac91d379d11e5357b0a0908e2da86
-  6db783b5581ebfddea5d3e27e0ac081f216252711a9ad1f0c88a78ca79bd7c0a76e21b28aec745052cd210e6282670824640b67016822cc312a508052347453b
-  d6cad457fbe801e0469dad7760f3dc434b09ae44f703d60e96dbe8882a9fce001d5ebfb5b86154eaddc898c57bd36ce540be5505f9dd67872ecdcf5a378bddbb
-  08a4893fb4cc059ddf4407e5989a21cd47efc4cbb49248b92638d39a5833f7a61c22d38a3c63a744417342f2a1cfe42615202bc19f4aa10c31e6efc3e757fa7c
-  610cca4845f8f7a8e4a5401a5247677d953d60ba9d936fde6d796f59ce545c103a229ff15c5511041fa7b6883ed622b5a0576f92bee9b668982bda191a748f12
-  5228910ca879655c32ccd6e87ebcaceaff34f370517f6f4dc02f9d34a724d0243a0a4512549bab3f6c9da296c527e73f30274f57fb35187aa76475166137e9f4
-  be389439dff009413c5bac5bc2a9b3ec98aafb9ed5be2c1429d8a528f9dcf9906f33f2f695d70f84e9940312a7e06c90bc9f8071ecb2bdd697bd7d6e7d69cc31
-  4d0fa955007c5ed6b3ab45da487bc569e0ee7e50d270ead3dea69e8e98b4f8fc105dc1e5876c2c1d35c1f5be97a48f013af3893214ecd1ac75f8c50d6db12446
-  4b2cb88b781c320b1230d65b41dcfbdb7120e2fc3acb30e679f7c143cacc293e07bf5d4e1c32910e9dd5952b17a8fb24d312a12553e7d7b99636c40d26d004ea
-  2ea6935fb9b9f24f901f34f6ad9982c8f523247992244b2f2cbc82a4558e73e9a401a6ceaa0b7d49b1b96c52ff145c1698d8e032bc5ecd81c313c7fc5d299224
-  d73c522a334c79ec68f5d3609d04585c0796d257435c9ae2ac19c5bca57c153b8fc45c045ab3fb3c26b2110eb9e1fd169edd6c67d6762a30b13b7bbe8bc00d79
-  709f86b5bae1a2d20ea78a35b84c4b60825090769bb0797c4958362d4c593e796a651801f3f52e2e8eb74f541945ad216f4f91ed633ed0d714fa4b13c88ab11f
-  0d6b27fcb5d9bf936215a4736877a605dd7279c9c3e4a30dd359acb373cc8413130855393e00e44f2465da980c5e18003f8b9c383e4fe24550234b06830e92e4
-  aec647729bff73a8f4a645d5a058ac65d106346023535197c13042e832f40f3e7c716b6c0f5ffc5071efe8a70138db5cf1edd36ab871d2b4d62729c151485d17
-  66fff3d844cf19dd606c87b21d61ca5b708693177e2e07b7496443b046c689db3670796f9979eb8e1705562f7912c9b0b55e588e5487184af88bbb4576db1dd6
-  02edefb82f8c80050bea8c34244b9475c56ee27331afa3660cb1c287b5e458bc497803fb0551f349490f8306a9484714d3e37202b65bae69b6193db3a338f39b
-  374015d62bd5e739438bd4d6946991448b545719be2b577e70efd1bae44d80ae05f164b234ba7dbc9908645d8d09882b51bd4576e2b787a1738e1da1c8da37c7
-  b7a9f867c1fa8d6867f23bdbc3cce2bc5de5524ed62197af58c64de79ada49daad7395c54795d588fdf48ea390c065c2648aa5f745072b58b16d8381e0c2c4fb
-  02113a07a1b326b961f3ffddbe8e5be7504d6d653ae5a9e1a0391c2f6f047cd59e783e257db717b6d31191b6c0516db61b3e729d9710b594d6cdd0a9cc396365
-  86840368f447eeb82ada6194ccab18cba8a293fa4803303041bff22d8639bba0099a1bdf93dd7b027ab91c675a42c02ccf6ba299986f1aa5f62b3fc5a6cc8745
-  16c08ab4088c44b3b09dd021c19669156da99e7a578bb91543ccd9a4d60a3a5d66d57b75f23b4c26c40924a2c52f9a73d02b61db1aae039701c3b881575265f3
-  e3c33cffe8e88bde6b6a1108de40809b2dc6ee8d9b861fed38d98389410d65856f84b8e225695283e8d53570147a2d12bfc9875a527b9e2f383249091712f5ea
-  29dfcc4f4eb455eab8eee90ee1fda258fb24b0679d73ac6b63085e48795c7218ac941e73c9dd691105e63907f8b5cd6aa067628d45b6d4a8c19e829f1ef28ca2
-  ced0dbdfd1f5685811c8984b8eaab67698eeec134d34852b8e64f62e426ddac5c0c2d6130ec14d4c0d374d5333b5376aefa256befc98bee77daff64fd7d0ecaf
-  c49242218db2c982182ead1ce91b72ad8e315a1dff8a327185cb2718eb27cd5381b9801e9bd287cf82a191d5618e434491246404a9801da95d37e0702730771e
-  44fdd428b0eaab6a6c879c940fd499d49a184b6e11fe73eb23534a7f6e069d7535c43b6364e17398e75b8fa420edb50efb2cd9e6321759171ad944d37c4297be
-  2f02da6626bb6f2b39c33ba761048a3219b11a7a1e0012e28e6b99eda194a12e467443716a5f3e3590d764cf96912d782fa2013f18c15df0694d58c380dfb665
-  9223386933582dbff20c40f84f6a7c60d86f3015de7a66f2119a616dc8a1ea1f148d7b726167dac72fed4742ff0d9ebe02660e99d22fceb59d557e718c35b3c9
-  1af17d2d25db68d4876f25e4d624d28f7ee83517fd3e8aa1e404b4eba82b8e6c9fe25ecf62593c737260ea969089c9be9ac111cdca45a8f32a10d88c4d76dd01
-  e8735e914db6707014a9e23cbde156862f113f9d6c83f1480b34235830e73dc1efddfba3c8eb692d3ec081de7c07bda6d467203498b4301a22c440a71094df4c
-  ac7ed3ecea34d585d1d66e00f84d946f676aadc5987596f324a51f72a55253c665577ff88f7d197640d33c721331e60b721c386018e87cdbc287461f74b5e3aa
-  ca8bf664228145b559e7032f225f585cc8cd606c53d81dee79f748e6197a42c58f0587a1d21ba282cccd4836b336d92efabfde8e523f4ef3298d40a0bb7c95cb
-  f40dcdbc6fd7bddac1a216af6796fae520a799863d559f57aecc2c6fae880ff8cdb6630ffc6672cd54c270b1a2e246d98b352437a752910199938b4a0ba38c0a
-  92e4a6140e0079dfd6f733a203e802174958829b40d46c5117c46fa9d278ae2acb5a51103486557b7ca09dcc3c432150b98963c8f4522d4cf75ecba7ae481eca
-  9a8f364eaa8fbaa241867bd85677b0258d39cefadbdce9bc09a34420392dfa7f1feceb56558a11666b7e9136dc420881c21705acc793bb98d2dc7858902c3e1c
-  edef438984bda3cfb48a5bb33e00613465c9eb51308eb2b77809d09d40fc9fd606e1f41fb5acb6381991e51d42d789efd278e3c7dfdeae03418700c4501af1b5
-  a21dc8a5c0bf621be61a612fad44d02bdda488e3eea528f54cf799430926d3ce3caff36b7a7ce5ae622ab4c8b5a1d93420ae01b646feeb41995dd0e6f6f1cda1
-  2f0d5222de35c08bc9197e8c89b1b0052164284207e390abaf436744badb77a3afa0832342649bcb4b94372a60f6deffae97fc486e4a84916e4a4630dd22b7e7
-  10b76868670c74b8a761189c410f1c174dd85b4f76b00aa7bdd497959dc4f584f2f6c5736cfb17f08ed8e6e27db6f82a206badc58653ecc7f765e2a27771651a
-  f4d1de91f617b2b72eb251b700bc54cf101d31a6b7c28cbf8f69f5f409e0e9b25b1aa1e1e349002a5af899edf28c6d36a16000de41f57f2a1fddd2d1ae45fb91
-  bf6a9f5e7360d9b79f03ce79734d9814167d96443c59eec479deba6fb7cb78beff323873c166ec99f1256d3768c1740b37d1cb5c531a2eadbe5eb9988925ad4e
-  e7157b16a6f5524ce1637d5f7e0136949f0cbcb4eec53264863a91388750a202548df27abf5b64a63697c12161e832fc3f1e8ffb4d06b05e22e131d06bb2c579
-  66fd746eb5e2b0ebd05d3d0c645498d149217927ef058da118e558a22bdc1f5e8e3edcbb0dba92dfc2a6443eea25a1ca35a41d1535172dd00d140de9f9976944
-  738a5529a9b6a386f8fa49f2a08b17d63589eee3d3384644988f384dfa758963afc93b019fe0811997464531b23f7351b22ff39b9087e5c173b324174c70f5c5
-  f3e1825879a37d561aa9c460b4b405225048f20b782a14ead6287eb62cd273ea72aee046d50e34c3af43e59bcf9449e801399a41fd8f42dde05c48c419971ff3
-  e26985e1443beb7f403a0cd68b1b751cfbfc66a4e467d50f69a1aaa39179b71291a421ae28d7e13c5d38a9606db63adcb256e1ff9529cdd53cb25d0bf2826384
-  27cc10d779d20d526b98bcb3cf6b7e355735f29ba2ab67579919989067a816e7aa6668f9f995f04e7da3f0e14f0e3a7f9bcb74e4e321cfddd83c947a7ba8c882
-  81462218ca3e24ad703435fbc762041dc3060719d4846d1264a678ef4bfb29dc88ba6fd80da6352942dd24a8c466f731b5fb42bea04b3a07af29f2bdd1e0a265
-  2e3a4b33fcdc65f6b9482ee0f8dd4baa7b3323634725df3414ab2273dcc71e0b004d0a5fd24019873d23af39687354f60d1cb2255dd74307eec4f356ed84ec91
-  187871334a815b1084ad3ff0ba328ded8573a987878cb22d8546e181fa9ebc683288a352389ce4c7fd715537c400f877488570e3c3a6e7232b77ca94aeec5546
-  cf33b1f63013d1fabba6868178f77075340fa946a03f0d936ec1fdfdfdfb58a4c59d21e2b8a8a0663306d05747220e951f17d5526ef6acd872e70c7c4084c18e
-  c18524862e76289187aa5e541ec11b3632ecf410c247d99aa6e29f73b5038b32e96ac8a6b8ac45671220ecff5c1d7837570dac4e65337e8e18b0e0938b6b8dfb
-  23ac9a28661a9befff8410b15cd1a1d935ab0325f0f7c96ac363e8561c0142d9fb912bcaf75b6983fb3c705160ec2eaa44c3f19bd950bcd25c4d9e94f3f707ba
-  bacabefa1703d0444087e86aff908ac4768a4c07ebdc51fc0f80b417850001bf90561473f316a1d2de6e4a68c92f59876218bf29fcacd84da793a90dcfeb5482
-  7edbfde7bd76cf23c68520b0fef9de128c5dee9a19d3adc291aea0695754470368dade75092a5d476a4ca18ce907efac0f3d567b62b1b65c6711f013c5ecb6de
-  04b2e1f09af6983905aaf8538333e4f42d4df856e2c9e6aa14c728ee2d6336f567734129e9a5aca1818f778d3ac81a2d5f0e0129024a77644f9a4318bc59e8a7
-  9d24a29788491eca45b893210e53eecb5eef326e8c9e9d0bc72a29dc2e9a9a369ee910759bf49f50d8d592a6bcf667ab325aa6523628e4358b1543cad5b81c5b
-  9f2c1975b5bfbad8348de2d64f453828b6e38747ecd172a902093cbad8846d96b0d43368b28437ec96516517e8091e60564dd9e264218a4e9e6add83672692b4
-  32d9b993a5453fcb2ee64d853fdde16ddcb1589a393e56dec3de03481bc19f67e2c73d76bcbfea26864d90dd127091aaa8e278f114b8a0026ee59662a3fce83d
-  fdf828e81d039bb35d497aff8a1770beafb91f3a9c53ecbbb6fda672b989648731640a876f7f134fb0956c65129b1923712d363d42f08a54288f0c75bfc57dff
-)
+sha512sums=('b6ddcf75c0ff8c542851be45147dfe22c1a73c5e4dd59ce6543d5a3e7bba70be3576bd280cbe53f479bfdf5c3839561484b0f9e93ca061bae9ff25990a7e899b'
+            'ccbc42363a5c0927404175d1d2abd1a039582789464e3533ea018055594522d25bb78cddb587c3d97f6747683e57a3f8ef387352756574f70aeef007bdb48e43'
+            '102c77a69adee2132e063a8d831cc0876b184100a36cd2a8a34be80cdbd4c9a5db2490d01b0329725fe4077b8be71c684f57fb71131bec35a1d2bc06570d09bd'
+            '0c6852c488ae71bf84b0cf09e605aaa6d465f67a81fbe6a0a608a63c413d2574b059e8596fbd3476b4c247246ef0600eaee9e5e514c5beea5306ed94d685111a'
+            '78eaed8c944ddf9ed2eed1165f2d55da4835aa31dd9e541017b528ee065f01907ac2538e7c2995ae7df9878c4395659431ac6ebcb63eec06f1dab0aa654b6f2c'
+            '56f5764051f9d2b1d6501d0c55953252359722fdef3364925275d890ac0eaec64c7d3f5ab674591217113f67041b6558dbec7448a172ee1a3d0e6728dc82e6dc'
+            '35c3c2bf8df1821fe7e88d3a25e1d05780c3376349c6d2ef5102016bc8f3dd5b474dbdff567f8eb81f01e9ead80ea251d8d0a97c1eaf378e8182d499e4163d1b'
+            '1ec2afe2877cd6237bec7edc9474d9f53410fe6bc401e5f22c8fe1545b3349ce2d273c8b926fe2e49d742a366d520d494b09a29b8103194ef43f255ab5c72cf1'
+            '16e7e18ed3a549767128e88edce8bc5510e609e61c016b7ae472cd292129f1a97a9bab6d71c85acb2a8999ae69ae00cdf74d7b0661062f843c693fcfb3c61cf3'
+            'f06e6d5a54ff1e02bb8ade7b52f229e1fc686b3e783f8409563698293bc97431b08c28fc33490617a6e97187f0bd25297ab41339cd55a6db5d419b912f110742'
+            '2132a6609004ae4362819d4a32c9db64edc94b5fad6902bf6c0a91e8c77828d028fd2444c7173ba5e35b2925e34d6914d788b9f2572f07c71605a21ed6f3e2d6'
+            'c6a43b119d720784d4757ff10e21d161689fd538869bdc28af161a244eee602aba9ed5089a8f3ccbdcd2339e756543f3f636adc235a0a1136edc144ddfccc045'
+            '73b332b86150b3acb163b7e438e4fd84fadddfa284619bd4664ce235d3979a2ad548f56b31a60af45b5005b6eef58d3177b9d343f829ff630dc7c892d73069c7'
+            '30ee0d37261826727003292434f94606d83f56933ff45a78e26160c32fb360752ca3a46a225b63e46f6091a7f4be7bc8ccce01e4af6d03e3d955e107df3dc192'
+            '36bf0085d7e1751a3845afffbc48bdfe97fee324ad373a24515e2278e9863f1fccead5cfd3dcc4257c68a6ee571f74b5d564496a7c859e8d2708db4f3dbc0e2c'
+            '79315feb9f32c6ef2b879902db479f9641ccace17f4aecc2d8e60d2758cddb739aecc1cedc168361ca5013afcbc65552227861c9890da6fefc52578bfa071f02'
+            'f092ce7de320fa4197039c727471b3485ecb58b21789e17d91f78c00eb294f5d59cc30d9c12dde56f1423517a2dd0d376ccdecd4a20f6ee429bc8d68abe6c58c'
+            'ac64bd3ef7d8bbc34a75d8769f7d167367913dcd48037344f4bd1664a20d0d957da5b4259f14c1bb1039e1700fcd911ebd363db51d77a058af97f319f3cf37af'
+            '762b19770395840066d7ed7a783737ae2b7441acda2b81a43ee660dc73f349016c5c0d76eedd7770179adc98855e9f8c4fc7c07f34aa226a6c0ac873bb2c9199'
+            '4eada162fd7356a75463d6a3f6e9a85348f578152be7ba8ebc7f720c89441be1c5cf1d1ecb87bac07fb5d58d144a62d89610f01e76fdac960e6452ad14b48640'
+            'd9004ddf736a599791516bda109641dc73f3c0cd75c57f4dc0f4eb38af7edd4c43cd679affdd787ce90c620eedeee4d4b57daf566ff45abe5296711bdbd361ef'
+            '28b64dcec6f5b80962c40e3ab24dd9e025292824e77421db415022619d1e93f59ef4e3bebf2d99aafffb7dded9d50b0a8828368dea1fd349cffac870293d547f'
+            'f9a0a0528f9e9eada477b9025b5ada3b331dccb9b813b8d6de8795888f8c2ba5ca83224b66c7bbc6b628bc5ddce412d02fdce13bb02cebd0368ed326fd985455'
+            '2eb64ec09e717c2bcff31972879cf5f4f38bedfd6c7e104c9f60c6112a0b66ca0b2a8bfb6e1fb8b0b917dd742e6a0294c7e63d950396938880fa2a08780028fe'
+            'de39689bcaaaad0d091cb629c8ffcc3d547e38cc18803a523e4dfd19261a73369d05dc516f9fd070416656f0b8525b2167a1a91e1f52dee566afbbde67546dad'
+            '5710bd570db458d7f380d1ef67f6916ae8b5aa168fef6148f8c9939eb0cf891d7c231baf7b82d3a929100ecdfb41f1697463493279d85782ae20ae8e1f723f27'
+            'dc81b95d5c0288b7b18f6b83385b5841f53be315d00283f7bbbda10546ddd1c6da8962cbcd17cdad596b80792430b9e370bd7504396148e9f3b7ecf6b67a3fb8'
+            'f99bf5afe15f8160c013aa61e117480962b41e3f07558479949e47a78deddd30e5edab92fbb95fe9fc5691cc758e4cd677db77438169db9b728ec859d0ea9be9'
+            '3876d605a77ba69a5c465b323af11bf465b5d3018a73d9abe3967d2efb581db44cdcfc1c3882b057f0341ff2c4a0f4a47644d621dbb82600d971b9fadc308c07'
+            'eb6a2f1c3cec49b87d3589d30e47fba7f5bb7988a9fea9c453c001a0b6b7efaab537eeb775beaf9340836a505141654f908880b2b87d017c3ea10df270e2bb08'
+            '15b55e38071b055b415a35ea6b01d62967e716f05a77d3cf0ca4579526705d8d95418517c62629a2c8bf2a4d4bd164bb562053bd062920327c7f46d6ecadb258'
+            'baf7e9d95af4a10460c2181b0e061477d19dcbd1f7ea07fcf57826663fd4bf289a44870f9f1e0b87491bbdf8c98e9c8cffc1166fbd85738e81fabca5ae2cbde1'
+            '63195a49b46a36281bcc8929bf60330bf71e0df573bcb84e88168785131f2a686d92a5d4cf0dbceeca8b98ad8b965614db519775ebb4201fb36d21aa63740acd'
+            '799c78a46d3e0f680530512296af06566c478b39036f5368db4f1dbafd03753e22b8db787fc8f10e0956406fb2af20d235e4a2db230231c7523bc10a9d0eb608'
+            '06ce49ad0b1ea766e5d9b4098977cb98d9b07501ead5288c943bd4aa394300f9d7c540000b8b6501dac70aa0f07a0f34c12ef405e98d193a8ccd4fdfddaf0c76'
+            'b4295f5c8018852ef99b704d976c72c0d6b1a1296a88ea8aa5a20afc2612ad5f6e7cafc78fef1b5efcc3a09a11a8f929fbdfa5f927fdfd1a237786ee23ea0890'
+            '41af25a045833fad8a2df8682466ea39278e71b560e356557ab8b5aace8cb7294e7e8eb868ba817b5027ce86badeb53caeab4ad615fc9d6836bdaa8ddacf589a'
+            '6b86ed5850f0af5a8ab3e982d8e568b49eec7b0ea636793d83fbbd2da49e66ff42be3a4ba03da79c04b091dfb966c366a73683bf7f12dd6a87875b0137c781a5'
+            '7e244e0b924a6ec524a4a8aa8f100785ba2e7a9a76d879b44ba7ad0cc21bd28669099203e81c68ad205bb9a62e384178a2008a8bc2b81133589fe103d924e4a8'
+            '55f1bb499e89c8668674534a0b5455d7035ecf190030cb244c3e7ed5fa30dda362bf162aa888d224fe8bfe6a2dac1bdb5fa37208b6613795bb0f6e1c7f328f9e'
+            '613fe8e67dff63acb99648b16c364df9ac9cd1000a694d4500dc3fa82ffa40a32664ec6af0ace72527358c54793819758f9db34864737dd24f568eecacc9d034'
+            'ef1f0f6c581a241d9641cfde319e3c827e6192b24848f32729b46d042d81c5d38b63c390dd9f6de07b022a2af44675699304426d223facec574310f49310f3fa'
+            'bf83bdbf27fa98b9b2bd6e1975c2c9ed978cccf20e30e0bebce7db9f0175ef7e64826ec04eb156d3608514b238e42a48c02094404c49b3cd8d6e225bb7ac9289'
+            '30590eb19cf6b3bc91211054bac3b59b211c4f24985643ec441a62346b56964b3f3509d8c814345be812ad424b47d5feca29e904fda54f1ac0f41f38781c7484'
+            '089eefd02e48b87912e4f7ca6f59f202a4f70809b6dcaffdd626e01454788a1190c89529e6952b3b53738f1c33c6888ca696b0039f0fd2bf041c78fb20864c52'
+            'f542e6664dd496c02c0ed31ffcae98961a0b5eb09fb6253c0342161753e35b2abaa1d63da30b7b46ad76d1daa75b234e6d960725cc105f9ad5aa4952f0848411'
+            'f8345f06193913910530709a7c2f0db346bbcd8d61ab284cb148f0d79957a02a63cba29255eb9c07f8b0b78b509bc182c2e6621926c6e1ba2bc7d22b689b8823'
+            '0138d8102177e49810a7c870f642f00d967f50b6c67fb19031ab738a345bf54cf6d4301156a1e3848e301105ec5a23a3e8a086660a56b947da5fe49c0482de9d'
+            'eb6b299e8d449d8ee9b55737e6c8544a047fb6fe3712ee7af5ab170ebd2511fd68783f26e053dcbfc6b3e5499d49d0e5e40751b3d666eddf2d522fea52515449'
+            '3f3affc89f9882c551458fe7a1d6ceb88c3d306e6ea33d374330bd68e797210fd57c58a144c150c22bc9ba5d4d0a072e3547720990a46d511dd39582d3144256'
+            'e74551b7a0b983556dc0d6abc1cba0249592db640c1ebc1ca85fe16581c9270be164e0f03b6597b2442ffb25debc5fb5c9cbe2cfd4b496ef7aaab3b392a90af4'
+            '296953b90b1b0e997d6f26261895c41124f3994a324639631757ad4f929b90484d339d7c39b2bd61162962aa711a8fc3106e39d894484bc2c1a9aaa19d1ca527'
+            '2953a1e268b6daa5c975ae474c699d5d666e4038bf9c9ac9bc43cbcba8595d6ae2b9d7ee276dd5e7b8e5aa28748266881ab08cab6b7b82f0300544d9db41fad0'
+            '4db9a7557de060401e983bcb941c82de24d28a52735060b0d0635f74fd03691d50917911a0d37361155e8d046b4f1276b4572aa5f5ab1d93b8e427562cf8c5c3'
+            'f741090c6ceb77dd32c3e2f7ed3bb333404aa1baa3403c9ed2555ae460af2a35aee8bf78bcf0df6ab2e62c7fbe8994c99b3701a7686201a6b0aeb8759480f0ce'
+            '14dc9e7baea0e6a69c1c2eb4fe40d6e73176240e5188966a8e71e9f443c4a1314785b83725bf95138751d21f0c5528af485dd91e82a70e3247e031796cc9f674'
+            '9339f2dd572e4856d83d58cf430fccdb7402726ce8aad598bdae4dea5c44fab85fcb8a6e4662ffb291aba5239fa897ae7b2175d43c3924d9b655ab4aa07a5c12'
+            'b6ecce0111f7f19f66dbb5272642a1cb49ca86ad66986d8068d6f7ec57daca37fb4bf21091eb571369a9c13b2ad362c9268fb57ed746a4965ed3f1c2ceee0b7f'
+            'ccac4efb9f646991ae8edbc629286a443ace2526505de8940f1c689aa03e774b95354710c5cfc4437b05061f33e196f99deea9b9a4097bffe659fc44e81905db'
+            '6bf2e0a8184dda096e4756010854abe678716da2e67f305a74ee781f2fa530f131b69cdc0ad028d73de74af47a0c63d8dccd150d7f5c62c0fda117898667e8fc'
+            '3447315c1301eb5cfaf9b5ff2182b8ec59028edee886dc0d746d38d9118a8bbb12496c4c7b8ed0105b825a305357d69378c9ed81c219146a5369426af51bc89d'
+            'b642f47cf12951b471eb88a827b446b93bd5be2e4f48f79f063c158330e571c364ed99e9db52aa46c3fa4bf05ddd4a453c170251e78ffefc0231df8226b54fab'
+            '52627d61d3fddb87bbc9bd0ff9285c7a9e02dce5b581900b81b67da3e29c5348d27c39e617955d67429c2463f390aa7e1517f1c169c99968e165b95c4c1cd788'
+            '2106e376a6489d8f3c7ac8de416629c358700b2211003ed62304b9c807abf2874ef0fc302a2ddc365b78eeaaf96e18efdb2638df53d0bb17cb25547754001315'
+            '94602a30a47096ad5b513db79e0ff6f9ae772ce1615fe7a96b59bf5167ae9f51b062939318b07fe4112f61d21ddadd63403c501f28e6b05972b57e7bd6d1fc3d'
+            '8f00a33b2e4e3ca4e3b8ef2bf570b235c1adb9bafcff72e57075ac23d7bfb3c4251b789ff297c1db26c67cae9b5450deefaa1e29be5f800fb83556757e739aee'
+            '20e960e0f63b47edc11ab3dc7821148e87ddbe2862dcce88d6683c2a029d898d37f222aec0f0a74437d722eaca969735268c361e6f3fd1ea0abb20b648216ac3'
+            '7120185e1bd4651a9ea04b6df44a38a06983673289fd730b0bb01cd5e5421157f000b6fbaace5108bf27f3f481abdb25ae37cce429a4903343b1d4d7d26fc89f'
+            'd019d132fbccd949e3c3d1431af404c91a70f2e1ab8453d2c4d181d296a6c1e04faf33c8a40817214b3942e49362c213ddc0ef27ca28abe0a5207cf38c8f0cae'
+            '6043baa68dd7416d58a05f79dff945d686e43ecbcc6887d095b726863fcecd82ca44c443eb7418271a94d2500a6a7be3986be0845004faa7019ce85c78fbdc46'
+            'eda161269a3d765e8f7c459c801a614b18a0cec532fdd6adf39b8dceef4ab300302e89ee124369416117e87aa5c2702828ccd629703477cc8b43695ea60d3a25'
+            '120a98b28b14c4c3ebb65686a0e80b1c9055bf0b800c09b7abfb7a55b69040ecd582e068eb0330509bdd7b50ae1c4a2cad1497a9948104185903145e849cafe4'
+            'a53fc721cdb2359b353e118ed063a4450b9bac414e50c75229f805eeefabf50ba56e6750f7d8785e1a44305c1cb65937ce4807fbdc9b39fa190ee76212fcf83c'
+            'f10d6cfbebdaaf03147584a87d0d5a08e77b0708528b4936f1dfdd5a3b0586fc011ed55e79d3c9f852c8812f64f4bef4b44b4732bbdac91657f1b929041b008a'
+            '382aa46e2063d13cf0def1dbf3d975b7e46e5aa752549ed2a705b445c77e8cb2788c1a457bb6eb498b2b5c712d0ef577b83970dd366e6a0301c1406bd3bd453c'
+            '4e827413807cd1a751bd60cbf4f77b289883e88a4c76414ba6467dbc9c7b34397f2c8b2468b6ded8f96328d8fb5e3db022e14957329cb345c17ac80eee446196'
+            '59df71086abd10f71a2a90bb4fbcca16bb7d397c437d1fa3d30f8b20aa79aa4ce7373e57b7c0985356069e196106398a9084a0261d13bfc2d7361a62653e7d78'
+            'efe0bd64ad3b65a9371b11c7c8f7fd49fd64cabfc4a8c920f49da620bb96f4f884c7ff608d45df8e02c59050e7305d8746f3293720a22ff9dd5d42768a2b7c65'
+            'b9c5bc90c92aa09ebdc9755111ac77f823b1f25f329d68549731d24ad04aa748fcb721bee88827f98b90f4337e934cfd01be7a8f1b61f8b2d7c5e8ee99b33ca2'
+            'b0a10a75106b1932d0c9bbbde06410951758685693dfafe761c3460976a702b26739ca954c09983b9d00e89aa93ded4f3d9894640d0706902c15f626211185b5'
+            '3a5ae6dd61c11076bd4306a2a46215eef72398d6408bdad2d1df5544ba221820ed761ab4e070f7a04283b38489e9b59432857b24c8ec6b3fd963658dfe7ca37f'
+            '162ea29214d4a08861fcf1ac01ac1b3502947f93d8b7b15f1b547ad966b7394089731224b5cdab0351a63165673b60ca3b66af7051ce4ac3e6851e146e1c1390'
+            '52239d8a7eb7af80401399510cbc4988131ad2aecf1fe0990498e5e0c6e1002e95b36fc8b94463661083348c2967548983ad47ce6cc4081a39394f27478433c4'
+            '965ed8801d5c857f90734837afe9d9d8f4931dc1eafe7bdbcf5c73d003d00e9d9175970cfdf62acc325bd93229dfae276b6b2481b48ab2198aca4a5d701bf5e6'
+            'cd49326639793d6fd115ddd61d38606575d11bab6c6a9c123800d924e5e720ce9a102ee0bd8d3d3e9ee1a0700da1b5c9058760dce9b9c752cf19bc93e5137a7a'
+            'f93bc631c340ea0211ad66cf270cc749a4b5f771d7b4445cf17544c0274cb75ddfe9529ac33f9e2d0103604e6102b88445c725d5753b5634fabb5cfb1a5be7b9'
+            'ed99a68bc4d59376c292cddacd7666de7e622e1a1737fa0d560d186e07f196139416f44c9ae8aca4823d9251d98327acfc2dd9f7e2ac88884f6ca517b86940fa'
+            '220fa866daa4a691d8f785be4744dd7efa0f1fd96456cd64d3958afaf7d201028d11dca313a7943cc11098606be6dfb1b202d5f0e453868f71e1e17d7fa68905'
+            '2ba9cd3a40ce4fba8cbb09ccd09ca0f1ec1170927c7c019349620c047a852ef1c9acba06894c81b177a150d4f2429d048a48c79a132c17b2a66a52dc44f0b876')
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 3d2655917..0721a71f2 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -14,7 +14,7 @@ _pgo=false
 
 pkgname=icecat
 pkgver=24.0
-pkgrel=2
+pkgrel=3
 pkgdesc='GNU IceCat, the standalone web browser based on Mozilla Firefox.'
 arch=(i686 x86_64 mips64el)
 license=(MPL GPL LGPL)
@@ -54,7 +54,7 @@ md5sums=(
   b41f82994fa056ffa5f8e6d99570e27a
   b30ba2b5562558d510fdd09d626d0faa
   64826fcf48816b13090042eefddbaa58
-  2c48d9feffb909df35b552f9c5c555d5
+  1dfa11e781950a969205e83840e9741e
   6e335a517c68488941340ee1c23f97b0
   #c8552d030494443218d88792f4dbbd0f
 )
diff --git a/libre/icecat/vendor.js b/libre/icecat/vendor.js
index 151140b8f..3d93cec01 100644
--- a/libre/icecat/vendor.js
+++ b/libre/icecat/vendor.js
@@ -8,9 +8,5 @@ pref("browser.shell.checkDefaultBrowser", false);
 pref("extensions.autoDisableScopes", 11);
 pref("extensions.shownSelectionUI", true);
 
-// Make sure that safebrowsing is disabled
-pref("browser.safebrowsing.enabled", false);
-pref("browser.safebrowsing.malware.enabled", false);
-
-// Enable gstreamer support
-pref("media.gstreamer.enabled", true);
+// Disable Social API
+pref("social.remote-install.enabled", false);
diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD
index 0698ac098..58645651d 100644
--- a/libre/icedove-l10n/PKGBUILD
+++ b/libre/icedove-l10n/PKGBUILD
@@ -3,8 +3,8 @@
 
 pkgbase=icedove-l10n
 epoch=1
-_pkgver=17.0.9esr
-pkgver=17.0.9.deb2
+_pkgver=24.0
+pkgver=24.0.deb1
 
 _langpacks=(ar ast be bg bn-BD br ca cs da de el en-GB en-US es-AR es-ES et eu fi fr fy-NL ga-IE gd gl he hr hu hy-AM id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW)
 
@@ -15,7 +15,7 @@ pkgname=($(for lang in ${_langpacks[@]}
 pkgrel=1
 pkgdesc="Language packs for Debian Icedove."
 arch=('any')
-url="http://packages.debian.org/sid/icedove"
+url="http://packages.debian.org/experimental/icedove"
 license=('MPL' 'GPL')
 depends=("icedove-libre>=$epoch:$pkgver")
 makedepends=('unzip' 'zip')
@@ -65,58 +65,58 @@ done
 
 md5sums=('d5b2567a8cc8f64591f313a6efdaaffc'
          'f3719964e893c1002b7a923e8f95f923'
-         'cc32b8aa30e0e54fcea11b76a9a030f4'
-         'a18431241d61f6f517c1b8c3d8ce884f'
-         '28b6143d9dea47b9bd89453fea455457'
-         'e1139e6b943a02af2be130f66db99390'
-         '6c446ab3cfc39b1b177f0b7c4558ffd6'
-         'f6a88413d68fff4451fb675586539705'
-         '8e77e2d1236ee08c690edd6617bc61ec'
-         '7a5748c07c863745540e4dc48773bdfe'
-         'fabe0a051dfedeee5b7301ae1f886aa2'
-         '171068c63cb0819a5c8769d92a713c6e'
-         '64d5d905bba39a9c857e16e2deed8d92'
-         '41a11fedd4f0721c7dfa7b4f294c4578'
-         '8a23d4d6616428292c9edf432e747543'
-         '41aa0520d62b7f257938bae83a3fc72b'
-         '2b1f30b215838a256a15eb87f93825a8'
-         '1c125ec400fa3d9de88cf6a775f5deae'
-         'd85151b34d12e265f3df28dfbc78dd1b'
-         '0ab58f3f0ee604e1af3dc5c16b0c2ea0'
-         'e7a3d71e609efcefe71c57b7890fb37c'
-         '166efd822691c91a722d53e8e9c6d7a8'
-         'f7837a358208e6720f18e9858478915a'
-         '58b38fd78be414cf4d10c2ac6dfd128c'
-         'aceb524b1e843668405b762ee7258756'
-         '2dfc7c8760aa197efe662a389614e284'
-         '5886ef068a1b73bfd7d8c3c2628d8674'
-         'ab535a80c409fd0b4b732fdb79f525ad'
-         '12dd37921eedcd2c9e5a4484315bed6d'
-         '0766135b41053a1b168b8a5d2b865025'
-         'fb61057edad48f619a4943d7033ea4ac'
-         'e7eb605e77a7dcf2093c78fee22432a8'
-         'ac3455b559e3be6bba9b801e54fba4a6'
-         '1ab817dd1e0b2a20c7b95b3821626e4b'
-         '239a2ce9ada5bee297a3abc5d382fbc0'
-         '5159ca357d344d48e4a1ed7f5d0c6148'
-         'b260be89e9ae689a2285995541055f06'
-         'fe3a462afcb4a9e0a4228f0f5a894790'
-         'e775993988b93497c062c0e0b5cf8c5e'
-         '67fec92b3bdaa8267467e96cde7145e1'
-         '36d0044c7e1808bc80fb7aa27c37f540'
-         'fcea0c7480719cf77b7d38a23114ac25'
-         '205bd5873fcb142b3c3828a8a6bbe4f9'
-         'e82f9a3ef19ec74d235c71d4162bef28'
-         'e38119f6bfc43aec4016120c970fa1eb'
-         '9e89b3c89bc8f6e4dd1c80e25591b634'
-         'af4688e2617a18410165da9474de7fdc'
-         '09f10be4a94a6eb9f91aa9be6fd65a65'
-         '864fe0fae10e437dd764454f87ad0cc1'
-         'b2e7cbfa68bcb2e7eac21e18d87a3d93'
-         '171a1064054f4fd185ce896738d50cbc'
-         '2f34b234825e28993eb244862cef607b'
-         'ad7814da5ccddfbba70fc9389b7b1368'
-         '41513e2cef7b5a311e8f3de988f2594b'
-         'a929204d41eba4631b97892f4a915591'
-         '6a36f76040d930fa8a448c1d7b6c7c22'
-         'be9c55a9994069fa8ebac022201cdaf3')
+         '00e5745138bd36a6dda6996ca82bb458'
+         '2681d2dd9cba526734ac85a07bd72dff'
+         'cd10d510639d2b4c524cd3a8fed30845'
+         'b5d4c6176cb3d9181bc4958a59955371'
+         'ec714abc51563df68c0e767499eb131b'
+         'b3958d9eb8ff1074524c913eea9d4531'
+         '6cd59396e969a9fe0c9c4494b05e0d70'
+         'a9cb42920b2dc0a07df802f9720e2976'
+         'ca88f9d29b53c5249e04007b27e6b6f1'
+         '7800c97656d7c969d7d99efaf5449547'
+         '52c26e8e74d054a9b0e8b785d05a1219'
+         'da4d4b0a905905a6befdacfc93ce11ec'
+         '7a1b3a80c2451cf388b1f394843d4d6e'
+         'c9e1bb783a81d0a2cebe1ddec3a29c2b'
+         'f586ca445a5e9cdb0cd8e5da5e301f75'
+         'cda87ee3de3712dd7d98a31205cd0d78'
+         '97dfd7b9bdd3ffc451874a7c918747a8'
+         '3cf977ccd8b1f4b5215c7bec4e795063'
+         'ce4b74e192d97b37b29bf725884bab77'
+         '0e131941c0cb0e7c2ecac70092c931a5'
+         '2140ad226acf709cbdf0a8323c704d97'
+         'e539e40b18fb35398e88eadda0751256'
+         'f7e0ff5bc085fa947d56677732ad40df'
+         'e031bcb2d0df57a79d39aa8555e918ba'
+         '87f1310bff7b978a8015362dc95dfeba'
+         '2d3e0e115d0b9b1cd061beeb7cfb1039'
+         'da16f65cb7095bf7ab50334d5310b46b'
+         'b0ef1e6b1289376c25dfad11fd3b5825'
+         'b33c0fc1a1b6d6f1b61e33e16a68c3aa'
+         '91d710244168d0c1c769435a60b64f3c'
+         '8debe2067c3ffdd910cfa0ad99ed62dd'
+         '7b639bf8009edb028538722812d29c1f'
+         '6ab044113bb056df256112716c4d7bc6'
+         '1f1cfc93ae9c04d6062d824fdf89ef0a'
+         'c13d3d3653cbb530aafd82ea3a455b31'
+         '4f0acf27aa26483e161ad74c0bde0a0d'
+         '0b19f435b174941580e423586330af30'
+         '2c377b2b3dcbe5869c2db0dda2de06ed'
+         'a7a04da21888fd15b755529b5bf2e36f'
+         '9309c021fc49d3a0aee8df25d41f525a'
+         '297f79f74a807063de05ed34159d7524'
+         '35d94ffaa43bd3dc451723b392b2bd2a'
+         '6028467f08ef13bd6b6a1de7348e06d3'
+         'b2903194003960ed7189ce6834abfb07'
+         '3841804189ed1a6bbf1a4845b5fdf53f'
+         '58245e37b544aa0dd0ce79e383a6aa23'
+         '5ee4beab35fd0adb3b250fb80a9b82a8'
+         '3d702ac32f8184038d38b2dbc7e7c886'
+         '27c5580bd0f7d45362e367c8b1675190'
+         'a70ab64d7bc529083bfe5ae4be9a4c0c'
+         'd7ca7f6c776958b22f97f59d7e28c647'
+         '4beb1c99e43c4ea2fea8d9d877bcfe06'
+         '67098d273f37d70f59f04b8be7a96595'
+         '69dd513b2ea4472b5b651faf278ba836'
+         'a62005875fba96de365a1432e6616842')
diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD
index 18e394f61..20dbea731 100644
--- a/libre/icedove-libre/PKGBUILD
+++ b/libre/icedove-libre/PKGBUILD
@@ -1,10 +1,10 @@
 # Maintainer : Márcio Silva <coadde@lavabit.com>
 # Maintainer : André Silva <emulatorman@parabola.nu>
 
-# We're getting this from Debian Sid
+# We're getting this from Debian Experimental
 _debname=icedove
-_debver=17.0.9
-_debrel=deb2
+_debver=24.0
+_debrel=deb1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
@@ -16,30 +16,28 @@ pkgrel=1
 pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird."
 arch=('i686' 'x86_64' 'mips64el')
 license=('MPL' 'GPL' 'LGPL')
-url="http://packages.debian.org/sid/${_pkgname}"
+url="http://packages.debian.org/experimental/${_pkgname}"
 depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification')
-makedepends=('unzip-libre' 'zip' 'pkg-config' 'python2' 'python2-virtualenv' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt')
+makedepends=('unzip-libre' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt')
 optdepends=('libcanberra: for sound support')
 replaces=('thunderbird')
 conflicts=('thunderbird')
 provides=('thunderbird')
 install=${_pkgname}.install
-source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
+source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz"
         "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel#deb}.debian.tar.gz"
         mozconfig
-        replace-urls.txt
         vendor.js
         ${_pkgname}.desktop)
 options=(!emptydirs)
-md5sums=('4c2aacece253be8f177a74d90d782f45'
-         'dd8ccad23583cc0d8c3b77066711f077'
-         '5cf95ea94f69cdd36604890cfbf7b954'
-         'a8fc4658d45b6bf9350023e5c3f34e56'
-         '4eecc4fc5aafaf0da651a09eadc90bee'
+md5sums=('c69b05c9a1c28d455964aed4927ef916'
+         'c67dc2f46f0e4d463ebe1ccdbfae6392'
+         'c46cf2a671c8fdefcabd4c87e38f3d40'
+         '5a53179d14ae9631b7afe5e4d0fc0b25'
          'e785e0c267f4435ae1a9aa0b03bcacfb')
 
 prepare() {
-  export DEBIAN_BUILD="comm-esr17"
+  export DEBIAN_BUILD="comm-esr24"
 
   export QUILT_PATCHES=debian/patches
   export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
@@ -74,32 +72,30 @@ prepare() {
           s|include $(DEPTH)/config/rules.mk|include $(topsrcdir)/config/rules.mk|;
          ' mail/branding/icedove/locales/Makefile.in
 
+  # Fix package-manifest.in
+  sed -i '\|; Phishing Protection| s|$|\n#ifdef MOZ_SAFE_BROWSING|;
+          \|@BINPATH@/components/url-classifier[.]xpt| s|$|\n#endif|
+         ' mail/installer/package-manifest.in
+
   # Fix branding
   sed -i 's|Icedove Mail/News|Icedove|' mail/branding/icedove/locales/en-US/brand.{dtd,properties}
 
   # Replace common URLs
-  sed '/^#/d' ../replace-urls.txt | while read -r moz_url gnu_url; do
-    if [[ -n $moz_url ]]; then
-      printf 'liberating: %s -> %s\n' "$moz_url" "$gnu_url"
-      grep -Erl "${moz_url}" \
-        --exclude='*.'{patch,orig,rej} \
-        --exclude-dir={.pc,test,tests,testing} \
-        | xargs -d '\n' --no-run-if-empty sed -ri "s<${moz_url}<${gnu_url}<g"
-    fi
-  done
+  sed -i '\|extensions[.]getAddons[.]get[.]url| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/Icedove");|g;
+          \|extensions[.]getAddons[.]search[.]browseURL| s|https://addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/Icedove");|g;
+          \|extensions[.]getAddons[.]search[.]url| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/Icedove");|g;
+          \|extensions[.]webservice[.]discoverURL| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/Icedove");|g;
+         ' mail/app/profile/all-thunderbird.js
 
   cp "${srcdir}/mozconfig" .mozconfig
 
   # configure script misdetects the preprocessor without an optimization level
   # https://bugs.archlinux.org/task/34644
-  sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure
-
-  # Fix virtualenv path
-  sed -i 's|/usr/share/pyshared/virtualenv.py|/usr/lib/python2.7/site-packages/virtualenv.py|' mozilla/configure
+  sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' mozilla/configure
 }
 
 build() {
-  export DEBIAN_BUILD="comm-esr17"
+  export DEBIAN_BUILD="comm-esr24"
 
   cd "${srcdir}/${DEBIAN_BUILD}"
 
@@ -110,7 +106,7 @@ build() {
 }
 
 package() {
-  export DEBIAN_BUILD="comm-esr17"
+  export DEBIAN_BUILD="comm-esr24"
 
   cd "${srcdir}/${DEBIAN_BUILD}"
 
diff --git a/libre/icedove-libre/mozconfig b/libre/icedove-libre/mozconfig
index 4f90cb58a..57c02368a 100644
--- a/libre/icedove-libre/mozconfig
+++ b/libre/icedove-libre/mozconfig
@@ -20,7 +20,7 @@ ac_add_options --with-system-libvpx
 ac_add_options --enable-system-hunspell
 ac_add_options --enable-system-sqlite
 ac_add_options --enable-system-ffi
-#ac_add_options --enable-system-cairo
+ac_add_options --enable-system-cairo
 ac_add_options --enable-system-pixman
 ac_add_options --with-pthreads
 
@@ -28,6 +28,7 @@ ac_add_options --with-pthreads
 ac_add_options --enable-startup-notification
 ac_add_options --enable-gio
 
+ac_add_options --disable-gstreamer
 ac_add_options --disable-gnomevfs
 ac_add_options --disable-crashreporter
 ac_add_options --disable-updater
diff --git a/libre/icedove-libre/replace-urls.txt b/libre/icedove-libre/replace-urls.txt
index fc13e32fb..9cc6d0933 100644
--- a/libre/icedove-libre/replace-urls.txt
+++ b/libre/icedove-libre/replace-urls.txt
@@ -2,24 +2,24 @@
 # These are whitespace-separated EREs, comments are lines starting with '#'
 
 https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/dictionaries/?(\?[^"']*)?   https://parabolagnulinux.org/packages/\?repo=Extra\&q=hunspell-
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/plugins/?(\?[^"']*)?        https://gnuzilla.gnu.org/plugins/
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/personas/?(\?[^"']*)?       https://www.gnu.org/software/gnuzilla/addons.html
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/recommended/?(\?[^"']*)?    https://www.gnu.org/software/gnuzilla/addons.html
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search-engines/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html#search%20engines
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search/?(\?[^"']*)?         https://www.gnu.org/software/gnuzilla/addons.html
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/themes/?(\?[^"']*)?         https://www.gnu.org/software/gnuzilla/addons.html#themes
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?"               https://www.gnu.org/software/gnuzilla/addons.html"
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?$               https://www.gnu.org/software/gnuzilla/addons.html
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/plugins/?(\?[^"']*)?        http://directory.fsf.org/wiki/Icedove
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/personas/?(\?[^"']*)?       http://directory.fsf.org/wiki/Icedove
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/recommended/?(\?[^"']*)?    http://directory.fsf.org/wiki/Icedove
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search-engines/?(\?[^"']*)? http://directory.fsf.org/wiki/Icedove
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search/?(\?[^"']*)?         http://directory.fsf.org/wiki/Icedove
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/themes/?(\?[^"']*)?         http://directory.fsf.org/wiki/Icedove
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?"               http://directory.fsf.org/wiki/Icedove"
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?$               http://directory.fsf.org/wiki/Icedove
 
-https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/ https://www.gnu.org/software/gnuzilla/addons.html
+https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/ http://directory.fsf.org/wiki/Icedove
 
-https?://services\.addons\.mozilla\.org/(%LOCALE%|@AB_CD@|en-US|ru)/([a-zA-Z%-]+)/  https://www.gnu.org/software/gnuzilla/addons.html#bogus-services.\2/
+https?://services\.addons\.mozilla\.org/(%LOCALE%|@AB_CD@|en-US|ru)/([a-zA-Z%-]+)/  http://directory.fsf.org/wiki/Icedove.\2/
 
-https?://pfs\.mozilla\.org/plugins/PluginFinderService\.php             https://gnuzilla.gnu.org/plugins/PluginFinderService.php
+https?://pfs\.mozilla\.org/plugins/PluginFinderService\.php             http://directory.fsf.org/wiki/Icedove
 #https?://versioncheck\.addons\.mozilla\.org/update/VersionCheck\.php
 #https?://versioncheck-bg\.addons\.mozilla\.org/update/VersionCheck\.php
 
-"https?://addons\.mozilla\.org/" "https://www.gnu.org/software/gnuzilla/addons.html"
+"https?://addons\.mozilla\.org/" "http://directory.fsf.org/wiki/Icedove"
 
 # hack: these aren't URLs, per se
-(addonsBrowseAll\.description\s*=.*)addons\.mozilla\.org \1gnu.org/software/gnuzilla/addons.html
+(addonsBrowseAll\.description\s*=.*)addons\.mozilla\.org \1directory.fsf.org/wiki/Icedove
diff --git a/libre/icedove-libre/vendor.js b/libre/icedove-libre/vendor.js
index 279bdc158..170b505a8 100644
--- a/libre/icedove-libre/vendor.js
+++ b/libre/icedove-libre/vendor.js
@@ -1,6 +1,3 @@
-// Forbid application updates
-lockPref("app.update.enabled", false);
-
 // Use LANG environment variable to choose locale
 pref("intl.locale.matchOS", true);
 
diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD
index 7fb595354..c032a2b70 100644
--- a/libre/iceweasel-l10n/PKGBUILD
+++ b/libre/iceweasel-l10n/PKGBUILD
@@ -11,8 +11,8 @@
 # - Run 'make'. It will take care of everything else for you.
 
 _debname=iceweasel
-_debver=24.0
-_debrel=deb2
+_debver=25.0
+_debrel=deb1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
@@ -28,7 +28,7 @@ pkgrel=1
 
 pkgdesc="Language packs for Debian Iceweasel."
 arch=('any')
-url="http://packages.debian.org/sid/iceweasel"
+url="http://packages.debian.org/experimental/iceweasel"
 license=('MPL' 'GPL')
 depends=("iceweasel-libre>=$epoch:$pkgver")
 makedepends=('unzip' 'zip')
@@ -75,92 +75,92 @@ package_iceweasel-l10n-$(echo $lang | tr A-Z a-z)() {
 "
 done
 
-md5sums=('e88728730ecf9f0f145de5f70e362b15'
-         '8b54f8c36f8465987871145fd70956ce'
-         'ad3a11f1485a58a0ad59d861d37a08a5'
-         '9761805e9011c371bb443d8f74fede3c'
-         '87bb6a20535feb2692aa2a6a1afa11e5'
-         '656dca2918d356fbe368b18fb9eac7ec'
-         'e1c793ac7d7beed9d21631154c3dbe1c'
-         '862470f8d5ee8f8d2f68afc7f4a3d5c1'
-         '5d7d027fe8c821689a4fdb022fdf7b1f'
-         'ab298b1e9d86dfccb6797a8f2f28c8af'
-         '4c3dd02509c0f7a8506b7303a410692b'
-         'ebe4f9e91981bbe85d4f2024325d4cf2'
-         'c7e1dae44043c1236f96739ad1117fbe'
-         'b33da7699c2a2f5e0febd11e4489d382'
-         '63c8b3e4c079fbbd98e321035b5c6317'
-         'f14d3462af09d8094393ee16f679e5ab'
-         '0eac6ddbcce45fd8e9a202c93a3738cb'
-         'c837f374f56c0bd6efdde745dce89f8a'
-         '5f780c1b42835050c39db15493dff728'
-         '69303505295c74467a56aa2a43ea2b82'
-         '7c44dba21f5d03604b5dd120231a00ae'
-         'a401bc653b544ac4f259cca56b79d96d'
-         'abdac5ba27fc5cd2ec4d5bc514772670'
-         '0ddc4de7b3050ed2a49233fbe18eebb3'
-         '7d09b317736ba78bd6bcf86f5f6e1e11'
-         '14d1ceaaef00130134e017ae868db8ea'
-         '9ddedfef7ffea213ef4d4e1773b3ad15'
-         'ae89977182d5998204b8ebc1e2603e9f'
-         '642cdf237587093072412720fb36485a'
-         '113ef967c5c05ae9ceae093064fdc116'
-         '90425e1d17c39090a68014c6ce7fb17b'
-         '0d9e0fc7162eb0aca197866ef427f481'
-         '95cc1695aa5bffbdcbcb773fb0430319'
-         '1475a2ad88c8699a9c36e07baed988e0'
-         '26fd5bf6e4e0a6c634ca7632fb20d69d'
-         '1cfb6db8de12e0698f0663fffe651962'
-         '47cbb471101ed09e1d43f85a38cac91f'
-         'e8cb435f70c0d62b07cddf051b2e6a5b'
-         'bc58060bf3539ab408f1a331ec617949'
-         '01e8eedc1594c13db4f8a991fcf87f83'
-         '91179c0d3ee8f003a848eedd2435ea3c'
-         '0bac7e153488e965f164d61d81de87cb'
-         '4dabbdfa4fe6477e862eb381eb2c4fd0'
-         'a83a772712ae74ddb309cb4a7cb52f75'
-         'e16444075ca17e7b5961f7e1e0a828bf'
-         '4df54bf6c1b1cb35a130d34f9a981eec'
-         '27e8f49d9a73c79515aa75304758ae22'
-         '4ad85b335fd26d3474548433fd20d919'
-         '7f63adfe80832afc40cc3774b48fdefc'
-         'dbeac803ed5906af388d2130cdac5c32'
-         'f82ba92549541e2d89d5040d175a11d8'
-         'bd46bc7902cba8866ffedbb50c8ca2f8'
-         '203f1fcb9dd3de9396787fc9dab0312a'
-         'da685c4c4bd727b337bb720d83de8cf5'
-         '42fbbda5287dfbf11619e6046bd06f8b'
-         '65844655106abc5fba71a2cd9bec2d26'
-         '4ad3f9cbb469aeca27443e39a53e8c73'
-         '9225277738d7a0fb8b585314ecdb642f'
-         '292574470c2daeda3c005b12d8a66269'
-         '954554b04d7aee0c6662d2edf7b48c1b'
-         'f15824595b7aab31ce8cc91de781ea03'
-         'c5f2c9ddb5775179be5eea13b12f843f'
-         'def21db04a3b606c603412d7a0091041'
-         '686fcc1eefcce197c8b27363c5db6f34'
-         '9eb2657a7af95927274b0453056173b3'
-         '58e3dedcb8c0f85766aaaa0d35746b94'
-         '209670672c37d4befa4375528385ae4a'
-         'f3b09defe2dd33f94c5aa4f3c19d726e'
-         '3f05b588ddea099c873203267287e296'
-         '91180565b17731d4ff40e6612f499527'
-         'fac9050297be0dfe64473d3fe3bce03b'
-         'd72a455cd79e304627db71c0ad42e42c'
-         'f271b0a4b2d348edca352611da9fa79e'
-         '367a12e148e94885d5141a7b374523f7'
-         '18fb3c7bbfdf0b81a40ef5f0bd9d3c2c'
-         '4e5418b69f62e5d281aa98b0089149de'
-         'bfdf7ae55a0994fbe3ed2359dfd2d437'
-         'e7b4b504e518b16bb5d9cea8770b1b7a'
-         'a8719e1294071e9e0366f686b89a793f'
-         'c422789ab794748200b3d33f660b0076'
-         'ac040347a410692fea6b7fdda06802cf'
-         '97c066c4bd823d8f3157fbb390cbaaac'
-         '3167b085b038f6f1bde2530a167e7405'
-         'e969d0185a8c34341edba2ea2e70a476'
-         'aff3452e3b6663a2e2f8870924bfded6'
-         '44519549cf6b052b49519c9960f97481'
-         'fe67796800cb807148a39722d689a4c7'
-         'b947f013e632c6d262ebdbfac53e3958'
-         '677267c8284fca2b3749f53eba598121')
+md5sums=('a4593936bf1c7a9ec9368ff249f9cc56'
+         '72891c593c993c5474abff8b4e72d543'
+         '675ce7d5e3d7a2899db8be29a3f8482a'
+         'ed754b10fb8e687dab42ccb50f31649c'
+         'e3ca6f8116a0d9b2cada9fa88b66e237'
+         '3324458a1907de5c95ed6d02601e2753'
+         '5ea65765bb6fb9ba8aac3e36ed66c1b8'
+         'c22ae0fcc64c979cf87aec4b191353fb'
+         'c33058a022beb01abad48d543d4621bc'
+         'f7cb06c3847748fcd01aa6c7e07bab09'
+         'b2c9f2768a5f364c64e38d76323aa1b7'
+         'cf5a47e0ce43bcbe9601401e3adcf87b'
+         'c42200f23f5ced9395ae8a1dff2e824f'
+         '487dd4ace0ed32330b4dcbf1c6d39758'
+         '5ad617928cf23d8e97916cf16d417635'
+         '6dd585cf48ac920dfb2ba2966ccc1a7b'
+         '399e6f69ea89436c3cb2d6c17b9415f5'
+         '726eb9a1368f01b01cb11f78c1fe91b1'
+         '19152bb2705946c16f7f10140128635b'
+         '34a8fd695d3ac20bf733c4c5fd9c733e'
+         'e13963f59dbec91fa9318fcfb19570c5'
+         '9ef86e7b69f7de49e321ef7dc7dc0b75'
+         'bb74f5cb87e6218820e7c9a2bddc2021'
+         'fa34dfaed15fa16814ac2d629971141f'
+         'a124544d82417a7a1341c37c80b18f68'
+         '6936b981c79fbffbd514dcbd281c26b8'
+         '0b59289da31c29844db8c688770a474a'
+         '8bd21818ca2216e65f160eb7a9ca072b'
+         '20ad27abc7c254a9960682f7afda1e5f'
+         'e8bd8488274796668e5b7a4e4dba5949'
+         '991f8d1e1faae1a6a22113f4f3f6d90e'
+         'bb0f98dcd2b87510d09216d9a36ef686'
+         '87fa30b76eafab63b28ee53943435e43'
+         '3cbafc8cdff119b73fcbd2bac8ffadea'
+         '25b4ee89d58b2edf937515a1f8309768'
+         'ea5b9b47bd4a24a80058509ba2126041'
+         '97be59190157410b37a56cbec1d95c78'
+         '575a68f6bc5ace8fc212a9a7d759291b'
+         'f57bea11b0f49cf2e4023008ffcdc87d'
+         'c1130d88b73db6a474d1df5ed00d0427'
+         'd0fd4480ab9fd6d20e2ea3c23a94ae14'
+         '4b7f19fd35a68990d114e0f7c265b7b2'
+         '77ed20f961742c3b8eb7a8cfdc24df25'
+         '9c3ed09220442dc602be0fd130475349'
+         'c7b7cd5971d07052c983e6d2047a3154'
+         '6e7b9ac0906938a0ba4296e99a03779c'
+         '39b1121cb719123596c3b1ef48d82b94'
+         'ae71cd7232645c49b1d9f970a6f824e0'
+         '25b322a7fa03c620747d72587e594173'
+         '4b5fefdfdba63243507ac623644912ca'
+         'ae02bb179460d0a1ad2c88ed063c1222'
+         '2eb0dd6b6540f11b1e3ea7cfb6a8f414'
+         '1a04b8c9fddcdbc96e52d2a6b5ccaae9'
+         '8fa2584f770ca97eb7a46826f027aa63'
+         '083f0e2bdc94f668b0aa10a7ebe65e78'
+         '091c223464fb65ed7e771fa0abda5db6'
+         '53bc7c5f16a4c1e9d5315ae44bfbc1ab'
+         '5cfc5a27b72a432da7267fcc87fab40a'
+         'a4467ea38382fd2c0aa22fdf1aab41b1'
+         '2ae42108358fe38e2efbe70e26f82f3c'
+         'dcba6a97010bb9504e9778bfc5aee54b'
+         '4b8dd9e54b79d133884d29b6a6b78d1f'
+         '0c364c911b310d5656652faced437ec4'
+         '60856a5d67e13bc3ecb2edd6f90ce328'
+         '1685cea5a1094769a0a2f7fa3e248482'
+         '6d3218c1a6c45206c71477f3403b3bf9'
+         'a75749039cca538ba22bb7007b8358e9'
+         'c795a1eb2f467a1fe6c7821af6dd9d05'
+         'b1e16275ee6b874e4f39579126cb8c94'
+         '159145964d7c3e6faa1416a2ebc96e84'
+         'bf6efa5437f4dbd6549e27b00523e10e'
+         'ab9d9d2568d3be83038973c7b1077c6a'
+         'd6ad3b4a84ca1a35ef46a6a7053de37c'
+         '285f62d8782aa73860a2187b0a4027cf'
+         'd107b587a939124df3c8a233e75d3ca3'
+         '968bd91d21c52095f08f9a55d20ba6a4'
+         '0f29172e2aa3edf11a1c705ce945f036'
+         '78ce26aa5e6fedff75cae9aa24d8d8e9'
+         'a8d0606d5d79f1e4f08908f67b0336ab'
+         '21d6c6af9ae10aa4d392a1f949a76462'
+         'bf1fb5267204996373ff541558d7b286'
+         'c3561aa5796054b0377eaab17017b341'
+         '2a2c08f36efd1b4455194abd67268c34'
+         '4cfe3e0dca2d7e26effb3fdda7bb2af7'
+         'a1eb070b498fd9324a7c5c3563f7d29e'
+         '1fad104a69ed3150d3d8ca1b79181d03'
+         '2e099ca02f1269f25627616cb7df3d12'
+         '852e3415f008110d23ed1ed9bdba2d35'
+         'e8f40197b8026e641b4836de6864045a')
diff --git a/libre/iceweasel-l10n/region.properties b/libre/iceweasel-l10n/region.properties
index fe7f265ce..5654eb9ee 100644
--- a/libre/iceweasel-l10n/region.properties
+++ b/libre/iceweasel-l10n/region.properties
@@ -15,7 +15,7 @@ browser.search.order.3=Seeks Search
 # profile database.  Note that "new" is defined as "has a different URL"; this
 # means that it's not possible to update the name of existing handler, so 
 # don't make any spelling errors here.
-gecko.handlerService.defaultHandlersVersion=3
+gecko.handlerService.defaultHandlersVersion=4
 
 # The default set of protocol handlers for irc:
 gecko.handlerService.schemes.irc.0.name=Freenode Web IRC
diff --git a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
index 5d56ee23b..d2716aed3 100644
--- a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
+++ b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
@@ -67,10 +67,10 @@ index d7fec75..d531b83 100644
  component {3d2532e3-4932-4774-b7ba-968f5899d3a4} IEProfileMigrator.js

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

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

-index 23e021d..469e504 100644

+index 3db6720..a3b3dda 100644

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

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

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

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

  

  

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

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

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

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

-index 3d23a98..4ce7a3e 100644

+index 2c91e9a..08962c4 100644

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

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

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

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

     * @see nsIStringBundle

     */

    getLocalizedString: function MU_getLocalizedString(aKey, aReplacements) {

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

        return getMigrationBundle().GetStringFromName(aKey);

      return getMigrationBundle().formatStringFromName(

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

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

    },

  

    /**

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

  

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

-index b1cb03d..1755ae7 100644

+index 094a9dc..a620905 100644

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

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

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

- sourceNameIE=Internet Explorer

- sourceNameSafari=Safari

- sourceNameChrome=Google Chrome

--sourceNameFirefox=Mozilla Firefox

- 

- importedBookmarksFolder=From %S

- 

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

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

  2_ie=Cookies

  2_safari=Cookies

  2_chrome=Cookies

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

 +16_self=Saved Passwords

  

- 32_ie=Favorites

+-32_ie=Favorites

++32_ie=Favourites

  32_safari=Bookmarks

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

+ 32_chrome=Bookmarks

+ 

  64_ie=Other Data

  64_safari=Other Data

  64_chrome=Other Data

 -64_firefox_other=Other Data

 +64_self=Other Data

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

-index 5c23509..54b82bd 100644

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

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

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

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

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

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

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

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

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

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

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

+ 

+-128_firefox=Windows and Tabs

++128_self=Windows and Tabs

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

-index dcb4065..09c1146 100644

+index d46b43b..2253994 100644

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

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

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

-                        getService(Ci.nsIToolkitProfileService);

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

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

+   populateResetPane("migratedItems");

+ }

  

--#expand const MOZ_APP_NAME = "__MOZ_APP_NAME__";

--#expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__";

--

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

-   try {

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

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

++<<<<<<< HEAD

++=======

++/**

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

++ *

++ * @return boolean whether reset is supported.

++ */

++function resetSupported() {

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

++                       getService(Ci.nsIToolkitProfileService);

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

++

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

++  try {

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

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

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

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

 +    }

-   } catch (e) {

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

-     Cu.reportError(e);

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

- function getMigratedData() {

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

- 

--#expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__";

--#expand const MOZ_APP_NAME = "__MOZ_APP_NAME__";

--

-   // From migration.properties

-   const MIGRATED_TYPES = [

-     4,  // History and Bookmarks

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

-   let dataTypes = [];

-   for (let itemID of MIGRATED_TYPES) {

-     try {

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

++  } catch (e) {

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

++    Cu.reportError(e);

++  }

++  return false;

++}

++

++function getMigratedData() {

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

++

++  // From migration.properties

++  const MIGRATED_TYPES = [

++    4,  // History and Bookmarks

++    16, // Passwords

++    8,  // Form History

++    2,  // Cookies

++  ];

++

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

++  let dataTypes = [];

++  for (let itemID of MIGRATED_TYPES) {

++    try {

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

-       dataTypes.push(typeName);

-     } catch (x) {

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

++      dataTypes.push(typeName);

++    } catch (x) {

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

++      Components.utils.reportError(x);

++    }

++  }

++  return dataTypes;

++}

++

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

+ function onResetProfileAccepted() {

+   let retVals = window.arguments[0];

+   retVals.reset = true;

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

 index f35c227..7062886 100644

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

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

  %{C++

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

-index cc3f65e..cdd4305 100644

+index 5f989ea..e7e21bd 100644

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

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

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

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

          if (gDoProfileReset) {

            // Automatically migrate from the current application if we just

            // reset the profile.

diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 0ed8d24ee..9285849c3 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -12,10 +12,10 @@
 
 _pgo=true
 
-# We're getting this from Debian Sid
+# We're getting this from Debian Experimental
 _debname=iceweasel
-_debver=24.0
-_debrel=deb2
+_debver=25.0
+_debrel=deb1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
@@ -23,7 +23,7 @@ _pkgname=iceweasel
 pkgname=iceweasel-libre
 epoch=1
 pkgver=$_debver.$_debrel
-pkgrel=2
+pkgrel=1
 
 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox."
 arch=(i686 x86_64 mips64el)
@@ -42,7 +42,7 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
             'gstreamer0.10-good-plugins: webm and mp4 demuxing'
             'gstreamer0.10-ugly-plugins: h.264 decoding'
             'libpulse: PulseAudio audio driver')
-url="http://packages.debian.org/sid/${_pkgname}"
+url="http://packages.debian.org/experimental/${_pkgname}"
 install=iceweasel.install
 replaces=('firefox')
 conflicts=('firefox')
@@ -55,20 +55,18 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
         iceweasel.desktop
         iceweasel-install-dir.patch
         vendor.js
-        replace-urls.txt
         iceweasel-20.0.1-fixed-loading-icon.png
         Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
-md5sums=('8f24807d67599516850a4bdca2b2fbd6'
-         '1f4f1347e05b15f5af137787d614ecdf'
+md5sums=('dd1462b582747210cc6c2ac1d01c4c17'
+         '4f4cde44b6e83cf78ff5d6e757d1913c'
          '350feec44d359c31679dbec3de6685df'
          'df08eaa1ac3bc6c2356be4fbf8ec8932'
-         '5e01a51ec4f3dd72ff2525edfe6cd371'
+         '8c11b80574b11e96c2ef44fa16f4b844'
          '7b9e5996dd9fe0b186a43a297db1c6b5'
          'abf5ecb74caa857abb42bcfbb3442d9c'
-         '121fefaa040936c3b96298da0c49f450'
-         'a8fc4658d45b6bf9350023e5c3f34e56'
+         '816013881cfc9a1f4f0ede72b014f8b3'
          '6e335a517c68488941340ee1c23f97b0'
-         'f1594fa3567e5b70202c3432d7c00202')
+         'ee3279c706c3a69e6f8eda415c4d35b0')
 
 prepare() {
   export DEBIAN_BUILD="mozilla-release"
@@ -97,15 +95,12 @@ prepare() {
   sed -i "\|abouthome/snippet|d" browser/base/jar.mn
 
   # Replace common URLs
-  sed '/^#/d' ../replace-urls.txt | while read -r moz_url gnu_url; do
-    if [[ -n $moz_url ]]; then
-      printf 'liberating: %s -> %s\n' "$moz_url" "$gnu_url"
-      grep -Erl "${moz_url}" \
-        --exclude='*.'{patch,orig,rej} \
-        --exclude-dir={.pc,test,tests,testing} \
-        | xargs -d '\n' --no-run-if-empty sed -ri "s<${moz_url}<${gnu_url}<g"
-    fi
-  done
+  sed -i '\|extensions[.]getAddons[.]get[.]url| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/GNU_IceCat");|g;
+          \|extensions[.]getAddons[.]search[.]browseURL| s|https://addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/GNU_IceCat");|g;
+          \|extensions[.]getAddons[.]search[.]url| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/GNU_IceCat");|g;
+          \|extensions[.]webservice[.]discoverURL| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/GNU_IceCat");|g;
+          \|browser[.]search[.]searchEnginesURL| s|https://addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/GNU_IceCat");|g;
+         ' browser/app/profile/firefox.js
 
   cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch
 
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index c0e61d5b9..e5632c667 100644
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -1,8 +1,7 @@
-diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
-index 2617a7f..a70434a 100644
---- a/browser/app/profile/firefox.js
-+++ b/browser/app/profile/firefox.js
-@@ -1242,14 +1242,6 @@ pref("pdfjs.previousHandler.alwaysAskBeforeHandling", false);
+diff -Nur mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/browser/app/profile/firefox.js
+--- mozilla-release.orig/browser/app/profile/firefox.js	2013-11-05 03:52:59.229583495 -0200
++++ mozilla-release/browser/app/profile/firefox.js	2013-11-05 03:57:12.955661016 -0200
+@@ -1269,14 +1269,6 @@
  // (This is intentionally on the high side; see bug 746055.)
  pref("image.mem.max_decoded_image_kb", 256000);
  
@@ -17,11 +16,10 @@ index 2617a7f..a70434a 100644
  // Turn on the CSP 1.0 parser for Content Security Policy headers
  pref("security.csp.speccompliant", true);
  
-diff --git a/browser/base/content/abouthome/aboutHome.css b/browser/base/content/abouthome/aboutHome.css
-index ce8db3c..27ff8b6 100644
---- a/browser/base/content/abouthome/aboutHome.css
-+++ b/browser/base/content/abouthome/aboutHome.css
-@@ -51,11 +51,6 @@ a {
+diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozilla-release/browser/base/content/abouthome/aboutHome.css
+--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.css	2013-10-25 20:27:08.000000000 -0200
++++ mozilla-release/browser/base/content/abouthome/aboutHome.css	2013-11-05 03:57:12.958994121 -0200
+@@ -49,11 +49,6 @@
    background-repeat: no-repeat;
  }
  
@@ -33,7 +31,7 @@ index ce8db3c..27ff8b6 100644
  #searchForm {
    display: -moz-box;
  }
-@@ -74,8 +69,7 @@ a {
+@@ -72,8 +67,7 @@
  #searchEngineLogo {
    display: inline-block;
    height: 28px;
@@ -43,7 +41,7 @@ index ce8db3c..27ff8b6 100644
  }
  
  #searchText {
-@@ -147,48 +141,6 @@ a {
+@@ -145,48 +139,6 @@
    transition-duration: 0ms;
  }
  
@@ -92,7 +90,7 @@ index ce8db3c..27ff8b6 100644
  #launcher {
    display: -moz-box;
    -moz-box-align: center;
-@@ -368,20 +320,6 @@ body[narrow] #restorePreviousSession::before {
+@@ -366,20 +318,6 @@
      background-image: url("chrome://branding/content/about-logo@2x.png");
    }
  
@@ -113,11 +111,10 @@ index ce8db3c..27ff8b6 100644
    .launchButton::before,
    #aboutMozilla::before {
      transform: scale(.5);
-diff --git a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/abouthome/aboutHome.js
-index dd050d3..7ae28d2 100644
---- a/browser/base/content/abouthome/aboutHome.js
-+++ b/browser/base/content/abouthome/aboutHome.js
-@@ -3,147 +3,44 @@
+diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozilla-release/browser/base/content/abouthome/aboutHome.js
+--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js	2013-10-25 20:27:08.000000000 -0200
++++ mozilla-release/browser/base/content/abouthome/aboutHome.js	2013-11-05 04:10:11.565757913 -0200
+@@ -3,152 +3,44 @@
   * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
  
  const SEARCH_ENGINES = {
@@ -296,10 +293,15 @@ index dd050d3..7ae28d2 100644
 -
 -const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day.
 -
+-// IndexedDB storage constants.
+-const DATABASE_NAME = "abouthome";
+-const DATABASE_VERSION = 1;
+-const SNIPPETS_OBJECTSTORE_NAME = "snippets";
+-
  // This global tracks if the page has been set up before, to prevent double inits
  let gInitialized = false;
  let gObserver = new MutationObserver(function (mutations) {
-@@ -151,7 +48,6 @@ let gObserver = new MutationObserver(function (mutations) {
+@@ -156,7 +48,6 @@
      if (mutation.attributeName == "searchEngineURL") {
        setupSearchEngine();
        if (!gInitialized) {
@@ -307,7 +309,7 @@ index dd050d3..7ae28d2 100644
          gInitialized = true;
        }
        return;
-@@ -172,70 +68,6 @@ window.addEventListener("pagehide", function() {
+@@ -177,117 +68,6 @@
    window.removeEventListener("resize", fitToWidth);
  });
  
@@ -339,46 +341,93 @@ index dd050d3..7ae28d2 100644
 -    return;
 -  }
 -
--  // TODO (bug 789348): use a real asynchronous storage here.  This setTimeout
--  // is done just to catch bugs with the asynchronous behavior.
--  setTimeout(function() {
--    // Populate the cache from the persistent storage.
--    let cache = new Map();
--    for (let key of [ "snippets-last-update",
--                      "snippets-cached-version",
--                      "snippets" ]) {
--      cache.set(key, localStorage[key]);
+-  let invokeCallbacks = function () {
+-    if (!gSnippetsMap) {
+-      gSnippetsMap = Object.freeze(new Map());
 -    }
 -
--    gSnippetsMap = Object.freeze({
--      get: function (aKey) cache.get(aKey),
--      set: function (aKey, aValue) {
--        localStorage[aKey] = aValue;
--        return cache.set(aKey, aValue);
--      },
--      has: function(aKey) cache.has(aKey),
--      delete: function(aKey) {
--        delete localStorage[aKey];
--        return cache.delete(aKey);
--      },
--      clear: function() {
--        localStorage.clear();
--        return cache.clear();
--      },
--      get size() cache.size
--    });
--
 -    for (let callback of gSnippetsMapCallbacks) {
 -      callback(gSnippetsMap);
 -    }
 -    gSnippetsMapCallbacks.length = 0;
--  }, 0);
+-  }
+-
+-  let openRequest = indexedDB.open(DATABASE_NAME, DATABASE_VERSION);
+-
+-  openRequest.onerror = function (event) {
+-    // Try to delete the old database so that we can start this process over
+-    // next time.
+-    indexedDB.deleteDatabase(DATABASE_NAME);
+-    invokeCallbacks();
+-  };
+-
+-  openRequest.onupgradeneeded = function (event) {
+-    let db = event.target.result;
+-    if (!db.objectStoreNames.contains(SNIPPETS_OBJECTSTORE_NAME)) {
+-      db.createObjectStore(SNIPPETS_OBJECTSTORE_NAME);
+-    }
+-  }
+-
+-  openRequest.onsuccess = function (event) {
+-    let db = event.target.result;
+-
+-    db.onerror = function (event) {
+-      invokeCallbacks();
+-    }
+-
+-    db.onversionchange = function (event) {
+-      event.target.close();
+-      invokeCallbacks();
+-    }
+-
+-    let cache = new Map();
+-    let cursorRequest = db.transaction(SNIPPETS_OBJECTSTORE_NAME)
+-                          .objectStore(SNIPPETS_OBJECTSTORE_NAME).openCursor();
+-    cursorRequest.onerror = function (event) {
+-      invokeCallbacks();
+-    }
+-
+-    cursorRequest.onsuccess = function(event) {
+-      let cursor = event.target.result;
+-
+-      // Populate the cache from the persistent storage.
+-      if (cursor) {
+-        cache.set(cursor.key, cursor.value);
+-        cursor.continue();
+-        return;
+-      }
+-
+-      // The cache has been filled up, create the snippets map.
+-      gSnippetsMap = Object.freeze({
+-        get: function (aKey) cache.get(aKey),
+-        set: function (aKey, aValue) {
+-          db.transaction(SNIPPETS_OBJECTSTORE_NAME, "readwrite")
+-            .objectStore(SNIPPETS_OBJECTSTORE_NAME).put(aValue, aKey);
+-          return cache.set(aKey, aValue);
+-        },
+-        has: function (aKey) cache.has(aKey),
+-        delete: function (aKey) {
+-          db.transaction(SNIPPETS_OBJECTSTORE_NAME, "readwrite")
+-            .objectStore(SNIPPETS_OBJECTSTORE_NAME).delete(aKey);
+-          return cache.delete(aKey);
+-        },
+-        clear: function () {
+-          db.transaction(SNIPPETS_OBJECTSTORE_NAME, "readwrite")
+-            .objectStore(SNIPPETS_OBJECTSTORE_NAME).clear();
+-          return cache.clear();
+-        },
+-        get size() cache.size
+-      });
+-
+-      setTimeout(invokeCallbacks, 0);
+-    }
+-  }
 -}
 -
  function onSearchSubmit(aEvent)
  {
    let searchTerms = document.getElementById("searchText").value;
-@@ -320,140 +152,6 @@ function setupSearchEngine()
+@@ -372,140 +152,6 @@
  
  }
  
@@ -519,10 +568,9 @@ index dd050d3..7ae28d2 100644
  function fitToWidth() {
    if (window.scrollMaxX) {
      document.body.setAttribute("narrow", "true");
-diff --git a/browser/base/content/abouthome/aboutHome.xhtml b/browser/base/content/abouthome/aboutHome.xhtml
-index cd821c4..9816d54 100644
---- a/browser/base/content/abouthome/aboutHome.xhtml
-+++ b/browser/base/content/abouthome/aboutHome.xhtml
+diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.xhtml mozilla-release/browser/base/content/abouthome/aboutHome.xhtml
+--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.xhtml	2013-10-25 20:27:08.000000000 -0200
++++ mozilla-release/browser/base/content/abouthome/aboutHome.xhtml	2013-11-05 03:57:12.962327229 -0200
 @@ -43,15 +43,6 @@
            <input id="searchSubmit" type="submit" value="&abouthome.searchEngineButton.label;"/>
          </form>
@@ -539,10 +587,9 @@ index cd821c4..9816d54 100644
      </div>
      <div class="spacer"/>
  
-diff --git a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties
-index 23a30d0..fe7f265 100644
---- a/browser/locales/en-US/chrome/browser-region/region.properties
-+++ b/browser/locales/en-US/chrome/browser-region/region.properties
+diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties
+--- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties	2013-10-25 20:27:09.000000000 -0200
++++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties	2013-11-05 04:16:11.884325686 -0200
 @@ -3,17 +3,12 @@
  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
@@ -565,13 +612,13 @@ index 23a30d0..fe7f265 100644
  
  # increment this number when anything gets changed in the list below.  This will
  # cause Firefox to re-read these prefs and inject any new handlers into the 
-@@ -22,20 +17,10 @@ browser.contentHandlers.types.0.uri=http://add.my.yahoo.com/rss?url=%s
+@@ -22,20 +17,10 @@
  # don't make any spelling errors here.
- gecko.handlerService.defaultHandlersVersion=3
+ gecko.handlerService.defaultHandlersVersion=4
  
 -# The default set of protocol handlers for webcal:
 -gecko.handlerService.schemes.webcal.0.name=30 Boxes
--gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s
+-gecko.handlerService.schemes.webcal.0.uriTemplate=https://30boxes.com/external/widget?refer=ff&url=%s
 -
 -# The default set of protocol handlers for mailto:
 -gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail
@@ -590,10 +637,9 @@ index 23a30d0..fe7f265 100644
 -gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s
 +gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC
 +gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net
-diff --git a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/generic/profile/bookmarks.html.in
-index e925c1e..5101035 100644
---- a/browser/locales/generic/profile/bookmarks.html.in
-+++ b/browser/locales/generic/profile/bookmarks.html.in
+diff -Nur mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in mozilla-release/browser/locales/generic/profile/bookmarks.html.in
+--- mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in	2013-10-25 20:27:09.000000000 -0200
++++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in	2013-11-05 03:57:12.972326552 -0200
 @@ -15,13 +15,20 @@
      <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3>
  <DD>@bookmarks_toolbarfolder_description@
@@ -621,11 +667,10 @@ index e925c1e..5101035 100644
 +        <DT><A HREF="http://www.h-node.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABgElEQVQ4jaXRz2uSARzHcb0vlRGEzTVWISU1BVkFYTIyjNK1pKcxHA+yhWMWIamHYikFgpoLIi9jwegi3QbL9SzdLmMbM9J+DkJBgm5RDvEPeHeQHOyQz0OH9+V7ePGBr0pqpPmfVPsP8a0AR4MnMEwf48x9K0s/E8oAY9iEMOvD+8yP2qVjrhhRBnSN61n5sIpULqC+pGHh8wNlgEY8jPQXcGh4VXukDND5evYAl46odIuXtYdKAANSudAChO52/XeMZMohecCbcoGdH99Y+7LO72adT9+/4nh8nYOjBl7/SsoB8gBkpHk8T0S2K++pN3fRin3cfnFDHvCuWkI9rEMvHGEo5gbAHnXhnLF1BpZLeRaLOVT2A8Q3A5wMngXgWtKLxX9KPqC+rCWQvYkpeK4NWKcGOgO50ts2MJJ0cPreeQDciTHMchZYIhcwh2wcuqjn+ccwGm9v6wsTxxn0dVgQXZ7Ek3Agpq6QrcaQGmmebtxFSDkRU1fJVmL/BpT2ByV/3eDMhinRAAAAAElFTkSuQmCC">h-node</A>
      </DL><p>
  </DL><p>
-diff --git a/dom/ipc/test.xul b/dom/ipc/test.xul
-index 25efdb6..8162c73 100644
---- a/dom/ipc/test.xul
-+++ b/dom/ipc/test.xul
-@@ -299,6 +299,6 @@
+diff -Nur mozilla-release.orig/dom/ipc/test.xul mozilla-release/dom/ipc/test.xul
+--- mozilla-release.orig/dom/ipc/test.xul	2013-10-25 20:27:14.000000000 -0200
++++ mozilla-release/dom/ipc/test.xul	2013-11-05 03:57:12.982325866 -0200
+@@ -302,6 +302,6 @@
                 oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/>
    </toolbar>
  
@@ -633,10 +678,9 @@ index 25efdb6..8162c73 100644
 +  <browser type="content" src="https://duckduckgo.com/html" flex="1" id="page" remote="true"/>
    <label id="messageLog" value="" crop="center"/>
  </window>
-diff --git a/layout/ipc/test-ipcbrowser.xul b/layout/ipc/test-ipcbrowser.xul
-index 237ba61..7603d7d 100644
---- a/layout/ipc/test-ipcbrowser.xul
-+++ b/layout/ipc/test-ipcbrowser.xul
+diff -Nur mozilla-release.orig/layout/ipc/test-ipcbrowser.xul mozilla-release/layout/ipc/test-ipcbrowser.xul
+--- mozilla-release.orig/layout/ipc/test-ipcbrowser.xul	2013-10-25 20:27:28.000000000 -0200
++++ mozilla-release/layout/ipc/test-ipcbrowser.xul	2013-11-05 03:57:12.982325866 -0200
 @@ -73,6 +73,6 @@
         label="setViewportScale"/>
    </toolbar>
@@ -645,11 +689,10 @@ index 237ba61..7603d7d 100644
 +  <browser type="content" src="https://duckduckgo.com/html" flex="1" id="content"
             remote="true"/>
  </window>
-diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
-index 3b67260..29f7730 100644
---- a/modules/libpref/src/init/all.js
-+++ b/modules/libpref/src/init/all.js
-@@ -4190,20 +4190,6 @@ pref("memory.ghost_window_timeout_seconds", 60);
+diff -Nur mozilla-release.orig/modules/libpref/src/init/all.js mozilla-release/modules/libpref/src/init/all.js
+--- mozilla-release.orig/modules/libpref/src/init/all.js	2013-11-05 03:52:59.219584174 -0200
++++ mozilla-release/modules/libpref/src/init/all.js	2013-11-05 03:57:12.985658973 -0200
+@@ -4255,20 +4255,6 @@
  // Disable freeing dirty pages when minimizing memory.
  pref("memory.free_dirty_pages", false);
  
diff --git a/libre/iceweasel-libre/replace-urls.txt b/libre/iceweasel-libre/replace-urls.txt
index fc13e32fb..278dd1a74 100644
--- a/libre/iceweasel-libre/replace-urls.txt
+++ b/libre/iceweasel-libre/replace-urls.txt
@@ -2,24 +2,24 @@
 # These are whitespace-separated EREs, comments are lines starting with '#'
 
 https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/dictionaries/?(\?[^"']*)?   https://parabolagnulinux.org/packages/\?repo=Extra\&q=hunspell-
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/plugins/?(\?[^"']*)?        https://gnuzilla.gnu.org/plugins/
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/personas/?(\?[^"']*)?       https://www.gnu.org/software/gnuzilla/addons.html
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/recommended/?(\?[^"']*)?    https://www.gnu.org/software/gnuzilla/addons.html
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search-engines/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html#search%20engines
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search/?(\?[^"']*)?         https://www.gnu.org/software/gnuzilla/addons.html
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/themes/?(\?[^"']*)?         https://www.gnu.org/software/gnuzilla/addons.html#themes
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?"               https://www.gnu.org/software/gnuzilla/addons.html"
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?$               https://www.gnu.org/software/gnuzilla/addons.html
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/plugins/?(\?[^"']*)?        http://directory.fsf.org/wiki/GNU_IceCat
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/personas/?(\?[^"']*)?       http://directory.fsf.org/wiki/GNU_IceCat
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/recommended/?(\?[^"']*)?    http://directory.fsf.org/wiki/GNU_IceCat
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search-engines/?(\?[^"']*)? http://directory.fsf.org/wiki/GNU_IceCat
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search/?(\?[^"']*)?         http://directory.fsf.org/wiki/GNU_IceCat
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/themes/?(\?[^"']*)?         http://directory.fsf.org/wiki/GNU_IceCat
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?"               http://directory.fsf.org/wiki/GNU_IceCat"
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?$               http://directory.fsf.org/wiki/GNU_IceCat
 
-https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/ https://www.gnu.org/software/gnuzilla/addons.html
+https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/ http://directory.fsf.org/wiki/GNU_IceCat
 
-https?://services\.addons\.mozilla\.org/(%LOCALE%|@AB_CD@|en-US|ru)/([a-zA-Z%-]+)/  https://www.gnu.org/software/gnuzilla/addons.html#bogus-services.\2/
+https?://services\.addons\.mozilla\.org/(%LOCALE%|@AB_CD@|en-US|ru)/([a-zA-Z%-]+)/  http://directory.fsf.org/wiki/GNU_IceCat.\2/
 
-https?://pfs\.mozilla\.org/plugins/PluginFinderService\.php             https://gnuzilla.gnu.org/plugins/PluginFinderService.php
+https?://pfs\.mozilla\.org/plugins/PluginFinderService\.php             http://directory.fsf.org/wiki/GNU_IceCat
 #https?://versioncheck\.addons\.mozilla\.org/update/VersionCheck\.php
 #https?://versioncheck-bg\.addons\.mozilla\.org/update/VersionCheck\.php
 
-"https?://addons\.mozilla\.org/" "https://www.gnu.org/software/gnuzilla/addons.html"
+"https?://addons\.mozilla\.org/" "http://directory.fsf.org/wiki/GNU_IceCat"
 
 # hack: these aren't URLs, per se
-(addonsBrowseAll\.description\s*=.*)addons\.mozilla\.org \1gnu.org/software/gnuzilla/addons.html
+(addonsBrowseAll\.description\s*=.*)addons\.mozilla\.org \1directory.fsf.org/wiki/GNU_IceCat
diff --git a/libre/iceweasel-libre/vendor.js b/libre/iceweasel-libre/vendor.js
index 91414dbbd..6510944a7 100644
--- a/libre/iceweasel-libre/vendor.js
+++ b/libre/iceweasel-libre/vendor.js
@@ -8,17 +8,15 @@ pref("browser.shell.checkDefaultBrowser", false);
 pref("extensions.autoDisableScopes", 11);
 pref("extensions.shownSelectionUI", true);
 
+// Disable Social API
+pref("social.remote-install.enabled", false);
+
 // Make sure that safebrowsing is disabled
 pref("browser.safebrowsing.enabled", false);
 pref("browser.safebrowsing.malware.enabled", false);
 
-pref("keyword.URL", "");
-pref("app.update.enabled", false);
-pref("app.update.auto", false);
+// Disable localstorage for privacy reasons.
 pref("dom.storage.enabled", false);
 
-// Disable Social API
-pref("social.remote-install.enabled", false);
-
 // Disable missing nonfree flash notification
 pref("plugins.notifyMissingFlash", false);
diff --git a/libre/ipsec-tools-libre/PKGBUILD b/libre/ipsec-tools-libre/PKGBUILD
index 373c83942..eb7a846bb 100644
--- a/libre/ipsec-tools-libre/PKGBUILD
+++ b/libre/ipsec-tools-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91859 2013-05-28 17:36:54Z spupykin $
+# $Id: PKGBUILD 100177 2013-11-01 20:59:04Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Allan Henriksen <allan.henriksen@gmail.com>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
@@ -6,7 +6,7 @@
 _pkgname=ipsec-tools
 pkgname=ipsec-tools-libre
 pkgver=0.8.1
-pkgrel=4
+pkgrel=5
 pkgdesc="KAME IPSec tools ported to Linux (built for the linux-libre-headers package)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ipsec-tools.sourceforge.net/"
@@ -16,7 +16,7 @@ replaces=$_pkgname
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
 license=('GPL')
-options=('!makeflags' '!libtool')
+options=('!makeflags')
 source=(http://downloads.sourceforge.net/sourceforge/ipsec-tools/$_pkgname-$pkgver.tar.bz2
 	racoon.service
 	ipsec.service
diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD
index 0c109a5d1..89119a29b 100644
--- a/libre/luxrender-libre/PKGBUILD
+++ b/libre/luxrender-libre/PKGBUILD
@@ -5,14 +5,14 @@
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 _pkgname=luxrender
 pkgname=$_pkgname-libre
-pkgver=1.2.1
-_pkgver=3066b2161439
-pkgrel=5
+pkgver=1.3
+_pkgver=523432614aa5
+pkgrel=1.1
 pkgdesc="Rendering system for physically correct, unbiased image synthesis, without nonfree OpenCL recommendation"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.$_pkgname.net/"
 license=('GPL')
-depends=('boost-libs' 'freeimage' 'openexr' 'libcl-libre' 'mesa-libgl')
+depends=('boost-libs' 'freeimage' 'openexr' 'mesa-libcl' 'mesa-libgl' 'fftw')
 optdepends=('blender-addon-luxrender: Blender for renderer and exporter' 'qt4: Qt GUI' \
             'python: Python interface (pylux)')
 makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python' 'opencl-headers')
@@ -20,28 +20,13 @@ makedepends+=('gcc-lts')
 provides=($_pkgname=$pkgver)
 conflicts=$_pkgname
 replaces=$_pkgname
-source=(https://bitbucket.org/$_pkgname/lux/get/$_pkgver.tar.bz2
-        boost-1.53-shared_array_constructor.diff)
-md5sums=(
-  '87958798c164ad14f92fb4af2595d332'
-  'dd19c7ac2ba8c9b703018a176ef77f98')
-
-prepare() {
-  cd "$srcdir"/$_pkgname-lux-$_pkgver
-
-  # fix the installation
-  sed -i '/.*wxgui.*/ d
-          s|-ftree-vectorize ||
-         ' CMakeLists.txt
-  # fix for boost 1.53
-  patch -Np1 < "$srcdir/boost-1.53-shared_array_constructor.diff" || true
-
-  export CXXFLAGS="$CXXFLAGS -lpthread"
-}
+source=(https://bitbucket.org/$_pkgname/lux/get/$_pkgver.tar.bz2)
+md5sums=('fad0fae0866e578ca6f5b3f3903d0c9f')
 
 build() {
   cd "$srcdir"/$_pkgname-lux-$_pkgver
 
+  export CXXFLAGS="$CXXFLAGS -lpthread"
   cmake . -DCMAKE_INSTALL_PREFIX=/usr \
     -DLUXRAYS_DISABLE_OPENCL=OFF \
     -DPYTHON_CUSTOM=ON \
@@ -52,7 +37,7 @@ build() {
 
 package() {
   cd "$srcdir"/$_pkgname-lux-$_pkgver
-  setarch $CARCH make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" install
 
   # fix library path on 64bit
   [[ $CARCH == x86_64 ]] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib
diff --git a/libre/luxrender-libre/boost-1.53-shared_array_constructor.diff b/libre/luxrender-libre/boost-1.53-shared_array_constructor.diff
deleted file mode 100644
index a6a8d532b..000000000
--- a/libre/luxrender-libre/boost-1.53-shared_array_constructor.diff
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -rup luxrender-lux-3066b2161439/cmake/luxrender.cmake luxrender-lux-3066b2161439.new/cmake/luxrender.cmake
---- luxrender-lux-3066b2161439/cmake/luxrender.cmake	2013-03-16 19:32:24.000000000 +0000
-+++ luxrender-lux-3066b2161439.new/cmake/luxrender.cmake	2013-03-26 18:26:46.194520697 +0000
-@@ -98,7 +98,7 @@ IF(QT4_FOUND)
- 
- 	QT4_ADD_RESOURCES( LUXQTGUI_RC_SRCS ${LUXQTGUI_RCS})
- 	QT4_WRAP_UI( LUXQTGUI_UI_HDRS ${LUXQTGUI_UIS} )
--	QT4_WRAP_CPP( LUXQTGUI_MOC_SRCS ${LUXQTGUI_MOC} )
-+	QT4_WRAP_CPP( LUXQTGUI_MOC_SRCS ${LUXQTGUI_MOC} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED -DBOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
- 
- 	#file (GLOB TRANSLATIONS_FILES qtgui/translations/*.ts)
- 	#qt4_create_translation(QM_FILES ${FILES_TO_TRANSLATE} ${TRANSLATIONS_FILES})
-diff -rup luxrender-lux-3066b2161439/core/film.cpp luxrender-lux-3066b2161439.new/core/film.cpp
---- luxrender-lux-3066b2161439/core/film.cpp	2013-03-16 19:32:24.000000000 +0000
-+++ luxrender-lux-3066b2161439.new/core/film.cpp	2013-03-26 18:03:02.828222310 +0000
-@@ -890,8 +890,8 @@ Film::Film(u_int xres, u_int yres, Filte
- 	filename(filename1),
- 	colorSpace(0.63f, 0.34f, 0.31f, 0.595f, 0.155f, 0.07f, 0.314275f, 0.329411f), // default is SMPTE
- 	convTest(NULL), varianceBuffer(NULL),
--	noiseAwareMap(NULL), noiseAwareMapVersion(0),
--	userSamplingMapFileName(samplingmapfilename), userSamplingMap(NULL), userSamplingMapVersion(0),
-+	noiseAwareMapVersion(0),
-+	userSamplingMapFileName(samplingmapfilename), userSamplingMapVersion(0),
- 	ZBuffer(NULL), use_Zbuf(useZbuffer),
- 	debug_mode(debugmode), premultiplyAlpha(premult),
- 	writeResumeFlm(w_resume_FLM), restartResumeFlm(restart_resume_FLM), writeFlmDirect(write_FLM_direct),
-diff -rup luxrender-lux-3066b2161439/samplers/lowdiscrepancy.cpp luxrender-lux-3066b2161439.new/samplers/lowdiscrepancy.cpp
---- luxrender-lux-3066b2161439/samplers/lowdiscrepancy.cpp	2013-03-16 19:32:24.000000000 +0000
-+++ luxrender-lux-3066b2161439.new/samplers/lowdiscrepancy.cpp	2013-03-26 18:03:02.828222310 +0000
-@@ -29,7 +29,7 @@
- using namespace lux;
- 
- LDSampler::LDData::LDData(const Sampler &sampler, int xPixelStart, int yPixelStart, u_int pixelSamples) :
--	samplingMap(NULL), noiseAwareMapVersion(0), userSamplingMapVersion(0) {
-+	noiseAwareMapVersion(0), userSamplingMapVersion(0) {
- 	xPos = xPixelStart - 1;
- 	yPos = yPixelStart;
- 	samplePos = pixelSamples - 1;
-diff -rup luxrender-lux-3066b2161439/samplers/metrosampler.cpp luxrender-lux-3066b2161439.new/samplers/metrosampler.cpp
---- luxrender-lux-3066b2161439/samplers/metrosampler.cpp	2013-03-16 19:32:24.000000000 +0000
-+++ luxrender-lux-3066b2161439.new/samplers/metrosampler.cpp	2013-03-26 18:13:13.146702871 +0000
-@@ -39,7 +39,7 @@ static const u_int rngA = 884;
- MetropolisSampler::MetropolisData::MetropolisData(const MetropolisSampler &sampler) :
- 	consecRejects(0), stamp(0), currentStamp(0), weight(0.f),
- 	LY(0.f), alpha(0.f), totalLY(0.f), sampleCount(0.f),
--	samplingMap(NULL), noiseAwareMapVersion(0), userSamplingMapVersion(0),
-+	noiseAwareMapVersion(0), userSamplingMapVersion(0),
- 	large(true), cooldown(sampler.cooldownTime > 0)
- {
- 	u_int i;
-diff -rup luxrender-lux-3066b2161439/samplers/random.cpp luxrender-lux-3066b2161439.new/samplers/random.cpp
---- luxrender-lux-3066b2161439/samplers/random.cpp	2013-03-16 19:32:24.000000000 +0000
-+++ luxrender-lux-3066b2161439.new/samplers/random.cpp	2013-03-26 18:12:34.378868365 +0000
-@@ -30,7 +30,7 @@ using namespace lux;
- 
- RandomSampler::RandomData::RandomData(const Sampler &sampler, int xPixelStart,
- 	int yPixelStart, u_int pixelSamples) :
--	samplingMap(NULL), noiseAwareMapVersion(0), userSamplingMapVersion(0)
-+	noiseAwareMapVersion(0), userSamplingMapVersion(0)
- {
- 	xPos = xPixelStart;
- 	yPos = yPixelStart;
diff --git a/libre/mplayer-libre/0001-demux_gif-declare-missing-PrintGifError.patch b/libre/mplayer-libre/0001-demux_gif-declare-missing-PrintGifError.patch
deleted file mode 100644
index c8a527cf3..000000000
--- a/libre/mplayer-libre/0001-demux_gif-declare-missing-PrintGifError.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 5194f95d39ffbb0a4a7b027d8f1b084436feb22c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= <b@bpiotrowski.pl>
-Date: Sun, 14 Jul 2013 10:51:11 +0200
-Subject: [PATCH] demux_gif: declare missing PrintGifError
-
-Apparently it has been removed from newer Giflib releases.
----
- libmpdemux/demux_gif.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/libmpdemux/demux_gif.c b/libmpdemux/demux_gif.c
-index eee7a85..3d761c0 100644
---- a/libmpdemux/demux_gif.c
-+++ b/libmpdemux/demux_gif.c
-@@ -44,6 +44,16 @@ typedef struct {
- 
- #define GIF_SIGNATURE (('G' << 16) | ('I' << 8) | 'F')
- 
-+static void PrintGifError(void)
-+{
-+  char *Err = GifErrorString();
-+
-+  if (Err != NULL)
-+    fprintf(stderr, "\nGIF-LIB error: %s.\n", Err);
-+  else
-+    fprintf(stderr, "\nGIF-LIB undefined error %d.\n", GifError());
-+}
-+
- #ifndef CONFIG_GIF_TVT_HACK
- // not supported by certain versions of the library
- static int my_read_gif(GifFileType *gif, uint8_t *buf, int len)
--- 
-1.8.3.2
-
diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD
index 717b56af5..3f8b45dfe 100644
--- a/libre/mplayer-libre/PKGBUILD
+++ b/libre/mplayer-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 197402 2013-10-25 12:27:32Z giovanni $
+# $Id: PKGBUILD 198698 2013-11-02 08:09:59Z bpiotrowski $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
@@ -7,33 +7,41 @@
 _pkgbase=mplayer
 pkgbase=mplayer-libre
 pkgname=('mplayer-libre' 'mencoder-libre')
-pkgver=36285
-pkgrel=5
+pkgver=36498
+pkgrel=2
 arch=('i686' 'x86_64')
-makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
-'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils'  'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx'
-'libpulse' 'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' 'libcdio-paranoia' 'subversion')
+makedepends=(
+    'libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora'
+    'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'jack' 'libcaca'
+    'x264' 'faad2' 'lirc-utils'  'libxvmc' 'enca' 'libvdpau' 'opencore-amr'
+    'libdca' 'a52dec' 'schroedinger' 'libvpx' 'libpulse' 'fribidi' 'unzip' 'mesa'
+    'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray'
+    'libcdio-paranoia' 'opus'
+    )
 license=('GPL')
-url="http://www.mplayerhq.hu/"
+url='http://www.mplayerhq.hu/'
 options=('!buildflags' '!emptydirs')
 source=(ftp://ftp.archlinux.org/other/packages/$_pkgbase/$_pkgbase-$pkgver.tar.xz
+        http://ffmpeg.org/releases/ffmpeg-2.1.tar.bz2
         mplayer.desktop
         cdio-includes.patch
-        0001-demux_gif-declare-missing-PrintGifError.patch)
-md5sums=('5e4f0d4d039b0219514cf52ae6da831d'
-         'c0d6ef795cf6de48e3b87ff7c23f0319'
+        include-samba-4.0.patch)
+md5sums=('8b856e8833d910b6e38b04bb8453d0dc'
+         '4ec1cedd4c7753512462f70b347c338a'
+         '62f44a58f072b2b1a3c3d3e4976d64b3'
          '7b5be7191aafbea64218dc4916343bbc'
-         '12a2a5b79849d57eab60a1bfec2978c4')
+         '868a92bdef148df7f38bfa992b26ce9d')
 
 prepare() {
-    cd "$srcdir/$_pkgbase-$pkgver"
+    cd $_pkgbase-$pkgver
+    patch -p0 -i ../cdio-includes.patch
+    patch -p1 -i ../include-samba-4.0.patch
 
-    patch -Np0 -i ../cdio-includes.patch
-    patch -Np1 -i ../0001-demux_gif-declare-missing-PrintGifError.patch
+    mv ../ffmpeg-2.1 ./ffmpeg
 }
 
 build() {
-    cd "$srcdir/$_pkgbase-$pkgver"
+    cd $_pkgbase-$pkgver
 
     ./configure --prefix=/usr \
         --enable-runtime-cpudetection \
@@ -51,9 +59,10 @@ build() {
         --enable-xvmc \
         --enable-radio \
         --enable-radio-capture \
+        --enable-smb \
         --language=all \
         --confdir=/etc/mplayer 
-    [ "$CARCH" = "i686" ] &&  sed 's|-march=i486|-march=i686|g' -i config.mak
+    [[ "$CARCH" = "i686" ]] &&  sed 's|-march=i486|-march=i686|g' -i config.mak
 
     make
 }
@@ -62,34 +71,50 @@ package_mplayer-libre() {
     pkgdesc="A movie player for GNU/Linux, without nonfree faac support"
     install=mplayer.install
     backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
-    depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx' 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig'  'libgl'
-    'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi'
-    'libjpeg' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass' 'libxxf86vm' 'libbluray' 'libcdio-paranoia')
+    depends=(
+        'desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx'
+        'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig'
+        'libgl' 'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore'
+        'opencore-amr' 'jack' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga'
+        'fribidi' 'libjpeg' 'faad2' 'libxvmc' 'schroedinger' 'mpg123'
+        'libass' 'libxxf86vm' 'libbluray' 'libcdio-paranoia' 'opus'
+    )
     provides=("mplayer=$pkgver")
     replaces=('mplayer')
     conflicts=('mplayer')
 
-    cd "$srcdir/$_pkgbase-$pkgver"
-
+    cd $_pkgbase-$pkgver
     make DESTDIR="$pkgdir" install-mplayer install-mplayer-man
-    install -Dm644 etc/{codecs.conf,input.conf,example.conf} "$pkgdir/etc/mplayer/"
+
+    install -Dm644 etc/{codecs.conf,input.conf,example.conf} \
+        "$pkgdir/etc/mplayer/"
+
     install -dm755 "$pkgdir/usr/share/mplayer/"
-    ln -s /usr/share/fonts/TTF/DejaVuSans.ttf "$pkgdir/usr/share/mplayer/subfont.ttf"
+    ln -s /usr/share/fonts/TTF/DejaVuSans.ttf \
+        "$pkgdir/usr/share/mplayer/subfont.ttf"
     rm -rf "$pkgdir/usr/share/mplayer/font"
+
     #desktop file  FS#14770
-    install -Dm644 "$srcdir/mplayer.desktop" "$pkgdir/usr/share/applications/mplayer.desktop"
-    install -Dm644 etc/mplayer256x256.png "$pkgdir/usr/share/pixmaps/mplayer.png"
+    install -Dm644 "$srcdir/mplayer.desktop" \
+        "$pkgdir/usr/share/applications/mplayer.desktop"
+    install -Dm644 etc/mplayer256x256.png \
+        "$pkgdir/usr/share/pixmaps/mplayer.png"
 }
 
 package_mencoder-libre() {
     pkgdesc="Free command line video decoding, encoding and filtering tool, without nonfree faac support"
-    depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr'
-    'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faad2' 'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio-paranoia' 'libvorbis')
+    depends=(
+        'enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame'
+        'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore'
+        'opencore-amr' 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faad2'
+        'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio-paranoia'
+        'libvorbis' 'opus'
+        )
     provides=("mencoder=$pkgver")
     replaces=('mencoder')
     conflicts=('mencoder')
 
-    cd "$srcdir/$_pkgbase-$pkgver"
+    cd $_pkgbase-$pkgver
     make DESTDIR="$pkgdir" install-mencoder install-mencoder-man
     find "$pkgdir/usr/share/man" -name mplayer.1 -exec rename mplayer.1 mencoder.1 {} +
 }
diff --git a/libre/mplayer-libre/include-samba-4.0.patch b/libre/mplayer-libre/include-samba-4.0.patch
new file mode 100644
index 000000000..2ed272b6a
--- /dev/null
+++ b/libre/mplayer-libre/include-samba-4.0.patch
@@ -0,0 +1,12 @@
+diff -rupN a/stream/stream_smb.c b/stream/stream_smb.c
+--- a/stream/stream_smb.c	2013-03-16 13:38:34.000000000 +0000
++++ b/stream/stream_smb.c	2013-10-31 20:05:32.473947926 +0000
+@@ -18,7 +18,7 @@
+ 
+ #include "config.h"
+ 
+-#include <libsmbclient.h>
++#include <samba-4.0/libsmbclient.h>
+ #include <unistd.h>
+ 
+ #include "mp_msg.h"
diff --git a/libre/mplayer-libre/mplayer.desktop b/libre/mplayer-libre/mplayer.desktop
index 07acea13f..946b8e345 100644
--- a/libre/mplayer-libre/mplayer.desktop
+++ b/libre/mplayer-libre/mplayer.desktop
@@ -19,3 +19,4 @@ Terminal=false
 NoDisplay=true
 Categories=GTK;AudioVideo;Audio;Video;Player;TV;
 MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg;video/x-mpeg2;video/mp4;video/msvideo;video/x-msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/x-fli;video/x-flv;video/x-theora;video/x-matroska;
+X-KDE-Protocols=http,ftp,smb
diff --git a/libre/netsurf-libre/PKGBUILD b/libre/netsurf-libre/PKGBUILD
index d3c6463a2..bcb40c614 100644
--- a/libre/netsurf-libre/PKGBUILD
+++ b/libre/netsurf-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 95886 2013-08-18 11:31:23Z arodseth $
+# $Id: PKGBUILD 100033 2013-10-31 10:58:22Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Paulo Matias <matiasΘarchlinux-br·org>
 # Contributor: Georgij Kondratjev <smpuj@bk.ru>
@@ -8,7 +8,7 @@
 _pkgname=netsurf
 pkgname=netsurf-libre
 pkgver=3.0
-pkgrel=4
+pkgrel=5
 pkgdesc='Lightweight and fast web browser, without non-privacy search providers'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://www.netsurf-browser.org/'
@@ -20,9 +20,11 @@ depends=('gtk2' 'libmng' 'curl' 'librsvg' 'desktop-file-utils' 'libnsbmp' 'libns
 makedepends=('js' 're2c' 'gendesk' 'netsurf-buildsystem' 'libglade' 'addinclude')
 install="$_pkgname.install"
 source=("netsurf.png::http://ubuntu.allmyapps.com/data/n/e/netsurf-netsurf-web-browser/icon_48x48_netsurf.png"
-        "http://download.$_pkgname-browser.org/$_pkgname/releases/source/$_pkgname-$pkgver-src.tar.gz")
+        "http://download.$_pkgname-browser.org/$_pkgname/releases/source/$_pkgname-$pkgver-src.tar.gz"
+        'netsurf.sh')
 sha256sums=('f0dbcc5d80bf03d706aa8b28a322aa7f169a40813848c2d1505691f6e2c7ef00'
-            '7c6a48d3cc3e9a3e3a51b532ddf60f7697e97bf8b61a6d3b2ced1a2e89fbccc6')
+            '7c6a48d3cc3e9a3e3a51b532ddf60f7697e97bf8b61a6d3b2ced1a2e89fbccc6'
+            '3efaf14b95c9aeb83caac488135bd5b6040d2ede382caa5589ff7ebd2bd506cc')
 
 prepare() {
   cd "$_pkgname-$pkgver"
@@ -115,6 +117,8 @@ package() {
   cd "$_pkgname-$pkgver"
 
   make install PREFIX=/usr DESTDIR="$pkgdir"
+  mv "$pkgdir/usr/bin/$_pkgname" "$pkgdir/usr/bin/$_pkgname.elf"
+  install -Dm755 "../$_pkgname.sh" "$pkgdir/usr/bin/$_pkgname"
   install -Dm644 "../$_pkgname.png" "$pkgdir/usr/share/pixmaps/$_pkgname.png"
   install -Dm644 "$_pkgname.desktop" \
     "$pkgdir/usr/share/applications/$_pkgname.desktop"
diff --git a/libre/netsurf-libre/netsurf.sh b/libre/netsurf-libre/netsurf.sh
new file mode 100644
index 000000000..49b1e161e
--- /dev/null
+++ b/libre/netsurf-libre/netsurf.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+shortname=`echo $LANG | cut -b1-2`
+if [[ -d /usr/share/netsurf/$shortname ]]; then
+	/usr/bin/netsurf.elf "$@"
+else
+	LANG=en_US /usr/bin/netsurf.elf "$@"
+fi
diff --git a/libre/sdl-libre/PKGBUILD b/libre/sdl-libre/PKGBUILD
index e16042e95..e745c3dbe 100644
--- a/libre/sdl-libre/PKGBUILD
+++ b/libre/sdl-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 197193 2013-10-23 17:24:50Z heftig $
+# $Id: PKGBUILD 198628 2013-10-31 13:07:39Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
@@ -8,7 +8,7 @@
 
 pkgname=sdl-libre
 pkgver=1.2.15
-pkgrel=4
+pkgrel=5
 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard"
 arch=('i686' 'x86_64')
 url="http://www.libsdl.org"
@@ -20,7 +20,7 @@ depends=('glibc' 'libxext' 'libxrender' 'libx11')
 makedepends=('alsa-lib' 'mesa' 'libpulse' 'glu')
 optdepends=('alsa-lib: ALSA audio driver'
             'libpulse: PulseAudio audio driver')
-options=('!libtool')
+options=('staticlibs')
 source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz
         sdl-1.2.14-fix-mouse-clicking.patch
         sdl-1.2.14-disable-mmx.patch
diff --git a/libre/syslinux/PKGBUILD b/libre/syslinux/PKGBUILD
index 35a17b630..ad30022df 100644
--- a/libre/syslinux/PKGBUILD
+++ b/libre/syslinux/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname="syslinux"
 pkgver="6.02"
-pkgrel="3"
+pkgrel="4"
 arch=('x86_64' 'i686')
 pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE (Parabola rebranded)"
 url="http://syslinux.zytor.com/"
@@ -22,19 +22,17 @@ optdepends=('perl-passwd-md5:  For md5pass'
             'util-linux:       For isohybrid'
             'efibootmgr:       For EFI support'
             'dosfstools:       For EFI support')
-md5sums=('6f275813a1b08cf852e55c0a3f8fbc78'
-         'f048880b57e2c5a7017ff8804bfda327'
-         '0e7d47e1f791f0c5e7bd40ed5c6d80cc'
-         '9dbede6b71a4de9e46aac4aad65334d7'
-         'cb46ca47c6b6323127d908440057d98f')
-
 install="${pkgname}.install"
-
 source=("https://www.kernel.org/pub/linux/utils/boot/syslinux/${pkgname}-${pkgver}.tar.xz"
         'syslinux.cfg'
         'syslinux-install_update'
         'syslinux-6.02-fix-chainloading.patch'
         'splash.png')
+md5sums=('6f275813a1b08cf852e55c0a3f8fbc78'
+         'f048880b57e2c5a7017ff8804bfda327'
+         '9da2b8b25ea8d628887f11749dc3fffa'
+         '9dbede6b71a4de9e46aac4aad65334d7'
+         'cb46ca47c6b6323127d908440057d98f')
 
 _build_syslinux_bios() {
     
diff --git a/libre/syslinux/syslinux-install_update b/libre/syslinux/syslinux-install_update
index 4dc09696a..251b9c482 100644
--- a/libre/syslinux/syslinux-install_update
+++ b/libre/syslinux/syslinux-install_update
@@ -1,7 +1,8 @@
 #!/usr/bin/env bash
 #
 # Syslinux Installer / Updater Script (for BIOS only)
-# Copyright (C) 2013  Matthew Gyurgyik <pyther@pyther.net>
+# Copyright (C) 2011-2013  Matthew Gyurgyik <pyther@pyther.net>
+# Copyright (C) 2013  Keshav Padram Amburay <(the) (ddoott) (ridikulus) (ddoott) (rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -18,19 +19,23 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 #-----------------
+# ChangeLog:
+# 2013-10-23 : Keshav Padram Amburay : Updated script to work with Syslinux 6.02 Parabola GNU/Linux-libre pkg
+# 2013-10-30 : André Silva : Rebranded script for Parabola
+#-----------------
 # Exit Codes:
 #   1 - get_boot_device or other function failed
 #   2 - install/update failed
 #   3 - set_active failed
 #   4 - install_mbr failed
-#
+#-----------------
+
 shopt -s nullglob
 
-bios_libpath="/usr/lib/syslinux/bios/"
-bios_bootpath="/boot/syslinux/"
+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"
 
@@ -294,34 +299,22 @@ install_mbr() {
 }
 
 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 all syslinux *.c32 modules to /boot
+    rm "$bios_bootpath"/*.c32 &> /dev/null
+    cp "$bios_libpath"/*.c32 "$bios_bootpath"/ &> /dev/null
 
     # Copy / Symlink pci.ids if pci.ids exists on the FS
-    if [[ -f $pciids_file ]]; then
+    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
+        cp "$pciids_file" "$bios_bootpath/pci.ids" &> /dev/null
     fi
 }
 
 _install() {
     install_modules
 
-    if device_is_raid "$bootpart"; then
-        echo "Detected RAID on /boot"
+    if device_is_raid "$bootpart" ; then
+        echo "Detected RAID on /boot - installing Syslinux with --raid"
         "$EXTLINUX" --install "$bios_bootpath" --raid &> /dev/null
     else
         "$EXTLINUX" --install "$bios_bootpath" &> /dev/null
@@ -340,8 +333,8 @@ _install() {
 update() {
     install_modules
 
-    if device_is_raid $bootpart; then
-        echo "Detected RAID on /boot"
+    if device_is_raid "$bootpart" ; then
+        echo "Detected RAID on /boot - installing Syslinux with --raid"
         "$EXTLINUX" --update "$bios_bootpath" --raid &> /dev/null
     else
         "$EXTLINUX" --update "$bios_bootpath" &> /dev/null
@@ -404,18 +397,18 @@ if [[ $USAGE ]]; then
     exit 0
 fi
 
-# Make sure only root can run our script
-if (( $(id -u) != 0 )); then
-    echo "This script must be run as root" 1>&2
-    exit 1
-fi
-
 # Display Usage Information if both Install and Update are passed
 if [[ $INSTALL && $UPDATE ]]; then
     usage
     exit 1
 fi
 
+# Make sure only root can run our script
+if (( $(id -u) != 0 )); then
+    echo "This script must be run as root" 1>&2
+    exit 1
+fi
+
 # If a chroot dir is path set variables to reflect chroot
 if [[ "$CHROOT" ]]; then
     bios_libpath="$CHROOT$bios_libpath"
diff --git a/libre/syslinux/syslinux.install b/libre/syslinux/syslinux.install
index ac8553a97..7dc7a43c1 100644
--- a/libre/syslinux/syslinux.install
+++ b/libre/syslinux/syslinux.install
@@ -26,7 +26,7 @@ post_upgrade() {
       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 "==> If (/ and /boot on separate fs):"
       echo "==>   # cp /usr/lib/syslinux/bios/*.c32 /boot/syslinux"
       echo "==> If (/ and /boot on same fs):"
       echo "==>   # ln -s /usr/lib/syslinux/bios/*.c32 /boot/syslinux"
diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD
index 21c12b87b..e43f8e70f 100644
--- a/libre/texlive-bin-libre/PKGBUILD
+++ b/libre/texlive-bin-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196425 2013-10-13 13:31:56Z andyrtr $
+# $Id: PKGBUILD 197649 2013-10-27 17:39:24Z remy $
 # Maintainer: Rémy Oudompheng <remy@archlinux.org>
 # Contributor: francois <francois.archlinux.org>
 # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
@@ -6,7 +6,7 @@
 
 pkgname=texlive-bin-libre
 pkgver=2013.30973
-pkgrel=5
+pkgrel=6
 pkgdesc="TeX Live binaries, without biber binaries (Parabola rebranded)"
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
@@ -63,6 +63,8 @@ build() {
      --disable-t1utils \
      --disable-bibtexu \
      --disable-xz \
+     --enable-shared \
+     --disable-static \
      --with-system-zlib \
      --with-system-zziplib \
      --with-system-pnglib \
diff --git a/libre/xbmc-libre/PKGBUILD b/libre/xbmc-libre/PKGBUILD
index cb48c5d90..23d389d52 100644
--- a/libre/xbmc-libre/PKGBUILD
+++ b/libre/xbmc-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 94534 2013-07-26 12:25:32Z spupykin $
+# $Id: PKGBUILD 100487 2013-11-05 08:57:03Z bpiotrowski $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
@@ -10,7 +10,7 @@ _prefix=/usr
 _pkgname=xbmc
 pkgname=xbmc-libre
 pkgver=12.2
-pkgrel=5
+pkgrel=6
 pkgdesc="A software media player and entertainment hub for digital media, with libarchive recommendation"
 arch=('i686' 'x86_64')
 url="http://xbmc.org"
diff --git a/pcr/czmq/PKGBUILD b/pcr/czmq/PKGBUILD
new file mode 100644
index 000000000..2cb94125c
--- /dev/null
+++ b/pcr/czmq/PKGBUILD
@@ -0,0 +1,27 @@
+# Contributor: Brian Knox <taotetek at gmail.com>
+# Maintainer: Brian Knox <taotetek at gmail.com>
+pkgname=czmq
+pkgver=2.0.2
+pkgrel=1
+pkgdesc="High level C API for ZeroMQ"
+arch=(i686 x86_64)
+url="http://czmq.zeromq.org/"
+license=('LGPL')
+depends=('zeromq')
+makedepends=('asciidoc' 'xmlto')
+options=(!libtool)
+source=(http://download.zeromq.org/${pkgname}-${pkgver}.tar.gz)
+
+sha1sums=('9a78ea2bf2100863eefdd0512c77486ebd1e2587')
+sha256sums=('75115c2a89facf7f706bc24d0cd09ad0cc4f173a6b6b242743a7ed4ffa7a791b')
+
+build() {
+  cd "$srcdir/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/${pkgname}-${pkgver}"
+  make DESTDIR="$pkgdir/" install
+}
diff --git a/pcr/eigen3/PKGBUILD b/pcr/eigen3/PKGBUILD
index a1e186325..240b55f8a 100644
--- a/pcr/eigen3/PKGBUILD
+++ b/pcr/eigen3/PKGBUILD
@@ -4,7 +4,7 @@
 # Maintainer: Parabola GNU / Linux-libre Aurélien Desbrières <aurelien@cwb.IO>
 
 pkgname=eigen3
-pkgver=3.1.2
+pkgver=3.2.0
 pkgrel=1
 pkgdesc="Eigen is a lightweight C++ template library for vector and matrix math, a.k.a. linear algebra."
 arch=('any')
@@ -12,6 +12,7 @@ url='http://eigen.tuxfamily.org'
 license=('MPL2')
 makedepends=('cmake' 'pkgconfig')
 source=("${pkgname}-${pkgver}.tar.bz2::http://bitbucket.org/eigen/eigen/get/${pkgver}.tar.bz2")
+sha512sums=ab30077c845b09aa3f652e4695f1e256c7c7ff1c0f850e38cf9867ab9659ec6008fa646c2796796ca718b996764e7e3d2811a2c6a24abacbe50a2513fc670ca5
 
 build() {
     mkdir -p "$srcdir"/build
diff --git a/pcr/filemq/PKGBUILD b/pcr/filemq/PKGBUILD
new file mode 100644
index 000000000..57f5eb69d
--- /dev/null
+++ b/pcr/filemq/PKGBUILD
@@ -0,0 +1,34 @@
+pkgname=filemq
+pkgver=v1.0a.r124.gd2d6274
+pkgrel=1
+pkgdesc="Chunked, flow-controlled, restartable, cancellable, async, multicast file transfer ØMQ protocol"
+url="https://github.com/zeromq/filemq"
+license=('GPL3' 'LGPL3')
+depends=('zeromq' 'czmq')
+makedepends=('git')
+arch=('i686' 'x86_64')
+
+source=("git+https://github.com/zeromq/filemq#branch=master")
+sha256sums=('SKIP')
+
+pkgver() {
+    cd "${srcdir}/${pkgname}"
+    git describe --always| sed -E 's/([^-]*-g)/r\1/;s/-/./g'
+}
+
+prepare() {
+    cd "${srcdir}/${pkgname}"
+
+    ./autogen.sh
+}
+
+build() {
+    cd "${srcdir}/${pkgname}"
+    ./configure --prefix=/usr
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}"
+    make prefix=${pkgdir}/usr install
+}
diff --git a/pcr/gcc-lts/PKGBUILD b/pcr/gcc-lts/PKGBUILD
index b1280fad9..b4ad7137d 100644
--- a/pcr/gcc-lts/PKGBUILD
+++ b/pcr/gcc-lts/PKGBUILD
@@ -1,6 +1,6 @@
 # $Id: PKGBUILD 186915 2013-05-31 23:25:14Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
 # NOTE: libtool requires rebuilt with each new gcc version
@@ -8,7 +8,7 @@
 #pkgname=('gcc-lts' 'gcc-lts-libs' 'gcc-lts-fortran' 'gcc-lts-objc' 'gcc-lts-ada' 'gcc-lts-go')
 pkgname=('gcc-lts' 'gcc-lts-libs' 'gcc-lts-fortran' 'gcc-lts-objc' 'gcc-lts-go')
 pkgver=4.7.3
-pkgrel=3
+pkgrel=4
 pkgdesc="The GNU Compiler Collection"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL' 'custom')
diff --git a/pcr/libdrm-nvfx/COPYING b/pcr/libdrm-nvfx/COPYING
new file mode 100644
index 000000000..6e74c337c
--- /dev/null
+++ b/pcr/libdrm-nvfx/COPYING
@@ -0,0 +1,48 @@
+ Copyright 2005 Adam Jackson.
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation on the rights to use, copy, modify, merge,
+ publish, distribute, sub license, and/or sell copies of the Software,
+ and to permit persons to whom the Software is furnished to do so,
+ subject to the following conditions:
+
+ The above copyright notice and this permission notice (including the
+ next paragraph) shall be included in all copies or substantial
+ portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NON-INFRINGEMENT.  IN NO EVENT SHALL ADAM JACKSON BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+------------------------------------------------------------------------
+
+ Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ All Rights Reserved.
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice (including the
+ next paragraph) shall be included in all copies or substantial
+ portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT.  IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS
+ SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
diff --git a/pcr/libdrm-nvfx/PKGBUILD b/pcr/libdrm-nvfx/PKGBUILD
new file mode 100644
index 000000000..81a39573e
--- /dev/null
+++ b/pcr/libdrm-nvfx/PKGBUILD
@@ -0,0 +1,54 @@
+# $Id: PKGBUILD 198149 2013-10-30 13:05:35Z allan $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
+
+_pkgname=libdrm
+pkgname=libdrm-nvfx
+pkgver=2.4.33
+pkgrel=3
+pkgdesc="Userspace interface to kernel DRM services, Nouveau NVFX for NV30 and NV40 (GeForce FX - 7000 series card) video card family"
+arch=(i686 x86_64 mips64el)
+license=('custom')
+depends=('glibc' 'libpciaccess')
+makedepends=('valgrind' 'clang')
+provides=('libdrm')
+conflicts=('libdrm')
+checkdepends=('cairo')
+options=('!libtool')
+url="http://dri.freedesktop.org/"
+source=(http://dri.freedesktop.org/$_pkgname/$_pkgname-$pkgver.tar.bz2
+        COPYING)
+sha256sums=('2d7b9d94ada0e3a6ede6243509883df2ded01c2983e24322759a366283898fea'
+            '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93')
+
+build() {
+  cd $_pkgname-$pkgver
+
+  # pthread is useless in Linux
+  sed -i "/pthread-stubs/d" configure.ac
+  autoreconf --force --install
+  
+  # gcc 4.8 introduces graphic corruption and X crashes with nouveau cards (nv44)
+  # http://gcc.gnu.org/ml/gcc-help/2013-07/msg00103.html
+  # we use clang compiler meanwhile
+  export CC=clang
+
+  ./configure --prefix=/usr --enable-udev \
+    --enable-nouveau-experimental-api \
+    --enable-libkms --disable-intel --disable-radeon
+
+  make
+}
+
+check() {
+  cd $_pkgname-$pkgver
+  make -k check
+}
+
+package() {
+  cd $_pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  install -m755 -d "$pkgdir/usr/share/licenses/$pkgname"
+  install -m644 ../COPYING "$pkgdir/usr/share/licenses/$pkgname/"
+}
diff --git a/pcr/libquvi-scripts-current/PKGBUILD b/pcr/libquvi-scripts-current/PKGBUILD
index 2c480bd45..851470439 100644
--- a/pcr/libquvi-scripts-current/PKGBUILD
+++ b/pcr/libquvi-scripts-current/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=libquvi-scripts-current
 _pkgname=libquvi-scripts
 provides=(libquvi-scripts)
-pkgver=0.9.20131012
+pkgver=0.9.20131104
 pkgrel=1
 pkgdesc='Library for parsing video download links.'
 arch=('any')
@@ -24,5 +24,5 @@ package() {
   cd "${_pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
-md5sums=('bd11a7946212b3e42f11c69afacc371a'
+md5sums=('0ddb9e392b46cee0e7a4af260bc1a1a3'
          'SKIP')
diff --git a/pcr/libtool-lts/PKGBUILD b/pcr/libtool-lts/PKGBUILD
new file mode 100644
index 000000000..66bcc547c
--- /dev/null
+++ b/pcr/libtool-lts/PKGBUILD
@@ -0,0 +1,44 @@
+# $Id: PKGBUILD 196866 2013-10-20 14:29:14Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+# Contributor: judd <jvinet@zeroflux.org>
+# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
+
+# NOTE: requires rebuilt with each new gcc version
+
+_pkgname=libtool
+pkgname=libtool-lts
+pkgver=2.4.2
+_gccver=4.7.3
+pkgrel=1
+pkgdesc="A generic library support script,"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.gnu.org/software/libtool"
+license=('GPL')
+depends=('sh' "libltdl=$pkgver" 'tar' "gcc-lts=${_gccver}")
+makedepends=("gcc-lts=${_gccver}")
+groups=('lts-devel')
+provides=("$_pkgname=$pkgver")
+conflicts=("$_pkgname")
+install=libtool.install
+source=(ftp://ftp.gnu.org/pub/gnu/libtool/${_pkgname}-${pkgver}.tar.xz{,.sig})
+md5sums=('2ec8997e0c07249eb4cbd072417d70fe'
+         '1e6ba57420c82c663c85e745d11c7eed')
+
+build() {
+  cd ${srcdir}/${_pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+check() {
+  cd ${srcdir}/${_pkgname}-${pkgver}
+  make check
+}
+
+package() {
+  cd ${srcdir}/${_pkgname}-${pkgver}
+  
+  make DESTDIR=${pkgdir} install-binSCRIPTS install-man install-info \
+                         install-data-local
+  rm -r ${pkgdir}/usr/share/libtool/libltdl/
+}
diff --git a/pcr/libtool-lts/libtool.install b/pcr/libtool-lts/libtool.install
new file mode 100644
index 000000000..73cf56422
--- /dev/null
+++ b/pcr/libtool-lts/libtool.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(libtool.info  libtool.info-1  libtool.info-2)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/pcr/mitsuba/PKGBUILD b/pcr/mitsuba/PKGBUILD
index 0961ef11d..d8e12a3b9 100644
--- a/pcr/mitsuba/PKGBUILD
+++ b/pcr/mitsuba/PKGBUILD
@@ -2,17 +2,17 @@
 
 _pkgname=mitsuba
 _pkgver=0.4.4
-_pkgrel=4
+_pkgrel=5
 _bldname=blender
-_bldver=2.68
-_bldep=9
+_bldver=2.69
+_bldep=10
 _addname=$_pkgname-$_bldname
 _adddat=20130320
-_addrev=40
-_addrel=3
+_addrev=47
+_addrel=1
 _pyver=3.3
 
-# Wed Mar 20 01:30:37 2013 +0100 rev:40 ($srcdir/$_addname/$_pkgname/__init__.py:bl_info>version)
+# Thu May 09 22:07:37 2013 +0200 - rev:47:8689e0896cf6 ($srcdir/$_addname/$_pkgname/__init__.py:bl_info>version)
 _addver=0.2.1
 
 pkgname=(
@@ -50,21 +50,25 @@ makedepends=(
   python
 )
 source=(
-  $_pkgname-$pkgver.tar.bz2::${url}hg/$_pkgname/archive/v$pkgver.tar.bz2
-  $_addname-$_addver.tar.bz2::${url}hg/$_addname/archive/$_addrev.tar.bz2
+  $_pkgname-$pkgver.tar.bz2::${url}repos/$_pkgname/archive/v$pkgver.tar.bz2
+  $_addname-$_addver-$_addrev.tar.bz2::${url}repos/exporters/$_addname/archive/$_addrev.tar.bz2
 )
 sha512sums=(
-  66dcab376a44eeb2fbe808a32ead5b554d777fb2f6a73c43883086b7829e0c697aaeccbb6fbbed9fcb221684a64ccce8be81a78ebcd228316ea12b8f6f3e7f6c
-  c829978a28c7780605662c604450c3d00b8ac958310e26aa7ad02dfb50f1875420e0e85fe0c868e030946c894cb939d18a4589c9e06a169f86eba5948eb2147e
+  01967fb84884fbab0ada3775c8f8c54b5523a97ebc9dedd559da3cb54543ecc919d3251c09718358405c19133218048fdb1c64f83d0637cf7b98acccb7564a1c
+  514cbb1300229599c536183ec300c3074aca349e0ddaa36ae7ae868a2c6b466116d9373a8d9ea89dcd1d09685e9a97bbd5c11121860da1a1bf45b921bcd21ca7
 )
 
 prepare() {
+  mv -v $srcdir/$_pkgname-???????????? $srcdir/$_pkgname-v$pkgver
+  mv -v $srcdir/$_addname-???????????? $srcdir/$_addname-$_addrev
+
   cd $srcdir/$_pkgname-v$pkgver
 
   msg 'renaming wrong OS name'
   _OS=$(uname -o)
   [[ $_OS == GNU ]] && sed -i 's|Linux|GNU|I' src/libcore/plugin.cpp
-  [[ $_OS == GNU/Linux ]] && sed -i 's|Linux,|GNU/Linux-libre,|' src/libcore/plugin.cpp
+  [[ $_OS == GNU/Linux ]] && sed -i 's|Linux,|GNU/Linux,|' src/libcore/plugin.cpp
+  [[ $_OS == GNU/kFreeBSD ]] && sed -i 's|Linux,|GNU/kFreeBSD,|' src/libcore/plugin.cpp
   sed -i 's|Linux/|Linux,|
           s|Linux|GNU/Linux|
          ' include/$_pkgname/core/{atomic,fstream,random,thread}.h
diff --git a/pcr/pandoc/PKGBUILD b/pcr/pandoc/PKGBUILD
index 0d2f2d8ea..49fcabcfe 100644
--- a/pcr/pandoc/PKGBUILD
+++ b/pcr/pandoc/PKGBUILD
@@ -5,36 +5,29 @@
 
 pkgname=pandoc-static
 _pkgname=pandoc
-pkgver=1.12
+pkgver=1.12.1
 pkgrel=1
 pkgdesc='Conversion between markup formats (no Haskell libs)'
 url='http://johnmacfarlane.net/pandoc/'
 license=('GPL')
 arch=('i686' 'x86_64')
+# Needed for pandoc-citeproc
+depends=('icu>=52' 'icu<=53')
 makedepends=('ghc' 'sh' 'cabal-install' 'alex' 'happy')
 options=(strip !makeflags !distcc !emptydirs)
-#source=(https://repo.parabolagnulinux.org/other/${_pkgname}-${pkgver}-$pkgrel-any.src.tar.xz{,.sig}
 source=(https://repo.parabolagnulinux.org/other/${_pkgname}-${pkgver}-1-any.src.tar.xz{,.sig}
         SRCBUILD)
-#        citeproc-hs-pre-0.3.7.patch)
 replaces=('pandoc')
 provides=('pandoc')
 optdepends=('texlive-most: for pdf creation')
-md5sums=('3d5f23060cad2ff29ba2df5651e92f8a'
-         'SKIP'
-         'c2e9f9b880468455b6e6a7f9ba7308e8')
 
 # PKGBUILD functions
 build() {
-    mkdir -p ${srcdir}/{build,${_pkgname}-${pkgver}}
-    cd ${srcdir}/${_pkgname}-${pkgver}
+   mkdir -p ${srcdir}/{build,${_pkgname}-${pkgver}}
+   cd ${srcdir}/${_pkgname}-${pkgver}
 
-# Patches from the next citeproc-hs release
-# These are needed because 0.3.6 with embed_data_files is broken
-# darcs diff --from-tag=0.3.6
-#   pushd ${srcdir}/${_pkgname}-${pkgver}/citeproc-hs-0.3.6
-#   patch -Np1 -i ${srcdir}/citeproc-hs-pre-0.3.7.patch
-#   popd
+# pandoc-citeproc needs hsb2hs
+   export PATH=${srcdir}/build/usr/bin:$PATH
 
    while read _hkpkg; do
 # Skip already built
@@ -47,23 +40,29 @@ build() {
        case $_hkpkg in
         $_pkgname-$pkgver)
          HOME=${srcdir}/${_pkgname}-${pkgver} \
-         cabal configure --flags='-library' \
-                         --prefix=/usr \
+         cabal configure --prefix=/usr \
                          --libdir=${srcdir}/build/usr/lib -v
 
          HOME=${srcdir}/${_pkgname}-${pkgver} \
          cabal build
+
+         HOME=${srcdir}/${_pkgname}-${pkgver} \
+         cabal register --inplace
          ;;
 
-        citeproc-hs-*)
+        pandoc-citeproc*)
+         HOME=${srcdir}/${_pkgname}-${pkgver} \
+         cabal configure --flags='small_base embed_data_files bibutils hexpat unicode_collation' \
+                       --libdir=${srcdir}/build/usr/lib \
+                       --prefix=/usr -v
+
          HOME=${srcdir}/${_pkgname}-${pkgver} \
-         cabal install --flags='embed_data_files' \
-                       --prefix=${srcdir}/build/usr -v
+         cabal build
          ;;
 
         *)
          HOME=${srcdir}/${_pkgname}-${pkgver} \
-         cabal install --prefix=${srcdir}/build/usr
+         cabal install --prefix=${srcdir}/build/usr --flags="embed_data_files"
          ;;
        esac
 
@@ -77,11 +76,16 @@ package() {
 
   runghc Setup.hs copy --destdir=${pkgdir}/
 
+  cd ${srcdir}/${_pkgname}-${pkgver}/pandoc-citeproc*
+  runghc Setup.hs copy --destdir=${pkgdir}/
+
 # For some reason the library is installed anyway
 # Remove all files and !emptydirs takes care of the rest
   msg2 "Removing lib files..."
   find ${pkgdir} -iname lib -print0 | xargs -0 rm -rvf
 
+  cp -av ${srcdir}/build/usr/bin/* ${pkgdir}/usr/bin/
+
 # EC is unfree and makes Parabola TeXLive cry
 # besides, it's unneeded
   sed "/fontenc/d" -i ${pkgdir}/usr/share/${_pkgname}-${pkgver}/data/templates/default.latex
@@ -90,6 +94,9 @@ package() {
   find ${pkgdir}/usr/share -type d -exec chmod 755 {} \;
 
   msg2 "Installing licenses"
-  install -d ${pkgdir}/usr/share
-  cp -rv ${srcdir}/build/usr/share/doc ${pkgdir}/usr/share/
+  install -d ${pkgdir}/usr/share/licenses
+  cp -rv ${srcdir}/build/usr/share/doc/* ${pkgdir}/usr/share/licenses/
 }
+sha256sums=('4cbeb1b112985961ff78b9baaa4cca3b24e5996c243c790fa00bbe44052cd418'
+            'SKIP'
+            '25fae3ded388733915dbaca9970ac5f5ef53883410564305bd225a950e5951db')
diff --git a/pcr/pandoc/SRCBUILD b/pcr/pandoc/SRCBUILD
index f822bb1a0..242356c89 100644
--- a/pcr/pandoc/SRCBUILD
+++ b/pcr/pandoc/SRCBUILD
@@ -2,7 +2,7 @@
 # Based on haskell-pandoc
 
 pkgname=pandoc
-pkgver=1.12
+pkgver=1.12.1
 pkgrel=1
 pkgdesc='Conversion between markup formats (no Haskell libs)'
 url='http://johnmacfarlane.net/pandoc/'
@@ -21,12 +21,14 @@ build() {
     cabal --verbose=3 update
 
     HOME=${srcdir}/${pkgname}-${pkgver} \
-    cabal --verbose=3 fetch file-embed ${pkgname}-${pkgver}
+    cabal --verbose=3 fetch hs-bibutils network hexpat text text-icu hsb2hs ${pkgname}-${pkgver} pandoc-citeproc
 
     msg2 "Getting the dependency build order"
 # Ignore the cabal messages
     HOME=${srcdir}/${pkgname}-${pkgver} \
-    cabal install --dry-run file-embed ${pkgname}-${pkgver} | grep "\-[0-9]\+" >>BUILDORDER
+    cabal install --flags="embed_data_files bibutils hexpat unicode_collation" --dry-run hsb2hs ${pkgname}-${pkgver} pandoc-citeproc |
+      grep "\-[0-9]\+" |
+      tee BUILDORDER
 }
 
 package() {
diff --git a/pcr/yafaray/PKGBUILD b/pcr/yafaray/PKGBUILD
index 458181279..1db06b6a9 100644
--- a/pcr/yafaray/PKGBUILD
+++ b/pcr/yafaray/PKGBUILD
@@ -2,21 +2,21 @@
 
 _pkgname=yafaray
 _pkgver=1.5
-_pkgrel=3
-_pkgdate=20130510
+_pkgrel=1
+_pkgdate=20130921
 _bldname=blender
-_bldver=2.68
-_bldep=9
+_bldver=2.69
+_bldep=10
 _gitname=Core
 _addname=${_bldname^}-Exporter
 _addrel=1
-_adddate=20130623
+_adddate=20130918
 _pyver=3.3
 
-# Fri May 10 00:57:12 2013 -0700 - Merge pull request #67 from DarkTide/master // Depth fix for hist on background
-_srcver=44323def5b3866ff601fd401ef2160b80ced8141                                  
-# Sun Jun 23 15:10:57 2013 +0200 - Refine AA changes for SPPM integrator
-_addver=9bcb22e8b8bd9281999ad36c5b22604f671484bb
+# Sat Sep 21 00:41:17 2013 -0700 - Merge pull request #70 from YafaRay/bidirectional_cleanup
+_srcver=caef0fc92078871a5dcd2b9f547d954eca2941f1
+# Fri Oct 18 19:07:53 2013 +0200 - Fix AO issue (wizofboz): -Fixed error of indentation in 'yaf_integrator.py' causer of the error in the use of Ambient Occlusion.
+_addver=1874704e44c57bcea478d652563639e79b00a766
 
 pkgname=(
   $_pkgname
@@ -55,8 +55,8 @@ source=(
   $_addname-$_addver.tar.gz::https://github.com/YafaRay/$_addname/archive/$_addver.tar.gz
 )
 sha512sums=(
-  5045a3de89e0a2d029e8b6ce962eeadeb5587369217d11d42ca79706a65e6ac7b07584f68307f76c90dbaf190af9626e3351e391107a4e763fc9e41d48cfd7a6
-  59322686d0623481b38c531e2a8350cafcf8942eb08df2dfcc8f59657715aa716ca34d473f862291e8a375fccdf717d93898caa3e344cfa1a3e5e760c903d32c
+  0470e26e2c7956f2d2dc18888cffaf7c2916df42c8208d6e0f4e1d5c438660dd6ae99a1e5f06a118175a8b2a97c89e482b1b069ced2abf3916bbfc60fac54e75
+  3c2207dbca7a70ba82ea6d835785401a24c7813d65380bf8c46a527fff6e65a0a7c101b60b5e8b88163ab07d3d42ec9f9aacbcf090f73062d3643c1c314c97d8
 )
 
 prepare() {
diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD
index 5b8828b77..f6aeb166c 100644
--- a/pcr/youtube-dl-current/PKGBUILD
+++ b/pcr/youtube-dl-current/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=youtube-dl-current
 _pkgname=youtube-dl
 provides=(youtube-dl)
-pkgver=2013.10.23.2
+pkgver=2013.11.03
 pkgrel=1
 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites"
 arch=('any')
@@ -27,5 +27,5 @@ package() {
     "${pkgdir}/usr/share/bash-completion/completions/youtube-dl"
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
 }
-md5sums=('72208a4aae88a51e1fba5d73cd5d7652'
+md5sums=('62e49076cb5e67233b3a8a8df9c8c0e8'
          'SKIP')