commit: d2fa99e4078b245b69553d5187d387f4d7499067 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Jun 6 21:29:23 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Jun 6 21:54:51 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2fa99e4
dev-python/matplotlib: Drop REQUIRED_USE="test? ( wxwidgets )" condition It was already ineffective because wx was not enabled with py3. At the same time, drop obsolete python_is_python3 condition. Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-python/matplotlib/matplotlib-3.1.2.ebuild | 33 ++++++++------------------- dev-python/matplotlib/matplotlib-3.2.1.ebuild | 28 ++++------------------- 2 files changed, 14 insertions(+), 47 deletions(-) diff --git a/dev-python/matplotlib/matplotlib-3.1.2.ebuild b/dev-python/matplotlib/matplotlib-3.1.2.ebuild index db457aa8b79..a5746a01b05 100644 --- a/dev-python/matplotlib/matplotlib-3.1.2.ebuild +++ b/dev-python/matplotlib/matplotlib-3.1.2.ebuild @@ -12,21 +12,20 @@ DESCRIPTION="Pure python plotting library with matlab like syntax" HOMEPAGE="https://matplotlib.org/"; SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" -SLOT="0" # Main license: matplotlib # Some modules: BSD # matplotlib/backends/qt4_editor: MIT # Fonts: BitstreamVera, OFL-1.1 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1" +SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" IUSE="cairo doc excel examples gtk3 latex qt5 test tk wxwidgets" -RESTRICT="!test? ( test )" +REQUIRED_USE="test? ( cairo gtk3 latex qt5 tk )" -REQUIRED_USE=" - test? ( - cairo latex qt5 tk wxwidgets gtk3 - )" +RESTRICT="!test? ( test )" +# internal copy of pycxx highly patched +# dev-python/pycxx COMMON_DEPEND=" dev-python/cycler[${PYTHON_USEDEP}] >=dev-python/numpy-1.7.1[${PYTHON_USEDEP}] @@ -41,9 +40,6 @@ COMMON_DEPEND=" cairo? ( dev-python/cairocffi[${PYTHON_USEDEP}] ) wxwidgets? ( dev-python/wxpython:*[${PYTHON_USEDEP}] )" -# internal copy of pycxx highly patched -# dev-python/pycxx - DEPEND="${COMMON_DEPEND} dev-python/versioneer[${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}] @@ -67,7 +63,7 @@ DEPEND="${COMMON_DEPEND} test? ( dev-python/mock[${PYTHON_USEDEP}] >=dev-python/nose-0.11.1[${PYTHON_USEDEP}] - )" + )" RDEPEND="${COMMON_DEPEND} >=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}] @@ -162,6 +158,8 @@ python_configure() { tests = $(usex test True False) [gui_support] agg = True + gtk = False + gtkagg = False pyside = False pysideagg = False qt4 = False @@ -170,6 +168,7 @@ python_configure() { $(use_setup gtk3) $(use_setup qt5) $(use_setup tk) + $(use_setup wxwidgets wx) EOF if use gtk3 && use cairo; then @@ -177,20 +176,6 @@ python_configure() { else echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die fi - - if python_is_python3; then - cat >> "${BUILD_DIR}"/setup.cfg <<- EOF || die - gtk = False - gtkagg = False - wx = False - wxagg = False - EOF - else - cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die - $(use_setup gtk2 gtk) - $(use_setup wxwidgets wx) - EOF - fi } wrap_setup() { diff --git a/dev-python/matplotlib/matplotlib-3.2.1.ebuild b/dev-python/matplotlib/matplotlib-3.2.1.ebuild index 71c93b77c27..50d6eee36e3 100644 --- a/dev-python/matplotlib/matplotlib-3.2.1.ebuild +++ b/dev-python/matplotlib/matplotlib-3.2.1.ebuild @@ -7,31 +7,24 @@ PYTHON_COMPAT=( python3_{6,7,8} ) PYTHON_REQ_USE='tk?,threads(+)' DISTUTILS_USE_SETUPTOOLS=bdepend - inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix DESCRIPTION="Pure python plotting library with matlab like syntax" HOMEPAGE="https://matplotlib.org/"; SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" -SLOT="0" # Main license: matplotlib # Some modules: BSD # matplotlib/backends/qt4_editor: MIT # Fonts: BitstreamVera, OFL-1.1 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1" +SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" IUSE="cairo doc excel examples gtk3 latex qt5 tk wxwidgets" - -REQUIRED_USE=" - test? ( - cairo latex qt5 tk wxwidgets gtk3 - ) -" +REQUIRED_USE="test? ( cairo gtk3 latex qt5 tk )" # internal copy of pycxx highly patched # dev-python/pycxx - RDEPEND=" >=dev-python/cycler-0.10.0-r1[${PYTHON_USEDEP}] >=dev-python/kiwisolver-1.2.0[${PYTHON_USEDEP}] @@ -176,6 +169,8 @@ python_configure() { tests = $(usex test True False) [gui_support] agg = True + gtk = False + gtkagg = False pyside = False pysideagg = False qt4 = False @@ -184,6 +179,7 @@ python_configure() { $(use_setup gtk3) $(use_setup qt5) $(use_setup tk) + $(use_setup wxwidgets wx) EOF if use gtk3 && use cairo; then @@ -191,20 +187,6 @@ python_configure() { else echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die fi - - if python_is_python3; then - cat >> "${BUILD_DIR}"/setup.cfg <<- EOF || die - gtk = False - gtkagg = False - wx = False - wxagg = False - EOF - else - cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die - $(use_setup gtk2 gtk) - $(use_setup wxwidgets wx) - EOF - fi } wrap_setup() {
