From: Thomas Deutschmann <whissi@gentoo.org>
Date: Tue, 21 Apr 2020 17:23:18 +0000 (+0200)
Subject: dev-libs/libbson: fix building against >=sphinx-3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ee4d32392fd1c0b32eef9c0b6d72baaadfa0de08;p=gentoo.git

dev-libs/libbson: fix building against >=sphinx-3

Closes: https://bugs.gentoo.org/716774
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
---

diff --git a/dev-libs/libbson/files/libbson-1.16.2-sphinx.patch b/dev-libs/libbson/files/libbson-1.16.2-sphinx.patch
new file mode 100644
index 000000000000..7a165b61c59a
--- /dev/null
+++ b/dev-libs/libbson/files/libbson-1.16.2-sphinx.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/716774
+
+--- a/build/sphinx/taglist.py
++++ b/build/sphinx/taglist.py
+@@ -24,7 +24,12 @@ THE SOFTWARE.
+ """
+ 
+ from docutils import nodes, utils
+-from sphinx.environment import NoUri
++
++try:
++    from sphinx.environment import NoUri
++except ImportError:
++    from sphinx.errors import NoUri
++
+ try:
+     from sphinx.util.compat import Directive
+ except ImportError:
+ 
diff --git a/dev-libs/libbson/libbson-1.16.2.ebuild b/dev-libs/libbson/libbson-1.16.2.ebuild
index b9aa783de3ef..6aca55220c67 100644
--- a/dev-libs/libbson/libbson-1.16.2.ebuild
+++ b/dev-libs/libbson/libbson-1.16.2.ebuild
@@ -19,6 +19,7 @@ DEPEND="dev-python/sphinx"
 PATCHES=(
 	"${FILESDIR}/${PN}-1.14.0-no-docs.patch"
 	"${FILESDIR}/${PN}-1.16.2-single-doc-job.patch"
+	"${FILESDIR}/${PN}-1.16.2-sphinx.patch"
 )
 
 S="${WORKDIR}/mongo-c-driver-${PV}"