summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2013-01-22 20:28:47 +0000
committerMike Gilbert <floppym@gentoo.org>2013-01-22 20:28:47 +0000
commit9dc25715a52adf3279618076d77fdb1fec51a8bb (patch)
treee1e07fc7651912be358adcee81af791e0d211650 /dev-python/reportlab
parentMigrate to distutils-r1. (diff)
downloadgentoo-2-9dc25715a52adf3279618076d77fdb1fec51a8bb.tar.gz
gentoo-2-9dc25715a52adf3279618076d77fdb1fec51a8bb.tar.bz2
gentoo-2-9dc25715a52adf3279618076d77fdb1fec51a8bb.zip
Version bump. Convert to distutils-r1. Resolve bug 318233.
(Portage version: 2.2.0_alpha155/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'dev-python/reportlab')
-rw-r--r--dev-python/reportlab/ChangeLog10
-rw-r--r--dev-python/reportlab/reportlab-2.5-r1.ebuild15
-rw-r--r--dev-python/reportlab/reportlab-2.6.ebuild (renamed from dev-python/reportlab/reportlab-2.5.ebuild)63
3 files changed, 53 insertions, 35 deletions
diff --git a/dev-python/reportlab/ChangeLog b/dev-python/reportlab/ChangeLog
index 0cb45009e07e..3ed25e2b7046 100644
--- a/dev-python/reportlab/ChangeLog
+++ b/dev-python/reportlab/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-python/reportlab
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/reportlab/ChangeLog,v 1.83 2012/12/06 17:37:57 bicatali Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/reportlab/ChangeLog,v 1.84 2013/01/22 20:28:47 floppym Exp $
+
+*reportlab-2.6 (22 Jan 2013)
+
+ 22 Jan 2013; Mike Gilbert <floppym@gentoo.org> +reportlab-2.6.ebuild,
+ -reportlab-2.5.ebuild, reportlab-2.5-r1.ebuild:
+ Version bump. Convert to distutils-r1. Resolve bug 318233.
06 Dec 2012; Sébastien Fabbro <bicatali@gentoo.org> reportlab-2.5-r1.ebuild:
Keyword amd64-linux and x86-linux
diff --git a/dev-python/reportlab/reportlab-2.5-r1.ebuild b/dev-python/reportlab/reportlab-2.5-r1.ebuild
index 6d35c30461ee..c19110306b75 100644
--- a/dev-python/reportlab/reportlab-2.5-r1.ebuild
+++ b/dev-python/reportlab/reportlab-2.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/reportlab/reportlab-2.5-r1.ebuild,v 1.2 2012/12/06 17:37:57 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/reportlab/reportlab-2.5-r1.ebuild,v 1.3 2013/01/22 20:28:47 floppym Exp $
EAPI="3"
PYTHON_DEPEND="2"
@@ -10,8 +10,9 @@ RESTRICT_PYTHON_ABIS="3.* *-jython"
inherit distutils eutils versionator
DESCRIPTION="Tools for generating printable PDF documents from any data source."
-HOMEPAGE="http://www.reportlab.org/ http://pypi.python.org/pypi/reportlab"
-SRC_URI="http://www.reportlab.org/ftp/${P}.tar.gz"
+HOMEPAGE="http://www.reportlab.com/ http://pypi.python.org/pypi/reportlab"
+SRC_URI="http://www.reportlab.com/ftp/${P}.tar.gz
+ http://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip"
LICENSE="BSD"
SLOT="0"
@@ -26,6 +27,12 @@ RDEPEND="${DEPEND}"
PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
+src_unpack() {
+ unpack ${P}.tar.gz
+ cd ${P}/src/reportlab/fonts || die
+ unpack pfbfer-20070710.zip
+}
+
src_prepare() {
distutils_src_prepare
diff --git a/dev-python/reportlab/reportlab-2.5.ebuild b/dev-python/reportlab/reportlab-2.6.ebuild
index af3448d3d94c..5b5a6fb418fa 100644
--- a/dev-python/reportlab/reportlab-2.5.ebuild
+++ b/dev-python/reportlab/reportlab-2.6.ebuild
@@ -1,34 +1,39 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/reportlab/reportlab-2.5.ebuild,v 1.8 2012/02/22 07:18:29 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/reportlab/reportlab-2.6.ebuild,v 1.1 2013/01/22 20:28:47 floppym Exp $
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
+EAPI="5"
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+# Tests crash with pypy
-inherit distutils eutils versionator
+inherit distutils-r1 eutils flag-o-matic
DESCRIPTION="Tools for generating printable PDF documents from any data source."
-HOMEPAGE="http://www.reportlab.org/ http://pypi.python.org/pypi/reportlab"
-SRC_URI="http://www.reportlab.org/ftp/${P}.tar.gz"
+HOMEPAGE="http://www.reportlab.com/ http://pypi.python.org/pypi/reportlab"
+SRC_URI="http://www.reportlab.com/ftp/${P}.tar.gz
+ http://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="doc examples test"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-fbsd ~x86-linux"
+IUSE="doc examples"
-DEPEND="dev-python/imaging
+RDEPEND="dev-python/imaging
media-fonts/ttf-bitstream-vera
media-libs/libart_lgpl
sys-libs/zlib"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+ app-arch/unzip"
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
+DISTUTILS_NO_PARALLEL_BUILD=1
-src_prepare() {
- distutils_src_prepare
+src_unpack() {
+ unpack ${P}.tar.gz
+ cd ${P}/src/reportlab/fonts || die
+ unpack pfbfer-20070710.zip
+}
+python_prepare_all() {
sed -i \
-e 's|/usr/lib/X11/fonts/TrueType/|/usr/share/fonts/ttf-bitstream-vera/|' \
-e 's|/usr/local/Acrobat|/opt/Acrobat|g' \
@@ -39,28 +44,28 @@ src_prepare() {
rm -fr src/rl_addons/renderPM/libart_lgpl
epatch "${FILESDIR}/${PN}-2.4-external_libart_lgpl.patch"
+
+ epatch "${FILESDIR}/${PN}-2.5-pypy-implicit-PyArg_NoArgs.patch"
}
src_compile() {
- distutils_src_compile
+ append-cflags -fno-strict-aliasing
+ distutils-r1_src_compile
+}
- # One of tests already builds documentation.
- if use doc && ! use test; then
- cd docs
- PYTHONPATH="$(ls -d ../build-$(PYTHON -f --ABI)/lib.*)" "$(PYTHON -f)" genAll.py || die "genAll.py failed"
+python_compile_all() {
+ if use doc; then
+ cd docs || die
+ "${PYTHON}" genAll.py || die "docs generation failed"
fi
}
-src_test() {
- testing() {
- "$(PYTHON)" setup.py tests-preinstall
- }
- python_execute_function testing
+python_test() {
+ cd tests || die
+ "${PYTHON}" runAll.py || die
}
-src_install() {
- distutils_src_install
-
+python_install_all() {
if use doc; then
# docs/reference/reportlab-reference.pdf is identical with docs/reportlab-reference.pdf
rm -f docs/reference/reportlab-reference.pdf