commit: 06015eb806b553ac05242d20038241bc01076b52 Author: Justin Lecher <jlec <AT> gentoo <DOT> org> AuthorDate: Thu Oct 15 12:13:31 2015 +0000 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> CommitDate: Thu Oct 15 12:13:31 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06015eb8
dev-python/matplotlib: Correct all deps so that py 2 and 3 are handled Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=456704 Package-Manager: portage-2.2.23 Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> dev-python/matplotlib/matplotlib-1.4.3.ebuild | 9 ++++++--- dev-python/matplotlib/matplotlib-9999.ebuild | 9 ++++++--- dev-python/matplotlib/metadata.xml | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dev-python/matplotlib/matplotlib-1.4.3.ebuild b/dev-python/matplotlib/matplotlib-1.4.3.ebuild index df777aa..f7b4156 100644 --- a/dev-python/matplotlib/matplotlib-1.4.3.ebuild +++ b/dev-python/matplotlib/matplotlib-1.4.3.ebuild @@ -51,7 +51,7 @@ DEPEND="${COMMON_DEPEND} virtual/python-imaging[${PYTHON_USEDEP}] dev-python/ipython[${PYTHON_USEDEP}] dev-python/numpydoc[${PYTHON_USEDEP}] - dev-python/xlwt[${PY2_USEDEP}] + dev-python/xlwt[${PYTHON_USEDEP}] dev-python/sphinx[${PYTHON_USEDEP}] dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended @@ -71,8 +71,11 @@ RDEPEND="${COMMON_DEPEND} dev-python/cairocffi[${PYTHON_USEDEP}] ) ) - excel? ( dev-python/xlwt[${PY2_USEDEP}] ) - fltk? ( dev-python/pyfltk[${PY2_USEDEP}] ) + excel? ( dev-python/xlwt[${PYTHON_USEDEP}] ) + fltk? ( + $(python_gen_cond_dep 'dev-python/pyfltk[${PYTHON_USEDEP}]' python2_7) + $(python_gen_cond_dep 'dev-python/pyfltk[${PYTHON_USEDEP}]' 'python3*') + ) gtk3? ( dev-python/pygobject:3[${PYTHON_USEDEP}] x11-libs/gtk+:3[introspection] ) diff --git a/dev-python/matplotlib/matplotlib-9999.ebuild b/dev-python/matplotlib/matplotlib-9999.ebuild index b5d52ac..bcdd269 100644 --- a/dev-python/matplotlib/matplotlib-9999.ebuild +++ b/dev-python/matplotlib/matplotlib-9999.ebuild @@ -52,7 +52,7 @@ DEPEND="${COMMON_DEPEND} virtual/python-imaging[${PYTHON_USEDEP}] dev-python/ipython[${PYTHON_USEDEP}] dev-python/numpydoc[${PYTHON_USEDEP}] - dev-python/xlwt[${PY2_USEDEP}] + dev-python/xlwt[${PYTHON_USEDEP}] dev-python/sphinx[${PYTHON_USEDEP}] dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended @@ -72,8 +72,11 @@ RDEPEND="${COMMON_DEPEND} dev-python/cairocffi[${PYTHON_USEDEP}] ) ) - excel? ( dev-python/xlwt[${PY2_USEDEP}] ) - fltk? ( dev-python/pyfltk[${PY2_USEDEP}] ) + excel? ( dev-python/xlwt[${PYTHON_USEDEP}] ) + fltk? ( + $(python_gen_cond_dep 'dev-python/pyfltk[${PYTHON_USEDEP}]' python2_7) + $(python_gen_cond_dep 'dev-python/pyfltk[${PYTHON_USEDEP}]' 'python3*') + ) gtk3? ( dev-python/pygobject:3[${PYTHON_USEDEP}] x11-libs/gtk+:3[introspection] ) diff --git a/dev-python/matplotlib/metadata.xml b/dev-python/matplotlib/metadata.xml index 6772739..385b784 100644 --- a/dev-python/matplotlib/metadata.xml +++ b/dev-python/matplotlib/metadata.xml @@ -1,4 +1,4 @@ -<?xml version='1.0' encoding='UTF-8'?> +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> <herd>python</herd>
