gentoo auto-resync : 01:03:2024 - 23:41:29

3 files changed, 49 insertions, 13 deletions

diff --git a/dev-ada/xmlada/Manifest b/dev-ada/xmlada/Manifest
index 97dbda31fe68..e12770cb8c0b 100644
--- a/dev-ada/xmlada/Manifest
+++ b/dev-ada/xmlada/Manifest
@@ -1,7 +1,8 @@
 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-r2.ebuild 2432 BLAKE2B 1f7058541c57ff369062bb5e80db7f179bb0e82f788b4f0ca53817868481bfa0219c26edb15d164d09acb5ea21bc099a85615d6e5f7a2a8ea1ee5e9f042f5628 SHA512 3bb696c7183a4e253f3ac7f147b0b1815336b88b0b1e88ce46e3b3d7a355089b748c4d5244de7b54189a72b83c9b714d67f87b3d80a60b1fd52d49aeb73f356c
-EBUILD xmlada-24.0.0.ebuild 2440 BLAKE2B b0b0e6617e1d0c861d9640cabff8c4bf19fed94139682d32d06c21e695b01bd148e155ca9bb18f1dac3970ce951850920c9d936cd511ac8614902b07e4e2c7be SHA512 074479afa9d36e55aa3c59f299709bb20766823122008704b392a74e7582825a8578c88b79bd3ca1eec06f6fd0a79a3def33be9fb891666904d3291f1b621f7e
+EBUILD xmlada-24.0.0-r1.ebuild 2243 BLAKE2B 7e93d00f9515dd052b260701be79b531ad3d2b81b8c375c516ecf47eef68d92d0173588e7b9f214bd19c059ce516b3de4a5425f5c35f8a27f6eeafdc20454464 SHA512 3f7e7fcf450e55930f6bd75f8b0b7a84a87fdfe8f718fdc56a3c5de234646d43b6108f6c2b0b60e08601ed8c846ce98a1e22c70c35cce215e7c546a510428f08
 MISC metadata.xml 987 BLAKE2B 0cea4d25986c676a4418a482ece808fe48869771b7c021727b7b81785ae254d68eab90a6ba52e5a62b2fbf2ea2539103cfc4b4909ebc6c578c33d61d8b3bb16e SHA512 c578017e1aceb4e81669eb3a44cb7e154f5ef16e09b88de70c5fb4675619fbbbaa0260ad7e7ba7bf07a957e64ac9ee8dc172d91df9f8ee1801ff5e4787e09092
diff --git a/dev-ada/xmlada/files/xmlada-24.0.0-gentoo.patch b/dev-ada/xmlada/files/xmlada-24.0.0-gentoo.patch
new file mode 100644
index 000000000000..5eb69f885285
--- /dev/null
+++ b/dev-ada/xmlada/files/xmlada-24.0.0-gentoo.patch
@@ -0,0 +1,24 @@
+--- a/input_sources/xmlada_input.gpr	2024-03-01 19:32:59.111253474 +0100
++++ b/input_sources/xmlada_input.gpr	2024-03-01 19:34:57.282827180 +0100
+@@ -39,13 +39,15 @@
+    package Ide      renames XmlAda_Shared.Ide;
+ 
+    package Install is
+-      for Artifacts ("share/doc/xmlada")
+-        use ("../docs/_build/html/*", "../docs/_build/latex/XMLAda.pdf");
++      for Artifacts ("share/doc/@PF@/html")
++        use ("../docs/_build/html/*");
++      for Artifacts ("share/doc/@PF@")
++        use ("../docs/_build/latex/XMLAda.pdf");
+       for Artifacts ("share/gpr") use ("../distrib/xmlada.gpr");
+-      for Artifacts ("share/examples/xmlada/dom") use ("../docs/dom/*");
+-      for Artifacts ("share/examples/xmlada/sax") use ("../docs/sax/*");
+-      for Artifacts ("share/examples/xmlada/schema") use ("../docs/schema/*");
+-      for Artifacts ("share/examples/xmlada/cross") use ("../docs/cross/*");
++      for Artifacts ("share/doc/@PF@/examples/dom") use ("../docs/dom/*");
++      for Artifacts ("share/doc/@PF@/examples/sax") use ("../docs/sax/*");
++      for Artifacts ("share/doc/@PF@/examples/schema") use ("../docs/schema/*");
++      for Artifacts ("share/doc/@PF@/examples/cross") use ("../docs/cross/*");
+    end Install;
+ 
+ end XmlAda_Input;
diff --git a/dev-ada/xmlada/xmlada-24.0.0.ebuild b/dev-ada/xmlada/xmlada-24.0.0-r1.ebuild
index 8b34419b5baa..3284fea75aa5 100644
--- a/dev-ada/xmlada/xmlada-24.0.0.ebuild
+++ b/dev-ada/xmlada/xmlada-24.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,15 +14,31 @@ 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
+)"
 
-PATCHES=( "${FILESDIR}"/${PN}-23.0.0-gentoo.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-23.0.0-gentoo.patch
+	"${FILESDIR}"/${P}-gentoo.patch
+)
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s|@PF@|${PF}|g" \
+		input_sources/xmlada_input.gpr \
+		|| die
+}
 
 src_compile() {
 	build () {
@@ -40,6 +56,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() {
@@ -74,13 +94,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
 }