gentoo auto-resync : 19:11:2024 - 03:03:00

3 files changed, 58 insertions, 3 deletions

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index dd7da8606075..d70bd7673ee5 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -35,7 +35,8 @@ DIST gcc-15-20241117.tar.xz 90065532 BLAKE2B 22ffd82f77871df3c90667d3fbc08ff7215
 DIST gcc-15.0.0-musl-patches-2.tar.xz 3076 BLAKE2B 0073248fe4f7dd827980559017b5aa1fb5c4c46acc9ad5c410dc152fd1e44966d3066bf7152338573cb45b1c36027de5f0c519abd414d97a37bccef07f6a5281 SHA512 295f1a669020bbe2874e9b03afd46b5d083073b276fca3543f3767a2d74f35df81cf0a67abad50c200cf7a3af36ec98ff9977cb7d5c19f334af7d3bb1926a3de
 DIST gcc-15.0.0-patches-21.tar.xz 16832 BLAKE2B 75a781cf9c7d9b2087d598d751fc1d2e4322b801c1864bb03c68c0a419f65051224febedd608473dec5ca76e2cdaf4ba3d3f1bd86eb13a71ceedb61983ecb208 SHA512 2ffac32494c455d969a7bafcdd8f68fb9d1905fdb4a6f966160f8ad89680d57d07361326739828c57b3e7c89138f74616f47522611982bc902466a14b08f0859
 DIST gcc-15.0.0-patches-23.tar.xz 18284 BLAKE2B 00cb74250dceaf780bfac7fb785a885a6fdf0ae5be1ffc69b75689b79e7d60415d1a8711e0b9278858b74bdf355f0ab8acc6af01253fa6f087b8ef41a2a9effb SHA512 5c663bf734a5415bd43b84978b87fe61accd94c7a6ec2e1fa016cb5aa9acb3420dff5bd6df754f833a76e778c2bc4ce63815b09ed389751af92042704339c376
-DIST gcc-15.0.0-patches-24.tar.xz 17340 BLAKE2B 2812b9d26ab5d7ade8aa82ac61a27e844df8b4016766aafecf50cbcf3a3179749687ecadd0d46915f74566d24fbdb1ad64db48c0066df54b93bc0e5c35623282 SHA512 27669b9ccd83d88f99a232d44113a27b58e002dede957fb306d2664399d496870b4d13cfe937df2c45b2d53e0690d6ec54fe37aa990a02d8ff520d6d14837c63
+DIST gcc-15.0.0-patches-25.tar.xz 18000 BLAKE2B 77506d61413b65eccd19511e3defe40dcf3bcf8ce5c5901474eac052cb6ac0cc6d77d81e073e61155d6cba8dfdfbfd39ef68236b0bbb2814ec517e9462837a58 SHA512 c578ff48e3c97b7bc72dc2393cd5ab5dd4cfb7f5357d4203f3a7acda53a1ea6af36b4aa758b5366f1535183dc7273f61fecab55aa9f45c727951ca681bd0a628
+DIST gcc-15.0.0-patches-26.tar.xz 18864 BLAKE2B dc11d5a4d292ae53558601a59a34a619f6e0bbe223e6645a82a04fcd3b83b5788a3a7fdd14ac6fc2fde079302355dbef1a94c283725807425e1ce8d67e28f416 SHA512 14721dffb4dac9394239a82c52e3cbf47094dadc1b310b55a71101ca7ba1a5077fd137f39fbfb89896d324117f6a13c97dc8e8fa8cedecc5c2af4179de7e7f1f
 DIST gcc-8.5.0-patches-4.tar.xz 18616 BLAKE2B 7594cbaea5daecf1a0b3d526c06aeba0a84c6da66aee2e105a51fda6be8d30a37ccc3814281b284a4582d892a1d556bca063551584edfc2525bed8ea5b6888e7 SHA512 1aa5742c361186637e7855f06feb1a4547e7d4d5de6e51f3d049e0ef3c19e2eff179465f52781739f59422035b7f8e4c0efa3844849f920f3c96acfdc37ca6a6
 DIST gcc-8.5.0.tar.xz 63841008 BLAKE2B aa81a1a730fd7371360f6abed6ba78b5843fd18c58d5de5687acc320741b9e430e85df3535a1ef7a26051409be8d2f0945f503e5968480d919103123a99d4b12 SHA512 92f599680e6b7fbce88bcdda810f468777d541e5fddfbb287f7977d51093de2a5178bd0e6a08dfe37090ea10a0508a43ccd00220041abbbec33f1179bfc174d8
 DIST gcc-9.5.0-patches-2.tar.xz 14324 BLAKE2B 1d3bf3e673108ad2fcdcb86daefb4603d1c9f6aa815e34d1591054d466b76d6f50cce124ab4760528c4951ea16eb00888a3e6485417f81ebf250548732df4a8e SHA512 a6d6f650aaf0bd193a17ac279649f0544a282cea295824384c59341c3000eac4b574b60e00dd427585d928f9768166abf85168b47772132790ad98854acacbbf
