diff --git a/dev-ada/langkit/Manifest b/dev-ada/langkit/Manifest
index fd2f0e851f70f..84afeec122208 100644
--- a/dev-ada/langkit/Manifest
+++ b/dev-ada/langkit/Manifest
@@ -1,2 +1,3 @@
+DIST AdaSAT-25.0.0.tar.gz 30707 BLAKE2B 7256fa3db93273657d52b7b895e51efa95c102753efbe498d283ef33a6bed067ddf2975e72a357483aa67b5ce7d8073d4a192e9a4741ab204ce159ec0f57b529 SHA512 7781a683c5aef9efa9a6b57e82070184c02d734fcf448aa5aa79d9aaa3b40d181d87d7487d9c204f7dcd584a3d2dc1c9ebc027e82b2532c3418c25a2395fd9af
 DIST langkit-24.0.0.tar.gz 1282265 BLAKE2B 63aa3eb05be6ea590c3f4d0478cdfa0ee217606607c73b4c172c5b89d8a2a5d815efbf2bcd23b84548ececd11ffa1f89ebcbc5d411845b7a3834d6f7e16aa0b1 SHA512 b26a83cd7e57d8821d09e5e1aeaa2fa5837ab2f3901a006cfd49b059a3cfc98d7ea236dc39a2e24365196bd45c2124396795fd46fdaf4d7cb41aabb45ff85326
 DIST langkit-25.0.0.tar.gz 1560623 BLAKE2B ef03755397e85fde9b968dced7cf6bc72e85c21b6baef41160e527840caf32e0ea573d52f66c4b82ce9fa7e2dd0120286e06a3f3525e0acad5f9f11037be29b9 SHA512 27ffecb9b6c5568ebdba4864d9c5ef7e511718083fe087e3af60cfe8cc994b6ea7353cc745bc33395d33e169aaaf6916d991fa4941774932904df3e9b455f1dc
diff --git a/dev-ada/langkit/langkit-25.0.0-r1.ebuild b/dev-ada/langkit/langkit-25.0.0-r2.ebuild
similarity index 63%
rename from dev-ada/langkit/langkit-25.0.0-r1.ebuild
rename to dev-ada/langkit/langkit-25.0.0-r2.ebuild
index ca02fb21fe896..af385c10ab09e 100644
--- a/dev-ada/langkit/langkit-25.0.0-r1.ebuild
+++ b/dev-ada/langkit/langkit-25.0.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{11..12} )
+PYTHON_COMPAT=( python3_{11..13} )
 ADA_COMPAT=( gcc_12 gcc_13 gcc_14 )
 
 DISTUTILS_USE_PEP517=setuptools
@@ -12,47 +12,51 @@ inherit distutils-r1 ada multiprocessing
 DESCRIPTION="A Python framework to generate language parsers"
 HOMEPAGE="https://www.adacore.com/community"
 SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
-	-> ${P}.tar.gz"
+	-> ${P}.tar.gz
+	https://github.com/AdaCore/AdaSAT/archive/refs/tags/v${PV}.tar.gz
+	-> AdaSAT-${PV}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+shared static-libs static-pic"
+IUSE="static-libs static-pic"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	${ADA_REQUIRED_USE}
-	|| ( shared static-libs static-pic )"
+	${ADA_REQUIRED_USE}"
 RESTRICT="test"
 
 RDEPEND="${PYTHON_DEPS}
 	${ADA_DEPS}
-	dev-ada/AdaSAT[${ADA_USEDEP},shared?,static-libs?,static-pic?]
-	dev-ada/e3-core[${PYTHON_USEDEP}]
-	dev-ada/gnatcoll-bindings:=[${ADA_USEDEP},gmp,iconv(+),shared?,static-libs?,static-pic?]
-	dev-ada/gnatcoll-core:=[${ADA_USEDEP},shared?,static-libs?,static-pic?]
-	dev-ada/prettier-ada:=[${ADA_USEDEP},shared?,static-libs?,static-pic?]
+	dev-ada/gnatcoll-bindings:=[${ADA_USEDEP},gmp,iconv(+)]
+	dev-ada/gnatcoll-bindings[shared,static-libs?,static-pic?]
+	dev-ada/gnatcoll-core:=[${ADA_USEDEP},shared,static-libs?,static-pic?]
+	dev-ada/prettier-ada:=[${ADA_USEDEP},shared,static-libs?,static-pic?]
 	dev-python/docutils[${PYTHON_USEDEP}]
 	dev-python/funcy[${PYTHON_USEDEP}]
 	dev-python/mako[${PYTHON_USEDEP}]
 	dev-python/mypy[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}
+	dev-ada/gprbuild[${ADA_USEDEP}]"
 
 distutils_enable_sphinx doc
 
+python_prepare_all() {
+	mv "${WORKDIR}"/AdaSAT-${PV} langkit/adasat || die
+	distutils-r1_python_prepare_all
+}
+
 python_compile_all() {
 	build () {
 		rm -f langkit/support/obj/dev/*lexch
 		gprbuild -v -p -j$(makeopts_jobs) \
 			-P langkit/support/langkit_support.gpr -XLIBRARY_TYPE=$1 \
-			-cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed"
+			-cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die
 	}
-	use shared      && build relocatable
+	build relocatable
 	use static-libs && build static
 	use static-pic  && build static-pic
-	if use shared; then
-		gprbuild -v -p -j$(makeopts_jobs) \
-			-P sigsegv_handler/langkit_sigsegv_handler.gpr \
-			-cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed"
-	fi
+	gprbuild -v -p -j$(makeopts_jobs) \
+		-P sigsegv_handler/langkit_sigsegv_handler.gpr \
+		-cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die
 	sphinx_compile_all
 }
 
@@ -64,9 +68,9 @@ python_install_all() {
 			--sources-subdir=include/langkit_support \
 			-XLIBRARY_TYPE=$1 --build-name=$1 || die
 	}
+	build relocatable
 	use static-libs && build static
 	use static-pic  && build static-pic
-	use shared      && build relocatable
 	gprinstall -v -P sigsegv_handler/langkit_sigsegv_handler.gpr -p \
 		--prefix="${D}"/usr || die
 	einstalldocs