From 06015eb806b553ac05242d20038241bc01076b52 Mon Sep 17 00:00:00 2001
From: Justin Lecher <jlec@gentoo.org>
Date: Thu, 15 Oct 2015 14:13:31 +0200
Subject: [PATCH] dev-python/matplotlib: Correct all deps so that py 2 and 3
 are handled

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=456704

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher <jlec@gentoo.org>
---
 dev-python/matplotlib/matplotlib-1.4.3.ebuild | 9 ++++++---
 dev-python/matplotlib/matplotlib-9999.ebuild  | 9 ++++++---
 dev-python/matplotlib/metadata.xml            | 2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/dev-python/matplotlib/matplotlib-1.4.3.ebuild b/dev-python/matplotlib/matplotlib-1.4.3.ebuild
index df777aa8c329..f7b41564e7a4 100644
--- a/dev-python/matplotlib/matplotlib-1.4.3.ebuild
+++ b/dev-python/matplotlib/matplotlib-1.4.3.ebuild
@@ -51,7 +51,7 @@ DEPEND="${COMMON_DEPEND}
 		virtual/python-imaging[${PYTHON_USEDEP}]
 		dev-python/ipython[${PYTHON_USEDEP}]
 		dev-python/numpydoc[${PYTHON_USEDEP}]
-		dev-python/xlwt[${PY2_USEDEP}]
+		dev-python/xlwt[${PYTHON_USEDEP}]
 		dev-python/sphinx[${PYTHON_USEDEP}]
 		dev-texlive/texlive-latexextra
 		dev-texlive/texlive-fontsrecommended
@@ -71,8 +71,11 @@ RDEPEND="${COMMON_DEPEND}
 			dev-python/cairocffi[${PYTHON_USEDEP}]
 			)
 		)
-	excel? ( dev-python/xlwt[${PY2_USEDEP}] )
-	fltk? ( dev-python/pyfltk[${PY2_USEDEP}] )
+	excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
+	fltk? (
+		$(python_gen_cond_dep 'dev-python/pyfltk[${PYTHON_USEDEP}]' python2_7)
+		$(python_gen_cond_dep 'dev-python/pyfltk[${PYTHON_USEDEP}]' 'python3*')
+		)
 	gtk3? (
 		dev-python/pygobject:3[${PYTHON_USEDEP}]
 		x11-libs/gtk+:3[introspection] )
diff --git a/dev-python/matplotlib/matplotlib-9999.ebuild b/dev-python/matplotlib/matplotlib-9999.ebuild
index b5d52ac66b29..bcdd269a6b6b 100644
--- a/dev-python/matplotlib/matplotlib-9999.ebuild
+++ b/dev-python/matplotlib/matplotlib-9999.ebuild
@@ -52,7 +52,7 @@ DEPEND="${COMMON_DEPEND}
 		virtual/python-imaging[${PYTHON_USEDEP}]
 		dev-python/ipython[${PYTHON_USEDEP}]
 		dev-python/numpydoc[${PYTHON_USEDEP}]
-		dev-python/xlwt[${PY2_USEDEP}]
+		dev-python/xlwt[${PYTHON_USEDEP}]
 		dev-python/sphinx[${PYTHON_USEDEP}]
 		dev-texlive/texlive-latexextra
 		dev-texlive/texlive-fontsrecommended
@@ -72,8 +72,11 @@ RDEPEND="${COMMON_DEPEND}
 			dev-python/cairocffi[${PYTHON_USEDEP}]
 			)
 		)
-	excel? ( dev-python/xlwt[${PY2_USEDEP}] )
-	fltk? ( dev-python/pyfltk[${PY2_USEDEP}] )
+	excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
+	fltk? (
+		$(python_gen_cond_dep 'dev-python/pyfltk[${PYTHON_USEDEP}]' python2_7)
+		$(python_gen_cond_dep 'dev-python/pyfltk[${PYTHON_USEDEP}]' 'python3*')
+		)
 	gtk3? (
 		dev-python/pygobject:3[${PYTHON_USEDEP}]
 		x11-libs/gtk+:3[introspection] )
diff --git a/dev-python/matplotlib/metadata.xml b/dev-python/matplotlib/metadata.xml
index 67727391d340..385b78482e13 100644
--- a/dev-python/matplotlib/metadata.xml
+++ b/dev-python/matplotlib/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>
-- 
2.26.2