python-reportlab-libre-3.0-1: updating version

5 files changed, 146 insertions, 196 deletions

diff --git a/libre/python-reportlab-libre/ChangeLog b/libre/python-reportlab-libre/ChangeLog
new file mode 100644
index 000000000..85b5db51f
--- /dev/null
+++ b/libre/python-reportlab-libre/ChangeLog
@@ -0,0 +1,18 @@
+
+2009-02-17  Douglas Soares de Andrade  <douglas@archlinux.org>
+
+	* Updated for i686: 2.3
+
+2008-11-03  Giovanni Scafora           <giovanni@archlinux.org>
+
+	* Rebuilt against python 2.6
+
+2008-09-14  Douglas Soares de Andrade  <douglas@archlinux.org>
+
+	* Updating for x86_64: 2.2
+
+2008-09-13  Douglas Soares de Andrade  <douglas@archlinux.org>
+
+	* Adding ChangeLog
+	* Updating for i686: 2.2
+
diff --git a/libre/python-reportlab-libre/PKGBUILD b/libre/python-reportlab-libre/PKGBUILD
new file mode 100644
index 000000000..2fc4ee836
--- /dev/null
+++ b/libre/python-reportlab-libre/PKGBUILD
@@ -0,0 +1,67 @@
+# $Id: PKGBUILD 106308 2014-02-27 10:52:25Z jelle $
+# Maintainer:
+# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
+# Contributor: William Rea <sillywilly@gmail.com>
+# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
+# Contributor: borgo <nomail>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
+
+pkgbase=python-reportlab-libre
+pkgname=(python2-reportlab-libre python-reportlab-libre)
+_origname=reportlab
+pkgver=3.0
+pkgrel=1
+pkgdesc="A proven industry-strength PDF generating solution, without nonfree fonts support"
+arch=('i686' 'x86_64')
+url="http://www.reportlab.org/rl_toolkit.html"
+depends=('freetype2')
+checkdepends=('python' 'python2')
+license=('custom')
+source=(http://www.reportlab.com/ftp/reportlab-$pkgver.tar.gz
+        free-fonts.patch)
+md5sums=('a4fd40abcfb604aa3bd907181133c071'
+         'eb3ac47734efb05b939fb88026aff8ed')
+
+prepare() {
+    cd $srcdir
+    cp -rf ${_origname}-$pkgver "${_origname}2-$pkgver"
+
+    _reportlab_source=("${_origname}-$pkgver" "${_origname}2-$pkgver")
+
+    for x in ${_reportlab_source[@]}; do
+      cd $srcdir/$x
+
+      # remove nonfree fonts support
+      patch -p1 -i $srcdir/free-fonts.patch
+
+      # Parabola contains those fonts from the ttf-bitstream-vera package
+      rm -fv src/reportlab/fonts/{bitstream-vera-license.txt,Vera*}
+    done
+}
+
+package_python2-reportlab-libre() {
+    conflicts+=('python2-reportlab' 'python-reportlab<=2.5-2')
+    replaces+=('python2-reportlab' 'python-reportlab<=2.5-2')
+    provides=("python2-reportlab=$pkgver")
+    depends=('python2')
+    cd "$srcdir/${_origname}2-$pkgver"
+    python2 setup.py install --root=$pkgdir --optimize=1
+    install -D -m644 LICENSE.txt $pkgdir/usr/share/licenses/$_pkgname/license.txt
+}
+
+package_python-reportlab-libre() {
+    conflicts+=('python-reportlab' 'python-reportlab-libre<=2.5-2')
+    replaces+=('python-reportlab' 'python-reportlab-libre<=2.5-2')
+    provides=("python-reportlab=$pkgver")
+    depends=('python3')
+    cd "$srcdir/${_origname}-$pkgver"
+    python3 setup.py install --root=$pkgdir --optimize=1
+    install -D -m644 LICENSE.txt $pkgdir/usr/share/licenses/$_pkgname/license.txt
+}
+
+
+check() {
+    cd ${srcdir}/${_origname}-${pkgver}
+    python2 setup.py tests
+    python setup.py tests
+}
diff --git a/libre/python-reportlab-libre/free-fonts.patch b/libre/python-reportlab-libre/free-fonts.patch
new file mode 100644
index 000000000..d88b3b31b
--- /dev/null
+++ b/libre/python-reportlab-libre/free-fonts.patch
@@ -0,0 +1,61 @@
+diff -Nur reportlab-3.0.orig/setup.py reportlab-3.0/setup.py
+--- reportlab-3.0.orig/setup.py	2014-02-14 12:22:37.000000000 -0200
++++ reportlab-3.0/setup.py	2014-02-27 22:46:48.998702565 -0200
+@@ -254,11 +254,6 @@
+         infoline('not downloading T1 font curve files')
+         return
+     try:
+-        infoline("Downloading standard T1 font curves")
+-
+-        remotehandle = ureq.urlopen("http://www.reportlab.com/ftp/pfbfer-20070710.zip")
+-        zipdata = io.BytesIO(remotehandle.read())
+-        remotehandle.close()
+         archive = zipfile.ZipFile(zipdata)
+         dst = pjoin(rl_dir, 'fonts')
+ 
+@@ -271,7 +266,6 @@
+     except:
+         xitmsg = "Failed to download standard T1 font curves"
+     reportlab_files = [x for x in reportlab_files if os.path.isfile(pjoin(rl_dir,x))]
+-    infoline(xitmsg)
+ 
+ def main():
+     #test to see if we've a special command
+diff -Nur reportlab-3.0.orig/src/reportlab/pdfbase/_fontdata.py reportlab-3.0/src/reportlab/pdfbase/_fontdata.py
+--- reportlab-3.0.orig/src/reportlab/pdfbase/_fontdata.py	2014-02-14 12:22:37.000000000 -0200
++++ reportlab-3.0/src/reportlab/pdfbase/_fontdata.py	2014-02-27 22:26:55.438002204 -0200
+@@ -72,20 +72,20 @@
+                     }
+ if sys.platform in ('linux2',):
+     _font2fnrMapLinux2 ={
+-                'symbol': 'Symbol',
+-                'zapfdingbats': 'ZapfDingbats',
+-                'helvetica': 'Arial',
+-                'helvetica-bold': 'Arial-Bold',
+-                'helvetica-boldoblique': 'Arial-BoldItalic',
+-                'helvetica-oblique': 'Arial-Italic',
+-                'times-bold': 'TimesNewRoman-Bold',
+-                'times-bolditalic':'TimesNewRoman-BoldItalic',
+-                'times-italic': 'TimesNewRoman-Italic',
+-                'times-roman': 'TimesNewRoman',
+-                'courier-bold': 'Courier-Bold',
+-                'courier-boldoblique': 'Courier-BoldOblique',
+-                'courier': 'Courier',
+-                'courier-oblique': 'Courier-Oblique',
++                'symbol': 's050000l.pfb',
++                'zapfdingbats': 'd050000l.pfb',
++                'helvetica': 'n019003l.pfb',
++                'helvetica-bold': 'n019004l.pfb',
++                'helvetica-boldoblique': 'n019024l.pfb',
++                'helvetica-oblique': 'n019023l.pfb',
++                'times-bold': 'n021004l.pfb',
++                'times-bolditalic':'n021024l.pfb',
++                'times-italic': 'n021023l.pfb',
++                'times-roman': 'n021003l.pfb',
++                'courier-bold': 'n022004l.pfb',
++                'courier-boldoblique': 'n022024l.pfb',
++                'courier': 'n022003l.pfb',
++                'courier-oblique': 'n022023l.pfb',
+                 }
+     _font2fnrMap = _font2fnrMapLinux2
+     for k, v in _font2fnrMap.items():
diff --git a/libre/python2-reportlab-libre/PKGBUILD b/libre/python2-reportlab-libre/PKGBUILD
deleted file mode 100644
index 0f608f7a0..000000000
--- a/libre/python2-reportlab-libre/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 97428 2013-09-19 18:56:42Z jelle $
-# Maintainer:
-# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
-# Contributor: William Rea <sillywilly@gmail.com>
-# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
-# Contributor: borgo <nomail>
-# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
-
-pkgbase=python-reportlab-libre
-pkgname=python2-reportlab-libre
-_origname=reportlab
-pkgver=2.7
-pkgrel=1
-pkgdesc="A proven industry-strength PDF generating solution, without nonfree Adobe T1 fonts support"
-arch=('i686' 'x86_64')
-url="http://www.reportlab.org/rl_toolkit.html"
-depends=('python2' 'freetype2')
-conflicts=('python-reportlab<=2.5-2' 'python2-reportlab')
-replaces=('python-reportlab<=2.5-2' 'python2-reportlab')
-provides=("python2-reportlab=$pkgver")
-license=('custom')
-source=(http://www.reportlab.com/ftp/reportlab-$pkgver.tar.gz
-        free-fonts.patch)
-md5sums=('78300e6fe8a0d020fc16734a3de80cc4'
-         '1588b88851711cc6c868db4c7d4f4dea')
-
-build() {
-    cd $srcdir/${_origname}-$pkgver
-
-    # remove nonfree Adobe T1 fonts support
-    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
-}
-
-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
-}
-
-check() {
-    cd ${srcdir}/${_origname}-${pkgver}
-#    python2 setup.py tests
-}
diff --git a/libre/python2-reportlab-libre/free-fonts.patch b/libre/python2-reportlab-libre/free-fonts.patch
deleted file mode 100644
index b2683931b..000000000
--- a/libre/python2-reportlab-libre/free-fonts.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-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
-     try:
--        infoline("Downloading standard T1 font curves")
-+        #infoline("Downloading standard T1 font curves")
- 
--        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/pfbfer-20070710.zip")
-+        #zipdata = StringIO.StringIO(remotehandle.read())
-+        #remotehandle.close()
-         archive = zipfile.ZipFile(zipdata)
-         dst = pjoin(rl_dir, 'fonts')
- 
-@@ -239,7 +239,7 @@ def get_fonts(PACKAGE_DIR, reportlab_fil
-     except:
-         xitmsg = "Failed to download standard T1 font curves"
-     reportlab_files = [x for x in reportlab_files if os.path.isfile(pjoin(rl_dir,x))]
--    infoline(xitmsg)
-+    #infoline(xitmsg)
- 
- def main():
-     #test to see if we've a special command
-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',):
-     _font2fnrMapLinux2 ={
--                'symbol': 'Symbol',
--                'zapfdingbats': 'ZapfDingbats',
--                'helvetica': 'Arial',
--                'helvetica-bold': 'Arial-Bold',
--                'helvetica-boldoblique': 'Arial-BoldItalic',
--                'helvetica-oblique': 'Arial-Italic',
--                'times-bold': 'TimesNewRoman-Bold',
--                'times-bolditalic':'TimesNewRoman-BoldItalic',
--                'times-italic': 'TimesNewRoman-Italic',
--                'times-roman': 'TimesNewRoman',
--                'courier-bold': 'Courier-Bold',
--                'courier-boldoblique': 'Courier-BoldOblique',
--                'courier': 'Courier',
--                'courier-oblique': 'Courier-Oblique',
-+                'symbol': 's050000l.pfb',
-+                'zapfdingbats': 'd050000l.pfb',
-+                'helvetica': 'n019003l.pfb',
-+                'helvetica-bold': 'n019004l.pfb',
-+                'helvetica-boldoblique': 'n019024l.pfb',
-+                'helvetica-oblique': 'n019023l.pfb',
-+                'times-bold': 'n021004l.pfb',
-+                'times-bolditalic':'n021024l.pfb',
-+                'times-italic': 'n021023l.pfb',
-+                'times-roman': 'n021003l.pfb',
-+                'courier-bold': 'n022004l.pfb',
-+                'courier-boldoblique': 'n022024l.pfb',
-+                'courier': 'n022003l.pfb',
-+                'courier-oblique': 'n022023l.pfb',
-                 }
-     _font2fnrMap = _font2fnrMapLinux2
-     for k, v in _font2fnrMap.items():
-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 16:05:12.683766581 -0200
-@@ -49,25 +49,7 @@ ttfAsciiReadable=           1
- 
- # places to look for T1Font information
- T1SearchPath =  (
--                'c:/Program Files/Adobe/Acrobat 9.0/Resource/Font', 
--                'c:/Program Files/Adobe/Acrobat 8.0/Resource/Font', 
--                'c:/Program Files/Adobe/Acrobat 7.0/Resource/Font', 
--                'c:/Program Files/Adobe/Acrobat 6.0/Resource/Font', #Win32, Acrobat 6
--                'c:/Program Files/Adobe/Acrobat 5.0/Resource/Font',     #Win32, Acrobat 5
--                'c:/Program Files/Adobe/Acrobat 4.0/Resource/Font', #Win32, Acrobat 4
--                '%(disk)s/Applications/Python %(sys_version)s/reportlab/fonts', #Mac?
--                '/usr/lib/Acrobat9/Resource/Font',      #Linux, Acrobat 5?
--                '/usr/lib/Acrobat8/Resource/Font',      #Linux, Acrobat 5?
--                '/usr/lib/Acrobat7/Resource/Font',      #Linux, Acrobat 5?
--                '/usr/lib/Acrobat6/Resource/Font',      #Linux, Acrobat 5?
--                '/usr/lib/Acrobat5/Resource/Font',      #Linux, Acrobat 5?
--                '/usr/lib/Acrobat4/Resource/Font',      #Linux, Acrobat 4
--                '/usr/local/Acrobat9/Resource/Font',    #Linux, Acrobat 5?
--                '/usr/local/Acrobat8/Resource/Font',    #Linux, Acrobat 5?
--                '/usr/local/Acrobat7/Resource/Font',    #Linux, Acrobat 5?
--                '/usr/local/Acrobat6/Resource/Font',    #Linux, Acrobat 5?
--                '/usr/local/Acrobat5/Resource/Font',    #Linux, Acrobat 5?
--                '/usr/local/Acrobat4/Resource/Font',    #Linux, Acrobat 4
-+                '/usr/share/fonts/Type1',
-                 '%(REPORTLAB_DIR)s/fonts',              #special
-                 '%(REPORTLAB_DIR)s/../fonts',           #special
-                 '%(REPORTLAB_DIR)s/../../fonts',        #special
-@@ -76,44 +58,17 @@ T1SearchPath =  (
- 
- # places to look for TT Font information
- TTFSearchPath = (
--                'c:/winnt/fonts',
--                'c:/windows/fonts',
--                '/usr/lib/X11/fonts/TrueType/',
--                '/usr/share/fonts/truetype',
-+                '/usr/share/fonts/TTF',
-                 '%(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',
--                
-                 )
- 
- # places to look for CMap files - should ideally merge with above
- CMapSearchPath = (
--                  '/usr/lib/Acrobat9/Resource/CMap',
--                  '/usr/lib/Acrobat8/Resource/CMap',
--                  '/usr/lib/Acrobat7/Resource/CMap',
--                  '/usr/lib/Acrobat6/Resource/CMap',
--                  '/usr/lib/Acrobat5/Resource/CMap',
--                  '/usr/lib/Acrobat4/Resource/CMap',
--                  '/usr/local/Acrobat9/Resource/CMap',
--                  '/usr/local/Acrobat8/Resource/CMap',
--                  '/usr/local/Acrobat7/Resource/CMap',
--                  '/usr/local/Acrobat6/Resource/CMap',
--                  '/usr/local/Acrobat5/Resource/CMap',
--                  '/usr/local/Acrobat4/Resource/CMap',
--                  'C:\\Program Files\\Adobe\\Acrobat\\Resource\\CMap',
--                  'C:\\Program Files\\Adobe\\Acrobat 9.0\\Resource\\CMap',
--                  'C:\\Program Files\\Adobe\\Acrobat 8.0\\Resource\\CMap',
--                  'C:\\Program Files\\Adobe\\Acrobat 7.0\\Resource\\CMap',
--                  '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/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