[gentoo-commits] repo/gentoo:master commit in: dev-build/ninja/

2024-05-31 Thread Sam James 
commit: 5707d9394c78b2d83c6eee75214f8bd7ac832942
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun  1 03:54:50 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun  1 03:54:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5707d939

dev-build/ninja: drop 1.12.0

Signed-off-by: Sam James  gentoo.org>

 dev-build/ninja/Manifest|   1 -
 dev-build/ninja/ninja-1.12.0.ebuild | 106 
 2 files changed, 107 deletions(-)

diff --git a/dev-build/ninja/Manifest b/dev-build/ninja/Manifest
index 8e41e460a754..31bb62aaf6a5 100644
--- a/dev-build/ninja/Manifest
+++ b/dev-build/ninja/Manifest
@@ -1,3 +1,2 @@
 DIST ninja-1.11.1.tar.gz 229479 BLAKE2B 
c96cf7c319b7abd65f644465688d256f8b3a576c4616d0c63852e25dd0dc5f63c66708d429d8dddb6228502eb147211a86a5dd369b80ec2228902b370d2343e5
 SHA512 
1bca38877c70ee6613f347ffccef5adc02ba0a3947c62ae004ea97f918442b5a3de92378e4f820ae2a7676bc7609d25fbc7d41f6cfb3a61e5e4b26ec3639e403
-DIST ninja-1.12.0.tar.gz 240291 BLAKE2B 
e7d721ab62164574b076f7cbf6d40fd2ee950534d124a58f5fe9e09bdae5895c8dc9dd7636a9f2f2b79774d6d9ba5f831e2c8b370826029af060fdc80fdc207f
 SHA512 
167cd838ad47815183b79302a6e19227d956e634ae9d4211f0895ea9f4d893932e1154a765a9d5a1a3167b1a48b398f255fb4f46eb1395a6da11070bda628875
 DIST ninja-1.12.1.tar.gz 240483 BLAKE2B 
915545888cbd7d9e6e7e4fb0bad42f6c36ecef2de93356966541de0f8f4315e59e47cf20f189de5de11ba2a038488c7964ec709bad8868488cc03524a88483f4
 SHA512 
d6e6f0e89a4844a69069ff0c7cefc07704a41c7b0c062a57534de87decdde63e27928147b32b806aa7efa1061f031a1319b074391db61b0cbdccf096954c

diff --git a/dev-build/ninja/ninja-1.12.0.ebuild 
b/dev-build/ninja/ninja-1.12.0.ebuild
deleted file mode 100644
index 3af9c43f1b06..
--- a/dev-build/ninja/ninja-1.12.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 2012-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit bash-completion-r1 edo python-any-r1 toolchain-funcs
-
-if [[ ${PV} ==  ]]; 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-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"
-
-BDEPEND="
-   ${PYTHON_DEPS}
-   dev-util/re2c
-   doc? (
-   app-text/asciidoc
-   app-text/doxygen
-   dev-libs/libxslt
-   media-gfx/graphviz
-   )
-"
-PDEPEND="
-   app-alternatives/ninja
-"
-
-pkg_setup() {
-   :
-}
-
-src_prepare() {
-   local PATCHES=(
-   "${FILESDIR}"/ninja-cflags.patch
-   )
-   default
-}
-
-bootstrap() {
-   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} -D_FILE_OFFSET_BITS=64"
-   local -x LDFLAGS=${BUILD_LDFLAGS}
-   fi
-   edo ${EPYTHON} configure.py --with-python=python --bootstrap --verbose
-}
-
-src_compile() {
-   python_setup
-
-   tc-export AR CXX
-   unset CFLAGS
-   export CXXFLAGS="${CXXFLAGS} -D_FILE_OFFSET_BITS=64"
-
-   bootstrap
-
-   if use doc; then
-   edo ./ninja -v doxygen manual
-   fi
-
-   if tc-is-cross-compiler; then
-   edo ${EPYTHON} configure.py --with-python=python
-   edo ./ninja -v ninja
-   fi
-}
-
-src_install() {
-   newbin ninja{,-reference}
-
-   if use doc; then
-   docinto html
-   dodoc -r doc/doxygen/html/.
-   dodoc doc/manual.html
-   fi
-
-   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
-}
-
-pkg_postinst() {
-   if ! [[ -e "${EROOT}/usr/bin/ninja" ]]; then
-   ln -s ninja-reference "${EROOT}/usr/bin/ninja" || die
-   fi
-}

[gentoo-commits] repo/gentoo:master commit in: dev-build/ninja/

2024-05-11 Thread Sam James 
commit: d54bb97f340dca4ff8b785623b14a5412d967747
Author: Sam James  gentoo  org>
AuthorDate: Sat May 11 16:59:09 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May 11 17:02:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d54bb97f

dev-build/ninja: add 1.12.1

Signed-off-by: Sam James  gentoo.org>

 dev-build/ninja/Manifest   | 1 +
 dev-build/ninja/{ninja-.ebuild => ninja-1.12.1.ebuild} | 2 +-
 dev-build/ninja/ninja-.ebuild  | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dev-build/ninja/Manifest b/dev-build/ninja/Manifest
index 5a84814e8171..8e41e460a754 100644
--- a/dev-build/ninja/Manifest
+++ b/dev-build/ninja/Manifest
@@ -1,2 +1,3 @@
 DIST ninja-1.11.1.tar.gz 229479 BLAKE2B 
