6 files changed, 170 insertions, 2 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index e98afff3de9b..554c7393a373 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index 38f1b9130488..4a7eb93cbbb4 100644
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@@ -1,5 +1,6 @@
 AUX ninja-cflags.patch 738 BLAKE2B ec025836197d41d96cfcab0a7363ab3bda50cb7fc3f91f096ccfaa16babdc353269738aef92e68a261f43ba617720f677766f7044acb1a01dd7e07d6c9eca13e SHA512 97935accbef92e6eeda7d38bae6978016f4423e3989fcfb13c6de55644133ddef43db49811fc85d2649d68473d8b81e1bfb70f59a5e63d2607741d90152a4f42
 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-9999.ebuild 2550 BLAKE2B 760679b15b50c129bb0d0443d6b91b030aa2b405a73db92ea6e8328eaf4eb54d28406bd68ac87ce518c3eceeaa672db67db7b811231f477b55e388664feda358 SHA512 c56ef7107e1c76ee64907b74f3ea0e1d306a623b70d9d1c12a769799ebbccb0d568f2bb43cf5bdb875afda33a98a8762bf33cc4b1ead50c52c512026453fb767
+EBUILD ninja-1.11.1-r3.ebuild 2600 BLAKE2B edd0d1ae46f9eb7f71bbdb1a845e2721a6ee88a9e9c412de210c64812c2a2b2cd4ec9fe2885e1d1ae90dca4d9b87533b3d503e669a47771f3c297642a6fd75d6 SHA512 e49d9af34e6b495896b9dba68f6c6649ac1f7ffce6dcc4949442d316e5392ff1be0482104febb9e05af67dda6a364570d6accad79cb6053b662437a9af8b5eea
+EBUILD ninja-9999.ebuild 2600 BLAKE2B edd0d1ae46f9eb7f71bbdb1a845e2721a6ee88a9e9c412de210c64812c2a2b2cd4ec9fe2885e1d1ae90dca4d9b87533b3d503e669a47771f3c297642a6fd75d6 SHA512 e49d9af34e6b495896b9dba68f6c6649ac1f7ffce6dcc4949442d316e5392ff1be0482104febb9e05af67dda6a364570d6accad79cb6053b662437a9af8b5eea
 MISC metadata.xml 463 BLAKE2B 4094365ee9f5db41a29df26eada46bc42050da4043003bc265733666475d950df0b53cc475585b5d0ad79a1b9cbe83a53076911e564960d21568479e52bc4b33 SHA512 2d08b1e9f5377ba2d1976093fc9a3a9ceec51e80a7473e3d80e536585d1adb21c90d954205b97dd063dc99fe60b7b0c5335a16e05d0a2fa79e951c4833697880
diff --git a/dev-util/ninja/ninja-1.11.1-r3.ebuild b/dev-util/ninja/ninja-1.11.1-r3.ebuild
new file mode 100644
index 000000000000..4f8bdfff6267
--- /dev/null
+++ b/dev-util/ninja/ninja-1.11.1-r3.ebuild
@@ -0,0 +1,128 @@
+# Copyright 2012-2023 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
+
+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 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:* )"
+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
+
+	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
+
+	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
+
+	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 38a59d4a303a..4f8bdfff6267 100644
--- a/dev-util/ninja/ninja-9999.ebuild
+++ b/dev-util/ninja/ninja-9999.ebuild
@@ -36,6 +36,7 @@ BDEPEND="
 	test? ( dev-cpp/gtest )
 "
 RDEPEND="emacs? ( >=app-editors/emacs-23.1:* )"
