6 files changed, 42 insertions, 4 deletions
diff --git a/dev-build/Manifest.gz b/dev-build/Manifest.gz
index 5ad8daf89ccf..70f7c9316dcf 100644
--- a/dev-build/Manifest.gz
+++ b/dev-build/Manifest.gz
diff --git a/dev-build/cmake/Manifest b/dev-build/cmake/Manifest
index 56413201ab17..9b57ec501bf1 100644
--- a/dev-build/cmake/Manifest
+++ b/dev-build/cmake/Manifest
@@ -7,6 +7,7 @@ AUX cmake-3.27.0_rc1-0005-Respect-Gentoo-s-Python-eclasses.patch 2339 BLAKE2B d9
 AUX cmake-3.27.0_rc1-0006-Filter-out-distcc-warnings-to-avoid-confusing-CMake.patch 1207 BLAKE2B 4cd68da953268521965e04810e9b76a97dbc68c6c7e81cb23e0257166886787519122e425991c9bc9c9fd2d4d23a6a221206a8a3edc888adf58b1fe312cea149 SHA512 da5e897e7b8cc0973fb36ad82ac145c3cc790eadd10c1b7283decec67ede42d3ce132b1a71a3daa362941bd24208d9a3923af7331faac93ebda96df6aaf297dc
 AUX cmake-3.30.3-cudahostld.patch 1248 BLAKE2B 085a8d01ed89eeee852a7adc12101046a6cbba19486c7e1b311dd67211f9f9d60e03a54509c66808dde7419a8f45f5ec8ac3b974fdd8013ee96152b6e3457ad9 SHA512 495afc75274a939e78cf5492c383cb586b6c14fc3c598fe40e2dd25f6883cb678e33ff3b8915f6f90490b8a9cd62746053407e2ba58dc88719a93f97a36fdf66
 AUX cmake-3.31.6-Prefer-pkgconfig-in-FindBLAS.patch 861 BLAKE2B 252158e031cd6f0af74cc294cb7829c11c6c4a72a2fb3c405f146a98362f5121b9351997a2818740fed3966fa29a98cd2a61f44f5da7b9107dc15df03597d697 SHA512 063a6c7cbf68c6c9b7931114a5d85683515dfa67aca2b3f3501f7af820f0b36e99f6588744089df31b7a3a487268b5047dd36090feece0bd986484f5240bf658
+AUX cmake-3.31.6-curl-8.13.0.patch 1289 BLAKE2B d506d210339c17243d4ce5893b77bd0e5a2daaf5c3ba53edd0d966dcd57d71b643d4eb7720189138997bb1b8c52c4ed09bcff97682edb1c499083f36417e71d6 SHA512 365123c812b3f89dc97c0ce0c382920aa8295aa4d920073d7592c25e78cc01df80664cf6ba29c21596a5a0b197553ea91cc42c38d9ea722de0293c228561217d
 AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b543452dc574e73d1c80167c83eb482d9eec310950ac811ba35d3eeb97b51958f12f3adf575ddbe7 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf
 DIST cmake-3.28.0-docs.tar.xz 525776 BLAKE2B b643f76012768f0100c51f0dd146230eba25b634ab4f9abd9c739b0b257e4b1d54aa01be8d2dcd27a7b1d9822bf13eb8af16ff3c6984eeefdeb58988a164bc26 SHA512 474dc77e44240de921013219bd7cdc4aee80214fbf38d60dc2ddb53c0fda8a11c466c01bbee2abbd32b711ec7524678515e39a79a5634354a6cb38f9683e229f
 DIST cmake-3.28.5-SHA-256.txt 1646 BLAKE2B 763cbec9ede58cc43a7435e3fe97a9a9f28b201712f52d98ecdf8035887232fe6000675c9bab90f275ff6d44406839f04352784a921dcbc9d65c5e2440b53f52 SHA512 0fdeed277d113e4642c11b87b98305da43213bd89566e3aaaf427a11e168d9e6754632c2fd76fae542d29fddfa8b67c3c0df19f741c53fdd3aea8ce7bec73ff3
