[gentoo-commits] repo/gentoo:master commit in: dev-scheme/racket/

["Maciej Barć" <xgqt@gentoo.org>]

commit:     f8757ad71d16fb4963f9933000d3b99a846a025c
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 14 08:13:41 2021 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> 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ć <xgqt <AT> 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
 }