From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1716616-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 72C0B1582EF
for <garchives@archives.gentoo.org>; Mon, 10 Feb 2025 00:19:29 +0000 (UTC)
Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
(Authenticated sender: relay-lists.gentoo.org@gentoo.org)
by smtp.gentoo.org (Postfix) with ESMTPSA id 5725B343116
for <garchives@archives.gentoo.org>; Mon, 10 Feb 2025 00:19:29 +0000 (UTC)
Received: from bobolink.gentoo.org (localhost [127.0.0.1])
by bobolink.gentoo.org (Postfix) with ESMTP id 8B849110471;
Mon, 10 Feb 2025 00:19:25 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by bobolink.gentoo.org (Postfix) with ESMTPS id 7FDCD110471
for <gentoo-commits@lists.gentoo.org>; Mon, 10 Feb 2025 00:19:25 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 3539534309B
for <gentoo-commits@lists.gentoo.org>; Mon, 10 Feb 2025 00:19:25 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 90A572765
for <gentoo-commits@lists.gentoo.org>; Mon, 10 Feb 2025 00:19:23 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1739146595.321a4cf17c0e4c5829b3a2d4582472a920fc9189.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/rust/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-lang/rust/rust-1.84.0-r1.ebuild dev-lang/rust/rust-1.84.1-r1.ebuild
X-VCS-Directories: dev-lang/rust/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 321a4cf17c0e4c5829b3a2d4582472a920fc9189
X-VCS-Branch: master
Date: Mon, 10 Feb 2025 00:19:23 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 80d7c760-ea67-4992-af3d-c4478e6fac74
X-Archives-Hash: 6a11b0f9e8c8d5ea96d3c31b678ff6da
commit: 321a4cf17c0e4c5829b3a2d4582472a920fc9189
Author: Matt Jolly <kangie <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 9 01:15:14 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 10 00:16:35 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=321a4cf1
dev-lang/rust: drop preinst/postinst workaround for 1.84.{0,1}
This workaround is only required when migrating from non-slotted
Rust to slotted Rust. Since these versions have never had
a non-slotted counterpart, this step is superfluous.
Remove it now in conjunction with an unrelated revbump so that
the workaround isn't carried forward any further.
Signed-off-by: Matt Jolly <kangie <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/rust/rust-1.84.0-r1.ebuild | 36 ------------------------------------
dev-lang/rust/rust-1.84.1-r1.ebuild | 36 ------------------------------------
2 files changed, 72 deletions(-)
diff --git a/dev-lang/rust/rust-1.84.0-r1.ebuild b/dev-lang/rust/rust-1.84.0-r1.ebuild
index 3fbaeec5c488..10294bcfad06 100644
--- a/dev-lang/rust/rust-1.84.0-r1.ebuild
+++ b/dev-lang/rust/rust-1.84.0-r1.ebuild
@@ -681,44 +681,8 @@ src_install() {
fi
}
-pkg_preinst() {
- # 943308 and friends; basically --keep-going can forget to unmerge old rust
- # but the soft blocker allows us to install conflicting files.
- # This results in duplicated .{rlib,so} files which confuses rustc and results in
- # the need for manual intervention.
- if has_version -b "dev-lang/rust:stable/$(ver_cut 1-2)"; then
- # we need to find all .{rlib,so} files in the old rust lib directory
- # and store them in an array for later use
- readarray -d '' old_rust_libs < <(
- find "${EROOT}/usr/lib/rust/${PV}/lib/rustlib" \
- -type f \( -name '*.rlib' -o -name '*.so' \) -print0)
- export old_rust_libs
- if [[ ${#old_rust_libs[@]} -gt 0 ]]; then
- einfo "Found old .rlib and .so files in the old rust lib directory"
- else
- die "Found no old .rlib and .so files but old rust version is installed. Bailing!"
- fi
- fi
-}
-
pkg_postinst() {
- if has_version -b "dev-lang/rust:stable/$(ver_cut 1-2)"; then
- # Be _extra_ careful here as we're removing files from the live filesystem
- local f
- for f in "${old_rust_libs[@]}"; do
- [[ -f ${f} ]] || die "old_rust_libs array contains non-existent file"
- local base_name="${f%-*}"
- local ext="${f##*.}"
- local matching_files=("${base_name}"-*.${ext})
- if [[ ${#matching_files[@]} -ne 2 ]]; then
- die "Expected exactly two files matching ${base_name}-\*.rlib, but found ${#matching_files[@]}"
- fi
- einfo "Removing old .rlib file ${f}"
- rm "${f}" || die
- done
- fi
-
eselect rust update
if has_version dev-debug/gdb || has_version llvm-core/lldb; then
diff --git a/dev-lang/rust/rust-1.84.1-r1.ebuild b/dev-lang/rust/rust-1.84.1-r1.ebuild
index 605506b91c5a..8ae682155bcc 100644
--- a/dev-lang/rust/rust-1.84.1-r1.ebuild
+++ b/dev-lang/rust/rust-1.84.1-r1.ebuild
@@ -681,44 +681,8 @@ src_install() {
fi
}
-pkg_preinst() {
- # 943308 and friends; basically --keep-going can forget to unmerge old rust
- # but the soft blocker allows us to install conflicting files.
- # This results in duplicated .{rlib,so} files which confuses rustc and results in
- # the need for manual intervention.
- if has_version -b "dev-lang/rust:stable/$(ver_cut 1-2)"; then
- # we need to find all .{rlib,so} files in the old rust lib directory
- # and store them in an array for later use
- readarray -d '' old_rust_libs < <(
- find "${EROOT}/usr/lib/rust/${PV}/lib/rustlib" \
- -type f \( -name '*.rlib' -o -name '*.so' \) -print0)
- export old_rust_libs
- if [[ ${#old_rust_libs[@]} -gt 0 ]]; then
- einfo "Found old .rlib and .so files in the old rust lib directory"
- else
- die "Found no old .rlib and .so files but old rust version is installed. Bailing!"
- fi
- fi
-}
-
pkg_postinst() {
- if has_version -b "dev-lang/rust:stable/$(ver_cut 1-2)"; then
- # Be _extra_ careful here as we're removing files from the live filesystem
- local f
- for f in "${old_rust_libs[@]}"; do
- [[ -f ${f} ]] || die "old_rust_libs array contains non-existent file"
- local base_name="${f%-*}"
- local ext="${f##*.}"
- local matching_files=("${base_name}"-*.${ext})
- if [[ ${#matching_files[@]} -ne 2 ]]; then
- die "Expected exactly two files matching ${base_name}-\*.rlib, but found ${#matching_files[@]}"
- fi
- einfo "Removing old .rlib file ${f}"
- rm "${f}" || die
- done
- fi
-
eselect rust update
if has_version dev-debug/gdb || has_version llvm-core/lldb; then