Merge branch 'master' of vparabola:abslibre

23 files changed, 114 insertions, 242 deletions

diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD
index aa3f3181d..cb7c71655 100644
--- a/libre/bbswitch-libre/PKGBUILD
+++ b/libre/bbswitch-libre/PKGBUILD
@@ -7,7 +7,7 @@ _pkgname=bbswitch
 pkgname=bbswitch-libre
 pkgver=0.7
 _extramodules=extramodules-3.10-LIBRE # Don't forget to update bbswitch.install
-pkgrel=10
+pkgrel=11
 pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops (built for the linux-libre kernel package)"
 arch=('i686' 'x86_64' 'mips64el')
 url=("http://github.com/Bumblebee-Project/bbswitch")
diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD
index 1a0bff6b6..1eb17b175 100644
--- a/libre/calibre-libre/PKGBUILD
+++ b/libre/calibre-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 95754 2013-08-16 10:44:14Z jelle $
+# $Id: PKGBUILD 96275 2013-08-23 10:26:11Z jelle $
 # Maintainer: jelle van der Waa <jelle@vdwaa.nl>
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
@@ -9,7 +9,7 @@
 
 _pkgname=calibre
 pkgname=calibre-libre
-pkgver=0.9.44
+pkgver=1.0.0
 pkgrel=1
 pkgdesc="Ebook management application, with unar support included and nonfree fonts removed"
 arch=('i686' 'x86_64' 'mips64el') 
@@ -20,7 +20,7 @@ depends=('python2-six' 'python2-dateutil' 'python2-cssutils' 'python2-cherrypy'
          'imagemagick' 'poppler-qt' 'chmlib' 'python2-lxml' 'libusbx' 
          'python2-imaging' 'shared-mime-info' 'python2-dnspython' 
          'unar' 'python2-pyqt4' 'python2-psutil' 'icu' 'libmtp' 
-         'python2-netifaces' 'python2-cssselect')
+         'python2-netifaces' 'python2-cssselect' 'python2-apsw')
 makedepends=('python2-pycountry' 'qt4-private-headers')
 optdepends=('ipython2: to use calibre-debug')
 replaces=$_pkgname
@@ -30,7 +30,7 @@ install=calibre.install
 source=("http://sourceforge.net/projects/calibre/files/${pkgver}/calibre-${pkgver}.tar.xz"
         'desktop_integration.patch'
         'calibre-mount-helper')
-md5sums=('5598d6717ce568a32ea2a4a1c173016b'
+md5sums=('5f3d0c3630a7289ef1f36d68153ea7a3'
          '8353d1878c5a498b3e49eddef473605f'
          '675cd87d41342119827ef706055491e7')
 
diff --git a/libre/ghostscript-libre/PKGBUILD b/libre/ghostscript-libre/PKGBUILD
index d9be53172..63958664e 100644
--- a/libre/ghostscript-libre/PKGBUILD
+++ b/libre/ghostscript-libre/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 192537 2013-08-13 17:54:45Z andyrtr $
+# $Id: PKGBUILD 193535 2013-08-22 17:59:22Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer (Parabola): Joshua Haase <hahj87@gmail.com>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=ghostscript
 pkgname=ghostscript-libre
-pkgver=9.07
-pkgrel=3
+pkgver=9.09
+pkgrel=1
 pkgdesc="An interpreter for the PostScript language, without nonfree files"
 arch=('i686' 'x86_64' 'mips64el')
 license=('AGPL') #non free files removed
 depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg'
-         'libtiff>=4.0.0' 'lcms' 'dbus')
-makedepends=('gtk2' 'gnutls')
+         'libtiff>=4.0.0' 'lcms2' 'dbus')
+makedepends=('gtk2' 'gnutls' 'openjpeg')
 optdepends=('texlive-core:      needed for dvipdf'
             'gtk2:              needed for gsx')
 conflicts=('ghostscript')
@@ -20,18 +20,18 @@ replaces=('ghostscript')
 provides=("ghostscript=$pkgver")
 url="http://www.ghostscript.com/"
 source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2)
