gentoo auto-resync : 02:02:2025 - 22:43:16

5 files changed, 83 insertions, 53 deletions

diff --git a/dev-ada/gnatdoc/Manifest b/dev-ada/gnatdoc/Manifest
index a9d4d3f421a2..99ee57627b9d 100644
--- a/dev-ada/gnatdoc/Manifest
+++ b/dev-ada/gnatdoc/Manifest
@@ -1,5 +1,5 @@
-DIST gnatdoc-23.0.0.tar.gz 39607 BLAKE2B 589b3f0a9af9d5067e2017083f834697f7e1995c76be3a84e24409261ec058cd8b1e2487bd78d03d36b6ccab68ec0b294534726f3171b4080ed1d569d0c23be7 SHA512 0e9095ced08086a3be03e20b49ddb436d4efb396001e9d6877b0612adc3d8e2a08f1d5146d07c9acf5dc59a73418f7a3ec3231aba63c9644e6829c387703e6ae
 DIST gnatdoc-24.0.0.tar.gz 113089 BLAKE2B e26310504863b8b88391c715a1ecbc9657bd03c6bd4f9b6b67b20f2a5d00f8a9ed3dd537409538999eeeb893e407da552bd02ed05b8b6c3f655f57ac55e616b9 SHA512 95b33fc556ba25611faca6b64a5599b98471bf687d13f10727300c62305cd45585d59ea77a7c64d33619e324508951624a0855535464a6b9b5c6dd27d2a56f83
