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

dev-python/matplotlib: Drop IUSE="gtk2"

Browse Source 
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 <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
2020-06-05 13:25:28 +02:00
parent e248fc47ab
commit 0bc07f9928
3 changed files with 14 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild
View File

@@ -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

21
dev-python/matplotlib/matplotlib-2.2.4.ebuild
View File

@@ -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

1
dev-python/matplotlib/metadata.xml
View File

@@ -17,7 +17,6 @@
</longdescription>
<use>
<flag name="excel">Pull <pkg>dev-python/xlwt</pkg> for the exceltools toolkit</flag>
<flag name="gtk2">Enable <pkg>x11-libs/gtk+</pkg>:2 support</flag>
<flag name="gtk3">Enable <pkg>x11-libs/gtk+</pkg>:3 support</flag>
</use>
<upstream>