-options=('!libtool')
-md5sums=('eea27befc1e85bef6d4768202f6b03a5')
+options=('!libtool' '!makeflags')
+md5sums=('4f47c29daae8e567ebdef842b7e0f8ea')
 
 build() {
   cd ghostscript-${pkgver}
   
-  # delete non-free packages
+  # delete nonfree files
   grep -l "are not altered" Resource/CMap/* | xargs rm -fv
   grep -l "not be copied" Resource/CMap/* | xargs rm -fv
 
   # force it to use system-libs
-  rm -rf jpeg libpng zlib jasper expat tiff lcms freetype 
+  rm -rf jpeg libpng zlib jasper expat tiff lcms lcms2 freetype openjpeg cups/libs # jbig2dec is in community
 
   ./configure --prefix=/usr \
 	--enable-dynamic \
@@ -60,7 +60,7 @@ build() {
 
 package() {
   cd ghostscript-${pkgver}
-  make -j1 DESTDIR="${pkgdir}" \
+  make DESTDIR="${pkgdir}" \
 	cups_serverroot="${pkgdir}"/etc/cups \
 	cups_serverbin="${pkgdir}"/usr/lib/cups install soinstall
 
@@ -74,7 +74,7 @@ package() {
 
   # install IJS
   cd ijs
-  make -j1 DESTDIR="${pkgdir}" install
+  make DESTDIR="${pkgdir}" install
   
   # remove filters that are now maintained in cups-filters as upstream home
   rm -rf "$pkgdir"/usr/lib/cups/filter/{gstopxl,gstoraster}
diff --git a/libre/gnu-ghostscript/PKGBUILD b/libre/gnu-ghostscript/PKGBUILD
index 46bbb845d..6d44a7646 100644
--- a/libre/gnu-ghostscript/PKGBUILD
+++ b/libre/gnu-ghostscript/PKGBUILD
@@ -2,15 +2,16 @@
 
 _pkgname=ghostscript
 pkgname=gnu-ghostscript
-_gspkgver=9.07 # ghostscript package version
+_gspkgver=9.09 # ghostscript package version
 _pkgver=9.06
 pkgver=9.06.0
-pkgrel=4
+pkgrel=5
 pkgdesc="An interpreter for the PostScript language maintained by a team of GNU programmers"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
-depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg' 'libtiff>=4.0.0' 'lcms2')
-makedepends=('gtk2' 'gnutls')
+depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg'
+         'libtiff>=4.0.0' 'lcms2' 'dbus')
+makedepends=('gtk2' 'gnutls' 'openjpeg')
 optdepends=('texlive-core:      needed for dvipdf'
             'gtk2:              needed for gsx')
 conflicts=${_pkgname}
@@ -19,13 +20,13 @@ url="https://www.gnu.org/software/${_pkgname}/"
 source=(ftp://ftp.gnu.org/gnu/${_pkgname}/${pkgname}-${pkgver}.tar.xz
         ijs-automake.patch
         libtool.patch)
-options=('!libtool')
+options=('!libtool' '!makeflags')
 md5sums=('85a5e07a6b91937c157576293b381065'
          '83bcae456ad4c9fb790be483914dbeba'
          '5bd5d4966007b460deed866a30a0b3c8')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
 
   # fix build with recent automake
   patch -p1 -i "$srcdir/ijs-automake.patch"
@@ -34,7 +35,7 @@ build() {
   patch -Np1 -i ${srcdir}/libtool.patch
 
   # force it to use system-libs
-  rm -rf jpeg libpng zlib jasper expat tiff lcms freetype
+  rm -rf jpeg libpng zlib jasper expat tiff lcms lcms2 freetype openjpeg cups/libs # jbig2dec is in community
 
   ./configure --prefix=/usr \
 	--enable-dynamic \
@@ -48,35 +49,37 @@ build() {
 	--enable-fontconfig \
 	--enable-freetype \
 	--without-luratech \
+	--without-omni \
 	--with-system-libtiff \
 	--disable-compile-inits #--help # needed for linking with system-zlib
   make
 
   # Build IJS
-  cd ${srcdir}/${pkgname}-${pkgver}/ijs
+  cd ijs
+  sed -i "s:AM_PROG_CC_STDC:AC_PROG_CC:g" configure.ac
   ./autogen.sh
   ./configure --prefix=/usr --enable-shared --disable-static
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make -j1 DESTDIR=${pkgdir} \
-	cups_serverroot=${pkgdir}/etc/cups \
-	cups_serverbin=${pkgdir}/usr/lib/cups install soinstall
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" \
+	cups_serverroot="${pkgdir}"/etc/cups \
+	cups_serverbin="${pkgdir}"/usr/lib/cups install soinstall
 
   # install missing doc files # http://bugs.archlinux.org/task/18023
-  install -m 644 ${srcdir}/${pkgname}-${pkgver}/doc/{Ps2ps2.htm,gs-vms.hlp,gsdoc.el,pscet_status.txt} ${pkgdir}/usr/share/${_pkgname}/$_pkgver/doc/
+  install -m 644 "${srcdir}"/${pkgname}-${pkgver}/doc/{Ps2ps2.htm,gs-vms.hlp,gsdoc.el,pscet_status.txt} "${pkgdir}"/usr/share/${_pkgname}/$_pkgver/doc/
   
   mkdir -p ${pkgdir}/usr/share/licenses/${_pkgname}
   install -m644 LICENSE ${pkgdir}/usr/share/licenses/${_pkgname}/
 
   # remove unwanted localized man-pages
-  rm -rf $pkgdir/usr/share/man/[^man1]*
+  rm -rf "$pkgdir"/usr/share/man/[^man1]*
 
   # install IJS
-  cd ${srcdir}/${pkgname}-${pkgver}/ijs
-  make -j1 DESTDIR=${pkgdir} install
+  cd ijs
+  make DESTDIR="${pkgdir}" install
   
   # remove filters that are now maintained in cups-filters as upstream home
   rm -rf "$pkgdir"/usr/lib/cups/filter/{gstopxl,gstoraster}
diff --git a/libre/iceape-l10n/PKGBUILD b/libre/iceape-l10n/PKGBUILD
index c9f22703d..5e088da07 100644
--- a/libre/iceape-l10n/PKGBUILD
+++ b/libre/iceape-l10n/PKGBUILD
@@ -12,7 +12,7 @@
 
 _debname=iceape
 _debver=2.7.12
-_debrel=1
+_debrel=deb1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
@@ -22,19 +22,20 @@ pkgbase=iceape-l10n
 pkgname=($(for lang in ${_langpacks[@]}
         do echo $pkgbase-$lang | tr A-Z a-z
         done))
+epoch=1
 pkgver=${_debver}.${_debrel}
-pkgrel=4
+pkgrel=1
 
 pkgdesc="Language packs for Debian Iceape."
 arch=('any')
 url="http://packages.debian.org/sid/iceape"
 license=('MPL' 'GPL')
-depends=("iceape-libre>=$pkgver")
+depends=("iceape-libre>=$epoch:$pkgver")
 makedepends=('unzip' 'zip')
 source=('region.properties')
 for lang in ${_langpacks[@]}
 do
-    source+=("${_debrepo}/`debfile ${_debname}`-l10n-$(echo $lang | tr A-Z a-z)_${_debver}-${_debrel}_all.deb")
+    source+=("${_debrepo}/`debfile ${_debname}`-l10n-$(echo $lang | tr A-Z a-z)_${_debver}-${_debrel#deb}_all.deb")
 done
 
 _path="/usr/lib/iceape/extensions"
diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD
index 22ad1541b..1ea0c56b0 100644
--- a/libre/iceape-libre/PKGBUILD
+++ b/libre/iceape-libre/PKGBUILD
@@ -4,14 +4,15 @@
 # We're getting this from Debian Sid
 _debname=iceape
 _debver=2.7.12
-_debrel=1
+_debrel=deb1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
 _pkgname=${_debname}
 pkgname=${_debname}-libre
+epoch=1
 pkgver=${_debver}.${_debrel}
-pkgrel=8
+pkgrel=1
 pkgdesc="A libre version of Debian Iceape, the internet suite based on SeaMonkey."
 arch=('i686' 'x86_64' 'mips64el')
 license=('MPL' 'GPL' 'LGPL')
@@ -23,7 +24,7 @@ provides=('seamonkey')
 install=$_pkgname.install
 url="http://packages.debian.org/sid/${_pkgname}"
 source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
-        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz"
+        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel#deb}.debian.tar.gz"
         mozconfig
         ${_pkgname}.desktop
         ${_pkgname}-2.0-lang.patch
@@ -98,6 +99,11 @@ prepare() {
 }
 
 build() {
+  export DEBIAN_BUILD="comm-release"
+  export DEBIAN_BRANDING_DIR="debian/branding"
+
+  export ICEAPE_ICONS_BRANDING="suite/branding/nightly"
+
   cd "${srcdir}/${DEBIAN_BUILD}"
 
   export LDFLAGS="${LDFLAGS} -Wl,-rpath,/usr/lib/${_pkgname}"
@@ -113,6 +119,11 @@ build() {
 }
 
 package() {
+  export DEBIAN_BUILD="comm-release"
+  export DEBIAN_BRANDING_DIR="debian/branding"
+
+  export ICEAPE_ICONS_BRANDING="suite/branding/nightly"
+
   cd "${srcdir}/${DEBIAN_BUILD}"
 
   make -j1 -f client.mk DESTDIR="${pkgdir}" install
diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD
index f1446b23b..bbd3e1213 100644
--- a/libre/icedove-l10n/PKGBUILD
+++ b/libre/icedove-l10n/PKGBUILD
@@ -2,8 +2,9 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
 pkgbase=icedove-l10n
+epoch=1
 _pkgver=17.0.8
-pkgver=17.0.8.1
+pkgver=17.0.8.deb1
 
 _langpacks=(ar ast be bg bn-BD br ca cs da de el en-GB en-US es-AR es-ES et eu fi fr fy-NL ga-IE gd gl he hr hu hy-AM id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW)
 
@@ -16,7 +17,7 @@ pkgdesc="Language packs for Debian Icedove."
 arch=('any')
 url="http://packages.debian.org/sid/icedove"
 license=('MPL' 'GPL')
-depends=("icedove-libre>=$pkgver")
+depends=("icedove-libre>=$epoch:$pkgver")
 makedepends=('unzip' 'zip')
 _url=https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$_pkgver/linux-i686/xpi
 
diff --git a/libre/icedove-libre/Icedove-branding.patch b/libre/icedove-libre/Icedove-branding.patch
deleted file mode 100644
index 751305147..000000000
--- a/libre/icedove-libre/Icedove-branding.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
-Date: Sat, 24 Nov 2012 11:36:16 +0100
-Subject: Icedove branding
-
----
- mail/app/application.ini |    2 +-
- mail/confvars.sh         |    4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/mail/app/application.ini b/mail/app/application.ini
-index 8380eb7..12902c2 100644
---- a/mail/app/application.ini
-+++ b/mail/app/application.ini
-@@ -4,7 +4,7 @@
- 
- #filter substitution
- [App]
--Name=Thunderbird
-+Name=Icedove
- Version=@APP_VERSION@
- BuildID=@GRE_BUILDID@
- #ifdef MOZ_SOURCE_REPO
-diff --git a/mail/confvars.sh b/mail/confvars.sh
-index 5c34d70..395bb87 100755
---- a/mail/confvars.sh
-+++ b/mail/confvars.sh
-@@ -3,8 +3,8 @@
- # License, v. 2.0. If a copy of the MPL was not distributed with this
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- 
--MOZ_APP_BASENAME=Thunderbird
--MOZ_APP_NAME=thunderbird
-+MOZ_APP_BASENAME=Icedove
-+MOZ_APP_NAME=icedove
- MOZ_UPDATER=1
- MOZ_THUNDERBIRD=1
- MOZ_CHROME_FILE_FORMAT=omni
diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD
index e793f5924..246f228bc 100644
--- a/libre/icedove-libre/PKGBUILD
+++ b/libre/icedove-libre/PKGBUILD
@@ -4,12 +4,13 @@
 # We're getting this from Debian Sid
 _debname=icedove
 _debver=17.0.8
-_debrel=1
+_debrel=deb1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
 _pkgname=${_debname}
 pkgname=${_debname}-libre
+epoch=1
 pkgver=${_debver}.${_debrel}
 pkgrel=1
 pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird."
@@ -24,24 +25,18 @@ conflicts=('thunderbird')
 provides=('thunderbird')
 install=${_pkgname}.install
 source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
-        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz"
+        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel#deb}.debian.tar.gz"
         mozconfig
         replace-urls.txt
         vendor.js
-        makefile.patch
-        branding.patch
-        ${_pkgname}.desktop
-        Icedove-branding.patch)
+        ${_pkgname}.desktop)
 options=(!emptydirs)
 md5sums=('37a706e6b2c17049ab70739600ef47b0'
          '0524d248bd0e83fa62c261700640ac0d'
          '5cf95ea94f69cdd36604890cfbf7b954'
          'a8fc4658d45b6bf9350023e5c3f34e56'
          '4eecc4fc5aafaf0da651a09eadc90bee'
-         'c4ed43e85945e180a89cce03e45ec62c'
-         '126b1446212396c33220936c01d9592d'
-         'e785e0c267f4435ae1a9aa0b03bcacfb'
-         'ea5f7a06967f561d47d7e5c35b23de6f')
+         'e785e0c267f4435ae1a9aa0b03bcacfb')
 
 prepare() {
   export DEBIAN_BUILD="comm-esr17"
@@ -63,14 +58,24 @@ prepare() {
       install -Dm644 "debian/app-icons/${_pkgname}${i/x*/}.png" "${srcdir}/${DEBIAN_BUILD}/mail/branding/${_pkgname}/content/icon${i/x*/}.png"
   done
 