-EBUILD gnatdoc-23.0.0-r2.ebuild 1484 BLAKE2B cabbdffa2586b7d3f54fa675c57a664f1187df0e17bb15adb12ced7ce0133ed38446f2f1174ae8aa0e6ccc6d843ff21af8bfdae22dfc79436e3fbc1e034f72f9 SHA512 df1235f08da9d69e13abf87cd3a61af62ae2638012a623ea39463db59fc47976bf1013a8ea4df90e708ff5be74f713fa65131ab0eced3d9c8cab860e9d76498f
-EBUILD gnatdoc-24.0.0.ebuild 1510 BLAKE2B 5a301aaf438abf4e4a12e7cc888d2d35634c6a654c8a1ab720cc4cfd47ea3e365ff55c002495a19c9a7960891a108fc607c60d4b8ebb9a26dca179236448c5f9 SHA512 80014500d2f076f104c705c47169cbdf1a1710a41960836756db4760863873aa00d4c5a8e698d4b9dbd307af2361fcb5cc6d1156295b5c9eb93544fb386c79d0
-MISC metadata.xml 296 BLAKE2B 4cb07a7a3239fdd3c318b261bca306066e1488dab6f3c0f32bcbbc434d3b584e230a9fa1159e4f1d056ae4cf886cc11425ca2648322b17748b09dccde17927be SHA512 04e74f766efbd81ac7ff2d33932f436f4546074c2b31dc95034fa94a94d5ac6e427b0775a7ea77771d347f571591ca908f80a00657be6801bc40dd69c96ddbc6
+DIST gnatdoc-25.0.0.tar.gz 179534 BLAKE2B c3441f91eec0cbbf87602a9c4c650cc651982668ef212810e3fc037f9389f939c5e6831ba6d57abdd66e91b3d17fe76916b99dfcd3c91a7a9f7e44fb1ea467fa SHA512 64814a48dfda70c9de7590061fb20960f99e07d9b9eadf4a5d97dd56e68fcb133a4d51f1c9c6d3c1f29d4c5bc2e7565e02305ed16968e4e37a42fd5374466ef3
+EBUILD gnatdoc-24.0.0.ebuild 1516 BLAKE2B 73d93049c9bda46d1042773dba3a5ef7e16ba4d21c0082284cdbeac09dee9ab476d7598b32161cda6817af806b1d5e3e4fd161dd367bc1a421e285674f52f18e SHA512 6ffc6441fd332224876af0aaa3ab51475e115fd74c8ae4df66dc4c22653333f323695e7bf9f00b99a03ed021fa91fbf38a94eabbfa3ef2bad71de433f9186cfa
+EBUILD gnatdoc-25.0.0.ebuild 1947 BLAKE2B 3bbb09b2ca15725104463e20ca30f7629559ba19e04b9c5aefe1e8745da3cd67ca4b7fd9b1daf25e395ade47f5c3165ab0e7f1c1d95ac3d7fee29e463ad3450d SHA512 5e631d474d92459be06798e8efb4a2328f1b89457f3fc9de57536c490f77cf2c08e5223704e11a3b53cf7ad2392ab4cd774056ae959e48f826ea16e593322d2d
+MISC metadata.xml 379 BLAKE2B 1b1d66704d200e15a48cbbb2be57ec97582b96c73cd531b2319391b8ee62faee5a84d8a2b43f808af84ee520fd499e84a6e0559fc66b45ec082dffe562348bbd SHA512 3d211ccb06695365b74f911bbf48561a999d05d196a198a2e3dc7b840039b6e666cdaa97a32f12d8abf67c23616fb3d29d9b302a73d1724fe86ff518740ff0af
diff --git a/dev-ada/gnatdoc/gnatdoc-23.0.0-r2.ebuild b/dev-ada/gnatdoc/gnatdoc-23.0.0-r2.ebuild
deleted file mode 100644
index 1826c53d9629..000000000000
--- a/dev-ada/gnatdoc/gnatdoc-23.0.0-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ADA_COMPAT=( gnat_2021 gcc_12 gcc_13 )
-inherit ada multiprocessing
-
-DESCRIPTION="GNAT Documentation Generation Tool"
-HOMEPAGE="https://github.com/AdaCore/gnatdoc"
-SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="${ADA_DEPS}
-	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/gpr[${ADA_USEDEP},shared,static-libs]
-	dev-ada/gpr-unit-provider[${ADA_USEDEP},shared,static-libs]
-	dev-ada/langkit[${ADA_USEDEP},shared,static-libs,static-pic]
-	dev-ada/libadalang[${ADA_USEDEP},static-libs,static-pic]
-	dev-ada/libgpr[${ADA_USEDEP},shared,static-libs,static-pic]
-	dev-ada/markdown[${ADA_USEDEP}]
-	dev-ada/VSS[${ADA_USEDEP}]
-	dev-ada/xmlada[${ADA_USEDEP},shared,static-libs,static-pic]"
-DEPEND="${RDEPEND}"
-BDEPEND=""
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-src_compile() {
-	gprbuild -v -j$(makeopts_jobs) -p -P gnat/libgnatdoc.gpr \
-		-XLIBRARY_TYPE=relocatable || die
-	gprbuild -v -j$(makeopts_jobs) -p -P gnat/gnatdoc.gpr \
-		-XLIBRARY_TYPE=static || die
-}
-
-src_install() {
-	gprinstall -v -p -P gnat/libgnatdoc.gpr \
-		-XLIBRARY_TYPE=relocatable --prefix="${D}"/usr || die
-	gprinstall -v -p -P gnat/gnatdoc.gpr \
-		-XLIBRARY_TYPE=relocatable --prefix="${D}"/usr || die
-}
diff --git a/dev-ada/gnatdoc/gnatdoc-24.0.0.ebuild b/dev-ada/gnatdoc/gnatdoc-24.0.0.ebuild
index 221c863b5cf1..f872d8cbbe7e 100644
--- a/dev-ada/gnatdoc/gnatdoc-24.0.0.ebuild
+++ b/dev-ada/gnatdoc/gnatdoc-24.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,11 +17,11 @@ KEYWORDS="~amd64 ~x86"
 RESTRICT="test"
 
 RDEPEND="${ADA_DEPS}
-	dev-ada/gnatcoll-bindings[${ADA_USEDEP},gmp,iconv,shared,static-libs,static-pic]
+	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/gpr[${ADA_USEDEP},shared,static-libs]
 	dev-ada/gpr-unit-provider[${ADA_USEDEP},shared,static-libs]
