From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 2964858973 for ; Mon, 25 Jan 2016 08:31:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DEBE8E08D1; Mon, 25 Jan 2016 08:31:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3B38FE08D0 for ; Mon, 25 Jan 2016 08:31:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F094433BEF8 for ; Mon, 25 Jan 2016 08:31:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1FF6A1069 for ; Mon, 25 Jan 2016 08:31:02 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1453708009.e76eb6f17968c523b546fc42d2f50e6e4102ca53.jlec@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/matplotlib/files/, dev-python/matplotlib/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/matplotlib/files/matplotlib-1.5.1-sphinx-1.4.3-backport.patch dev-python/matplotlib/matplotlib-1.5.1.ebuild X-VCS-Directories: dev-python/matplotlib/ dev-python/matplotlib/files/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: e76eb6f17968c523b546fc42d2f50e6e4102ca53 X-VCS-Branch: master Date: Mon, 25 Jan 2016 08:31:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8fac5f9e-6e0c-4ddd-9ab8-b5430c6011da X-Archives-Hash: 1a9fb12d58c5ae48cffdd747f55ef674 commit: e76eb6f17968c523b546fc42d2f50e6e4102ca53 Author: Justin Lecher gentoo org> AuthorDate: Mon Jan 25 07:46:49 2016 +0000 Commit: Justin Lecher gentoo org> CommitDate: Mon Jan 25 07:46:49 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e76eb6f1 dev-python/matplotlib: Backport patch for problems with sphinx-1.3.4 Package-Manager: portage-2.2.27 Signed-off-by: Justin Lecher gentoo.org> .../matplotlib-1.5.1-sphinx-1.4.3-backport.patch | 58 ++++++++++++++++++++++ dev-python/matplotlib/matplotlib-1.5.1.ebuild | 2 +- 2 files changed, 59 insertions(+), 1 deletion(-) diff --git a/dev-python/matplotlib/files/matplotlib-1.5.1-sphinx-1.4.3-backport.patch b/dev-python/matplotlib/files/matplotlib-1.5.1-sphinx-1.4.3-backport.patch new file mode 100644 index 0000000..19c111d --- /dev/null +++ b/dev-python/matplotlib/files/matplotlib-1.5.1-sphinx-1.4.3-backport.patch @@ -0,0 +1,58 @@ +From b7dfa4fa7a69d091dac0ead295d28422c4e33b45 Mon Sep 17 00:00:00 2001 +From: Thomas A Caswell +Date: Sun, 24 Jan 2016 13:05:18 -0500 +Subject: [PATCH] Merge pull request #5872 from jenshnielsen/sphinx134 + +DOC: Fix issue with Sphinx 1.3.4 + +Discarded changes to .travis.yml from #5872 +--- + lib/matplotlib/dviread.py | 2 +- + lib/matplotlib/patches.py | 18 ++++++++++++------ + 2 files changed, 13 insertions(+), 7 deletions(-) + +diff --git a/lib/matplotlib/dviread.py b/lib/matplotlib/dviread.py +index db6e976..1141f6a 100644 +--- a/lib/matplotlib/dviread.py ++++ b/lib/matplotlib/dviread.py +@@ -841,7 +841,7 @@ def find_tex_file(filename, format=None): + """ + Call :program:`kpsewhich` to find a file in the texmf tree. If + *format* is not None, it is used as the value for the +- :option:`--format` option. ++ `--format` option. + + Apparently most existing TeX distributions on Unix-like systems + use kpathsea. I hear MikTeX (a popular distribution on Windows) +diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py +index b8b7363..917eca7 100644 +--- a/lib/matplotlib/patches.py ++++ b/lib/matplotlib/patches.py +@@ -2992,15 +2992,21 @@ class Bar(_Base): + + def __init__(self, armA=0., armB=0., fraction=0.3, angle=None): + """ +- *armA* : minimum length of armA ++ Parameters ++ ---------- ++ armA : float ++ minimum length of armA + +- *armB* : minimum length of armB ++ armB : float ++ minimum length of armB + +- *fraction* : a fraction of the distance between two points that +- will be added to armA and armB. ++ fraction : float ++ a fraction of the distance between two points that ++ will be added to armA and armB. + +- *angle* : angle of the connecting line (if None, parallel to A +- and B) ++ angle : float or None ++ angle of the connecting line (if None, parallel ++ to A and B) + """ + self.armA = armA + self.armB = armB diff --git a/dev-python/matplotlib/matplotlib-1.5.1.ebuild b/dev-python/matplotlib/matplotlib-1.5.1.ebuild index 904233a..3635965 100644 --- a/dev-python/matplotlib/matplotlib-1.5.1.ebuild +++ b/dev-python/matplotlib/matplotlib-1.5.1.ebuild @@ -74,7 +74,6 @@ DEPEND="${COMMON_DEPEND} dev-python/mock[${PY2_USEDEP}] dev-python/numpydoc[${PYTHON_USEDEP}] dev-python/sphinx[${PYTHON_USEDEP}] - !~dev-python/sphinx-1.3.4 dev-python/xlwt[${PYTHON_USEDEP}] dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended @@ -112,6 +111,7 @@ RDEPEND="${COMMON_DEPEND} DISTUTILS_IN_SOURCE_BUILD=1 PATCHES=( + "${FILESDIR}"/${P}-sphinx-1.4.3-backport.patch "${FILESDIR}"/${P}-test-fix-backport.patch "${FILESDIR}"/${P}-test-fix-backport-2.patch )