+PDEPEND="app-alternatives/ninja"
 
 PATCHES=(
 	"${FILESDIR}"/ninja-cflags.patch
@@ -98,7 +99,7 @@ src_install() {
 		dodoc doc/manual.html
 	fi
 
-	dobin ninja
+	newbin ninja ninja-reference
 
 	newbashcomp misc/bash-completion ${PN}
 
diff --git a/dev-util/packer/Manifest b/dev-util/packer/Manifest
index 392f1eb196ad..579451a619dd 100644
--- a/dev-util/packer/Manifest
+++ b/dev-util/packer/Manifest
@@ -4,7 +4,10 @@ DIST packer-1.8.5-deps.tar.xz 385789132 BLAKE2B 680852f380bc6b2c74183bf0c32baf8e
 DIST packer-1.8.5.tar.gz 2278013 BLAKE2B 0465356e78b62a67e71ef943a7dfb89b5f50b3b3cdb34c3ca41ac6d57e32fad8f40da1316ba8f54d93ae0c25b22627cc9f633f4e488ee9cc66fc6e6080b5769e SHA512 8ffd9e0a755e5e537c63a70454756a6df787d299cb5f3a8d6dea9c7e93dbea744017cd2f2c4fa9a8b6fbc052dedecb702dc6ac656b4c6c293ad5eab1f581872e
 DIST packer-1.8.6-deps.tar.xz 386558076 BLAKE2B 54903da9788ad483bb9dd66fd9c130f6a5beef6ebd70733b0e05437fe4d58a00769e2bef46c381610d3fe8769fdacc9527ba812eb40b2437160abec84662eb97 SHA512 c2c8cfcd85ae683e5558742965b5782a96d05cc2a5331e66da24aad094d2082c6cb6a1eba901bbaf7e9b56fbd3a754a0334c1be18c75c3f01643667ae1f9b09d
 DIST packer-1.8.6.tar.gz 2265929 BLAKE2B bb56ab642d3f358afed58153de27e52ad1d4fa9e97f5ab94ad9212cb6e46ba845606c266246ca89a74cc93738ed197e545772c0db22f32ed9c2f8b1bcb7d1f3b SHA512 1e0e36959f1efb6eeae076da3d27c200f4888a6a08e759072ac6c767e1cc3e14876f09f96bdd208b788d32efde9420357afe3105337b7edcc87ba2d99966578c
+DIST packer-1.9.4-deps.tar.xz 330480200 BLAKE2B 8c02e0fac4763f6a4cff98631ee0151a8d66ad199ae4979a0750e684c8b51284c59e5f99dd265590737be37e8ff0f65e692d3ebb11dcbcd8cba372e393c9e517 SHA512 d0bf06769ac66fda4d721388a612d7d8c981e091172a6ef0ae7f5ec461b32f834d024c031dd9c9da08de4ac46ed8bb69ca5f5f0eee0d764d8fdf5f9bdffb5790
+DIST packer-1.9.4.tar.gz 2301344 BLAKE2B 431b843076cc20127bdd0bc1acbb030cecc42ba9c3200a1c3b72c8e2ea4081e99a5c9f15d73397c67c176902f4ef1bbf4796efe32bdd1d8fe583a5996bb5f7ec SHA512 966de31fc7a174e5397e89b0c84979c13cf538971b2ea228f6fbf7dc54bed61d7cb21b58699175e93b9c81a9fc0c515e7cefffbd7b2865f2f6c36e4f78a81a95
 EBUILD packer-1.7.10.ebuild 782 BLAKE2B d07c471c1ddd43a126dce74e3f877f10978f6b549fa251c6f947a9775f5a9ec4e4688eaef370cd2001c56086b43397facf9b6dfc6a2ae63029c748716c604457 SHA512 5fa4d8825455b08c39f6c69049d6452b569b10944e4fcac6aaabae9a4c93503c8a8815e11004ff54a562e8eaef1389e9f8a3f15e11d04b4446fc0daccb0ac2cb
 EBUILD packer-1.8.5.ebuild 782 BLAKE2B 81c1510edf376fb2119db7e14bceac85c4046765acd0e2c8759473f7b6ead8118dc0a9001705cccbcb6ffce793d592f242625ca7cc72b19e371057ca5be0953c SHA512 2184baea8a3cb822477356c72079f14fee5ce3061e7e56e40c6a4cc3d87c3168e4f1b936fd394563e3380b1fc3e8dfb94e927059de6680464c331216d998445e
 EBUILD packer-1.8.6.ebuild 782 BLAKE2B 81c1510edf376fb2119db7e14bceac85c4046765acd0e2c8759473f7b6ead8118dc0a9001705cccbcb6ffce793d592f242625ca7cc72b19e371057ca5be0953c SHA512 2184baea8a3cb822477356c72079f14fee5ce3061e7e56e40c6a4cc3d87c3168e4f1b936fd394563e3380b1fc3e8dfb94e927059de6680464c331216d998445e
+EBUILD packer-1.9.4.ebuild 762 BLAKE2B 23f81351b95c960ccaf1548f8e26d888b6a672d0c120c424818b2b1a684b5595a8e5df8f8c0094e47dd9bbbd9f2379d4eec60ec4770671661e369bae05fe74a4 SHA512 5f00c8f619b94f383f4c1bec59025e3fe6e9533f796e2826f3ca5a1045340bbd6ce9a609e73a6317ef44a976160567b041db37bd926b3e4b4a1b33e053d28910
 MISC metadata.xml 1408 BLAKE2B 04204c3ac4c45b58a23e611fbd34014423fd1839829101f7a30a188fc8b4588532f72b05c41a77f093170c6a6d9bd804c47bc831a8006ecbda5d3a30ccf6ade6 SHA512 2a45870ccadf85968c81c3129cfffa16184c3cc6ed135b716a84e545d9c80ed35064be231386b0bbfbe6fb7f9a12704c25d7fabc9383b3211d61720691c2ae9b
diff --git a/dev-util/packer/packer-1.9.4.ebuild b/dev-util/packer/packer-1.9.4.ebuild
new file mode 100644
index 000000000000..20a7d1166c80
--- /dev/null
+++ b/dev-util/packer/packer-1.9.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="A tool to create identical machine images for multiple platforms"
+HOMEPAGE="https://www.packer.io"
+SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://gentoo.neutroniak.com/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD-2 BSD-4 MIT MPL-2.0 unicode"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+
+DOCS=( {README,CHANGELOG}.md )
+
+RESTRICT+=" test"
+
+src_compile() {
+	ego build \
+		-mod=readonly \
+		-ldflags "${go_ldflags}" \
+		-work -o "bin/${PN}" ./ || die
+}
+
+src_install() {
+	dobin bin/packer
+
+	einstalldocs
+
+	insinto /usr/share/zsh/site-functions
+	doins contrib/zsh-completion/_packer
+}