diff options
Diffstat (limited to 'dev-python/matplotlib')
| -rw-r--r-- | dev-python/matplotlib/matplotlib-1.5.0.ebuild | 14 | ||||
| -rw-r--r-- | dev-python/matplotlib/metadata.xml | 3 |
2 files changed, 7 insertions, 10 deletions
diff --git a/dev-python/matplotlib/matplotlib-1.5.0.ebuild b/dev-python/matplotlib/matplotlib-1.5.0.ebuild index db96ac7d0a97..c1a2fc658881 100644 --- a/dev-python/matplotlib/matplotlib-1.5.0.ebuild +++ b/dev-python/matplotlib/matplotlib-1.5.0.ebuild @@ -21,18 +21,18 @@ SLOT="0" # Fonts: BitstreamVera, OFL-1.1 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1" KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -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 @@ -47,7 +47,7 @@ COMMON_DEPEND=" media-libs/freetype:2 media-libs/libpng:0 media-libs/qhull - gtk? ( + gtk2? ( dev-libs/glib:2= x11-libs/gdk-pixbuf x11-libs/gtk+:2 @@ -124,10 +124,6 @@ use_setup() { fi } -_PATCHES=( - "${FILESDIR}"/${P}-backport-GH5291-2462.patch -) - python_prepare_all() { # Generates test failures, but fedora does it # local PATCHES=( @@ -210,7 +206,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 diff --git a/dev-python/matplotlib/metadata.xml b/dev-python/matplotlib/metadata.xml index 385b78482e13..fa1693c70e1f 100644 --- a/dev-python/matplotlib/metadata.xml +++ b/dev-python/matplotlib/metadata.xml @@ -10,7 +10,8 @@ </longdescription> <use> <flag name="excel">Pull <pkg>dev-python/xlwt</pkg> for the exceltools toolkit</flag> - <flag name="gtk3">Use <pkg>x11-libs/gtk+:3</pkg> instead of <pkg>x11-libs/gtk+:2</pkg></flag> + <flag name="gtk2">Enable <pkg>x11-libs/gtk+:2</pkg> support</flag> + <flag name="gtk3">Enable <pkg>x11-libs/gtk+:3</pkg> support</flag> <flag name="pyside">Qt support via <pkg>dev-python/pyside</pkg></flag> </use> <upstream> |