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

4 files changed, 113 insertions, 113 deletions

diff --git a/libre/iceape-i18n/PKGBUILD b/libre/iceape-i18n/PKGBUILD
index d146e02dd..78ac80d82 100755
--- a/libre/iceape-i18n/PKGBUILD
+++ b/libre/iceape-i18n/PKGBUILD
@@ -11,7 +11,7 @@
 # - Run 'make'. It will take care of everything else for you.
 
 _debname=iceape
-_debver=2.7.6
+_debver=2.7.9
 _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -22,7 +22,7 @@ pkgbase=iceape-i18n
 pkgname=($(for lang in ${_langpacks[@]}
         do echo $pkgbase-$lang | tr A-Z a-z
         done))
-_pkgver=2.7.6
+_pkgver=2.7.9
 pkgver=${_debver}.${_debrel}
 pkgrel=1
 
@@ -58,26 +58,26 @@ package_iceape-i18n-$(echo $lang | tr A-Z a-z)() {
 "
 done
 
-md5sums=('ee7f337bb32aee98a9f2be1936843106'
-         '10102b3e8f81dbd91dacddb892ba68b9'
-         'fef4de4746cc36bcf911fb0f7a7b2338'
-         'd31e21bb4917155e159941400b86b9a8'
-         '76e7c36cc0fd7e200c8b0d220d05f084'
-         '804fbc692db4523e31fbe337c37cd958'
-         '7bd3d6b9d4bdfcd5c53002ed695c3be9'
-         'b875123775d4aa52b747e9ef897cee4c'
-         'a5ecf997b5afa853fd46840f1e9cc01e'
-         '352872240f6e1812fb27599f2d43ed5e'
-         '7f680543cca22102660e39d775ea4f1f'
-         '19c47a8901163e23fc937b2076812147'
-         '7c1b1105b5a70008c12b3a5195c5a789'
-         '3306f9408c61f622a185fd9e218199ef'
-         '88f466e2bd3ec4236f76d92b22cc5e12'
-         '8c655118c3cfc0063581f11f11f23817'
-         '0d481cfdd69a591881e358f6a4d45e3e'
-         '457aea13f02af3aa2bc690ab438e1f37'
-         '9b72f83a7e1142ab8839fd2350437dfc'
-         '7e640437184ff9874d50bba9ddd8b800'
-         '2f00074f37b3785df5781a750e4a8293'
-         '9b4295c47829adcc3832d2b9524c6a95'
-         '1dea8892db29f13a37acdb02ba635f80')
+md5sums=('9ac6e3351e0d3d32e351a359e4f91062'
+         '9c2e0cbcd9759554d78fd050c2c30fa7'
+         '0ebf63ad1eeb338bc87f1abd34bc59e4'
+         '70c3e008980aad34875c62a8c4d1857a'
+         '7811bc669dd7f2ba73331b3b65258d2b'
+         'd50a27578ea43b9cc926e7cae5ef4b6f'
+         '9afe72fe36fe5da2c1246d19e43e8158'
+         '9a7b0c16665e4b7b6ea20267cb7dfeaf'
+         'd79e0f519763edb4c9c88528241c49f4'
+         '714f8c028b633e25be32c0c60f5d4ee9'
+         'b84f5f9616b37c4f6b868255d214b029'
+         '5725445a70d4e6e1f18438e6b164eaa0'
+         '839ea776b1d21990bcaf67bfefbbdeeb'
+         '14b20bf9388eb918ed094836306ea424'
+         '0fcc5b00ad23e2fd823b6e32a4d5fa86'
+         'd9ee55e4b53d182be6ecda64bac3686b'
+         '44d6a193b3c3b6a95898a455ff8d092a'
+         'ebe5a81f03658b44c301a15ba2a7c7e4'
+         '8c4c87c2e944f850b7f6561c866bef0d'
+         '8072fd0512358da3bd679afb0f7b5d68'
+         '292b42caa14502f420bc400291af075d'
+         'cbe874781488f0b95f4a84bb33b3e4c2'
+         'faabe8d25b70381d6620716450203cdf')
diff --git a/libre/icedove-i18n/PKGBUILD b/libre/icedove-i18n/PKGBUILD
index 8213076af..6d1e339a2 100755
--- a/libre/icedove-i18n/PKGBUILD
+++ b/libre/icedove-i18n/PKGBUILD
@@ -56,7 +56,7 @@ pkgname=('icedove-i18n-ar'
          'icedove-i18n-zh-cn'
          'icedove-i18n-zh-tw')
 
-pkgrel=1
+pkgrel=3
 pkgdesc="Language pack for Debian Icedove"
 arch=('any')
 url="http://packages.debian.org/source/experimental/icedove"
@@ -121,319 +121,319 @@ noextract=(${source[@]##*/})
 _path="/usr/lib/icedove/extensions/"
 
 package_icedove-i18n-ar() {
-  pkgdesc="Arabic language pack for Debian Icedove"
+  pkgdesc="Language packs for Debian Icedove."
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-ar.xpi "${pkgdir}/$_path/langpack-ar@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-af() {
-  pkgdesc="Afrikaans (South Africa) language pack for Debian Icedove"
+  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="Belarusian language pack for Debian Icedove"
+  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() {
-  pkgdesc="Bangladesh language pack for Debian Icedove"
+  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"
 }
 
 package_icedove-i18n-bg() {
-  pkgdesc="Bulgarian language pack for Debian Icedove"
+  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"
 }
 
 package_icedove-i18n-br() {
-  pkgdesc="Breton language pack for Debian Icedove"
+  pkgdesc="Language packs for Debian Icedove."
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-br.xpi "${pkgdir}/$_path/langpack-br@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-ca() {
-  pkgdesc="Catalan language pack for Debian Icedove"
+  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="Czech language pack for Debian Icedove"
+  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="Danish language pack for Debian Icedove"
+  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="German language pack for Debian Icedove"
+  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="Greek language pack for Debian Icedove"
+  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="English (GB) language pack for Debian Icedove"
+  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-es-ar() {
-  pkgdesc="Spanish (AR) language pack for Debian Icedove"
+  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() {
-  pkgdesc="Spanish language pack for Debian Icedove"
+  pkgdesc="Language packs for Debian Icedove."
   replaces=icedove-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="Estonian language pack for Debian Icedove"
+  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="Basque language pack for Debian Icedove"
+  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="Finnish language pack for Debian Icedove"
+  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="French language pack for Debian Icedove"
+  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"
 }
 
 package_icedove-i18n-fy-nl(){
-  pkgdesc="Frysk (fy) language pack for Debian Icedove"
+  pkgdesc="Language packs for Debian Icedove."
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-fy-NL.xpi "${pkgdir}/$_path/langpack-fy-NL@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-ga() {
-  pkgdesc="Irish language pack for Debian Icedove"
+  pkgdesc="Language packs for Debian Icedove."
   replaces=icedove-ga
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-ga-IE.xpi "${pkgdir}/$_path/langpack-ga-IE@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-gd() {
-  pkgdesc="Scottish Gaelic language pack for Debian Icedove"
+  pkgdesc="Language packs for Debian Icedove."
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-gd.xpi "${pkgdir}/$_path/langpack-gd@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-gl() {
-  pkgdesc="Galician language pack for Debian Icedove"
+  pkgdesc="Language packs for Debian Icedove."
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-gl.xpi "${pkgdir}/$_path/langpack-gl@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-he() {
-  pkgdesc="Hebrew language pack for Debian Icedove"
+  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-hu() {
-  pkgdesc="Hungarian language pack for Debian Icedove"
+  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-id(){
-  pkgdesc="Indonesian language pack for Debian Icedove"
+  pkgdesc="Language packs for Debian Icedove."
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-id.xpi "${pkgdir}/$_path/langpack-id@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-is() {
-  pkgdesc="Icelandic Gaelic language pack for Debian Icedove"
+  pkgdesc="Language packs for Debian Icedove."
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-is.xpi "${pkgdir}/$_path/langpack-is@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-it() {
-  pkgdesc="Italian language pack for Debian Icedove"
+  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="Japanese language pack for Debian Icedove"
+  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="Korean language pack for Debian Icedove"
+  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="Lithuanian language pack for Debian Icedove"
+  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() {
-  pkgdesc="Norwegian (Bokmal) language pack for Debian Icedove"
+  pkgdesc="Language packs for Debian Icedove."
   replaces=icedove-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="Macedonian language pack for Debian Icedove"
+  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="Dutch language pack for Debian Icedove"
+  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() {
-  pkgdesc="Norwegian (Nynorsk) language pack for Debian Icedove"
+  pkgdesc="Language packs for Debian Icedove."
   replaces=icedove-nn
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-nn-NO.xpi "${pkgdir}/$_path/langpack-nn-NO@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-pa() {
-  pkgdesc="Punjabi language pack for Debian Icedove"
+  pkgdesc="Language packs for Debian Icedove."
   replaces=icedove-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="Polish language pack for Debian Icedove"
+  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="Brazilian Portuguese language pack for Debian Icedove"
+  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="Portuguese language pack for Debian Icedove"
+  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="Romanian language pack for Debian Icedove"
+  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"
 }
 
 package_icedove-i18n-rm() {
-  pkgdesc="Romansh language pack for Debian Icedove"
+  pkgdesc="Language packs for Debian Icedove."
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-rm.xpi "${pkgdir}/$_path/langpack-rm@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-ru() {
-  pkgdesc="Russian language pack for Debian Icedove"
+  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"
 }
 
 package_icedove-i18n-si() {
-  pkgdesc="Sinhalese language pack for Debian Icedove"
+  pkgdesc="Language packs for Debian Icedove."
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-si.xpi "${pkgdir}/$_path/langpack-si@icedove.mozilla.org.xpi"
 }
 
 package_icedove-i18n-sk() {
-  pkgdesc="Slovak language pack for Debian Icedove"
+  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="Slovenian language pack for Debian Icedove"
+  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="Albanian language pack for Debian Icedove"
+  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() {
-  pkgdesc="Swedish language pack for Debian Icedove"
+  pkgdesc="Language packs for Debian Icedove."
   replaces=icedove-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=" Tamil (Sri Lanka) language pack for Debian Icedove"
+  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"
@@ -441,33 +441,33 @@ package_icedove-i18n-ta-lk() {
 
 
 package_icedove-i18n-tr() {
-  pkgdesc="Turkish language pack for Debian Icedove"
+  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="Ukrainian language pack for Debian Icedove"
+  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"
 }
 
 package_icedove-i18n-vi() {
-  pkgdesc="Vietnamese language pack for Debian Icedove"
+  pkgdesc="Language packs for Debian Icedove."
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-vi.xpi "${pkgdir}/$_path/langpack-vi@icedove.mozilla.org.xpi"
 }
 package_icedove-i18n-zh-cn() {
-  pkgdesc="Chinese (simplified) language pack for Debian Icedove"
+  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="Chinese (traditional) language pack for Debian Icedove"
+  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"
diff --git a/libre/python-reportlab-libre/PKGBUILD b/libre/python2-reportlab-libre/PKGBUILD
index 7ead18cba..2adbbc234 100755
--- a/libre/python-reportlab-libre/PKGBUILD
+++ b/libre/python2-reportlab-libre/PKGBUILD
@@ -6,35 +6,43 @@
 # Contributor: borgo <nomail>
 # Contributor (Parabola): André Silva <emulatorman@lavabit.com>
 
-pkgname=python-reportlab-libre
+pkgbase=python-reportlab-libre
+pkgname=python2-reportlab-libre
 _origname=reportlab
-pkgver=2.5
-pkgrel=2
-pkgdesc="A proven industry-strength PDF generating solution"
+pkgver=2.6
+pkgrel=1
+pkgdesc="A proven industry-strength PDF generating solution (without non-free Adobe T1 fonts)"
 arch=('i686' 'x86_64')
+url="http://www.reportlab.org/rl_toolkit.html"
 depends=('python2' 'freetype2' 'ttf-bitstream-vera' 'gsfonts' 'python-imaging')
+conflicts=('python2-reportlab' 'python-reportlab<=2.5-2')
+replaces=('python2-reportlab' 'python-reportlab<=2.5-2')
+provides=("python2-reportlab=$pkgver")
 license=('custom')
 source=(http://www.reportlab.com/ftp/${_origname}-$pkgver.tar.gz
         free-fonts.patch)
-url="http://www.reportlab.org/rl_toolkit.html"
-md5sums=('cdf8b87a6cf1501de1b0a8d341a217d3'
-         '1fc63857754cf3e2987d2400d94e7cd7')
-provides=("python-reportlab=$pkgver")
-conflicts=('python-reportlab')
-replaces=('python-reportlab')
+md5sums=('e5d27a24a2c8456b168913242aa1940f'
+         'd3abd11dfee7d1cf2edbcc786792e3cd')
 optdepends=('ghostscript')
 
 build() {
     cd $srcdir/${_origname}-$pkgver
 
+    # remove non-free Adobe T1 fonts
+    patch -p1 -i $srcdir/free-fonts.patch
+
+    # Parabola contains those fonts from the ttf-bitstream-vera package
+    rm -f src/reportlab/fonts/{bitstream-vera-license.txt,Vera*}
+
     # python2 fix
     for file in src/reportlab/graphics/widgets/table.py src/reportlab/lib/normalDate.py \
                 src/reportlab/pdfgen/pycanvas.py; do
         sed -i 's_#!.*/usr/bin/env python_#!/usr/bin/env python2_' $file
     done
+}
 
-    rm -f reportlab/fonts/Vera* reportlab/fonts/bitstream-vera-license.txt
-    patch -p1 -i $srcdir/free-fonts.patch
+package_python2-reportlab-libre() {
+    cd $srcdir/${_origname}-$pkgver
 
     python2 setup.py install --root=$pkgdir --optimize=1
     install -D -m644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/license.txt
diff --git a/libre/python-reportlab-libre/free-fonts.patch b/libre/python2-reportlab-libre/free-fonts.patch
index 9c79839b6..0359e4c2e 100755..100644
--- a/libre/python-reportlab-libre/free-fonts.patch
+++ b/libre/python2-reportlab-libre/free-fonts.patch
@@ -1,6 +1,6 @@
-diff -rupN reportlab-2.5-orig/setup.py reportlab-2.5/setup.py
---- reportlab-2.5-orig/setup.py	2010-06-16 13:56:53.000000000 +0200
-+++ reportlab-2.5/setup.py	2011-01-06 11:01:50.263333455 +0100
+diff -rupN reportlab-2.6.orig/setup.py reportlab-2.6/setup.py
+--- reportlab-2.6.orig/setup.py	2012-09-27 13:14:06.000000000 -0300
++++ reportlab-2.6/setup.py	2012-10-18 14:34:16.750336101 -0200
 @@ -222,11 +222,11 @@ def get_fonts(PACKAGE_DIR, reportlab_fil
          infoline("Standard T1 font curves already downloaded")
          return
@@ -8,10 +8,10 @@ diff -rupN reportlab-2.5-orig/setup.py reportlab-2.5/setup.py
 -        infoline("Downloading standard T1 font curves")
 +        #infoline("Downloading standard T1 font curves")
  
--        remotehandle = urllib2.urlopen("http://www.reportlab.com/ftp/fonts/pfbfer.zip")
+-        remotehandle = urllib2.urlopen("http://www.reportlab.com/ftp/pfbfer-20070710.zip")
 -        zipdata = StringIO.StringIO(remotehandle.read())
 -        remotehandle.close()
-+        #remotehandle = urllib2.urlopen("http://www.reportlab.com/ftp/fonts/pfbfer.zip")
++        #remotehandle = urllib2.urlopen("http://www.reportlab.com/ftp/pfbfer-20070710.zip")
 +        #zipdata = StringIO.StringIO(remotehandle.read())
 +        #remotehandle.close()
          archive = zipfile.ZipFile(zipdata)
@@ -26,9 +26,9 @@ diff -rupN reportlab-2.5-orig/setup.py reportlab-2.5/setup.py
  
  def main():
      #test to see if we've a special command
-diff -rupN reportlab-2.5-orig/src/reportlab/pdfbase/_fontdata.py reportlab-2.5/src/reportlab/pdfbase/_fontdata.py
---- reportlab-2.5-orig/src/reportlab/pdfbase/_fontdata.py	2010-02-10 22:01:22.000000000 +0100
-+++ reportlab-2.5/src/reportlab/pdfbase/_fontdata.py	2011-01-06 11:03:59.459999025 +0100
+diff -rupN reportlab-2.6.orig/src/reportlab/pdfbase/_fontdata.py reportlab-2.6/src/reportlab/pdfbase/_fontdata.py
+--- reportlab-2.6.orig/src/reportlab/pdfbase/_fontdata.py	2012-09-27 11:39:39.000000000 -0300
++++ reportlab-2.6/src/reportlab/pdfbase/_fontdata.py	2012-10-18 14:36:08.018365073 -0200
 @@ -72,20 +72,20 @@ _font2fnrMapWin32 = {
                      }
  if sys.platform in ('linux2',):
@@ -64,9 +64,9 @@ diff -rupN reportlab-2.5-orig/src/reportlab/pdfbase/_fontdata.py reportlab-2.5/s
                  }
      _font2fnrMap = _font2fnrMapLinux2
      for k, v in _font2fnrMap.items():
-diff -rupN reportlab-2.5-orig/src/reportlab/rl_config.py reportlab-2.5/src/reportlab/rl_config.py
---- reportlab-2.5-orig/src/reportlab/rl_config.py	2010-09-30 13:27:09.000000000 +0200
-+++ reportlab-2.5/src/reportlab/rl_config.py	2011-01-06 11:01:50.266666714 +0100
+diff -rupN reportlab-2.6.orig/src/reportlab/rl_config.py reportlab-2.6/src/reportlab/rl_config.py
+--- reportlab-2.6.orig/src/reportlab/rl_config.py	2012-09-27 11:39:39.000000000 -0300
++++ reportlab-2.6/src/reportlab/rl_config.py	2012-10-18 14:47:45.619021247 -0200
 @@ -49,25 +49,7 @@ ttfAsciiReadable=           1
  
  # places to look for T1Font information
@@ -94,7 +94,7 @@ diff -rupN reportlab-2.5-orig/src/reportlab/rl_config.py reportlab-2.5/src/repor
                  '%(REPORTLAB_DIR)s/fonts',              #special
                  '%(REPORTLAB_DIR)s/../fonts',           #special
                  '%(REPORTLAB_DIR)s/../../fonts',        #special
-@@ -76,44 +58,17 @@ T1SearchPath =  (
+@@ -76,10 +58,7 @@ T1SearchPath =  (
  
  # places to look for TT Font information
  TTFSearchPath = (
@@ -106,15 +106,7 @@ diff -rupN reportlab-2.5-orig/src/reportlab/rl_config.py reportlab-2.5/src/repor
                  '%(REPORTLAB_DIR)s/fonts',      #special
                  '%(REPORTLAB_DIR)s/../fonts',   #special
                  '%(REPORTLAB_DIR)s/../../fonts',#special
-                 '%(HOME)s/fonts',               #special
--                #mac os X - from
--                #http://developer.apple.com/technotes/tn/tn2024.html
--                '~/Library/Fonts',
--                '/Library/Fonts',
--                '/Network/Library/Fonts',
--                '/System/Library/Fonts',
--                
-                 )
+@@ -95,25 +74,8 @@ TTFSearchPath = (
  
  # places to look for CMap files - should ideally merge with above
  CMapSearchPath = (
@@ -137,8 +129,8 @@ diff -rupN reportlab-2.5-orig/src/reportlab/rl_config.py reportlab-2.5/src/repor
 -                  'C:\\Program Files\\Adobe\\Acrobat 6.0\\Resource\\CMap',
 -                  'C:\\Program Files\\Adobe\\Acrobat 5.0\\Resource\\CMap',
 -                  'C:\\Program Files\\Adobe\\Acrobat 4.0\\Resource\\CMap',
-+                  '/usr/share/ghostscript/8.71/Resource/CMap',
-+                  '/usr/share/ghostscript/9.00/Resource/CMap',
++                  '/usr/share/ghostscript/9.04/Resource/CMap',
++                  '/usr/share/ghostscript/9.06/Resource/CMap',
                    '%(REPORTLAB_DIR)s/fonts/CMap',       #special
                    '%(REPORTLAB_DIR)s/../fonts/CMap',    #special
                    '%(REPORTLAB_DIR)s/../../fonts/CMap', #special