gentoo auto-resync : 10:10:2024 - 04:03:57

4 files changed, 108 insertions, 7 deletions

diff --git a/dev-build/gn/Manifest b/dev-build/gn/Manifest
index 602810e95bac..c7cba001b3ef 100644
--- a/dev-build/gn/Manifest
+++ b/dev-build/gn/Manifest
@@ -1,13 +1,16 @@
 AUX gn-gen-r5.patch 1563 BLAKE2B ff909ef01743ca36d866257ad3bc2a1ca7a4e894b6a0c7672d08d0e1cd412b1056477f77ab64c75fa67a5c21794cecdd87f6bb75ebd963fff0ee3599523c73f6 SHA512 bb18dc2900084ca15ee12addec56d32cce520cb0d229bddbb69e8da7cca144887a6eb7267ea449613505dca4cdeba8ef0e4e69595fc202289d2f3c5fed2e4971
+AUX gn-gen-r6.patch 1204 BLAKE2B 81b43733d89ba65a42f136262643aab564a9ed0561ba8b9ed11770f51d56af84ed1d5f0b1530407133e46d51a59b8b5d4585cadef2d713c50317ad6e38a17a1f SHA512 e0f0550f2bd7dd405de523e6995b8b6bc4a6e58b9ab7d1a126a45e30d32880f480b27dd5270b0422f0bda1ab75a8f6d38044ee0ec75585ad9cc7a38494c665fb
 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
 DIST gn-0.2157.tar.xz 747636 BLAKE2B 85080f87ef42416d242034ae68276263d9a0d5020fd78471fe1f8c41fd092cb66df23725062465fa54de019acf846660a4527a0e3759b55136450d1de8a2f65d SHA512 f51621dff061c5c265c997d4326d6429f3a5763ffa50f4644fb7b9e1fa9b787497f21209449413b97fe589ee3e5a90253938ed63a987c311028666ce89500fdc
 DIST gn-0.2165.tar.xz 748624 BLAKE2B 6c966fa5791c069bfd790926db7c986a8831f29819e8d7121fe9a30d4f870897064900479ecd620134f2549f30d888efc748da87b7246f12905c3c53ac4a0b7a SHA512 6d99c92e951595f6e0168fea20765d31605485dea4aeec1a0c5d225223f809da2b025f8e09523d5f4a607ffb9f30118503ee4d990cc31d174c6edf6bce384f87
+DIST gn-0.2200.tar.xz 753048 BLAKE2B 9c57e21a5cab2a5df92aee78baacb8260de0793689a3ac743428d16e5b48cdd48de0a81fa137947ed1be0b54e1751748777488d2ca68377baa1a0d02f27e9819 SHA512 bef69e706078617a4ec45cba978a4ba01a2a9b6ddc0bd91697fca2712529f030febf2d12dbb26a432c6ec43af249b708ec0800d01e059bc6ebc26069e0ef8a56
 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 1549 BLAKE2B c73b38c3796b85185b5911172b62b74727cc80a7af79254e7f6f9804a387391d83b1e46b2bfec06908b9ca028f3398a48a48dc13f41ee0f87690b2f4a5a6baf2 SHA512 be5bc804d6f6debc6776b9958f208efe705c982c330675541104e509ce4be2e2be3e4b7db5374eb47c5de06815cc5c36d1a5b8e27124108b270fc24b0b341f36
 EBUILD gn-0.2165.ebuild 1549 BLAKE2B c73b38c3796b85185b5911172b62b74727cc80a7af79254e7f6f9804a387391d83b1e46b2bfec06908b9ca028f3398a48a48dc13f41ee0f87690b2f4a5a6baf2 SHA512 be5bc804d6f6debc6776b9958f208efe705c982c330675541104e509ce4be2e2be3e4b7db5374eb47c5de06815cc5c36d1a5b8e27124108b270fc24b0b341f36
