gentoo auto-resync : 20:03:2024 - 13:00:14

4 files changed, 17 insertions, 71 deletions

diff --git a/dev-build/Manifest.gz b/dev-build/Manifest.gz
index 5be7dd33967c..2f434a4e5fc3 100644
--- a/dev-build/Manifest.gz
+++ b/dev-build/Manifest.gz
diff --git a/dev-build/gn/Manifest b/dev-build/gn/Manifest
index 2a605756b219..09b3dc36fdc6 100644
--- a/dev-build/gn/Manifest
+++ b/dev-build/gn/Manifest
@@ -1,13 +1,11 @@
 AUX gn-gen-r5.patch 1563 BLAKE2B ff909ef01743ca36d866257ad3bc2a1ca7a4e894b6a0c7672d08d0e1cd412b1056477f77ab64c75fa67a5c21794cecdd87f6bb75ebd963fff0ee3599523c73f6 SHA512 bb18dc2900084ca15ee12addec56d32cce520cb0d229bddbb69e8da7cca144887a6eb7267ea449613505dca4cdeba8ef0e4e69595fc202289d2f3c5fed2e4971
-DIST gn-0.2088.tar.xz 736408 BLAKE2B 23cb932c6fa1711472e0369b5c9271dd28b1d1a8eee40366295ea576fb0d913f3e01dd802df718d6d55ad27b566b0fae5da0cb03167e38df46bbda284b26f99c SHA512 be1d0a0095a7de9fc130935d45c610ab77dd9451822b33c344ac79d096828752bab04b81183eaa35b654abbb76748ce13751c04d44968d08643b6cd89f3fe8f7
-DIST gn-0.2114.tar.xz 740080 BLAKE2B 51c6d373ed7a33673e76fe8bb40f727193c6e1172fba328916fd2229d1e350cea5c51da734edf6dbf4c0b7bed61a590424484d4150e7cd4c890abba7f43251c7 SHA512 f5370e45bc2a079b79e4bcfc802fbc6cf67f7674a11311f849699f54775593e75def15323843ef887231891cb06b043863c79c5168e565319a4b73fcffa13738
 DIST gn-0.2122.tar.xz 740444 BLAKE2B df57fb611f26964ed3ac47365080cd043ba4206233450bb39699e78e35b8acff918e94efe4e7cea957199dd2f441dfcf31566e7d64ad10aace9d2c1d538ed6ac SHA512 80c330eac876fc0d6f46038b96eefd19bc1b6e5e89515489c1d02f82675213174fba394398ffc1bdd1405ddcd11b60c2870f3076296390976da74012867faf39
 DIST gn-0.2143.tar.xz 742220 BLAKE2B bfc33c4f323e9a7182c57c0c832866b48ae0877cfc1eeb42518a97ac6a64ab70e5bc81855f1c5201a49a7842e284b7a9042e1666f79c6182539076cfef6bb128 SHA512 8450947abf904faf47951ebb8336f4e2c54cb50fd6044750206a0d2a4284107670aeaec9d520374dfdb8baa1ca3b6dae5158ae564dcd40a2898f3614c003e7eb
 DIST gn-0.2154.tar.xz 746968 BLAKE2B 2d1b29e183d7ebb37bee322b3dff367a019c03ef9a7f5bcb258d54dc232dda1ad0ec75eb11685851192630922f4df2d6f5f0d0108cc2551b0e6b96e7fbade360 SHA512 8bb0f4da180297d0d04b1c6fc83e1508343ff43f1b9d6b38825f59cb3cb496ca452870f7b0c27bb041a0d429a80da47f2579afa7526d24221b12e4894905b67f
