diff options
Diffstat (limited to 'dev-ada')
-rw-r--r-- | dev-ada/Manifest.gz | bin | 4911 -> 4908 bytes | |||
-rw-r--r-- | dev-ada/gprbuild/Manifest | 7 | ||||
-rw-r--r-- | dev-ada/gprbuild/gprbuild-23.0.0-r1.ebuild | 68 | ||||
-rw-r--r-- | dev-ada/gprbuild/gprbuild-25.0.0.ebuild (renamed from dev-ada/gprbuild/gprbuild-23.0.0-r3.ebuild) | 14 | ||||
-rw-r--r-- | dev-ada/xmlada/Manifest | 5 | ||||
-rw-r--r-- | dev-ada/xmlada/xmlada-23.0.0-r1.ebuild | 86 | ||||
-rw-r--r-- | dev-ada/xmlada/xmlada-25.0.0.ebuild (renamed from dev-ada/xmlada/xmlada-23.0.0-r3.ebuild) | 42 |
7 files changed, 50 insertions, 172 deletions
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz Binary files differindex b6ae902707f6..10ab5a8a5bda 100644 --- a/dev-ada/Manifest.gz +++ b/dev-ada/Manifest.gz 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 } 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 } |