@@ -25,7 +26,7 @@ DIST cmake-4.0.0.tar.gz 11824527 BLAKE2B 21ab208f663498a4851e312bdee884fae9a7112
 DIST cmake-4.0.0_rc1-docs.tar.xz 577536 BLAKE2B 74a742ffef8e1af1652746e1c177d4198155145a039635e6a0ea40af463f3a2d45b6c6ce7d3a9b1fee24f0c1cfd1c3aa95c27669ca3c6281d54e701fc0ece202 SHA512 74c20067d3b82493024b2f2711b55b93998ce3b5f35ab5a154f33a8268a35a29d01127c55ce6b85b80ff252d15284ed1065e1338422124f6722a4190a984637c
 EBUILD cmake-3.28.5.ebuild 8496 BLAKE2B fed797d7701c1c29eaba65ef98e6fad43dcc8602b5895c5be3355a8a279657dbee1b09e90d4c82a41e960ef4df29102ac59a2877f32dbda2b19163ed3a955685 SHA512 95eb2b178a25829be4d6ae7ded2f0c349ae48a5e034f8c1786df430718baa2eaa253f09b4e07527266470b35f796620454dc9c0f64b76f1df6048e5379cd869d
 EBUILD cmake-3.31.5.ebuild 9747 BLAKE2B ee45238a0d2df8151d070183aec708c432241c18a1f8a41d80c6e210cf056e4374cd7d7f0bb31b71dbe82093c67beebbb8585fd3d0b7002d3eab65fe5faf473c SHA512 7cdfe1cecebe0b5ac62acb9dcc3164c150bdea6e2b3e52d09e106bd8e2569902c6978a4f89a45a4ba9ec9343d18ebea6de58789fa9a91a5ebd323910b4fe2b07
-EBUILD cmake-3.31.6-r1.ebuild 9745 BLAKE2B d98da2054bc4924ebf393aebf82fbd95916328ec64550a367c9f028932efc3548e2fbc79fe9eb14c0619c759131cf3e750950bba136becb1451f7462dd730612 SHA512 9d0d7190d67d77a74e778ac309cef38a0dcbd25abae4cf894d5f9b2305e701d009a9eab316c5762edf235f8e83b4e02aba6c2726f07c7f846b9bd694587d59c1
+EBUILD cmake-3.31.6-r1.ebuild 9791 BLAKE2B be2854cdbf1ce2a9b3955fc7d02f6c84c29c984641f12f20b5451aaf78ccb43eda6b6acd44f55be93ea7deec921bc2d691cb48bdf9f715a9371e0b7dd48ad14c SHA512 30357f99b7b64808412aa0080e7a43050e604c5913aa7164fa155848ff4dd455519167a927cb1d576b482fbc56c9dddbc8c13e210541747b7c6b4977b2785f80
 EBUILD cmake-4.0.0.ebuild 10067 BLAKE2B 2195d89b4107fda269fdc846ccf2a158d80d54dcf13b2d5c04996f4687386e0feef6d0253b27670997a505028b25a47795384bc0169ccb47ef02e1505b00ea12 SHA512 a03cce5c117f9411877e75c06fa1fc418bbd8fb0dfaf0dbe38dbb262a741e5440ae2ddde6c4320eb33e8c86c62978726a54718f0ea7a5b4308fe27ffb113d6b5
 EBUILD cmake-9999.ebuild 10067 BLAKE2B 2195d89b4107fda269fdc846ccf2a158d80d54dcf13b2d5c04996f4687386e0feef6d0253b27670997a505028b25a47795384bc0169ccb47ef02e1505b00ea12 SHA512 a03cce5c117f9411877e75c06fa1fc418bbd8fb0dfaf0dbe38dbb262a741e5440ae2ddde6c4320eb33e8c86c62978726a54718f0ea7a5b4308fe27ffb113d6b5
 MISC metadata.xml 588 BLAKE2B 59754f6dd52986589583b875b48cdfb28f0d22e97fd6cdac9763ed2aa8981c692d81f6cfe73a93f7defde3e58fc0df60fba647760e9f20d00bd8141e4c39055e SHA512 ac463b9402727ba83b276fc206d2ea9101c6edc85142957c9be33bd8841c0396262ceaad545d133a84f6c294b5beee289e84c3226a1aac2d1f041dbfe08c047f
