gentoo auto-resync : 31:08:2022 - 04:49:49

3 files changed, 143 insertions, 24 deletions

diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index 6d0a9e25016d..55d67d30a8f7 100644
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@@ -1,5 +1,7 @@
 AUX ninja-cflags.patch 738 BLAKE2B ec025836197d41d96cfcab0a7363ab3bda50cb7fc3f91f096ccfaa16babdc353269738aef92e68a261f43ba617720f677766f7044acb1a01dd7e07d6c9eca13e SHA512 97935accbef92e6eeda7d38bae6978016f4423e3989fcfb13c6de55644133ddef43db49811fc85d2649d68473d8b81e1bfb70f59a5e63d2607741d90152a4f42
 DIST ninja-1.11.0.tar.gz 229475 BLAKE2B 71c8b6cf9524bdc11cf73f7e761f0d7deef2498a970c1439c10cc7d361e31fed1e3b54bcb185f3c7ed041f15704851a96e42560058af61b8a5df6e918d52ebf3 SHA512 9b9c8dae2251f9ddba50680911271b8504c292994fd90a0da94902f64c69a9edc72212217df5c651ddfc2f79c2ae03e84c99b805497dcd7497c53a1617de83e7
+DIST ninja-1.11.1.tar.gz 229479 BLAKE2B c96cf7c319b7abd65f644465688d256f8b3a576c4616d0c63852e25dd0dc5f63c66708d429d8dddb6228502eb147211a86a5dd369b80ec2228902b370d2343e5 SHA512 1bca38877c70ee6613f347ffccef5adc02ba0a3947c62ae004ea97f918442b5a3de92378e4f820ae2a7676bc7609d25fbc7d41f6cfb3a61e5e4b26ec3639e403
 EBUILD ninja-1.11.0.ebuild 2664 BLAKE2B 597dbb7ecc13989c1c0b064d58bc6a8ad9e4ee2bd95385755874be1b6cda966ce798006b4a6dd71a00321734918c5a3d4a2ffa8c1840c800af6fe02c50314ff0 SHA512 ab6fd121f8b0f4c07d538d26a49996b3eb65b52abfbaec51852010543441973bf51785c3bdab8cae933692e68b3b6539a812fdd6f50a753210e799b63706fd2c
-EBUILD ninja-9999.ebuild 2672 BLAKE2B 62774b99edc98754f307c8a5576e148534cc21eed8fc0b0e42ac2653b27943f8b86b3368b856743011884a034601e221bcac1da81c45bede2c249b7e42b6783c SHA512 014bc565791220ba3794563973162e38237a5f5cb7247c79fbbd6ef811944d2decf9f67c8f29df2f0a39920f9077f1550625bbb4bbdbac3d2f0f4f642ec2577f
+EBUILD ninja-1.11.1.ebuild 2561 BLAKE2B 272031b0e8898d4a0970276869c20dcbfd7a4a90adbc75ea68f28bb7f075b432447cc2fcaadb4715c0b84832f5942d61e77243ff180221ddf07131d7bb844f02 SHA512 4c9ca432475d6d056d10d306f96c5189d9692ef83f8f3ce36901fbf0428d442424134936b7709cb05d22ebe9b4a25b1122e820c6c21207b30e7a5a6a1b13f660
+EBUILD ninja-9999.ebuild 2561 BLAKE2B 272031b0e8898d4a0970276869c20dcbfd7a4a90adbc75ea68f28bb7f075b432447cc2fcaadb4715c0b84832f5942d61e77243ff180221ddf07131d7bb844f02 SHA512 4c9ca432475d6d056d10d306f96c5189d9692ef83f8f3ce36901fbf0428d442424134936b7709cb05d22ebe9b4a25b1122e820c6c21207b30e7a5a6a1b13f660
 MISC metadata.xml 345 BLAKE2B 62344dee3d109b90fe9cdc68f581d3dddd9ffee182af72e82509180d9382b6765ecac373680f0c3fc3e1b5c4e9641a689bb036ee877a2117d335ae4e1608718b SHA512 20d5ee6f6448835b6cdcb3ac1f6760d5bc452aa44a1c72de2241cd47432967498c30099c79a5b59a53796cbe1c373291bb62a5d48914996fa20c9e22569d68eb
diff --git a/dev-util/ninja/ninja-1.11.1.ebuild b/dev-util/ninja/ninja-1.11.1.ebuild
new file mode 100644
index 000000000000..bedb66f577c5
--- /dev/null
+++ b/dev-util/ninja/ninja-1.11.1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 2012-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit edo bash-completion-r1 elisp-common 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 ~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"
+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 )
+"
+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
+
+	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-util/ninja/ninja-9999.ebuild b/dev-util/ninja/ninja-9999.ebuild
index 81d813fea607..bedb66f577c5 100644
--- a/dev-util/ninja/ninja-9999.ebuild
+++ b/dev-util/ninja/ninja-9999.ebuild
@@ -1,15 +1,15 @@
 # Copyright 2012-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 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 ~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"
@@ -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="
@@ -35,15 +35,7 @@ BDEPEND="
 	)
 	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
@@ -90,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
+	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
+	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