commit: 3ca0955510567177ee12f734c192f5b6fca6ec1b
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 13 07:22:43 2016 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Jan 13 07:51:14 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ca09555
dev-python/matplotlib: Transfer latest changes to live ebuild
Package-Manager: portage-2.2.26
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
dev-python/matplotlib/matplotlib-9999.ebuild | 51 ++++++++++++++++------------
1 file changed, 30 insertions(+), 21 deletions(-)
diff --git a/dev-python/matplotlib/matplotlib-9999.ebuild
b/dev-python/matplotlib/matplotlib-9999.ebuild
index 59cad22..579d0c5 100644
--- a/dev-python/matplotlib/matplotlib-9999.ebuild
+++ b/dev-python/matplotlib/matplotlib-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
PYTHON_REQ_USE='tk?,threads(+)'
-inherit distutils-r1 eutils flag-o-matic git-r3 virtualx toolchain-funcs
+inherit distutils-r1 eutils flag-o-matic git-r3 multiprocessing virtualx
toolchain-funcs
DESCRIPTION="Pure python plotting library with matlab like syntax"
HOMEPAGE="http://matplotlib.org/";
@@ -22,18 +22,18 @@ SLOT="0"
# Fonts: BitstreamVera, OFL-1.1
LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
KEYWORDS=""
-IUSE="cairo doc excel examples fltk gtk gtk3 latex pyside qt4 qt5 test tk
wxwidgets"
+IUSE="cairo doc excel examples fltk gtk2 gtk3 latex pyside qt4 qt5 test tk
wxwidgets"
PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
REQUIRED_USE="
doc? ( ${PY2_FLAGS} )
excel? ( ${PY2_FLAGS} )
fltk? ( ${PY2_FLAGS} )
- gtk? ( ${PY2_FLAGS} )
+ gtk2? ( ${PY2_FLAGS} )
wxwidgets? ( ${PY2_FLAGS} )
test? (
cairo fltk latex pyside qt5 qt4 tk wxwidgets
- || ( gtk gtk3 )
+ || ( gtk2 gtk3 )
)"
# #456704 -- a lot of py2-only deps
@@ -48,7 +48,13 @@ COMMON_DEPEND="
media-libs/freetype:2
media-libs/libpng:0
media-libs/qhull
- gtk? (
+ cairo? (
+ || (
+ dev-python/pycairo[${PYTHON_USEDEP}]
+ dev-python/cairocffi[${PYTHON_USEDEP}]
+ )
+ )
+ gtk2? (
dev-libs/glib:2=
x11-libs/gdk-pixbuf
x11-libs/gtk+:2
@@ -59,14 +65,17 @@ COMMON_DEPEND="
# dev-python/pycxx
DEPEND="${COMMON_DEPEND}
+ dev-python/versioneer[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
virtual/pkgconfig
doc? (
app-text/dvipng
dev-python/pillow[${PYTHON_USEDEP}]
dev-python/ipython[${PYTHON_USEDEP}]
+ dev-python/mock[${PY2_USEDEP}]
dev-python/numpydoc[${PYTHON_USEDEP}]
- dev-python/xlwt[${PYTHON_USEDEP}]
dev-python/sphinx[${PYTHON_USEDEP}]
+ dev-python/xlwt[${PYTHON_USEDEP}]
dev-texlive/texlive-latexextra
dev-texlive/texlive-fontsrecommended
dev-texlive/texlive-latexrecommended
@@ -79,12 +88,6 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
- cairo? (
- || (
- dev-python/pycairo[${PYTHON_USEDEP}]
- dev-python/cairocffi[${PYTHON_USEDEP}]
- )
- )
excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
fltk? ( dev-python/pyfltk[${PYTHON_USEDEP}] )
gtk3? (
@@ -133,15 +136,20 @@ python_prepare_all() {
# rm -r agg24 CXX || die
# rm -r agg24 || die
+# cat > lib/${PN}/externals/six.py <<-EOF
+# from __future__ import absolute_import
+# from six import *
+# EOF
+
sed \
-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
|| die "sed pyparsing failed"
# suggested by upstream
- sed \
- -e '/tol/s:32:35:g' \
- -i lib/matplotlib/tests/test_mathtext.py || die
+# sed \
+# -e '/tol/s:32:35:g' \
+# -i lib/matplotlib/tests/test_mathtext.py || die
sed \
-e "s:/usr/:${EPREFIX}/usr/:g" \
@@ -201,7 +209,7 @@ python_configure() {
cat >> "${BUILD_DIR}"/setup.cfg <<-EOF
six = False
$(use_setup fltk)
- $(use_setup gtk)
+ $(use_setup gtk2 gtk)
$(use_setup gtk3)
$(use_setup wxwidgets wx)
EOF
@@ -236,10 +244,11 @@ python_compile_all() {
python_test() {
wrap_setup distutils_install_for_testing
- cd "${TMPDIR}" || die
- VIRTUALX_COMMAND="${PYTHON}"
- virtualmake -c "import sys, matplotlib as m; sys.exit(0 if
m.test(verbosity=2) else 1)" || \
- die "Tests fail with ${EPYTHON}"
+ virtx ${PYTHON} tests.py \
+ --no-pep8 \
+ --no-network \
+ --verbose \
+ --processes=$(makeopts_jobs)
}
python_install() {
