Gentoo Archives: gentoo-commits

From: Justin Lecher <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/matplotlib/
Date: Thu, 24 Dec 2015 17:33:08
Message-Id: 1450978379.0dd862461d8c7cb6a07f5b45445d70700e75211d.jlec@gentoo
1 commit: 0dd862461d8c7cb6a07f5b45445d70700e75211d
2 Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
3 AuthorDate: Thu Dec 24 17:32:39 2015 +0000
4 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 24 17:32:59 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dd86246
7
8 dev-python/matplotlib: Move cairo deps to DEPEND too
9
10 Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=569500
11
12 Package-Manager: portage-2.2.26
13 Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
14
15 dev-python/matplotlib/matplotlib-1.5.0.ebuild | 12 ++++++------
16 1 file changed, 6 insertions(+), 6 deletions(-)
17
18 diff --git a/dev-python/matplotlib/matplotlib-1.5.0.ebuild b/dev-python/matplotlib/matplotlib-1.5.0.ebuild
19 index 3bde29f..a98751d 100644
20 --- a/dev-python/matplotlib/matplotlib-1.5.0.ebuild
21 +++ b/dev-python/matplotlib/matplotlib-1.5.0.ebuild
22 @@ -47,6 +47,12 @@ COMMON_DEPEND="
23 media-libs/freetype:2
24 media-libs/libpng:0
25 media-libs/qhull
26 + cairo? (
27 + || (
28 + dev-python/pycairo[${PYTHON_USEDEP}]
29 + dev-python/cairocffi[${PYTHON_USEDEP}]
30 + )
31 + )
32 gtk2? (
33 dev-libs/glib:2=
34 x11-libs/gdk-pixbuf
35 @@ -80,12 +86,6 @@ DEPEND="${COMMON_DEPEND}
36
37 RDEPEND="${COMMON_DEPEND}
38 >=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
39 - cairo? (
40 - || (
41 - dev-python/pycairo[${PYTHON_USEDEP}]
42 - dev-python/cairocffi[${PYTHON_USEDEP}]
43 - )
44 - )
45 excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
46 fltk? ( dev-python/pyfltk[${PYTHON_USEDEP}] )
47 gtk3? (