-EBUILD gn-9999.ebuild 1551 BLAKE2B 0d861afc3878c7f27ef351e13f5287ec6916f07a263a2caa46968fd3b57756ece653dd37a17107dfecf255b38dff864c7b879a99c031f4b65dc520973d36c634 SHA512 d374ad64ba52575c84fbfd0c5488b146f852f5ecf808844bd39037d14245d8ee36e9416a14fd2b387e5e768aa5fc6f1b355e0c2a80a6678ee41ca4ca08de0c02
+EBUILD gn-0.2200.ebuild 1422 BLAKE2B 02b008909516785fbe18c6d929f53c841fcdeb765115b1dc1d536d0ba767198e28fda19cbe58aada657aee2fcfa26e853ebcff5fc6f2289d219f67f2ebeea02b SHA512 30d7348a1902e72d2431e66b4ba3646972464f9d962a1f94fc41c883c3fae6fe9c46ebac1e41e6e1a7a7325218f999002e3517b67f1fea858793fa1b72dddca2
+EBUILD gn-9999.ebuild 1422 BLAKE2B 02b008909516785fbe18c6d929f53c841fcdeb765115b1dc1d536d0ba767198e28fda19cbe58aada657aee2fcfa26e853ebcff5fc6f2289d219f67f2ebeea02b SHA512 30d7348a1902e72d2431e66b4ba3646972464f9d962a1f94fc41c883c3fae6fe9c46ebac1e41e6e1a7a7325218f999002e3517b67f1fea858793fa1b72dddca2
 MISC metadata.xml 221 BLAKE2B ce7615d8eda5f58e7729bf86156010821052ae580769c3be3922f1270f1211bc5cf297afc5c68db67a46c1c01450c08751fc3cda0995d62bbe60da64d21802d6 SHA512 6ffee27f859f923795e8ded3a5544a82473f72568e96475374b937adbf0963f81d46fbcf4752a9d4eef3f071cadd3dedf141f43802b58c6a788243c7f05114cf
diff --git a/dev-build/gn/files/gn-gen-r6.patch b/dev-build/gn/files/gn-gen-r6.patch
new file mode 100644
index 000000000000..194bf2477249
--- /dev/null
+++ b/dev-build/gn/files/gn-gen-r6.patch
@@ -0,0 +1,36 @@
+From 60f253dbba70f2146f7226e476030a5b6074e1ac Mon Sep 17 00:00:00 2001
+From: Matt Jolly <kangie@gentoo.org>
+Date: Thu, 10 Oct 2024 09:28:20 +1000
+Subject: [PATCH] Update patch to v6
+
+---
+ build/gen.py | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/build/gen.py b/build/gen.py
+index d1c649c..1fc5b4d 100755
+--- a/build/gen.py
++++ b/build/gen.py
+@@ -431,11 +431,6 @@ def WriteGNNinja(path, platform, host, options, args_list):
+       if not platform.is_darwin():
+         cflags.extend(['-D_LIBCPP_DEBUG=1', '-D_GLIBCXX_DEBUG=1'])
+     else:
+-      cflags.append('-DNDEBUG')
+-      cflags.append('-O3')
+-      if options.no_strip:
+-        cflags.append('-g')
+-      ldflags.append('-O3')
+       # Use -fdata-sections and -ffunction-sections to place each function
+       # or data item into its own section so --gc-sections can eliminate any
+       # unused functions and data items.
+@@ -482,7 +477,6 @@ def WriteGNNinja(path, platform, host, options, args_list):
+         '-D_FILE_OFFSET_BITS=64',
+         '-D__STDC_CONSTANT_MACROS', '-D__STDC_FORMAT_MACROS',
+         '-pthread',
+-        '-pipe',
+         '-fno-exceptions',
+         '-fno-rtti',
+         '-fdiagnostics-color',
+-- 
+2.46.2
+
diff --git a/dev-build/gn/gn-0.2200.ebuild b/dev-build/gn/gn-0.2200.ebuild
new file mode 100644
index 000000000000..a252da4d6f3f
--- /dev/null
+++ b/dev-build/gn/gn-0.2200.ebuild
@@ -0,0 +1,66 @@
+# Copyright 2018-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..13} )
+
+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/"
+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"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	app-alternatives/ninja
+"
+
+PATCHES=(
+	"${FILESDIR}"/gn-gen-r6.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
+	edo "$@"
+	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-9999.ebuild b/dev-build/gn/gn-9999.ebuild
index 5dea03c85f58..a252da4d6f3f 100644
--- a/dev-build/gn/gn-9999.ebuild
+++ b/dev-build/gn/gn-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit edo ninja-utils python-any-r1 toolchain-funcs
 
@@ -26,7 +26,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/gn-gen-r5.patch
+	"${FILESDIR}"/gn-gen-r6.patch
 )
 
 pkg_setup() {
@@ -36,10 +36,6 @@ 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
 	edo "$@"