Re-added pyparsing (hopefully temporarily) for proper outputs and stix-fonts for ttf, but added media-fonts/texcm-ttf. More information on bundled packages, see bug #260025, thanks Michael Droettboom for explanations. Also now builds documentation from source (html and pdf), and added a src_test for regression. Finally added a small patch on string literal from Mandriva.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 205 insertions, 2 deletions

diff --git a/dev-python/matplotlib/ChangeLog b/dev-python/matplotlib/ChangeLog
index 44c86dea7825..ef069d9e735e 100644
--- a/dev-python/matplotlib/ChangeLog
+++ b/dev-python/matplotlib/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-python/matplotlib
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.58 2009/01/25 16:01:56 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.59 2009/02/25 20:33:41 bicatali Exp $
+
+*matplotlib-0.98.5.2-r3 (25 Feb 2009)
+
+  25 Feb 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/matplotlib-0.98.5.2-literal.patch, +matplotlib-0.98.5.2-r3.ebuild:
+  Re-added pyparsing (hopefully temporarily) for proper outputs and
+  stix-fonts for ttf, but added media-fonts/texcm-ttf. More information on
+  bundled packages, see bug #260025, thanks Michael Droettboom for
+  explanations. Also now builds documentation from source (html and pdf),
+  and added a src_test for regression. Finally added a small patch on string
+  literal from Mandriva.
 
 *matplotlib-0.98.5.2-r2 (25 Jan 2009)
 
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 60ef85b2138c..7fbcdfab59ef 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -1,4 +1,8 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX matplotlib-0.91.2-gcc43.patch 293 RMD160 698bc92d149b5f271b5ad04b2dd4ae674c88e84e SHA1 193dac4c14cfef23ad4c12c1b1df029f64155f50 SHA256 154c993a5d2e68f55344a3056cb8995f63d2f338142b12955f7e3a46f6b4a215
+AUX matplotlib-0.98.5.2-literal.patch 308 RMD160 2d96faf45f2a163df5b7f68e3237178fc8530bf5 SHA1 cd676d743fd14e4f83be9906b44f05ebdd32ddaa SHA256 85de016c19836cbe2774fe7d92087203ef434a12f4eb491ce5204d7936023213
 DIST matplotlib-0.91.2.tar.gz 6457944 RMD160 dfffd6d4925d96ccffdc45e5da4e8426d24c095c SHA1 1424fe2f105dc82080920f89f97f1e6cb639952b SHA256 c25f6350b0047c0983d14933344006f95e48f22131de111db40af15bc21c15d2
 DIST matplotlib-0.91.4.tar.gz 4098254 RMD160 39f19915cd4627c3fb8af46ae40d94478b2700f3 SHA1 8975dbaada2a578c6ae07bb484b31730d2e0f7c8 SHA256 cd4bf6ae4f95348a7dba3cddf289c951dfe7391bbcc65fdcc46094c21a0edef7
 DIST matplotlib-0.98.5.2.tar.gz 11535286 RMD160 12c64fce5758259f10e31aa1c8e3b47152bda09f SHA1 fbce043555de4f5a34e2a47e200527720a90b370 SHA256 9234f10314ffa1774b33839f59bc25dfeb8fd899484c06980454cac4cdaf928a
@@ -7,6 +11,14 @@ DIST users_guide_0.98.5.2.pdf 11535372 RMD160 c780a8a9de94470cb052f1a2567235596a
 EBUILD matplotlib-0.91.2.ebuild 3242 RMD160 acf139fe0fdea107a98c53241090ac5dfee813b0 SHA1 0d31edc94b0bf59aa1d1f7401cad7eb89b2da7c0 SHA256 6baeb575c511381626009889e1e740a16b83bfd15b11437100e1c4f02069bb5c
 EBUILD matplotlib-0.91.4.ebuild 3266 RMD160 359278283166254daf40007539d70a013e52f245 SHA1 8b34906dc62a4a1f001d57ea5b6133bc1bf3b8dc SHA256 a70038af83e8eea4f8c72fd4054d764512f6189534266ac7f18996e7da4542f5
 EBUILD matplotlib-0.98.5.2-r2.ebuild 3679 RMD160 c7225ac1fc3f7a902aefd4319c31af9bae7af09a SHA1 735f15e055d9cfbfb42f35eabcaefd4b28951db5 SHA256 2ffbb120e123542ccb2bd460b358364dbc9ff4d838f73e8e849213b648d76029
