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

3 files changed, 33 insertions, 100 deletions

diff --git a/dev-ada/xmlada/Manifest b/dev-ada/xmlada/Manifest
index 9f6d3b7f1805..e49a779240c2 100644
--- a/dev-ada/xmlada/Manifest
+++ b/dev-ada/xmlada/Manifest
@@ -1,8 +1,7 @@
 AUX xmlada-23.0.0-gentoo.patch 1070 BLAKE2B 1894bf507add813229dc505c6300d475dfbad4a5f0dbcf957b211cf47f9f916d5656658eecd4892d10810d4e5c13cda00107d7a9fe591ebe8f4b5b3567a043c9 SHA512 c3fd4ee0d44df3ad836c6ca3a1e1ae3ee0c5962c8a628299134e6293bc8bdb0de3b98b43910940646c4384db985cf4a1fb47b50ac17a2d315bb1ee12a406e800
 AUX xmlada-24.0.0-gentoo.patch 1255 BLAKE2B 92e437d6d594a0d1527114301a3e77b0466588dc66b6cbb31d9cb0777416dc5cba9d78b1147df7ee23dde63f20aa046f8d797347885d4a7715fae8e902e1c5f7 SHA512 10beb7eec14815b899552dda732368dee8183fc78f9014eb3557c84416892ca46d6df4dfbb567875574bdd74c96bbdf5558f9d17d3dbc310fcb296966ecb1056
-DIST xmlada-23.0.0.tar.gz 1053370 BLAKE2B 4edf2244818d72d6fc760f60c8145f373e5445d1d245b20b605e21faa7eeefed7835db87c1fd1239008e75211a572294e1d8e35af16c2ba2631c02d1d3b6f52f SHA512 a0fb2a34ffb5edf408fbdc1a3d68511b5545a5ec8993251ba75d71dd2a197f14e187d08f8febd71cb23bbd694889a99941911386af8468c5eb3b11128555edcb
 DIST xmlada-24.0.0.tar.gz 1053363 BLAKE2B 628a1d3645c58cc3f8f5140c7cfb16adef02f6ccc72b8e9410819eaf67e0160bdcf81a8e33065ec52f54cb12309d857a3d82e532990a0fd17c249c04334ab10f SHA512 4e6773a5fdf9b6ebb5afca913d77aba9f697768f28ef9b23b9277aa4ea4ce09de4e53655dd5559e2326ff847327adb53fa6b776775aa923100a2624df415c97d
-EBUILD xmlada-23.0.0-r1.ebuild 2423 BLAKE2B 7fa7cebecb991d8ddca21cc3693a61b3c91391e84e5749166f1c800623e0dc3d39ad928b069eba5eb658b2887f1ec2979b0e956fe16339319f44e3d2d98c30bf SHA512 e703eb60f456b87368f3c17b777498dc58c8b9863c4ff8810084c22829d551c4223c489151af0523e70bc8b7f0d8c7e7b64d98f7b8e4dbccc22095e9c2c6d665
-EBUILD xmlada-23.0.0-r3.ebuild 2439 BLAKE2B 01da5bcac23ed171d0fdebac3b8d7297ab2bbf6eaa36cf0d0ca274ffdb11025d71192041d323c414169490ed5f3735367d07466a844fdcb4e8d244c5fc2bea35 SHA512 3ffc5f3b453f8d6b8083000c2352f7468510927d461389d965bdb416ef4606d74e08a06b08413aad5b7b9012160d4fa7ed41c9fb1a0d7c765e7fb14060a92efc
+DIST xmlada-25.0.0.tar.gz 1082553 BLAKE2B daddd7b1d6cd8c38ff3e9ecdc1d0864e1eca88128121635e8d1a8133f73285ced08478e732a0b7bb02cc00e240887d20a1a16048991450025290fd96ad5cb09f SHA512 c57db78e3afd20862c3275d3d0874ada1748e98df06a76841cb3dca3686b29c7693835a591ca5789dca2d3d6ba9677c9082df94857e180e0758a5b77fafc40c0
 EBUILD xmlada-24.0.0-r3.ebuild 2492 BLAKE2B 4c3ae705dd48d9bf293c8b1bff2a0fe238596abf315d3043d49c4e2d5d13f862c01ee69c933f06c910ee542f170a15af9daf6ad698f22f3b54708ce22d21c6a6 SHA512 75cb73d7f424c06dd17c07c0312bba95313768c3265c3ef267762ca4c55344793a620b0a60b974a7f5928f2e9a4b3f1b1069d968724f13e7523c3d6a756d8314
