| 1 |
commit: c956035180c107d600413210079654c3c4192712 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Aug 1 09:45:56 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 1 23:19:37 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9560351 |
| 7 |
|
| 8 |
dev-python/matplotlib: Drop IUSE="qt5" |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.1, Repoman-2.3.23 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild | 10 +++++----- |
| 14 |
dev-python/matplotlib/matplotlib-2.2.4.ebuild | 10 +++++----- |
| 15 |
2 files changed, 10 insertions(+), 10 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild b/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild |
| 18 |
index 9503034ec4c..6732f35082a 100644 |
| 19 |
--- a/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild |
| 20 |
+++ b/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild |
| 21 |
@@ -19,7 +19,7 @@ SLOT="0" |
| 22 |
# Fonts: BitstreamVera, OFL-1.1 |
| 23 |
LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1" |
| 24 |
KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86" |
| 25 |
-IUSE="cairo doc excel examples gtk3 latex qt5 test tk wxwidgets" |
| 26 |
+IUSE="cairo doc excel examples gtk3 latex test tk wxwidgets" |
| 27 |
RESTRICT="!test? ( test )" |
| 28 |
|
| 29 |
PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )" |
| 30 |
@@ -27,7 +27,7 @@ REQUIRED_USE=" |
| 31 |
doc? ( ${PY2_FLAGS} ) |
| 32 |
excel? ( ${PY2_FLAGS} ) |
| 33 |
wxwidgets? ( ${PY2_FLAGS} ) |
| 34 |
- test? ( cairo gtk3 latex qt5 tk wxwidgets )" |
| 35 |
+ test? ( cairo gtk3 latex tk wxwidgets )" |
| 36 |
|
| 37 |
# #456704 -- a lot of py2-only deps |
| 38 |
PY2_USEDEP=$(python_gen_usedep python2_7) |
| 39 |
@@ -94,8 +94,7 @@ RDEPEND="${COMMON_DEPEND} |
| 40 |
dev-texlive/texlive-fontsrecommended |
| 41 |
dev-texlive/texlive-latexextra |
| 42 |
dev-texlive/texlive-xetex |
| 43 |
- ) |
| 44 |
- qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )" |
| 45 |
+ )" |
| 46 |
|
| 47 |
# A few C++ source files are written to srcdir. |
| 48 |
# Other than that, the ebuild shall be fit for out-of-source build. |
| 49 |
@@ -172,9 +171,10 @@ python_configure() { |
| 50 |
pysideagg = False |
| 51 |
qt4 = False |
| 52 |
qt4agg = False |
| 53 |
+ qt5 = False |
| 54 |
+ qt5agg = False |
| 55 |
$(use_setup cairo) |
| 56 |
$(use_setup gtk3) |
| 57 |
- $(use_setup qt5) |
| 58 |
$(use_setup tk) |
| 59 |
EOF |
| 60 |
|
| 61 |
|
| 62 |
diff --git a/dev-python/matplotlib/matplotlib-2.2.4.ebuild b/dev-python/matplotlib/matplotlib-2.2.4.ebuild |
| 63 |
index 824ae05fff3..d7c77f8d78f 100644 |
| 64 |
--- a/dev-python/matplotlib/matplotlib-2.2.4.ebuild |
| 65 |
+++ b/dev-python/matplotlib/matplotlib-2.2.4.ebuild |
| 66 |
@@ -19,13 +19,13 @@ SLOT="0" |
| 67 |
# Fonts: BitstreamVera, OFL-1.1 |
| 68 |
LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1" |
| 69 |
KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" |
| 70 |
-IUSE="cairo doc excel examples gtk3 latex qt5 test tk wxwidgets" |
| 71 |
+IUSE="cairo doc excel examples gtk3 latex test tk wxwidgets" |
| 72 |
RESTRICT="!test? ( test )" |
| 73 |
|
| 74 |
PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )" |
| 75 |
REQUIRED_USE=" |
| 76 |
wxwidgets? ( ${PY2_FLAGS} ) |
| 77 |
- test? ( cairo gtk3 latex qt5 tk wxwidgets )" |
| 78 |
+ test? ( cairo gtk3 latex tk wxwidgets )" |
| 79 |
|
| 80 |
# #456704 -- a lot of py2-only deps |
| 81 |
PY2_USEDEP=$(python_gen_usedep python2_7) |
| 82 |
@@ -93,8 +93,7 @@ RDEPEND="${COMMON_DEPEND} |
| 83 |
dev-texlive/texlive-fontsrecommended |
| 84 |
dev-texlive/texlive-latexextra |
| 85 |
dev-texlive/texlive-xetex |
| 86 |
- ) |
| 87 |
- qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )" |
| 88 |
+ )" |
| 89 |
|
| 90 |
# A few C++ source files are written to srcdir. |
| 91 |
# Other than that, the ebuild shall be fit for out-of-source build. |
| 92 |
@@ -174,9 +173,10 @@ python_configure() { |
| 93 |
pysideagg = False |
| 94 |
qt4 = False |
| 95 |
qt4agg = False |
| 96 |
+ qt5 = False |
| 97 |
+ qt5agg = False |
| 98 |
$(use_setup cairo) |
| 99 |
$(use_setup gtk3) |
| 100 |
- $(use_setup qt5) |
| 101 |
$(use_setup tk) |
| 102 |
EOF |
Archives