gentoo auto-resync : 20:04:2024 - 12:05:23

6 files changed, 60 insertions, 73 deletions

diff --git a/dev-build/Manifest.gz b/dev-build/Manifest.gz
index 3f338648814c..be827c5e205f 100644
--- a/dev-build/Manifest.gz
+++ b/dev-build/Manifest.gz
diff --git a/dev-build/ninja/Manifest b/dev-build/ninja/Manifest
index e0cba8bcd2f0..31c7d9055b95 100644
--- a/dev-build/ninja/Manifest
+++ b/dev-build/ninja/Manifest
@@ -2,6 +2,6 @@ AUX ninja-cflags.patch 738 BLAKE2B ec025836197d41d96cfcab0a7363ab3bda50cb7fc3f91
 DIST ninja-1.11.1.tar.gz 229479 BLAKE2B c96cf7c319b7abd65f644465688d256f8b3a576c4616d0c63852e25dd0dc5f63c66708d429d8dddb6228502eb147211a86a5dd369b80ec2228902b370d2343e5 SHA512 1bca38877c70ee6613f347ffccef5adc02ba0a3947c62ae004ea97f918442b5a3de92378e4f820ae2a7676bc7609d25fbc7d41f6cfb3a61e5e4b26ec3639e403
 DIST ninja-1.12.0.tar.gz 240291 BLAKE2B e7d721ab62164574b076f7cbf6d40fd2ee950534d124a58f5fe9e09bdae5895c8dc9dd7636a9f2f2b79774d6d9ba5f831e2c8b370826029af060fdc80fdc207f SHA512 167cd838ad47815183b79302a6e19227d956e634ae9d4211f0895ea9f4d893932e1154a765a9d5a1a3167b1a48b398f255fb4f46eb1395a6da11070bda628875
 EBUILD ninja-1.11.1-r5.ebuild 2451 BLAKE2B bf0e6fc2f7d09db24ca6b58a4a1e081ef08ee2bb04acc73af3e2f8fe8f77745f99ac8d68d0338b0867a0040555b6eddad61930c7ce7d72d43d0c426511b078a9 SHA512 831f9e6e2800fdf5c466ba0d69a9034b0c329a2d34b80cad723dead14d02a205ee76b398ca6a56b7d16a1ce8249b1be1493ce77bfb7e8e98e86e0a665f797b1b
-EBUILD ninja-1.12.0.ebuild 2274 BLAKE2B 4fa8ff716f1aaf61447029eac4663454941c7faebc0e81688ae3f8df35c57d3d7207eaf6e7f38add7b5bd6fab3b68e252f4c8999a262c5aca0cdd3786fdc647a SHA512 79b8db18779e6a21ce333ccb58648a18b0d94b6bf10bfe0a75e87a07ce1fedc2ce9d8e5b9ec118a35dc27a09ddfeb4b1995ae5911d87106bea23f9290ca7c08e
-EBUILD ninja-9999.ebuild 2274 BLAKE2B 4fa8ff716f1aaf61447029eac4663454941c7faebc0e81688ae3f8df35c57d3d7207eaf6e7f38add7b5bd6fab3b68e252f4c8999a262c5aca0cdd3786fdc647a SHA512 79b8db18779e6a21ce333ccb58648a18b0d94b6bf10bfe0a75e87a07ce1fedc2ce9d8e5b9ec118a35dc27a09ddfeb4b1995ae5911d87106bea23f9290ca7c08e
+EBUILD ninja-1.12.0.ebuild 2181 BLAKE2B 176fb48a6cd527f5e04cc0c971f3ddbb2b845cff8199a414b8049768088efe8d54bafcd519f25f04764f58457a3613c267c942143eba6ce21498e1bede645d39 SHA512 ae40c1d845c748da41ba0903f055f42cf401677d14365afddcedb22cf39dd2ed275571873df5b77b64c42ab308a84b9019884e89d68a12dad66f6f8f45ffbacf
+EBUILD ninja-9999.ebuild 2181 BLAKE2B 176fb48a6cd527f5e04cc0c971f3ddbb2b845cff8199a414b8049768088efe8d54bafcd519f25f04764f58457a3613c267c942143eba6ce21498e1bede645d39 SHA512 ae40c1d845c748da41ba0903f055f42cf401677d14365afddcedb22cf39dd2ed275571873df5b77b64c42ab308a84b9019884e89d68a12dad66f6f8f45ffbacf
 MISC metadata.xml 463 BLAKE2B 4094365ee9f5db41a29df26eada46bc42050da4043003bc265733666475d950df0b53cc475585b5d0ad79a1b9cbe83a53076911e564960d21568479e52bc4b33 SHA512 2d08b1e9f5377ba2d1976093fc9a3a9ceec51e80a7473e3d80e536585d1adb21c90d954205b97dd063dc99fe60b7b0c5335a16e05d0a2fa79e951c4833697880