+EBUILD xmlada-25.0.0.ebuild 2502 BLAKE2B e6e49bd7fb0c5bd31b1834f91c86ea4ae2ac85e6db48b3f9edb478b24905cad4722931083456aca44a6b69abbda8c247abe2646ab7de73cb25c418403aca7553 SHA512 d99ce68ed8fcae3e9984bb3810c1b15eb737e25f84e07201b14e03fcbc168645451b8c0bb6b992e046ee605ea76df5e2f729d3cefd9eb83c09b20ebdbbd446f5
 MISC metadata.xml 987 BLAKE2B 0cea4d25986c676a4418a482ece808fe48869771b7c021727b7b81785ae254d68eab90a6ba52e5a62b2fbf2ea2539103cfc4b4909ebc6c578c33d61d8b3bb16e SHA512 c578017e1aceb4e81669eb3a44cb7e154f5ef16e09b88de70c5fb4675619fbbbaa0260ad7e7ba7bf07a957e64ac9ee8dc172d91df9f8ee1801ff5e4787e09092
diff --git a/dev-ada/xmlada/xmlada-23.0.0-r1.ebuild b/dev-ada/xmlada/xmlada-23.0.0-r1.ebuild
deleted file mode 100644
index 67b2018ced01..000000000000
--- a/dev-ada/xmlada/xmlada-23.0.0-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ADA_COMPAT=( gnat_2021 gcc_12 )
-inherit ada multiprocessing
-
-DESCRIPTION="Set of modules that provide a simple manipulation of XML streams"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+shared static-libs static-pic"
-REQUIRED_USE="|| ( shared static-libs static-pic )
-	${ADA_REQUIRED_USE}"
-
-RDEPEND="${ADA_DEPS}"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_compile() {
-	build () {
-		gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=$1 \
-			-XBUILD=Production -XPROCESSORS=$(makeopts_jobs) xmlada.gpr \
-			-largs ${LDFLAGS} \
-			-cargs ${ADAFLAGS} || die "gprbuild failed"
-	}
-	if use shared; then
-		build relocatable
-	fi
-	if use static-libs; then
-		build static
-	fi
-	if use static-pic; then
-		build static-pic
-	fi
-}
-
-src_test() {
-	GPR_PROJECT_PATH=schema:input_sources:dom:sax:unicode \
-	gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=static \
-		-XBUILD=Production -XPROCESSORS=$(makeopts_jobs) xmlada.gpr \
-		-XTESTS_ACTIVATED=Only \
-		-largs ${LDFLAGS} \
-		-cargs ${ADAFLAGS} || die "gprbuild failed"
-	emake --no-print-directory -C tests tests | tee xmlada.testLog
-	grep -q DIFF xmlada.testLog && die
-}
-
-src_install() {
-	build () {
-		gprinstall -XLIBRARY_TYPE=$1 -f -p -XBUILD=Production \
-			-XPROCESSORS=$(makeopts_jobs) --prefix="${D}"/usr \
-			--install-name=xmlada --build-var=LIBRARY_TYPE \
-			--build-var=XMLADA_BUILD \
-			--build-name=$1 xmlada.gpr || die "gprinstall failed"
-	}
-	if use shared; then
-		build relocatable
-	fi
-	if use static-libs; then
-		build static
-	fi
-	if use static-pic; then
-		build static-pic
-	fi
-
-	einstalldocs
-	dodoc xmlada-roadmap.txt
-	rm -rf "${D}"/usr/share/gpr/manifests
-	rm -f "${D}"/usr/share/examples/xmlada/*/b__*
-	rm -f "${D}"/usr/share/examples/xmlada/*/*.adb.std*
-	rm -f "${D}"/usr/share/examples/xmlada/*/*.ali
-	rm -f "${D}"/usr/share/examples/xmlada/*/*.bexch
-	rm -f "${D}"/usr/share/examples/xmlada/*/*.o
-	rm -f "${D}"/usr/share/examples/xmlada/*/*example
-	rm -f "${D}"/usr/share/examples/xmlada/dom/domexample2
-	rm -f "${D}"/usr/share/examples/xmlada/sax/saxexample_main
-	mv "${D}"/usr/share/examples/xmlada "${D}"/usr/share/doc/"${PF}"/examples || die
-}
diff --git a/dev-ada/xmlada/xmlada-23.0.0-r3.ebuild b/dev-ada/xmlada/xmlada-25.0.0.ebuild
index d5f175058ac5..9d20b93cb7e7 100644
--- a/dev-ada/xmlada/xmlada-23.0.0-r3.ebuild
+++ b/dev-ada/xmlada/xmlada-25.0.0.ebuild
@@ -14,15 +14,32 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
 LICENSE="GPL-3"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE="+shared static-libs static-pic"
