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 6FA861382C5 for ; Sun, 6 Jun 2021 10:01:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6C1B6E087A; Sun, 6 Jun 2021 10:01:09 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 4D7B2E087A for ; Sun, 6 Jun 2021 10:01:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 07836335D6D for ; Sun, 6 Jun 2021 10:01:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 14530644 for ; Sun, 6 Jun 2021 10:01:06 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1622973663.014738239a0908d3bdb47240c54bf04411cdaf31.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/ghc/files/, dev-lang/ghc/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/ghc/files/ghc-8.10.4-sphinx-quote.patch dev-lang/ghc/ghc-8.10.4.ebuild X-VCS-Directories: dev-lang/ghc/ dev-lang/ghc/files/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: 014738239a0908d3bdb47240c54bf04411cdaf31 X-VCS-Branch: master Date: Sun, 6 Jun 2021 10:01:06 +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: f17b31f7-59fc-4b6d-8f9a-94b9020959be X-Archives-Hash: 70c75171421f1ff8ea49852f657d769d commit: 014738239a0908d3bdb47240c54bf04411cdaf31 Author: Sergei Trofimovich gentoo org> AuthorDate: Sun Jun 6 09:57:22 2021 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Sun Jun 6 10:01:03 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01473823 dev-lang/ghc: backport sphinx quoting fix Reported-by: Andrew Savchenko Closes: https://bugs.gentoo.org/792558 Package-Manager: Portage-3.0.19, Repoman-3.0.3 Signed-off-by: Sergei Trofimovich gentoo.org> dev-lang/ghc/files/ghc-8.10.4-sphinx-quote.patch | 27 ++++++++++++++++++++++++ dev-lang/ghc/ghc-8.10.4.ebuild | 1 + 2 files changed, 28 insertions(+) diff --git a/dev-lang/ghc/files/ghc-8.10.4-sphinx-quote.patch b/dev-lang/ghc/files/ghc-8.10.4-sphinx-quote.patch new file mode 100644 index 00000000000..e9517dbea06 --- /dev/null +++ b/dev-lang/ghc/files/ghc-8.10.4-sphinx-quote.patch @@ -0,0 +1,27 @@ +https://bugs.gentoo.org/792558 + +From 83407ffc7acc00cc025b9f6ed063add9ab9f9bcc Mon Sep 17 00:00:00 2001 +From: Krzysztof Gogolewski +Date: Fri, 25 Sep 2020 02:52:19 +0200 +Subject: [PATCH] Various documentation fixes + +* Use r'' in conf.py. This fixes a Sphinx warning: + WARNING: Support for evaluating Python 2 syntax is deprecated and will be removed in Sphinx 4.0. Convert docs/users_guide/conf.py to Python 3 syntax. +--- a/docs/users_guide/conf.py ++++ b/docs/users_guide/conf.py +@@ -100,13 +100,13 @@ htmlhelp_basename = 'GHCUsersGuide' + latex_elements = { + 'inputenc': '', + 'utf8extra': '', +- 'preamble': ''' ++ 'preamble': r''' + \usepackage{fontspec} + \usepackage{makeidx} + \setsansfont{DejaVu Sans} + \setromanfont{DejaVu Serif} + \setmonofont{DejaVu Sans Mono} +-\setlength{\\tymin}{45pt} ++\setlength{\tymin}{45pt} + ''', + } + diff --git a/dev-lang/ghc/ghc-8.10.4.ebuild b/dev-lang/ghc/ghc-8.10.4.ebuild index 3e4cfb0d0db..af942b11cd0 100644 --- a/dev-lang/ghc/ghc-8.10.4.ebuild +++ b/dev-lang/ghc/ghc-8.10.4.ebuild @@ -502,6 +502,7 @@ src_prepare() { eapply "${FILESDIR}"/${PN}-8.8.1-revert-CPP.patch eapply "${FILESDIR}"/${PN}-8.10.1-allow-cross-bootstrap.patch eapply "${FILESDIR}"/${PN}-8.10.3-C99-typo-ac270.patch + eapply "${FILESDIR}"/${PN}-8.10.4-sphinx-quote.patch # a bunch of crosscompiler patches # needs newer version: