5 files changed, 86 insertions, 32 deletions
diff --git a/dev-python/breathe/Manifest b/dev-python/breathe/Manifest
index bb5e5c3b6373..a14e4d4d735f 100644
--- a/dev-python/breathe/Manifest
+++ b/dev-python/breathe/Manifest
@@ -1 +1 @@
-DIST breathe-4.14.1.tar.gz 69369 BLAKE2B 93c394d7174aff8e8e8b1c95435d88c5f344ea1a26f46e9ef6ea8e7457bb9650d0cce96d03bc5c23e58704e3dcda3228ef1a61b16cd9ab45b07c2f1989eea88f SHA512 7247aae71c8e3e2491b76e6a5889fd9b97100e921e8c724c26e6c75b904c4e5dca825ae824b015f156960d5afbbf622b29535a46261c7fa0c24dd52deb46d096
+DIST breathe-4.35.0.gh.tar.gz 212932 BLAKE2B 9423cc99cd1dc45fa1c93f1e2adfe59be4f3398842d3c6f98ee7a17285e108de4eb88e149c4ee179fa1008e30b69c8fa4f3934506aa53892c2eb612fa7652ba3 SHA512 76e36fceb89c21e2c62471a37b856f8e7077f946ca8ebffdd068297d7d447ba4f42f8f9d91e231f7a181d7dba2cb8650479f35f8bef342184e5ccbd3dd951f91
diff --git a/dev-python/breathe/breathe-4.14.1.ebuild b/dev-python/breathe/breathe-4.14.1.ebuild
deleted file mode 100644
index d98d50a6d7fc..000000000000
--- a/dev-python/breathe/breathe-4.14.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx Doxygen renderer"
-HOMEPAGE="https://breathe.readthedocs.io/en/latest/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-doc/doxygen
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-texlive/texlive-bibtexextra
-	dev-texlive/texlive-fontsextra
-	dev-texlive/texlive-fontutils
-	dev-texlive/texlive-latex
-	dev-texlive/texlive-latexextra
-"
diff --git a/dev-python/breathe/breathe-4.35.0-r1.ebuild b/dev-python/breathe/breathe-4.35.0-r1.ebuild
new file mode 100644
index 000000000000..16719afdb406
--- /dev/null
+++ b/dev-python/breathe/breathe-4.35.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx Doxygen renderer"
+HOMEPAGE="
+	https://breathe.readthedocs.io/en/latest/
+	https://github.com/breathe-doc/breathe/
+	https://pypi.org/project/breathe/
+"
+SRC_URI="
+	https://github.com/breathe-doc/breathe/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	app-text/doxygen
+	dev-python/docutils[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-4.0.0[${PYTHON_USEDEP}]
+	dev-texlive/texlive-bibtexextra
+	dev-texlive/texlive-fontsextra
+	dev-texlive/texlive-fontutils
+	dev-texlive/texlive-latex
+	dev-texlive/texlive-latexextra
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	# https://github.com/breathe-doc/breathe/pull/956
+	"${FILESDIR}/${P}-sphinx-7.2.patch"
+)
diff --git a/dev-python/breathe/files/breathe-4.35.0-sphinx-7.2.patch b/dev-python/breathe/files/breathe-4.35.0-sphinx-7.2.patch
new file mode 100644
index 000000000000..b81eddc6a6e3
--- /dev/null
+++ b/dev-python/breathe/files/breathe-4.35.0-sphinx-7.2.patch
@@ -0,0 +1,40 @@
+From 46abd77157a2a57e81586e4f8765ae8f1a09d167 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Mark=C3=A9ta?= <meggy.calabkova@gmail.com>
+Date: Wed, 4 Oct 2023 15:53:59 +0200
+Subject: [PATCH] support Sphinx 7.2
+
+---
+ breathe/project.py     | 2 +-
+ tests/test_renderer.py | 6 +++++-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/breathe/project.py b/breathe/project.py
+index 865236e8..9716cb59 100644
+--- a/breathe/project.py
++++ b/breathe/project.py
+@@ -113,7 +113,7 @@ def __init__(self, app: Sphinx):
+         # Assume general build directory is the doctree directory without the last component.
+         # We strip off any trailing slashes so that dirname correctly drops the last part.
+         # This can be overridden with the breathe_build_directory config variable
+-        self._default_build_dir = os.path.dirname(app.doctreedir.rstrip(os.sep))
++        self._default_build_dir = app.doctreedir.parent
+         self.project_count = 0
+         self.project_info_store: Dict[str, ProjectInfo] = {}
+         self.project_info_for_auto_store: Dict[str, AutoProjectInfo] = {}
+diff --git a/tests/test_renderer.py b/tests/test_renderer.py
+index a858c65d..73a29e4e 100644
+--- a/tests/test_renderer.py
++++ b/tests/test_renderer.py
+@@ -35,7 +35,11 @@ def app(test_params, app_params, make_app, shared_result):
+     """
+     args, kwargs = app_params
+     assert "srcdir" in kwargs
+-    kwargs["srcdir"].makedirs(exist_ok=True)
++    try:
++        kwargs["srcdir"].mkdir(parents=True, exist_ok=True)
++    except AttributeError:
++        # old version of Sphinx
++        kwargs["srcdir"].makedirs(exist_ok=True)
+     (kwargs["srcdir"] / "conf.py").write_text("")
+     app_ = make_app(*args, **kwargs)
+     yield app_
diff --git a/dev-python/breathe/metadata.xml b/dev-python/breathe/metadata.xml
index c4975d2a8a68..8348e294cac4 100644
--- a/dev-python/breathe/metadata.xml
+++ b/dev-python/breathe/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>python@gentoo.org</email>
@@ -13,8 +13,9 @@
     like support for people who enjoy using Sphinx but work with languages
     other than Python. The system relies on the Doxygen’s xml output.
   </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">breathe</remote-id>
-    <remote-id type="github">michaeljones/breathe</remote-id>
+    <remote-id type="github">breathe-doc/breathe</remote-id>
   </upstream>
 </pkgmetadata>