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 1DDB51384B4 for ; Fri, 20 Nov 2015 11:29:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DE64021C012; Fri, 20 Nov 2015 11:29:36 +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 2747A21C010 for ; Fri, 20 Nov 2015 11:29:36 +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 AA04A340AC8 for ; Fri, 20 Nov 2015 11:29:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 61E6E1068 for ; Fri, 20 Nov 2015 11:29:31 +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: <1448018961.b1aeb406bf927ca3f71304535c5cb6785bec28d7.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.5.0.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: b1aeb406bf927ca3f71304535c5cb6785bec28d7 X-VCS-Branch: master Date: Fri, 20 Nov 2015 11:29:31 +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: ba60d91c-0caa-4375-8df6-89ee1cdafcd6 X-Archives-Hash: 2abe76983bed4b50c8d6164be4b09c91 commit: b1aeb406bf927ca3f71304535c5cb6785bec28d7 Author: Justin Lecher gentoo org> AuthorDate: Fri Nov 20 10:40:46 2015 +0000 Commit: Justin Lecher gentoo org> CommitDate: Fri Nov 20 11:29:21 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1aeb406 dev-python/matplotlib: Rename USE gtk to gtk2 USE gtk is ambigous and gtk2 will better represent the acutal effect the use has, similar to gtk3 Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=566296 Package-Manager: portage-2.2.25 Signed-off-by: Justin Lecher gentoo.org> dev-python/matplotlib/matplotlib-1.5.0.ebuild | 14 +++++--------- 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 db96ac7..c1a2fc6 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 385b784..fa1693c 100644 --- a/dev-python/matplotlib/metadata.xml +++ b/dev-python/matplotlib/metadata.xml @@ -10,7 +10,8 @@ Pull dev-python/xlwt for the exceltools toolkit - Use x11-libs/gtk+:3 instead of x11-libs/gtk+:2 + Enable x11-libs/gtk+:2 support + Enable x11-libs/gtk+:3 support Qt support via dev-python/pyside