From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0CF691382C5 for ; Fri, 5 Jun 2020 11:31:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 34E61E08C4; Fri, 5 Jun 2020 11:30:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 10399E08C4 for ; Fri, 5 Jun 2020 11:30:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7A6A634F2BD for ; Fri, 5 Jun 2020 11:30:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E7AF631 for ; Fri, 5 Jun 2020 11:30:50 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1591356478.0bc07f9928ab1f8ab61b482fb6847afbc574aece.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/matplotlib/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild dev-python/matplotlib/matplotlib-2.2.4.ebuild dev-python/matplotlib/metadata.xml X-VCS-Directories: dev-python/matplotlib/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 0bc07f9928ab1f8ab61b482fb6847afbc574aece X-VCS-Branch: master Date: Fri, 5 Jun 2020 11:30:50 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ddbcbbb8-7de4-4809-b7fc-fcc34f0a2380 X-Archives-Hash: 12e5af124c397f5307d889eda1449748 commit: 0bc07f9928ab1f8ab61b482fb6847afbc574aece Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Jun 5 11:25:28 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Jun 5 11:27:58 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bc07f99 dev-python/matplotlib: Drop IUSE="gtk2" Depends on doomed dev-python/pygtk. Closes: https://bugs.gentoo.org/706464 Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild | 21 +++++++-------------- dev-python/matplotlib/matplotlib-2.2.4.ebuild | 21 +++++++-------------- dev-python/matplotlib/metadata.xml | 1 - 3 files changed, 14 insertions(+), 29 deletions(-) diff --git a/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild b/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild index a4c0390e0f3..9503034ec4c 100644 --- a/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild +++ b/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild @@ -19,19 +19,15 @@ SLOT="0" # Fonts: BitstreamVera, OFL-1.1 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1" KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86" -IUSE="cairo doc excel examples gtk2 gtk3 latex qt5 test tk wxwidgets" +IUSE="cairo doc excel examples gtk3 latex qt5 test tk wxwidgets" RESTRICT="!test? ( test )" PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )" REQUIRED_USE=" doc? ( ${PY2_FLAGS} ) excel? ( ${PY2_FLAGS} ) - gtk2? ( ${PY2_FLAGS} ) wxwidgets? ( ${PY2_FLAGS} ) - test? ( - cairo latex qt5 tk wxwidgets - || ( gtk2 gtk3 ) - )" + test? ( cairo gtk3 latex qt5 tk wxwidgets )" # #456704 -- a lot of py2-only deps PY2_USEDEP=$(python_gen_usedep python2_7) @@ -51,11 +47,6 @@ COMMON_DEPEND=" >=media-libs/qhull-2013 >=dev-python/kiwisolver-1.0.0[${PYTHON_USEDEP}] cairo? ( dev-python/cairocffi[${PYTHON_USEDEP}] ) - gtk2? ( - dev-libs/glib:2= - x11-libs/gdk-pixbuf - x11-libs/gtk+:2 - dev-python/pygtk[${PY2_USEDEP}] ) wxwidgets? ( >=dev-python/wxpython-2.8:*[${PY2_USEDEP}] )" # internal copy of pycxx highly patched @@ -85,7 +76,7 @@ DEPEND="${COMMON_DEPEND} test? ( dev-python/mock[${PYTHON_USEDEP}] >=dev-python/nose-0.11.1[${PYTHON_USEDEP}] - )" + )" RDEPEND="${COMMON_DEPEND} ${PY2_DEPEND} @@ -93,7 +84,8 @@ RDEPEND="${COMMON_DEPEND} excel? ( dev-python/xlwt[${PYTHON_USEDEP}] ) gtk3? ( dev-python/pygobject:3[${PYTHON_USEDEP}] - x11-libs/gtk+:3[introspection] ) + x11-libs/gtk+:3[introspection] + ) latex? ( virtual/latex-base app-text/ghostscript-gpl @@ -201,7 +193,8 @@ python_configure() { EOF else cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die - $(use_setup gtk2 gtk) + gtk = False + gtkagg = False $(use_setup wxwidgets wx) EOF fi diff --git a/dev-python/matplotlib/matplotlib-2.2.4.ebuild b/dev-python/matplotlib/matplotlib-2.2.4.ebuild index 993902f040d..824ae05fff3 100644 --- a/dev-python/matplotlib/matplotlib-2.2.4.ebuild +++ b/dev-python/matplotlib/matplotlib-2.2.4.ebuild @@ -19,17 +19,13 @@ SLOT="0" # Fonts: BitstreamVera, OFL-1.1 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1" KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" -IUSE="cairo doc excel examples gtk2 gtk3 latex qt5 test tk wxwidgets" +IUSE="cairo doc excel examples gtk3 latex qt5 test tk wxwidgets" RESTRICT="!test? ( test )" PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )" REQUIRED_USE=" - gtk2? ( ${PY2_FLAGS} ) wxwidgets? ( ${PY2_FLAGS} ) - test? ( - cairo latex qt5 tk wxwidgets - || ( gtk2 gtk3 ) - )" + test? ( cairo gtk3 latex qt5 tk wxwidgets )" # #456704 -- a lot of py2-only deps PY2_USEDEP=$(python_gen_usedep python2_7) @@ -49,11 +45,6 @@ COMMON_DEPEND=" >=media-libs/qhull-2013 >=dev-python/kiwisolver-1.0.0[${PYTHON_USEDEP}] cairo? ( dev-python/cairocffi[${PYTHON_USEDEP}] ) - gtk2? ( - dev-libs/glib:2= - x11-libs/gdk-pixbuf - x11-libs/gtk+:2 - dev-python/pygtk[${PY2_USEDEP}] ) wxwidgets? ( >=dev-python/wxpython-2.8:*[${PY2_USEDEP}] )" # internal copy of pycxx highly patched @@ -84,7 +75,7 @@ DEPEND="${COMMON_DEPEND} test? ( dev-python/mock[${PYTHON_USEDEP}] >=dev-python/nose-0.11.1[${PYTHON_USEDEP}] - )" + )" RDEPEND="${COMMON_DEPEND} ${PY2_DEPEND} @@ -92,7 +83,8 @@ RDEPEND="${COMMON_DEPEND} excel? ( dev-python/xlwt[${PYTHON_USEDEP}] ) gtk3? ( dev-python/pygobject:3[${PYTHON_USEDEP}] - x11-libs/gtk+:3[introspection] ) + x11-libs/gtk+:3[introspection] + ) latex? ( virtual/latex-base app-text/ghostscript-gpl @@ -203,7 +195,8 @@ python_configure() { EOF else cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die - $(use_setup gtk2 gtk) + gtk = False + gtkagg = False $(use_setup wxwidgets wx) EOF fi diff --git a/dev-python/matplotlib/metadata.xml b/dev-python/matplotlib/metadata.xml index d238bedf5ab..f024fad1333 100644 --- a/dev-python/matplotlib/metadata.xml +++ b/dev-python/matplotlib/metadata.xml @@ -17,7 +17,6 @@ Pull dev-python/xlwt for the exceltools toolkit - Enable x11-libs/gtk+:2 support Enable x11-libs/gtk+:3 support