From bd6c7f88a517497b81d6ed2fd6c6e85826b86de7 Mon Sep 17 00:00:00 2001 From: Marcin Deranek Date: Tue, 1 Feb 2022 10:46:47 +0100 Subject: Relax rust requirements --- app-admin/vaultwarden/Manifest | 2 +- app-admin/vaultwarden/vaultwarden-1.24.0.ebuild | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'app-admin') diff --git a/app-admin/vaultwarden/Manifest b/app-admin/vaultwarden/Manifest index 28607e3..0627425 100644 --- a/app-admin/vaultwarden/Manifest +++ b/app-admin/vaultwarden/Manifest @@ -2,5 +2,5 @@ AUX conf 270 BLAKE2B eedd55cdae2c1b4160ef2e08a341aeb3356edbef7bbba67ce4fcde810de AUX init 493 BLAKE2B fbb148dfd2e319928544ae36ccde1fa62456359403999cc8cb151db5febb6d5331ae185b599012924b6bd3533260005fe16fe3694464aff2f249065aba37a2a6 SHA512 bbcd2355cec35c185b143f9cbd26cec4c57de4cd4dbd8b7e9376e6a5aa48a8db5ab72c72da4f4ddf0b9b70f2c915379c8e07eda772983928242057afa67189e0 AUX vaultwarden 332 BLAKE2B eeee143031362d7232de544ba5b349eb77326e1e8ea462d4736557def280a00836cc35f7cfbb9eb27ab52058e8a51be2d805bcf2a7a30ee56d277c8de04f889c SHA512 9e98beefef37922309bbba217624a9ec586e9af642905e590a5d978efcb8027754a71cab792b14ff623c6422f5e958afaef1b3edf245a5f39d60d867f9faf131 AUX vaultwarden.service 972 BLAKE2B 25865a0e76ed673202eb9c0259331c3de5f843050185913f02b14d8a0d25036656f5a30b2f5b460fc13ce3cd3a6e2319495aac1365d3c5a75746000d315bacfe SHA512 277d8fc4c9db0b24990cbc2e0a1ea687b5779c28febca54352a15b782cdd4c24b7c64821d7fe0a2e0794efb1a0732ccb4533cf8f97cf832876013f0ad2b8c5dd -EBUILD vaultwarden-1.24.0.ebuild 1956 BLAKE2B 006811d18d140d26b3a1172caabe4f090d63e24156ccd7435a6d0c85b98498832a390bbdae6c85f64ba317ba1ad6a94c8cf93c8fe4d1583e0e6373e39c607b1c SHA512 aa8cd895961976baff80da13f3a4975042464e1905e1e643df3f4e53b3799213d83c565e55973ccaf95e1db69075496f4e7b4dd8c70048a5d2a8dc00b2acb4c0 +EBUILD vaultwarden-1.24.0.ebuild 2146 BLAKE2B c6c0b8dabc253b1a4e0b914f18b0db69165983ee5790c7563faa5cda24742473235006ede12e437d01255d234cd7a5731b81da5162d9601520f50f567d21c107 SHA512 5c03ab64a27f008e582c74c280e94860e467b47085fd02c4f63e80460c098b62845fecf00e2f94748b86b737d7f91972cac4ff18c6119123a8c1f475f926d74f MISC metadata.xml 255 BLAKE2B fec818e56877b2451e889c05ed95700632e02438bbe9ae515925548714246b19bdf3b141e0771f64b92483ade6734afe8828d0b177db1d76902c535871ea5551 SHA512 f5e088eef2af90b4f6129ca7ed31d833f61521a8fe6c60e5d5cb871601a85374bf330f445c298990760d51e5186ec8156a192ff30b42f8abc3cb82d329ccc803 diff --git a/app-admin/vaultwarden/vaultwarden-1.24.0.ebuild b/app-admin/vaultwarden/vaultwarden-1.24.0.ebuild index 3adea6b..8d67b0a 100644 --- a/app-admin/vaultwarden/vaultwarden-1.24.0.ebuild +++ b/app-admin/vaultwarden/vaultwarden-1.24.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2017-2021 Gentoo Authors +# Copyright 2017-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -25,7 +25,7 @@ ACCT_DEPEND=" DEPEND=" ${ACCT_DEPEND} >=app-admin/vaultwarden-web-vault-2.19.0 - dev-lang/rust[nightly] + >=dev-lang/rust-1.58.1[nightly] dev-libs/openssl:0= " RDEPEND="${DEPEND}" @@ -43,6 +43,13 @@ src_unpack() { cargo_gen_config } +src_prepare() { + default + + # Lower rust requirements as 1.60 is not in the tree yet + sed -i -e 's|^rust-version[[:blank:]]*=.*|rust-version = "1.58.1"|' "${S}"/Cargo.toml || die +} + src_configure() { myfeatures=( $(usev mysql) -- cgit v1.2.3