dev-util/ninja: Sync with Gentoo

It's from Gentoo commit ff37eeaa0f2e43d1f5b3f681ad0dc8b2556b4877.
This commit is contained in:
Krzesimir Nowak 2022-08-12 14:43:53 +02:00
parent 69a628f291
commit 5a1e156e82
8 changed files with 45 additions and 366 deletions

View File

@ -1,3 +1,2 @@
DIST ninja-1.10.0.tar.gz 210313 BLAKE2B 0a3db145deaea8a990958ad2e812bc18ed014aaba94911a2905b082745a0d08f10ce1113badabaa362f3834540b7bd3858f07e2a5fce268c66d3d6c73e974e76 SHA512 5ed47ef1ff18a03eb73296629679a8617a08ee443e10e28ae9cb24e4506f84fe1eb142888adea9a62364b626b35817def8c55ba956c9b3cbc7b82d3e62293044
DIST ninja-1.10.1.tar.gz 211216 BLAKE2B cb27beeef903ff7c5a00f2ac85b36e66d9c41bcb271edbb6c6d827d5b2b652bacfe3d429a3f966d22fd97495323f83692abf7835f3d6ed3af51a3df9fef180c1 SHA512 9915767a6ffc7147903f346082b5c31fcaeb1e45742754cfaaa642e8ec4c1bd9ec26692a59eb4e2118c397336712a6548e6a16408e094001f8f0c173e67afcc2
DIST ninja-1.10.2.tar.gz 213959 BLAKE2B b8160ca6d58cfa0edb93d16b7dfb9776d290c42e54b33b78cd925f167c80f8794e4cc30af984a526b8263c7904a734cf0770d3c27283d21d02f18d3e2eb70032 SHA512 895412ae1cbc83c656e92f282602a29300e08274e9dea0da4464202ae556e7a1ab03bec057f23da4756bbd91bd2d744cd7a64b336740fd2782bb4db5c3b7b496
DIST ninja-1.11.0.tar.gz 229475 BLAKE2B 71c8b6cf9524bdc11cf73f7e761f0d7deef2498a970c1439c10cc7d361e31fed1e3b54bcb185f3c7ed041f15704851a96e42560058af61b8a5df6e918d52ebf3 SHA512 9b9c8dae2251f9ddba50680911271b8504c292994fd90a0da94902f64c69a9edc72212217df5c651ddfc2f79c2ae03e84c99b805497dcd7497c53a1617de83e7
DIST ninja-1.11.1.tar.gz 229479 BLAKE2B c96cf7c319b7abd65f644465688d256f8b3a576c4616d0c63852e25dd0dc5f63c66708d429d8dddb6228502eb147211a86a5dd369b80ec2228902b370d2343e5 SHA512 1bca38877c70ee6613f347ffccef5adc02ba0a3947c62ae004ea97f918442b5a3de92378e4f820ae2a7676bc7609d25fbc7d41f6cfb3a61e5e4b26ec3639e403

View File