+EBUILD matplotlib-0.98.5.2-r3.ebuild 4482 RMD160 c4eb6937991f17967805eb21b88fb51ce37bd117 SHA1 3246fe6f30df3469148ddcfb2c0a5bc21ec51a5f SHA256 1db39e0c75232016389ccef4274d7285e1f73ae65ba34b3ce3dc1e73e6378054
 EBUILD matplotlib-0.98.5.2.ebuild 3037 RMD160 ef20e274dd6386d8c0132a3811cef9caad1ff07c SHA1 b2b3601f191a7430f1d099486b5b826e7f186bfc SHA256 1314648dec742bb7c5f4bc4fbd51f7e929ba96ecf20612b7390ac2ba2f11af6d
-MISC ChangeLog 11573 RMD160 63fcba26a5c3690a2b253f9d9b0746f09e5b8a2a SHA1 4e08c2014028f28e05e088718bc1cc3f818d6a4a SHA256 ca72407c0f63d41df3e529857e4790b4b155a8eeb90c4ae0824fcb05f62f191a
+MISC ChangeLog 12131 RMD160 f5843d1711161ed5259029be019776b6bdd2a908 SHA1 a74dcd7cb31ebe548490d203a66e8afa3f55f272 SHA256 728088736a18c64b73ccdbdef541ed3c53eab568d7e5edcb8fce8f8e32eb75fa
 MISC metadata.xml 657 RMD160 b3a3a414f9d7a2c0cf66e1d78364f7efbccbf1ee SHA1 247593a497bd9cb016edce60434a8a993eefe20c SHA256 3db1ec7b35c9f0ceff13e28395cbdb1f2f9b4c3e41c45dafba9e1a0975aae071
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.10 (GNU/Linux)
+
+iEYEARECAAYFAkmlqy4ACgkQ1ycZbhPLE2ADUgCgnD0XBOxsvd8ejtlGXPaB0Lnp
+7UQAn0UD5Hqw9KZkmMpW1vCmBUfmmQ19
+=Y3p8
+-----END PGP SIGNATURE-----
diff --git a/dev-python/matplotlib/files/matplotlib-0.98.5.2-literal.patch b/dev-python/matplotlib/files/matplotlib-0.98.5.2-literal.patch
new file mode 100644
index 000000000000..ef60e9b12ae4
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-0.98.5.2-literal.patch
@@ -0,0 +1,11 @@
+--- src/swig_runtime.h.old	2008-12-15 06:34:58.000000000 -0800
++++ src/swig_runtime.h	2008-12-30 23:38:49.000000000 -0800
+@@ -856,7 +856,7 @@
+     Py_DECREF(old_str);
+     Py_DECREF(value);
+   } else {
+-    PyErr_Format(PyExc_RuntimeError, mesg);
++    PyErr_Format(PyExc_RuntimeError, "%s", mesg);
+   }
+ }
+ 
diff --git a/dev-python/matplotlib/matplotlib-0.98.5.2-r3.ebuild b/dev-python/matplotlib/matplotlib-0.98.5.2-r3.ebuild
new file mode 100644
index 000000000000..cf2c4c0ef999
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-0.98.5.2-r3.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-0.98.5.2-r3.ebuild,v 1.1 2009/02/25 20:33:41 bicatali Exp $
+
+WX_GTK_VER=2.8
+EAPI=2
+inherit distutils wxwidgets
+
+PDOC="users_guide_${PV}"
+
+DESCRIPTION="Pure python plotting library with matlab like syntax"
+HOMEPAGE="http://matplotlib.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+IUSE="cairo doc excel examples fltk gtk latex qt3 qt4 traits tk wxwindows"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LICENSE="PYTHON BSD"
+
+CDEPEND=">=dev-python/numpy-1.1
+	dev-python/python-dateutil
+	dev-python/pytz
+	media-libs/freetype:2
+	media-libs/libpng
+	gtk? ( dev-python/pygtk )
+	tk? ( dev-lang/python[tk] )
+	wxwindows? ( dev-python/wxpython:2.8 )"
+
+DEPEND="${CDEPEND}
+	dev-python/pycxx
+	dev-util/pkgconfig
+	doc? ( >=dev-python/sphinx-0.5.1
+			app-text/dvipng
+			dev-python/ipython )"
+
+RDEPEND="${CDEPEND}
+	|| ( media-fonts/dejavu media-fonts/ttf-bitstream-vera )
+	media-fonts/texcm-ttf
+	cairo?  ( dev-python/pycairo )
+	excel?  ( dev-python/xlwt )
+	fltk?   ( dev-python/pyfltk )
+	qt3?    ( dev-python/PyQt )
+	qt4?    ( dev-python/PyQt4 )
+	traits? ( dev-python/traits dev-python/configobj )
+	latex?  (
+		virtual/latex-base
+		virtual/ghostscript
+		app-text/dvipng
+		app-text/poppler
+		|| ( dev-texlive/texlive-fontsrecommended
+			 app-text/tetex
+			 app-text/ptex ) )"
+
+DOCS="INTERACTIVE"
+
+use_setup() {
+	local uword="${2}"
+	[ -z "${2}" ] && uword="${1}"
+	if use ${1}; then
+		echo "${uword} = True"
+		echo "${uword}agg = True"
+	else
+		echo "${uword} = False"
+		echo "${uword}agg = False"
+	fi
+}
+
+src_prepare() {
+	# patch from mandriva
+	epatch "${FILESDIR}"/${P}-literal.patch
+
+	# create setup.cfg (see setup.cfg.template for any changes)
+	cat > setup.cfg <<-EOF
+		[provide_packages]
+		pytz = False
+		dateutil = False
+		configobj = False
+		enthought.traits = False
+		[gui_support]
+		$(use_setup gtk)
+		$(use_setup tk)
+		$(use_setup wxwindows wx)
+		$(use_setup qt3 qt)
+		$(use_setup qt4)
+		$(use_setup fltk)
+		$(use_setup cairo)
+	EOF
+
+	# avoid checks needing a X display
+	sed -i \
+		-e "s/check_for_gtk()/$(use gtk && echo True || echo False)/" \
+		-e "s/check_for_tk()/$(use tk && echo True || echo False)/" \
+		setup.py || die "sed setup.py failed"
+
+	# respect FHS:
+	#  - mpl-data in /usr/share/matplotlib
+	#  - config files in /etc/matplotlib
+	sed -i \
+		-e "/'mpl-data\/matplotlibrc',/d" \
+		-e "/'mpl-data\/matplotlib.conf',/d" \
+		-e "s:'lib/matplotlib/mpl-data/matplotlibrc':'matplotlibrc':" \
+		-e "s:'lib/matplotlib/mpl-data/matplotlib.conf':'matplotlib.conf':" \
+		setup.py \
+		|| die "sed setup.py for FHS failed"
+
+	sed -i \
+		-e "s:path =  get_data_path():path = '/etc/matplotlib':" \
+		-e "s:os.path.dirname(__file__):'/usr/share/${PN}':g"  \
+		lib/matplotlib/{__init__,config/cutils}.py \
+		|| die "sed init for FHS failed"
+
+	# remove internal copies of fonts, pycxx, pyparsing
+	rm -rf \
+		CXX \
+		lib/matplotlib/mpl-data/fonts/{afm,pdfcorefonts} \
+		lib/matplotlib/mpl-data/fonts/ttf/{Vera*,cm*,*.TXT} \
+		|| die "removed internal copies failed"
+	ln -s /usr/share/python*/CXX . || die
+
+	# remove pyparsing only when upstream pyparsing included matplotlib
+	# fixes. See bug #260025
+	#rm -f lib/matplotlib/pyparsing.py
+}
+
+src_compile() {
+	distutils_src_compile
+	if use doc; then
+		cd "${S}/doc"
+		# no die function here: broken compilation at the end, do it twice,
+		# result ok.
+		MATPLOTLIBDATA="${S}/lib/matplotlib/mpl-data" \
+			PYTHONPATH=$(dir -d "${S}"/build/lib*) \
+			${python} make.py html
+		MATPLOTLIBDATA="${S}/lib/matplotlib/mpl-data" \
+			PYTHONPATH=$(dir -d "${S}"/build/lib*) \
+			${python} make.py
+	fi
+}
+
+src_test() {
+	einfo "Tests are quite long, be patient"
+	cd "${S}/examples/tests"
+	PYTHONPATH=$(dir -d "${S}"/build/lib*) ${python} backend_driver.py agg \
+		|| die "tests failed"
+	PYTHONPATH=$(dir -d "${S}"/build/lib*) ${python} backend_driver.py \
+		--clean
+}
+
+src_install() {
+	distutils_src_install
+
+	# respect FHS
+	dodir /usr/share/${PN}
+	mv "${D}"/usr/*/*/site-packages/${PN}/{mpl-data,backends/Matplotlib.nib} \
+		"${D}"/usr/share/${PN} || die "failed renaming"
+	insinto /etc/matplotlib
+	doins matplotlibrc matplotlib.conf \
+		|| die "installing config files failed"
+
+	# doc and examples
+	insinto /usr/share/doc/${PF}
+	if use doc; then
+		doins doc/build/latex/Matplotlib.pdf || die
+		doins -r doc/build/html || die
+	fi
+	if use examples; then
+		doins -r examples || die
+	fi
+}