python2-reportlab-libre-2.6-1: updating version

1 files changed, 20 insertions, 12 deletions

diff --git a/libre/python2-reportlab-libre/PKGBUILD b/libre/python2-reportlab-libre/PKGBUILD
index 7ead18cba..2adbbc234 100755
--- a/libre/python2-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