dev-util/ninja: version bump to 1.10.0

Closes: https://github.com/gentoo/gentoo/pull/15008
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Christoph Junghans <junghans@gentoo.org>
Signed-off-by: Mike Gilbert <floppym@gentoo.org>

diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index 8de2b193c8ebf358f2828b49261144d6d57c8801..b3314b7be05ae23fc7b432aa5abdc246b5a3a9fb 100644 (file)
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@@ -1,3 +1,4 @@
+DIST ninja-1.10.0.tar.gz 210313 BLAKE2B 0a3db145deaea8a990958ad2e812bc18ed014aaba94911a2905b082745a0d08f10ce1113badabaa362f3834540b7bd3858f07e2a5fce268c66d3d6c73e974e76 SHA512 5ed47ef1ff18a03eb73296629679a8617a08ee443e10e28ae9cb24e4506f84fe1eb142888adea9a62364b626b35817def8c55ba956c9b3cbc7b82d3e62293044
 DIST ninja-1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1.tar.gz 203848 BLAKE2B a6002abcfe4003dd5c9ccb8fd504b98736a6bc249323ca7afabc042a5091b9e7f0c0c19853cd7a270e00b0825ea14a7ba47c1b35d15f725c7b4866de1a79c07a SHA512 74f42181a2a712653450b0ab7ce5ad93b5ec010f4ab8411c732f682be5a6a991a7481ae1649ad70a7b903c45427b1e238b001aef29702f0896a1ae393ee22bec
 DIST ninja-1.8.2.g81279.kitware.dyndep-1.jobserver-1.tar.gz 204539 BLAKE2B cee66a5d6ad7fd1254e68cf7be1e97eb796ec3103bdb9e869dc66757a96ce1d6e946018aa048855e70d6a3698ae609f75740809a8e9183057da16769f07e1fa6 SHA512 ae5f9c4c76114cabc4ec06056edccfa4027d514c4ae0f3ab08bbcd3ce2322e9ff08b8f90fe69fab989707adb6ecc78f226b65e223b41535aa5c0db5b6c61117a
 DIST ninja-1.8.2.tar.gz 185226 BLAKE2B c464c50829a0e9f0f6fd4b860946b14bf07f752adb8e7857d4072a1c1f06977eda283f633041929065c9164377ca769b3293b04fc9ceab583371708a9c4e8f2a SHA512 1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2

diff --git a/dev-util/ninja/ninja-1.10.0.ebuild b/dev-util/ninja/ninja-1.10.0.ebuild
new file mode 100644 (file)
index 0000000..5275d63
--- /dev/null
+++ b/dev-util/ninja/ninja-1.10.0.ebuild
@@ -0,0 +1,128 @@
+# Copyright 2012-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+       inherit git-r3
+       EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
+else
+       SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-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 vim-syntax"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+       ${PYTHON_DEPS}
+       dev-util/re2c
+       doc? (
+               app-text/asciidoc
+               app-doc/doxygen
+               dev-libs/libxslt
+       )
+       test? ( dev-cpp/gtest )
+"
+RDEPEND="
+       emacs? ( >=app-editors/emacs-23.1:* )
+       vim-syntax? (
+               || (
+                       app-editors/vim
+                       app-editors/gvim
+               )
+       )
+"
+
+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 uses CFLAGS instead of CXXFLAGS
+       export CFLAGS=${CXXFLAGS}
+
+       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
+               ./ninja -v ninja_test || die
+               ./ninja_test || die
+       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}"
+
+       if use vim-syntax; then
+               insinto /usr/share/vim/vimfiles/syntax/
+               doins misc/ninja.vim
+
+               echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}/ninja.vim"
+               insinto /usr/share/vim/vimfiles/ftdetect
+               doins "${T}/ninja.vim"
+       fi
+
+       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 8c9e987cef2ffa15aa47d459b54760315bb48c6a..bf75daf0bbb4824f1eebc08f0eb829ee8e3b5fac 100644 (file)
--- a/dev-util/ninja/ninja-9999.ebuild
+++ b/dev-util/ninja/ninja-9999.ebuild
@@ -11,11 +11,8 @@ if [[ ${PV} == 9999 ]]; then
        inherit git-r3
        EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
 else
-       KITWARE_VERSION="1.9.0.g99df1.kitware.dyndep-1.jobserver-1"
-       MY_P="ninja-${KITWARE_VERSION}"
-       S="${WORKDIR}/${MY_P}"
-       SRC_URI="https://github.com/Kitware/ninja/archive/v${KITWARE_VERSION}.tar.gz -> ${MY_P}.tar.gz"
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+       SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+       KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 fi
 
 DESCRIPTION="A small build system similar to make"
@@ -94,7 +91,7 @@ src_test() {
 }
 
 src_install() {
-       dodoc README HACKING.md
+       dodoc README.md CONTRIBUTING.md
        if use doc; then
                docinto html
                dodoc -r doc/doxygen/html/.