gentoo auto-resync : 08:04:2025 - 08:43:11

12 files changed, 17 insertions, 681 deletions

diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index fb4bf9bf9739..18f5722a16e1 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index d3e195e708a1..719946cce628 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,8 +1,5 @@
 AUX gcc-13-fix-cross-fixincludes.patch 883 BLAKE2B 1ae33195320754c55f42e1206bcfdf98914af5190df5939a4c7b072a2bc25216c354ea5d76f5171e1b8a150ca7764bdf57cea1bc137c237a5e8bb44713885f1b SHA512 ca9625001f0a10826d75691fdba35ca5783ed2f80e605b935785f8dc7591b0e650dca28bf1fc7e688e27547dddc7ab38232459b4f1865ed10a148978d0e09703
 AUX gcc-14.2.1_p20241221-arm-Revert-arm-MVE-intrinsics-Fix-support-for-predicate-.patch 5160 BLAKE2B f229bc58851d348a67d636d65878166479f2eb735dddc6368e21c2cc5b1c2b8660b1c87024c1637a25a9acf609662823337307f21fe9a51fe9cbfc6fdcbb0a16 SHA512 c62e991b826cee7258abfa3f1305fc33b8b0e0dce2aaa1ae5a753b547126d9dde6632894eb72e46c6c78c9777029a7593a4f9afbb6a3ac6d831c63ea0c19decd
-AUX gcc-15.0.1_pre20250323-disable-musttail.patch 7995 BLAKE2B b147d64f1757c6ddf17963cc62bc0304cf344ae3e42b26ca0ff8a04f447355057ce5906107b946aa40848c72957f92637aaed0276a8decd715c48e6b3fbb5b0c SHA512 2d1af2c1ce6bf0801665cb1014a01bd43cbbcf174e196c6f2f47a4bdcbf5a36e2aa8ff1ec52574a2dc9395404a98d3efbbd4d88fb3ecb5f9a44a562d8e6552a1
-AUX gcc-15.0.1_pre20250323-e2fsprogs.patch 4467 BLAKE2B 80ced89c0ea4d44ed5bac8adcdeb985ea1ea2ae46e269beb8dd7a825207cf52dc3f0e49724d54681f8a787d9c103ff806c88f941b073160a2674f8aafed2f21e SHA512 42382c7e5b1fc527ca4f30c9507edbe966d06a47b281299adebbf1bc2c97ef8bffe46aae75a227eb50506e76685b34ead2a0e8cf531e9ea1199e77cb2e4b398b
-AUX gcc-15.0.1_pre20250330-lifetime-extension.patch 5800 BLAKE2B 9893082839344508114800872c17ac5982c77591db0949c6315d0db8c51fc80e30d354c7e5d886aee29ba7207df942b3a9c1378361c42be769d788a6eec94fd6 SHA512 284bc62c97cd30a1355df639d40043bf08911807fbbc4122501347998bbd0f4b826e85f6a9719acc3ed7712c0fe2560355b07f436c5686008c4208dd78a72f71
 AUX gcc-configure-texinfo.patch 341 BLAKE2B d2ea3b2ea08f5d3a498ba27d0fb95e325097e2104e55caa28b66515cb48662649140d90b639369aedc54b2b1178fa4b49cda442f5f504e09d88a2efa45a5057c SHA512 e8d34c5077409df5495cf0c5fbf5e77f841c5698108fa6a5fde33eb28202c685603bdefd8368918e55f30c4b995e895d71d64c715c1ec2b017e09eb2c54c09ff
 DIST gcc-10.5.0-musl-patches-2.tar.xz 3452 BLAKE2B 5387e516d07d81477b3f39b8b3bd986bf861d32cd25dc5481c97bd3620d00c918c5661e86857f66dbf28a655401a53e43417f638c443e44cbfdbf5e950caac4d SHA512 86f2ce31cc4fc4fb5a6043fb527bf822d895e1a6220652024f78a1cbd5a962edb6be8dc5f43c32053e075f39bb2350ea8f14e7d57e0473dd2933a7b44676bde5
 DIST gcc-10.5.0-patches-6.tar.xz 18208 BLAKE2B 4cac3340108fb378c76ad62b728429f3c97f348d178744e7536575f3576ca8aa682b878b7df3b1c162dccae64a3cb56c66d8d60eae323e1ece2de4278084fdbd SHA512 9d6c84325fbc118cee01347468ce729c278e5b026b16da945fe54050726e26f86a46ee7b71a01a47cf927b70bfcce459c49a6bc4fb93dcfaa047c76d4c5bc5bc
@@ -33,18 +30,13 @@ DIST gcc-14-20241221.tar.xz 88198252 BLAKE2B 7491c2e1c8885e201859143bdf5cae95af4
 DIST gcc-14-20250301.tar.xz 88230928 BLAKE2B 2b65e7cccbf431a74df73adac53995873e78240d7abd97e9c9c576806c389b3c1abb6d47710a25a26f2ee399de750a07c3fb7916a580875d08a3a83354d89c1c SHA512 6b2afe19ce95a595307ae10b89054927116d33b499f1ef8233936d719271c04cb8f66890068ef2252c59ab0276dd0e6210990cb88abdfb4965818c25949f431e
 DIST gcc-14-20250322.tar.xz 88221060 BLAKE2B c8ec3dcbaaed1ee9a8d35f866a21879192a10707600a9ffa10c9a958de84e0fec3f8bd93950a5cdd53f2e4d9fcc74b45c4416a357eb271e70b314bd339da4818 SHA512 860049792547bfc21c4f61f1648056510495f16e97ea47444d02a740e60bfea1870d3ff437548854681e94fb2e7099a186526a6acecb02df7753e0f5661f6d30
 DIST gcc-14-20250329.tar.xz 88223376 BLAKE2B 024343e0307d8cc18efe326a137f599c25304346e23ba2a501e7a414c7c96891cd339ac5f82c9b6b1f8bfa0101734aafc3580d8577405d8f18d0c809f5d1b2d2 SHA512 ae86076dee09826ef3bed6ae927c757205ea48c9fcef59c61a74a3ca31117797a958ba2307cdee785f2c2bbccd87dd93316a0e3415f0e81bf2712d6abebcdef3