-EBUILD gn-0.2088.ebuild 1280 BLAKE2B b3b195efc99ac13db11705f2aa7137770a55b7ed1d29bb8a344d213ce0d8f22f8127394964f0d4c942a85481ed8dd1f4a105cf2efe56c1dd4aa140b98d41e9c2 SHA512 613b18b8de1b1522baa707338bd53e054328ce2d562a563fadb3e79382be05632f60a01fcb10c36c400023726a04fe484f1c2a0feb634d565b49beee3dd175de
-EBUILD gn-0.2114.ebuild 1278 BLAKE2B 8557903b7ae304656fe59d5f7c264615213c36d08695253265d99e7d44ce062e95808926f14a8790258a4a9ecf38b64891747f0d2d884ff32b40c9e1e2d6733a SHA512 bb33ec64f0831b3dd2dbd26cc097bd62fd9b0e2151494f55371d0118fde3bca24d88a7525f78298fef615fe6ed3a4b95f0ef62cab4dab4932ddeb64f1fa3e9b5
+DIST gn-0.2157.tar.xz 747636 BLAKE2B 85080f87ef42416d242034ae68276263d9a0d5020fd78471fe1f8c41fd092cb66df23725062465fa54de019acf846660a4527a0e3759b55136450d1de8a2f65d SHA512 f51621dff061c5c265c997d4326d6429f3a5763ffa50f4644fb7b9e1fa9b787497f21209449413b97fe589ee3e5a90253938ed63a987c311028666ce89500fdc
 EBUILD gn-0.2122.ebuild 1548 BLAKE2B 3fece061ecdc971f00bf73cc1536b1d096e90027f5f44a753d1ee4e32718077fcac8850a97275811ac1742a710a63863aa4852a2d0c8b864266f92176275e976 SHA512 39ae3518b9d0bb8a7479fb0c0f2ee117c9e67cf4bb453e16e77bd6088b05472e83e1ca0bc3f674fef34cb66d1bfcc240d356fca64ce0bc73c2268dda1d60be3a
 EBUILD gn-0.2143.ebuild 1549 BLAKE2B c73b38c3796b85185b5911172b62b74727cc80a7af79254e7f6f9804a387391d83b1e46b2bfec06908b9ca028f3398a48a48dc13f41ee0f87690b2f4a5a6baf2 SHA512 be5bc804d6f6debc6776b9958f208efe705c982c330675541104e509ce4be2e2be3e4b7db5374eb47c5de06815cc5c36d1a5b8e27124108b270fc24b0b341f36
 EBUILD gn-0.2154.ebuild 1551 BLAKE2B 0d861afc3878c7f27ef351e13f5287ec6916f07a263a2caa46968fd3b57756ece653dd37a17107dfecf255b38dff864c7b879a99c031f4b65dc520973d36c634 SHA512 d374ad64ba52575c84fbfd0c5488b146f852f5ecf808844bd39037d14245d8ee36e9416a14fd2b387e5e768aa5fc6f1b355e0c2a80a6678ee41ca4ca08de0c02
+EBUILD gn-0.2157.ebuild 1551 BLAKE2B 0d861afc3878c7f27ef351e13f5287ec6916f07a263a2caa46968fd3b57756ece653dd37a17107dfecf255b38dff864c7b879a99c031f4b65dc520973d36c634 SHA512 d374ad64ba52575c84fbfd0c5488b146f852f5ecf808844bd39037d14245d8ee36e9416a14fd2b387e5e768aa5fc6f1b355e0c2a80a6678ee41ca4ca08de0c02
 EBUILD gn-9999.ebuild 1551 BLAKE2B 0d861afc3878c7f27ef351e13f5287ec6916f07a263a2caa46968fd3b57756ece653dd37a17107dfecf255b38dff864c7b879a99c031f4b65dc520973d36c634 SHA512 d374ad64ba52575c84fbfd0c5488b146f852f5ecf808844bd39037d14245d8ee36e9416a14fd2b387e5e768aa5fc6f1b355e0c2a80a6678ee41ca4ca08de0c02
 MISC metadata.xml 221 BLAKE2B ce7615d8eda5f58e7729bf86156010821052ae580769c3be3922f1270f1211bc5cf297afc5c68db67a46c1c01450c08751fc3cda0995d62bbe60da64d21802d6 SHA512 6ffee27f859f923795e8ded3a5544a82473f72568e96475374b937adbf0963f81d46fbcf4752a9d4eef3f071cadd3dedf141f43802b58c6a788243c7f05114cf
