summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2020-04-21 19:23:18 +0200
committerThomas Deutschmann <whissi@gentoo.org>2020-04-21 19:26:34 +0200
commitee4d32392fd1c0b32eef9c0b6d72baaadfa0de08 (patch)
tree68f0c7bb03cecae36450c228407b010fed78631a /dev-libs/libbson
parentnet-misc/bridge-utils: fix hardcoded ar (diff)
downloadgentoo-ee4d32392fd1c0b32eef9c0b6d72baaadfa0de08.tar.gz
gentoo-ee4d32392fd1c0b32eef9c0b6d72baaadfa0de08.tar.bz2
gentoo-ee4d32392fd1c0b32eef9c0b6d72baaadfa0de08.zip
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>
Diffstat (limited to 'dev-libs/libbson')
-rw-r--r--dev-libs/libbson/files/libbson-1.16.2-sphinx.patch19
-rw-r--r--dev-libs/libbson/libbson-1.16.2.ebuild1
2 files changed, 20 insertions, 0 deletions
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}"