c96cf7c319b7abd65f644465688d256f8b3a576c4616d0c63852e25dd0dc5f63c66708d429d8dddb6228502eb147211a86a5dd369b80ec2228902b370d2343e5
 SHA512 
1bca38877c70ee6613f347ffccef5adc02ba0a3947c62ae004ea97f918442b5a3de92378e4f820ae2a7676bc7609d25fbc7d41f6cfb3a61e5e4b26ec3639e403
 DIST ninja-1.12.0.tar.gz 240291 BLAKE2B 
e7d721ab62164574b076f7cbf6d40fd2ee950534d124a58f5fe9e09bdae5895c8dc9dd7636a9f2f2b79774d6d9ba5f831e2c8b370826029af060fdc80fdc207f
 SHA512 
167cd838ad47815183b79302a6e19227d956e634ae9d4211f0895ea9f4d893932e1154a765a9d5a1a3167b1a48b398f255fb4f46eb1395a6da11070bda628875
+DIST ninja-1.12.1.tar.gz 240483 BLAKE2B 
915545888cbd7d9e6e7e4fb0bad42f6c36ecef2de93356966541de0f8f4315e59e47cf20f189de5de11ba2a038488c7964ec709bad8868488cc03524a88483f4
 SHA512 
d6e6f0e89a4844a69069ff0c7cefc07704a41c7b0c062a57534de87decdde63e27928147b32b806aa7efa1061f031a1319b074391db61b0cbdccf096954c

diff --git a/dev-build/ninja/ninja-.ebuild 
b/dev-build/ninja/ninja-1.12.1.ebuild
similarity index 98%
copy from dev-build/ninja/ninja-.ebuild
copy to dev-build/ninja/ninja-1.12.1.ebuild
index 3af9c43f1b06..b387ddf90c06 100644
--- a/dev-build/ninja/ninja-.ebuild
+++ b/dev-build/ninja/ninja-1.12.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit bash-completion-r1 edo python-any-r1 toolchain-funcs
 

diff --git a/dev-build/ninja/ninja-.ebuild 
b/dev-build/ninja/ninja-.ebuild
index 3af9c43f1b06..b387ddf90c06 100644
--- a/dev-build/ninja/ninja-.ebuild
+++ b/dev-build/ninja/ninja-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit bash-completion-r1 edo python-any-r1 toolchain-funcs

[gentoo-commits] repo/gentoo:master commit in: dev-build/ninja/

2024-04-19 Thread Mike Gilbert 
commit: d3cec83caf1478a2ac994ac2ca2d149553e61132
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Apr 20 00:17:03 2024 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Apr 20 00:17:03 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3cec83c

dev-build/ninja: switch back to configure.py

Using cmake causes a circular dependency via dev-libs/jsoncpp.

Signed-off-by: Mike Gilbert  gentoo.org>

 dev-build/ninja/ninja-1.12.0.ebuild | 63 +
 dev-build/ninja/ninja-.ebuild   | 63 +
 2 files changed, 56 insertions(+), 70 deletions(-)

diff --git a/dev-build/ninja/ninja-1.12.0.ebuild 
b/dev-build/ninja/ninja-1.12.0.ebuild
index c7a7c9ee0b26..3af9c43f1b06 100644
--- a/dev-build/ninja/ninja-1.12.0.ebuild
+++ b/dev-build/ninja/ninja-1.12.0.ebuild
@@ -3,10 +3,9 @@
 
 EAPI=8
 
-CMAKE_MAKEFILE_GENERATOR=emake
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit bash-completion-r1 edo cmake python-any-r1 toolchain-funcs
+inherit bash-completion-r1 edo python-any-r1 toolchain-funcs
 
 if [[ ${PV} ==  ]]; then
EGIT_REPO_URI="https://github.com/ninja-build/ninja.git;
@@ -21,19 +20,17 @@ HOMEPAGE="https://ninja-build.org/;
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
+IUSE="doc"
 
 BDEPEND="
+   ${PYTHON_DEPS}
dev-util/re2c
doc? (
-   ${PYTHON_DEPS}
app-text/asciidoc
app-text/doxygen
dev-libs/libxslt
media-gfx/graphviz
)
-   test? ( dev-cpp/gtest )
 "
 PDEPEND="
app-alternatives/ninja
@@ -43,49 +40,45 @@ pkg_setup() {
:
 }
 
