gnome-base/librsvg: backport time crate update to 2.57.3, 2.58.2

Backport the changes from 5c3fde3d2ed0b76356131adfa7ba6ed8fd29cf1f so
that people don't need 3 Rust slots installed.

Signed-off-by: Sam James <sam@gentoo.org>

4 files changed, 59 insertions, 10 deletions

diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index 93b89f47b303..31a2300c35c4 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -309,12 +309,8 @@ DIST thiserror-1.0.56.crate 20592 BLAKE2B e98c8bba8d21342c981646e88b72a7cbc146c6
 DIST thiserror-impl-1.0.50.crate 15357 BLAKE2B 41309507014a2c628b7e91d250335070e4cca6c6c452c90ee7e6173bed049df83ca197b37c16537cf15415550919c248e0f6c798aead760e7bbcd25eab701d50 SHA512 8555e010f94390e93ba757bce9ef25d066ed542f23b843db431a66fbab722584ea0ce6c9d4b6f4d92cea3d91c190336abd567c4a0aa4a27893db25720c5b89c9
 DIST thiserror-impl-1.0.56.crate 15367 BLAKE2B 6fad787eb1e2c0f25fee7bef160be794fb8000a0aa292ec0d2d66d7a4d1fcb226c3e2e690ff6a61ba2d8704208014eea84044dba27523d4b2c26d2f7d4ba64d5 SHA512 da66f4674cf699083f7142f3a60c1c9334767b4de3690b4c7af460ffda787fab2089f5bca231e92b6e71724d46fe7dbdcaa19073f5d8100838536d10971efbde
 DIST tiff-0.9.1.crate 1423953 BLAKE2B d01949cc3a76a32f2e802a151a4c1d4bbe47c7f217f198f940293d02fd6a1a6d3087c66b3fbc099da3e155f959774d2a9d4d8c5f5f00cd6486f5f44571a1dedd SHA512 82419e671c6a896f1d639d46a3c5a019e3bff6c75d961b838f5311e5ecb31c3baafc5f88fe928e88f6b3b31881a867ea4ca9905f43e3e24f77f183260dc27b93
-DIST time-0.3.30.crate 120289 BLAKE2B 917b71ea8362ca14f2564706919e7e62ebd3e8024d48ebcd9ac9799368a12f425b982a7739a73c025155d5dd0650ef8c9fd4642c60a9111294cad7ac2e30672c SHA512 268f0c779e2a44431932aa407f39878ff1412e287f9678574537fe7185f12faf7605c5ef433aa6d364bf77894e819ff3953f870ef7ad208b7203f1c58eccc4e5
-DIST time-0.3.34.crate 118430 BLAKE2B 6d04a20596c9b0961ca104748d9d360f07b16059719d7410fdf1a7a0d5f2aa02aaebf640999464835964bbded2d3257d79c4b0ca3080fbecf13dd2d0aa6962fc SHA512 3997e1b8d9be2f54184ebc9e1355d4b65f0b7bc9439b2b29e4a4acd86ad3a3aa019261112a24d998d76a7f66b266a86536fa50412279911b14d4d7aa7078c116
 DIST time-0.3.36.crate 119805 BLAKE2B d4da96368ab8565373d034edce261e0d8867036f2ba87e84b5e4a506a70ed3b62b93ba10734aecb39847e258cf7008b6ae57f92df8d0e5229cd3fec488d14caf SHA512 83da6e27691d1f0ef37ed276528e927686a06dab4811b6e29d625ef7a0f7c30fbb86896d74a2b087726e7a24a951b0a83aa1f5f22d711ead54f447d36ac47133
 DIST time-core-0.1.2.crate 7191 BLAKE2B c477ad3410ff29f3bf4a38fc6ac4a043d49b6d2bdf5cf309ffcd2eec3bb6e4c4b62156ee7f069f0b37ea31c163bc75ccbf35abc1db2833cdd4912135e60ddfc9 SHA512 3861724c23cb806829a01186deb5217ae8252c20af622975264e6670cff528f42155039e4937756a9eb312a5580ffab07949437d5504d684a0e70755046cac52
-DIST time-macros-0.2.15.crate 23568 BLAKE2B ed16207f302e03095e726f0087f9f7c1514cd71b68a17ac804424c526349838171f3bda62d442b8429a89adb084cca1a4117828c3d66d20f2ff8272d7cb2d3a6 SHA512 d6da54996ab99a46b2b2cef83cec62eca2462490db439ba9814502f7d5ecc3018eb266b29453d601677a0ef39797da77a106d407e0e5de3b110ec1c5ae2f3c6b
-DIST time-macros-0.2.17.crate 24443 BLAKE2B 5045af9352961db0c97cae2f6ca3e8d2c4f89a129c7ac2ec1d8d20804292aa9f2901a61f910a564954614b68f39311bd381deeb66fed8bdac423227d077f3d14 SHA512 c81747f0b74e68d3b3f36d378ac5911dece8c6b511e5ac793807f854cc31c812b927d0df941f55ff90d3d67512d0ac6a5f63f2de4322c81b05da42f46b4a661c
 DIST time-macros-0.2.18.crate 24361 BLAKE2B 09fa325be0b1a5b922285f035484b0de8e339306b49595c87f6374e46459d6777c6db4b12c1a0c6ea9795ae8c741188fbb81208d0499a651760b9f5089323fc7 SHA512 557786115add272290be8305ab79c44f5b4425b64eb698492fe300f15879d9e013c66933cae8aa8faad9c109e2917e7a0e43c8a5eed7f4b0f0fdad092089efe4
 DIST tinytemplate-1.2.1.crate 26490 BLAKE2B af39d96f33f63238e455a4e38fde1d1730fd9661ae68be7b05df6ef9d2ab1a04db1332cc4ec9deb6da3a8e22b124df81b0fa8916d8491b808742bb733c8e48be SHA512 0cc080057e096f0796e72004343e1a8332c2e8a12e43f6ade150ebf632e9c29c7ad04de0b940cd57df81efdc4d07a6607da9b86a30d8383e39ac3d7be185edb9
 DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c
