gentoo auto-resync : 29:12:2024 - 06:30:44

3 files changed, 17 insertions, 72 deletions

diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index 28e07e54c761..860de953f1db 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -1,9 +1,8 @@
 AUX gprbuild-22.0.0-gentoo.patch 2052 BLAKE2B dcab01dcc71bdab78ecf16796c4174401a3d1dd950fb3600b993ed8e3f9606b7bb19e0ef9e30a1e2265a2003154b6ed06de8b1da73bb3279301b21e68a58e7a0 SHA512 6266611075133e580b07044f1fa85a03918254c189d2def36e227996f377b56876085f3e3ff18b443ccb0cc1d67ee69cb478cd90403015ff4d68107870929c0d
-DIST gprbuild-23.0.0.tar.gz 952887 BLAKE2B a0de49e838dd41ca927d728dc2e7f23298bb3e7f865146ed6807e1da0f20fe9ce345d972ef93340f1a1fec91082ce14b575ad4e6642d759cb9d696602f291508 SHA512 d3b1af5295c0216eaa93e52b63ca51ceeaea324a3a3f40644e294f9048170f9294335e7e8ee2d77d99d4d9bb359267921632a01d43485d841b6e771143fb47a5
 DIST gprbuild-24.0.0.tar.gz 959615 BLAKE2B c432b1f13a1aecb8f664aeb06694d86123268f29b43a50f5c7a48d7428c0b1c16f397e5a84c097aba04c7ee34011df119b154fd546ce156c999a54d159a84afb SHA512 09da4d54f2f151e9f9453e1a459533e2373eb5d4c51831be2bf90964ebcf653752de2f8b271c77f7b599f62146516fc60258ec3c96779fa2b52cd52979c6bd03
-DIST xmlada-23.0.0.tar.gz 1053370 BLAKE2B 4edf2244818d72d6fc760f60c8145f373e5445d1d245b20b605e21faa7eeefed7835db87c1fd1239008e75211a572294e1d8e35af16c2ba2631c02d1d3b6f52f SHA512 a0fb2a34ffb5edf408fbdc1a3d68511b5545a5ec8993251ba75d71dd2a197f14e187d08f8febd71cb23bbd694889a99941911386af8468c5eb3b11128555edcb
+DIST gprbuild-25.0.0.tar.gz 940774 BLAKE2B b2a2895db767b55e459351ea6fbeb91a771b6e39672217d53fb2b4aeea4f42aa093760448da715ffb0b7da54c50b4b55f0034910ebfdfc52a8cde7dad7533ef0 SHA512 eb2d7072194323cae90acd0c8683eeb6a806ef6ff2ed4d3496e8b94c5b63dae8a428ec428a3610b380df7e122d7a00d9e9634ef06b5369b165536c99209602ce
 DIST xmlada-24.0.0.tar.gz 1053363 BLAKE2B 628a1d3645c58cc3f8f5140c7cfb16adef02f6ccc72b8e9410819eaf67e0160bdcf81a8e33065ec52f54cb12309d857a3d82e532990a0fd17c249c04334ab10f SHA512 4e6773a5fdf9b6ebb5afca913d77aba9f697768f28ef9b23b9277aa4ea4ce09de4e53655dd5559e2326ff847327adb53fa6b776775aa923100a2624df415c97d
-EBUILD gprbuild-23.0.0-r1.ebuild 1680 BLAKE2B af2bb8ebb07de78ffae8f18601a0a087e60036e32be80c5f7a9ad64982e092ef2695c8c64df9098b74d1e2dc84617134f4cd9b1ecf577a63189f8e9c870c01b1 SHA512 a1493abbfb15309a46f8ffcfd346754b8bf17e4a94a6fd649d79a035a08b4d2a2b65a3aadccec47ec3b8dea829fafd492e465992549b4479918c522220d5c2ae
-EBUILD gprbuild-23.0.0-r3.ebuild 1696 BLAKE2B 17743273a195a7f6358b2cd29359128a5da54a6ccda8c9e40b15aa5c5fa2cf1e6cd42b60af98d7fc3398a7b11a1cc2f386cd2783c207978fd1c9498afdc9ce7d SHA512 ddf97786f6a058c2c12060fb18bc63e288e763f3377727077539465fabe40a9af5571e5aaef0957b3bc7da6807440071c1d85f4b3d639a528726bd5418255e90
+DIST xmlada-25.0.0.tar.gz 1082553 BLAKE2B daddd7b1d6cd8c38ff3e9ecdc1d0864e1eca88128121635e8d1a8133f73285ced08478e732a0b7bb02cc00e240887d20a1a16048991450025290fd96ad5cb09f SHA512 c57db78e3afd20862c3275d3d0874ada1748e98df06a76841cb3dca3686b29c7693835a591ca5789dca2d3d6ba9677c9082df94857e180e0758a5b77fafc40c0
 EBUILD gprbuild-24.0.0-r2.ebuild 1990 BLAKE2B dbc02977f2830d7aa874ef0988316cb3774043c3fd9167ae79ced38384891889671d9db2ac20eea1d1b97489bebc75e91092185a82a446efef81d90bd8ff120c SHA512 a9c5f17c78c80788df815231032a165deb5921c67d34b48d3c50d7090f246a4d68e920ef056411c90b8dad38bca251cc513230372e1aef40ee728fe4dc5e2dc4