-  # This patch has a orthographic issue ("Icdove" instead of "Icedove") in MOZ_APP_BASENAME line for confvars.sh.
-  rm -v debian/patches/debian-hacks/Icedove-branding.patch || true
+  # Fix orthographic issue ("Icdove" to "Icedove") in MOZ_APP_BASENAME line for confvars.sh.
+  sed -i 's|Icdove|Icedove|' debian/patches/debian-hacks/Icedove-branding.patch
 
   quilt push -av
 
-  patch -Np1 -i "${srcdir}/makefile.patch" # small fix
-  patch -Np1 -i "${srcdir}/branding.patch" # fixing branding
-  patch -Np1 -i "${srcdir}/Icedove-branding.patch" # debian patch fixed version
+  # Fix paths on makefile
+  sed -i 's|topsrcdir = [.][.]/[.][.]/[.][.]/|topsrcdir = @top_srcdir@|;
+          s|include $(topsrcdir)/config/autoconf.mk|include $(DEPTH)/config/autoconf.mk|;
+          s|include $(DEPTH)/config/rules.mk|include $(topsrcdir)/config/rules.mk|;
+         ' mail/branding/icedove/Makefile.in
+
+  sed -i 's|topsrcdir      = [.][.]/[.][.]/[.][.]/[.][.]|topsrcdir      = @top_srcdir@|;
+          s|include $(topsrcdir)/config/autoconf.mk|include $(DEPTH)/config/autoconf.mk|;
+          s|include $(DEPTH)/config/rules.mk|include $(topsrcdir)/config/rules.mk|;
+         ' mail/branding/icedove/locales/Makefile.in
+
+  # Fix branding
+  sed -i 's|Icedove Mail/News|Icedove|' mail/branding/icedove/locales/en-US/brand.{dtd,properties}
 
   # Replace common URLs
   sed '/^#/d' ../replace-urls.txt | while read -r moz_url gnu_url; do
