gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-07-25 08:58:27 -07:00
Code Issues Projects Releases Wiki Activity

dev-python/matplotlib: Drop REQUIRED_USE="test? ( wxwidgets )" condition

Browse Source 
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@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
2020-06-06 23:29:23 +02:00
parent a500108e0f
commit d2fa99e407
2 changed files with 14 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
dev-python/matplotlib/matplotlib-3.1.2.ebuild
View File

@@ -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"
REQUIRED_USE="test? ( cairo gtk3 latex qt5 tk )"
RESTRICT="!test? ( test )"
REQUIRED_USE="
test? (
cairo latex qt5 tk wxwidgets gtk3
)"
# 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() {

28
dev-python/matplotlib/matplotlib-3.2.1.ebuild
View File

@@ -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() {