-	dev-ada/langkit[${ADA_USEDEP},shared,static-libs,static-pic]
+	dev-ada/langkit[${ADA_USEDEP},shared(+),static-libs,static-pic]
 	dev-ada/libadalang[${ADA_USEDEP},static-libs,static-pic]
 	dev-ada/libgpr[${ADA_USEDEP},shared,static-libs,static-pic]
 	dev-ada/markdown[${ADA_USEDEP}]
diff --git a/dev-ada/gnatdoc/gnatdoc-25.0.0.ebuild b/dev-ada/gnatdoc/gnatdoc-25.0.0.ebuild
new file mode 100644
index 000000000000..347799ade291
--- /dev/null
+++ b/dev-ada/gnatdoc/gnatdoc-25.0.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..13} )
+ADA_COMPAT=( gcc_12 gcc_13 gcc_14 )
+
+inherit ada python-single-r1 multiprocessing
+
+DESCRIPTION="GNAT Documentation Generation Tool"
+HOMEPAGE="https://github.com/AdaCore/gnatdoc"
+SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	${ADA_REQUIRED_USE}"
+IUSE="doc static-libs static-pic"
+
+RDEPEND="${ADA_DEPS}
+	${PYTHON_DEPS}
+	dev-ada/gpr:=[${ADA_USEDEP},shared,static-libs?]
+	dev-ada/markdown:=[${ADA_USEDEP}]
+	>=dev-ada/VSS-24.0.0:=[${ADA_USEDEP},static-libs?]
+	dev-ada/libadalang:=[${ADA_USEDEP},static-libs?,static-pic?]
+	dev-ada/libadalang:=[${PYTHON_SINGLE_USEDEP}]
+"
+BDEPEND="dev-ada/gprbuild[${ADA_USEDEP}]"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ada_pkg_setup
+}
+
+src_compile() {
+	build() {
+		gprbuild -v -j$(makeopts_jobs) -p -P gnat/libgnatdoc.gpr \
+			-XLIBRARY_TYPE=$1 -cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} \
+			|| die
+	}
+	build relocatable
+	use static-libs && build static
+	use static-pic  && build static-pic
+	gprbuild -v -j$(makeopts_jobs) -p -P gnat/gnatdoc.gpr \
+		-XLIBRARY_TYPE=relocatable || die
+	if use doc; then
+		emake -C documentation/users_guide html
+	fi
+}
+
+src_test() {
+	gprbuild -v -j$(makeopts_jobs) -p -P gnat/tests/test_drivers.gpr \
+		-XLIBRARY_TYPE=relocatable || die
+	PATH="${S}/bin:$PATH" \
+		${EPYTHON} testsuite/testsuite.py || die
+}
+
+src_install() {
+	build() {
+		gprinstall -v -p -P gnat/libgnatdoc.gpr \
+			-XLIBRARY_TYPE=$1 --prefix="${D}"/usr || die
+	}
+	build relocatable
+	use static-libs && build static
+	use static-pic  && build static-pic
+	gprinstall -v -p -P gnat/gnatdoc.gpr \
+		-XLIBRARY_TYPE=relocatable --prefix="${D}"/usr || die
+	use doc && HTML_DOCS=( documentation/users_guide/_build/html/* )
+	einstalldocs
+}
diff --git a/dev-ada/gnatdoc/metadata.xml b/dev-ada/gnatdoc/metadata.xml
index 3e71b8715df6..93866dd27028 100644
--- a/dev-ada/gnatdoc/metadata.xml
+++ b/dev-ada/gnatdoc/metadata.xml
@@ -4,6 +4,9 @@
 	<maintainer type="project">
 		<email>ada@gentoo.org</email>
 	</maintainer>
+	<use>
+		<flag name="static-pic">Build static library with pic code</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">AdaCore/gnatdoc</remote-id>
 	</upstream>