From b89a664f266dab3b9b5ddac2cb874f8869142370 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 13 Oct 2022 01:41:21 +0100 Subject: gentoo auto-resync : 13:10:2022 - 01:41:21 --- dev-util/ninja/Manifest | 6 +- dev-util/ninja/metadata.xml | 4 +- dev-util/ninja/ninja-1.11.1-r2.ebuild | 127 ++++++++++++++++++++++++++++++++++ dev-util/ninja/ninja-1.11.1.ebuild | 125 --------------------------------- dev-util/ninja/ninja-9999.ebuild | 4 +- 5 files changed, 135 insertions(+), 131 deletions(-) create mode 100644 dev-util/ninja/ninja-1.11.1-r2.ebuild delete mode 100644 dev-util/ninja/ninja-1.11.1.ebuild (limited to 'dev-util/ninja') diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest index 4a27fbb530f6..c7361f103c64 100644 --- a/dev-util/ninja/Manifest +++ b/dev-util/ninja/Manifest @@ -1,5 +1,5 @@ AUX ninja-cflags.patch 738 BLAKE2B ec025836197d41d96cfcab0a7363ab3bda50cb7fc3f91f096ccfaa16babdc353269738aef92e68a261f43ba617720f677766f7044acb1a01dd7e07d6c9eca13e SHA512 97935accbef92e6eeda7d38bae6978016f4423e3989fcfb13c6de55644133ddef43db49811fc85d2649d68473d8b81e1bfb70f59a5e63d2607741d90152a4f42 DIST ninja-1.11.1.tar.gz 229479 BLAKE2B c96cf7c319b7abd65f644465688d256f8b3a576c4616d0c63852e25dd0dc5f63c66708d429d8dddb6228502eb147211a86a5dd369b80ec2228902b370d2343e5 SHA512 1bca38877c70ee6613f347ffccef5adc02ba0a3947c62ae004ea97f918442b5a3de92378e4f820ae2a7676bc7609d25fbc7d41f6cfb3a61e5e4b26ec3639e403 -EBUILD ninja-1.11.1.ebuild 2553 BLAKE2B e936a09d0079b91c49d647fb77cfee9c3a94f7a556dac6dc67dd13efa6f3a596751a67c92b29a338a7837d402b125f40835e90bc5f538f17fe466c976b317833 SHA512 a136e0a3fece713b121faa3a3a6aa8c1a3c218370831dd4ea2ec1f328bb5a6b4e63dd4d167d642170a82f42d4a29d19e0a99ce465e5908ab9eabc21966cee80e -EBUILD ninja-9999.ebuild 2561 BLAKE2B 272031b0e8898d4a0970276869c20dcbfd7a4a90adbc75ea68f28bb7f075b432447cc2fcaadb4715c0b84832f5942d61e77243ff180221ddf07131d7bb844f02 SHA512 4c9ca432475d6d056d10d306f96c5189d9692ef83f8f3ce36901fbf0428d442424134936b7709cb05d22ebe9b4a25b1122e820c6c21207b30e7a5a6a1b13f660 -MISC metadata.xml 345 BLAKE2B 62344dee3d109b90fe9cdc68f581d3dddd9ffee182af72e82509180d9382b6765ecac373680f0c3fc3e1b5c4e9641a689bb036ee877a2117d335ae4e1608718b SHA512 20d5ee6f6448835b6cdcb3ac1f6760d5bc452aa44a1c72de2241cd47432967498c30099c79a5b59a53796cbe1c373291bb62a5d48914996fa20c9e22569d68eb +EBUILD ninja-1.11.1-r2.ebuild 2585 BLAKE2B 5f7d81db5d943a959ae96a8d0b2748fcda184128246f64d9004856b10212af982aa99de7cedad9b411e96debb0868910e25aa49cc819f238a61d5c6627fa0270 SHA512 41ae047a984b84dfa802794deea4cefebf799d2eeb2e883003ed79986c882e8f12c29230c231c91a092e962af5da7076df8629cc8eadfbed939b11531f62bcdc +EBUILD ninja-9999.ebuild 2593 BLAKE2B 6d513f77d36e3f1c4949bb8a2b48caa5fd6485756561f97f908f86729da37abd1063a2b3013fea0bfef297f342f8b3cdf3bae1f99178e8fbf69ccc557a8cdc4c SHA512 de7994ffe60c137b96185e71d5579c36bff365d380396cb578c975bc41ce0f539b2a22917ad7049bc1cef1c98adbb02d9fde6c8d7bf94655f86659d38d7fa976 +MISC metadata.xml 340 BLAKE2B fa4555bacb95d21f647d7ee1f5c6f28bea00910580bb680ab7d0ed99a2495c08819bc9a8f29580435f53ab8b69f1779a420bdd6bfd2f088b41304fdc96a3e1a9 SHA512 6182c10c0e91903fe1dbe392882881c00013818f606729c57126a0fe0932f4900d196948dc906c81b5415f649c5ce11233763b4616f4dd87dd744bfce9ec82d5 diff --git a/dev-util/ninja/metadata.xml b/dev-util/ninja/metadata.xml index 500b65060534..9f465f8c98bf 100644 --- a/dev-util/ninja/metadata.xml +++ b/dev-util/ninja/metadata.xml @@ -2,8 +2,8 @@ - chromium@gentoo.org - Chromium in Gentoo Project + base-system@gentoo.org + Gentoo Base System ninja-build/ninja diff --git a/dev-util/ninja/ninja-1.11.1-r2.ebuild b/dev-util/ninja/ninja-1.11.1-r2.ebuild new file mode 100644 index 000000000000..477e2d2504ea --- /dev/null +++ b/dev-util/ninja/ninja-1.11.1-r2.ebuild @@ -0,0 +1,127 @@ +# Copyright 2012-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..11} ) + +inherit edo bash-completion-r1 elisp-common flag-o-matic python-any-r1 toolchain-funcs + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://github.com/ninja-build/ninja.git" + inherit git-r3 +else + SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +DESCRIPTION="A small build system similar to make" +HOMEPAGE="https://ninja-build.org/" + +LICENSE="Apache-2.0" +SLOT="0" + +IUSE="doc emacs test" +RESTRICT="!test? ( test )" + +BDEPEND=" + ${PYTHON_DEPS} + dev-util/re2c + doc? ( + app-text/asciidoc + app-doc/doxygen + dev-libs/libxslt + media-gfx/graphviz + ) + test? ( dev-cpp/gtest ) +" +RDEPEND="emacs? ( >=app-editors/emacs-23.1:* )" + +PATCHES=( + "${FILESDIR}"/ninja-cflags.patch +) + +run_for_build() { + if tc-is-cross-compiler; then + local -x AR=$(tc-getBUILD_AR) + local -x CXX=$(tc-getBUILD_CXX) + local -x CFLAGS= + local -x CXXFLAGS=${BUILD_CXXFLAGS} + local -x LDFLAGS=${BUILD_LDFLAGS} + fi + echo "$@" >&2 + "$@" +} + +src_compile() { + tc-export AR CXX + + # configure.py appends CFLAGS to CXXFLAGS + unset CFLAGS + + append-lfs-flags + + run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die + + if tc-is-cross-compiler; then + mv ninja ninja-build || die + ${EPYTHON} configure.py || die + ./ninja-build -v ninja || die + else + ln ninja ninja-build || die + fi + + if use doc; then + ./ninja-build -v doxygen manual || die + fi + + if use emacs; then + elisp-compile misc/ninja-mode.el || die + fi +} + +src_test() { + if ! tc-is-cross-compiler; then + # Bug 485772 + ulimit -n 2048 + edo ./ninja -v ninja_test + edo ./ninja_test + fi +} + +src_install() { + dodoc README.md CONTRIBUTING.md + + if use doc; then + docinto html + dodoc -r doc/doxygen/html/. + dodoc doc/manual.html + fi + + dobin ninja + + newbashcomp misc/bash-completion ${PN} + + insinto /usr/share/vim/vimfiles/syntax/ + doins misc/ninja.vim + + echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}"/ninja.vim || die + insinto /usr/share/vim/vimfiles/ftdetect + doins "${T}"/ninja.vim + + insinto /usr/share/zsh/site-functions + newins misc/zsh-completion _ninja + + if use emacs; then + cd misc || die + elisp-install ninja ninja-mode.el* || die + fi +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/dev-util/ninja/ninja-1.11.1.ebuild b/dev-util/ninja/ninja-1.11.1.ebuild deleted file mode 100644 index 68d015410a2a..000000000000 --- a/dev-util/ninja/ninja-1.11.1.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 2012-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..11} ) - -inherit edo bash-completion-r1 elisp-common python-any-r1 toolchain-funcs - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/ninja-build/ninja.git" - inherit git-r3 -else - SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -DESCRIPTION="A small build system similar to make" -HOMEPAGE="https://ninja-build.org/" - -LICENSE="Apache-2.0" -SLOT="0" - -IUSE="doc emacs test" -RESTRICT="!test? ( test )" - -BDEPEND=" - ${PYTHON_DEPS} - dev-util/re2c - doc? ( - app-text/asciidoc - app-doc/doxygen - dev-libs/libxslt - media-gfx/graphviz - ) - test? ( dev-cpp/gtest ) -" -RDEPEND="emacs? ( >=app-editors/emacs-23.1:* )" - -PATCHES=( - "${FILESDIR}"/ninja-cflags.patch -) - -run_for_build() { - if tc-is-cross-compiler; then - local -x AR=$(tc-getBUILD_AR) - local -x CXX=$(tc-getBUILD_CXX) - local -x CFLAGS= - local -x CXXFLAGS=${BUILD_CXXFLAGS} - local -x LDFLAGS=${BUILD_LDFLAGS} - fi - echo "$@" >&2 - "$@" -} - -src_compile() { - tc-export AR CXX - - # configure.py appends CFLAGS to CXXFLAGS - unset CFLAGS - - run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die - - if tc-is-cross-compiler; then - mv ninja ninja-build || die - ${EPYTHON} configure.py || die - ./ninja-build -v ninja || die - else - ln ninja ninja-build || die - fi - - if use doc; then - ./ninja-build -v doxygen manual || die - fi - - if use emacs; then - elisp-compile misc/ninja-mode.el || die - fi -} - -src_test() { - if ! tc-is-cross-compiler; then - # Bug 485772 - ulimit -n 2048 - edo ./ninja -v ninja_test - edo ./ninja_test - fi -} - -src_install() { - dodoc README.md CONTRIBUTING.md - - if use doc; then - docinto html - dodoc -r doc/doxygen/html/. - dodoc doc/manual.html - fi - - dobin ninja - - newbashcomp misc/bash-completion ${PN} - - insinto /usr/share/vim/vimfiles/syntax/ - doins misc/ninja.vim - - echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}"/ninja.vim || die - insinto /usr/share/vim/vimfiles/ftdetect - doins "${T}"/ninja.vim - - insinto /usr/share/zsh/site-functions - newins misc/zsh-completion _ninja - - if use emacs; then - cd misc || die - elisp-install ninja ninja-mode.el* || die - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-util/ninja/ninja-9999.ebuild b/dev-util/ninja/ninja-9999.ebuild index bedb66f577c5..49a69753e911 100644 --- a/dev-util/ninja/ninja-9999.ebuild +++ b/dev-util/ninja/ninja-9999.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{8..11} ) -inherit edo bash-completion-r1 elisp-common python-any-r1 toolchain-funcs +inherit edo bash-completion-r1 elisp-common flag-o-matic python-any-r1 toolchain-funcs if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/ninja-build/ninja.git" @@ -59,6 +59,8 @@ src_compile() { # configure.py appends CFLAGS to CXXFLAGS unset CFLAGS + append-lfs-flags + run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die if tc-is-cross-compiler; then -- cgit v1.2.3