From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 429F0138334 for ; Wed, 27 Nov 2019 00:13:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0FEACE09C3; Wed, 27 Nov 2019 00:13:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9D963E09C3 for ; Wed, 27 Nov 2019 00:13:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7518234D44F for ; Wed, 27 Nov 2019 00:13:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E5D188C5 for ; Wed, 27 Nov 2019 00:13:07 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1574813567.7de4915e9c99fba07343fc33c4bf50c85b2b7c76.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/, media-libs/vigra/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/vigra/files/vigra-1.11.1-sphinx.ext.pngmath.patch media-libs/vigra/vigra-1.11.1-r2.ebuild media-libs/vigra/vigra-9999.ebuild X-VCS-Directories: media-libs/vigra/files/ media-libs/vigra/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 7de4915e9c99fba07343fc33c4bf50c85b2b7c76 X-VCS-Branch: master Date: Wed, 27 Nov 2019 00:13:07 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7212cc88-388d-420a-8522-3bfe0b3fe55d X-Archives-Hash: 59ef966b2679578fe7b43ec37d30df99 commit: 7de4915e9c99fba07343fc33c4bf50c85b2b7c76 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Nov 26 22:23:53 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Nov 27 00:12:47 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7de4915e media-libs/vigra: Fix build with sphinx-2 See also: https://github.com/ukoethe/vigra/issues/462 Closes: https://bugs.gentoo.org/678308 Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/vigra-1.11.1-sphinx.ext.pngmath.patch | 27 ++++++++++++++++++++++ media-libs/vigra/vigra-1.11.1-r2.ebuild | 1 + media-libs/vigra/vigra-9999.ebuild | 6 ++++- 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/media-libs/vigra/files/vigra-1.11.1-sphinx.ext.pngmath.patch b/media-libs/vigra/files/vigra-1.11.1-sphinx.ext.pngmath.patch new file mode 100644 index 00000000000..fc265763f6a --- /dev/null +++ b/media-libs/vigra/files/vigra-1.11.1-sphinx.ext.pngmath.patch @@ -0,0 +1,27 @@ +Description: Replace sphinx.ext.pngmath by sphinx.ext.imgmath to build with sphinx 1.8 +Bug-Debian: https://bugs.debian.org/923467 +Author: Andreas Tille +Last-Update: Fri, 08 Mar 2019 18:38:02 +0100 + +--- a/vigranumpy/docsrc/conf.py.cmake2.in ++++ b/vigranumpy/docsrc/conf.py.cmake2.in +@@ -59,7 +59,7 @@ os.environ['PATH'] = os.pathsep.join([vi + + # Add any Sphinx extension module names here, as strings. They can be extensions + # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. +-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.pngmath'] ++extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.imgmath'] + + # Add any paths that contain templates here, relative to this directory. + templates_path = ['_templates'] +--- a/vigranumpy/docsrc/conf.py.in ++++ b/vigranumpy/docsrc/conf.py.in +@@ -58,7 +58,7 @@ os.environ['PATH'] = os.pathsep.join([vi + + # Add any Sphinx extension module names here, as strings. They can be extensions + # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. +-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.pngmath'] ++extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.imgmath'] + + # Add any paths that contain templates here, relative to this directory. + templates_path = ['_templates'] diff --git a/media-libs/vigra/vigra-1.11.1-r2.ebuild b/media-libs/vigra/vigra-1.11.1-r2.ebuild index 8f4b2b23a1c..757fe839d19 100644 --- a/media-libs/vigra/vigra-1.11.1-r2.ebuild +++ b/media-libs/vigra/vigra-1.11.1-r2.ebuild @@ -69,6 +69,7 @@ PATCHES=( "${FILESDIR}/${P}-boost-python.patch" # TODO: upstream "${FILESDIR}/${P}-lib_suffix.patch" + "${FILESDIR}/${P}-sphinx.ext.pngmath.patch" # thanks to Debian; bug 678308 ) pkg_setup() { diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild index cad2a8191a7..6d9d2266b16 100644 --- a/media-libs/vigra/vigra-9999.ebuild +++ b/media-libs/vigra/vigra-9999.ebuild @@ -64,7 +64,11 @@ RDEPEND="${PYTHON_DEPS} # Severely broken, also disabled in Fedora, bugs #390447, #653442 RESTRICT="test" -PATCHES=( "${FILESDIR}/${PN}-1.11.1-lib_suffix.patch" ) +PATCHES=( + # TODO: upstream + "${FILESDIR}/${PN}-1.11.1-lib_suffix.patch" + "${FILESDIR}/${PN}-1.11.1-sphinx.ext.pngmath.patch" # thanks to Debian; bug 678308 +) pkg_setup() { if use python || use doc; then