diff --git a/libre/icedove-libre/branding.patch b/libre/icedove-libre/branding.patch
deleted file mode 100644
index d84b8075a..000000000
--- a/libre/icedove-libre/branding.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Naur comm-release.orig/mail/branding/icedove/locales/en-US/brand.dtd comm-release/mail/branding/icedove/locales/en-US/brand.dtd
---- comm-release.orig/mail/branding/icedove/locales/en-US/brand.dtd	2012-10-30 16:41:16.000000000 -0200
-+++ comm-release/mail/branding/icedove/locales/en-US/brand.dtd	2012-10-31 22:35:04.203666114 -0200
-@@ -1,4 +1,4 @@
- <!ENTITY  brandShortName        "Icedove">
--<!ENTITY  brandFullName         "Icedove Mail/News">
--<!ENTITY  vendorShortName       "Icedove">
-+<!ENTITY  brandFullName         "Icedove">
-+<!ENTITY  vendorShortName       "Mozilla">
- <!ENTITY  trademarkInfo.part1   " ">
-diff -Naur comm-release.orig/mail/branding/icedove/locales/en-US/brand.properties comm-release/mail/branding/icedove/locales/en-US/brand.properties
---- comm-release.orig/mail/branding/icedove/locales/en-US/brand.properties	2012-10-30 10:13:50.000000000 -0200
-+++ comm-release/mail/branding/icedove/locales/en-US/brand.properties	2012-10-31 22:35:14.786423732 -0200
-@@ -1,3 +1,3 @@
- brandShortName=Icedove
--brandFullName=Icedove Mail/News
--vendorShortName=Icedove
-+brandFullName=Icedove
-+vendorShortName=Mozilla
diff --git a/libre/icedove-libre/libre.patch b/libre/icedove-libre/libre.patch
deleted file mode 100644
index a6f23bdcd..000000000
--- a/libre/icedove-libre/libre.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -Nur comm-esr17.orig/mail/app/profile/all-thunderbird.js comm-esr17/mail/app/profile/all-thunderbird.js
---- comm-esr17.orig/mail/app/profile/all-thunderbird.js	2013-05-18 18:46:27.290732014 -0300
-+++ comm-esr17/mail/app/profile/all-thunderbird.js	2013-05-18 18:10:57.239376924 -0300
-@@ -160,11 +160,11 @@
- // Preferences for AMO integration
- pref("extensions.getAddons.cache.enabled", true);
- pref("extensions.getAddons.maxResults", 15);
--pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=%OS%&appVersion=%VERSION%");
--pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
--pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/search?q=%TERMS%");
--pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=thunderbird");
--pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/discovery/pane/%VERSION%/%OS%");
-+pref("extensions.getAddons.get.url", "https://trisquel.info/browser-plain");
-+pref("extensions.getAddons.getWithPerformance.url", "https://trisquel.info/browser-plain");
-+pref("extensions.getAddons.search.browseURL", "https://trisquel.info/browser-plain");
-+pref("extensions.getAddons.search.url", "https://trisquel.info/browser-plain");
-+pref("extensions.webservice.discoverURL", "https://trisquel.info/browser-plain");
- 
- // Blocklist preferences
- pref("extensions.blocklist.enabled", true);
-@@ -189,7 +189,7 @@
- pref("extensions.update.interval", 86400);  // Check for updates to Extensions and 
-                                             // Themes every day
- 
--pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/themes/");
-+pref("extensions.getMoreThemesURL", "https://trisquel.info/browser-plain");
- pref("extensions.dss.enabled", false);          // Dynamic Skin Switching                                               
- pref("extensions.dss.switchPending", false);    // Non-dynamic switch pending after next
- 
-@@ -390,7 +390,7 @@
- 
- pref("spellchecker.dictionary", "");
- // Dictionary download preference
--pref("spellchecker.dictionaries.download.url", "https://addons.mozilla.com/%LOCALE%/thunderbird/dictionaries/");
-+pref("spellchecker.dictionaries.download.url", "https://trisquel.info/browser-plain");
- 
- // profile.force.migration can be used to bypass the migration wizard, forcing migration from a particular
- // mail application without any user intervention. Possible values are: 
-@@ -747,9 +747,7 @@
- #endif
- 
- // plugin finder service url
--pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.
--php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=
--%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%");
-+pref("pfs.datasource.url", "http://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE%");
- 
- // By default we show an infobar message when pages require plugins the user has
- // not installed, or are outdated.
diff --git a/libre/icedove-libre/makefile.patch b/libre/icedove-libre/makefile.patch
deleted file mode 100644
index 8f8137bec..000000000
--- a/libre/icedove-libre/makefile.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -Nur comm-release.orig/mail/branding/icedove/Makefile.in comm-release/mail/branding/icedove/Makefile.in
---- comm-release.orig/mail/branding/icedove/Makefile.in	2012-04-18 15:42:15.000000000 -0300
-+++ comm-release/mail/branding/icedove/Makefile.in	2012-05-08 04:03:25.680643202 -0300
-@@ -38,11 +38,11 @@
- # Branding Makefile for Icedove branding
- 
- DEPTH = ../../..
--topsrcdir = ../../../
-+topsrcdir = @top_srcdir@
- srcdir = @srcdir@
- VPATH = @srcdir@
- 
--include $(topsrcdir)/config/autoconf.mk
-+include $(DEPTH)/config/autoconf.mk
- 
- DIRS = \
- 	locales \
-@@ -50,7 +50,7 @@
- 
- PREF_JS_EXPORTS += $(srcdir)/thunderbird-branding.js
- 
--include $(DEPTH)/config/rules.mk
-+include $(topsrcdir)/config/rules.mk
- 
- export::
- 	$(NSINSTALL) -D $(DIST)/branding
-diff -Nur comm-release.orig/mail/branding/icedove/locales/Makefile.in comm-release/mail/branding/icedove/locales/Makefile.in
---- comm-release.orig/mail/branding/icedove/locales/Makefile.in	2012-04-18 15:42:15.000000000 -0300
-+++ comm-release/mail/branding/icedove/locales/Makefile.in	2012-05-08 05:32:57.481620942 -0300
-@@ -36,13 +36,13 @@
- # ***** END LICENSE BLOCK *****
- 
- DEPTH          = ../../../..
--topsrcdir      = ../../../..
-+topsrcdir      = @top_srcdir@
- srcdir         = @srcdir@
- VPATH          = @srcdir@
- relativesrcdir = mail/branding/icedove/locales
- 
--include $(topsrcdir)/config/autoconf.mk
-+include $(DEPTH)/config/autoconf.mk
- 
- DEFINES += -DAB_CD=$(AB_CD) -DMOZ_DISTRIBUTION_ID_UNQUOTED=$(MOZ_DISTRIBUTION_ID)
- 
--include $(DEPTH)/config/rules.mk
-+include $(topsrcdir)/config/rules.mk
diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD
index fae6951dd..19400ce5f 100644
--- a/libre/iceweasel-l10n/PKGBUILD
+++ b/libre/iceweasel-l10n/PKGBUILD
@@ -12,7 +12,7 @@
 
 _debname=iceweasel
 _debver=23.0.1
