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

dev-libs/mongo-c-driver: 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/mongo-c-driver/files/mongo-c-driver-1.16.2-sphinx.patch b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.16.2-sphinx.patch
new file mode 100644
index 000000000000..7a165b61c59a
--- /dev/null
+++ b/dev-libs/mongo-c-driver/files/mongo-c-driver-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/mongo-c-driver/mongo-c-driver-1.16.2.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.16.2.ebuild
index 66adfafad3a1..e5f55ceb6252 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.16.2.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.16.2.ebuild
@@ -41,6 +41,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.14.0-no-docs.patch"
 	"${FILESDIR}/${PN}-1.16.2-enable-tests.patch" # enable tests with system libbson
 	"${FILESDIR}/${PN}-1.16.2-single-doc-job.patch"
+	"${FILESDIR}/${PN}-1.16.2-sphinx.patch"
 )
 
 src_prepare() {