gentoo auto-resync : 16:04:2024 - 12:04:26

4 files changed, 138 insertions, 39 deletions

diff --git a/dev-build/Manifest.gz b/dev-build/Manifest.gz
index de5562098950..142727a931a4 100644
--- a/dev-build/Manifest.gz
+++ b/dev-build/Manifest.gz
diff --git a/dev-build/ninja/Manifest b/dev-build/ninja/Manifest
index 8f826711d98e..7a5e8de2dd6b 100644
--- a/dev-build/ninja/Manifest
+++ b/dev-build/ninja/Manifest
@@ -1,5 +1,7 @@
 AUX ninja-cflags.patch 738 BLAKE2B ec025836197d41d96cfcab0a7363ab3bda50cb7fc3f91f096ccfaa16babdc353269738aef92e68a261f43ba617720f677766f7044acb1a01dd7e07d6c9eca13e SHA512 97935accbef92e6eeda7d38bae6978016f4423e3989fcfb13c6de55644133ddef43db49811fc85d2649d68473d8b81e1bfb70f59a5e63d2607741d90152a4f42
 DIST ninja-1.11.1.tar.gz 229479 BLAKE2B c96cf7c319b7abd65f644465688d256f8b3a576c4616d0c63852e25dd0dc5f63c66708d429d8dddb6228502eb147211a86a5dd369b80ec2228902b370d2343e5 SHA512 1bca38877c70ee6613f347ffccef5adc02ba0a3947c62ae004ea97f918442b5a3de92378e4f820ae2a7676bc7609d25fbc7d41f6cfb3a61e5e4b26ec3639e403
+DIST ninja-1.12.0.tar.gz 240291 BLAKE2B e7d721ab62164574b076f7cbf6d40fd2ee950534d124a58f5fe9e09bdae5895c8dc9dd7636a9f2f2b79774d6d9ba5f831e2c8b370826029af060fdc80fdc207f SHA512 167cd838ad47815183b79302a6e19227d956e634ae9d4211f0895ea9f4d893932e1154a765a9d5a1a3167b1a48b398f255fb4f46eb1395a6da11070bda628875
 EBUILD ninja-1.11.1-r5.ebuild 2451 BLAKE2B bf0e6fc2f7d09db24ca6b58a4a1e081ef08ee2bb04acc73af3e2f8fe8f77745f99ac8d68d0338b0867a0040555b6eddad61930c7ce7d72d43d0c426511b078a9 SHA512 831f9e6e2800fdf5c466ba0d69a9034b0c329a2d34b80cad723dead14d02a205ee76b398ca6a56b7d16a1ce8249b1be1493ce77bfb7e8e98e86e0a665f797b1b
-EBUILD ninja-9999.ebuild 2459 BLAKE2B eac089a7a0a09114f066017dcee347c60780e8d7517dbc200ce699b4a644441545778528c9b78f0bb89c438e88b9068b5f87e7ea4a52f082b47f0b5afe249de1 SHA512 0a123a17a343c1d3fd4721476dc2653f26b6968f44632b8e2ebaaa3ffce0e098202a92fad75320d8a915c67b2b4349e77ad4cf19a6dbffb5740113edab458e53
+EBUILD ninja-1.12.0.ebuild 2115 BLAKE2B e491be00561dd92225d1ab6e1d0ad2b88924d5af3e4a658748337f63ee9cbb0a427cd7ae0af819faede5894e5e0103b445803484a7700411da233655f0092502 SHA512 d27fac616fded6c869d9f558a6d543a05ce11481806597d3d0e4f8a56692cd95d215217cc1d945c52d78fd82bbabc539052d5f39aea37b0a78eca22370c031c3
+EBUILD ninja-9999.ebuild 2115 BLAKE2B e491be00561dd92225d1ab6e1d0ad2b88924d5af3e4a658748337f63ee9cbb0a427cd7ae0af819faede5894e5e0103b445803484a7700411da233655f0092502 SHA512 d27fac616fded6c869d9f558a6d543a05ce11481806597d3d0e4f8a56692cd95d215217cc1d945c52d78fd82bbabc539052d5f39aea37b0a78eca22370c031c3
 MISC metadata.xml 463 BLAKE2B 4094365ee9f5db41a29df26eada46bc42050da4043003bc265733666475d950df0b53cc475585b5d0ad79a1b9cbe83a53076911e564960d21568479e52bc4b33 SHA512 2d08b1e9f5377ba2d1976093fc9a3a9ceec51e80a7473e3d80e536585d1adb21c90d954205b97dd063dc99fe60b7b0c5335a16e05d0a2fa79e951c4833697880
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 000000000000..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} == 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="
+	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
+}
diff --git a/dev-build/ninja/ninja-9999.ebuild b/dev-build/ninja/ninja-9999.ebuild
index 9442eeaecf97..932bf822922b 100644
--- a/dev-build/ninja/ninja-9999.ebuild
+++ b/dev-build/ninja/ninja-9999.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} == 9999 ]]; 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/