From ad9f6d848f9b0fa975cffa7c919d02c404586ae3 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 4 Sep 2014 21:38:52 -0300 Subject: python-reportlab: remove libre suffix and add complex pkgrel --- libre/python-reportlab-libre/ChangeLog | 18 ------- libre/python-reportlab-libre/PKGBUILD | 67 --------------------------- libre/python-reportlab-libre/free-fonts.patch | 61 ------------------------ libre/python-reportlab/ChangeLog | 18 +++++++ libre/python-reportlab/PKGBUILD | 67 +++++++++++++++++++++++++++ libre/python-reportlab/free-fonts.patch | 61 ++++++++++++++++++++++++ 6 files changed, 146 insertions(+), 146 deletions(-) delete mode 100644 libre/python-reportlab-libre/ChangeLog delete mode 100644 libre/python-reportlab-libre/PKGBUILD delete mode 100644 libre/python-reportlab-libre/free-fonts.patch create mode 100644 libre/python-reportlab/ChangeLog create mode 100644 libre/python-reportlab/PKGBUILD create mode 100644 libre/python-reportlab/free-fonts.patch (limited to 'libre') diff --git a/libre/python-reportlab-libre/ChangeLog b/libre/python-reportlab-libre/ChangeLog deleted file mode 100644 index 85b5db51f..000000000 --- a/libre/python-reportlab-libre/ChangeLog +++ /dev/null @@ -1,18 +0,0 @@ - -2009-02-17 Douglas Soares de Andrade - - * Updated for i686: 2.3 - -2008-11-03 Giovanni Scafora - - * Rebuilt against python 2.6 - -2008-09-14 Douglas Soares de Andrade - - * Updating for x86_64: 2.2 - -2008-09-13 Douglas Soares de Andrade - - * Adding ChangeLog - * Updating for i686: 2.2 - diff --git a/libre/python-reportlab-libre/PKGBUILD b/libre/python-reportlab-libre/PKGBUILD deleted file mode 100644 index 40a2e2ef4..000000000 --- a/libre/python-reportlab-libre/PKGBUILD +++ /dev/null @@ -1,67 +0,0 @@ -# $Id: PKGBUILD 110391 2014-04-28 19:17:21Z jelle $ -# Maintainer (Arch): -# Contributor (Arch): Angel 'angvp' Velasquez -# Contributor (Arch): William Rea -# Maintainer: fauno -# Contributor: borgo -# Contributor: André Silva - -pkgbase=python-reportlab-libre -pkgname=(python2-reportlab-libre python-reportlab-libre) -_origname=reportlab -pkgver=3.1.8 -pkgrel=1 -pkgdesc="A proven industry-strength PDF generating solution, without nonfree Adobe T1 fonts support" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.reportlab.org/rl_toolkit.html" -depends=('freetype2') -checkdepends=('python' 'python2' 'python2-pillow' 'python-pillow') -license=('custom') -source=("https://pypi.python.org/packages/source/r/reportlab/reportlab-$pkgver.tar.gz" - 'free-fonts.patch') -md5sums=(820a9fda647078503597b85cdba7ed7f - 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 Adobe T1 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 deleted file mode 100644 index d88b3b31b..000000000 --- a/libre/python-reportlab-libre/free-fonts.patch +++ /dev/null @@ -1,61 +0,0 @@ -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/python-reportlab/ChangeLog b/libre/python-reportlab/ChangeLog new file mode 100644 index 000000000..85b5db51f --- /dev/null +++ b/libre/python-reportlab/ChangeLog @@ -0,0 +1,18 @@ + +2009-02-17 Douglas Soares de Andrade + + * Updated for i686: 2.3 + +2008-11-03 Giovanni Scafora + + * Rebuilt against python 2.6 + +2008-09-14 Douglas Soares de Andrade + + * Updating for x86_64: 2.2 + +2008-09-13 Douglas Soares de Andrade + + * Adding ChangeLog + * Updating for i686: 2.2 + diff --git a/libre/python-reportlab/PKGBUILD b/libre/python-reportlab/PKGBUILD new file mode 100644 index 000000000..dfceee7cd --- /dev/null +++ b/libre/python-reportlab/PKGBUILD @@ -0,0 +1,67 @@ +# $Id: PKGBUILD 110391 2014-04-28 19:17:21Z jelle $ +# Maintainer (Arch): +# Contributor (Arch): Angel 'angvp' Velasquez +# Contributor (Arch): William Rea +# Maintainer: fauno +# Contributor: borgo +# Contributor: André Silva + +pkgbase=python-reportlab +pkgname=(python2-reportlab python-reportlab) +_origname=reportlab +pkgver=3.1.8 +pkgrel=1.parabola1 +pkgdesc="A proven industry-strength PDF generating solution, without nonfree Adobe T1 fonts support" +arch=('i686' 'x86_64' 'mips64el') +url="http://www.reportlab.org/rl_toolkit.html" +depends=('freetype2') +conflicts=('python-reportlab<=2.5-2') +checkdepends=('python' 'python2' 'python2-pillow' 'python-pillow') +replaces=('python-reportlab<=2.5-2') +license=('custom') +source=("https://pypi.python.org/packages/source/r/reportlab/reportlab-$pkgver.tar.gz" + 'free-fonts.patch') +md5sums=(820a9fda647078503597b85cdba7ed7f + 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 Adobe T1 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() { + conflicts+=('python2-reportlab-libre') + replaces+=('python2-reportlab-libre') + 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() { + conflicts+=('python-reportlab-libre') + replaces+=('python-reportlab-libre') + 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/free-fonts.patch b/libre/python-reportlab/free-fonts.patch new file mode 100644 index 000000000..d88b3b31b --- /dev/null +++ b/libre/python-reportlab/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(): -- cgit v1.2.3