dev-python/matplotlib: Replace python_gen_usedep with python_gen_cond_dep
An upgrade attempt was made in CL:2328827, but it fails because of
reverse depedencies that want python 2* support.
BUG=chromium:1111336
TEST=emerge matplotlib
Change-Id: Ie416b97a7fe60d5a576722e67afca1b16517eb7d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/portage-stable/+/2333121
Commit-Queue: Allen Webb <allenwebb@google.com>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Allen Webb <allenwebb@google.com>
Auto-Submit: Allen Webb <allenwebb@google.com>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
diff --git a/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild b/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild
index a8950a3..1aa4da4 100644
--- a/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild
+++ b/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild
@@ -33,7 +33,6 @@
)"
# #456704 -- a lot of py2-only deps
-PY2_USEDEP=$(python_gen_usedep python2_7)
PY2_DEPEND="
$(python_gen_cond_dep 'dev-python/functools32[${PYTHON_USEDEP}]' python2_7)
$(python_gen_cond_dep 'dev-python/subprocess32[${PYTHON_USEDEP}]' python2_7)
@@ -54,8 +53,8 @@
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}] )"
+ $(python_gen_cond_dep 'dev-python/pygtk[${PYTHON_USEDEP}]' python2_7) )
+ wxwidgets? ( $(python_gen_cond_dep '>=dev-python/wxpython-2.8:*[${PYTHON_USEDEP}]' python2_7) )"
# internal copy of pycxx highly patched
# dev-python/pycxx
@@ -70,7 +69,7 @@
dev-python/colorspacious[${PYTHON_USEDEP}]
dev-python/pillow[${PYTHON_USEDEP}]
dev-python/ipython[${PYTHON_USEDEP}]
- dev-python/mock[${PY2_USEDEP}]
+ $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
dev-python/numpydoc[${PYTHON_USEDEP}]
sci-libs/scipy[${PYTHON_USEDEP}]
>=dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
diff --git a/dev-python/matplotlib/matplotlib-2.2.2-r2.ebuild b/dev-python/matplotlib/matplotlib-2.2.2-r2.ebuild
new file mode 120000
index 0000000..4df7217
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-2.2.2-r2.ebuild
@@ -0,0 +1 @@
+matplotlib-2.2.2-r1.ebuild
\ No newline at end of file