+DIST gcc-14-20250405.tar.xz 88235744 BLAKE2B 8de5bb1e182391c20b887b84da2ef04aab01bfd8f50d0a0fdca107fde89059f492d2920604ce7680be66f0aca319ed3fbb79f671e3d89b8fda0d33f447074210 SHA512 ba12a47dd3c2f3af4def7d582241b450e1e6ca9e8585839089401bf00dedfb93020bfd8a05ecb1a120491d664208c319f7ae2f763fb49c764492efe6a109cf92
 DIST gcc-14.1.0-musl-patches-1.tar.xz 3600 BLAKE2B 4cd920b7ca1f122cae806707564d8e45bfd48e78c88788a12a301f6068b5a5f335d8885e67479ac536c66aeaa81f2ecb7240ae56e9fc821a7246ab66b453711f SHA512 61c48d90a55dfc2129d96aee69d939d6a89f6407f69f7bd12c1a619f28989f471fd219d731958f8e62b0fd650c32300f0ad8dc06d5df23d9fc8c1a77fe210c25
 DIST gcc-14.2.0-patches-7.tar.xz 14244 BLAKE2B 11236e91e1fe83fec8ffaa40ec0cdd4b52a00a951e9aa9a7a0a932b234b8f1a9603333a7ccf55859f4ef53dd4d8ad1fd5c1d2514b6e45fce5b86bb58622a0ecc SHA512 5a4d86d943e31fa068b5a784c0132bd83c23243dcb3cf972557a42e004469a415e1b3185f31b1bb36f916594d475f266a2fda031a414e4a15e0bbfe471269eee
 DIST gcc-14.2.0-patches-8.tar.xz 14540 BLAKE2B 09f66035343d4cab694b8ab382170f8e2d546ddffedf3477f26edbd6a798ddf94294f569c2661729d40088d590bc17a4eb651710d8d9f66f33703734a1a82b67 SHA512 7a9a2724ef8db3c57b033d90751192969c16e5eaa8f4777b7f16470222ff3a18771b461bd89feaad701e7f0d573b883b487981588129933c732fb76117728b86
-DIST gcc-15-20250323.tar.xz 91685912 BLAKE2B cd56bfe95b80358cbc44ae27a15d297d60630495f452e5d8158f5dfb7be457cdbb144226ef3bc8bdac6eec7f9e20185240a7a4ddc229ab96b7a9ef5c502c308a SHA512 45e44a9136c466ef1ace86129cc5e4629f4cbeefd896967ef9701711a09f806ac0505232f5eb840823aeaca82c8e6107b6cbb3ea7b912264402b4faf5cd19788
-DIST gcc-15-20250330.tar.xz 91772420 BLAKE2B 164a4db7f83d40a010edbed11ecf949e459a5f0c866425812299d55ed96965fcc537bb40190dc78a16f66dfaa8da110b74fb612d8e76fe29ce4031d6196ef0b3 SHA512 719f5b1d79cd8ba4462d6916b1ddb401ca7ee9a9596610e6be00085fdf0d20c7ccbdc88983a22cfea73a0b21b28e1edb8dfd095ca95696362d1d9d62fe6551c2
+DIST gcc-15-20250406.tar.xz 91871244 BLAKE2B d9b4f8b382c5755f62e5f8b89deac74fdbe177e3961c205bba1d887c2157486908b85e80e0171e4d1ed6233d0cd8704af89850a3d2f6dcf0c6e703aa27b23fd9 SHA512 3a4b135833660107b6d3129570a24b3977e7da0f85296d663cfa8949eb8b2bd97237086535b1ff3eaf6423afcf799d18f21aaadc4fcc35835dca2f10cc154c7c
 DIST gcc-15.0.0-musl-patches-2.tar.xz 3076 BLAKE2B 0073248fe4f7dd827980559017b5aa1fb5c4c46acc9ad5c410dc152fd1e44966d3066bf7152338573cb45b1c36027de5f0c519abd414d97a37bccef07f6a5281 SHA512 295f1a669020bbe2874e9b03afd46b5d083073b276fca3543f3767a2d74f35df81cf0a67abad50c200cf7a3af36ec98ff9977cb7d5c19f334af7d3bb1926a3de
-DIST gcc-15.0.0-patches-48.tar.xz 18120 BLAKE2B bfb1e7330c1c0499d2d0a0046506961cccaac1df8e5779f9de599e8b6d89e9014b512072159ed18fb58243e95716b79aaa0d7665e7742ceda117d40a867cf34f SHA512 1cc61250e943e2cae543a5336fdc9ad04851186f8f45e4b82cb9be287a804374e84066cec0efd55662211107cecde92f78b6d3c745e421bc83b3d60101be9ebd
-DIST gcc-15.0.0-patches-50.tar.xz 25208 BLAKE2B 09e98c3dcdd3c60ede26c6e322d513b3df09efddfa21ea95b2cb7c3ee57b4c054f41fc60668706e33e56f022ef4b7cb96f7cc01b4a25d62d9777ef8b3b0d1ade SHA512 3b69d97a08c894a387fbcc4934bf0c519af8f66aff394c2a2565ed545fcb93f0bd70526cc74f5d952047d8d6782847c6d8e4aa7a408f0f89b1666c747ada8b4d
-DIST gcc-15.0.0-patches-51.tar.xz 18672 BLAKE2B 3912f0db334c7169eb89f994625329348e60ba462f809ce52c93925b3dfa7b34bbc801ac4311c56ca53ab636a02b8e99a1fcca146e7089136c9af2a9f4e53f9a SHA512 65d2ded634c5f90a4c059339c820e7fcc0b9675c8ee7c7f1f30694964d6645ce78f7d061ec367da4f2da5078f3df68e69e83a2c65a37e3395800f294c7baca9b
-DIST gcc-15.0.0-patches-52.tar.xz 26592 BLAKE2B 693032b28405f42159ef0371da45bae7edf020708e84c34db19a6646f6ab511d90e78e590eddb395b9688f67f98f810bc9382780f9790c9ca9f5c12b9ed98976 SHA512 b0ade13302f200874b8704a3f58e24f040b55b2090099cc8f28899f847ac76d6a13df9090eb41941acdf4fa91c4bfcd2fce568d49e2e78ace3e897e0f18d69c5
-DIST gcc-15.0.1_pre20250330-patches-2.tar.xz 374992 BLAKE2B 11aa86f37ff7025488f2a3e5607f1bae0d4ecbc628251e5f6cd7e9446ec723f5f1ce2fdca867e97f0191b542ffba178e401b7acf10d1a9fc81c4c2f76503ca50 SHA512 4ec050a3dfe3ee4b9252987e83cb796f4cb5ed96a5c49dd4460028438513f802e0522831462aaac76c4c7dfbe7fa7dcb6946f1d692246750213d3aa3054e74c9
-DIST gcc-15.0.1_pre20250330-patches.tar.xz 148252 BLAKE2B 34c5d7ed6d7afd3c848ae82ab22a3007c7cd42b2c43c640c5ae01e55b3861a71c8a3206c16db407a6b089b7ab03431562c696d4135c9377c56fc671b3dfcef22 SHA512 ff54d8966370384a0ddbc2c9cd9e5aef808bd254a803dcd0d07ea4716c5a5b07d69a2c2cfede9f63960ac18ff0d499f6942aa613f46e90712f68666693a8f639
+DIST gcc-15.0.0-patches-53.tar.xz 27892 BLAKE2B 0c1455cae4aee49051fb5a8c31b8f82765da8ad9509ef17cb8c9f96d2c53a73fe1c8cfc0a2708e3bce0f8deb6f5e16807d8739bfd06cc6c08788331a719ded73 SHA512 c8f375f4de882ba99872f649f2cbbcc1b9f89d3dc9b355c1d11abfb6daf3ae7e89b82e002497215b641175d42d9f9a94749add2af2a5b6bcc1f3f5b41320df5b
 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