diff --git a/dev-build/ninja/ninja-1.12.0.ebuild b/dev-build/ninja/ninja-1.12.0.ebuild
index c7a7c9ee0b26..3af9c43f1b06 100644
--- a/dev-build/ninja/ninja-1.12.0.ebuild
+++ b/dev-build/ninja/ninja-1.12.0.ebuild
@@ -3,10 +3,9 @@
 
 EAPI=8
 
-CMAKE_MAKEFILE_GENERATOR=emake
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit bash-completion-r1 edo cmake python-any-r1 toolchain-funcs
+inherit bash-completion-r1 edo python-any-r1 toolchain-funcs
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
@@ -21,19 +20,17 @@ HOMEPAGE="https://ninja-build.org/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
+IUSE="doc"
 
 BDEPEND="
+	${PYTHON_DEPS}
 	dev-util/re2c
 	doc? (
-		${PYTHON_DEPS}
 		app-text/asciidoc
 		app-text/doxygen
 		dev-libs/libxslt
 		media-gfx/graphviz
 	)
-	test? ( dev-cpp/gtest )
 "
 PDEPEND="
 	app-alternatives/ninja
@@ -43,49 +40,45 @@ pkg_setup() {
 	:
 }
 
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test ON OFF)
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}"/ninja-cflags.patch
 	)
-	cmake_src_configure
+	default
+}
 
-	if use doc; then
-		if tc-is-cross-compiler; then
-			mycmakeargs=( -DBUILD_TESTING=OFF )
-			local BUILD_DIR=${WORKDIR}/native
-			local SYSROOT=
-			tc-env_build cmake_src_configure
-		fi
-
-		python_setup
-		edo ${EPYTHON} configure.py
+bootstrap() {
+	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} -D_FILE_OFFSET_BITS=64"
+		local -x LDFLAGS=${BUILD_LDFLAGS}
 	fi
+	edo ${EPYTHON} configure.py --with-python=python --bootstrap --verbose
 }
 
 src_compile() {
-	cmake_src_compile
+	python_setup
+
+	tc-export AR CXX
+	unset CFLAGS
+	export CXXFLAGS="${CXXFLAGS} -D_FILE_OFFSET_BITS=64"
+
+	bootstrap
 
 	if use doc; then
-		if tc-is-cross-compiler; then
-			local BUILD_DIR=${WORKDIR}/native
-			cmake_build ninja
-		fi
-		edo "${BUILD_DIR}/ninja" -v -j1 doxygen manual
+		edo ./ninja -v doxygen manual
 	fi
-}
 
-src_test() {
-	if ! tc-is-cross-compiler; then
-		# Bug 485772
-		ulimit -n 2048
-		cmake_src_test
+	if tc-is-cross-compiler; then
+		edo ${EPYTHON} configure.py --with-python=python
+		edo ./ninja -v ninja
 	fi
 }
 
 src_install() {
-	cmake_src_install
-
-	mv "${ED}"/usr/bin/ninja{,-reference} || die
+	newbin ninja{,-reference}
 
 	if use doc; then
 		docinto html
diff --git a/dev-build/ninja/ninja-9999.ebuild b/dev-build/ninja/ninja-9999.ebuild
index c7a7c9ee0b26..3af9c43f1b06 100644
--- a/dev-build/ninja/ninja-9999.ebuild
+++ b/dev-build/ninja/ninja-9999.ebuild
@@ -3,10 +3,9 @@
 
 EAPI=8
 
-CMAKE_MAKEFILE_GENERATOR=emake
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit bash-completion-r1 edo cmake python-any-r1 toolchain-funcs
+inherit bash-completion-r1 edo python-any-r1 toolchain-funcs
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
@@ -21,19 +20,17 @@ HOMEPAGE="https://ninja-build.org/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
+IUSE="doc"
 
 BDEPEND="
+	${PYTHON_DEPS}
 	dev-util/re2c
 	doc? (
-		${PYTHON_DEPS}
 		app-text/asciidoc
 		app-text/doxygen
 		dev-libs/libxslt
 		media-gfx/graphviz
 	)
-	test? ( dev-cpp/gtest )
 "
 PDEPEND="
 	app-alternatives/ninja
@@ -43,49 +40,45 @@ pkg_setup() {
 	:
 }
 
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test ON OFF)
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}"/ninja-cflags.patch
 	)
-	cmake_src_configure
+	default
+}
 
-	if use doc; then
-		if tc-is-cross-compiler; then
-			mycmakeargs=( -DBUILD_TESTING=OFF )
-			local BUILD_DIR=${WORKDIR}/native
-			local SYSROOT=
-			tc-env_build cmake_src_configure
-		fi
-
-		python_setup
-		edo ${EPYTHON} configure.py
+bootstrap() {
+	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} -D_FILE_OFFSET_BITS=64"
+		local -x LDFLAGS=${BUILD_LDFLAGS}
 	fi
