summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2012-01-17 06:36:09 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2012-01-17 06:36:09 +0000
commit18e48418eb0efa0966e41efad6b1c2eb8c74f79c (patch)
tree2976885d328cf2ed6f2281f3200ed645a6ef4f92 /dev-python/matplotlib
parentVersion bump (diff)
downloadhistorical-18e48418eb0efa0966e41efad6b1c2eb8c74f79c.tar.gz
historical-18e48418eb0efa0966e41efad6b1c2eb8c74f79c.tar.bz2
historical-18e48418eb0efa0966e41efad6b1c2eb8c74f79c.zip
Added PySide for optional GUI (bug #393647), removed traits dependency (bug #398919), now download examples from upstream, some cleaning, hopefully fixing doc generation (bug #339775)
Package-Manager: portage-2.1.10.41/cvs/Linux x86_64
Diffstat (limited to 'dev-python/matplotlib')
-rw-r--r--dev-python/matplotlib/ChangeLog9
-rw-r--r--dev-python/matplotlib/Manifest23
-rw-r--r--dev-python/matplotlib/matplotlib-1.1.0.ebuild80
3 files changed, 56 insertions, 56 deletions
diff --git a/dev-python/matplotlib/ChangeLog b/dev-python/matplotlib/ChangeLog
index 6acc5666dfe2..91c8b47ae151 100644
--- a/dev-python/matplotlib/ChangeLog
+++ b/dev-python/matplotlib/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-python/matplotlib
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.111 2011/12/03 18:06:01 hwoarang Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.112 2012/01/17 06:36:09 bicatali Exp $
+
+ 17 Jan 2012; Sébastien Fabbro <bicatali@gentoo.org> matplotlib-1.1.0.ebuild:
+ Added PySide for optional GUI (bug #393647), removed traits dependency (bug
+ #398919), now download examples from upstream, some cleaning, hopefully
+ fixing doc generation (bug #339775)
03 Dec 2011; Markos Chandras <hwoarang@gentoo.org> matplotlib-1.0.1-r1.ebuild,
matplotlib-1.1.0.ebuild:
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 759d695368da..a6f03ba0fc87 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -1,5 +1,5 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
AUX matplotlib-1.0.1-libpng15.patch 2393 RMD160 ab0fdb3ebfa3d112496f0246d084dc996ecfc019 SHA1 4aa6374bef7193163a9ed641fd513607566a8060 SHA256 fd6721b37b6de66b5d11804137a7040ad9bc4edcadfd1397b9afbe570e7c58c7
AUX matplotlib-1.0.1-linux3.patch 985 RMD160 679247326b0bc98d61462a42658d4ae9620daeb5 SHA1 e53f58b4f4ebbe618e4ef28e25eb89e7a6db1286 SHA256 2487d4b599a0b52ebccdc79a30365aa4ad56a2cb5fd8d5d3f8cfb167780bb380
@@ -7,24 +7,15 @@ AUX matplotlib-1.0.1-sphinx.patch 3441 RMD160 b1a7ad1184dc0e16d65ba0d409f508309d
DIST matplotlib-1.0.1.tar.gz 13285166 RMD160 e3e326f7f31ef995253da483444cb593b8e6753b SHA1 c7a832f28a66817626e7a8af21e14ea0e15f4008 SHA256 83bc6377373b3f34b18eac1883c27f3f381f5c9b9c422b4d85c91e217a947af6
DIST matplotlib-1.1.0.tar.gz 35842643 RMD160 9313fc6407271c46f3ac5af4c53df5ea57982711 SHA1 435b4f04a7e099b79f66451d69ad0b5ce66030ae SHA256 be37e1d86c65ecacae6683f8805e051e9904e5f2e02bf2b7a34262c46a6d06a7
DIST matplotlib-sampledata.tar.bz2 1013421 RMD160 43a06cf7847cfe1ad744bd6444786b16843bb1f3 SHA1 b5335b05b6d3c05dcb052c81385f1304e465d2ee SHA256 0a9d45f1e5f31bee1e6efeb453775153d0553b721971830d6c1657a8d9640a3e
+DIST mpl_sampledata-1.1.0.tar.gz 874730 RMD160 7c1d4e8b66eeaee718540d21b8b3e1404e65a9cf SHA1 2bf93d6131a4a39095eeefd196685a7648c636df SHA256 eee173eaf9bd42bc57fb1bcff7044a184da85e6ea1262c1a7d1fdc2e303e78d8
EBUILD matplotlib-1.0.1-r1.ebuild 6296 RMD160 0dbbc97e4ac8a13cb31190ef099c66d0dcc3e554 SHA1 ee2a5d6064eca99860a4df0b6b251f1a0c8e52b3 SHA256 358e64a2ea492e2e9ab1341604755f8eda572da78a1e717fd75d3031f5aa81ed
-EBUILD matplotlib-1.1.0.ebuild 6154 RMD160 cd744e3679ecdb430b62d951bddee5fd8795c76f SHA1 4af6301929dedcb98227b9432ac50b39ad2737e8 SHA256 c5443d5bab2305f101872df34b2c7a85352daa5d0896f54f290a7b98b1e5a1a0
-MISC ChangeLog 21079 RMD160 054ef42ef2417023a92ac360c45943979f6e62a7 SHA1 9ab36df4cce43ff4a5417a55084d10a759c7074f SHA256 07145cee12597e671a77db592ff42c08481034ef5aac22920371f8d71c88535d
+EBUILD matplotlib-1.1.0.ebuild 6077 RMD160 30cceee9acac3976ad8cdfbfc06cce89d719609a SHA1 3bf40d64c92ef4f785f0873b36f7a51a0294faac SHA256 d98fb0ed79080a3a9549bf951b32c05c0efde72b7980bb2148017861bc8d7e77
+MISC ChangeLog 21350 RMD160 ce6daa972199b756a87df8afc61af4bb90db5f60 SHA1 b54cda3f7bf3a938a97d1b67c634e02838cf3f9a SHA256 7ac0bbb6935c0edb5f621db3aa1003f8348226a02823f3e980e27036bc9f12be
MISC metadata.xml 640 RMD160 5a3412572c06b5f54b7570a6d42e503b5711b8b9 SHA1 dbdefc26499cd67470a363f54fcb928f2f510fcf SHA256 6643fb3ec5019f58c1a7af76a25d791f1109c37929b3332ddbe1a2911f5de3b4
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iQIcBAEBCgAGBQJO2mUMAAoJEPqDWhW0r/LC+BUP/RhkQyi4I03YpHsF7he09Nrj
-RAPeBJQQTk5LxaWLJ4v+pVyM9SviGBN16/y38Hv10vn96BenBiWk2HJ0MBIOcg4Q
-j4KkbF11X19c5yWptSHhQkMeutqdttctglbsm542fY663POEKhWNC/omqmCCwycW
-jMew0+YV1zpF1iXcgyDI1E8QitQwgtrYFrfCZZciPKsW2xl3LPLwQnXCBAuEVVmH
-0kjbB3wQbScDym/mfrk81v0lpT9u+cPVO93LADdoTyZj2Ft4qqX3aY6tSgtslM+c
-rTLSfciZSYqEypENguS9aboDDaMtGgjM6/he6xKIgqWe+HUzp1jqtaDHCmqkA67X
-fXa8D4kODPNFa4JVChMZ55Src2h+h3CXqO8JmVjc9q5EKOcEa3iNNwKRWTrR6dZa
-s6Nqhf+4I6tbZh/IywVFMAWntokS2WPrcQsTeFmEcAeoGXW6YfGn+12L8796XxZh
-f6RU6V36XdcLniwlS4JyXb714buYbJ52PLvYDtn+JOqzsVbjBJvCFPFV01jIhGu6
-204tONU9NI4SFnhGJMSIY1BeiGIeiHEsRqqHr54a9WhDTJXwFVmkjm8h105a2O4a
-iyb1wue55d9Q5k1gGPTh4Yy5h5jQ4DwfT5Gs0OIUh4kS5zBG/fnrZx3EHfCP8wpa
-s5l/rKCOEe6fshvNjBv1
-=q98V
+iEYEARECAAYFAk8VFuIACgkQ1ycZbhPLE2D6xQCgoy1QmCwuX3YHewLfT3M0ypoR
+FcsAn1HrwYeFzcW8XROzybnVUtZUteAQ
+=D83b
-----END PGP SIGNATURE-----
diff --git a/dev-python/matplotlib/matplotlib-1.1.0.ebuild b/dev-python/matplotlib/matplotlib-1.1.0.ebuild
index c0bb501064d6..bb205b1a5e6a 100644
--- a/dev-python/matplotlib/matplotlib-1.1.0.ebuild
+++ b/dev-python/matplotlib/matplotlib-1.1.0.ebuild
@@ -1,24 +1,25 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-1.1.0.ebuild,v 1.2 2011/12/03 18:06:01 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-1.1.0.ebuild,v 1.3 2012/01/17 06:36:09 bicatali Exp $
EAPI="3"
+
PYTHON_DEPEND="2"
PYTHON_USE_WITH="tk"
PYTHON_USE_WITH_OPT="tk"
SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
+RESTRICT_PYTHON_ABIS="3.* *-jython *-pypy-*"
WX_GTK_VER="2.8"
-inherit distutils eutils
+inherit distutils
DESCRIPTION="Pure python plotting library with matlab like syntax"
HOMEPAGE="http://matplotlib.sourceforge.net/ http://pypi.python.org/pypi/matplotlib"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
- doc? ( mirror://gentoo/${PN}-sampledata.tar.bz2 )
- examples? ( mirror://gentoo/${PN}-sampledata.tar.bz2 )"
+ doc? ( mirror://sourceforge/${PN}/mpl_sampledata-${PV}.tar.gz )
+ examples? ( mirror://sourceforge/${PN}/mpl_sampledata-${PV}.tar.gz )"
-IUSE="cairo doc excel examples fltk gtk latex qt4 traits tk wxwidgets"
+IUSE="cairo doc excel examples fltk gtk latex qt4 tk wxwidgets"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
# Main license: matplotlib
@@ -58,8 +59,7 @@ RDEPEND="${CDEPEND}
cairo? ( dev-python/pycairo )
excel? ( dev-python/xlwt )
fltk? ( dev-python/pyfltk )
- qt4? ( dev-python/PyQt4[X] )
- traits? ( dev-python/traits dev-python/configobj )
+ qt4? ( || ( dev-python/PyQt4[X] dev-python/pyside ) )
latex? (
virtual/latex-base
app-text/ghostscript-gpl
@@ -74,8 +74,7 @@ PYTHON_CXXFLAGS=("2.* + -fno-strict-aliasing")
PYTHON_MODNAME="matplotlib mpl_toolkits pylab.py"
use_setup() {
- local uword="${2}"
- [[ -z "${2}" ]] && uword="${1}"
+ local uword="${2:-${1}}"
if use ${1}; then
echo "${uword} = True"
echo "${uword}agg = True"
@@ -91,15 +90,13 @@ src_prepare() {
[provide_packages]
pytz = False
dateutil = False
- configobj = False
- enthought.traits = False
[gui_support]
+ $(use_setup cairo)
+ $(use_setup fltk)
$(use_setup gtk)
+ $(use_setup qt4)
$(use_setup tk)
$(use_setup wxwidgets wx)
- $(use_setup qt4)
- $(use_setup fltk)
- $(use_setup cairo)
EOF
# avoid checks needing a X display
@@ -116,18 +113,17 @@ src_prepare() {
-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"
+ setup.py || die "sed setup.py for FHS failed"
# remove internal copies of pycxx, pyparsing
rm -rf CXX lib/matplotlib/pyparsing.py \
|| die "removed internal copies failed"
- # bug #334429 - also see https://developer.mozilla.org/en/Mozilla_MathML_Project/Fonts
+ # bug #334429 https://developer.mozilla.org/en/Mozilla_MathML_Project/Fonts
# which advise against bakoma fonts
sed -i \
-e '/fontset/s/cm/stix/' \
- lib/matplotlib/mpl-data/matplotlib.conf || die
+ lib/matplotlib/mpl-data/matplotlib.conf* || die
sed -i \
-e 's/matplotlib.pyparsing/pyparsing/g' \
@@ -135,11 +131,16 @@ src_prepare() {
|| die "sed pyparsing failed"
# some fixes to avoid fetching data while compiling examples in tests
- mv "${WORKDIR}"/sample_data examples/
- echo "examples.download : False" >> doc/matplotlibrc
- echo "examples.directory : ${S}/examples/sample_data" >> doc/matplotlibrc
- echo "examples.download : False" >> matplotlibrc.template
- echo "examples.directory : ${EPREFIX}/usr/share/${PF}/examples/sample_data" >> matplotlibrc.template
+ if use doc || use examples; then
+ cat <<-EOF >> doc/matplotlibrc
+ examples.download : False
+ examples.directory : "${WORKDIR}"/mpl_sampledata-${PV}
+ EOF
+ cat <<-EOF >> matplotlibrc.template
+ examples.download : False
+ examples.directory : "${EPREFIX}"/usr/share/${PF}/examples
+ EOF
+ fi
}
src_compile() {
@@ -151,8 +152,8 @@ src_compile() {
if use doc; then
cd "${S}/doc"
- export VARTEXFONTS="${T}"/fonts
MATPLOTLIBDATA="${S}/lib/matplotlib/mpl-data" \
+ VARTEXFONTS="${T}"/fonts \
PYTHONPATH=$(ls -d "${S}"/build-$(PYTHON -f --ABI)/lib*) \
"$(PYTHON -f)" make.py --small all
[[ -e build/latex/Matplotlib.pdf ]] || die "doc generation failed"
@@ -165,17 +166,19 @@ src_test() {
einfo "Tests are quite long, be patient"
cd "${S}/examples/tests"
testing() {
- PYTHONPATH=$(ls -d "${S}"/build-${PYTHON_ABI}/lib*) "$(PYTHON)" backend_driver.py agg || return 1
- PYTHONPATH=$(ls -d "${S}"/build-${PYTHON_ABI}/lib*) "$(PYTHON)" backend_driver.py --clean
+ PYTHONPATH=$(ls -d "${S}"/build-${PYTHON_ABI}/lib*) \
+ "$(PYTHON)" backend_driver.py agg || return 1
+ PYTHONPATH=$(ls -d "${S}"/build-${PYTHON_ABI}/lib*) \
+ "$(PYTHON)" backend_driver.py --clean
}
python_execute_function testing
}
src_install() {
# remove fonts bundles except some computer modern ones
- rm lib/matplotlib/mpl-data/fonts/ttf/cm{ex,mi,r,sy}10.ttf
- rm lib/matplotlib/mpl-data/fonts/ttf/{Vera*,*.TXT}
- rm lib/matplotlib/mpl-data/fonts/{afm,pdfcorefonts}
+ rm -f lib/matplotlib/mpl-data/fonts/ttf/cm{ex,mi,r,sy}10.ttf || die
+ rm -f lib/matplotlib/mpl-data/fonts/ttf/{Vera*,*.TXT} || die
+ rm -rf lib/matplotlib/mpl-data/fonts/{afm,pdfcorefonts} || die
# sed only after doc building, to allow using default configs
sed -i \
@@ -185,22 +188,23 @@ src_install() {
|| die "sed init for FHS failed"
distutils_src_install
- # Respect FHS
+ # respect FHS
dodir /usr/share/${PN}
mv "${ED}$(python_get_sitedir -f)/${PN}/"{mpl-data,backends/Matplotlib.nib} \
"${ED}usr/share/${PN}" || die "Renaming failed"
- rm -fr "${ED}"usr/lib*/python*/site-packages/${PN}/{mpl-data,backends/Matplotlib.nib}
+ rm -fr "${ED}"usr/lib*/*/site-packages/${PN}/{mpl-data,backends/Matplotlib.nib}
insinto /etc/matplotlib
- doins matplotlibrc matplotlib.conf || die "installing config files failed"
+ doins matplotlibrc matplotlib.conf
# 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
+ insinto /usr/share/doc/${PF}
+ doins -r doc/build/latex/Matplotlib.pdf doc/build/html || die
fi
if use examples; then
- doins -r examples || die
+ insinto /usr/share/doc/${PF}/examples
+ doins -r "${WORKDIR}"/mpl_sampledata-${PV}/* || die
fi
+
}