@ -1,38 +0,0 @@
From b748d085618bf5e802de6a13b07d632d20ab04bf Mon Sep 17 00:00:00 2001
From: Mike Gilbert <floppym@gentoo.org>
Date: Fri, 20 Mar 2020 19:36:01 -0400
Subject: [PATCH] Replace references to README with README.md
The README file was renamed to README.md in commit
a37da20ae74c81703b1c811182fc154d95ed46fe.
---
configure.py | 2 +-
misc/packaging/ninja.spec | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.py b/configure.py
index 7d8ce9045..8eef7e6eb 100755
--- a/configure.py
+++ b/configure.py
@@ -649,7 +649,7 @@ def has_re2c():
command='$doxygen_mainpage_generator $in > $out',
description='DOXYGEN_MAINPAGE $out')
mainpage = n.build(built('doxygen_mainpage'), 'doxygen_mainpage',
- ['README', 'COPYING'],
+ ['README.md', 'COPYING'],
implicit=['$doxygen_mainpage_generator'])
n.build('doxygen', 'doxygen', doc('doxygen.config'),
implicit=mainpage)
diff --git a/misc/packaging/ninja.spec b/misc/packaging/ninja.spec
index 05f5a079a..36e518186 100644
--- a/misc/packaging/ninja.spec
+++ b/misc/packaging/ninja.spec
@@ -32,7 +32,7 @@ cp -p ninja %{buildroot}%{_bindir}/
%files
%defattr(-, root, root)
-%doc COPYING README doc/manual.html
+%doc COPYING README.md doc/manual.html
%{_bindir}/*
%clean

View File

@ -6,6 +6,6 @@
<name>Chromium in Gentoo Project</name>
</maintainer>
<upstream>
<remote-id type="github">martine/ninja</remote-id>
<remote-id type="github">ninja-build/ninja</remote-id>
</upstream>
</pkgmetadata>

View File

@ -1,133 +0,0 @@
# Copyright 2012-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{7,8} )
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 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 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
)
)
"
PATCHES=(
"${FILESDIR}"/ninja-cflags.patch
"${FILESDIR}"/ninja-1.10.0-readme.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
./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
}

View File

@ -1,136 +0,0 @@
# Copyright 2012-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{8..10} )
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 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 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
)
)
"
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
# enable LFS, bug #760848
export CXXFLAGS+=" -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
BUILD_CXXFLAGS+=" -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
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
}

View File

@ -1,9 +1,9 @@
# Copyright 2012-2021 Gentoo Authors
# Copyright 2012-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{7,8,9} )
PYTHON_COMPAT=( python3_{8..11} )
inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
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 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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"
@ -31,6 +31,7 @@ BDEPEND="
app-text/asciidoc
app-doc/doxygen
dev-libs/libxslt
media-gfx/graphviz
)
test? ( dev-cpp/gtest )
"

View File

@ -1,18 +1,18 @@
# Copyright 2012-2021 Gentoo Authors
# Copyright 2012-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
EAPI=8
PYTHON_COMPAT=( python3_{7,8,9} )
PYTHON_COMPAT=( python3_{8..11} )
inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
inherit edo 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"
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 ~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"
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"
@ -21,7 +21,7 @@ HOMEPAGE="https://ninja-build.org/"
LICENSE="Apache-2.0"
SLOT="0"
IUSE="doc emacs test vim-syntax"
IUSE="doc emacs test"
RESTRICT="!test? ( test )"
BDEPEND="
@ -31,18 +31,11 @@ BDEPEND="
app-text/asciidoc
app-doc/doxygen
dev-libs/libxslt
media-gfx/graphviz
)
test? ( dev-cpp/gtest )
"
RDEPEND="
emacs? ( >=app-editors/emacs-23.1:* )
vim-syntax? (
|| (
app-editors/vim
app-editors/gvim
)
)
"
RDEPEND="emacs? ( >=app-editors/emacs-23.1:* )"
PATCHES=(
"${FILESDIR}"/ninja-cflags.patch
@ -89,30 +82,30 @@ src_test() {
if ! tc-is-cross-compiler; then
# Bug 485772
ulimit -n 2048
./ninja -v ninja_test || die
./ninja_test || die
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}"
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"
echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}"/ninja.vim || die
insinto /usr/share/vim/vimfiles/ftdetect
doins "${T}/ninja.vim"
fi
doins "${T}"/ninja.vim
insinto /usr/share/zsh/site-functions
newins misc/zsh-completion _ninja

View File

@ -1,18 +1,18 @@
# Copyright 2012-2021 Gentoo Authors
# Copyright 2012-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
PYTHON_COMPAT=( python3_{8..11} )
inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
inherit edo 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"
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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
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"
@ -21,7 +21,7 @@ HOMEPAGE="https://ninja-build.org/"
LICENSE="Apache-2.0"
SLOT="0"
IUSE="doc emacs test vim-syntax"
IUSE="doc emacs test"
RESTRICT="!test? ( test )"
BDEPEND="
@ -31,18 +31,11 @@ BDEPEND="
app-text/asciidoc
app-doc/doxygen
dev-libs/libxslt
media-gfx/graphviz
)
test? ( dev-cpp/gtest )
"
RDEPEND="
emacs? ( >=app-editors/emacs-23.1:* )
vim-syntax? (
|| (
app-editors/vim
app-editors/gvim
)
)
"
RDEPEND="emacs? ( >=app-editors/emacs-23.1:* )"
PATCHES=(
"${FILESDIR}"/ninja-cflags.patch
@ -89,30 +82,30 @@ src_test() {
if ! tc-is-cross-compiler; then
# Bug 485772
ulimit -n 2048
./ninja -v ninja_test || die
./ninja_test || die
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}"
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"
echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}"/ninja.vim || die
insinto /usr/share/vim/vimfiles/ftdetect
doins "${T}/ninja.vim"
fi
doins "${T}"/ninja.vim
insinto /usr/share/zsh/site-functions
newins misc/zsh-completion _ninja