diff --git a/dev-scheme/chez/chez-9.5.6.ebuild b/dev-scheme/chez/chez-9.5.4-r1.ebuild
similarity index 93%
rename from dev-scheme/chez/chez-9.5.6.ebuild
rename to dev-scheme/chez/chez-9.5.4-r1.ebuild
index 18f1b2b25e..a08526e789 100644
--- a/dev-scheme/chez/chez-9.5.6.ebuild
+++ b/dev-scheme/chez/chez-9.5.4-r1.ebuild
@@ -10,6 +10,7 @@ inherit multilib
 DESCRIPTION="A programming language based on R6RS"
 HOMEPAGE="https://cisco.github.io/ChezScheme/ https://github.com/cisco/ChezScheme"
 SRC_URI="https://github.com/cisco/ChezScheme/releases/download/v${PV}/${CSV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${CSV}"
 
 # Chez Scheme itself is Apache 2.0, but it vendors LZ4 (BSD-2),
 # Nanopass (MIT), stex (MIT), and zlib (ZLIB).
@@ -22,18 +23,16 @@ DEPEND="
 	X? ( x11-libs/libX11 )
 	ncurses? ( sys-libs/ncurses )
 "
-RDEPEND="
-	${DEPEND}
-"
-
-S="${WORKDIR}/${CSV}"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
-	default
+	tc-export AR CC CXX LD RANLIB
 
 	if use ncurses; then
 		eapply "${FILESDIR}/tinfo.patch"
 	fi
+
+	default
 }
 
 src_configure() {
@@ -51,7 +50,7 @@ src_configure() {
 		--installscriptname=chezscheme-script
 		--nogzip-man-pages
 	)
-	./configure "${myconfargs[@]}" || die
+	sh ./configure "${myconfargs[@]}" || die
 }
 
 src_install() {
diff --git a/dev-scheme/chez/chez-9.5.4.ebuild b/dev-scheme/chez/chez-9.5.6-r1.ebuild
similarity index 92%
rename from dev-scheme/chez/chez-9.5.4.ebuild
rename to dev-scheme/chez/chez-9.5.6-r1.ebuild
index 9d7b7ed2b9..a08526e789 100644
--- a/dev-scheme/chez/chez-9.5.4.ebuild
+++ b/dev-scheme/chez/chez-9.5.6-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 CSV="csv${PV}"
 
@@ -10,6 +10,7 @@ inherit multilib
 DESCRIPTION="A programming language based on R6RS"
 HOMEPAGE="https://cisco.github.io/ChezScheme/ https://github.com/cisco/ChezScheme"
 SRC_URI="https://github.com/cisco/ChezScheme/releases/download/v${PV}/${CSV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${CSV}"
 
 # Chez Scheme itself is Apache 2.0, but it vendors LZ4 (BSD-2),
 # Nanopass (MIT), stex (MIT), and zlib (ZLIB).
@@ -22,18 +23,16 @@ DEPEND="
 	X? ( x11-libs/libX11 )
 	ncurses? ( sys-libs/ncurses )
 "
-RDEPEND="
-	${DEPEND}
-"
-
-S="${WORKDIR}/${CSV}"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
-	default
+	tc-export AR CC CXX LD RANLIB
 
 	if use ncurses; then
 		eapply "${FILESDIR}/tinfo.patch"
 	fi
+
+	default
 }
 
 src_configure() {
@@ -51,7 +50,7 @@ src_configure() {
 		--installscriptname=chezscheme-script
 		--nogzip-man-pages
 	)
-	./configure "${myconfargs[@]}" || die
+	sh ./configure "${myconfargs[@]}" || die
 }
 
 src_install() {