diff --git a/dev-build/gn/gn-0.2114.ebuild b/dev-build/gn/gn-0.2114.ebuild
deleted file mode 100644
index e6d655e17b06..000000000000
--- a/dev-build/gn/gn-0.2114.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 2018-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit ninja-utils python-any-r1 toolchain-funcs
-
-DESCRIPTION="GN is a meta-build system that generates build files for Ninja"
-HOMEPAGE="https://gn.googlesource.com/"
-SRC_URI="https://dev.gentoo.org/~sultan/distfiles/dev-build/gn/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	app-alternatives/ninja
-"
-
-PATCHES=(
-	"${FILESDIR}"/gn-gen-r5.patch
-)
-
-pkg_setup() {
-	:
-}
-
-src_configure() {
-	python_setup
-	tc-export AR CC CXX
-	unset CFLAGS
-	set -- ${EPYTHON} build/gen.py --no-last-commit-position --no-strip --no-static-libstdc++ --allow-warnings
-	echo "$@" >&2
-	"$@" || die
-	cat >out/last_commit_position.h <<-EOF || die
-	#ifndef OUT_LAST_COMMIT_POSITION_H_
-	#define OUT_LAST_COMMIT_POSITION_H_
-	#define LAST_COMMIT_POSITION_NUM ${PV##0.}
-	#define LAST_COMMIT_POSITION "${PV}"
-	#endif  // OUT_LAST_COMMIT_POSITION_H_
-	EOF
-}
-
-src_compile() {
-	eninja -C out gn
-}
-
-src_test() {
-	eninja -C out gn_unittests
-	out/gn_unittests || die
-}
-
-src_install() {
-	dobin out/gn
-	einstalldocs
-
-	insinto /usr/share/vim/vimfiles
-	doins -r misc/vim/{autoload,ftdetect,ftplugin,syntax}
-}
diff --git a/dev-build/gn/gn-0.2088.ebuild b/dev-build/gn/gn-0.2157.ebuild
index fe4a275e1a0e..5dea03c85f58 100644
--- a/dev-build/gn/gn-0.2088.ebuild
+++ b/dev-build/gn/gn-0.2157.ebuild
@@ -2,17 +2,23 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
-inherit ninja-utils python-any-r1 toolchain-funcs
+inherit edo ninja-utils python-any-r1 toolchain-funcs
 
 DESCRIPTION="GN is a meta-build system that generates build files for Ninja"
 HOMEPAGE="https://gn.googlesource.com/"
-SRC_URI="https://dev.gentoo.org/~sultan/distfiles/dev-build/gn/${P}.tar.xz"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gn.googlesource.com/gn"
+else
+	# The version number is derived from `git describe HEAD --abbrev=12`
+	SRC_URI="https://deps.gentoo.zip/dev-build/gn/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 
 BDEPEND="
 	${PYTHON_DEPS}
@@ -30,10 +36,13 @@ pkg_setup() {
 src_configure() {
 	python_setup
 	tc-export AR CC CXX
+	if use elibc_musl ; then # bug 906362
+		export CC="${CC} -D_LARGEFILE64_SOURCE"
+		export CXX="${CXX} -D_LARGEFILE64_SOURCE"
+	fi
 	unset CFLAGS
 	set -- ${EPYTHON} build/gen.py --no-last-commit-position --no-strip --no-static-libstdc++ --allow-warnings
-	echo "$@" >&2
-	"$@" || die
+	edo "$@"
 	cat >out/last_commit_position.h <<-EOF || die
 	#ifndef OUT_LAST_COMMIT_POSITION_H_
 	#define OUT_LAST_COMMIT_POSITION_H_