-_debrel=1
+_debrel=deb1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
@@ -22,19 +22,20 @@ pkgbase=iceweasel-l10n
 pkgname=($(for lang in ${_langpacks[@]}
         do echo $pkgbase-$lang | tr A-Z a-z
         done))
+epoch=1
 pkgver=$_debver.$_debrel
-pkgrel=1
+pkgrel=2
 
 pkgdesc="Language packs for Debian Iceweasel."
 arch=('any')
-url="http://packages.debian.org/experimental/iceweasel"
+url="http://packages.debian.org/sid/iceweasel"
 license=('MPL' 'GPL')
-depends=("iceweasel-libre>=$pkgver")
+depends=("iceweasel-libre>=$epoch:$pkgver")
 makedepends=('unzip' 'zip')
 source=('region.properties')
 for lang in ${_langpacks[@]}
 do
-    source+=("${_debrepo}/`debfile ${_debname}`-l10n-$(echo $lang | tr A-Z a-z)_${_debver}-${_debrel}_all.deb")
+    source+=("${_debrepo}/`debfile ${_debname}`-l10n-$(echo $lang | tr A-Z a-z)_${_debver}-${_debrel#deb}_all.deb")
 done
 
 _path="/usr/lib/iceweasel/browser/extensions/"
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 6172155ef..1918e27a6 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -12,17 +12,18 @@
 
 _pgo=true
 
