diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-04-17 12:04:28 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-04-17 12:04:28 +0100 |
commit | 97bacba3ead078e5db8b87ab651a3ffa7d82f60f (patch) | |
tree | a769244c0cdbaa4ae87951809f61da3a3f9df7a4 /dev-build/ninja | |
parent | b92911550490e2da121ec4b02d3cf60a2d31a17d (diff) |
gentoo auto-resync : 17:04:2024 - 12:04:27
Diffstat (limited to 'dev-build/ninja')
-rw-r--r-- | dev-build/ninja/Manifest | 4 | ||||
-rw-r--r-- | dev-build/ninja/ninja-1.12.0.ebuild | 21 | ||||
-rw-r--r-- | dev-build/ninja/ninja-9999.ebuild | 21 |
3 files changed, 28 insertions, 18 deletions
diff --git a/dev-build/ninja/Manifest b/dev-build/ninja/Manifest index 7a5e8de2dd6b..74fa2ad8cbc2 100644 --- a/dev-build/ninja/Manifest +++ b/dev-build/ninja/Manifest @@ -2,6 +2,6 @@ AUX ninja-cflags.patch 738 BLAKE2B ec025836197d41d96cfcab0a7363ab3bda50cb7fc3f91 DIST ninja-1.11.1.tar.gz 229479 BLAKE2B c96cf7c319b7abd65f644465688d256f8b3a576c4616d0c63852e25dd0dc5f63c66708d429d8dddb6228502eb147211a86a5dd369b80ec2228902b370d2343e5 SHA512 1bca38877c70ee6613f347ffccef5adc02ba0a3947c62ae004ea97f918442b5a3de92378e4f820ae2a7676bc7609d25fbc7d41f6cfb3a61e5e4b26ec3639e403 DIST ninja-1.12.0.tar.gz 240291 BLAKE2B e7d721ab62164574b076f7cbf6d40fd2ee950534d124a58f5fe9e09bdae5895c8dc9dd7636a9f2f2b79774d6d9ba5f831e2c8b370826029af060fdc80fdc207f SHA512 167cd838ad47815183b79302a6e19227d956e634ae9d4211f0895ea9f4d893932e1154a765a9d5a1a3167b1a48b398f255fb4f46eb1395a6da11070bda628875 EBUILD ninja-1.11.1-r5.ebuild 2451 BLAKE2B bf0e6fc2f7d09db24ca6b58a4a1e081ef08ee2bb04acc73af3e2f8fe8f77745f99ac8d68d0338b0867a0040555b6eddad61930c7ce7d72d43d0c426511b078a9 SHA512 831f9e6e2800fdf5c466ba0d69a9034b0c329a2d34b80cad723dead14d02a205ee76b398ca6a56b7d16a1ce8249b1be1493ce77bfb7e8e98e86e0a665f797b1b -EBUILD ninja-1.12.0.ebuild 2115 BLAKE2B e491be00561dd92225d1ab6e1d0ad2b88924d5af3e4a658748337f63ee9cbb0a427cd7ae0af819faede5894e5e0103b445803484a7700411da233655f0092502 SHA512 d27fac616fded6c869d9f558a6d543a05ce11481806597d3d0e4f8a56692cd95d215217cc1d945c52d78fd82bbabc539052d5f39aea37b0a78eca22370c031c3 -EBUILD ninja-9999.ebuild 2115 BLAKE2B e491be00561dd92225d1ab6e1d0ad2b88924d5af3e4a658748337f63ee9cbb0a427cd7ae0af819faede5894e5e0103b445803484a7700411da233655f0092502 SHA512 d27fac616fded6c869d9f558a6d543a05ce11481806597d3d0e4f8a56692cd95d215217cc1d945c52d78fd82bbabc539052d5f39aea37b0a78eca22370c031c3 +EBUILD ninja-1.12.0.ebuild 2229 BLAKE2B 18ddf25348637f391dd5562c55cc2e4d8dacbb67b62706e2adccf4654995feebec3c202da56c7c42241b3bbbf1957c943b7f257ec218f3ee1b0189715b7cab95 SHA512 2b85bd93fb613e39d6cd247f78198de7f144964f1876ce2c1d57d5a2c92a094428cd2d7036865858d0690f193c0da144db058b60f33221a48e3d111954168f4d +EBUILD ninja-9999.ebuild 2229 BLAKE2B 18ddf25348637f391dd5562c55cc2e4d8dacbb67b62706e2adccf4654995feebec3c202da56c7c42241b3bbbf1957c943b7f257ec218f3ee1b0189715b7cab95 SHA512 2b85bd93fb613e39d6cd247f78198de7f144964f1876ce2c1d57d5a2c92a094428cd2d7036865858d0690f193c0da144db058b60f33221a48e3d111954168f4d MISC metadata.xml 463 BLAKE2B 4094365ee9f5db41a29df26eada46bc42050da4043003bc265733666475d950df0b53cc475585b5d0ad79a1b9cbe83a53076911e564960d21568479e52bc4b33 SHA512 2d08b1e9f5377ba2d1976093fc9a3a9ceec51e80a7473e3d80e536585d1adb21c90d954205b97dd063dc99fe60b7b0c5335a16e05d0a2fa79e951c4833697880 diff --git a/dev-build/ninja/ninja-1.12.0.ebuild b/dev-build/ninja/ninja-1.12.0.ebuild index 932bf822922b..fd0e6fc7d748 100644 --- a/dev-build/ninja/ninja-1.12.0.ebuild +++ b/dev-build/ninja/ninja-1.12.0.ebuild @@ -44,17 +44,13 @@ pkg_setup() { : } -docs_enabled() { - use doc && ! tc-is-cross-compiler -} - src_configure() { local mycmakeargs=( -DBUILD_TESTING=$(usex test ON OFF) ) cmake_src_configure - if docs_enabled; then + if use doc; then python_setup edo ${EPYTHON} configure.py fi @@ -63,8 +59,17 @@ src_configure() { src_compile() { cmake_src_compile - if docs_enabled; then - edo ./ninja -v -j1 doxygen manual + if use doc; then + local ninja=./ninja + if tc-is-cross-compiler; then + ninja=$(type -P ninja) + fi + if [[ -n ${ninja} ]]; then + edo "${ninja}" -v -j1 doxygen manual + DOCS_BUILT=yes + else + DOCS_BUILT=no + fi fi } @@ -81,7 +86,7 @@ src_install() { mv "${ED}"/usr/bin/ninja{,-reference} || die - if docs_enabled; then + if [[ ${DOCS_BUILT} == yes ]]; then docinto html dodoc -r doc/doxygen/html/. dodoc doc/manual.html diff --git a/dev-build/ninja/ninja-9999.ebuild b/dev-build/ninja/ninja-9999.ebuild index 932bf822922b..fd0e6fc7d748 100644 --- a/dev-build/ninja/ninja-9999.ebuild +++ b/dev-build/ninja/ninja-9999.ebuild @@ -44,17 +44,13 @@ pkg_setup() { : } -docs_enabled() { - use doc && ! tc-is-cross-compiler -} - src_configure() { local mycmakeargs=( -DBUILD_TESTING=$(usex test ON OFF) ) cmake_src_configure - if docs_enabled; then + if use doc; then python_setup edo ${EPYTHON} configure.py fi @@ -63,8 +59,17 @@ src_configure() { src_compile() { cmake_src_compile - if docs_enabled; then - edo ./ninja -v -j1 doxygen manual + if use doc; then + local ninja=./ninja + if tc-is-cross-compiler; then + ninja=$(type -P ninja) + fi + if [[ -n ${ninja} ]]; then + edo "${ninja}" -v -j1 doxygen manual + DOCS_BUILT=yes + else + DOCS_BUILT=no + fi fi } @@ -81,7 +86,7 @@ src_install() { mv "${ED}"/usr/bin/ninja{,-reference} || die - if docs_enabled; then + if [[ ${DOCS_BUILT} == yes ]]; then docinto html dodoc -r doc/doxygen/html/. dodoc doc/manual.html |