Version bump (with cleanup and enabled tests). Removed some old files.

(Portage version: 2.1.3_rc4)

7 files changed, 120 insertions, 111 deletions

diff --git a/dev-python/reportlab/ChangeLog b/dev-python/reportlab/ChangeLog
index 49a7f12d5b0f..82adcd65d784 100644
--- a/dev-python/reportlab/ChangeLog
+++ b/dev-python/reportlab/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/reportlab
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/reportlab/ChangeLog,v 1.35 2007/04/21 15:18:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/reportlab/ChangeLog,v 1.36 2007/06/23 08:50:30 dev-zero Exp $
+
+*reportlab-2.1 (23 Jun 2007)
+
+  23 Jun 2007; Tiziano Müller <dev-zero@gentoo.org> -files/1.14/setup.py,
+  -files/1.17/setup.py, +files/2.1-test_fix.patch,
+  +files/2.1-tests_report_failure.patch, +reportlab-2.1.ebuild:
+  Version bump (with cleanup and enabled tests). Removed some old files.
 
   21 Apr 2007; Raúl Porcel <armin76@gentoo.org> reportlab-2.0.ebuild:
   ia64 stable
diff --git a/dev-python/reportlab/files/1.14/setup.py b/dev-python/reportlab/files/1.14/setup.py
deleted file mode 100644
index aae40634a142..000000000000
--- a/dev-python/reportlab/files/1.14/setup.py
+++ /dev/null
@@ -1,55 +0,0 @@
-#! /usr/bin/env python
-
-from os import chdir, stat
-from distutils.core import setup, Extension
-
-setup (# Distribution meta-data
-        name = "ReportLab",
-        version = "1.14",
-        description = "Tools for generating printable PDF documents from any data source.",
-        author = "ReportLab Inc.",
-#        author_email = "",
-       	license = """
-#####################################################################################
-#
-#       Copyright (c) 2000-2001, ReportLab Inc.
-#       All rights reserved.
-#
-#       Redistribution and use in source and binary forms, with or without modification,
-#       are permitted provided that the following conditions are met:
-#
-#               *       Redistributions of source code must retain the above copyright notice,
-#                       this list of conditions and the following disclaimer. 
-#               *       Redistributions in binary form must reproduce the above copyright notice,
-#                       this list of conditions and the following disclaimer in the documentation
-#                       and/or other materials provided with the distribution. 
-#               *       Neither the name of the company nor the names of its contributors may be
-#                       used to endorse or promote products derived from this software without
-#                       specific prior written permission. 
-#
-#       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-#       ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-#       WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-#       IN NO EVENT SHALL THE OFFICERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#       INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-#       TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#       OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-#       IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-#       IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-#       SUCH DAMAGE.
-#
-#####################################################################################""",
-        long_description = "Tools for generating printable PDF documents from any data source.",
-        url = "http://www.reportlab.com/",
-	extra_path = "reportlab",
-        package_dir = { '':'.' },
-        packages = [ 'extensions',
-                     'graphics', 'graphics/charts', 'graphics/widgets',
-                     'lib', 'pdfbase', 'pdfgen', 'platypus',
-                     'test', 'tools', 'tools/docco', 'tools/py2pdf',
-                     'tools/pythonpoint', 'tools/pythonpoint/styles',
-                     '.',
-                     ],
-#./fonts
-      )
-
diff --git a/dev-python/reportlab/files/1.17/setup.py b/dev-python/reportlab/files/1.17/setup.py
deleted file mode 100644
index 2ca3d033e8d3..000000000000
--- a/dev-python/reportlab/files/1.17/setup.py
+++ /dev/null
@@ -1,55 +0,0 @@
-#! /usr/bin/env python
-
-from os import chdir, stat
-from distutils.core import setup, Extension
-
-setup (# Distribution meta-data
-        name = "ReportLab",
-        version = "1.17",
-        description = "Tools for generating printable PDF documents from any data source.",
-        author = "ReportLab Inc.",
-#        author_email = "",
-       	license = """
-#####################################################################################
-#
-#       Copyright (c) 2000-2001, ReportLab Inc.
-#       All rights reserved.
-#
-#       Redistribution and use in source and binary forms, with or without modification,
-#       are permitted provided that the following conditions are met:
-#
-#               *       Redistributions of source code must retain the above copyright notice,
-#                       this list of conditions and the following disclaimer. 
-#               *       Redistributions in binary form must reproduce the above copyright notice,
-#                       this list of conditions and the following disclaimer in the documentation
-#                       and/or other materials provided with the distribution. 
-#               *       Neither the name of the company nor the names of its contributors may be
-#                       used to endorse or promote products derived from this software without
-#                       specific prior written permission. 
-#
-#       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-#       ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-#       WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-#       IN NO EVENT SHALL THE OFFICERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-#       INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-#       TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#       OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-#       IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-#       IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-#       SUCH DAMAGE.
-#
-#####################################################################################""",
-        long_description = "Tools for generating printable PDF documents from any data source.",
-        url = "http://www.reportlab.com/",
-	extra_path = "reportlab",
-        package_dir = { '':'.' },
-        packages = [ 'extensions',
-                     'graphics', 'graphics/charts', 'graphics/widgets',
-                     'lib', 'pdfbase', 'pdfgen', 'platypus',
-                     'test', 'tools', 'tools/docco', 'tools/py2pdf',
-                     'tools/pythonpoint', 'tools/pythonpoint/styles',
-                     '.',
-                     ],
-#./fonts
-      )
-
diff --git a/dev-python/reportlab/files/2.1-test_fix.patch b/dev-python/reportlab/files/2.1-test_fix.patch
new file mode 100644
index 000000000000..800102d3e1e6
--- /dev/null
+++ b/dev-python/reportlab/files/2.1-test_fix.patch
@@ -0,0 +1,12 @@
+diff -Naur reportlab_2_1.orig/reportlab/test/test_platypus_pleaseturnover.py reportlab_2_1/reportlab/test/test_platypus_pleaseturnover.py
+--- reportlab_2_1.orig/reportlab/test/test_platypus_pleaseturnover.py	2007-06-23 10:28:17.000000000 +0200
++++ reportlab_2_1/reportlab/test/test_platypus_pleaseturnover.py	2007-06-23 10:28:45.000000000 +0200
+@@ -113,7 +113,7 @@
+     pto.alignment = TA_RIGHT
+     pto.fontSize -= 1
+     def ColorParagraph(c,text,style):
+-        return Paragraph('<para color=%s>%s</para>' % (c,text),style)
++        return Paragraph('<para color="%s">%s</para>' % (c,text),style)
+ 
+     def ptoblob(blurb,content,trailer=None,header=None, story=story, H1=H1):
+         if type(content) not in (type([]),type(())): content = [content]
diff --git a/dev-python/reportlab/files/2.1-tests_report_failure.patch b/dev-python/reportlab/files/2.1-tests_report_failure.patch
new file mode 100644
index 000000000000..c6c65dd868a4
--- /dev/null
+++ b/dev-python/reportlab/files/2.1-tests_report_failure.patch
@@ -0,0 +1,26 @@
+--- reportlab_2_1/reportlab/test/runAll.py.orig	2007-05-24 13:08:05.000000000 +0200
++++ reportlab_2_1/reportlab/test/runAll.py	2007-06-21 20:38:12.000000000 +0200
+@@ -59,7 +59,7 @@
+     cleanOnly = '--clean' in sys.argv
+     if not cleanOnly:
+         testSuite = makeSuite(folder,nonImportable=NI,pattern=pattern+(not haveSRC and 'c' or ''))
+-        unittest.TextTestRunner().run(testSuite)
++        result = unittest.TextTestRunner().run(testSuite)
+     if haveSRC: cleanup(folder,patterns=('*.pyc','*.pyo'))
+     if not cleanOnly:
+         if NI:
+@@ -67,6 +67,7 @@
+             for f,tb in NI:
+                 print 'file: "%s"\n%s\n' % (f,string.join(tb,''))
+         printLocation()
++    return result
+ 
+ def mainEx():
+     '''for use in subprocesses'''
+@@ -90,4 +91,5 @@
+     return '\nFAILED' in outerr
+ 
+ if __name__ == '__main__': #noruntests
+-    main()
++    if not main().wasSuccessful():
++		sys.exit(-1)
diff --git a/dev-python/reportlab/files/digest-reportlab-2.1 b/dev-python/reportlab/files/digest-reportlab-2.1
new file mode 100644
index 000000000000..3d5c7084b35f
--- /dev/null
+++ b/dev-python/reportlab/files/digest-reportlab-2.1
@@ -0,0 +1,3 @@
+MD5 d6eefe9e6e06aaa1315462045c9726ba ReportLab_2_1.tgz 3303983
+RMD160 3aa6c7683f9d291c82cd3e8b1c545bbe9c522e37 ReportLab_2_1.tgz 3303983
+SHA256 8fb088c79975bb20815f495fb91cd02b2942e255dd3f95223a807b51ff720c1e ReportLab_2_1.tgz 3303983
diff --git a/dev-python/reportlab/reportlab-2.1.ebuild b/dev-python/reportlab/reportlab-2.1.ebuild
new file mode 100644
index 000000000000..af7d179f8fa0
--- /dev/null
+++ b/dev-python/reportlab/reportlab-2.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/reportlab/reportlab-2.1.ebuild,v 1.1 2007/06/23 08:50:31 dev-zero Exp $
+
+NEED_PYTHON=2.4
+
+inherit distutils versionator
+
+MY_PV="$(replace_all_version_separators _)"
+
+DESCRIPTION="Tools for generating printable PDF documents from any data source."
+HOMEPAGE="http://www.reportlab.org/"
+SRC_URI="http://www.reportlab.org/ftp/ReportLab_${MY_PV}.tgz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc examples"
+
+DEPEND="sys-libs/zlib
+	dev-python/imaging
+	media-fonts/ttf-bitstream-vera"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PN}_${MY_PV}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PV}-tests_report_failure.patch"
+	epatch "${FILESDIR}/${PV}-test_fix.patch"
+
+	sed -i \
+		-e "/'docs/d" -e "/'test/d" \
+		-e "/'fonts/d" -e "/demos/d" \
+		setup.py || die "sed failed"
+
+	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' \
+		-e 's|%(REPORTLAB_DIR)s/../../fonts|/usr/share/fonts|' \
+		rl_config.py || die "sed failed"
+
+	# A rather useless test which rebuilds the docs and fails
+	# since it calls python using os.system but doesn't pass
+	# the PYTHONPATH env-variable along
+	rm "${S}/test/test_docs_build.py"
+	# ... and remove yet another broken test
+	rm "${S}/test/test_platypus_paragraphs.py"
+}
+
+src_install() {
+	distutils_src_install
+
+	if use doc ; then
+		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
+}
+
+src_test() {
+	cd "${S}/test"
+	PYTHONPATH="../.." ${python} runAll.py || die "tests failed"
+}