-# We're getting this from Debian Experimental
+# We're getting this from Debian Sid
 _debname=iceweasel
 _debver=23.0.1
-_debrel=1
+_debrel=deb1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
 _pkgname=iceweasel
 pkgname=iceweasel-libre
+epoch=1
 pkgver=$_debver.$_debrel
-pkgrel=1
+pkgrel=2
 
 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox."
 arch=(i686 x86_64 mips64el)
@@ -37,13 +38,13 @@ if $_pgo; then
 fi
 optdepends=('networkmanager: Location detection via available WiFi networks'
             'libpulse: PulseAudio audio driver')
-url="http://packages.debian.org/experimental/${_pkgname}"
+url="http://packages.debian.org/sid/${_pkgname}"
 install=iceweasel.install
 replaces=('firefox')
 conflicts=('firefox')
 provides=('firefox')
 source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
-        "$_debrepo/`debfile $_debname`_$_debver-$_debrel.debian.tar.gz"
+        "$_debrepo/`debfile $_debname`_$_debver-${_debrel#deb}.debian.tar.gz"
         mozconfig
         mozconfig.pgo
         libre.patch
diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD
index 00714409a..c6262a0dc 100644
--- a/libre/linux-libre-lts-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD
@@ -1,12 +1,12 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
-_kernver=3.0.91
+_kernver=3.0.93
 _kernrel=1
 pkgname=('linux-libre-lts-kmod-alx')
 _version=v3.9-rc4
 _pkgver=3.9-rc4-2-su
 pkgver=3.9rc4.2