-src_configure() {
-   local mycmakeargs=(
-   -DBUILD_TESTING=$(usex test ON OFF)
+src_prepare() {
+   local PATCHES=(
+   "${FILESDIR}"/ninja-cflags.patch
)
-   cmake_src_configure
+   default
+}
 
-   if use doc; then
-   if tc-is-cross-compiler; then
-   mycmakeargs=( -DBUILD_TESTING=OFF )
-   local BUILD_DIR=${WORKDIR}/native
-   local SYSROOT=
-   tc-env_build cmake_src_configure
-   fi
-
-   python_setup
-   edo ${EPYTHON} configure.py
+bootstrap() {
+   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} -D_FILE_OFFSET_BITS=64"
+   local -x LDFLAGS=${BUILD_LDFLAGS}
fi
+   edo ${EPYTHON} configure.py --with-python=python --bootstrap --verbose
 }
 
 src_compile() {
-   cmake_src_compile
+   python_setup
+
+   tc-export AR CXX
+   unset CFLAGS
+   export CXXFLAGS="${CXXFLAGS} -D_FILE_OFFSET_BITS=64"
+
+   bootstrap
 
if use doc; then
-   if tc-is-cross-compiler; then
-   local BUILD_DIR=${WORKDIR}/native
-   cmake_build ninja
-   fi
-   edo "${BUILD_DIR}/ninja" -v -j1 doxygen manual
+   edo ./ninja -v doxygen manual
fi
-}
 
-src_test() {
-   if ! tc-is-cross-compiler; then
-   # Bug 485772
-   ulimit -n 2048
-   cmake_src_test
+   if tc-is-cross-compiler; then
+   edo ${EPYTHON} configure.py --with-python=python
+   edo ./ninja -v ninja
fi
 }
 
 src_install() {
-   cmake_src_install
-
-   mv "${ED}"/usr/bin/ninja{,-reference} || die
+   newbin ninja{,-reference}
 
if use doc; then
docinto html

diff --git a/dev-build/ninja/ninja-.ebuild 
b/dev-build/ninja/ninja-.ebuild
index c7a7c9ee0b26..3af9c43f1b06 100644
--- a/dev-build/ninja/ninja-.ebuild
+++ b/dev-build/ninja/ninja-.ebuild
@@ -3,10 +3,9 @@
 
 EAPI=8
 
-CMAKE_MAKEFILE_GENERATOR=emake
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit bash-completion-r1 edo cmake python-any-r1 toolchain-funcs
+inherit bash-completion-r1 edo python-any-r1 toolchain-funcs
 
 if [[ ${PV} ==  ]]; then
EGIT_REPO_URI="https://github.com/ninja-build/ninja.git;
@@ -21,19 +20,17 @@ HOMEPAGE="https://ninja-build.org/;
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
+IUSE="doc"
 
 BDEPEND="
+   ${PYTHON_DEPS}
dev-util/re2c
doc? (
-   ${PYTHON_DEPS}
app-text/asciidoc
app-text/doxygen
dev-libs/libxslt
media-gfx/graphviz
)
-   test? ( dev-cpp/gtest )
 "
 PDEPEND="
app-alternatives/ninja
@@ -43,49 +40,45 @@ pkg_setup() {
:
 }
 
-src_configure() {
-   local mycmakeargs=(
-   -DBUILD_TESTING=$(usex test ON OFF)
+src_prepare() {
+   local PATCHES=(
+   "${FILESDIR}"/ninja-cflags.patch
)
-

[gentoo-commits] repo/gentoo:master commit in: dev-build/ninja/

2024-04-18 Thread Mike Gilbert 
commit: 1122aa04647a60de150811c133490d248de4bc43
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Apr 18 19:27:38 2024 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Thu Apr 18 19:30:03 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1122aa04

dev-build/ninja: improve docs support when cross-compiling

Signed-off-by: Mike Gilbert  gentoo.org>

 dev-build/ninja/ninja-1.12.0.ebuild | 21 +++--
 dev-build/ninja/ninja-.ebuild   | 21 +++--
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/dev-build/ninja/ninja-1.12.0.ebuild 
b/dev-build/ninja/ninja-1.12.0.ebuild
index fd0e6fc7d748..c7a7c9ee0b26 100644
--- a/dev-build/ninja/ninja-1.12.0.ebuild
+++ b/dev-build/ninja/ninja-1.12.0.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=8
 
-CMAKE_IN_SOURCE_BUILD=1 # Simplifies doc build
 CMAKE_MAKEFILE_GENERATOR=emake
 PYTHON_COMPAT=( python3_{10..12} )
 
@@ -51,6 +50,13 @@ src_configure() {
cmake_src_configure
 
if use doc; then
+   if tc-is-cross-compiler; then
+   mycmakeargs=( -DBUILD_TESTING=OFF )
+   local BUILD_DIR=${WORKDIR}/native
+   local SYSROOT=
+   tc-env_build cmake_src_configure
+   fi
+
python_setup
edo ${EPYTHON} configure.py
fi
@@ -60,16 +66,11 @@ src_compile() {
cmake_src_compile
 
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
+   local BUILD_DIR=${WORKDIR}/native
+   cmake_build ninja
fi
+   edo "${BUILD_DIR}/ninja" -v -j1 doxygen manual
fi
 }
 
@@ -86,7 +87,7 @@ src_install() {
 
mv "${ED}"/usr/bin/ninja{,-reference} || die
 
-   if [[ ${DOCS_BUILT} == yes ]]; then
+   if use doc; then
docinto html
dodoc -r doc/doxygen/html/.
dodoc doc/manual.html

diff --git a/dev-build/ninja/ninja-.ebuild 
b/dev-build/ninja/ninja-.ebuild
index fd0e6fc7d748..c7a7c9ee0b26 100644
--- a/dev-build/ninja/ninja-.ebuild
+++ b/dev-build/ninja/ninja-.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=8
 
-CMAKE_IN_SOURCE_BUILD=1 # Simplifies doc build
 CMAKE_MAKEFILE_GENERATOR=emake
 PYTHON_COMPAT=( python3_{10..12} )
 
@@ -51,6 +50,13 @@ src_configure() {
cmake_src_configure
 
if use doc; then
+   if tc-is-cross-compiler; then
+   mycmakeargs=( -DBUILD_TESTING=OFF )
+   local BUILD_DIR=${WORKDIR}/native
+   local SYSROOT=
+   tc-env_build cmake_src_configure
+   fi
+
python_setup
edo ${EPYTHON} configure.py
fi
@@ -60,16 +66,11 @@ src_compile() {
cmake_src_compile
 
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
+   local BUILD_DIR=${WORKDIR}/native
+   cmake_build ninja
fi
+   edo "${BUILD_DIR}/ninja" -v -j1 doxygen manual
fi
 }
 
@@ -86,7 +87,7 @@ src_install() {
 
mv "${ED}"/usr/bin/ninja{,-reference} || die
 
-   if [[ ${DOCS_BUILT} == yes ]]; then
+   if use doc; then
docinto html
dodoc -r doc/doxygen/html/.
dodoc doc/manual.html

[gentoo-commits] repo/gentoo:master commit in: dev-build/ninja/

2024-04-16 Thread Mike Gilbert 
commit: 00f988e1a48d08c5758de35771776104471ee97f
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue Apr 16 15:12:26 2024 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Tue Apr 16 15:12:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00f988e1

dev-build/ninja: enable docs build when cross-compiling

... if ninja is in PATH.

Signed-off-by: Mike Gilbert  gentoo.org>

 dev-build/ninja/ninja-1.12.0.ebuild | 21 +
 dev-build/ninja/ninja-.ebuild   | 21 +
 2 files changed, 26 insertions(+), 16 deletions(-)

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-.ebuild 
b/dev-build/ninja/ninja-.ebuild
index 932bf822922b..fd0e6fc7d748 100644
--- a/dev-build/ninja/ninja-.ebuild
+++ b/dev-build/ninja/ninja-.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

[gentoo-commits] repo/gentoo:master commit in: dev-build/ninja/

2024-04-15 Thread Mike Gilbert 
commit: c236ec2e25c74092b85e6c78c02c66745e606a48
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Apr 15 20:12:08 2024 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Apr 15 20:12:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c236ec2e

dev-build/ninja: add 1.12.0

Closes: https://bugs.gentoo.org/929221
Signed-off-by: Mike Gilbert  gentoo.org>

 dev-build/ninja/Manifest|   1 +
 dev-build/ninja/ninja-1.12.0.ebuild | 107 
 2 files changed, 108 insertions(+)

diff --git a/dev-build/ninja/Manifest b/dev-build/ninja/Manifest
index 4ccdb98ca1a4..5a84814e8171 100644
--- a/dev-build/ninja/Manifest
+++ b/dev-build/ninja/Manifest
@@ -1 +1,2 @@
 DIST ninja-1.11.1.tar.gz 229479 BLAKE2B 
c96cf7c319b7abd65f644465688d256f8b3a576c4616d0c63852e25dd0dc5f63c66708d429d8dddb6228502eb147211a86a5dd369b80ec2228902b370d2343e5
 SHA512 
1bca38877c70ee6613f347ffccef5adc02ba0a3947c62ae004ea97f918442b5a3de92378e4f820ae2a7676bc7609d25fbc7d41f6cfb3a61e5e4b26ec3639e403
+DIST ninja-1.12.0.tar.gz 240291 BLAKE2B 
e7d721ab62164574b076f7cbf6d40fd2ee950534d124a58f5fe9e09bdae5895c8dc9dd7636a9f2f2b79774d6d9ba5f831e2c8b370826029af060fdc80fdc207f
 SHA512 
167cd838ad47815183b79302a6e19227d956e634ae9d4211f0895ea9f4d893932e1154a765a9d5a1a3167b1a48b398f255fb4f46eb1395a6da11070bda628875

diff --git a/dev-build/ninja/ninja-1.12.0.ebuild 
b/dev-build/ninja/ninja-1.12.0.ebuild
new file mode 100644
index ..932bf822922b
--- /dev/null
+++ b/dev-build/ninja/ninja-1.12.0.ebuild
@@ -0,0 +1,107 @@
+# Copyright 2012-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_IN_SOURCE_BUILD=1 # Simplifies doc build
+CMAKE_MAKEFILE_GENERATOR=emake
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit bash-completion-r1 edo cmake python-any-r1 toolchain-funcs
+
+if [[ ${PV} ==  ]]; 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-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 test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+   dev-util/re2c
+   doc? (
+   ${PYTHON_DEPS}
+   app-text/asciidoc
+   app-text/doxygen
+   dev-libs/libxslt
+   media-gfx/graphviz
+   )
+   test? ( dev-cpp/gtest )
+"
+PDEPEND="
+   app-alternatives/ninja
+"
+
+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
+   python_setup
+   edo ${EPYTHON} configure.py
+   fi
+}
+
+src_compile() {
+   cmake_src_compile
+
+   if docs_enabled; then
+   edo ./ninja -v -j1 doxygen manual
+   fi
+}
+
+src_test() {
+   if ! tc-is-cross-compiler; then
+   # Bug 485772
+   ulimit -n 2048
+   cmake_src_test
+   fi
+}
+
+src_install() {
+   cmake_src_install
+
+   mv "${ED}"/usr/bin/ninja{,-reference} || die
+
+   if docs_enabled; then
+   docinto html
+   dodoc -r doc/doxygen/html/.
+   dodoc doc/manual.html
+   fi
+
+   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
+}
+
+pkg_postinst() {
+   if ! [[ -e "${EROOT}/usr/bin/ninja" ]]; then
+   ln -s ninja-reference "${EROOT}/usr/bin/ninja" || die
+   fi
+}

[gentoo-commits] repo/gentoo:master commit in: dev-build/ninja/

2024-04-15 Thread Mike Gilbert 
commit: cad3542b8b988747e5b5c9a28dfa3650e426ce2c
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Apr 15 20:05:32 2024 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Apr 15 20:12:30 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cad3542b

dev-build/ninja: switch to cmake build system

configure.py no longer supports building tests.
Using cmake also simplifies cross-compiles.

Bug: https://bugs.gentoo.org/929221
Signed-off-by: Mike Gilbert  gentoo.org>

 dev-build/ninja/ninja-.ebuild | 66 +--
 1 file changed, 28 insertions(+), 38 deletions(-)

diff --git a/dev-build/ninja/ninja-.ebuild 
b/dev-build/ninja/ninja-.ebuild
index 9442eeaecf97..932bf822922b 100644
--- a/dev-build/ninja/ninja-.ebuild
+++ b/dev-build/ninja/ninja-.ebuild
@@ -3,9 +3,11 @@
 
 EAPI=8
 
+CMAKE_IN_SOURCE_BUILD=1 # Simplifies doc build
+CMAKE_MAKEFILE_GENERATOR=emake
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit edo bash-completion-r1 python-any-r1 toolchain-funcs
+inherit bash-completion-r1 edo cmake python-any-r1 toolchain-funcs
 
 if [[ ${PV} ==  ]]; then
EGIT_REPO_URI="https://github.com/ninja-build/ninja.git;
@@ -24,9 +26,9 @@ IUSE="doc test"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
-   ${PYTHON_DEPS}
dev-util/re2c
doc? (
+   ${PYTHON_DEPS}
app-text/asciidoc
app-text/doxygen
dev-libs/libxslt
@@ -38,42 +40,31 @@ PDEPEND="
app-alternatives/ninja
 "
 
-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} -D_FILE_OFFSET_BITS=64"
-   local -x LDFLAGS=${BUILD_LDFLAGS}
-   fi
-   echo "$@" >&2
-   "$@"
+pkg_setup() {
+   :
 }
 
-src_compile() {
-   tc-export AR CXX
-
-   # configure.py appends CFLAGS to CXXFLAGS
-   unset CFLAGS
-
-   local -x CXXFLAGS="${CXXFLAGS} -D_FILE_OFFSET_BITS=64"
+docs_enabled() {
+   use doc && ! tc-is-cross-compiler
+}
 
-   run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die
+src_configure() {
+   local mycmakeargs=(
+   -DBUILD_TESTING=$(usex test ON OFF)
+   )
+   cmake_src_configure
 
-   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
+   if docs_enabled; then
+   python_setup
+   edo ${EPYTHON} configure.py
fi
+}
+
+src_compile() {
+   cmake_src_compile
 
-   if use doc; then
-   ./ninja-build -v doxygen manual || die
+   if docs_enabled; then
+   edo ./ninja -v -j1 doxygen manual
fi
 }
 
@@ -81,22 +72,21 @@ src_test() {
if ! tc-is-cross-compiler; then
# Bug 485772
ulimit -n 2048
-   edo ./ninja -v ninja_test
-   edo ./ninja_test
+   cmake_src_test
fi
 }
 
 src_install() {
-   dodoc README.md CONTRIBUTING.md
+   cmake_src_install
 
-   if use doc; then
+   mv "${ED}"/usr/bin/ninja{,-reference} || die
+
+   if docs_enabled; then
docinto html
dodoc -r doc/doxygen/html/.
dodoc doc/manual.html
fi
 
-   newbin ninja ninja-reference
-
newbashcomp misc/bash-completion ${PN}
 
insinto /usr/share/vim/vimfiles/syntax/

[gentoo-commits] repo/gentoo:master commit in: dev-build/ninja/

2024-02-21 Thread Mike Gilbert 
commit: be0f08020ddeea3acc624b2734e6dd763b15d992
Author: Mike Gilbert  gentoo  org>
AuthorDate: Wed Feb 21 20:52:59 2024 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Wed Feb 21 20:59:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be0f0802

dev-build/ninja: drop 1.11.1-r2, 1.11.1-r3, 1.11.1-r4

Signed-off-by: Mike Gilbert  gentoo.org>

 dev-build/ninja/ninja-1.11.1-r2.ebuild | 127 
 dev-build/ninja/ninja-1.11.1-r3.ebuild | 131 -
 dev-build/ninja/ninja-1.11.1-r4.ebuild | 117 -
 3 files changed, 375 deletions(-)

diff --git a/dev-build/ninja/ninja-1.11.1-r2.ebuild 
b/dev-build/ninja/ninja-1.11.1-r2.ebuild
deleted file mode 100644
index 0cb89335a647..
--- a/dev-build/ninja/ninja-1.11.1-r2.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 2012-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit edo bash-completion-r1 elisp-common flag-o-matic python-any-r1 
toolchain-funcs
-
-if [[ ${PV} ==  ]]; 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-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"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-   ${PYTHON_DEPS}
-   dev-util/re2c
-   doc? (
-   app-text/asciidoc
-   app-text/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-build/ninja/ninja-1.11.1-r3.ebuild 
b/dev-build/ninja/ninja-1.11.1-r3.ebuild
deleted file mode 100644
index 2ca427037c35..
--- a/dev-build/ninja/ninja-1.11.1-r3.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 2012-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit edo bash-completion-r1 elisp-common flag-o-matic python-any-r1 
toolchain-funcs
-
-if [[ ${PV} ==  ]]; 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos

[gentoo-commits] repo/gentoo:master commit in: dev-build/ninja/files/, dev-build/ninja/

2024-02-21 Thread Mike Gilbert 
commit: 9549bcf6aceef0dcc7cbe779d30d7733dbe8f0f2
Author: Mike Gilbert  gentoo  org>
AuthorDate: Wed Feb 21 20:56:03 2024 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Wed Feb 21 20:59:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9549bcf6

dev-build/ninja: simplify LFS handling

Just append -D_FILE_OFFSET_BITS=64 to CXXFLAGS directly.

Signed-off-by: Mike Gilbert  gentoo.org>

 dev-build/ninja/files/ninja-cppflags.patch | 21 -
 dev-build/ninja/ninja-1.11.1-r5.ebuild |  7 +++
 dev-build/ninja/ninja-.ebuild  |  7 +++
 3 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/dev-build/ninja/files/ninja-cppflags.patch 
b/dev-build/ninja/files/ninja-cppflags.patch
deleted file mode 100644
index 375f6fce6045..
--- a/dev-build/ninja/files/ninja-cppflags.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Needed for append-lfs-flags to work.
 a/configure.py
-+++ b/configure.py
-@@ -261,7 +261,7 @@ configure_args = sys.argv[1:]
- if '--bootstrap' in configure_args:
- configure_args.remove('--bootstrap')
- n.variable('configure_args', ' '.join(configure_args))
--env_keys = set(['CXX', 'AR', 'CFLAGS', 'CXXFLAGS', 'LDFLAGS'])
-+env_keys = set(['CXX', 'AR', 'CFLAGS', 'CPPFLAGS', 'CXXFLAGS', 'LDFLAGS'])
- configure_env = dict((k, os.environ[k]) for k in os.environ if k in env_keys)
- if configure_env:
- config_str = ' '.join([k + '=' + pipes.quote(configure_env[k])
-@@ -406,6 +406,8 @@ def shell_escape(str):
- if 'CFLAGS' in configure_env:
- cflags.append(configure_env['CFLAGS'])
- ldflags.append(configure_env['CFLAGS'])
-+if 'CPPFLAGS' in configure_env:
-+cflags.append(configure_env['CPPFLAGS'])
- if 'CXXFLAGS' in configure_env:
- cflags.append(configure_env['CXXFLAGS'])
- ldflags.append(configure_env['CXXFLAGS'])

diff --git a/dev-build/ninja/ninja-1.11.1-r5.ebuild 
b/dev-build/ninja/ninja-1.11.1-r5.ebuild
index ee03031346ed..44ee3c27b3bd 100644
--- a/dev-build/ninja/ninja-1.11.1-r5.ebuild
+++ b/dev-build/ninja/ninja-1.11.1-r5.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit edo bash-completion-r1 flag-o-matic python-any-r1 toolchain-funcs
+inherit edo bash-completion-r1 python-any-r1 toolchain-funcs
 
 if [[ ${PV} ==  ]]; then
EGIT_REPO_URI="https://github.com/ninja-build/ninja.git;
@@ -40,7 +40,6 @@ PDEPEND="
 
 PATCHES=(
"${FILESDIR}"/ninja-cflags.patch
-   "${FILESDIR}"/ninja-cppflags.patch
 )
 
 run_for_build() {
@@ -48,7 +47,7 @@ run_for_build() {
local -x AR=$(tc-getBUILD_AR)
local -x CXX=$(tc-getBUILD_CXX)
local -x CFLAGS=
-   local -x CXXFLAGS=${BUILD_CXXFLAGS}
+   local -x CXXFLAGS="${BUILD_CXXFLAGS} -D_FILE_OFFSET_BITS=64"
local -x LDFLAGS=${BUILD_LDFLAGS}
fi
echo "$@" >&2
@@ -61,7 +60,7 @@ src_compile() {
# configure.py appends CFLAGS to CXXFLAGS
unset CFLAGS
 
-   append-lfs-flags
+   local -x CXXFLAGS="${CXXFLAGS} -D_FILE_OFFSET_BITS=64"
 
run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die
 

diff --git a/dev-build/ninja/ninja-.ebuild 
b/dev-build/ninja/ninja-.ebuild
index eae54565f9fc..9442eeaecf97 100644
--- a/dev-build/ninja/ninja-.ebuild
+++ b/dev-build/ninja/ninja-.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit edo bash-completion-r1 flag-o-matic python-any-r1 toolchain-funcs
+inherit edo bash-completion-r1 python-any-r1 toolchain-funcs
 
 if [[ ${PV} ==  ]]; then
EGIT_REPO_URI="https://github.com/ninja-build/ninja.git;
@@ -40,7 +40,6 @@ PDEPEND="
 
 PATCHES=(
"${FILESDIR}"/ninja-cflags.patch
-   "${FILESDIR}"/ninja-cppflags.patch
 )
 
 run_for_build() {
@@ -48,7 +47,7 @@ run_for_build() {
local -x AR=$(tc-getBUILD_AR)
local -x CXX=$(tc-getBUILD_CXX)
local -x CFLAGS=
-   local -x CXXFLAGS=${BUILD_CXXFLAGS}
+   local -x CXXFLAGS="${BUILD_CXXFLAGS} -D_FILE_OFFSET_BITS=64"
local -x LDFLAGS=${BUILD_LDFLAGS}
fi
echo "$@" >&2
@@ -61,7 +60,7 @@ src_compile() {
# configure.py appends CFLAGS to CXXFLAGS
unset CFLAGS
 
-   append-lfs-flags
+   local -x CXXFLAGS="${CXXFLAGS} -D_FILE_OFFSET_BITS=64"
 
run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die

[gentoo-commits] repo/gentoo:master commit in: dev-build/ninja/

2024-02-06 Thread Sam James 
commit: 6f1b1849b7dc1dc728ae3ec4e6ad044048a7048f
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb  6 19:29:10 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb  6 19:29:10 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f1b1849

dev-build/ninja: Stabilize 1.11.1-r5 hppa, #923850

Signed-off-by: Sam James  gentoo.org>

 dev-build/ninja/ninja-1.11.1-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/ninja/ninja-1.11.1-r5.ebuild 
b/dev-build/ninja/ninja-1.11.1-r5.ebuild
index 9440dad6602f..ee03031346ed 100644
--- a/dev-build/ninja/ninja-1.11.1-r5.ebuild
+++ b/dev-build/ninja/ninja-1.11.1-r5.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} ==  ]]; then
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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="A small build system similar to make"

[gentoo-commits] repo/gentoo:master commit in: dev-build/ninja/

2024-02-05 Thread Sam James 
commit: ae025bd2e5131a725c5c25aa3c12cee29e59ba09
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb  6 02:27:22 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb  6 02:27:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae025bd2

dev-build/ninja: Stabilize 1.11.1-r5 amd64, #923850

Signed-off-by: Sam James  gentoo.org>

 dev-build/ninja/ninja-1.11.1-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/ninja/ninja-1.11.1-r5.ebuild 
b/dev-build/ninja/ninja-1.11.1-r5.ebuild
index 527e722bee7a..9440dad6602f 100644
--- a/dev-build/ninja/ninja-1.11.1-r5.ebuild
+++ b/dev-build/ninja/ninja-1.11.1-r5.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} ==  ]]; then
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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="A small build system similar to make"

[gentoo-commits] repo/gentoo:master commit in: dev-build/ninja/

2024-02-05 Thread Sam James 
commit: 10aa0c48e0b47c0a95a73f4779b95082ad62ecb2
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb  6 01:09:02 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb  6 01:09:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10aa0c48

dev-build/ninja: Stabilize 1.11.1-r5 x86, #923850

Signed-off-by: Sam James  gentoo.org>

 dev-build/ninja/ninja-1.11.1-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/ninja/ninja-1.11.1-r5.ebuild 
b/dev-build/ninja/ninja-1.11.1-r5.ebuild
index ee05fd49aafe..527e722bee7a 100644
--- a/dev-build/ninja/ninja-1.11.1-r5.ebuild
+++ b/dev-build/ninja/ninja-1.11.1-r5.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} ==  ]]; then
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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="A small build system similar to make"

[gentoo-commits] repo/gentoo:master commit in: dev-build/ninja/

2024-02-05 Thread Sam James 
commit: 7d619cb2b1f156011ef7d68d229886d3e07c24ce
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb  6 01:09:01 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb  6 01:09:01 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d619cb2

dev-build/ninja: Stabilize 1.11.1-r5 ppc64, #923850

Signed-off-by: Sam James  gentoo.org>

 dev-build/ninja/ninja-1.11.1-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/ninja/ninja-1.11.1-r5.ebuild 
b/dev-build/ninja/ninja-1.11.1-r5.ebuild
index 848958760824..ee05fd49aafe 100644
--- a/dev-build/ninja/ninja-1.11.1-r5.ebuild
+++ b/dev-build/ninja/ninja-1.11.1-r5.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} ==  ]]; then
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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="A small build system similar to make"

[gentoo-commits] repo/gentoo:master commit in: dev-build/ninja/

2024-02-05 Thread Sam James 
commit: 27c0d142ac3f7abad0125ea376e8b814882cbe87
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb  6 01:09:00 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb  6 01:09:00 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27c0d142

dev-build/ninja: Stabilize 1.11.1-r5 ppc, #923850

Signed-off-by: Sam James  gentoo.org>

 dev-build/ninja/ninja-1.11.1-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/ninja/ninja-1.11.1-r5.ebuild 
b/dev-build/ninja/ninja-1.11.1-r5.ebuild
index a262983b2a48..848958760824 100644
--- a/dev-build/ninja/ninja-1.11.1-r5.ebuild
+++ b/dev-build/ninja/ninja-1.11.1-r5.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} ==  ]]; then
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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc 
~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="A small build system similar to make"

[gentoo-commits] repo/gentoo:master commit in: dev-build/ninja/

2024-02-05 Thread Sam James 
commit: 84d8d8f18683d83d07ed774ed69d5aec570b6d62
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb  6 00:36:44 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb  6 00:36:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84d8d8f1

dev-build/ninja: Stabilize 1.11.1-r5 sparc, #923850

Signed-off-by: Sam James  gentoo.org>

 dev-build/ninja/ninja-1.11.1-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/ninja/ninja-1.11.1-r5.ebuild 
b/dev-build/ninja/ninja-1.11.1-r5.ebuild
index c4f79506da26..b134868baa75 100644
--- a/dev-build/ninja/ninja-1.11.1-r5.ebuild
+++ b/dev-build/ninja/ninja-1.11.1-r5.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} ==  ]]; then
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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="A small build system similar to make"

[gentoo-commits] repo/gentoo:master commit in: dev-build/ninja/

2024-02-05 Thread Sam James 
commit: e328b6bfe7d6969169e1a09bb0e8d7dca3010d79
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb  6 00:36:43 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb  6 00:36:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e328b6bf

dev-build/ninja: Stabilize 1.11.1-r5 arm64, #923850

Signed-off-by: Sam James  gentoo.org>

 dev-build/ninja/ninja-1.11.1-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/ninja/ninja-1.11.1-r5.ebuild 
b/dev-build/ninja/ninja-1.11.1-r5.ebuild
index eae54565f9fc..c4f79506da26 100644
--- a/dev-build/ninja/ninja-1.11.1-r5.ebuild
+++ b/dev-build/ninja/ninja-1.11.1-r5.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} ==  ]]; then
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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="A small build system similar to make"

