From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8B8A4158086 for ; Tue, 14 Dec 2021 08:53:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 36EE42BC009; Tue, 14 Dec 2021 08:53:45 +0000 (UTC) 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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2B9102BC009 for ; Tue, 14 Dec 2021 08:53:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 479AE343327 for ; Tue, 14 Dec 2021 08:53:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C0372D0 for ; Tue, 14 Dec 2021 08:53:40 +0000 (UTC) From: "Maciej Barć" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Maciej Barć" Message-ID: <1639472016.f8757ad71d16fb4963f9933000d3b99a846a025c.xgqt@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-scheme/racket/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-scheme/racket/racket-8.2-r1.ebuild dev-scheme/racket/racket-8.2-r2.ebuild dev-scheme/racket/racket-8.3-r1.ebuild dev-scheme/racket/racket-8.3-r2.ebuild X-VCS-Directories: dev-scheme/racket/ X-VCS-Committer: xgqt X-VCS-Committer-Name: Maciej Barć X-VCS-Revision: f8757ad71d16fb4963f9933000d3b99a846a025c X-VCS-Branch: master Date: Tue, 14 Dec 2021 08:53: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: fead20a6-6289-4744-a76c-744a53a271d1 X-Archives-Hash: 21341f91d3a384744f39f293728ce976 commit: f8757ad71d16fb4963f9933000d3b99a846a025c Author: Maciej Barć gentoo org> AuthorDate: Tue Dec 14 08:13:41 2021 +0000 Commit: Maciej Barć gentoo org> CommitDate: Tue Dec 14 08:53:36 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8757ad7 dev-scheme/racket: fix pkg_preinst; do not die on pkg_config Closes: https://bugs.gentoo.org/829121 Signed-off-by: Maciej Barć gentoo.org> dev-scheme/racket/{racket-8.2-r1.ebuild => racket-8.2-r2.ebuild} | 8 ++++---- dev-scheme/racket/{racket-8.3-r1.ebuild => racket-8.3-r2.ebuild} | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dev-scheme/racket/racket-8.2-r1.ebuild b/dev-scheme/racket/racket-8.2-r2.ebuild similarity index 95% rename from dev-scheme/racket/racket-8.2-r1.ebuild rename to dev-scheme/racket/racket-8.2-r2.ebuild index ebb87fe339c6..d442f6c1047d 100644 --- a/dev-scheme/racket/racket-8.2-r1.ebuild +++ b/dev-scheme/racket/racket-8.2-r2.ebuild @@ -143,7 +143,7 @@ pkg_preinst() { echo "We are installing the same SLOT: ${SLOT}" local rktd for rktd in "${PKGDB[@]}"; do - if [[ -f "${EROOT}/${rktd}" ]]; then + if [[ -f "${EROOT}"/${rktd} ]] && [[ -f "${ED}"/${rktd} ]]; then einfo "Keeping old file: ${rktd}" mv "${ED}"/${rktd} "${ED}"/${rktd}.bak || die "failed to create a backup of ${rktd}" @@ -169,8 +169,8 @@ pkg_config() { einfo "Swapping package database backup files" for rktd in "${PKGDB[@]}"; do - mv "${EROOT}"/${rktd} "${EROOT}"/${rktd}.pkg_config || die - mv "${EROOT}"/${rktd}.bak "${EROOT}"/${rktd} || die - mv "${EROOT}"/${rktd}.pkg_config "${EROOT}"/${rktd}.bak || die + mv "${EROOT}"/${rktd} "${EROOT}"/${rktd}.pkg_config + mv "${EROOT}"/${rktd}.bak "${EROOT}"/${rktd} + mv "${EROOT}"/${rktd}.pkg_config "${EROOT}"/${rktd}.bak done } diff --git a/dev-scheme/racket/racket-8.3-r1.ebuild b/dev-scheme/racket/racket-8.3-r2.ebuild similarity index 94% rename from dev-scheme/racket/racket-8.3-r1.ebuild rename to dev-scheme/racket/racket-8.3-r2.ebuild index 507893805143..d6c989e973c9 100644 --- a/dev-scheme/racket/racket-8.3-r1.ebuild +++ b/dev-scheme/racket/racket-8.3-r2.ebuild @@ -119,7 +119,7 @@ pkg_preinst() { echo "We are installing the same SLOT: ${SLOT}" local rktd for rktd in "${PKGDB[@]}"; do - if [[ -f "${EROOT}/${rktd}" ]]; then + if [[ -f "${EROOT}"/${rktd} ]] && [[ -f "${ED}"/${rktd} ]]; then einfo "Keeping old file: ${rktd}" mv "${ED}"/${rktd} "${ED}"/${rktd}.bak || die "failed to create a backup of ${rktd}" @@ -139,8 +139,8 @@ pkg_config() { einfo "Swapping package database backup files" for rktd in "${PKGDB[@]}"; do - mv "${EROOT}"/${rktd} "${EROOT}"/${rktd}.pkg_config || die - mv "${EROOT}"/${rktd}.bak "${EROOT}"/${rktd} || die - mv "${EROOT}"/${rktd}.pkg_config "${EROOT}"/${rktd}.bak || die + mv "${EROOT}"/${rktd} "${EROOT}"/${rktd}.pkg_config + mv "${EROOT}"/${rktd}.bak "${EROOT}"/${rktd} + mv "${EROOT}"/${rktd}.pkg_config "${EROOT}"/${rktd}.bak done }