-pkgrel=14
+pkgrel=15
 pkgdesc='Atheros alx ethernet device driver for Linux-libre-lts kernel'
 arch=('i686' 'x86_64')
 url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx'
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index fc8e94f77..bfe0c4000 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193105 2013-08-16 10:56:05Z tpowa $
+# $Id: PKGBUILD 193507 2013-08-21 13:08:50Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -8,10 +8,10 @@
 pkgbase=linux-libre-lts     # Build stock -LIBRE-LTS kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.0
-_sublevel=91
+_sublevel=93
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.91 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.93 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -33,7 +33,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'module-init-wait-3.0.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu1_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('f30a562307b6f71204370fcd33756466'
-         'cb479cc4ee4709804bf65677c4178985'
+         '0d900fb04812ca03cd2a6de094cdcc04'
          '7373cc3ac66342156a7fc32af8577b46'
          'b7229f80282337979514f9640a969ff5'
          'c072b17032e80debc6a8626299245d46'
@@ -45,7 +45,7 @@ md5sums=('f30a562307b6f71204370fcd33756466'
          'f36222e7ce20c8e4dc27376f9be60f6c'
          '670931649c60fcb3ef2e0119ed532bd4'
          '8a71abc4224f575008f974a099b5cf6f'
-         '0acdb5346ba868c3a1819f36902ef562')
+         '0b0f582f9736f7d99d75b5f67cb56dfc')
 if [ "$CARCH" != "mips64el" ]; then
     # don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index b45052181..5bd6ff7c2 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193106 2013-08-16 10:56:45Z tpowa $
+# $Id: PKGBUILD 193503 2013-08-21 12:43:35Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -10,10 +10,10 @@
 pkgbase=linux-libre         # Build stock -LIBRE kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.10
-_sublevel=7
+_sublevel=9
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.7 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.9 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -33,7 +33,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         '3.10.6-logitech-dj.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
-         '8d05dec5772b17c4c21c00b93da42bd8'
+         '312e4b4203d2e74201a14f1a9633482d'
          '8ec987449e0e42a1c98d8ce92b9019c2'
          '8efbd1f17f37bdaa8649c8a63761bf07'
          'e49ac236dfeef709f91a3d993ea7b62c'
@@ -43,7 +43,7 @@ md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
          'f3def2cefdcbb954c21d8505d23cc83c'
          'd50c1ac47394e9aec637002ef3392bd1'
          '3ff40ca684cfe719723e627e2cef7cea'
-         '797e952fb0a168c0c1822acc0fac67bc')
+         'd2fb29339d9ec7978af71f80daa27a12')
 if [ "$CARCH" != "mips64el" ]; then
     # don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD
