commit: faf5534c23514d5e462794a8b6c2366907198803
Author: orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Thu Aug 14 16:12:22 2025 +0000
Commit: orbea <orbea <AT> riseup <DOT> net>
CommitDate: Thu Aug 14 16:22:40 2025 +0000
URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=faf5534c
dev-lang/rust: sync ::gentoo
Signed-off-by: orbea <orbea <AT> riseup.net>
dev-lang/rust/Manifest | 4 ++--
dev-lang/rust/metadata.xml | 6 +-----
dev-lang/rust/rust-1.86.0-r2.ebuild | 6 ++++--
dev-lang/rust/rust-1.87.0-r1.ebuild | 8 +++++---
dev-lang/rust/rust-1.88.0.ebuild | 6 ++++--
5 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index 8eed0c6..db3fbb3 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -1,5 +1,5 @@
-DIST rust-patches-1.86.0-r2.tar.bz2 5980 BLAKE2B
179d6acc8c7006eac4d00e073ec1f5496756ef51d465bc098daf1cfe650f469f4341893c72a65e21d84ecb3ccaeb46f5204ef517ae942482d835f89c0a934391
SHA512
31e902661d5ee2da82858910551393890583d9702303fed5652122c852e9384fb88a42eddd0b968558865e16b5bd4ac2a13a35bd01ec3f8c3adbb673bc465596
-DIST rust-patches-1.87.0-r1.tar.bz2 4635 BLAKE2B
d813ec4a602d3bb879927a44a0b9f752aac255e31dfd13c56ab71b3fae7ce46a742c1d2e7494a7e17728f1edb2327ddd6ad6ebabc0c47d66326b766bbd323fbd
SHA512
596ffe744a5849b443f077bbd4edbcbb240b9ac51c9d53e0e436e46d7c93a6734477d22eba4a066a0cf474503a6357a72dfa124e594f645be6f50d9bd25bdb10
+DIST rust-patches-1.86.0-r2-1.tar.bz2 6308 BLAKE2B
eca644026942bd729a748df57dd67465bbec96b2d18a71c58fe04bb8e2514aabb1ca02cbd3761be5283328a3b728e063b1b85ea78f4f242c182071c44b8cb148
SHA512
1f1edcf76c64b0555366253e21d759e904a752746c2e5d88aba6e31f5ee2a2b0b06275674d2fc3acc42f589905eddc006d788f95b48a5d79a6ab767251d934da
+DIST rust-patches-1.87.0-r1-1.tar.bz2 5116 BLAKE2B
783ad21464a7e393d0aee506119be12b0137a7d360402b74f36b6fde154c2804cc0779da63875977d09f7e9f2d273ff41dd189bbe4eb239a314fea27bbaa704c
SHA512
8c67e4e43bf2afb226f70bb2a03aad0abfd525cd484c8c9ff663da06d63b471f4f1b48169d952a6a6c14258c0029dedea14aadaaca2ee75389df65b806188363
DIST rust-patches-1.88.0.tar.bz2 4062 BLAKE2B
64168ffa608f2edf2e0b3d079152c3b5dd59d0cea29078894f286bf91488e2e7769c55ede2d43769368d2147b46699d1bf981190d6800dc3d41c736289122eaf
SHA512
b565acfb4d1146e52b1fb66b4a242927407cc34f1b38c2a100135cbbde24c8374af1997bc22069cca25f33cc8d747e56391f3d98a2d4e13dc0abcec0d6f88b0b
DIST rustc-1.74.1-src.tar.xz 155968724 BLAKE2B
e05f2379ac94b286f85791a138e1928e5b5b5a7749f0981d82c40c2a12860f55bf96bb2f0e924e35a0f8b2447b13052d38adea909aaa3199105787bb5a4861b3
SHA512
14c7e7ed2f38ab60299d8c7d41d78f042b6b57ef822d577b5138e60bdde31cf141eccd4332a25bc5da3d58eb5313d63c1448b5dfe9e11b8055bb8ea133a9038d
DIST rustc-1.74.1-src.tar.xz.asc 801 BLAKE2B
ddf73175b164233babf31ca3a381b03e20c0f36d017c1d5f85d6ab11f0986d861ab23b11c061e6b2444ced70c3d6a494cc3de4ec86f0deb221a805491bd75420
SHA512
9a96ff9ba9a4e2af4e267b2ec126fc0675c78d0eb767703daa2f28491c3d85c2ab00fbd8584390bf658812ec6c4ab6c57e43b386db59fd505bd3134a8873a09e
diff --git a/dev-lang/rust/metadata.xml b/dev-lang/rust/metadata.xml
index 393578b..b32f018 100644
--- a/dev-lang/rust/metadata.xml
+++ b/dev-lang/rust/metadata.xml
@@ -9,10 +9,6 @@
<email>[email protected]</email>
<name>Anna Figueiredo Gomes</name>
</maintainer>
- <maintainer type="person" proxied="yes">
- <email>[email protected]</email>
- <name>Matoro Mahri</name>
- </maintainer>
<use>
<flag name="clippy">Install clippy, Rust code linter</flag>
<flag name="dist">Install dist tarballs (used for
bootstrapping)</flag>
@@ -20,9 +16,9 @@
<flag name="mrustc-bootstrap">Use <pkg>dev-lang/mrustc</pkg> to
build the bootstrap Rust sysroot from this package's source</flag>
<flag name="nightly">Enable nightly (UNSTABLE) features (NOTE:
it does not install nightly version, just enables features marked as nightly at
time of release)</flag>
<flag name="parallel-compiler">Build a multi-threaded rustc
(experimental, not tested by upstream)</flag>
- <flag name="rustfmt">Install rustfmt, Rust code formatter</flag>
<flag name="rust-analyzer">Install rust-analyzer, A Rust
compiler front-end for IDEs (language server)</flag>
<flag name="rust-src">Install rust-src, needed by developer
tools and for build-std (cross)</flag>
+ <flag name="rustfmt">Install rustfmt, Rust code formatter</flag>
<flag name="system-llvm">Use the system LLVM installation</flag>
<flag name="wasm">Build support for the wasm32-unknown-unknown
target</flag>
</use>
diff --git a/dev-lang/rust/rust-1.86.0-r2.ebuild
b/dev-lang/rust/rust-1.86.0-r2.ebuild
index e051bae..7ae36e8 100644
--- a/dev-lang/rust/rust-1.86.0-r2.ebuild
+++ b/dev-lang/rust/rust-1.86.0-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=8
LLVM_COMPAT=( 19 )
PYTHON_COMPAT=( python3_{11..13} )
-RUST_PATCH_VER=${PVR}
+RUST_PATCH_VER="${PVR}-1"
RUST_MAX_VER=${PV%%_*}
if [[ ${PV} == *9999* ]]; then
@@ -84,7 +84,7 @@ fi
LLVM_DEPEND=()
# splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation
for _x in "${ALL_LLVM_TARGETS[@]}"; do
- LLVM_DEPEND+=( " ${_x}? ( $(llvm_gen_dep
"llvm-core/llvm:\${LLVM_SLOT}[${_x}]") )" )
+ LLVM_DEPEND+=( " ${_x}? ( $(llvm_gen_dep
"llvm-core/llvm:\${LLVM_SLOT}[${_x}=]") )" )
if [[ -v ALL_RUST_EXPERIMENTAL_TARGETS["${_x}"] ]] ; then
ALL_RUST_EXPERIMENTAL_TARGETS["${_x}"]=1
fi
@@ -319,6 +319,8 @@ src_prepare() {
${CARGO} generate-lockfile --offline || die "Failed to generate
lockfiles"
fi
+ # Commit patches to the appropriate branch in proj/rust-patches.git
+ # then cut a new tag / tarball. Don't add patches to ${FILESDIR}
PATCHES=(
"${WORKDIR}/rust-patches-${RUST_PATCH_VER}/"
)
diff --git a/dev-lang/rust/rust-1.87.0-r1.ebuild
b/dev-lang/rust/rust-1.87.0-r1.ebuild
index b9c726b..b04761e 100644
--- a/dev-lang/rust/rust-1.87.0-r1.ebuild
+++ b/dev-lang/rust/rust-1.87.0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
LLVM_COMPAT=( 20 )
PYTHON_COMPAT=( python3_{11..14} )
-RUST_PATCH_VER=${PVR}
+RUST_PATCH_VER="${PVR}-1"
RUST_MAX_VER=${PV%%_*}
if [[ ${PV} == *9999* ]]; then
@@ -84,7 +84,7 @@ fi
LLVM_DEPEND=()
# splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation
for _x in "${ALL_LLVM_TARGETS[@]}"; do
- LLVM_DEPEND+=( " ${_x}? ( $(llvm_gen_dep
"llvm-core/llvm:\${LLVM_SLOT}[${_x}]") )" )
+ LLVM_DEPEND+=( " ${_x}? ( $(llvm_gen_dep
"llvm-core/llvm:\${LLVM_SLOT}[${_x}=]") )" )
if [[ -v ALL_RUST_EXPERIMENTAL_TARGETS["${_x}"] ]] ; then
ALL_RUST_EXPERIMENTAL_TARGETS["${_x}"]=1
fi
@@ -320,6 +320,8 @@ src_prepare() {
${CARGO} generate-lockfile --offline || die "Failed to generate
lockfiles"
fi
+ # Commit patches to the appropriate branch in proj/rust-patches.git
+ # then cut a new tag / tarball. Don't add patches to ${FILESDIR}
PATCHES=(
"${WORKDIR}/rust-patches-${RUST_PATCH_VER}/"
)
@@ -456,6 +458,7 @@ src_configure() {
cargo = "${rust_stage0_root}/bin/cargo"
rustc = "${rust_stage0_root}/bin/rustc"
rustfmt = "${rust_stage0_root}/bin/rustfmt"
+ description = "gentoo"
docs = $(toml_usex doc)
compiler-docs = false
submodules = false
@@ -493,7 +496,6 @@ src_configure() {
echo "default-linker = \"${CHOST}-cc\""
fi)
channel = "${build_channel}"
- description = "gentoo"
rpath = true
verbose-tests = true
optimize-tests = $(toml_usex !debug)
diff --git a/dev-lang/rust/rust-1.88.0.ebuild b/dev-lang/rust/rust-1.88.0.ebuild
index 23b1537..6e53bd3 100644
--- a/dev-lang/rust/rust-1.88.0.ebuild
+++ b/dev-lang/rust/rust-1.88.0.ebuild
@@ -75,7 +75,7 @@ fi
LLVM_DEPEND=()
# splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation
for _x in "${ALL_LLVM_TARGETS[@]}"; do
- LLVM_DEPEND+=( " ${_x}? ( $(llvm_gen_dep
"llvm-core/llvm:\${LLVM_SLOT}[${_x}]") )" )
+ LLVM_DEPEND+=( " ${_x}? ( $(llvm_gen_dep
"llvm-core/llvm:\${LLVM_SLOT}[${_x}=]") )" )
if [[ -v ALL_RUST_EXPERIMENTAL_TARGETS["${_x}"] ]] ; then
ALL_RUST_EXPERIMENTAL_TARGETS["${_x}"]=1
fi
@@ -332,6 +332,8 @@ src_prepare() {
${CARGO} generate-lockfile --offline || die "Failed to generate
lockfiles"
fi
+ # Commit patches to the appropriate branch in proj/rust-patches.git
+ # then cut a new tag / tarball. Don't add patches to ${FILESDIR}
PATCHES=(
"${WORKDIR}/rust-patches-${RUST_PATCH_VER}/"
)
@@ -470,6 +472,7 @@ src_configure() {
cargo = "${rust_stage0_root}/bin/cargo"
rustc = "${rust_stage0_root}/bin/rustc"
rustfmt = "${rust_stage0_root}/bin/rustfmt"
+ description = "gentoo"
docs = $(toml_usex doc)
compiler-docs = false
submodules = false
@@ -507,7 +510,6 @@ src_configure() {
echo "default-linker = \"${CHOST}-cc\""
fi)
channel = "${build_channel}"
- description = "gentoo"
rpath = true
verbose-tests = true
optimize-tests = $(toml_usex !debug)