+EBUILD gprbuild-25.0.0.ebuild 1992 BLAKE2B 176f871841a21cd92e311e3ea9e27518360f7051a46e1d6d680edabf77b20802dabc1570b48e660bf2066ccce5d73a8d3ab52c14161e605e28c5268e202b2d13 SHA512 950e4ed6e1afc218e89f1e6e9bcdefaa5af3ecc3e6a5ed1d69973310064bb02bb0590a58ae66566a2eaf0e039e72f8e83b45c95762cd27df78603590f7ce053a
 MISC metadata.xml 888 BLAKE2B 635ae939acfcaa26b0ba80341ed90cb02d8c5a2cfa50ca78bbcf19bd3081cf434a51ef1b05547bc80f9174db1aabfad1bde6270c3c08ea4c119684a4af7d5e4e SHA512 65b9e30e2b0d5694fe31c244eeca739327274beda743330edb8f85f050a7f9c809cfb3a115b4f9349f282fc39de36f934354db864669f515da746cd9551b5337
diff --git a/dev-ada/gprbuild/gprbuild-23.0.0-r1.ebuild b/dev-ada/gprbuild/gprbuild-23.0.0-r1.ebuild
deleted file mode 100644
index e340685fb095..000000000000
--- a/dev-ada/gprbuild/gprbuild-23.0.0-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ADA_COMPAT=( gnat_2021 gcc_12 )
-
-inherit ada multiprocessing
-
-XMLADA=xmlada-${PV}
-
-DESCRIPTION="Multi-Language Management"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="
-	https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
-		-> ${P}.tar.gz
-	https://github.com/AdaCore/xmlada/archive/refs/tags/v${PV}.tar.gz
-		-> ${XMLADA}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="${ADA_DEPS}
-	dev-ada/gprconfig_kb[${ADA_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-PATCHES=( "${FILESDIR}"/${PN}-22.0.0-gentoo.patch )
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s:@GNATBIND@:${GNATBIND}:g" \
-		src/gprlib.adb \
-		|| die
-	cd gpr/src || die
-	ln -s gpr-util-put_resource_usage__unix.adb \
-		gpr-util-put_resource_usage.adb
-}
-
-bin_progs="gprbuild gprconfig gprclean gprinstall gprname gprls"
-lib_progs="gprlib gprbind"
-
-src_compile() {
-	local xmlada_src="../${XMLADA}"
-	inc_flags="-Isrc -Igpr/src -I${xmlada_src}/sax -I${xmlada_src}/dom \
-		-I${xmlada_src}/schema -I${xmlada_src}/unicode \
-		-I${xmlada_src}/input_sources"
-
-	gcc -c ${CFLAGS} gpr/src/gpr_imports.c -o gpr_imports.o || die
-	for bin in ${bin_progs}; do
-		gnatmake -j$(makeopts_jobs) ${inc_flags} $ADAFLAGS ${bin}-main \
-			-o ${bin} -largs ${LDFLAGS} gpr_imports.o || die
-	done
-	for lib in $lib_progs; do
-		gnatmake -j$(makeopts_jobs) ${inc_flags} ${lib} $ADAFLAGS \
-			-largs ${LDFLAGS} gpr_imports.o || die
-	done
-}
-
-src_install() {
-	dobin ${bin_progs}
-	exeinto /usr/libexec/gprbuild
-	doexe ${lib_progs}
-	insinto /usr/share/gpr
-	doins share/_default.gpr
-	einstalldocs
-}
diff --git a/dev-ada/gprbuild/gprbuild-23.0.0-r3.ebuild b/dev-ada/gprbuild/gprbuild-25.0.0.ebuild
index 7141f9b2e902..f57e0dc497a4 100644
--- a/dev-ada/gprbuild/gprbuild-23.0.0-r3.ebuild
+++ b/dev-ada/gprbuild/gprbuild-25.0.0.ebuild
@@ -19,10 +19,12 @@ SRC_URI="
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="doc"
 
 DEPEND="${ADA_DEPS}
 	dev-ada/gprconfig_kb[${ADA_USEDEP}]"
 RDEPEND="${DEPEND}"
+BDEPEND="doc? ( dev-python/sphinx )"
 
 REQUIRED_USE="${ADA_REQUIRED_USE}"
 PATCHES=( "${FILESDIR}"/${PN}-22.0.0-gentoo.patch )
@@ -56,6 +58,11 @@ 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
+	fi
 }
 
 src_install() {
@@ -64,5 +71,12 @@ 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"
+		HTML_DOCS+="doc/html/*"
+		doinfo doc/info/gprbuild_ug.info
+	fi
 	einstalldocs
 }