From fd1c5b8dc5c9f412036f0356cc2036803d0a41c1 Mon Sep 17 00:00:00 2001 From: Tim Orling Date: Sun, 12 Oct 2014 22:02:22 -0700 Subject: python-matplotlib: add dateutil & pytz to DEPENDS/RDEPENDS python-matplotlib is currently providing its own dateutil and pytz Add dateutil and pytz as DEPENDS/RDEPENDS. Patch setupext.py to no longer provide its own dateutil and pytz. Remove python-matplotlib from blacklist. Signed-off-by: Tim Orling Signed-off-by: Martin Jansa --- meta-python/recipes-devtools/python/python-matplotlib_1.1.0.bb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'meta-python/recipes-devtools/python/python-matplotlib_1.1.0.bb') diff --git a/meta-python/recipes-devtools/python/python-matplotlib_1.1.0.bb b/meta-python/recipes-devtools/python/python-matplotlib_1.1.0.bb index 6c8a202c59..69f71c7116 100644 --- a/meta-python/recipes-devtools/python/python-matplotlib_1.1.0.bb +++ b/meta-python/recipes-devtools/python/python-matplotlib_1.1.0.bb @@ -4,11 +4,8 @@ LICENSE = "PSF" LIC_FILES_CHKSUM = "file://README.txt;md5=83c5bf8b16a5f99507f2f47a21ae3b81" PR = "r1" -DEPENDS += "python-numpy freetype libpng" -RDEPENDS_${PN} = "python-core python-distutils python-numpy freetype libpng" - -PNBLACKLIST[python-matplotlib] = "CONFLICT: 34 files with python-dateutil" -# e.g. sysroots/qemux86-64/usr/lib/python2.7/site-packages/dateutil/tzwin.pyc +DEPENDS += "python-numpy freetype libpng python-dateutil python-pytz" +RDEPENDS_${PN} = "python-core python-distutils python-numpy freetype libpng python-dateutil python-pytz" SRC_URI = "${SOURCEFORGE_MIRROR}/matplotlib/matplotlib-${PV}.tar.gz \ file://fix_setup.patch \ -- cgit v1.2.3-54-g00ecf