diff --git a/dev-build/cmake/cmake-3.31.6-r1.ebuild b/dev-build/cmake/cmake-3.31.6-r1.ebuild
index 91497ec73ba9..f94a7b1a1a77 100644
--- a/dev-build/cmake/cmake-3.31.6-r1.ebuild
+++ b/dev-build/cmake/cmake-3.31.6-r1.ebuild
@@ -95,9 +95,10 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.27.0_rc1-0004-Ensure-that-the-correct-version-of-Qt-is-always-used.patch
 	"${FILESDIR}"/${PN}-3.27.0_rc1-0005-Respect-Gentoo-s-Python-eclasses.patch
 	# Cuda
-	"${FILESDIR}/${PN}-3.30.3-cudahostld.patch"
+	"${FILESDIR}"/${PN}-3.30.3-cudahostld.patch
 
 	# Upstream fixes (can usually be removed with a version bump)
+	"${FILESDIR}"/${PN}-3.31.6-curl-8.13.0.patch
 )
 
 cmake_src_bootstrap() {
diff --git a/dev-build/cmake/files/cmake-3.31.6-curl-8.13.0.patch b/dev-build/cmake/files/cmake-3.31.6-curl-8.13.0.patch
new file mode 100644
index 000000000000..08bbcf4a3f23
--- /dev/null
+++ b/dev-build/cmake/files/cmake-3.31.6-curl-8.13.0.patch
@@ -0,0 +1,36 @@
+https://bugs.gentoo.org/953060
+https://gitlab.kitware.com/cmake/cmake/-/issues/26754
+https://gitlab.kitware.com/cmake/cmake/-/merge_requests/10449
+
+From 1b0c92a3a1b782ff3e1c4499b6ab8db614d45bcd Mon Sep 17 00:00:00 2001
+From: Brad King <brad.king@kitware.com>
+Date: Mon, 10 Mar 2025 11:08:42 -0400
+Subject: [PATCH] cmCurl: Avoid using undocumented type for CURLOPT_NETRC
+ values
+
+Since upstream curl commit `2ec00372a1` (curl.h: change some enums to
+defines with L suffix, 2025-02-25), the `CURL_NETRC_*` constants are
+integer literals instead of `enum CURL_NETRC_OPTION`.  It turns out
+that `curl_easy_setopt` has always expected a `long` anyway, and
+that `CURL_NETRC_OPTION` is not documented for public use.
+
+Fixes: #26754
+---
+ Source/cmCurl.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Source/cmCurl.cxx b/Source/cmCurl.cxx
+index b9133ed7d47..0cf8a71a72d 100644
+--- a/Source/cmCurl.cxx
++++ b/Source/cmCurl.cxx
+@@ -170,7 +170,7 @@ std::string cmCurlSetNETRCOption(::CURL* curl, const std::string& netrc_level,
+                                  const std::string& netrc_file)
+ {
+   std::string e;
+-  CURL_NETRC_OPTION curl_netrc_level = CURL_NETRC_LAST;
++  long curl_netrc_level = CURL_NETRC_LAST;
+   ::CURLcode res;
+ 
+   if (!netrc_level.empty()) {
+-- 
+GitLab
diff --git a/dev-build/kbuild/Manifest b/dev-build/kbuild/Manifest
index b4663aacd45f..7b984c18153a 100644
--- a/dev-build/kbuild/Manifest
+++ b/dev-build/kbuild/Manifest
@@ -18,6 +18,6 @@ DIST kbuild-0.1.9998.3660-r1-fix-clang-16.patch.bz2 11810 BLAKE2B a9f8c084a8b1b7
 DIST kbuild-0.1.9998.3660-src.tar.xz 5281800 BLAKE2B 6c8ca902efddbbdce4588a046edc243ad76bd56cc319c94b4ffb7c25dad7c3ad9e5f816c960c6d80a13374995469d6f1d4c91a20860321a2d12b2456c21ba26f SHA512 d993de9a481a30aef7f4db2bbd6c19ffbeba6e5e505ae2ea63e7479007198d3eb89308860b90a5df8728997fb239ff5e553e6050c136468522c780a2a1e593e2
 EBUILD kbuild-0.1.9998.3499-r4.ebuild 2178 BLAKE2B 897369bb29eb47cb2b704aeff61fefdc7f17de9a6a085a9789aea9a8be37757e082ccd85106ed8c8727111ec4b7480d8da136b9175e672f785f58ac0c35e0b9b SHA512 bab0600078b428472b9825506eefdf4d31a5afd2dd2551455aa0eba20b1643e9d5cb2572e10af58779ccf36b47adf1e97833a8a59224e4ed3c56337161abd0c3
 EBUILD kbuild-0.1.9998.3592.ebuild 2128 BLAKE2B 7b05945eaa6bb1afd241652bc1da82759c668d5fb15d2f23b574ccf8ace9e9a11b64e4c9081779d81f174805ff6d2ac73d87f510cedeeb83b69a72beb7c64a77 SHA512 0a9d9c9668108a42c107e8a1a5f611052aa09aa4c34de3c927c385ef30c512aaadc9d1ab7d2bd57375f01f657e43b175a7fa4f3a34e7a81cf7f51b756e5bc175
-EBUILD kbuild-0.1.9998.3660-r1.ebuild 2088 BLAKE2B fe0f04f3eb80b8f5f3611e00a3b184162bf0adbc871ea91d69dbdc800771b6054d455d38b1f800751fe9feb32062802a27146745c22410bbbc3b51ac0b82563b SHA512 d5a3b25360d7297c2e6f523f3ed8acd26484bcfba0bcdc772dfa9341d77c8b25919a6e65524bd2dc31f96530f2627c5b812b79a6c44ec4cf6e9033716b640de1
+EBUILD kbuild-0.1.9998.3660-r1.ebuild 2086 BLAKE2B bd47fb951d052b96f46fd52a1fb0097e8c69d3b9ce6050979c5e95b3b987e25c6fd454f6aaa392ca59e7d935620409d837c706ecdada76006c10c8f3568b3a50 SHA512 3e6ceeb196f7a383c072f2b9095bdf304cf65061a59cc41ebcaf2d21e8967260d9d5e2038821dc90f5314eab2480f68346bad712326ca2df0f3e56b377854350
 EBUILD kbuild-9999.ebuild 1815 BLAKE2B fe42fec4355cd7c7f95541db1d82435645b06f2dd6f381fc52782ef5a1d755ee21d469400e96f6f577ae92c4479b37951e8c381d2bc3662a64d1be7c80645c6e SHA512 0694478c5e08e1c5b61e703cbc2363ed4340b937a396c92202a18e6650a2becd0aa5076901fc9b6cef884d19d9d50ec210bc92fb2e2d59e1593056306a53f0c1
 MISC metadata.xml 249 BLAKE2B 3bc7510e014ef8df90da064f4ef969eab6cc3311951a6dd556ca7b6f4e2e74e229f12a16ceb641393d1ec1f89d1942718267ecc664a8136df194c40de94a58e4 SHA512 63f88d798d410e4fb6670d199a86a665ab61b09cb9508b4047f13fe73070c682231d35a27c9d2c1fd82a1b8a84676d857b534c96bd09f4562cf13d7fc8de36b2
diff --git a/dev-build/kbuild/kbuild-0.1.9998.3660-r1.ebuild b/dev-build/kbuild/kbuild-0.1.9998.3660-r1.ebuild
index 004c44ac8ea1..cf039173e520 100644
--- a/dev-build/kbuild/kbuild-0.1.9998.3660-r1.ebuild
+++ b/dev-build/kbuild/kbuild-0.1.9998.3660-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	sys-apps/texinfo