diff options
| author |   Vincent de Phily <moltonel@gmail.com> | 2024-08-24 11:49:28 +0100 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2024-08-25 20:00:36 +0100 |
| commit | 51fa6ed42e92447e236d12fcf2482ea5870bcf49 (patch) | |
| tree | 1f94ac4695ae11b64707f2b5bc126a5effe5b6ff /app-portage/emlop | |
| parent | dev-perl/Sys-Virt: Add 10.6.0 (diff) | |
| download | gentoo-51fa6ed42e92447e236d12fcf2482ea5870bcf49.tar.gz gentoo-51fa6ed42e92447e236d12fcf2482ea5870bcf49.tar.bz2 gentoo-51fa6ed42e92447e236d12fcf2482ea5870bcf49.zip | |
app-portage/emlop: Fix build with rust 1.80
Bug: https://bugs.gentoo.org/938192
Signed-off-by: Vincent de Phily <moltonel@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/38278
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-portage/emlop')
| -rw-r--r-- | app-portage/emlop/Manifest | 4 | ||||
| -rw-r--r-- | app-portage/emlop/emlop-0.7.0.ebuild | 9 | ||||
| -rw-r--r-- | app-portage/emlop/files/emlop-0.7.0-time_dep.patch | 28 |
3 files changed, 37 insertions, 4 deletions
diff --git a/app-portage/emlop/Manifest b/app-portage/emlop/Manifest index 08867fedb507..52d016592e54 100644 --- a/app-portage/emlop/Manifest +++ b/app-portage/emlop/Manifest @@ -106,10 +106,10 @@ DIST thiserror-1.0.57.crate 20993 BLAKE2B 4eb90b8ee027e39102d6c030176db94510180f DIST thiserror-impl-1.0.40.crate 15138 BLAKE2B 7590428b5a97efde6a823440a9c91e1d1835b20df4ad8a700c1eeddd98516f1203605853fc6dc65528c5fd92480d04f9a8412aa7c20a524cb94435b0a0032f1d SHA512 9027f2d4127864c34d2d92ad3b2753a95893d26f5b2dcdec869884a98232c5304db1700a38112ced258e5f3832218cdea3a4bb21223098e1b20d06af1fd7edd2 DIST thiserror-impl-1.0.57.crate 15639 BLAKE2B 2838235c5536fcb16d19382fe286850d6fb882b1d77ca4ade6a62e1d4727ef89f69cf0383cf330996f9e2303226d5fd709557331a45c9a91393db1788fbf4422 SHA512 a850806f09b232546d1e0df5e35cd961a8aa32f1d8ac3b24df360981da53b75325a46dc788c994042c95a5887fdc77234b9f6ee5851242f734a613e579548e3c DIST time-0.3.22.crate 113792 BLAKE2B 8c9920d38b2d9b2f3204de7fe399f6e25b0a7ae7bb72d155eeba397f5721130fae1e0b3022ce9f1109d08e73b72a9fd09043d69f5cca953e80f3d70c4f49a71d SHA512 55575d043cdda64f7a789c61360974d17d3d380a4f0b243346222709743609503644c352ab2ec5d5336bd2b2a4709d54fe1863209d5625f14f881a1c33df1763 -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.1.crate 7197 BLAKE2B 9d0be2ef7111a8b66e5c750b2c372627ae4acfb2c68b0c6ed44b3c23bea1cdca4f65b24d2f2027b4d334667b1620019f4cb8c6d9799c1c2c537e6cfe692ab88a SHA512 a29d6619581d3fed73d6bc66a2c18805b80a3d54197feac5ad987a2c31d003bf4fef88a312d5315d2fa5c7d3e509066a65c1732be2ce280cf937bb4eff012e14 DIST time-core-0.1.2.crate 7191 BLAKE2B c477ad3410ff29f3bf4a38fc6ac4a043d49b6d2bdf5cf309ffcd2eec3bb6e4c4b62156ee7f069f0b37ea31c163bc75ccbf35abc1db2833cdd4912135e60ddfc9 SHA512 3861724c23cb806829a01186deb5217ae8252c20af622975264e6670cff528f42155039e4937756a9eb312a5580ffab07949437d5504d684a0e70755046cac52 -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 time-macros-0.2.9.crate 23684 BLAKE2B 5484a3c5bca52fcff3fcd4e6f060ee24ce293fbdad1abd5819d0426eca29b95de866fe1273e0ed3431d1b94b12c37f23748d4cacb0112a67e9be0f49132d03ba SHA512 2fe094e61ca0ab708d60693367812f1b87fb9b6770dbfa3dad8a2aad7d2a000c24ae3b8960104d6c5b72b4a055c7715fa5d4d601eb7b7ea1764bb730aec86033 DIST toml-0.8.10.crate 50667 BLAKE2B 815c850d4e2b8f107729c24ff82a6be81160649fff726f07a2c6e2af0283298fd5eadcc5811ba4ef20ce12914ecb43da79fa1840fea8d1572ca59f02f9e2c310 SHA512 24f3b44244d7e91ae50eaf20bde40c177352592aadd2dac697a831a5de9305ac1c93c8dc407579b9bbd8d9984fe34cfdc42c3243cd0057ad83db14bd899bb546 DIST toml_datetime-0.6.5.crate 10910 BLAKE2B 93a21ab2784e96ee2e6b56c7b4f733f6ac4c68c1e7d7dac3fbd8aceedb3580e25b4a9c7d9c3f9b5ed152560353b3e80906e37824956dc4ea90bc6f039768f6cb SHA512 502bdedbcbd2ac9fbaa5f4b51f2e409af185f3633f01f8845de5e3b007f2400215ddeb82ac588bc915ed5a5f9d7251ccf93fe2a57cd40fca2927f4c0966357e6 diff --git a/app-portage/emlop/emlop-0.7.0.ebuild b/app-portage/emlop/emlop-0.7.0.ebuild index bd064cc27d2f..cf05a60489ae 100644 --- a/app-portage/emlop/emlop-0.7.0.ebuild +++ b/app-portage/emlop/emlop-0.7.0.ebuild @@ -68,8 +68,8 @@ CRATES=" thiserror-impl@1.0.57 thiserror@1.0.57 time-core@0.1.2 - time-macros@0.2.17 - time@0.3.34 + time-macros@0.2.18 + time@0.3.36 toml@0.8.10 toml_datetime@0.6.5 toml_edit@0.22.6 @@ -111,6 +111,11 @@ BDEPEND=">=virtual/rust-1.71.0" # rust does not use *FLAGS from make.conf, silence portage warning QA_FLAGS_IGNORED="usr/bin/${PN}" +PATCHES=( + # Fix build with rust >= 1.80 + "${FILESDIR}/${P}-time_dep.patch" +) + src_install() { cargo_src_install dodoc README.md CHANGELOG.md emlop.toml diff --git a/app-portage/emlop/files/emlop-0.7.0-time_dep.patch b/app-portage/emlop/files/emlop-0.7.0-time_dep.patch new file mode 100644 index 000000000000..ccf42d498e00 --- /dev/null +++ b/app-portage/emlop/files/emlop-0.7.0-time_dep.patch @@ -0,0 +1,28 @@ +diff --git a/Cargo.lock b/Cargo.lock +index b34d367..21ab90b 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -536,9 +536,9 @@ dependencies = [ + + [[package]] + name = "time" +-version = "0.3.34" ++version = "0.3.36" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" ++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" + dependencies = [ + "deranged", + "itoa", +@@ -559,9 +559,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + + [[package]] + name = "time-macros" +-version = "0.2.17" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" ++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" + dependencies = [ + "num-conv", + "time-core", |