Version bump.

Package-Manager: portage-15206-svn/cvs/Linux x86_64

4 files changed, 148 insertions, 3 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/Manifest b/dev-python/reportlab/Manifest
index 7db6f8710ac4..3f03910211f5 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -1,6 +1,9 @@
 AUX reportlab-2.2_qa_msg.patch 736 RMD160 3ee7043a9c5f999b097e4800c5fcda57d732e4b4 SHA1 4f8b90dee2c9e5cf71c05af91484c0440009581d SHA256 e4913decadf05228b1cb76da8cade26b76feb4d69c317c828ee0ba1eb8d66a58
 AUX reportlab-2.3-external_libart_lgpl.patch 3135 RMD160 c688797106ec0dcd2b07d37a81120b0ce25674a1 SHA1 3614d1aefa993a6757b3af17bf4e626ae77f2226 SHA256 35b93bc6231d9651adc41ee4a1edf6bdaa846ab41280000e3b037568f5b5d063
+AUX reportlab-2.4-external_libart_lgpl.patch 3304 RMD160 4881b7e8914630c87c642fa704ebbfd869550af7 SHA1 daad396df4711d75b0aeae4ae13288de95f19519 SHA256 93a5afda9e4bee650545912362dd3a23c12a5aebcec3ef2691ab675fe114af01
 DIST ReportLab_2_3.tar.gz 1857239 RMD160 ebb347765d516e74b965ec89c7909ec7592e3f54 SHA1 cb5e27fef02eceaab79236d5a074cdfb92bff179 SHA256 b63872c4b29063f0e0c2fe56223585175f03c7a6991e2a8bc9a221ae5ee2c092
+DIST ReportLab_2_4.tar.gz 1884175 RMD160 7a7198b9934b1f993dbb49705d93cc4b78b45012 SHA1 31ecc9ff0f55ce3c5fddaa909dd48b6e9e9a20ce SHA256 e82a4ff45e405b6cf8ed607ea87203b3ceb22aaa8b6f2298ceb40bde2304741d
 EBUILD reportlab-2.3-r1.ebuild 2244 RMD160 7af128a5b405261fb7d39069e972f317a63eecd8 SHA1 699af3a6451befb4778dd324d6f971041023a462 SHA256 b3ae71025f37f729477600a95f25188f3df81640c49452b06911d3baf60d9244
-MISC ChangeLog 8691 RMD160 f0dc35b77a467f7fba82ed40351e6b1cfddbc389 SHA1 53b8b7cbd6a765562a6c313a7786245ef4f727c1 SHA256 2b82211758f688b183a2b5dcf3897bb37d282fe2e2cda7dca324ae5ec54ce846
+EBUILD reportlab-2.4.ebuild 2028 RMD160 5238c5594e71186af656195595d0ca4a2552e84f SHA1 ca375192adf3ab6880b0b4112a54962b1a440637 SHA256 8a57bb58ae4537ebd658824e619022552eccb4351258b645ef4f576c7e48fb0c
+MISC ChangeLog 8886 RMD160 6d6b7d55da5087114eb415f67de288b8f1324437 SHA1 3021ddafa5fd6253492e6770410f717bd2480e60 SHA256 7e358eed0a3c6801df00d34d982d51595714b1bce2e9b33c428812c04b05c4e4
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
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
+}