diff --git a/dev-ada/gprbuild/gprbuild-25.0.0-r1.ebuild b/dev-ada/gprbuild/gprbuild-25.0.0-r2.ebuild
similarity index 82%
rename from dev-ada/gprbuild/gprbuild-25.0.0-r1.ebuild
rename to dev-ada/gprbuild/gprbuild-25.0.0-r2.ebuild
index 82f8651e0b1a1..e4b4ece9db503 100644
--- a/dev-ada/gprbuild/gprbuild-25.0.0-r1.ebuild
+++ b/dev-ada/gprbuild/gprbuild-25.0.0-r2.ebuild
@@ -4,8 +4,8 @@
 EAPI=8
 
 ADA_COMPAT=( gnat_2021 gcc_12 gcc_13 gcc_14 )
-
-inherit ada multiprocessing
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+inherit ada python-any-r1 multiprocessing
 
 XMLADA=xmlada-${PV}
 
@@ -24,11 +24,24 @@ IUSE="doc"
 DEPEND="${ADA_DEPS}
 	dev-ada/gprconfig_kb[${ADA_USEDEP}]"
 RDEPEND="${DEPEND}"
-BDEPEND="doc? ( dev-python/sphinx )"
+BDEPEND="doc? (
+	$(python_gen_any_dep '
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	')
+)"
 
 REQUIRED_USE="${ADA_REQUIRED_USE}"
 PATCHES=( "${FILESDIR}"/${PN}-22.0.0-gentoo.patch )
 
+python_check_deps() {
+	python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+	ada_pkg_setup
+}
+
 src_prepare() {
 	default
 	sed -i \
@@ -62,12 +75,7 @@ src_compile() {
 		gnatmake -j$(makeopts_jobs) ${inc_flags} ${lib} $ADAFLAGS \
 			-largs ${LDFLAGS} gpr_imports.o || die
 	done
-	if use doc; then
-		emake -C doc txt
-		emake -C doc info
-		emake -C doc html
-		emake -C doc pdf
-	fi
+	use doc && emake -C doc html
 }
 
 src_install() {
@@ -76,12 +84,7 @@ src_install() {
 	doexe ${lib_progs}
 	insinto /usr/share/gpr
 	doins share/_default.gpr
-	local HTML_DOCS=
 	local DOCS=README.md
-	if use doc; then
-		DOCS+=" examples doc/txt/gprbuild_ug.txt doc/pdf/gprbuild_ug.pdf"
-		HTML_DOCS+="doc/html/*"
-		doinfo doc/info/gprbuild_ug.info
-	fi
+	use doc && HTML_DOCS="doc/html/*"
 	einstalldocs
 }