[gentoo-commits] repo/gentoo:master commit in: dev-build/ninja/

2024-02-05 Thread Sam James 
commit: 432eac5a61b3ad67d4b452b1704b714dcde91eef
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb  6 00:36:45 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb  6 00:36:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=432eac5a

dev-build/ninja: Stabilize 1.11.1-r5 arm, #923850

Signed-off-by: Sam James  gentoo.org>

 dev-build/ninja/ninja-1.11.1-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-build/ninja/ninja-1.11.1-r5.ebuild 
b/dev-build/ninja/ninja-1.11.1-r5.ebuild
index b134868baa75..a262983b2a48 100644
--- a/dev-build/ninja/ninja-1.11.1-r5.ebuild
+++ b/dev-build/ninja/ninja-1.11.1-r5.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} ==  ]]; then
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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="A small build system similar to make"

[gentoo-commits] repo/gentoo:master commit in: dev-build/ninja/files/, dev-build/ninja/

2024-02-05 Thread Sam James 
commit: 102f79613e208193ade66e71ddf6530db3fadc05
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb  5 23:15:36 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb  5 23:16:32 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=102f7961

dev-build/ninja: fix LFS (by respecting CPPFLAGS)

Reported by dilfridge w/ x86 build on XFS (which has larger inodes). See
also 280be1cadfdfd607d422dcefa33e9f15bf9c638c.