+IUSE="doc +shared static-libs static-pic"
 REQUIRED_USE="|| ( shared static-libs static-pic )
 	${ADA_REQUIRED_USE}"
 
 RDEPEND="${ADA_DEPS}"
 DEPEND="${RDEPEND}
 	dev-ada/gprbuild[${ADA_USEDEP}]"
+BDEPEND="doc? (
+	dev-tex/latexmk
+	dev-python/sphinx
+	dev-python/sphinx-rtd-theme
+	dev-texlive/texlive-latexextra
+)"
 
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-23.0.0-gentoo.patch
+	"${FILESDIR}"/${PN}-24.0.0-gentoo.patch
+)
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s|@PF@|${PF}|g" \
+		input_sources/xmlada_input.gpr \
+		|| die
+}
 
 src_compile() {
 	build () {
@@ -40,6 +57,10 @@ src_compile() {
 	if use static-pic; then
 		build static-pic
 	fi
+	if use doc; then
+		emake -C docs latexpdf
+		emake -C docs html
+	fi
 }
 
 src_test() {
@@ -51,6 +72,14 @@ src_test() {
 		-cargs ${ADAFLAGS} || die "gprbuild failed"
 	emake --no-print-directory -C tests tests | tee xmlada.testLog
 	grep -q DIFF xmlada.testLog && die
+	rm docs/*/b__* || die
+	rm docs/*/*ali || die
+	rm docs/*/*std* || die
+	rm docs/*/*bexch || die
+	rm docs/*/*.o || die
+	rm docs/*/*example || die
+	rm docs/dom/domexample2 || die
+	rm docs/sax/saxexample_main || die
 }
 
 src_install() {
@@ -74,13 +103,4 @@ src_install() {
 	einstalldocs
 	dodoc xmlada-roadmap.txt
 	rm -rf "${D}"/usr/share/gpr/manifests
-	rm -f "${D}"/usr/share/examples/xmlada/*/b__*
-	rm -f "${D}"/usr/share/examples/xmlada/*/*.adb.std*
-	rm -f "${D}"/usr/share/examples/xmlada/*/*.ali
-	rm -f "${D}"/usr/share/examples/xmlada/*/*.bexch
-	rm -f "${D}"/usr/share/examples/xmlada/*/*.o
-	rm -f "${D}"/usr/share/examples/xmlada/*/*example
-	rm -f "${D}"/usr/share/examples/xmlada/dom/domexample2
-	rm -f "${D}"/usr/share/examples/xmlada/sax/saxexample_main
-	mv "${D}"/usr/share/examples/xmlada "${D}"/usr/share/doc/"${PF}"/examples || die
 }