@@ -63,7 +64,8 @@ EBUILD gcc-14.3.9999.ebuild 1410 BLAKE2B 9bae23ee70f670946a0b160e4d4d8a074584097
 EBUILD gcc-15.0.0_pre20241027.ebuild 1360 BLAKE2B 109f9b1ddfaffbc2855befa1e1ee0ac9eff8adb263c6e429b8f4a017b7c16cba8139fd8fb11c301dda13c552a1050bc896eafedebdf8a0fc068a585354a15bb3 SHA512 fa273b7f51e9e632cc19695d54bf152d05456b38865d8c1452cc711ecbb459b581bb02432e5e4bda295683cd631a8f5b6d28dc43868bdd81900d41d15843d396
 EBUILD gcc-15.0.0_pre20241103.ebuild 1360 BLAKE2B 109f9b1ddfaffbc2855befa1e1ee0ac9eff8adb263c6e429b8f4a017b7c16cba8139fd8fb11c301dda13c552a1050bc896eafedebdf8a0fc068a585354a15bb3 SHA512 fa273b7f51e9e632cc19695d54bf152d05456b38865d8c1452cc711ecbb459b581bb02432e5e4bda295683cd631a8f5b6d28dc43868bdd81900d41d15843d396
 EBUILD gcc-15.0.0_pre20241110.ebuild 1360 BLAKE2B 26ea52cd183b04e285abef0e353bcb048dda6c39012b5440b35445ceb980a3ca970343836099f2bfaa3460e62346c0b44a8ccfc0fa6aa7cea6d068abeb07dac4 SHA512 2d3f8f49f0e99b7bec38c0ebe15d5c47f4455ea6037a5537e8d8d150e91b26aefc713d9bb6e3466c1a54245da95551b44931d285caf53e2386a30f33dba4b406