index a5e5212b1..a1c0ddbae 100644
--- a/libre/lirc-libre/PKGBUILD
+++ b/libre/lirc-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193099 2013-08-16 10:37:27Z tpowa $
+# $Id: PKGBUILD 193472 2013-08-20 22:18:28Z tpowa $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
@@ -6,7 +6,7 @@ _pkgbase=lirc
 pkgbase=lirc-libre
 pkgname=('lirc-libre' 'lirc-utils-libre')
 pkgver=0.9.0
-pkgrel=56
+pkgrel=57
 epoch=1
 _extramodules=extramodules-3.10-LIBRE
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/libre/mozilla-searchplugins/PKGBUILD b/libre/mozilla-searchplugins/PKGBUILD
index 6721ff845..2405ac889 100644
--- a/libre/mozilla-searchplugins/PKGBUILD
+++ b/libre/mozilla-searchplugins/PKGBUILD
@@ -10,7 +10,7 @@
 
 pkgname=mozilla-searchplugins
 pkgver=1.4
-pkgrel=1
+pkgrel=2
 pkgdesc="System-wide OpenSearch plugins common for Mozilla based browsers."
 arch=('any')
 license=('MPL' 'GPL' 'LGPL')
@@ -21,7 +21,7 @@ source=(
   internet-archive.xml
   parabola-packages.xml::https://parabolagnulinux.org/opensearch/packages/
   parabola-wiki-en.xml::
-  seeks-search.xml::http://seeks.zat.im/opensearch.xml
+  seeks-search.xml::http://www.seeks.fr/opensearch.xml
 #  yacy.xml::http://search.ipredator.se/opensearchdescription.xml
   yacy.xml
   wikipedia-en.xml::https://en.wikipedia.org/w/opensearch_desc.php
@@ -37,6 +37,6 @@ md5sums=('b4cc6bd8353af36ade441916217619e4'
          '462c68585461f8cdc23c93c46f6ee4cf'
          '92f834a3a1d85c9ae202955cdfe941eb'
          'b9a0893d7f6d41d755c478fd60c44be8'
-         '76df72680069a41a476539213a569302'
+         'dc6c76acf4c68a40710383513d72fa8b'
          '0f6cb4119f54e90d678827e2928474d4'
          'dbdd9b61e89d73cc3a70cbe20a1160e1')
diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD
index 36bf2f4ff..a5bda5d85 100644
--- a/libre/mplayer-libre/PKGBUILD
+++ b/libre/mplayer-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 191803 2013-07-30 21:46:38Z bpiotrowski $
+# $Id: PKGBUILD 193127 2013-08-17 00:43:52Z eric $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -8,7 +8,7 @@ _pkgbase=mplayer
 pkgbase=mplayer-libre
 pkgname=('mplayer-libre' 'mencoder-libre')
 pkgver=36285
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
 'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils'  'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx'
diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD
index 9923b356b..71d158d17 100644
--- a/libre/mplayer-vaapi-libre/PKGBUILD
+++ b/libre/mplayer-vaapi-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 94736 2013-07-29 18:51:32Z foutrelis $
+# $Id: PKGBUILD 95856 2013-08-17 15:21:03Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
@@ -9,7 +9,7 @@
 _pkgname=mplayer-vaapi
 pkgname=mplayer-vaapi-libre
 pkgver=36265
-pkgrel=3
+pkgrel=4
 pkgdesc="A movie player, compiled with vaapi support, without nonfree faac support"
 arch=('i686' 'x86_64')
 url="http://gitorious.org/vaapi/mplayer"
diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD
index 04773b21a..11faf618b 100644
--- a/libre/tp_smapi-libre/PKGBUILD
+++ b/libre/tp_smapi-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 95735 2013-08-16 09:00:08Z tpowa $
+# $Id: PKGBUILD 96173 2013-08-20 22:21:57Z tpowa $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: xduugu
 # Contributor: nh2
@@ -12,7 +12,7 @@
 _pkgname=tp_smapi
 pkgname=tp_smapi-libre
 pkgver=0.41
-pkgrel=31
+pkgrel=32
 pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre kernel package)"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://github.com/evgeni/tp_smapi'
diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD
index d0a47e872..b26b45dd1 100644
--- a/libre/vhba-module-libre/PKGBUILD
+++ b/libre/vhba-module-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 95737 2013-08-16 09:00:28Z tpowa $
+# $Id: PKGBUILD 96175 2013-08-20 22:22:25Z tpowa $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Charles Lindsay <charles@chaoslizard.org>
@@ -8,7 +8,7 @@ _pkgname=vhba-module
 pkgname=vhba-module-libre
 pkgver=20130607
 _extramodules=extramodules-3.10-LIBRE
-pkgrel=10
+pkgrel=11
 pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cdemu.sourceforge.net/"