gentoo auto-resync : 05:01:2024 - 14:04:25

3 files changed, 125 insertions, 21 deletions

diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index 38a90530365b..81078231b9f4 100644
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@@ -2,5 +2,6 @@ AUX ninja-cflags.patch 738 BLAKE2B ec025836197d41d96cfcab0a7363ab3bda50cb7fc3f91
 DIST ninja-1.11.1.tar.gz 229479 BLAKE2B c96cf7c319b7abd65f644465688d256f8b3a576c4616d0c63852e25dd0dc5f63c66708d429d8dddb6228502eb147211a86a5dd369b80ec2228902b370d2343e5 SHA512 1bca38877c70ee6613f347ffccef5adc02ba0a3947c62ae004ea97f918442b5a3de92378e4f820ae2a7676bc7609d25fbc7d41f6cfb3a61e5e4b26ec3639e403
 EBUILD ninja-1.11.1-r2.ebuild 2542 BLAKE2B b97833127e9f27880fd8e8dbf7d9cef4233ebd6a83eb88bf4131d21d12fac8ca076b48252be7909cf346fc416dcb31457ca4bcf63915a916a2f9057a7cb8e3dd SHA512 dfa83ca9aedc01c5a8c5a39843626bfe9b0d7543fc320013695538a1faf163654f54f10176201438fd4b1c9c7198e7fe66fd15e95d83751d5ac14969e5483599
 EBUILD ninja-1.11.1-r3.ebuild 2698 BLAKE2B 556911ca4e02ff8c4319a27b7121b4a877cb99ff6e81deed69364c5b5d8e8e6c113da14b22115baf72836d3494b46260866e593abfa34b04e1696ec69cc9af9b SHA512 376dff0bc9693a8d3c8db98f04b4f93e5077459a424610b1da6d05601867a019ab78a269474b6f972bf291d8f968b570637436081711e9a062a3b696cc1807e6
-EBUILD ninja-9999.ebuild 2706 BLAKE2B 5e5fae0c0c1bae2d6cfba87f32bb30f80a73bf6221e5f49ab1d918104309497df4e2ef0fc533cc92741f43ee34e141c7640ebe266ffe8d92f51179abb330339e SHA512 c7483d2e62f6b90ea66460782cb8958fa461cd6d2d60a7ad8167745a059bc8a5ac010b2f9a37fceaeb3192a79ca7c97552d8ab44001fe13736c3100773d0dcbf
+EBUILD ninja-1.11.1-r4.ebuild 2408 BLAKE2B 3fcb2019ec82acc7dd8879ba43f135b37f85604a69b0311e2c998803f08faaa88ca9a50fb7f2f9c2ea94943964d41cab358ce121cc6720bddb9cb79ea4b61f42 SHA512 fe16ac9c646ee904bb60317a3e73d050fab5ff7c2e4d82fe9cf68954c52ffb451eecd5c27d21539a5a0706a1323965eafedacd735cb280731fe77d25896c31b1
+EBUILD ninja-9999.ebuild 2408 BLAKE2B 3fcb2019ec82acc7dd8879ba43f135b37f85604a69b0311e2c998803f08faaa88ca9a50fb7f2f9c2ea94943964d41cab358ce121cc6720bddb9cb79ea4b61f42 SHA512 fe16ac9c646ee904bb60317a3e73d050fab5ff7c2e4d82fe9cf68954c52ffb451eecd5c27d21539a5a0706a1323965eafedacd735cb280731fe77d25896c31b1
 MISC metadata.xml 463 BLAKE2B 4094365ee9f5db41a29df26eada46bc42050da4043003bc265733666475d950df0b53cc475585b5d0ad79a1b9cbe83a53076911e564960d21568479e52bc4b33 SHA512 2d08b1e9f5377ba2d1976093fc9a3a9ceec51e80a7473e3d80e536585d1adb21c90d954205b97dd063dc99fe60b7b0c5335a16e05d0a2fa79e951c4833697880
diff --git a/dev-util/ninja/ninja-1.11.1-r4.ebuild b/dev-util/ninja/ninja-1.11.1-r4.ebuild
new file mode 100644
index 000000000000..74b611b5aeca
--- /dev/null
+++ b/dev-util/ninja/ninja-1.11.1-r4.ebuild
@@ -0,0 +1,117 @@
+# 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-doc/doxygen
+		dev-libs/libxslt
+		media-gfx/graphviz
+	)
+	test? ( dev-cpp/gtest )
+"
+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}
+		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-util/ninja/ninja-9999.ebuild b/dev-util/ninja/ninja-9999.ebuild
index c4874b6be066..74b611b5aeca 100644
--- a/dev-util/ninja/ninja-9999.ebuild
+++ b/dev-util/ninja/ninja-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 2012-2023 Gentoo Authors
+# 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
+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"
@@ -20,8 +20,7 @@ HOMEPAGE="https://ninja-build.org/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-
-IUSE="doc emacs test"
+IUSE="doc test"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
@@ -35,8 +34,9 @@ BDEPEND="
 	)
 	test? ( dev-cpp/gtest )
 "
-RDEPEND="emacs? ( >=app-editors/emacs-23.1:* )"
-PDEPEND="app-alternatives/ninja"
+PDEPEND="
+	app-alternatives/ninja
+"
 
 PATCHES=(
 	"${FILESDIR}"/ninja-cflags.patch
@@ -75,10 +75,6 @@ src_compile() {
 	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() {
@@ -112,20 +108,10 @@ src_install() {
 
 	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
 	if ! [[ -e "${EROOT}/usr/bin/ninja" ]]; then
 		ln -s ninja-reference "${EROOT}/usr/bin/ninja" || die
 	fi
 }
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}