@@ -70,12 +62,9 @@ EBUILD gcc-14.2.1_p20241221.ebuild 1671 BLAKE2B be37005763106d7e235911720995010f
 EBUILD gcc-14.2.1_p20250301.ebuild 1573 BLAKE2B 5a2e92ce7e4b2a1d74a7d1d40bcd3de6104290044c56139b55daa99f87bbdb30c22b23ed33c9ded472efa7cdaea40d5a9a21d7128b615ff2e3bac9b58f08a6da SHA512 c1424741140b2d067ad8017a751c438915186dadd5c58960946f2367b1e2fc43ac107a438115dcc209e4bbc4546ec0437148fdd6f3b3307ce2501c16cd62db04
 EBUILD gcc-14.2.1_p20250322.ebuild 1574 BLAKE2B 6adb8d31e8a39464d81bab35916494df6a9d595c37b9a1c936016d08a30302173bcc777d6a5605a0ab774a63aa024852f5b3f2c80b87c57622fbea95bcead8d4 SHA512 5dacff91df9d51714f31891aabe6a02d73775bd401b6e349614294eb6e71b092ca3b1ad730acee2bd833680aa701bc98bfed56bf575f3e1c88005aad0234ebe7
 EBUILD gcc-14.2.1_p20250329.ebuild 1574 BLAKE2B 6adb8d31e8a39464d81bab35916494df6a9d595c37b9a1c936016d08a30302173bcc777d6a5605a0ab774a63aa024852f5b3f2c80b87c57622fbea95bcead8d4 SHA512 5dacff91df9d51714f31891aabe6a02d73775bd401b6e349614294eb6e71b092ca3b1ad730acee2bd833680aa701bc98bfed56bf575f3e1c88005aad0234ebe7
+EBUILD gcc-14.2.1_p20250405.ebuild 1574 BLAKE2B 6adb8d31e8a39464d81bab35916494df6a9d595c37b9a1c936016d08a30302173bcc777d6a5605a0ab774a63aa024852f5b3f2c80b87c57622fbea95bcead8d4 SHA512 5dacff91df9d51714f31891aabe6a02d73775bd401b6e349614294eb6e71b092ca3b1ad730acee2bd833680aa701bc98bfed56bf575f3e1c88005aad0234ebe7
 EBUILD gcc-14.3.9999.ebuild 1544 BLAKE2B cc463c5c5a86e4d7d1695493a80c13f4cc4a1583d349960c1594a4704f83e5eef411825a467c9ba6230b4bb37f6ae14fa99f50a145ceee1ea75f1602a9ff5ae5 SHA512 e9ee5685b18fe8fb078ac976fda9c9569ea839f5291ab55197526fd00e269db827845c18a3e6b765943ecaef5415ea311fc0d0ccabc6c447666149fd502f9b36
-EBUILD gcc-15.0.1_pre20250323-r1.ebuild 1586 BLAKE2B b46700779c75b1e836d5fb6c7a8ed2ee7703c93b45fcc00898c4785c6b555023ecf2f6a84049471a6dfba43548f3b98d311ceec493c42e78c263df23d3b61336 SHA512 de2c37907b99a616b76e470a200378ebd974af2efd5cd15b2eb6dc13f41c2d566629ebfab24e920e9d83adf0ebc12df53b135b3765531f35da722d5986139a2d
-EBUILD gcc-15.0.1_pre20250330-r1.ebuild 1692 BLAKE2B c26a994c7a04818c1fe4cb27a9a6cad804395bc65048a6205a1f07d8bc5d3c7b5ec123609820bdb07f5f308dff6522a0e4974263ee5e4aa72eb8c0b41b569e30 SHA512 14aca0677d3c3796ba7395d877bd6813b38738aa980c70a97f305a8bf37052075c4120f938c9cee0293c49b9d10a54260401f52a632f08fc13a76554dd337ca0
-EBUILD gcc-15.0.1_pre20250330-r2.ebuild 1634 BLAKE2B 83718bbe4c815c062097f631f5647bc238ad0115cf0c46f616b2306cad3382b2afd6084f4fece4d38223c7afbf4069eac0e9b41461bc7969a532d962f852c19c SHA512 bc7bdb01a50b03065e78f82b4f711c152a729fb4e72e0ac3744c6ba8696bded753cbb52aea3e0dc30dfd38cef8e39c72123cfc817065f46f481f4487be4f648a
-EBUILD gcc-15.0.1_pre20250330-r3.ebuild 1638 BLAKE2B b5404f81c112823322f9e45d3ebf6580a4733514503e742c12cc6e3375a2ccac8af17f948a627dff57f0bd74b29b72cc217f8bb60886204ed8b60464efc4fcf0 SHA512 588bd43bcb48ae804161e3dae452b45b07e4ffc98d2144a83a82eec16661206ad14be700072fbec2b0b9bdefc93b93dbf164d36414a262237fbf93940d2f0801
-EBUILD gcc-15.0.1_pre20250330.ebuild 1493 BLAKE2B fbd03226327b6c4a8efed9394f5c3112f3b7a90df1af5709ecceed7033ba563e55b644b86472e45bd39ca89d512e2a68a7d18ca400db90a0323d059c0473c06d SHA512 f9942e80dd37ebe85d1193fe622941bf0ceb49cf6b9fc155d216370e0946bb792b692cb3fec26933085accb146378bc609ec9fcdeacc99945bd9a02a9c6ea1b2
+EBUILD gcc-15.0.1_pre20250406.ebuild 1493 BLAKE2B 8019599974c61a62d9e486597336cc7824807858ddb8641bc1f3088c1b5a2130eedadea685d5a9882922b3359516064903842ff170575189c227b206ca0fe5a5 SHA512 6c526f3f5248023a702c30004bbb32ffc7e26e25250730dfc38180e0ac0a309284e6ed7ef53118bd91861bde06ace3a38bbbdc5bf327aa387e7b750d74b1de3a
 EBUILD gcc-15.0.9999.ebuild 1466 BLAKE2B 32e002d112c6523b45e80c43cfebdcd53dd2ef85d55edfd55c2b532c8ced6dce972ef00c37810f5f2af6d87fe8e103eaba39b92c793088acc4dc87b6052f772b SHA512 4c6aeccac90f8b8ba41d8deef7276513026db3560e7f9a5aa7db983670b6b38339d04d75d0cdf601d4174c11f0b7b9f426d85087c19dffed9f1401f8541dc9f0
 EBUILD gcc-8.5.0-r2.ebuild 683 BLAKE2B baac476321e8c074abe7d261aea13046f0d6508297c28e6b29708b56e1831318dba86273cd20985a9a41f40f12f2861121e6bdf563c627c2cb3d8fa59df3f799 SHA512 6872ad082f203aec401a7916cff7388eb9fdefb20651e61ecfad9a45a983820d499d200bc9ba50b60e0548134b7d2ea1739a185d0a07c08c522080e84b324338
 EBUILD gcc-9.5.0.ebuild 1391 BLAKE2B 1e6795285b290c046ee80c729da8771ef666a912d38d74ba46a9636bb133d9771ea5313612c6a21084c8cf2d40c6a941440a17a93df316513515687bf2b05037 SHA512 7f5244300603de512ff83195f03013905d017fc2353b54a584f6cc8e89a9525123842202e49d863ea7ba27c7b113ac5881de7e1dc8eb06d7139e9cc69d9d2a14
