From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 557C41386F3 for ; Thu, 13 Aug 2015 12:59:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E7B78E07DA; Thu, 13 Aug 2015 12:59:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 85FA5E07DA for ; Thu, 13 Aug 2015 12:59:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 32180340A1B for ; Thu, 13 Aug 2015 12:59:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 89609127 for ; Thu, 13 Aug 2015 12:59:07 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1439470738.2e864ad0e3fc047b8166d40934625d48e6608943.jlec@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/matplotlib/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/matplotlib/matplotlib-9999.ebuild X-VCS-Directories: dev-python/matplotlib/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 2e864ad0e3fc047b8166d40934625d48e6608943 X-VCS-Branch: master Date: Thu, 13 Aug 2015 12:59:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: eaa33631-395a-45af-8e8c-2a6a8d72ec45 X-Archives-Hash: ba4376963113f200fe7c85a8a7c30839 commit: 2e864ad0e3fc047b8166d40934625d48e6608943 Author: Justin Lecher gentoo org> AuthorDate: Thu Aug 13 12:58:45 2015 +0000 Commit: Justin Lecher gentoo org> CommitDate: Thu Aug 13 12:58:58 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e864ad0 dev-python/matplotlib: Move all changes to live version, bug #556882 Package-Manager: portage-2.2.20 Signed-off-by: Justin Lecher gentoo.org> dev-python/matplotlib/matplotlib-9999.ebuild | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dev-python/matplotlib/matplotlib-9999.ebuild b/dev-python/matplotlib/matplotlib-9999.ebuild index 1e63422..b5d52ac 100644 --- a/dev-python/matplotlib/matplotlib-9999.ebuild +++ b/dev-python/matplotlib/matplotlib-9999.ebuild @@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_3,3_4} ) PYTHON_REQ_USE='tk?' -inherit distutils-r1 eutils flag-o-matic git-r3 virtualx +inherit distutils-r1 eutils flag-o-matic git-r3 virtualx toolchain-funcs DESCRIPTION="Pure python plotting library with matlab like syntax" HOMEPAGE="http://matplotlib.org/" @@ -65,8 +65,13 @@ DEPEND="${COMMON_DEPEND} )" RDEPEND="${COMMON_DEPEND} - dev-python/pyparsing[${PYTHON_USEDEP}] - cairo? ( dev-python/pycairo[${PYTHON_USEDEP}] ) + >=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}] + cairo? ( + || ( + dev-python/pycairo[${PYTHON_USEDEP}] + dev-python/cairocffi[${PYTHON_USEDEP}] + ) + ) excel? ( dev-python/xlwt[${PY2_USEDEP}] ) fltk? ( dev-python/pyfltk[${PY2_USEDEP}] ) gtk3? ( @@ -83,7 +88,7 @@ RDEPEND="${COMMON_DEPEND} ) pyside? ( dev-python/pyside[X,${PYTHON_USEDEP}] ) qt4? ( dev-python/PyQt4[X,${PYTHON_USEDEP}] ) - qt5? ( dev-python/PyQt5[X,${PYTHON_USEDEP}] ) + qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] ) " PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )" @@ -94,7 +99,7 @@ REQUIRED_USE=" gtk? ( ${PY2_FLAGS} ) wxwidgets? ( ${PY2_FLAGS} ) test? ( - cairo fltk latex pyside qt4 tk wxwidgets + cairo fltk latex pyside qt5 qt4 tk wxwidgets || ( gtk gtk3 ) )" @@ -152,6 +157,7 @@ python_prepare_all() { python_configure_all() { append-flags -fno-strict-aliasing append-cppflags -DNDEBUG # or get old trying to do triangulation + tc-export PKG_CONFIG } python_configure() {