gentoo resync : 29.12.2022

3 files changed, 139 insertions, 3 deletions

diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index df8912424ae3..b35dbdb6452b 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.10.2.tar.gz 213959 BLAKE2B b8160ca6d58cfa0edb93d16b7dfb9776d290c42e54b33b78cd925f167c80f8794e4cc30af984a526b8263c7904a734cf0770d3c27283d21d02f18d3e2eb70032 SHA512 895412ae1cbc83c656e92f282602a29300e08274e9dea0da4464202ae556e7a1ab03bec057f23da4756bbd91bd2d744cd7a64b336740fd2782bb4db5c3b7b496
+DIST ninja-1.11.0.tar.gz 229475 BLAKE2B 71c8b6cf9524bdc11cf73f7e761f0d7deef2498a970c1439c10cc7d361e31fed1e3b54bcb185f3c7ed041f15704851a96e42560058af61b8a5df6e918d52ebf3 SHA512 9b9c8dae2251f9ddba50680911271b8504c292994fd90a0da94902f64c69a9edc72212217df5c651ddfc2f79c2ae03e84c99b805497dcd7497c53a1617de83e7
 EBUILD ninja-1.10.2-r1.ebuild 2798 BLAKE2B fae8cb33fbd559d68120a8501fa99e7a6299227c590c9902a1cc402798e892d92718ca1e6248d22f41059e2a1a98ca92bdfb534a33ebc34cadd88615974fe565 SHA512 c26741a21ef5155ef518d219b377fbe70139406b533ff64c2a2f1cf626848f76a2172052f5b2584a7c4a50e3017c7d4ba4ea656141e8925bf8bdb4a9a06b301f
-EBUILD ninja-9999.ebuild 2593 BLAKE2B 7dc734e7ff64046e9eb0bf73b5e7455f3452bc35c9dc5288cd70c290211649956e7dbb0654b72aecbae9e0413a2e24716c362282a2ebf22db7e94bc7f9cdb1a8 SHA512 ba8bc261502d3395d3f1a8c8f136565365d1731fa94c15664a1accaaa68c7ec36ae7f2c971a1344c2256c0e73329d2625a0043f0695eb24d43c648bb935ce99e
+EBUILD ninja-1.11.0.ebuild 2672 BLAKE2B 7dfc16d910bcc396f6e993738c072fcfa6f71128133cbcfa0caa90fe7dfe842f13bf4c2fac57e5cfb0eac6fab53de1e049131e99aa5f281f25c5735691fb9411 SHA512 9075656d3c3b4c35b48359c08213241430b912a96976be59aca2686d462620f58c5c81de4b583e3adc8db6775e92f02be96cfa8229cacd76d2eb110b7cd6bdce
+EBUILD ninja-9999.ebuild 2672 BLAKE2B 7dfc16d910bcc396f6e993738c072fcfa6f71128133cbcfa0caa90fe7dfe842f13bf4c2fac57e5cfb0eac6fab53de1e049131e99aa5f281f25c5735691fb9411 SHA512 9075656d3c3b4c35b48359c08213241430b912a96976be59aca2686d462620f58c5c81de4b583e3adc8db6775e92f02be96cfa8229cacd76d2eb110b7cd6bdce
 MISC metadata.xml 341 BLAKE2B 4bceedc688b9b13ad2abb63a709c72d4f814ce502342d2b6059143d0bc9672dfd7a0734eba4fdbc6efd1859adf2f2c9f654d756af73ab22b0d8c51329a42388b SHA512 f440b2242abf1fe2e41be8fd80542899bbfa5265c2b424058f0ed89ffedf6c6ea890a2ca3bec5f1313ba4222b21a82aedde9fbd0870a6348dcae8d7013e537a6
diff --git a/dev-util/ninja/ninja-1.11.0.ebuild b/dev-util/ninja/ninja-1.11.0.ebuild
new file mode 100644
index 000000000000..009dcff946ca
--- /dev/null
+++ b/dev-util/ninja/ninja-1.11.0.ebuild
@@ -0,0 +1,133 @@
+# Copyright 2012-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit 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"
+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 vim-syntax"
+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:* )
+	vim-syntax? (
+		|| (
+			app-editors/vim
+			app-editors/gvim
+		)
+	)
+"
+
+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
+		./ninja -v ninja_test || die
+		./ninja_test || die
+	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}"
+
+	if use vim-syntax; then
+		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
+
+	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 72b8e4d9e83e..009dcff946ca 100644
--- a/dev-util/ninja/ninja-9999.ebuild
+++ b/dev-util/ninja/ninja-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2012-2021 Gentoo Authors
+# Copyright 2012-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
 else
 	SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+	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"
@@ -31,6 +31,7 @@ BDEPEND="
 		app-text/asciidoc
 		app-doc/doxygen
 		dev-libs/libxslt
+		media-gfx/graphviz
 	)
 	test? ( dev-cpp/gtest )
 "