+	edo ${EPYTHON} configure.py --with-python=python --bootstrap --verbose
 }
 
 src_compile() {
-	cmake_src_compile
+	python_setup
+
+	tc-export AR CXX
+	unset CFLAGS
+	export CXXFLAGS="${CXXFLAGS} -D_FILE_OFFSET_BITS=64"
+
+	bootstrap
 
 	if use doc; then
-		if tc-is-cross-compiler; then
-			local BUILD_DIR=${WORKDIR}/native
-			cmake_build ninja
-		fi
-		edo "${BUILD_DIR}/ninja" -v -j1 doxygen manual
+		edo ./ninja -v doxygen manual
 	fi
-}
 
-src_test() {
-	if ! tc-is-cross-compiler; then
-		# Bug 485772
-		ulimit -n 2048
-		cmake_src_test
+	if tc-is-cross-compiler; then
+		edo ${EPYTHON} configure.py --with-python=python
+		edo ./ninja -v ninja
 	fi
 }
 
 src_install() {
-	cmake_src_install
-
-	mv "${ED}"/usr/bin/ninja{,-reference} || die
+	newbin ninja{,-reference}
 
 	if use doc; then
 		docinto html
diff --git a/dev-build/scons/Manifest b/dev-build/scons/Manifest
index 7f673faf7f29..a8c823eca2e7 100644
--- a/dev-build/scons/Manifest
+++ b/dev-build/scons/Manifest
@@ -4,5 +4,5 @@ DIST SCons-4.7.0.tar.gz 3220744 BLAKE2B 0fe8cdbaef46ca6571de35fb6544afe992e8a509
 DIST scons-4.7.0-user.html 1683569 BLAKE2B 6c68f34af85fbfaf70f77758321bd0bb86b4f549c5fa05f721df94af0627d030a15db89565910ee6674b514d6b4fac9e624ac0aa6e849bd1224833c0473ed4c6 SHA512 8b0320794775890d898854767cd12bc4da725f6a33ae4496dc41a7b37a6dcb5f812c23083093d17685db9799b230552e19cc5550a108c2cf6787ffd963e649d6
 DIST scons-4.7.0-user.pdf 3069908 BLAKE2B 7196a5b247802c9f42914c4de5968862c4a183e5c3ff7e5172ec7bbf58f049362f0b85fdaba47c66fc09dbed79c22ddac8195a78bff2e564eff879b0e6a4f482 SHA512 6d62def8a68c8bf3b6cc269a93272c815e82b46bd6a223d0f7f3848daf9c7212e5f9de8dcdac41d2a6f2d7d70053b97f92e0b99c11f4f5b2b3a69951d474fe3a
 DIST scons-4.7.0.gh.tar.gz 5896790 BLAKE2B 1ce9041ad1e2891da92a9bd50e07e29a5e23c7c9432adb120d6610956a2ea4a5125fb6bfa1f8b944797d589cfdbe036a1b9b1eae271ae51abb826c6ee5a3ee1c SHA512 8be4d611c375c13467a1a437e0d47873f973584d9a1be0d1cbbd345685a8f477fc19fa59ab01bca1ab7be8af0034d5cfda360090ee4b347c41f7bfea363bfe6c
-EBUILD scons-4.7.0.ebuild 4534 BLAKE2B 4b612562b1338e984c7817699b5ff3eb8beadc5790a402cf96236b8f76c78e015fec2ad1444c2593fa0b90807ce3d976eb157ed79abd3690f223aed186a4df35 SHA512 304d885c3719d05add8a02af6a8a634c7c2323a7891dfd435c14d878fac58bfe4987b7aa92b1ea2a1e81ffccf86883186d265acbdadaf29eed412db329ec696d
+EBUILD scons-4.7.0.ebuild 4583 BLAKE2B f4329429d94022e85d8094b8d94a7f7d82d7c4f81791a6a395b2b7368626ed71b7ad74fc4b0ccf99feb44605256358aa4c1e896959186903f24839cb21507ffd SHA512 bb9a6fa13caecd7062afe05512b71279754f44386ceccd559bc4e68ef8bae0c21b15e953bf9c075d3b67fb4137dd97bc546169afd981af548b4518fff3cd926e
 MISC metadata.xml 803 BLAKE2B 17a1596fb7b6991a9c4732c8e8c1231cd57ba42ae9e0b65a475f4a00503bacba23ae671df112909688574f836962951dcd2fd7a35bc83c34a0eeb72ecb96bbc2 SHA512 c1451442bdf49d7c85cc84831ea3a8a540581680858dc1ac117080b6a8558419d004952ade0410c0b31d9d241ae3d5eef1c81525ecb80c40cdc380b50f49e1ad
diff --git a/dev-build/scons/scons-4.7.0.ebuild b/dev-build/scons/scons-4.7.0.ebuild
index 4b4b4161b6d5..0d56d78fc664 100644
--- a/dev-build/scons/scons-4.7.0.ebuild
+++ b/dev-build/scons/scons-4.7.0.ebuild
@@ -76,6 +76,7 @@ src_prepare() {
 			test/TEX/newglossary.py
 			test/TEX/variant_dir_newglossary.py
 			test/Configure/option--config.py
+			test/D/HSTeoh/sconstest-linkingProblem_gdc.py
 			# broken by commas in date, sic!
 			test/option/option-v.py
 			test/Interactive/version.py