Version bump.

(Portage version: 15206-svn/cvs/Linux x86_64)

3 files changed, 144 insertions, 2 deletions

diff --git a/dev-python/reportlab/ChangeLog b/dev-python/reportlab/ChangeLog
index 2058f5106195..c8179fcae041 100644
--- a/dev-python/reportlab/ChangeLog
+++ b/dev-python/reportlab/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/reportlab
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/reportlab/ChangeLog,v 1.62 2009/11/14 16:48:25 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/reportlab/ChangeLog,v 1.63 2010/01/23 21:06:43 arfrever Exp $
+
+*reportlab-2.4 (23 Jan 2010)
+
+  23 Jan 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +reportlab-2.4.ebuild, +files/reportlab-2.4-external_libart_lgpl.patch:
+  Version bump.
 
   14 Nov 2009; Raúl Porcel <armin76@gentoo.org> reportlab-2.3-r1.ebuild:
   ia64/sparc stable wrt #289435
diff --git a/dev-python/reportlab/files/reportlab-2.4-external_libart_lgpl.patch b/dev-python/reportlab/files/reportlab-2.4-external_libart_lgpl.patch
new file mode 100644
index 000000000000..4b140d20c912
--- /dev/null
+++ b/dev-python/reportlab/files/reportlab-2.4-external_libart_lgpl.patch
@@ -0,0 +1,60 @@
+--- setup.py
++++ setup.py
+@@ -306,39 +306,12 @@
+         infoline( '################################################')
+         infoline( '#Attempting install of _renderPM')
+         infoline( '#extensions from %r'%RENDERPM)
+-        LIBART_DIR=pjoin(RENDERPM,'libart_lgpl')
++        LIBART_DIR='/usr/include/libart-2.0'
++        LIBART_LIB=['art_lgpl_2']
+         GT1_DIR=pjoin(RENDERPM,'gt1')
+         MACROS=[('ROBIN_DEBUG',None)]
+         MACROS=[]
+-        def libart_version():
+-            K = ('LIBART_MAJOR_VERSION','LIBART_MINOR_VERSION','LIBART_MICRO_VERSION')
+-            D = {}
+-            for l in open(pjoin(LIBART_DIR,'configure.in'),'r').readlines():
+-                l = l.strip().split('=')
+-                if len(l)>1 and l[0].strip() in K:
+-                    D[l[0].strip()] = l[1].strip()
+-                    if len(D)==3: break
+-            return (sys.platform == 'win32' and '\\"%s\\"' or '"%s"') % '.'.join(map(lambda k,D=D: D.get(k,'?'),K))
+-        LIBART_VERSION = libart_version()
+         SOURCES=[pjoin(RENDERPM,'_renderPM.c'),
+-                    pjoin(LIBART_DIR,'art_vpath_bpath.c'),
+-                    pjoin(LIBART_DIR,'art_rgb_pixbuf_affine.c'),
+-                    pjoin(LIBART_DIR,'art_rgb_svp.c'),
+-                    pjoin(LIBART_DIR,'art_svp.c'),
+-                    pjoin(LIBART_DIR,'art_svp_vpath.c'),
+-                    pjoin(LIBART_DIR,'art_svp_vpath_stroke.c'),
+-                    pjoin(LIBART_DIR,'art_svp_ops.c'),
+-                    pjoin(LIBART_DIR,'art_vpath.c'),
+-                    pjoin(LIBART_DIR,'art_vpath_dash.c'),
+-                    pjoin(LIBART_DIR,'art_affine.c'),
+-                    pjoin(LIBART_DIR,'art_rect.c'),
+-                    pjoin(LIBART_DIR,'art_rgb_affine.c'),
+-                    pjoin(LIBART_DIR,'art_rgb_affine_private.c'),
+-                    pjoin(LIBART_DIR,'art_rgb.c'),
+-                    pjoin(LIBART_DIR,'art_rgb_rgba_affine.c'),
+-                    pjoin(LIBART_DIR,'art_svp_intersect.c'),
+-                    pjoin(LIBART_DIR,'art_svp_render_aa.c'),
+-                    pjoin(LIBART_DIR,'art_misc.c'),
+                     pjoin(GT1_DIR,'gt1-parset1.c'),
+                     pjoin(GT1_DIR,'gt1-dict.c'),
+                     pjoin(GT1_DIR,'gt1-namecontext.c'),
+@@ -398,12 +371,12 @@
+         EXT_MODULES +=  [Extension( '_renderPM',
+                                         SOURCES,
+                                         include_dirs=[RENDERPM,LIBART_DIR,GT1_DIR]+FT_INC_DIR,
+-                                        define_macros=FT_MACROS+[('LIBART_COMPILATION',None)]+MACROS+[('LIBART_VERSION',LIBART_VERSION)],
++                                        define_macros=FT_MACROS+MACROS,
+                                         library_dirs=[]+FT_LIB_DIR,
+ 
+                                         # libraries to link against
+-                                        libraries=FT_LIB,
+-                                        #extra_objects=['gt1.lib','libart.lib',],
++                                        libraries=FT_LIB+LIBART_LIB,
++                                        #extra_objects=['gt1.lib'],
+                                         #extra_compile_args=['/Z7'],
+                                         extra_link_args=[]
+                                         ),
diff --git a/dev-python/reportlab/reportlab-2.4.ebuild b/dev-python/reportlab/reportlab-2.4.ebuild
new file mode 100644
index 000000000000..20673869555f
--- /dev/null
+++ b/dev-python/reportlab/reportlab-2.4.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/reportlab/reportlab-2.4.ebuild,v 1.1 2010/01/23 21:06:43 arfrever Exp $
+
+EAPI="2"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit distutils versionator
+
+MY_PN="ReportLab"
+MY_PV="$(replace_all_version_separators _)"
+
+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/${MY_PN}_${MY_PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="doc examples test"
+
+DEPEND="dev-python/imaging
+	media-fonts/ttf-bitstream-vera
+	media-libs/libart_lgpl
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+RESTRICT_PYTHON_ABIS="3.*"
+
+S="${WORKDIR}/${MY_PN}_${MY_PV}"
+
+src_prepare() {
+	sed -i \
+		-e 's|/usr/lib/X11/fonts/TrueType/|/usr/share/fonts/ttf-bitstream-vera/|' \
+		-e 's|/usr/local/Acrobat|/opt/Acrobat|g' \
+		-e 's|%(HOME)s/fonts|%(HOME)s/.fonts|g' \
+		src/reportlab/rl_config.py || die "sed failed"
+	epatch "${FILESDIR}/${PN}-2.2_qa_msg.patch"
+
+	rm -fr src/rl_addons/renderPM/libart_lgpl
+	epatch "${FILESDIR}/${P}-external_libart_lgpl.patch"
+}
+
+src_compile() {
+	distutils_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"
+	fi
+}
+
+src_test() {
+	testing() {
+		"$(PYTHON)" setup.py tests-preinstall
+	}
+	python_execute_function testing
+}
+
+src_install() {
+	distutils_src_install
+
+	if use doc; then
+		# docs/reference/reportlab-reference.pdf is identical with docs/reportlab-reference.pdf
+		rm -f docs/reference/reportlab-reference.pdf
+
+		insinto /usr/share/doc/${PF}
+		doins -r docs/*
+	fi
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r demos
+		insinto /usr/share/doc/${PF}/tools/pythonpoint
+		doins -r tools/pythonpoint/demos
+	fi
+}