Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/webfs/PKGBUILD
	extra/gconf-editor/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/kdeplasma-addons/PKGBUILD
	extra/transmission/PKGBUILD

5 files changed, 245 insertions, 138 deletions

diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index 2800d9147..396706459 100644
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -1,7 +1,7 @@
 # $Id$
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
-spacenav=true
+spacenav=false
 pkgbase=blender-libre
 pkgflag=-libre
 if [ $spacenav == true ]; then
@@ -17,7 +17,7 @@ else
 fi
 pkgdesc="A fully integrated 3D graphics creation suite, without nonfree cuda-toolkit and redcode image format support$spndesc"
 pkgver=2.64a
-pkgrel=2
+pkgrel=3
 pkgaev=5
 arch=(
   i686
@@ -118,9 +118,9 @@ optdepends=(
 )
 makedepends=(
   # make dependencies tree (root) #
-  mesa
   boost
   cmake
+  mesa
   subversion
 )
 provides=(
diff --git a/libre/gst-plugins-bad-libre/PKGBUILD b/libre/gst-plugins-bad-libre/PKGBUILD
new file mode 100644
index 000000000..2e0658cfb
--- /dev/null
+++ b/libre/gst-plugins-bad-libre/PKGBUILD
@@ -0,0 +1,83 @@
+# $Id: PKGBUILD 153258 2012-03-12 16:05:19Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+
+pkgbase=gst-plugins-bad
+pkgname=gst-plugins-bad-libre
+pkgver=1.0.2
+pkgrel=1
+pkgdesc='GStreamer Multimedia Framework Bad Plugins, without nonfree faac support'
+arch=(
+  i686
+  x86_64
+  mips64el
+)
+license=(
+  LGPL
+)
+url="http://gstreamer.freedesktop.org/"
+depends=(
+  celt
+  chromaprint
+  curl
+  faad2
+  gst-plugins-base-libs
+  libdca
+  libdvdnav
+  libgme
+  libmms
+  libmodplug
+  mjpegtools
+  mpg123
+  opus
+  soundtouch
+  spandsp
+)
+makedepends=(
+  libdvdread
+  libexif
+  libmpeg2
+  libvdpau
+  schroedinger
+)
+provides=(
+  $pkgbase=$pkgver
+)
+conflicts=(
+  $pkgbase
+)
+replaces=(
+  $pkgbase 
+)
+options=(
+  '!libtool'
+  '!emptydirs'
+)
+source=(
+  "$url/src/$pkgbase/$pkgbase-$pkgver.tar.xz"
+)
+sha256sums=(
+  9e503305799a2b6eb9d0b77c59b8aa8bbe9e6eb815a0635bd013560c73996579
+)
+
+build() {
+  cd $pkgbase-$pkgver
+  sed -i '/AC_PATH_XTRA/d' configure.ac
+  autoreconf
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --disable-static --enable-experimental \
+    --with-package-name='GStreamer Bad Plugins Libre (Parabola)' \
+    --with-package-origin='http://www.parabolagnulinux.org/' \
+    --with-gtk=3.0
+  make
+}
+
+check() {
+  cd $pkgbase-$pkgver
+  make check
+}
+
+package() {
+  cd $pkgbase-$pkgver
+  make DESTDIR=$pkgdir install
+}
diff --git a/libre/icedove-i18n/PKGBUILD b/libre/icedove-i18n/PKGBUILD
index 6d1e339a2..7d0aa1d8b 100644
--- a/libre/icedove-i18n/PKGBUILD
+++ b/libre/icedove-i18n/PKGBUILD
@@ -1,14 +1,13 @@
-# $Id$
-# Maintainer: Márcio Silva <coadde@adinet.com.uy>
-# Maintainer: André Silva <andre.paulista@adinet.com.uy>
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+# Maintainer: André Silva <emulatorman@lavabit.com>
 
 pkgbase=icedove-i18n
-pkgver=11.0.1
+pkgver=16.0.2.1
 pkgname=('icedove-i18n-ar'
-        #'icedove-i18n-af'
+         'icedove-i18n-ast'
          'icedove-i18n-be'
-         'icedove-i18n-bn-bd'
          'icedove-i18n-bg'
+         'icedove-i18n-bn-bd'
          'icedove-i18n-br'
          'icedove-i18n-ca'
          'icedove-i18n-cs'
@@ -16,28 +15,31 @@ pkgname=('icedove-i18n-ar'
          'icedove-i18n-de'
          'icedove-i18n-el'
          'icedove-i18n-en-gb'
+         'icedove-i18n-en-us'
          'icedove-i18n-es-ar'
-         'icedove-i18n-es'
+         'icedove-i18n-es-es'
          'icedove-i18n-et'
          'icedove-i18n-eu'
          'icedove-i18n-fi'
          'icedove-i18n-fr'
          'icedove-i18n-fy-nl'
-         'icedove-i18n-ga'
+         'icedove-i18n-ga-ie'
          'icedove-i18n-gd'
          'icedove-i18n-gl'
          'icedove-i18n-he'
+         'icedove-i18n-hr'
          'icedove-i18n-hu'
+         'icedove-i18n-hy-am'
          'icedove-i18n-id'
          'icedove-i18n-is'
          'icedove-i18n-it'
          'icedove-i18n-ja'
          'icedove-i18n-ko'
          'icedove-i18n-lt'
-         'icedove-i18n-nb'
+         'icedove-i18n-nb-no'
          'icedove-i18n-nl'
-         'icedove-i18n-nn'
-         'icedove-i18n-pa'
+         'icedove-i18n-nn-no'
+         'icedove-i18n-pa-in'
          'icedove-i18n-pl'
          'icedove-i18n-pt-br'
          'icedove-i18n-pt'
@@ -48,7 +50,8 @@ pkgname=('icedove-i18n-ar'
          'icedove-i18n-sk'
          'icedove-i18n-sl'
          'icedove-i18n-sq'
-         'icedove-i18n-sv'
+         'icedove-i18n-sr'
+         'icedove-i18n-sv-se'
          'icedove-i18n-ta-lk'
          'icedove-i18n-tr'
          'icedove-i18n-uk'
@@ -56,7 +59,7 @@ pkgname=('icedove-i18n-ar'
          'icedove-i18n-zh-cn'
          'icedove-i18n-zh-tw')
 
-pkgrel=3
+pkgrel=1
 pkgdesc="Language pack for Debian Icedove"
 arch=('any')
 url="http://packages.debian.org/source/experimental/icedove"
@@ -64,10 +67,10 @@ license=('MPL' 'GPL')
 depends=("icedove-libre>=$pkgver")
 _url=http://repo.parabolagnulinux.org/other/$pkgbase/releases/$pkgver
 source=(icedove-i18n-$pkgver-ar.xpi::$_url/ar.xpi
-#       icedove-i18n-$pkgver-af.xpi::$_url/af.xpi
+        icedove-i18n-$pkgver-ast.xpi::$_url/ast.xpi
         icedove-i18n-$pkgver-be.xpi::$_url/be.xpi
-        icedove-i18n-$pkgver-bn-BD.xpi::$_url/bn-BD.xpi
         icedove-i18n-$pkgver-bg.xpi::$_url/bg.xpi
+        icedove-i18n-$pkgver-bn-BD.xpi::$_url/bn-BD.xpi
         icedove-i18n-$pkgver-br.xpi::$_url/br.xpi
         icedove-i18n-$pkgver-ca.xpi::$_url/ca.xpi
         icedove-i18n-$pkgver-cs.xpi::$_url/cs.xpi
@@ -75,6 +78,7 @@ source=(icedove-i18n-$pkgver-ar.xpi::$_url/ar.xpi
         icedove-i18n-$pkgver-de.xpi::$_url/de.xpi
         icedove-i18n-$pkgver-el.xpi::$_url/el.xpi
         icedove-i18n-$pkgver-en-GB.xpi::$_url/en-GB.xpi
+        icedove-i18n-$pkgver-en-US.xpi::$_url/en-US.xpi
         icedove-i18n-$pkgver-es-AR.xpi::$_url/es-AR.xpi
         icedove-i18n-$pkgver-es-ES.xpi::$_url/es-ES.xpi
         icedove-i18n-$pkgver-et.xpi::$_url/et.xpi
@@ -86,7 +90,9 @@ source=(icedove-i18n-$pkgver-ar.xpi::$_url/ar.xpi
         icedove-i18n-$pkgver-gd.xpi::$_url/gd.xpi
         icedove-i18n-$pkgver-gl.xpi::$_url/gl.xpi
         icedove-i18n-$pkgver-he.xpi::$_url/he.xpi
+        icedove-i18n-$pkgver-hr.xpi::$_url/hr.xpi
         icedove-i18n-$pkgver-hu.xpi::$_url/hu.xpi
+        icedove-i18n-$pkgver-hy-AM.xpi::$_url/hy-AM.xpi
         icedove-i18n-$pkgver-id.xpi::$_url/id.xpi
         icedove-i18n-$pkgver-is.xpi::$_url/is.xpi
         icedove-i18n-$pkgver-it.xpi::$_url/it.xpi
@@ -107,6 +113,7 @@ source=(icedove-i18n-$pkgver-ar.xpi::$_url/ar.xpi
         icedove-i18n-$pkgver-sk.xpi::$_url/sk.xpi
         icedove-i18n-$pkgver-sl.xpi::$_url/sl.xpi
         icedove-i18n-$pkgver-sq.xpi::$_url/sq.xpi
+        icedove-i18n-$pkgver-sr.xpi::$_url/sr.xpi
         icedove-i18n-$pkgver-sv-SE.xpi::$_url/sv-SE.xpi
         icedove-i18n-$pkgver-ta-LK.xpi::$_url/ta-LK.xpi
         icedove-i18n-$pkgver-tr.xpi::$_url/tr.xpi
@@ -126,31 +133,34 @@ package_icedove-i18n-ar() {
   install -Dm644 icedove-i18n-$pkgver-ar.xpi "${pkgdir}/$_path/langpack-ar@icedove.mozilla.org.xpi"
 }
 
+package_icedove-i18n-ast() {
+  pkgdesc="Language packs for Debian Icedove."
+  cd ${srcdir}
+  install -Dm644 icedove-i18n-$pkgver-ast.xpi "${pkgdir}/$_path/langpack-ast@icedove.mozilla.org.xpi"
+}
+
 package_icedove-i18n-af() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-af
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-af.xpi "${pkgdir}/$_path/langpack-af@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-be() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-be
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-be.xpi "${pkgdir}/$_path/langpack-be@icedove.mozilla.org.xpi"
 }
 
-package_icedove-i18n-bn-bd() {
+package_icedove-i18n-bg() {
   pkgdesc="Language packs for Debian Icedove."
   cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-bn-BD.xpi "${pkgdir}/$_path/langpack-bn-BE@icedove.mozilla.org.xpi"
+  install -Dm644 icedove-i18n-$pkgver-bg.xpi "${pkgdir}/$_path/langpack-bg@icedove.mozilla.org.xpi"
 }
 
-package_icedove-i18n-bg() {
+package_icedove-i18n-bn-bd() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-bg
   cd ${srcdir}
-  install -Dm644 icedove-i18n-$pkgver-bg.xpi "${pkgdir}/$_path/langpack-bg@icedove.mozilla.org.xpi"
+  install -Dm644 icedove-i18n-$pkgver-bn-BD.xpi "${pkgdir}/$_path/langpack-bn-BD@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-br() {
@@ -161,84 +171,79 @@ package_icedove-i18n-br() {
 
 package_icedove-i18n-ca() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-ca
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-ca.xpi "${pkgdir}/$_path/langpack-ca@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-cs() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-cs
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-cs.xpi "${pkgdir}/$_path/langpack-cs@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-da() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-da
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-da.xpi "${pkgdir}/$_path/langpack-da@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-de() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-de
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-de.xpi "${pkgdir}/$_path/langpack-de@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-el() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-el
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-el.xpi "${pkgdir}/$_path/langpack-el@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-en-gb() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-en-gb
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-en-GB.xpi "${pkgdir}/$_path/langpack-en-GB@icedove.mozilla.org.xpi"
 }
 
+package_icedove-i18n-en-us() {
+  pkgdesc="Language packs for Debian Icedove."
+  cd ${srcdir}
+  install -Dm644 icedove-i18n-$pkgver-en-US.xpi "${pkgdir}/$_path/langpack-en-US@icedove.mozilla.org.xpi"
+}
+
 package_icedove-i18n-es-ar() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-es-ar
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-es-AR.xpi "${pkgdir}/$_path/langpack-es-AR@icedove.mozilla.org.xpi"
 }
 
-package_icedove-i18n-es() {
+package_icedove-i18n-es-es() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-es
+  replaces=icedove-i18n-es
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-es-ES.xpi "${pkgdir}/$_path/langpack-es-ES@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-et() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-et
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-et.xpi "${pkgdir}/$_path/langpack-et@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-eu() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-eu
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-eu.xpi "${pkgdir}/$_path/langpack-eu@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-fi() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-fi
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-fi.xpi "${pkgdir}/$_path/langpack-fi@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-fr() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-fr
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-fr.xpi "${pkgdir}/$_path/langpack-fr@icedove.mozilla.org.xpi"
 }
@@ -249,9 +254,9 @@ package_icedove-i18n-fy-nl(){
   install -Dm644 icedove-i18n-$pkgver-fy-NL.xpi "${pkgdir}/$_path/langpack-fy-NL@icedove.mozilla.org.xpi"
 }
 
-package_icedove-i18n-ga() {
+package_icedove-i18n-ga-ie() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-ga
+  replaces=icedove-i18n-ga
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-ga-IE.xpi "${pkgdir}/$_path/langpack-ga-IE@icedove.mozilla.org.xpi"
 }
@@ -270,18 +275,28 @@ package_icedove-i18n-gl() {
 
 package_icedove-i18n-he() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-he
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-he.xpi "${pkgdir}/$_path/langpack-he@icedove.mozilla.org.xpi"
 }
 
+package_icedove-i18n-hr() {
+  pkgdesc="Language packs for Debian Icedove."
+  cd ${srcdir}
+  install -Dm644 icedove-i18n-$pkgver-hr.xpi "${pkgdir}/$_path/langpack-hr@icedove.mozilla.org.xpi"
+}
+
 package_icedove-i18n-hu() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-hu
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-hu.xpi "${pkgdir}/$_path/langpack-hu@icedove.mozilla.org.xpi"
 }
 
+package_icedove-i18n-hy-am() {
+  pkgdesc="Language packs for Debian Icedove."
+  cd ${srcdir}
+  install -Dm644 icedove-i18n-$pkgver-hy-AM.xpi "${pkgdir}/$_path/langpack-hy-am@icedove.mozilla.org.xpi"
+}
+
 package_icedove-i18n-id(){
   pkgdesc="Language packs for Debian Icedove."
   cd ${srcdir}
@@ -296,91 +311,81 @@ package_icedove-i18n-is() {
 
 package_icedove-i18n-it() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-it
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-it.xpi "${pkgdir}/$_path/langpack-it@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-ja() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-ja
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-ja.xpi "${pkgdir}/$_path/langpack-ja@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-ko() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-ko
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-ko.xpi "${pkgdir}/$_path/langpack-ko@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-lt() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-lt
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-lt.xpi "${pkgdir}/$_path/langpack-lt@icedove.mozilla.org.xpi"
 }
 
-package_icedove-i18n-nb() {
+package_icedove-i18n-nb-no() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-nb
+  replaces=icedove-i18n-nb
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-nb-NO.xpi "${pkgdir}/$_path/langpack-nb-NO@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-mk() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-mk
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-mk.xpi "${pkgdir}/$_path/langpack-mk@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-nl() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-nl
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-nl.xpi "${pkgdir}/$_path/langpack-nl@icedove.mozilla.org.xpi"
 }
 
-package_icedove-i18n-nn() {
+package_icedove-i18n-nn-no() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-nn
+  replaces=icedove-i18n-nn
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-nn-NO.xpi "${pkgdir}/$_path/langpack-nn-NO@icedove.mozilla.org.xpi"
 }
 
-package_icedove-i18n-pa() {
+package_icedove-i18n-pa-in() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-pa
+  replaces=icedove-i18n-pa
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-pa-IN.xpi "${pkgdir}/$_path/langpack-pa-IN@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-pl() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-pl
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-pl.xpi "${pkgdir}/$_path/langpack-pl@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-pt-br() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-pt-br
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-pt-BR.xpi "${pkgdir}/$_path/langpack-pt-BR@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-pt() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-pt
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-pt-PT.xpi "${pkgdir}/$_path/langpack-pt-PT@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-ro() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-ro
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-ro.xpi "${pkgdir}/$_path/langpack-ro@icedove.mozilla.org.xpi"
 }
@@ -393,7 +398,6 @@ package_icedove-i18n-rm() {
 
 package_icedove-i18n-ru() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-ru
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-ru.xpi "${pkgdir}/$_path/langpack-ru@icedove.mozilla.org.xpi"
 }
@@ -406,50 +410,49 @@ package_icedove-i18n-si() {
 
 package_icedove-i18n-sk() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-sk
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-sk.xpi "${pkgdir}/$_path/langpack-sk@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-sl() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-sl
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-sl.xpi "${pkgdir}/$_path/langpack-sl@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-sq() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-sl
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-sq.xpi "${pkgdir}/$_path/langpack-sq@icedove.mozilla.org.xpi"
 }
 
-package_icedove-i18n-sv() {
+package_icedove-i18n-sr() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-sv
+  cd ${srcdir}
+  install -Dm644 icedove-i18n-$pkgver-sr.xpi "${pkgdir}/$_path/langpack-sr@icedove.mozilla.org.xpi"
+}
+
+package_icedove-i18n-sv-se() {
+  pkgdesc="Language packs for Debian Icedove."
+  replaces=icedove-i18n-sv
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-sv-SE.xpi "${pkgdir}/$_path/langpack-sv-SE@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-ta-lk() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-sv
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-ta-LK.xpi "${pkgdir}/$_path/langpack-ta-LK@icedove.mozilla.org.xpi"
 }
 
-
 package_icedove-i18n-tr() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-tr
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-tr.xpi "${pkgdir}/$_path/langpack-tr@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-uk() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-uk
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-uk.xpi "${pkgdir}/$_path/langpack-uk@icedove.mozilla.org.xpi"
 }
@@ -461,64 +464,67 @@ package_icedove-i18n-vi() {
 }
 package_icedove-i18n-zh-cn() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-zh-cn
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-zh-CN.xpi "${pkgdir}/$_path/langpack-zh-CN@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-zh-tw() {
   pkgdesc="Language packs for Debian Icedove."
-  replaces=icedove-zh-tw
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-zh-TW.xpi "${pkgdir}/$_path/langpack-zh-TW@icedove.mozilla.org.xpi"
 }
-md5sums=('43ea2aeec780c591af577215a8f928ae'
-         '0dc7a6ca6d308f4135ce135b87b19823'
-         '343f4b73820d9906205606833c48ddd1'
-         '56f7a9e47037c82fda2d97efcac6e2fa'
-         '7da75017f43c073b7f7e413d41794a37'
-         '07c7efe6d9400b17ef572c5769f25ccd'
-         '8dba7a9ff2c2b55908bb32b947fab75e'
-         'e262a088217fceb213a8890124e85db6'
-         '9c2355ff0ca0b640e50f7a24ec5d9f6e'
-         '628c84299fc7b76a5f084905518b8f73'
-         'a26276362394dedbbea98356d573f2f1'
-         '06c0ed88ff10c296f2066a7a84cc33d6'
-         '2a03c69e72bbe08e8938177908a3ab17'
-         'e80febfd74cc81bc9e5cb9752c0b3b95'
-         '4ad12b69da9910e1c0122aa76c3513d5'
-         '5e9c7ab66141389b9300f8db28852a5a'
-         'c3390ce9a18b979fe148652fc76ae311'
-         '85c17fe5018696d6999e7fed8c447edc'
-         'a049d7cf3b9c9ef5ece4afced3b56f9d'
-         'c483f4da184315444d1d094fd75b150a'
-         'e57eba03836a14e8915a816a7655fb46'
-         'c4d4caf6baf85ca22ed1ea19a3630d67'
-         'e16465d4d1234fe7362b5ba2f73682f9'
-         '36fb64f2541e5a7ba0640931e8ee2be1'
-         'd03b2ddcfc3cf28e1725df4972e2abfe'
-         'f5fcf08545542a752b7355d1dd692c2d'
-         '842c4ce562c0beba6713424551d5d748'
-         '004c5c6a1a5bb575827fe626e0b804cc'
-         '0d810b4347b21d43d8b38fd077a63f9d'
-         'e03ac78e858e0d345512bcc24f180838'
-         'e17ab7b097085b9462d38a7d8aa4d027'
-         'f58b78d51281acf36c9755abb6bbde14'
-         '086270a5669cb5db0a21bf5ca1c7620c'
-         'c972a8eaf135cfeb9509603ae1d392d3'
-         'c4eb654adce293e9ef6fe2cb2b1078bc'
-         'd120891141f898644a93bb2317def809'
-         '78c32f4f1c814130f9cddce60b17a089'
-         '055d77477e07632dcb06a08d51609514'
-         '9b28657c99b9193cef3dbf959ed1849c'
-         '5c6ca9cd178df6a6fca1f638a0845b0a'
-         '277cf819683b9a9016b322a77a3236fa'
-         '7104f5238b221ea4dc502c14eae12ea1'
-         'a29ed3f28bab6a970c15378505b352cc'
-         '5774b9adccafa40221e6eb3011de5db0'
-         '5419f4456c65703ebeb9d4befc0c2d2c'
-         '2423b38ceb1022a6064070a3f7f5600f'
-         '5de7fd60a6a74bf23066a6cfe9dee2d6'
-         '47a23af3184ee6999433a9f59da3a67a'
-         'd3242d7e7c35df585e55918ed6556f16'
-         'd0f7e27dfdc4aa14398e8422e3135a4a')
+md5sums=('9c4a59c7da66e2354164c3a5bc7af21d'
+         '1cc30ebb50c2ff783b07060fe14b4260'
+         'bd2a994f1b0aa8d71b7f432f582e08b5'
+         '1b7d5f199b714e5d235cdadc89882c82'
+         'a5945807be0c8e205cf0f4be41d1f301'
+         'ec323d1ea8372afa236ed82d1f38bf62'
+         '04985b1bb7a7255970de1c9a0d6b6c37'
+         '143d16162ded3cf1ed99731e0ccd4cbc'
+         'ec04abda3d2eafd5cccad44b843d2191'
+         'a1273c8ba22f38f0304d44f52095541d'
+         '06ff7794da97ef3cad3ccfde2a229db3'
+         'bb873b67b1e65eccf186622c1315e14b'
+         '87ea24ef462fed8a3f6e74e25b210607'
+         'c7363deffa336c8470884ca7500ff583'
+         '64d7b4490bbe3cdb25cc8633d46761d4'
+         '1bc28fd43fbe54185e0f34161e2bb856'
+         'f90cedcac1daa1a7be9abc9a960bbde0'
+         '326a063d3b5d0aff735a145dcbb51e01'
+         '86ff061d2346b75b85e59374328d20f8'
+         '83969caa207fa30dd016fee6bd2aa543'
+         '68d50a5c356d62514bfa99b04776ed7c'
+         'f5ffaa9dc1da2412faf78a4920d19278'
+         'a76518ba680a2fc263de99099e0e1c53'
+         'e88f3c95cf4e51035429307f4f6a4eb5'
+         'c2573d6f463cdd69f6b37612f9ae997a'
+         '8b17220cd897ea744978752b2ef11ab0'
+         '4ee8b3d2e4fd7bf3353a910d76cbbaf8'
+         'f87d295343ecf5b1e21abe430b157c42'
+         '74ce04669c8acf87a8b8878fb2653dc4'
+         '5ffc16a8c701c8c2c133775a815d1e67'
+         '6d6c1a7e31bf6301ee690509881a4395'
+         '41c970fd7ef2224a63de7d562ce71b39'
+         'a4243831934d31aad648221190fe2b42'
+         '6c1c023d67a35e4ed3a792bb365f360e'
+         '0045f4bceaaddd57fa6c0b895a34feff'
+         '18b359d881127defff20e549bb0c5b80'
+         'a295fbd180dfe3e009218aa2775ce332'
+         '6beaeaf5bf67321fdef0ee6de968edaa'
+         '92b29bc95a476d9cb75c5df075f353b9'
+         'fa757024edb1f1f794f77ecee8c07706'
+         '8f21adb897625a2a27a040a8e88bed3f'
+         '26b5ab6bb93b454702179c48c9da2e5b'
+         'f319345cdc962919830792644c66165d'
+         '7f32885e485beab6822eb9ec0025bae7'
+         'edf019e6332d099d67b68f1f90da680c'
+         'e21836a77f143457ac7912ee0e6386dc'
+         '24adc86b3fb496f3d27944a5027d5fa9'
+         '7192e7c7d80cc8eb85e1f57defa0496c'
+         'f449ced45bb084ce0adda6df89b1ee31'
+         '25e3ce79fc2c1e2164ce04821e683a29'
+         '615138d3ed86797a168a0d5784f0c6fe'
+         '7c83196da5ee2d01444450cca620c29d'
+         '265f8447eee6e6b41ab8fdcf1a1dc154'
+         '9889d38b50a7e2d095582ebf75cab9e2'
+         '12b882986056bca65fdfc90806daf87b')
diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD
index 6bd50cd47..6ec577f58 100644
--- a/libre/icedove-libre/PKGBUILD
+++ b/libre/icedove-libre/PKGBUILD
@@ -1,9 +1,9 @@
-# Maintainer : Márcio Silva <coadde@adinet.com.uy>
-# Maintainer : André Silva <andre.paulista@adinet.com.uy>
+# Maintainer : Márcio Silva <coadde@lavabit.com>
+# Maintainer : André Silva <emulatorman@lavabit.com>
 
 # We're getting this from Debian Experimental
 _debname=icedove
-_debver=11.0
+_debver=16.0.2
 _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -11,7 +11,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 _pkgname=${_debname}
 pkgname=${_debname}-libre
 pkgver=${_debver}.${_debrel}
-pkgrel=1
+pkgrel=3
 pkgdesc="A libre version of Debian Icedove, the Standalone Mail/News reader based on Mozilla Thunderbird."
 arch=('i586' 'i686' 'x86_64' 'mips64el')
 license=('GPL2' 'MPL' 'LGPL')
@@ -22,24 +22,23 @@ optdepends=('libcanberra: for sound support')
 replaces=('thunderbird')
 conflicts=('thunderbird')
 provides=('thunderbird')
-install=$_pkgname.install
+install=${_pkgname}.install
 source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
         "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz"
         mozconfig
         channel-prefs.js
         vendor.js
-        gcc47.patch
-        clrf.patch
         makefile.patch
+        branding.patch
         ${_pkgname}.desktop)
-md5sums=('0d4aaf892cd1cbf9bda38928947025fe'
-         'd4401c080fe5190e8bb1326f10808231'
+options=(!emptydirs)
+md5sums=('a3724f40d28014acf593528bb8a048f0'
+         '53d62a4841d7989d1f6d1b04929394b4'
          'd6d58d3104a44624e0a3d227cdf1c211'
          '476ec205162340fb0679f522c9d31c3b'
          '4eecc4fc5aafaf0da651a09eadc90bee'
-         '94d5cd599ccc4438f192d8daabf98b6a'
-         'c395d443a8c4c16880c7322bcf174743'
          'c4ed43e85945e180a89cce03e45ec62c'
+         '126b1446212396c33220936c01d9592d'
          'e785e0c267f4435ae1a9aa0b03bcacfb')
 
 build() {
@@ -61,9 +60,8 @@ build() {
   done
   quilt push -av
 
-  patch -Np1 -i "$srcdir/gcc47.patch"
-  patch -Np1 -i "$srcdir/clrf.patch"
-  patch -Np1 -i "$srcdir/makefile.patch"
+  patch -Np1 -i "${srcdir}/makefile.patch" # small fix
+  patch -Np1 -i "${srcdir}/branding.patch" # fixing branding
 
   cp "${srcdir}/mozconfig" .mozconfig
   make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}"
@@ -74,17 +72,18 @@ package() {
 
   make -j1 -f client.mk DESTDIR="${pkgdir}" install
 
-  install -m644 "${srcdir}/vendor.js" "${pkgdir}/usr/lib/${_pkgname}/defaults/pref"
+  install -Dm644 "${srcdir}/vendor.js" "${pkgdir}/usr/lib/${_pkgname}/defaults/preferences/vendor.js"
+
   # Recommend free addons
-  install -m644 "${srcdir}/channel-prefs.js" "${pkgdir}/usr/lib/${_pkgname}/defaults/pref"
+  install -m644 "${srcdir}/channel-prefs.js" "${pkgdir}/usr/lib/${_pkgname}/defaults/pref/channel-prefs.js"
 
   for i in 16x16 22x22 24x24 32x32 48x48 64x64 128x128 256x256; do
       install -Dm644 "debian/app-icons/${_pkgname}${i/x*/}.png" "${pkgdir}/usr/share/icons/hicolor/$i/apps/${_pkgname}.png"
   done
   install -Dm644 "debian/app-icons/${_pkgname}_icon.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${_pkgname}.svg"
   
-  install -Dm644 "$srcdir/${_pkgname}.desktop" \
-      "$pkgdir/usr/share/applications/${_pkgname}.desktop"
+  install -Dm644 "${srcdir}/${_pkgname}.desktop" \
+      "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
   
   rm -rf "${pkgdir}"/usr/lib/${_pkgname}/{dictionaries,hyphenation,searchplugins}
   ln -sf /usr/share/hunspell "${pkgdir}/usr/lib/${_pkgname}/dictionaries"
diff --git a/libre/icedove-libre/branding.patch b/libre/icedove-libre/branding.patch
new file mode 100644
index 000000000..d84b8075a
--- /dev/null
+++ b/libre/icedove-libre/branding.patch
@@ -0,0 +1,19 @@
+diff -Naur comm-release.orig/mail/branding/icedove/locales/en-US/brand.dtd comm-release/mail/branding/icedove/locales/en-US/brand.dtd
+--- comm-release.orig/mail/branding/icedove/locales/en-US/brand.dtd	2012-10-30 16:41:16.000000000 -0200
++++ comm-release/mail/branding/icedove/locales/en-US/brand.dtd	2012-10-31 22:35:04.203666114 -0200
+@@ -1,4 +1,4 @@
+ <!ENTITY  brandShortName        "Icedove">
+-<!ENTITY  brandFullName         "Icedove Mail/News">
+-<!ENTITY  vendorShortName       "Icedove">
++<!ENTITY  brandFullName         "Icedove">
++<!ENTITY  vendorShortName       "Mozilla">
+ <!ENTITY  trademarkInfo.part1   " ">
+diff -Naur comm-release.orig/mail/branding/icedove/locales/en-US/brand.properties comm-release/mail/branding/icedove/locales/en-US/brand.properties
+--- comm-release.orig/mail/branding/icedove/locales/en-US/brand.properties	2012-10-30 10:13:50.000000000 -0200
++++ comm-release/mail/branding/icedove/locales/en-US/brand.properties	2012-10-31 22:35:14.786423732 -0200
+@@ -1,3 +1,3 @@
+ brandShortName=Icedove
+-brandFullName=Icedove Mail/News
+-vendorShortName=Icedove
++brandFullName=Icedove
++vendorShortName=Mozilla