diff --git a/sys-devel/gcc/files/gcc-15.0.1_pre20250323-disable-musttail.patch b/sys-devel/gcc/files/gcc-15.0.1_pre20250323-disable-musttail.patch
deleted file mode 100644
index 537496f9a2d2..000000000000
--- a/sys-devel/gcc/files/gcc-15.0.1_pre20250323-disable-musttail.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-https://inbox.sourceware.org/gcc-patches/20250320013102.1336516-1-andi@firstfloor.org/
-
-From 592f60bef27cb60ea6405ca8603449fc4d92e640 Mon Sep 17 00:00:00 2001
-Message-ID: <592f60bef27cb60ea6405ca8603449fc4d92e640.1742435883.git.sam@gentoo.org>
-From: Andi Kleen <ak@gcc.gnu.org>
-Date: Wed, 19 Mar 2025 18:31:02 -0700
-Subject: [PATCH] PR119376: Disable clang musttail
-
-There are multiple reports (see PR 119376) now where semantic differences
-in the gcc musttail implementation break existing programs written for the clang
-variant.
-
-Even though that can be all hopefully fixed eventually,
-for the gcc 15 release it seems safer to disable clang::musttail,
-and only keep gnu::musttail.
-
-That means that programs that use __has_c_attribute to check for
-clang::musttail must opt-in explicitly.
-
-Reported-by: Sam James
-
-gcc/c/ChangeLog:
-
-	PR ipa/119376
-	* c-parser.cc (c_parser_handle_musttail): Drop clang namespace
-	check.
-
-gcc/cp/ChangeLog:
-
-	PR ipa/119376
-	* parser.cc (cp_parser_jump_statement): Drop clang namespace
-	check.
-
-gcc/ChangeLog:
-
-	PR ipa/119376
-	* doc/extend.texi: Drop clang::musttail reference.
-
-gcc/testsuite/ChangeLog:
-
-PR ipa/119376
-	* c-c++-common/musttail23.c: Don't use clang::musttail
-	* c-c++-common/musttail24.c: Dito.
-	* c-c++-common/musttail3.c: Dito.
-	* g++.dg/musttail14.C: Dito.
----
- gcc/c/c-parser.cc                       |  5 -----
- gcc/cp/parser.cc                        |  6 ------
- gcc/doc/extend.texi                     |  2 +-
- gcc/testsuite/c-c++-common/musttail23.c | 10 +++++-----
- gcc/testsuite/c-c++-common/musttail24.c |  6 ------
- gcc/testsuite/c-c++-common/musttail3.c  |  6 +++---
- gcc/testsuite/g++.dg/musttail14.C       |  4 ++--
- 7 files changed, 11 insertions(+), 28 deletions(-)
-
-diff --git a/gcc/c/c-parser.cc b/gcc/c/c-parser.cc
-index d49d5c58659f..79654448acaa 100644
---- a/gcc/c/c-parser.cc
-+++ b/gcc/c/c-parser.cc
-@@ -7409,11 +7409,6 @@ c_parser_handle_musttail (c_parser *parser, tree std_attrs, attr_state &attr)
- 	  std_attrs = remove_attribute ("gnu", "musttail", std_attrs);
- 	  attr.musttail_p = true;
- 	}
--      if (lookup_attribute ("clang", "musttail", std_attrs))
--	{
--	  std_attrs = remove_attribute ("clang", "musttail", std_attrs);
--	  attr.musttail_p = true;
--	}
-     }
-   return std_attrs;
- }
-diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc
-index 2fb1dc5992d4..da7700b55c64 100644
---- a/gcc/cp/parser.cc
-+++ b/gcc/cp/parser.cc
-@@ -15342,12 +15342,6 @@ cp_parser_jump_statement (cp_parser* parser, tree &std_attrs)
- 		musttail_p = true;
- 		std_attrs = remove_attribute ("gnu", "musttail", std_attrs);
- 	      }
--	    /* Support this for compatibility.  */
--	    if (lookup_attribute ("clang", "musttail", std_attrs))
--	      {
--		musttail_p = true;
--		std_attrs = remove_attribute ("clang", "musttail", std_attrs);
--	      }
- 
- 	    tree ret_expr = expr;
- 	    if (ret_expr && TREE_CODE (ret_expr) == TARGET_EXPR)
-diff --git a/gcc/doc/extend.texi b/gcc/doc/extend.texi
-index b919df914648..50f95e968ff9 100644
---- a/gcc/doc/extend.texi
-+++ b/gcc/doc/extend.texi
-@@ -10241,7 +10241,7 @@ have to optimize it to just @code{return 42 + 42;}.
- @cindex @code{musttail} statement attribute
- @item musttail
- 
--The @code{gnu::musttail} or @code{clang::musttail} standard attribute
-+The @code{gnu::musttail} standard attribute
- or @code{musttail} GNU attribute can be applied to a @code{return} statement
- with a return-value expression that is a function call.  It asserts that the
- call must be a tail call that does not allocate extra stack space, so it is
-diff --git a/gcc/testsuite/c-c++-common/musttail23.c b/gcc/testsuite/c-c++-common/musttail23.c
-index d2ba70b03250..1ceab1165129 100644
---- a/gcc/testsuite/c-c++-common/musttail23.c
-+++ b/gcc/testsuite/c-c++-common/musttail23.c
-@@ -19,10 +19,10 @@ foo (int x)
-     [[gnu::musttail (1, "", 3)]] return bar ();		/* { dg-error "'musttail' attribute does not take any arguments" } */
- 							/* { dg-error "expected" "" { target c } .-1 } */
-   if (x == 3)
--    [[clang::musttail (1)]] return bar ();		/* { dg-error "'musttail' attribute does not take any arguments" } */
-+    [[gnu::musttail (1)]] return bar ();		/* { dg-error "'musttail' attribute does not take any arguments" } */
- 							/* { dg-error "expected" "" { target c } .-1 } */
-   if (x == 4)
--    [[clang::musttail (1, "", 3)]] return bar ();	/* { dg-error "'musttail' attribute does not take any arguments" } */
-+    [[gnu::musttail (1, "", 3)]] return bar ();	/* { dg-error "'musttail' attribute does not take any arguments" } */
- 							/* { dg-error "expected" "" { target c } .-1 } */
-   if (x == 5)
-     __attribute__((fallthrough, musttail)) return bar (); /* { dg-warning "attribute 'musttail' mixed with other attributes on 'return' statement" "" { target c } } */
-@@ -32,14 +32,14 @@ foo (int x)
-     [[fallthrough]] [[gnu::musttail]] return bar ();	/* { dg-warning "'fallthrough' attribute ignored" "" { target c } } */
- 							/* { dg-warning "attributes at the beginning of statement are ignored" "" { target c++ } .-1 } */
-   if (x == 7)
--    [[clang::musttail, fallthrough]] return bar ();	/* { dg-warning "'fallthrough' attribute ignored" "" { target c } } */
-+    [[gnu::musttail, fallthrough]] return bar ();	/* { dg-warning "'fallthrough' attribute ignored" "" { target c } } */
- 							/* { dg-warning "attributes at the beginning of statement are ignored" "" { target c++ } .-1 } */
-   if (x == 8)
-     __attribute__((musttail, musttail)) return bar ();
-   if (x == 9)
-     [[gnu::musttail, gnu::musttail]] return bar ();
-   if (x == 10)
--    [[clang::musttail]] [[clang::musttail]] return bar ();
-+    [[gnu::musttail]] [[gnu::musttail]] return bar ();
-   if (x == 11)
--    [[clang::musttail]] [[gnu::musttail]] return bar ();
-+    [[gnu::musttail]] [[gnu::musttail]] return bar ();
- }
-diff --git a/gcc/testsuite/c-c++-common/musttail24.c b/gcc/testsuite/c-c++-common/musttail24.c
-index 10c2d3f188d8..26b8dbfb4c8e 100644
---- a/gcc/testsuite/c-c++-common/musttail24.c
-+++ b/gcc/testsuite/c-c++-common/musttail24.c
-@@ -8,14 +8,8 @@
- #if !__has_cpp_attribute (gnu::musttail)
- #error missing gnu::musttail attribute
- #endif
--#if !__has_cpp_attribute (clang::musttail)
--#error missing clang::musttail attribute
--#endif
- #else
- #if !__has_c_attribute (gnu::musttail)
- #error missing gnu::musttail attribute
- #endif
--#if !__has_c_attribute (clang::musttail)
--#error missing clang::musttail attribute
--#endif
- #endif
-diff --git a/gcc/testsuite/c-c++-common/musttail3.c b/gcc/testsuite/c-c++-common/musttail3.c
-index 7499fd6460b4..daedca28852a 100644
---- a/gcc/testsuite/c-c++-common/musttail3.c
-+++ b/gcc/testsuite/c-c++-common/musttail3.c
-@@ -11,7 +11,7 @@ struct str
- cstruct (int x)
- {
-   if (x < 10)
--    [[clang::musttail]] return cstruct (x + 1);
-+    [[gnu::musttail]] return cstruct (x + 1);
-   return ((struct str){ x, 0 });
- }
- 
-@@ -19,11 +19,11 @@ int
- foo (int x)
- {
-   if (x < 10)
--    [[clang::musttail]] return foo2 (x, 29);
-+    [[gnu::musttail]] return foo2 (x, 29);
-   if (x < 100)
-     {
-       int k = foo (x + 1);
--      [[clang::musttail]] return k;	/* { dg-error "cannot tail-call: " } */
-+      [[gnu::musttail]] return k;	/* { dg-error "cannot tail-call: " } */
-     }
-   return x;
- }
-diff --git a/gcc/testsuite/g++.dg/musttail14.C b/gcc/testsuite/g++.dg/musttail14.C
-index 810b45546d61..e4764a3bc03b 100644
---- a/gcc/testsuite/g++.dg/musttail14.C
-+++ b/gcc/testsuite/g++.dg/musttail14.C
-@@ -58,8 +58,8 @@ garply (int x)
-     case 3:
-       __attribute__(()) [[gnu::musttail]] __attribute__(()) [[]] __attribute__(()) return qux (45);
-     case 4:
--      [[]] __attribute__(()) [[clang::musttail]] __attribute__(()) [[]] return corge (46);
-+      [[]] __attribute__(()) [[gnu::musttail]] __attribute__(()) [[]] return corge (46);
-     default:
--      __attribute__(()) [[clang::musttail]] __attribute__(()) [[]] __attribute__(()) return freddy (47);
-+      __attribute__(()) [[gnu::musttail]] __attribute__(()) [[]] __attribute__(()) return freddy (47);
-     }
- }
--- 
-2.49.0
diff --git a/sys-devel/gcc/files/gcc-15.0.1_pre20250323-e2fsprogs.patch b/sys-devel/gcc/files/gcc-15.0.1_pre20250323-e2fsprogs.patch
deleted file mode 100644
index 5619bd5ef5a4..000000000000
--- a/sys-devel/gcc/files/gcc-15.0.1_pre20250323-e2fsprogs.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=584b346a4c7a6e6e77da6dc80968401a3c08161d
-
-From 584b346a4c7a6e6e77da6dc80968401a3c08161d Mon Sep 17 00:00:00 2001
-From: Jakub Jelinek <jakub@redhat.com>
-Date: Tue, 25 Mar 2025 16:55:24 +0100
-Subject: [PATCH] i386: Fix up combination of -2 r<<= (x & 7) into btr
- [PR119428]
-
-The following patch is miscompiled from r15-8478 but latently already
-since my r11-5756 and r11-6631 changes.
-The r11-5756 change was
-https://gcc.gnu.org/pipermail/gcc-patches/2020-December/561164.html
-which changed the splitters to immediately throw away the masking.
-And the r11-6631 change was an optimization to recognize
-(set (zero_extract:HI (...) (const_int 1) (...)) (const_int 1)
-as btr.
-
-The problem is their interaction.  x86 is not a SHIFT_COUNT_TRUNCATED
-target, so the masking needs to be explicit in the IL.
-And combine.cc (make_field_assignment) has since 1992 optimizations
-which try to optimize x &= (-2 r<< y) into zero_extract (x) = 0.
-Now, such an optimization is fine if y has not been masked or if the
-chosen zero_extract has the same mode as the rotate (or it recognizes
-something with a left shift too).  IMHO such optimization is invalid
-for SHIFT_COUNT_TRUNCATED targets because we explicitly say that
-the masking of the shift/rotate counts are redundant there and don't
-need to be part of the IL (I have a patch for that, but because it
-is just latent, I'm not sure it needs to be posted for gcc 15 (and
-also am not sure if it should punt or add operand masking just in case)).
-x86 is not SHIFT_COUNT_TRUNCATED though and so even fixing combine
-not to do that for SHIFT_COUNT_TRUNCATED targets doesn't help, and we don't
-have QImode insv, so it is optimized into HImode insertions.  Now,
-if the y in x &= (-2 r<< y) wasn't masked in any way, turning it into
-HImode btr is just fine, but if it was x &= (-2 r<< (y & 7)) and we just
-decided to throw away the masking, using btr changes the behavior on it
-and causes e2fsprogs and sqlite miscompilations.
-
-So IMHO on !SHIFT_COUNT_TRUNCATED targets, we need to keep the maskings
-explicit in the IL, either at least for the duration of the combine pass
-as does the following patch (where combine is the only known pass to have
-such transformation), or even keep it until final pass in case there are
-some later optimizations that would also need to know whether there was
-explicit masking or not and with what mask.  The latter change would be
-much larger.
-
-The following patch just reverts the r11-5756 change and adds a testcase.
-
-2025-03-25  Jakub Jelinek  <jakub@redhat.com>
-
-	PR target/96226
-	PR target/119428
-	* config/i386/i386.md (splitter after *<rotate_insn><mode>3_mask,
-	splitter after *<rotate_insn><mode>3_mask_1): Revert 2020-12-05
-	changes.
-
-	* gcc.c-torture/execute/pr119428.c: New test.
----
- gcc/config/i386/i386.md                        |  6 ++++--
- gcc/testsuite/gcc.c-torture/execute/pr119428.c | 18 ++++++++++++++++++
- 2 files changed, 22 insertions(+), 2 deletions(-)
- create mode 100644 gcc/testsuite/gcc.c-torture/execute/pr119428.c
-
-diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md
-index 2b3cffc1f350..9d1b34e55959 100644
---- a/gcc/config/i386/i386.md
-+++ b/gcc/config/i386/i386.md
-@@ -18168,7 +18168,8 @@
-  [(set (match_dup 4) (match_dup 1))
-   (set (match_dup 0)
-        (any_rotate:SWI (match_dup 4)
--		       (subreg:QI (match_dup 2) 0)))]
-+		       (subreg:QI
-+			 (and:SI (match_dup 2) (match_dup 3)) 0)))]
-  "operands[4] = gen_reg_rtx (<MODE>mode);")
- 
- (define_insn_and_split "*<insn><mode>3_mask_1"
-@@ -18202,7 +18203,8 @@
-   == GET_MODE_BITSIZE (<MODE>mode) - 1"
-  [(set (match_dup 4) (match_dup 1))
-   (set (match_dup 0)
--       (any_rotate:SWI (match_dup 4) (match_dup 2)))]
-+       (any_rotate:SWI (match_dup 4)
-+		       (and:QI (match_dup 2) (match_dup 3))))]
-  "operands[4] = gen_reg_rtx (<MODE>mode);")
- 
- (define_insn_and_split "*<insn><mode>3_add"
-diff --git a/gcc/testsuite/gcc.c-torture/execute/pr119428.c b/gcc/testsuite/gcc.c-torture/execute/pr119428.c
-new file mode 100644
-index 000000000000..33a93f46b3bd
---- /dev/null
-+++ b/gcc/testsuite/gcc.c-torture/execute/pr119428.c
-@@ -0,0 +1,18 @@
-+/* PR target/119428 */
-+
-+__attribute__((noipa)) void
-+foo (unsigned int x, unsigned char *y)
-+{
-+  y += x >> 3;
-+  *y &= (unsigned char) ~(1 << (x & 0x07));
-+}
-+
-+int
-+main ()
-+{
-+  unsigned char buf[8];
-+  __builtin_memset (buf, 0xff, 8);
-+  foo (8, buf);
-+  if (buf[1] != 0xfe)
-+    __builtin_abort ();
-+}
--- 
-2.43.5
diff --git a/sys-devel/gcc/files/gcc-15.0.1_pre20250330-lifetime-extension.patch b/sys-devel/gcc/files/gcc-15.0.1_pre20250330-lifetime-extension.patch
deleted file mode 100644
index 42eed3f6bb86..000000000000
--- a/sys-devel/gcc/files/gcc-15.0.1_pre20250330-lifetime-extension.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-https://inbox.sourceware.org/gcc-patches/Z-sCHDjucrcWTs2f@redhat.com/
-
-From d1ddf83b25fbe6c7c247007c754b7858cfaea916 Mon Sep 17 00:00:00 2001
-Message-ID: <d1ddf83b25fbe6c7c247007c754b7858cfaea916.1743458566.git.sam@gentoo.org>
-From: Marek Polacek <polacek@redhat.com>
-Date: Mon, 31 Mar 2025 16:59:08 -0400
-Subject: [PATCH] c++: fix missing lifetime extension [PR119383]
-
-Since r15-8011 cp_build_indirect_ref_1 won't do the *&TARGET_EXPR ->
-TARGET_EXPR folding not to change its value category.  That fix seems
-correct but it made us stop extending the lifetime in this testcase,
-causing a wrong-code issue -- extend_ref_init_temps_1 did not see
-through the extra *& because it doesn't use a tree walk.
-
-This patch reverts r15-8011 and instead handles the problem in
-build_over_call by calling force_lvalue in the is_really_empty_class
-case as well as in the general case.
-
-	PR c++/119383
-
-gcc/cp/ChangeLog:
-
-	* call.cc (build_over_call): Use force_lvalue to ensure op= returns
-	an lvalue.
-	* cp-tree.h (force_lvalue): Declare.
-	* cvt.cc (force_lvalue): New.
-	* typeck.cc (cp_build_indirect_ref_1): Revert r15-8011.
-
-gcc/testsuite/ChangeLog:
-
-* g++.dg/cpp0x/temp-extend3.C: New test.
----
- gcc/cp/call.cc                            |  9 ++++---
- gcc/cp/cp-tree.h                          |  1 +
- gcc/cp/cvt.cc                             | 13 +++++++++
- gcc/cp/typeck.cc                          | 10 +++----
- gcc/testsuite/g++.dg/cpp0x/temp-extend3.C | 32 +++++++++++++++++++++++
- 5 files changed, 55 insertions(+), 10 deletions(-)
- create mode 100644 gcc/testsuite/g++.dg/cpp0x/temp-extend3.C
-
-diff --git a/gcc/cp/call.cc b/gcc/cp/call.cc
-index c1c8987ec8b1..b1469cb5a4c9 100644
---- a/gcc/cp/call.cc
-+++ b/gcc/cp/call.cc
-@@ -10828,10 +10828,8 @@ build_over_call (struct z_candidate *cand, int flags, tsubst_flags_t complain)
-       if (is_really_empty_class (type, /*ignore_vptr*/true))
- 	{
- 	  /* Avoid copying empty classes, but ensure op= returns an lvalue even
--	     if the object argument isn't one. This isn't needed in other cases
--	     since MODIFY_EXPR is always considered an lvalue.  */
--	  to = cp_build_addr_expr (to, tf_none);
--	  to = cp_build_indirect_ref (input_location, to, RO_ARROW, complain);
-+	     if the object argument isn't one.  */
-+	  to = force_lvalue (to, complain);
- 	  val = build2 (COMPOUND_EXPR, type, arg, to);
- 	  suppress_warning (val, OPT_Wunused);
- 	}
-@@ -10852,6 +10850,9 @@ build_over_call (struct z_candidate *cand, int flags, tsubst_flags_t complain)
- 	  tree array_type, alias_set;
- 
- 	  arg2 = TYPE_SIZE_UNIT (as_base);
-+	  /* Ensure op= returns an lvalue even if the object argument isn't
-+	     one.  */
-+	  to = force_lvalue (to, complain);
- 	  to = cp_stabilize_reference (to);
- 	  arg0 = cp_build_addr_expr (to, complain);
- 
-diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
-index 2f2122dcf241..927f51b116b3 100644
---- a/gcc/cp/cp-tree.h
-+++ b/gcc/cp/cp-tree.h
-@@ -7079,6 +7079,7 @@ extern tree convert_to_reference		(tree, tree, int, int, tree,
- 						 tsubst_flags_t);
- extern tree convert_from_reference		(tree);
- extern tree force_rvalue			(tree, tsubst_flags_t);
-+extern tree force_lvalue			(tree, tsubst_flags_t);
- extern tree ocp_convert				(tree, tree, int, int,
- 						 tsubst_flags_t);
- extern tree cp_convert				(tree, tree, tsubst_flags_t);
-diff --git a/gcc/cp/cvt.cc b/gcc/cp/cvt.cc
-index bd1f147f2c56..f663a6d08c89 100644
---- a/gcc/cp/cvt.cc
-+++ b/gcc/cp/cvt.cc
-@@ -575,6 +575,19 @@ force_rvalue (tree expr, tsubst_flags_t complain)
-   return expr;
- }
- 
-+/* Force EXPR to be an lvalue, if it isn't already.  */
-+
-+tree
-+force_lvalue (tree expr, tsubst_flags_t complain)
-+{
-+  if (!lvalue_p (expr))
-+    {
-+      expr = cp_build_addr_expr (expr, complain);
-+      expr = cp_build_indirect_ref (input_location, expr, RO_ARROW, complain);
-+    }
-+  return expr;
-+}
-+
- 
- /* If EXPR and ORIG are INTEGER_CSTs, return a version of EXPR that has
-    TREE_OVERFLOW set only if it is set in ORIG.  Otherwise, return EXPR
-diff --git a/gcc/cp/typeck.cc b/gcc/cp/typeck.cc
-index c8e4441fb8b4..4f4dc683b5a0 100644
---- a/gcc/cp/typeck.cc
-+++ b/gcc/cp/typeck.cc
-@@ -3870,13 +3870,11 @@ cp_build_indirect_ref_1 (location_t loc, tree ptr, ref_operator errorstring,
- 	  return error_mark_node;
- 	}
-       else if (do_fold && TREE_CODE (pointer) == ADDR_EXPR
--	       && same_type_p (t, TREE_TYPE (TREE_OPERAND (pointer, 0)))
--	       /* Don't let this change the value category.  '*&TARGET_EXPR'
--		  is an lvalue, but folding it into 'TARGET_EXPR' would turn
--		  it into a prvalue of class type.  */
--	       && lvalue_p (TREE_OPERAND (pointer, 0)))
-+	       && same_type_p (t, TREE_TYPE (TREE_OPERAND (pointer, 0))))
- 	/* The POINTER was something like `&x'.  We simplify `*&x' to
--	   `x'.  */
-+	   `x'.  This change the value category: '*&TARGET_EXPR'
-+	   is an lvalue and folding it into 'TARGET_EXPR' turns it into
-+	   a prvalue of class type.  */
- 	return TREE_OPERAND (pointer, 0);
-       else
- 	{
-diff --git a/gcc/testsuite/g++.dg/cpp0x/temp-extend3.C b/gcc/testsuite/g++.dg/cpp0x/temp-extend3.C
-new file mode 100644
-index 000000000000..3eab88d0076e
---- /dev/null
-+++ b/gcc/testsuite/g++.dg/cpp0x/temp-extend3.C
-@@ -0,0 +1,32 @@
-+// PR c++/119383
-+// { dg-do run { target c++11 } }
-+
-+int g;
-+
-+struct base {
-+  virtual base *clone() const = 0;
-+  ~base() { }
-+};
-+
-+struct impl : virtual base {
-+  base *clone() const { return new impl; }  // #1
-+  impl() { ++g; }
-+  ~impl() { --g; }
-+};
-+
-+const base *
-+make_a_clone ()
-+{
-+  const base &base = impl{}; // #2
-+  return base.clone();
-+}
-+
-+int
-+main ()
-+{
-+  make_a_clone ();
-+  // impl::impl() is called twice (#1 and #2), impl::~impl() once,
-+  // at the end of make_a_clone.
-+  if (g != 1)
-+    __builtin_abort ();
-+}
-
-base-commit: aa3aaf2bfb8fcc17076993df4297597b68bc5f60
--- 
-2.49.0
-
diff --git a/sys-devel/gcc/gcc-15.0.1_pre20250323-r1.ebuild b/sys-devel/gcc/gcc-14.2.1_p20250405.ebuild
index 2a59abeeb80c..d405a1386bd4 100644
--- a/sys-devel/gcc/gcc-15.0.1_pre20250323-r1.ebuild
+++ b/sys-devel/gcc/gcc-14.2.1_p20250405.ebuild
@@ -8,10 +8,10 @@ EAPI=8
 
 TOOLCHAIN_PATCH_DEV="sam"
 TOOLCHAIN_HAS_TESTS=1
-PATCH_GCC_VER="15.0.0"
-PATCH_VER="48"
-MUSL_VER="2"
-MUSL_GCC_VER="15.0.0"
+PATCH_GCC_VER="14.2.0"
+PATCH_VER="8"
+MUSL_VER="1"
+MUSL_GCC_VER="14.1.0"
 PYTHON_COMPAT=( python3_{10..13} )
 
 if [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
@@ -27,10 +27,10 @@ inherit toolchain
 
 if tc_is_live ; then
 	# Needs to be after inherit (for now?), bug #830908
-	EGIT_BRANCH=master
+	EGIT_BRANCH=releases/gcc-$(ver_cut 1)
 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"
+	# m68k doesnt build (ICE, bug 932733)
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 	:;
 fi
 
@@ -51,7 +51,7 @@ src_prepare() {
 	done
 
 	toolchain_src_prepare
-	eapply "${FILESDIR}"/${P}-e2fsprogs.patch
-	eapply "${FILESDIR}"/${P}-disable-musttail.patch
+
+	eapply "${FILESDIR}"/${PN}-13-fix-cross-fixincludes.patch
 	eapply_user
 }
diff --git a/sys-devel/gcc/gcc-15.0.1_pre20250330-r1.ebuild b/sys-devel/gcc/gcc-15.0.1_pre20250330-r1.ebuild
deleted file mode 100644
index f51cba8957f7..000000000000
--- a/sys-devel/gcc/gcc-15.0.1_pre20250330-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Maintenance notes and explanations of GCC handling are on the wiki:
-# https://wiki.gentoo.org/wiki/Project:Toolchain/sys-devel/gcc
-
-TOOLCHAIN_PATCH_DEV="sam"
-TOOLCHAIN_HAS_TESTS=1
-PATCH_GCC_VER="15.0.0"
-PATCH_VER="50"
-MUSL_VER="2"
-MUSL_GCC_VER="15.0.0"
-PYTHON_COMPAT=( python3_{10..13} )
-
-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
-		80_all_PR119376-tailc-Don-t-fail-musttail-calls-if-they-use-or-could.patch
-	)
-	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/${p}" || die
-	done
-
-	toolchain_src_prepare
-	eapply "${FILESDIR}"/${P}-lifetime-extension.patch
-	eapply "${FILESDIR}"/${PN}-15.0.1_pre20250323-disable-musttail.patch
-	eapply_user
-}
diff --git a/sys-devel/gcc/gcc-15.0.1_pre20250330-r2.ebuild b/sys-devel/gcc/gcc-15.0.1_pre20250330-r2.ebuild
deleted file mode 100644
index 6baa03cc8933..000000000000
--- a/sys-devel/gcc/gcc-15.0.1_pre20250330-r2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Maintenance notes and explanations of GCC handling are on the wiki:
-# https://wiki.gentoo.org/wiki/Project:Toolchain/sys-devel/gcc
-
-TOOLCHAIN_PATCH_DEV="sam"
-TOOLCHAIN_HAS_TESTS=1
-PATCH_GCC_VER="15.0.0"
-PATCH_VER="51"
-MUSL_VER="2"
-MUSL_GCC_VER="15.0.0"
-PYTHON_COMPAT=( python3_{10..13} )
-
-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
-
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches.tar.xz"
-
-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 "${WORKDIR}"/gcc-15.0.1_pre20250330-patches
-	eapply_user
-}
diff --git a/sys-devel/gcc/gcc-15.0.1_pre20250330-r3.ebuild b/sys-devel/gcc/gcc-15.0.1_pre20250330-r3.ebuild
deleted file mode 100644
index de71eb2d85e3..000000000000
--- a/sys-devel/gcc/gcc-15.0.1_pre20250330-r3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Maintenance notes and explanations of GCC handling are on the wiki:
-# https://wiki.gentoo.org/wiki/Project:Toolchain/sys-devel/gcc
-
-TOOLCHAIN_PATCH_DEV="sam"
-TOOLCHAIN_HAS_TESTS=1
-PATCH_GCC_VER="15.0.0"
-PATCH_VER="52"
-MUSL_VER="2"
-MUSL_GCC_VER="15.0.0"
-PYTHON_COMPAT=( python3_{10..13} )
-
-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
-
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches-2.tar.xz"
-
-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 "${WORKDIR}"/gcc-15.0.1_pre20250330-patches-2
-	eapply_user
-}
diff --git a/sys-devel/gcc/gcc-15.0.1_pre20250330.ebuild b/sys-devel/gcc/gcc-15.0.1_pre20250406.ebuild
index 8a87e0ec2f08..fd941e7a420d 100644
--- a/sys-devel/gcc/gcc-15.0.1_pre20250330.ebuild
+++ b/sys-devel/gcc/gcc-15.0.1_pre20250406.ebuild
@@ -9,7 +9,7 @@ EAPI=8
 TOOLCHAIN_PATCH_DEV="sam"
 TOOLCHAIN_HAS_TESTS=1
 PATCH_GCC_VER="15.0.0"
-PATCH_VER="50"
+PATCH_VER="53"
 MUSL_VER="2"
 MUSL_GCC_VER="15.0.0"
 PYTHON_COMPAT=( python3_{10..13} )
diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index 68f39a27f101..2feffb214ad6 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -6,6 +6,6 @@ DIST mold-2.37.1.tar.gz 10169802 BLAKE2B 702f5678f070b66cd3e6a2df000aad73ce6248d
 EBUILD mold-2.1.0.ebuild 2169 BLAKE2B b91dec8fb9890052e06cf40124f7647833a6ea786d95d44863848bfff17c0ba335f28aaac08d6971a619dbb845b9091d1134bae47f70bd811d2fde0f9ca11066 SHA512 5d27926e5003e6bd24ee3baf8258ab043aa660b7a36918500283bbec9d991ad8ea6971add52579ba6ee10a7eeeb97a6dff3a7e065c7292ced42d2f0043e33d1e
 EBUILD mold-2.35.1.ebuild 2587 BLAKE2B 37ce681019fab2dcc215efa29628214c974bf4b5d9331528f49ac674fe9e82b540ddd1d5755207761cccc186a1763956ec8a6087b1531324c278b94cc412aa90 SHA512 e40620b614d823308d9440785ccfd3a4a597f14b1af07c013fbd0a5a29f000a22b817cf7f9e8360c9e3beff3b55a679b454c1b2e7d86ae465fd7d934f699d778
 EBUILD mold-2.36.0.ebuild 2643 BLAKE2B 53026434252a6f9fac0aa74aff3a2649dd8678934a04be7ac253b10ea65a135bbcf6cff53c79cef76dbf8fc61da3cd983cbef119118a6fb658aea8cf2fb0cb03 SHA512 d6e164c93e9ad2a3000e61f576b9d6c972572726b6b0833b73357077907a2d65a8493b01ba8ff469dce631dd75101b3474db6a4ad080bf1cc27c2fe96f77aa56
-EBUILD mold-2.37.1.ebuild 2744 BLAKE2B 5ada51542d02fb71e8487d596525d18967adf25f627e5499738fe5c2e7952021f019d111c9caa9cc9e3c669dd76fc9dd72000171042c91f356aa13987a120794 SHA512 14fff705c54127d0323a7c5f3558cfa28ce1b41b2c91de97292e7b98718d2a9bd8287ad80d55bfe786aca42a8fa84cb4fe325477a2402db7ec2d449bfbe3b2a6
+EBUILD mold-2.37.1.ebuild 2743 BLAKE2B 6ab45f1d1809fdbd8391bfceb11d1fb8492ed82051bd0de4e34d3637469d246e8c82c2a06859a8254d6c35c402a11722386e0453ce2daae893c0d11c4ebb1253 SHA512 8fb3521e419fd8e289904ecbdf48fe1a01a3f9d0ed967f4c0bd306db6c28333ea063a3c03919a770458296cceaf41799cc6e3b4790b57dd6e4d950ce89574900
 EBUILD mold-9999.ebuild 2744 BLAKE2B 5ada51542d02fb71e8487d596525d18967adf25f627e5499738fe5c2e7952021f019d111c9caa9cc9e3c669dd76fc9dd72000171042c91f356aa13987a120794 SHA512 14fff705c54127d0323a7c5f3558cfa28ce1b41b2c91de97292e7b98718d2a9bd8287ad80d55bfe786aca42a8fa84cb4fe325477a2402db7ec2d449bfbe3b2a6
 MISC metadata.xml 424 BLAKE2B a1c0cbdcb86c323fa1e6143c9665ec548f7713e74002a25b2fc26c51b60dae00922d3448a5aaecd5027a8cb026a681386ca7dea90657a3e10b25fb194dafc0d3 SHA512 1adc934e78ca0210743a1aa7479ebc4b5ea0b66a348c4408423460f02b404b885d3a8eca6e89ea8ac53ac9c76e85116965f1eef79e3f3e1f0451c8cf5ce0dfd6
diff --git a/sys-devel/mold/mold-2.37.1.ebuild b/sys-devel/mold/mold-2.37.1.ebuild
index f675a8309da7..216aa0ac7faa 100644
--- a/sys-devel/mold/mold-2.37.1.ebuild
+++ b/sys-devel/mold/mold-2.37.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
 else
 	SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 	# -alpha: https://github.com/rui314/mold/commit/3711ddb95e23c12991f6b8c7bfeba4f1421d19d4
-	KEYWORDS="-alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~riscv ~sparc ~x86"
+	KEYWORDS="-alpha amd64 ~arm ~arm64 ~loong ~ppc ~riscv ~sparc ~x86"
 fi
 
 # mold (MIT)