From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 80D8E1582EF for ; Fri, 21 Feb 2025 17:54:43 +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 66D9934330D for ; Fri, 21 Feb 2025 17:54:43 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 697091102A2; Fri, 21 Feb 2025 17:54:42 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 5F9561102A2 for ; Fri, 21 Feb 2025 17:54:42 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EEAED34330F for ; Fri, 21 Feb 2025 17:54:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 88A132712 for ; Fri, 21 Feb 2025 17:54:40 +0000 (UTC) From: "orbea" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "orbea" Message-ID: <1740156300.43d792963272d90d48c9794d58233e2d7a1ee83c.orbea@gentoo> Subject: [gentoo-commits] repo/proj/libressl:master commit in: dev-lang/rust/files/, dev-lang/rust/ X-VCS-Repository: repo/proj/libressl X-VCS-Files: dev-lang/rust/files/rehash-crate.sh dev-lang/rust/rust-1.71.1-r101.ebuild X-VCS-Directories: dev-lang/rust/ dev-lang/rust/files/ X-VCS-Committer: orbea X-VCS-Committer-Name: orbea X-VCS-Revision: 43d792963272d90d48c9794d58233e2d7a1ee83c X-VCS-Branch: master Date: Fri, 21 Feb 2025 17:54:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9ea371b9-05ac-4f94-881e-2bee4afed14d X-Archives-Hash: 1fcbf38842324cdae1ee9f69e45b2c68 commit: 43d792963272d90d48c9794d58233e2d7a1ee83c Author: orbea riseup net> AuthorDate: Fri Feb 21 16:45:00 2025 +0000 Commit: orbea riseup net> CommitDate: Fri Feb 21 16:45:00 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=43d79296 dev-lang/rust: drop rehash-crate.sh Signed-off-by: orbea riseup.net> dev-lang/rust/files/rehash-crate.sh | 18 ------------------ dev-lang/rust/rust-1.71.1-r101.ebuild | 11 +++++------ 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/dev-lang/rust/files/rehash-crate.sh b/dev-lang/rust/files/rehash-crate.sh deleted file mode 100644 index c43f542..0000000 --- a/dev-lang/rust/files/rehash-crate.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -# $1 = crate patch file - -set -euf - -cargo='.cargo-checksum.json' - -grep -- '^[+][+][+] ' "${1:?}" | while read -r _ f; do - file="${f#*/}" - orig_sum="$(grep -Eo "\"${file}\":\"[0-9a-fA-F]+\"" "${cargo}" | - cut -d':' -f2 | tr -d '"')" - if [ -n "${orig_sum}" ]; then - sum="$(sha256sum "${file}")" - sed -i "s|${orig_sum}|${sum%% *}|" "${cargo}" - fi -done - -exit 0 diff --git a/dev-lang/rust/rust-1.71.1-r101.ebuild b/dev-lang/rust/rust-1.71.1-r101.ebuild index bbeede3..2c737e6 100644 --- a/dev-lang/rust/rust-1.71.1-r101.ebuild +++ b/dev-lang/rust/rust-1.71.1-r101.ebuild @@ -146,11 +146,10 @@ PATCHES=( ) eapply_crate() { - pushd "${1:?}" > /dev/null || die - local patch="${2:?}" - eapply "${patch}" - "${EPREFIX}"/bin/sh "${FILESDIR}"/rehash-crate.sh "${patch}" || die + pushd "vendor/${1:?}" > /dev/null || die + eapply "${2:?}" popd > /dev/null || die + sed -i 's/\("files":{\)[^}]*/\1/' "vendor/${1}/.cargo-checksum.json" || die } toml_usex() { @@ -222,8 +221,8 @@ pkg_setup() { } src_prepare() { - eapply_crate vendor/openssl-sys-0.9.85 "${FILESDIR}"/1.71.0-libressl-openssl-sys.patch - eapply_crate vendor/openssl-sys "${FILESDIR}"/1.71.0-libressl-openssl-sys.patch + eapply_crate openssl-sys-0.9.85 "${FILESDIR}"/1.71.0-libressl-openssl-sys.patch + eapply_crate openssl-sys "${FILESDIR}"/1.71.0-libressl-openssl-sys.patch default }