-EBUILD gcc-15.0.0_pre20241117.ebuild 1360 BLAKE2B 4c0878d9992306615157dbedd206102d932f4f454edff704a43b87a75bacdb5b3db3dc53bdbc344c5947781dbfce84451ae7327f69b17fd71a80c548eeca7ccd SHA512 af14a89a120dd8909585dd7ee0c9fbf50523f70d9d4f2aeb12eddba90ebf0e262bb8b62a6f09afcb59c1de305a76b4fb6267f2b4be3f5ddcf1eac869515d1ed9
+EBUILD gcc-15.0.0_pre20241117-r1.ebuild 1360 BLAKE2B a29f12ab66cdb9d68e2a798f0e874e446ea2ade47a750508833e5b769614fa5e1b8b45aedce7e97237f04d67105abc98b1d69dad80919dd074ff68a78c7729ec SHA512 91ced8e4907562bed7ed2ea815caf1604ab72c0b5f42d350ddd8156f124010e7d4b55c05889ee19c709d019620600e92a822c5b26ee437ac857ee87a81432f30
+EBUILD gcc-15.0.0_pre20241117.ebuild 1360 BLAKE2B 504d230541404b9df3bad1a3cb0d5ac99e8b882ea035afbfd799f8bce6cf2f9db49dd63c6c3836f487a61b76a7624d8a261b93651b08411def12c4d7862b2ef3 SHA512 3b4f1c57359560d66fcac234092f49497bd79fd1125a6df43162a5c2358ba298f91626a96c54c8fadd6ce6cd17e4a267313902d391b3d2b283879157200fff6c
 EBUILD gcc-15.0.9999.ebuild 1332 BLAKE2B 6f17f77603522bac72d4d57094cc086263a9bfe6273c04d91b169ebc23d78fa2943c0950d4a40fe846d9d92648e54ca54ad1cecd5446ed5710062f9dca569b4b SHA512 4e4a673229a36dee68238e10efb2d9e0ff1c530411395e5230bbf567c92342a4b79d0ecb0ec91573c52fd8b5efd5cf6d20e612971848c9529378e0c42c0e213d
 EBUILD gcc-8.5.0-r2.ebuild 549 BLAKE2B 2856372670c76fbe54778c0532815e3510b01b1c8aad99acc3e9183bf6829251952e29887340895625c1e421e19302430ae1a0a8dddcd8470bd71cc221f0b6b0 SHA512 559ba0dbdc7542b6af5d101f19a5b3c9eab38b9996c26330834ffa924fd8c792988f223b492e6ac84255eccbc4af762be50c2d60e84ca24b7a9ebba134608c6d
 EBUILD gcc-9.5.0.ebuild 1257 BLAKE2B b398cea6cb4227fd126b85feb3e735f6b505236f54aecc9983e46fd30dbfcd8f16e80680c231567212c7cbd524b0d485574f7c5c5830137f9ebeea089a641e90 SHA512 0faea0a2389563bede22ba172ae6ab490a693c221bf6700152e9f63b23fad8d74a595a50c40cdf2eed32ee5e9cdddfdb6e2907629036c94034327f5772c93f6f
diff --git a/sys-devel/gcc/gcc-15.0.0_pre20241117-r1.ebuild b/sys-devel/gcc/gcc-15.0.0_pre20241117-r1.ebuild
new file mode 100644
index 000000000000..c8764ff4f220
--- /dev/null
+++ b/sys-devel/gcc/gcc-15.0.0_pre20241117-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_DEV="sam"
+TOOLCHAIN_HAS_TESTS=1
+PATCH_GCC_VER="15.0.0"
+PATCH_VER="26"
+MUSL_VER="2"
+MUSL_GCC_VER="15.0.0"
+PYTHON_COMPAT=( python3_{10..12} )
+
+if [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
+	# Cheesy hack for RCs
+	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
+	MY_P=${PN}-${MY_PV}
+	GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	TOOLCHAIN_SET_S=no
+	S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain
+
+if tc_is_live ; then
+	# Needs to be after inherit (for now?), bug #830908
+	EGIT_BRANCH=master
+elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+	# Don't keyword live ebuilds
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	:;
+fi
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	# Technically only if USE=hardened *too* right now, but no point in complicating it further.
+	# If GCC is enabling CET by default, we need glibc to be built with support for it.
+	# bug #830454
+	RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+	DEPEND="${RDEPEND}"
+fi
+
+src_prepare() {
+	local p upstreamed_patches=(
+		# add them here
+	)
+	for p in "${upstreamed_patches[@]}"; do
+		rm -v "${WORKDIR}/patch/${p}" || die
+	done
+
+	toolchain_src_prepare
+
+	eapply_user
+}
diff --git a/sys-devel/gcc/gcc-15.0.0_pre20241117.ebuild b/sys-devel/gcc/gcc-15.0.0_pre20241117.ebuild
index 8ec7d782b67b..d8ac0cc985c5 100644
--- a/sys-devel/gcc/gcc-15.0.0_pre20241117.ebuild
+++ b/sys-devel/gcc/gcc-15.0.0_pre20241117.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 TOOLCHAIN_PATCH_DEV="sam"
 TOOLCHAIN_HAS_TESTS=1
 PATCH_GCC_VER="15.0.0"
-PATCH_VER="24"
+PATCH_VER="25"
 MUSL_VER="2"
 MUSL_GCC_VER="15.0.0"
 PYTHON_COMPAT=( python3_{10..12} )