diff --git a/gnome-base/librsvg/files/librsvg-2.57.3-time-rust-1.80.patch b/gnome-base/librsvg/files/librsvg-2.57.3-time-rust-1.80.patch
new file mode 100644
index 000000000000..0cd4fb77f0da
--- /dev/null
+++ b/gnome-base/librsvg/files/librsvg-2.57.3-time-rust-1.80.patch
@@ -0,0 +1,46 @@
+Needed for compat w/ >=rust-1.80. The time crate is only used for tests.
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -1217,6 +1217,12 @@ dependencies = [
+  "num-traits",
+ ]
+ 
++[[package]]
++name = "num-conv"
++version = "0.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
++
+ [[package]]
+ name = "num-integer"
+ version = "0.1.45"
+@@ -2109,12 +2115,13 @@ dependencies = [
+ 
+ [[package]]
+ name = "time"
+-version = "0.3.30"
++version = "0.3.36"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5"
++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+ dependencies = [
+  "deranged",
+  "itoa",
++ "num-conv",
+  "powerfmt",
+  "serde",
+  "time-core",
+@@ -2129,10 +2136,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+ 
+ [[package]]
+ name = "time-macros"
+-version = "0.2.15"
++version = "0.2.18"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+ dependencies = [
++ "num-conv",
+  "time-core",
+ ]
+ 
diff --git a/gnome-base/librsvg/librsvg-2.57.3-r2.ebuild b/gnome-base/librsvg/librsvg-2.57.3-r2.ebuild
index c5a49fa7c29d..92a57c008000 100644
--- a/gnome-base/librsvg/librsvg-2.57.3-r2.ebuild
+++ b/gnome-base/librsvg/librsvg-2.57.3-r2.ebuild
@@ -131,6 +131,7 @@ CRATES="
 	nom@7.1.3
 	normalize-line-endings@0.3.0
 	num-complex@0.4.4
+	num-conv@0.1.0
 	num-integer@0.1.45
 	num-rational@0.4.1
 	num-traits@0.2.17
@@ -220,8 +221,8 @@ CRATES="
 	thiserror-impl@1.0.50
 	thiserror@1.0.50
 	time-core@0.1.2
-	time-macros@0.2.15
-	time@0.3.30
+	time-macros@0.2.18
+	time@0.3.36
 	tinytemplate@1.2.1
 	tinyvec@1.6.0
 	tinyvec_macros@0.1.1
@@ -277,7 +278,6 @@ CRATES="
 	yeslogic-fontconfig-sys@4.0.1
 "
 
-RUST_MAX_VER="1.79.0"
 RUST_USEDEP='${MULTILIB_USEDEP}'
 
 inherit multilib-minimal cargo gnome2 python-any-r1 rust-toolchain vala
@@ -327,6 +327,10 @@ BDEPEND="
 "
 # dev-libs/gobject-introspection-common, dev-libs/vala-common needed by eautoreconf
 
+PATCHES=(
+	"${FILESDIR}"/librsvg-2.57.3-time-rust-1.80.patch
+)
+
 QA_FLAGS_IGNORED="
 	usr/bin/rsvg-convert
 	usr/lib.*/librsvg.*
diff --git a/gnome-base/librsvg/librsvg-2.58.2-r2.ebuild b/gnome-base/librsvg/librsvg-2.58.2-r2.ebuild
index d29d3b02aa5c..494eefff7652 100644
--- a/gnome-base/librsvg/librsvg-2.58.2-r2.ebuild
+++ b/gnome-base/librsvg/librsvg-2.58.2-r2.ebuild
@@ -230,8 +230,8 @@ CRATES="
 	thiserror@1.0.56
 	tiff@0.9.1
 	time-core@0.1.2
-	time-macros@0.2.17
-	time@0.3.34
+	time-macros@0.2.18
+	time@0.3.36
 	tinytemplate@1.2.1
 	tinyvec@1.6.0
 	tinyvec_macros@0.1.1
@@ -288,7 +288,6 @@ CRATES="
 	zune-inflate@0.2.54
 "
 
-RUST_MAX_VER="1.79.0"
 RUST_MIN_VER="1.71.1"
 RUST_USEDEP='${MULTILIB_USEDEP}'
 
@@ -344,6 +343,10 @@ QA_FLAGS_IGNORED="
 	usr/lib.*/librsvg.*
 "
 
+PATCHES=(
+	"${FILESDIR}"/librsvg-2.58.5-time-rust-1.80.patch
+)
+
 pkg_setup() {
 	rust_pkg_setup
 	python-any-r1_pkg_setup