Bug: https://bugs.gentoo.org/760848
Signed-off-by: Sam James  gentoo.org>

 dev-build/ninja/files/ninja-cppflags.patch  | 21 +
 .../{ninja-.ebuild => ninja-1.11.1-r5.ebuild}   |  1 +
 dev-build/ninja/ninja-.ebuild   |  1 +
 3 files changed, 23 insertions(+)

diff --git a/dev-build/ninja/files/ninja-cppflags.patch 
b/dev-build/ninja/files/ninja-cppflags.patch
new file mode 100644
index ..375f6fce6045
--- /dev/null
+++ b/dev-build/ninja/files/ninja-cppflags.patch
@@ -0,0 +1,21 @@
+Needed for append-lfs-flags to work.
+--- a/configure.py
 b/configure.py
+@@ -261,7 +261,7 @@ configure_args = sys.argv[1:]
+ if '--bootstrap' in configure_args:
+ configure_args.remove('--bootstrap')
+ n.variable('configure_args', ' '.join(configure_args))
+-env_keys = set(['CXX', 'AR', 'CFLAGS', 'CXXFLAGS', 'LDFLAGS'])
++env_keys = set(['CXX', 'AR', 'CFLAGS', 'CPPFLAGS', 'CXXFLAGS', 'LDFLAGS'])
+ configure_env = dict((k, os.environ[k]) for k in os.environ if k in env_keys)
+ if configure_env:
+ config_str = ' '.join([k + '=' + pipes.quote(configure_env[k])
+@@ -406,6 +406,8 @@ def shell_escape(str):
+ if 'CFLAGS' in configure_env:
+ cflags.append(configure_env['CFLAGS'])
+ ldflags.append(configure_env['CFLAGS'])
++if 'CPPFLAGS' in configure_env:
++cflags.append(configure_env['CPPFLAGS'])
+ if 'CXXFLAGS' in configure_env:
+ cflags.append(configure_env['CXXFLAGS'])
+ ldflags.append(configure_env['CXXFLAGS'])

diff --git a/dev-build/ninja/ninja-.ebuild 
b/dev-build/ninja/ninja-1.11.1-r5.ebuild
similarity index 98%
copy from dev-build/ninja/ninja-.ebuild
copy to dev-build/ninja/ninja-1.11.1-r5.ebuild
index 4a9cf1f32132..eae54565f9fc 100644
--- a/dev-build/ninja/ninja-.ebuild
+++ b/dev-build/ninja/ninja-1.11.1-r5.ebuild
@@ -40,6 +40,7 @@ PDEPEND="
 
 PATCHES=(
"${FILESDIR}"/ninja-cflags.patch
+   "${FILESDIR}"/ninja-cppflags.patch
 )
 
 run_for_build() {

diff --git a/dev-build/ninja/ninja-.ebuild 
b/dev-build/ninja/ninja-.ebuild
index 4a9cf1f32132..eae54565f9fc 100644
--- a/dev-build/ninja/ninja-.ebuild
+++ b/dev-build/ninja/ninja-.ebuild
@@ -40,6 +40,7 @@ PDEPEND="
 
 PATCHES=(
"${FILESDIR}"/ninja-cflags.patch
+   "${FILESDIR}"/ninja-cppflags.patch
 )
 
 run_for_build() {