diff --git a/dev-scheme/chibi/chibi-9999.ebuild b/dev-scheme/chibi/chibi-9999.ebuild
index 40985662f0058..a4b1ead15985b 100644
--- a/dev-scheme/chibi/chibi-9999.ebuild
+++ b/dev-scheme/chibi/chibi-9999.ebuild
@@ -1,13 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-REAL_PN="${PN}-scheme"
-REAL_PV="$(ver_cut 1-2)"
-REAL_P="${REAL_PN}-${REAL_PV}"
-
-inherit toolchain-funcs
+inherit cmake
 
 DESCRIPTION="Minimal Scheme implementation for use as an extension language"
 HOMEPAGE="http://synthcode.com/scheme/chibi/"
@@ -15,31 +11,19 @@ HOMEPAGE="http://synthcode.com/scheme/chibi/"
 if [[ "${PV}" == *9999* ]] ; then
 	inherit git-r3
 
-	EGIT_REPO_URI="https://github.com/ashinn/${REAL_PN}.git"
+	EGIT_REPO_URI="https://github.com/ashinn/${PN}-scheme"
 else
-	SRC_URI="https://github.com/ashinn/${REAL_PN}/archive/${REAL_PV}.tar.gz
-		-> ${P}.tar.gz"
-	S="${WORKDIR}/${REAL_P}"
+	SRC_URI="https://github.com/ashinn/${PN}-scheme/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+	S="${WORKDIR}/${PN}-scheme-${PV}"
 
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~riscv ~x86"
 fi
 
 LICENSE="BSD"
 SLOT="0"
 
-src_configure() {
-	tc-export CC
-
-	export PREFIX="${EPREFIX}/usr"
-	export LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-	export SOLIBDIR="${EPREFIX}/usr/$(get_libdir)"
-
-	# If "ldconfig" exists it is ran, overwrite it with "LDCONFIG" variable.
-	export LDCONFIG="0"
-}
-
 src_install() {
-	default
-
-	dosym "${REAL_PN}" "/usr/bin/${PN}"
+	cmake_src_install
+	dosym -r /usr/bin/${PN}{-scheme,}
 }