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 1291813888F for ; Thu, 15 Oct 2015 12:13:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6D4A321C010; Thu, 15 Oct 2015 12:13:48 +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 EF74921C010 for ; Thu, 15 Oct 2015 12:13:47 +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 AA0FB340C31 for ; Thu, 15 Oct 2015 12:13:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 06092922 for ; Thu, 15 Oct 2015 12:13:42 +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: <1444911211.06015eb806b553ac05242d20038241bc01076b52.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-1.4.3.ebuild dev-python/matplotlib/matplotlib-9999.ebuild dev-python/matplotlib/metadata.xml X-VCS-Directories: dev-python/matplotlib/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 06015eb806b553ac05242d20038241bc01076b52 X-VCS-Branch: master Date: Thu, 15 Oct 2015 12:13:42 +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: fa15817a-ed09-4d79-b757-d5b1f2353552 X-Archives-Hash: b83ba47809b050ff0fa3d98bd3043246 commit: 06015eb806b553ac05242d20038241bc01076b52 Author: Justin Lecher gentoo org> AuthorDate: Thu Oct 15 12:13:31 2015 +0000 Commit: Justin Lecher gentoo 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 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 @@ - + python