gentoo auto-resync : 06:02:2024 - 05:42:43

4 files changed, 143 insertions, 1 deletions

diff --git a/dev-build/ninja/Manifest b/dev-build/ninja/Manifest
index 8a2107651fc3..9bc7a46d8cde 100644
--- a/dev-build/ninja/Manifest
+++ b/dev-build/ninja/Manifest
@@ -1,7 +1,9 @@
 AUX ninja-cflags.patch 738 BLAKE2B ec025836197d41d96cfcab0a7363ab3bda50cb7fc3f91f096ccfaa16babdc353269738aef92e68a261f43ba617720f677766f7044acb1a01dd7e07d6c9eca13e SHA512 97935accbef92e6eeda7d38bae6978016f4423e3989fcfb13c6de55644133ddef43db49811fc85d2649d68473d8b81e1bfb70f59a5e63d2607741d90152a4f42
+AUX ninja-cppflags.patch 934 BLAKE2B a7c16c6a3bf7ea4ff1cbbb29ab2e15385a4fb8d1d4bbc834fb4a0e577753c5071eea734b8f6505dd9478a6eb3b13298ff0eb9973812b8d851bdba9764441b346 SHA512 1551d22492d48221dc0653b0a8eecc9fb22b7f9f6e89047b00e190cd2ddf956acfb6976412de56b513b68ed8bf9410f3051354a121a83295abc558432bd3054d
 DIST ninja-1.11.1.tar.gz 229479 BLAKE2B c96cf7c319b7abd65f644465688d256f8b3a576c4616d0c63852e25dd0dc5f63c66708d429d8dddb6228502eb147211a86a5dd369b80ec2228902b370d2343e5 SHA512 1bca38877c70ee6613f347ffccef5adc02ba0a3947c62ae004ea97f918442b5a3de92378e4f820ae2a7676bc7609d25fbc7d41f6cfb3a61e5e4b26ec3639e403
 EBUILD ninja-1.11.1-r2.ebuild 2543 BLAKE2B 5a7e075acc0c1fe74efd1c67663cf6a227a98418278061ddad90bb448d17d1834d64ee3d508ea31fef27e2c529de9f46ec71769725cb8c61252a6aba62abb408 SHA512 ec33e4c178f8f13c80822568cd531d06d616e1c6484ba20741aff4c65b6deb439cdd1f1c205a1b82a6d8873e38145f6ee3624303fd703ab577d09557a26f5177
 EBUILD ninja-1.11.1-r3.ebuild 2699 BLAKE2B aa8a3d1a893ea4a1130c2658a1785d951411f37a23ef4443a97514dd82fbf9c3c3e2ba5e982074be8ba8c30c6be4ccfe4006048f868f70651994f3614b55c0dd SHA512 019bae6f9580ef5c4bbc9c6c9300df60ba88b1717b9b89b695e40ffb8a334699c98263fc8691ef7f95c84a16f2e07e41c43dc9109baef6e2b6d502bc96a8ce6e
 EBUILD ninja-1.11.1-r4.ebuild 2409 BLAKE2B 58291c8571d0c167dbcc15129849ab879158e74d65f19757ccdf24ffec8731e101d9043122474e0fb96bb2ca0f13dd2bf6bc1873f03be06dbf8f3c0abf28e951 SHA512 050421b837e12b8a2cd03f4bf83cbfa5c5c9623dea85f87945faef884ac4f118fbe193faf5302212428dcfe8ce569b416da3c033994521e019d8d3f3d14f24e4
-EBUILD ninja-9999.ebuild 2409 BLAKE2B 58291c8571d0c167dbcc15129849ab879158e74d65f19757ccdf24ffec8731e101d9043122474e0fb96bb2ca0f13dd2bf6bc1873f03be06dbf8f3c0abf28e951 SHA512 050421b837e12b8a2cd03f4bf83cbfa5c5c9623dea85f87945faef884ac4f118fbe193faf5302212428dcfe8ce569b416da3c033994521e019d8d3f3d14f24e4
+EBUILD ninja-1.11.1-r5.ebuild 2438 BLAKE2B d77042284b20c6005e60d47a9afc067e15ac8c0703dc72209df6a90fb1dbcda25766401ab5b59e931e1676eebaf6e0dc0523f1639c7c4acae0a6c254f34167a7 SHA512 3606df57304bece0a4f235eaa2fcaaf55fa991375911eda513d7075b1413c844372facb3cc878ebb64eadd3d9d82e6b1218b787eeeeab1e79bdbceeeceaee4af
+EBUILD ninja-9999.ebuild 2445 BLAKE2B 6dc6d48a7a935113a1c0dba882ecbbc62a4df6b89b6bb03e2badd0a7b8764260a75ec23d75f273f8946c4bdc8693b6473ffd96d273baa80f8cc10a6700799192 SHA512 5637abd7759af17d241cbd797e5b2004badd1b017feb8a8b320f28d1409ed4fac9299d0afde283b3f1c397c16b2cf195f49ceaef6da08be4fa7a7c43e0047d6a
 MISC metadata.xml 463 BLAKE2B 4094365ee9f5db41a29df26eada46bc42050da4043003bc265733666475d950df0b53cc475585b5d0ad79a1b9cbe83a53076911e564960d21568479e52bc4b33 SHA512 2d08b1e9f5377ba2d1976093fc9a3a9ceec51e80a7473e3d80e536585d1adb21c90d954205b97dd063dc99fe60b7b0c5335a16e05d0a2fa79e951c4833697880
diff --git a/dev-build/ninja/files/ninja-cppflags.patch b/dev-build/ninja/files/ninja-cppflags.patch
new file mode 100644
index 000000000000..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-1.11.1-r5.ebuild b/dev-build/ninja/ninja-1.11.1-r5.ebuild
new file mode 100644
index 000000000000..9440dad6602f
--- /dev/null
+++ b/dev-build/ninja/ninja-1.11.1-r5.ebuild
@@ -0,0 +1,118 @@
+# 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 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 ~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="
+	${PYTHON_DEPS}
+	dev-util/re2c
+	doc? (
+		app-text/asciidoc
+		app-text/doxygen
+		dev-libs/libxslt
+		media-gfx/graphviz
+	)
+	test? ( dev-cpp/gtest )
+"
+PDEPEND="
+	app-alternatives/ninja
+"
+
+PATCHES=(
+	"${FILESDIR}"/ninja-cflags.patch
+	"${FILESDIR}"/ninja-cppflags.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
+}
+
+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
+
+	newbin ninja ninja-reference
+
+	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
+}
diff --git a/dev-build/ninja/ninja-9999.ebuild b/dev-build/ninja/ninja-9999.ebuild
index 4a9cf1f32132..eae54565f9fc 100644
--- a/dev-build/ninja/ninja-9999.ebuild
+++ b/dev-build/ninja/ninja-9999.ebuild
@@ -40,6 +40,7 @@ PDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/ninja-cflags.patch
+	"${FILESDIR}"/ninja-cppflags.patch
 )
 
 run_for_build() {