commit: b4747b945b528eef127f2704c9f3058accde384e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 11 21:24:51 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 11 21:26:23 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4747b94
dev-lang/rust: fix patches for 1.92.0
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/rust/Manifest | 2 +-
.../rust/{rust-1.92.0.ebuild => rust-1.92.0_p1.ebuild} | 17 +++++++++--------
dev-lang/rust/rust-9999.ebuild | 17 +++++++++--------
3 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index 2497ea69628e..fb8814c5d2a0 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -18,7 +18,7 @@ DIST rust-patches-1.88.0.tar.bz2 4062 BLAKE2B
64168ffa608f2edf2e0b3d079152c3b5dd
DIST rust-patches-1.89.0.tar.bz2 4091 BLAKE2B
0fea3488a39d2b00627084f6b192dfbd7ed49bdceabbb1141d1a849ba053f786e31115e00365679b1b6fb5b0ccdf5dc0dc0803057cbffbcf0ae3d75ae9830d94
SHA512
de6c9b693bdd719d06605b5da730ee5d9cf9a1d88d58194a0ba48bd378a951c66723f561e39181222d28abb38e974a2921e14ea1f40156caf7b903778cf65790
DIST rust-patches-1.90.0_p1.tar.bz2 6095 BLAKE2B
d94899021a2ad0bd2de00c15a04b6a5437fa156f7a1b0b18d31e9487312004dfb2d9cb487eacd30592066ef168e088608bd4fc0c7e383c2fe5ec0a8bfd666b0b
SHA512
351ea7dcdea3767b7affe40dc3d2684b7fc56cd0dcd06a6feb86ecb5d62d0451083fae20f878eb1a04c0f8cb31c6f7c96cb5bc84fc22844328fbcfcdf0ae03fb
DIST rust-patches-1.91.0.tar.bz2 6041 BLAKE2B
7ebc846e0ae7b496b4ed89a8b0a5c397923e4dd6c83a1289e0b98f57477feea35978224b9c4ae19a129282a8c53bdd68f8ab615821f62e4bb5fda8e39b03eeb9
SHA512
fee179ec4e4c90aacfc7f8de2b4d41c80472e1fee17dbfc5ebf384d0fb8ec5afb3f8110a429abaf5a74a924fd1926ab69b29d1b2bafd3b5014b2ad360ca24cce
-DIST rust-patches-1.92.0.tar.bz2 5953 BLAKE2B
972fcdcbdbdd02a1891fb5ac599a1248b7b12fe124d4f9763091acf515c12a4c0859a876516b8a348ea106bb8a84d748032ceec5f4a8a7b657b3a81a45ccdfff
SHA512
1e7625a721e92caf2e3af924db449aa737f8802dbab3c50c50c56e55f59fe88bc67de4578a6e7acfd468d5d183b1b0b296d8f16d1ff16b5da4d7d61c1e0bf3b3
+DIST rust-patches-1.92.0_p1.tar.bz2 5993 BLAKE2B
aa3183a46834b9442fd79fcda61a308b6b1831c9eab6c5a48c6fca7eef49267af815a3d53c0f17563483dbb58e4c4cb9ab09e4f00c32c37b5411d184e222079b
SHA512
c2ec50796e8037b1bb1074c516816c9edc815db503ccac0cde4884a7f190e186897cb91ecbad7e1bb7e34b6753d2ccbbc59e83c8efdff452c1ed446850347000
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
DIST rustc-1.75.0-src.tar.xz 159624388 BLAKE2B
8937b80585eddaa3e1f1ef948899d14a170308518c6fef9fe569560cdd870053776956743f796055f2119399b9ca6c0df12fedd789ae46324d071e5126c4e495
SHA512
7b0f25d91b1b5c317980fc88e059200bd43b56a70b445fbc72fb9b96e09775bfd3a98e9bd9d662af80f0ce3aef527c777ee82777e96ca876f47a972d63da8606
diff --git a/dev-lang/rust/rust-1.92.0.ebuild
b/dev-lang/rust/rust-1.92.0_p1.ebuild
similarity index 98%
rename from dev-lang/rust/rust-1.92.0.ebuild
rename to dev-lang/rust/rust-1.92.0_p1.ebuild
index 4f3736670cae..2914a977ee62 100644
--- a/dev-lang/rust/rust-1.92.0.ebuild
+++ b/dev-lang/rust/rust-1.92.0_p1.ebuild
@@ -10,6 +10,7 @@ PYTHON_COMPAT=( python3_{11..14} )
RUST_PATCH_VER=${PV#*_p}
RUST_MAX_VER=${PV%%_*}
+RUST_PV=${PV%%_p*}
if [[ ${PV} == *9999* ]]; then
RUST_MIN_VER="1.88.0" # Update this as new `beta` releases come out.
@@ -31,16 +32,16 @@ elif [[ ${PV} == *beta* ]]; then
betaver=${PV//*beta}
BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
MY_P="rustc-beta"
-
SRC_URI="https://static.rust-lang.org/dist/${BETA_SNAPSHOT}/rustc-beta-src.tar.xz
-> rustc-${PV}-src.tar.xz
-
https://gitweb.gentoo.org/proj/rust-patches.git/snapshot/rust-patches-${RUST_PATCH_VER}.tar.bz2
+
SRC_URI="https://static.rust-lang.org/dist/${BETA_SNAPSHOT}/rustc-beta-src.tar.xz
-> rustc-${RUST_PV}-src.tar.xz
+
https://gitweb.gentoo.org/proj/rust-patches.git/snapshot/rust-patches-${PV}.tar.bz2
verify-sig? (
https://static.rust-lang.org/dist/${BETA_SNAPSHOT}/rustc-beta-src.tar.xz.asc
- -> rustc-${PV}-src.tar.xz.asc )
+ -> rustc-${RUST_PV}-src.tar.xz.asc )
"
S="${WORKDIR}/${MY_P}-src"
else
- MY_P="rustc-${PV}"
+ MY_P="rustc-${RUST_PV}"
SRC_URI="https://static.rust-lang.org/dist/${MY_P}-src.tar.xz
-
https://gitweb.gentoo.org/proj/rust-patches.git/snapshot/rust-patches-${RUST_PATCH_VER}.tar.bz2
+
https://gitweb.gentoo.org/proj/rust-patches.git/snapshot/rust-patches-${PV}.tar.bz2
verify-sig? (
https://static.rust-lang.org/dist/${MY_P}-src.tar.xz.asc )
"
S="${WORKDIR}/${MY_P}-src"
@@ -316,7 +317,7 @@ src_unpack() {
_EOF_
elif use verify-sig ; then
# Patch tarballs are not signed (but we trust Gentoo infra)
- verify-sig_verify_detached
"${DISTDIR}"/rustc-${PV}-src.tar.xz{,.asc}
+ verify-sig_verify_detached
"${DISTDIR}"/rustc-${RUST_PV}-src.tar.xz{,.asc}
default
else
default
@@ -332,7 +333,7 @@ src_prepare() {
# 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}/"
+ "${WORKDIR}/rust-patches-${PV}/"
)
if use lto && tc-is-clang && ! tc-ld-is-lld && ! tc-ld-is-mold; then
@@ -836,7 +837,7 @@ pkg_postinst() {
if has_version dev-debug/gdb || has_version llvm-core/lldb; then
elog "Rust installs helper scripts for calling GDB and LLDB,"
- elog "for convenience they are installed under
/usr/bin/rust-{gdb,lldb}-${PV}."
+ elog "for convenience they are installed under
/usr/bin/rust-{gdb,lldb}-${RUST_PV}."
fi
if has_version app-editors/emacs; then
diff --git a/dev-lang/rust/rust-9999.ebuild b/dev-lang/rust/rust-9999.ebuild
index f098b0b6ab6f..1652bf4c51dd 100644
--- a/dev-lang/rust/rust-9999.ebuild
+++ b/dev-lang/rust/rust-9999.ebuild
@@ -10,6 +10,7 @@ PYTHON_COMPAT=( python3_{11..14} )
RUST_PATCH_VER=${PV#*_p}
RUST_MAX_VER=${PV%%_*}
+RUST_PV=${PV%%_p*}
if [[ ${PV} == *9999* ]]; then
RUST_MIN_VER="1.91.0" # Update this as new `beta` releases come out.
@@ -31,16 +32,16 @@ elif [[ ${PV} == *beta* ]]; then
betaver=${PV//*beta}
BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
MY_P="rustc-beta"
-
SRC_URI="https://static.rust-lang.org/dist/${BETA_SNAPSHOT}/rustc-beta-src.tar.xz
-> rustc-${PV}-src.tar.xz
-
https://gitweb.gentoo.org/proj/rust-patches.git/snapshot/rust-patches-${RUST_PATCH_VER}.tar.bz2
+
SRC_URI="https://static.rust-lang.org/dist/${BETA_SNAPSHOT}/rustc-beta-src.tar.xz
-> rustc-${RUST_PV}-src.tar.xz
+
https://gitweb.gentoo.org/proj/rust-patches.git/snapshot/rust-patches-${PV}.tar.bz2
verify-sig? (
https://static.rust-lang.org/dist/${BETA_SNAPSHOT}/rustc-beta-src.tar.xz.asc
- -> rustc-${PV}-src.tar.xz.asc )
+ -> rustc-${RUST_PV}-src.tar.xz.asc )
"
S="${WORKDIR}/${MY_P}-src"
else
- MY_P="rustc-${PV}"
+ MY_P="rustc-${RUST_PV}"
SRC_URI="https://static.rust-lang.org/dist/${MY_P}-src.tar.xz
-
https://gitweb.gentoo.org/proj/rust-patches.git/snapshot/rust-patches-${RUST_PATCH_VER}.tar.bz2
+
https://gitweb.gentoo.org/proj/rust-patches.git/snapshot/rust-patches-${PV}.tar.bz2
verify-sig? (
https://static.rust-lang.org/dist/${MY_P}-src.tar.xz.asc )
"
S="${WORKDIR}/${MY_P}-src"
@@ -316,7 +317,7 @@ src_unpack() {
_EOF_
elif use verify-sig ; then
# Patch tarballs are not signed (but we trust Gentoo infra)
- verify-sig_verify_detached
"${DISTDIR}"/rustc-${PV}-src.tar.xz{,.asc}
+ verify-sig_verify_detached
"${DISTDIR}"/rustc-${RUST_PV}-src.tar.xz{,.asc}
default
else
default
@@ -327,7 +328,7 @@ src_prepare() {
# 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}/"
+ "${WORKDIR}/rust-patches-${PV}/"
)
if use lto && tc-is-clang && ! tc-ld-is-lld && ! tc-ld-is-mold; then
@@ -831,7 +832,7 @@ pkg_postinst() {
if has_version dev-debug/gdb || has_version llvm-core/lldb; then
elog "Rust installs helper scripts for calling GDB and LLDB,"
- elog "for convenience they are installed under
/usr/bin/rust-{gdb,lldb}-${PV}."
+ elog "for convenience they are installed under
/usr/bin/rust-{gdb,lldb}-${RUST_PV}."
fi
if has_version app-editors/emacs; then
