diff options
| author | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2014-09-04 21:40:09 -0300 |
|---|---|---|
| committer | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2014-09-04 21:40:09 -0300 |
| commit | 69b2477a0877356e87098396eeb32ef3ac58dc6d (patch) | |
| tree | 0697453633b93dfe4ba8ef3cf34ad1fb6486d573 | |
| parent | cdb42980694959a58b91d1fc9d64326e392e5099 (diff) | |
| parent | ad9f6d848f9b0fa975cffa7c919d02c404586ae3 (diff) | |
Merge branch 'master' of ssh://lukeshu.com:1863/srv/git/mirror/parabola/abslibre
| -rw-r--r-- | libre/python-reportlab/ChangeLog (renamed from libre/python-reportlab-libre/ChangeLog) | 0 | ||||
| -rw-r--r-- | libre/python-reportlab/PKGBUILD (renamed from libre/python-reportlab-libre/PKGBUILD) | 26 | ||||
| -rw-r--r-- | libre/python-reportlab/free-fonts.patch (renamed from libre/python-reportlab-libre/free-fonts.patch) | 0 |
3 files changed, 13 insertions, 13 deletions
diff --git a/libre/python-reportlab-libre/ChangeLog b/libre/python-reportlab/ChangeLog index 85b5db51f..85b5db51f 100644 --- a/libre/python-reportlab-libre/ChangeLog +++ b/libre/python-reportlab/ChangeLog diff --git a/libre/python-reportlab-libre/PKGBUILD b/libre/python-reportlab/PKGBUILD index 40a2e2ef4..dfceee7cd 100644 --- a/libre/python-reportlab-libre/PKGBUILD +++ b/libre/python-reportlab/PKGBUILD @@ -6,16 +6,18 @@ # Contributor: borgo <nomail> # Contributor: André Silva <emulatorman@parabola.nu> -pkgbase=python-reportlab-libre -pkgname=(python2-reportlab-libre python-reportlab-libre) +pkgbase=python-reportlab +pkgname=(python2-reportlab python-reportlab) _origname=reportlab pkgver=3.1.8 -pkgrel=1 +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') @@ -39,24 +41,22 @@ prepare() { 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") +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 + 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") +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 + install -D -m644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/license.txt } diff --git a/libre/python-reportlab-libre/free-fonts.patch b/libre/python-reportlab/free-fonts.patch index d88b3b31b..d88b3b31b 100644 --- a/libre/python-reportlab-libre/free-fonts.patch +++ b/libre/python-reportlab/free-fonts.patch |