diff --git a/dev-gap/aclib/aclib-1.3.2.ebuild b/dev-gap/aclib/aclib-1.3.2.ebuild
index 1665099667ccf..243dedb65439f 100644
--- a/dev-gap/aclib/aclib-1.3.2.ebuild
+++ b/dev-gap/aclib/aclib-1.3.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="dev-gap/polycyclic"
 
diff --git a/dev-gap/alnuth/alnuth-3.2.1.ebuild b/dev-gap/alnuth/alnuth-3.2.1.ebuild
index 2201e9e41a1d0..efd5c91c0e085 100644
--- a/dev-gap/alnuth/alnuth-3.2.1.ebuild
+++ b/dev-gap/alnuth/alnuth-3.2.1.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="Algebraic number theory and an interface to PARI/GP"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="amd64"
+SLOT="0"
+KEYWORDS="amd64 ~riscv"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-gap/atlasrep/atlasrep-2.1.8.ebuild b/dev-gap/atlasrep/atlasrep-2.1.8.ebuild
index d060050d4dced..b1ef24694fdd4 100644
--- a/dev-gap/atlasrep/atlasrep-2.1.8.ebuild
+++ b/dev-gap/atlasrep/atlasrep-2.1.8.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://www.math.rwth-aachen.de/~Thomas.Breuer/atlasrep/${P}.tar.gz
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~riscv"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-gap/autodoc/autodoc-2022.10.20.ebuild b/dev-gap/autodoc/autodoc-2022.10.20.ebuild
index c775df7216976..9ec0544e9df0b 100644
--- a/dev-gap/autodoc/autodoc-2022.10.20.ebuild
+++ b/dev-gap/autodoc/autodoc-2022.10.20.ebuild
@@ -6,12 +6,12 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="Generate documentation from GAP source code"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 S="${WORKDIR}/AutoDoc-${PV}"
 
 LICENSE="GPL-2+"
-KEYWORDS="amd64"
+SLOT="0"
+KEYWORDS="amd64 ~riscv"
 
 # The test suite tries to LoadPackage this
 BDEPEND="test? ( dev-gap/io )"
diff --git a/dev-gap/autpgrp/autpgrp-1.11.ebuild b/dev-gap/autpgrp/autpgrp-1.11.ebuild
index f99ce75556a3e..8c66dd2993ef4 100644
--- a/dev-gap/autpgrp/autpgrp-1.11.ebuild
+++ b/dev-gap/autpgrp/autpgrp-1.11.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="Computing the Automorphism Group of a p-Group"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="amd64"
+SLOT="0"
+KEYWORDS="amd64 ~riscv"
 
 DOCS=( README CHANGES.md )
 
diff --git a/dev-gap/browse/browse-1.8.21-r2.ebuild b/dev-gap/browse/browse-1.8.21-r2.ebuild
index 00da7a3a04334..feca5aa41003c 100644
--- a/dev-gap/browse/browse-1.8.21-r2.ebuild
+++ b/dev-gap/browse/browse-1.8.21-r2.ebuild
@@ -9,12 +9,12 @@ MY_PN=Browse
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="GAP ncurses interface for browsing two-dimensional data"
-SLOT="0"
 SRC_URI="https://www.math.rwth-aachen.de/homes/${MY_PN}/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3+"
-KEYWORDS="amd64"
+SLOT="0"
+KEYWORDS="amd64 ~riscv"
 
 DEPEND="sci-mathematics/gap:=
 	sys-libs/ncurses:="
diff --git a/dev-gap/cohomolo/cohomolo-1.6.11.ebuild b/dev-gap/cohomolo/cohomolo-1.6.11.ebuild
index 7756fd073fb01..c046a8c0b0c0e 100644
--- a/dev-gap/cohomolo/cohomolo-1.6.11.ebuild
+++ b/dev-gap/cohomolo/cohomolo-1.6.11.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="Cohomology groups of finite groups on finite modules"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
 
 DEPEND="sci-mathematics/gap"
 
diff --git a/dev-gap/congruence/congruence-1.2.6.ebuild b/dev-gap/congruence/congruence-1.2.6.ebuild
index d1dd8494ca93e..2702762108f83 100644
--- a/dev-gap/congruence/congruence-1.2.6.ebuild
+++ b/dev-gap/congruence/congruence-1.2.6.ebuild
@@ -10,6 +10,6 @@ SRC_URI="https://github.com/gap-packages/congruence/releases/download/v${PV}/${P
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 gap-pkg_enable_tests
diff --git a/dev-gap/corelg/corelg-1.56.ebuild b/dev-gap/corelg/corelg-1.56.ebuild
index 4fb27e8ac24c2..d6f050ee649c6 100644
--- a/dev-gap/corelg/corelg-1.56.ebuild
+++ b/dev-gap/corelg/corelg-1.56.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="GAP package to compute with real semisimple Lie algebras"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="dev-gap/sla"
 
diff --git a/dev-gap/crime/crime-1.6.ebuild b/dev-gap/crime/crime-1.6.ebuild
index 965cc326ed154..c03f318e0f9d6 100644
--- a/dev-gap/crime/crime-1.6.ebuild
+++ b/dev-gap/crime/crime-1.6.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="GAP Package to calculate group cohomology and Massey products"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
 
 DOCS=( CHANGES.md README.md )
 
diff --git a/dev-gap/crisp/crisp-1.4.6.ebuild b/dev-gap/crisp/crisp-1.4.6.ebuild
index b6806f9febc7b..05748fc7093c1 100644
--- a/dev-gap/crisp/crisp-1.4.6.ebuild
+++ b/dev-gap/crisp/crisp-1.4.6.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="GAP algorithms for subgroups of finite soluble groups"
-SLOT="0"
 SRC_URI="https://github.com/bh11/${PN}/releases/download/${P^^}/${P}.tar.bz2"
 
 LICENSE="BSD-2"
-KEYWORDS="amd64"
+SLOT="0"
+KEYWORDS="amd64 ~riscv"
 
 GAP_PKG_HTML_DOCDIR="htm"
 gap-pkg_enable_tests
diff --git a/dev-gap/crypting/crypting-0.10.4-r1.ebuild b/dev-gap/crypting/crypting-0.10.4-r1.ebuild
index b998e7366c3d6..0b6ed6d45b6a5 100644
--- a/dev-gap/crypting/crypting-0.10.4-r1.ebuild
+++ b/dev-gap/crypting/crypting-0.10.4-r1.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="GAP implementation of SHA256 and HMAC for the Jupyter kernel"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
 
 DEPEND="sci-mathematics/gap:="
 RDEPEND="${DEPEND}"
diff --git a/dev-gap/cryst/cryst-4.1.27.ebuild b/dev-gap/cryst/cryst-4.1.27.ebuild
index 0b21d0ee04573..b10ba46a19258 100644
--- a/dev-gap/cryst/cryst-4.1.27.ebuild
+++ b/dev-gap/cryst/cryst-4.1.27.ebuild
@@ -6,12 +6,12 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="GAP package for computing with crystallographic groups"
-SLOT="0"
 SRC_URI="https://www.math.uni-bielefeld.de/~gaehler/gap/Cryst/${P}.tar.gz"
 S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="dev-gap/polycyclic"
 
diff --git a/dev-gap/crystcat/crystcat-1.1.10.ebuild b/dev-gap/crystcat/crystcat-1.1.10.ebuild
index a28fb1ae0366d..ee5e019ca6bac 100644
--- a/dev-gap/crystcat/crystcat-1.1.10.ebuild
+++ b/dev-gap/crystcat/crystcat-1.1.10.ebuild
@@ -6,12 +6,12 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="The crystallographic groups catalog"
-SLOT="0"
 SRC_URI="https://www.math.uni-bielefeld.de/~gaehler/gap/CrystCat/${P}.tar.gz"
 S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="dev-gap/cryst"
 
diff --git a/dev-gap/ctbllib/ctbllib-1.3.9.ebuild b/dev-gap/ctbllib/ctbllib-1.3.9.ebuild
index 95a284407227f..162235782a57e 100644
--- a/dev-gap/ctbllib/ctbllib-1.3.9.ebuild
+++ b/dev-gap/ctbllib/ctbllib-1.3.9.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="The GAP Character Table Library"
-SLOT="0"
 SRC_URI="https://www.math.rwth-aachen.de/~Thomas.Breuer/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
-KEYWORDS="amd64"
+SLOT="0"
+KEYWORDS="amd64 ~riscv"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-gap/cvec/cvec-2.8.1-r1.ebuild b/dev-gap/cvec/cvec-2.8.1-r1.ebuild
index b32983dee0298..cf6de1e9e8aa8 100644
--- a/dev-gap/cvec/cvec-2.8.1-r1.ebuild
+++ b/dev-gap/cvec/cvec-2.8.1-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 IUSE="examples"
 
 DEPEND="sci-mathematics/gap:="
diff --git a/dev-gap/datastructures/datastructures-0.3.0-r1.ebuild b/dev-gap/datastructures/datastructures-0.3.0-r1.ebuild
index 27f7390214197..dfd5933499494 100644
--- a/dev-gap/datastructures/datastructures-0.3.0-r1.ebuild
+++ b/dev-gap/datastructures/datastructures-0.3.0-r1.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit flag-o-matic gap-pkg
 
 DESCRIPTION="Collection of standard data structures for GAP"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/datastructures/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
 
 DEPEND="sci-mathematics/gap:="
 RDEPEND="${DEPEND}"
diff --git a/dev-gap/design/design-1.7.ebuild b/dev-gap/design/design-1.7.ebuild
index a1f056a9a6896..9ccc5bb994e80 100644
--- a/dev-gap/design/design-1.7.ebuild
+++ b/dev-gap/design/design-1.7.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="The Design Package for GAP"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="dev-gap/grape"
 
diff --git a/dev-gap/digraphs/digraphs-1.7.1.ebuild b/dev-gap/digraphs/digraphs-1.7.1.ebuild
index 56038c62d068c..d41ad562ddb5b 100644
--- a/dev-gap/digraphs/digraphs-1.7.1.ebuild
+++ b/dev-gap/digraphs/digraphs-1.7.1.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="Graphs, digraphs, and multidigraphs in GAP"
-SLOT="0"
 SRC_URI="https://github.com/digraphs/Digraphs/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
-KEYWORDS="~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
 
 DEPEND="sci-mathematics/gap:=
 	sci-mathematics/planarity
diff --git a/dev-gap/edim/edim-1.3.7-r2.ebuild b/dev-gap/edim/edim-1.3.7-r2.ebuild
index 4db28d12584c3..93bd0e749d980 100644
--- a/dev-gap/edim/edim-1.3.7-r2.ebuild
+++ b/dev-gap/edim/edim-1.3.7-r2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 DEPEND="sci-mathematics/gap:="
 RDEPEND="${DEPEND}"
diff --git a/dev-gap/factint/factint-1.6.3.ebuild b/dev-gap/factint/factint-1.6.3.ebuild
index 5a98fa950d803..03f19bec91b73 100644
--- a/dev-gap/factint/factint-1.6.3.ebuild
+++ b/dev-gap/factint/factint-1.6.3.ebuild
@@ -8,12 +8,12 @@ inherit gap-pkg
 MY_PN="FactInt"
 MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Advanced Methods for Factoring Integers"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${MY_PN}/releases/download/v${PV}/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2+"
-KEYWORDS="amd64"
+SLOT="0"
+KEYWORDS="amd64 ~riscv"
 
 GAP_PKG_EXTRA_INSTALL=( tables )
 gap-pkg_enable_tests
diff --git a/dev-gap/fga/fga-1.5.0.ebuild b/dev-gap/fga/fga-1.5.0.ebuild
index 817f035b40c7e..aad8c70f51fd5 100644
--- a/dev-gap/fga/fga-1.5.0.ebuild
+++ b/dev-gap/fga/fga-1.5.0.ebuild
@@ -6,10 +6,10 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="Free Group Algorithms (FGA) for GAP"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="amd64"
+SLOT="0"
+KEYWORDS="amd64 ~riscv"
 
 gap-pkg_enable_tests
diff --git a/dev-gap/gapdoc/gapdoc-1.6.7.ebuild b/dev-gap/gapdoc/gapdoc-1.6.7.ebuild
index 4083a05b467f8..89f51c97b4007 100644
--- a/dev-gap/gapdoc/gapdoc-1.6.7.ebuild
+++ b/dev-gap/gapdoc/gapdoc-1.6.7.ebuild
@@ -8,12 +8,12 @@ inherit gap-pkg
 MY_PN=GAPDoc
 MY_P="${MY_PN}-${PV}"
 DESCRIPTION="GAP documentation structure and tooling"
-SLOT="0"
 SRC_URI="https://github.com/frankluebeck/${MY_PN}/archive/relv${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${MY_PN}-relv${PV}"
 
 LICENSE="GPL-2+"
-KEYWORDS="amd64"
+SLOT="0"
+KEYWORDS="amd64 ~riscv"
 IUSE="examples"
 
 # PackageInfo.g defines TestFile := tst/test.tst, but that
diff --git a/dev-gap/gaplint/gaplint-1.2.1.ebuild b/dev-gap/gaplint/gaplint-1.2.1.ebuild
index 725d661d1d120..e650052379696 100644
--- a/dev-gap/gaplint/gaplint-1.2.1.ebuild
+++ b/dev-gap/gaplint/gaplint-1.2.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/james-d-mitchell/${PN}/archive/refs/tags/v${PV}.tar.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
 
diff --git a/dev-gap/gbnp/gbnp-1.0.5.ebuild b/dev-gap/gbnp/gbnp-1.0.5.ebuild
index 0179f59239695..eab277f5c4cd5 100644
--- a/dev-gap/gbnp/gbnp-1.0.5.ebuild
+++ b/dev-gap/gbnp/gbnp-1.0.5.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="Compute Gröbner bases of noncommutative polynomials"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
 IUSE="examples"
 
 gap-pkg_enable_tests
diff --git a/dev-gap/genss/genss-1.6.8.ebuild b/dev-gap/genss/genss-1.6.8.ebuild
index c5439755306a1..9cd2ecc894586 100644
--- a/dev-gap/genss/genss-1.6.8.ebuild
+++ b/dev-gap/genss/genss-1.6.8.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="GAP implementation of the randomized Schreier-Sims algorithm"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
-KEYWORDS="~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
 IUSE="examples"
 
 RDEPEND="dev-gap/io
diff --git a/dev-gap/grape/grape-4.9.0.ebuild b/dev-gap/grape/grape-4.9.0.ebuild
index 023681f3b5745..5e54a459ea639 100644
--- a/dev-gap/grape/grape-4.9.0.ebuild
+++ b/dev-gap/grape/grape-4.9.0.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg prefix
 
 DESCRIPTION="GRaph Algorithms using PErmutation groups"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2+"
-KEYWORDS="~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
 IUSE="bliss"
 
 RDEPEND="bliss? ( sci-libs/bliss )
diff --git a/dev-gap/guava/guava-3.19.ebuild b/dev-gap/guava/guava-3.19.ebuild
index 7cef6eaa6e7bd..b00d33b0c4e0d 100644
--- a/dev-gap/guava/guava-3.19.ebuild
+++ b/dev-gap/guava/guava-3.19.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="GAP package for computing with error-correcting codes"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 DEPEND="sci-mathematics/gap"
 
diff --git a/dev-gap/hap/hap-1.62.ebuild b/dev-gap/hap/hap-1.62.ebuild
index ef7a1b6988d47..df5a4545699fb 100644
--- a/dev-gap/hap/hap-1.62.ebuild
+++ b/dev-gap/hap/hap-1.62.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-gap/hapcryst/hapcryst-0.1.15.ebuild b/dev-gap/hapcryst/hapcryst-0.1.15.ebuild
index c68ce6b2cf529..4ec0b51665eb2 100644
--- a/dev-gap/hapcryst/hapcryst-0.1.15.ebuild
+++ b/dev-gap/hapcryst/hapcryst-0.1.15.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/gap-packages/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 IUSE="examples"
 
 RDEPEND="dev-gap/aclib
diff --git a/dev-gap/hecke/hecke-1.5.3.ebuild b/dev-gap/hecke/hecke-1.5.3.ebuild
index 66b4ce9dc1b50..53aca48cc7453 100644
--- a/dev-gap/hecke/hecke-1.5.3.ebuild
+++ b/dev-gap/hecke/hecke-1.5.3.ebuild
@@ -6,10 +6,10 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="Calculate decomposition matrices of Hecke algebras in GAP"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
 
 gap-pkg_enable_tests
diff --git a/dev-gap/images/images-1.3.1.ebuild b/dev-gap/images/images-1.3.1.ebuild
index 1459076d3b181..b283177070cc4 100644
--- a/dev-gap/images/images-1.3.1.ebuild
+++ b/dev-gap/images/images-1.3.1.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="Find minimal and canonical images in permutation groups"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="MPL-2.0"
-KEYWORDS="~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
 
 BDEPEND="test? (
 	dev-gap/atlasrep
diff --git a/dev-gap/io/io-4.8.2-r1.ebuild b/dev-gap/io/io-4.8.2-r1.ebuild
index f5c4b33df639e..b3f521e442b17 100644
--- a/dev-gap/io/io-4.8.2-r1.ebuild
+++ b/dev-gap/io/io-4.8.2-r1.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit autotools gap-pkg
 
 DESCRIPTION="Bindings for low level C library I/O routines"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
-KEYWORDS="amd64"
+SLOT="0"
+KEYWORDS="amd64 ~riscv"
 IUSE="examples"
 
 DEPEND="sci-mathematics/gap:="
diff --git a/dev-gap/irredsol/irredsol-1.4.4.ebuild b/dev-gap/irredsol/irredsol-1.4.4.ebuild
index 3c75a197123ef..ceeb230d0319d 100644
--- a/dev-gap/irredsol/irredsol-1.4.4.ebuild
+++ b/dev-gap/irredsol/irredsol-1.4.4.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="Irreducible soluble linear groups over finite fields and more"
-SLOT="0"
 SRC_URI="https://github.com/bh11/${PN}/releases/download/IRREDSOL-${PV}/${P}.tar.bz2"
 
 LICENSE="BSD-2"
-KEYWORDS="amd64"
+SLOT="0"
+KEYWORDS="amd64 ~riscv"
 
 GAP_PKG_HTML_DOCDIR="htm"
 GAP_PKG_EXTRA_INSTALL=( data fp )
diff --git a/dev-gap/laguna/laguna-3.9.6.ebuild b/dev-gap/laguna/laguna-3.9.6.ebuild
index c59b98ac1c4f3..1731e665b9851 100644
--- a/dev-gap/laguna/laguna-3.9.6.ebuild
+++ b/dev-gap/laguna/laguna-3.9.6.ebuild
@@ -6,10 +6,10 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="Lie AlGebras and UNits of group Algebras"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="amd64"
+SLOT="0"
+KEYWORDS="amd64 ~riscv"
 
 gap-pkg_enable_tests
diff --git a/dev-gap/liealgdb/liealgdb-2.2.1.ebuild b/dev-gap/liealgdb/liealgdb-2.2.1.ebuild
index 42b7641cbfefd..89dba04e0a913 100644
--- a/dev-gap/liealgdb/liealgdb-2.2.1.ebuild
+++ b/dev-gap/liealgdb/liealgdb-2.2.1.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="A database of Lie algebras"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
 
 DOCS=( CHANGES.md README )
 
diff --git a/dev-gap/liepring/liepring-2.9.1.ebuild b/dev-gap/liepring/liepring-2.9.1.ebuild
index ca182a6b376b1..1354535578760 100644
--- a/dev-gap/liepring/liepring-2.9.1.ebuild
+++ b/dev-gap/liepring/liepring-2.9.1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Database and algorithms for Lie p-rings"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="dev-gap/liering"
 
diff --git a/dev-gap/liering/liering-2.4.2.ebuild b/dev-gap/liering/liering-2.4.2.ebuild
index a64b5875fbb12..c13cf5a526249 100644
--- a/dev-gap/liering/liering-2.4.2.ebuild
+++ b/dev-gap/liering/liering-2.4.2.ebuild
@@ -6,10 +6,10 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="Finitely presented Lie rings in GAP"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
 
 gap-pkg_enable_tests
diff --git a/dev-gap/loops/loops-3.4.3.ebuild b/dev-gap/loops/loops-3.4.3.ebuild
index c96e474598409..7ad0b0a4f04dc 100644
--- a/dev-gap/loops/loops-3.4.3.ebuild
+++ b/dev-gap/loops/loops-3.4.3.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="Computing with quasigroups and loops in GAP"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
 
 GAP_PKG_EXTRA_INSTALL=( data )
 gap-pkg_enable_tests
diff --git a/dev-gap/mapclass/mapclass-1.4.6.ebuild b/dev-gap/mapclass/mapclass-1.4.6.ebuild
index 17b93c0c8360d..f5d3a212bb07b 100644
--- a/dev-gap/mapclass/mapclass-1.4.6.ebuild
+++ b/dev-gap/mapclass/mapclass-1.4.6.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="A GAP package to compute mapping-class group orbits"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 S="${WORKDIR}/MapClass-${PV}"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
 
 gap-pkg_enable_tests
diff --git a/dev-gap/nq/nq-2.5.10.ebuild b/dev-gap/nq/nq-2.5.10.ebuild
index cfa6ff041eb30..78ba87c48f477 100644
--- a/dev-gap/nq/nq-2.5.10.ebuild
+++ b/dev-gap/nq/nq-2.5.10.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="Nilpotent Quotients of finitely-presented groups"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
 IUSE="examples"
 
 DEPEND="sci-mathematics/gap:=
diff --git a/dev-gap/orb/orb-4.9.0-r1.ebuild b/dev-gap/orb/orb-4.9.0-r1.ebuild
index 4161922dd244c..dac1312f7d5ab 100644
--- a/dev-gap/orb/orb-4.9.0-r1.ebuild
+++ b/dev-gap/orb/orb-4.9.0-r1.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg toolchain-funcs
 
 DESCRIPTION="GAP methods to enumerate orbits"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
-KEYWORDS="~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-gap/polenta/polenta-1.3.10.ebuild b/dev-gap/polenta/polenta-1.3.10.ebuild
index be16c92966ee8..642fe3a81e9a4 100644
--- a/dev-gap/polenta/polenta-1.3.10.ebuild
+++ b/dev-gap/polenta/polenta-1.3.10.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="Polycyclic presentations for matrix groups"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
-KEYWORDS="amd64"
+SLOT="0"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND="dev-gap/polycyclic
 	dev-gap/radiroot
diff --git a/dev-gap/polycyclic/polycyclic-2.16.ebuild b/dev-gap/polycyclic/polycyclic-2.16.ebuild
index 11250dca1cdde..b7f15dde6f074 100644
--- a/dev-gap/polycyclic/polycyclic-2.16.ebuild
+++ b/dev-gap/polycyclic/polycyclic-2.16.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="Computation with polycyclic groups"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="amd64"
+SLOT="0"
+KEYWORDS="amd64 ~riscv"
 
 # Circular dependency polycyclic->alnuth->polycyclic. There's a global
 # variable called USE_ALNUTH in polycyclic, but setting it to "false"
diff --git a/dev-gap/polymaking/polymaking-0.8.7.ebuild b/dev-gap/polymaking/polymaking-0.8.7.ebuild
index e488b8819e711..e3546baa7f694 100644
--- a/dev-gap/polymaking/polymaking-0.8.7.ebuild
+++ b/dev-gap/polymaking/polymaking-0.8.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 # Tests fail: https://github.com/gap-packages/polymaking/issues/18
 RESTRICT=test
diff --git a/dev-gap/primgrp/primgrp-3.4.4.ebuild b/dev-gap/primgrp/primgrp-3.4.4.ebuild
index 0f9e7963b03be..82ad124671859 100644
--- a/dev-gap/primgrp/primgrp-3.4.4.ebuild
+++ b/dev-gap/primgrp/primgrp-3.4.4.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="GAP Primitive Permutation Groups Library"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="amd64"
+SLOT="0"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND="dev-gap/gapdoc"
 gap-pkg_enable_tests
diff --git a/dev-gap/qpa/qpa-1.35.ebuild b/dev-gap/qpa/qpa-1.35.ebuild
index ddd175960b245..44e0ab7585fe3 100644
--- a/dev-gap/qpa/qpa-1.35.ebuild
+++ b/dev-gap/qpa/qpa-1.35.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="Quivers and Path Algebras in GAP"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
 IUSE="examples"
 
 RDEPEND="dev-gap/gbnp"
diff --git a/dev-gap/quagroup/quagroup-1.8.3.ebuild b/dev-gap/quagroup/quagroup-1.8.3.ebuild
index ae11810b0f6a8..5f7b24235df2a 100644
--- a/dev-gap/quagroup/quagroup-1.8.3.ebuild
+++ b/dev-gap/quagroup/quagroup-1.8.3.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="GAP package for quantum group computations"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
 
 DOCS=( README.md CHANGES.md )
 
diff --git a/dev-gap/radiroot/radiroot-2.9.ebuild b/dev-gap/radiroot/radiroot-2.9.ebuild
index 7ec9b762ca278..9fb93bee93e76 100644
--- a/dev-gap/radiroot/radiroot-2.9.ebuild
+++ b/dev-gap/radiroot/radiroot-2.9.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="Roots of a polynomial as radicals in GAP"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="amd64"
+SLOT="0"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND="dev-gap/alnuth"
 
diff --git a/dev-gap/resclasses/resclasses-4.7.3.ebuild b/dev-gap/resclasses/resclasses-4.7.3.ebuild
index 8a6abb33adb90..9b63d27b293bb 100644
--- a/dev-gap/resclasses/resclasses-4.7.3.ebuild
+++ b/dev-gap/resclasses/resclasses-4.7.3.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="Set-theoretic computations with residue classes in GAP"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="amd64"
+SLOT="0"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND="dev-gap/utils
 	dev-gap/polycyclic"
diff --git a/dev-gap/semigroups/semigroups-5.3.7.ebuild b/dev-gap/semigroups/semigroups-5.3.7.ebuild
index 4981df03590e4..3785c59ecb354 100644
--- a/dev-gap/semigroups/semigroups-5.3.7.ebuild
+++ b/dev-gap/semigroups/semigroups-5.3.7.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="GAP package for semigroups and monoids"
-SLOT="0"
 SRC_URI="https://github.com/semigroups/Semigroups/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
-KEYWORDS="~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
 
 DEPEND="sci-mathematics/gap:=
 	>=sci-libs/libsemigroups-2.7.3:="
diff --git a/dev-gap/singular/singular-2024.06.03.ebuild b/dev-gap/singular/singular-2024.06.03.ebuild
index 4e1ed1e183234..3f7b6be3ac2a5 100644
--- a/dev-gap/singular/singular-2024.06.03.ebuild
+++ b/dev-gap/singular/singular-2024.06.03.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="GAP interface to sci-mathematics/singular"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="sci-mathematics/singular"
 
diff --git a/dev-gap/sla/sla-1.5.3.ebuild b/dev-gap/sla/sla-1.5.3.ebuild
index d6e4f0e16fd25..053c4e2274b98 100644
--- a/dev-gap/sla/sla-1.5.3.ebuild
+++ b/dev-gap/sla/sla-1.5.3.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="GAP package for simple Lie algebra computations"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="dev-gap/quagroup"
 
diff --git a/dev-gap/smallgrp/smallgrp-1.5.3.ebuild b/dev-gap/smallgrp/smallgrp-1.5.3.ebuild
index d9f9cef246044..36c76d21269f2 100644
--- a/dev-gap/smallgrp/smallgrp-1.5.3.ebuild
+++ b/dev-gap/smallgrp/smallgrp-1.5.3.ebuild
@@ -7,12 +7,12 @@ inherit gap-pkg
 
 MY_P="SmallGrp-${PV}"
 DESCRIPTION="The GAP Small Groups Library"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/smallgrp/releases/download/v${PV}/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="Artistic-2"
-KEYWORDS="amd64"
+SLOT="0"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND="dev-gap/gapdoc"
 gap-pkg_enable_tests
diff --git a/dev-gap/sonata/sonata-2.9.6.ebuild b/dev-gap/sonata/sonata-2.9.6.ebuild
index b444b3fe3e9a5..85c29f84d7a12 100644
--- a/dev-gap/sonata/sonata-2.9.6.ebuild
+++ b/dev-gap/sonata/sonata-2.9.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 GAP_PKG_EXTRA_INSTALL=( grp nr nri )
 gap-pkg_enable_tests
diff --git a/dev-gap/sophus/sophus-1.27.ebuild b/dev-gap/sophus/sophus-1.27.ebuild
index 479c9041b23be..2d88fd1510197 100644
--- a/dev-gap/sophus/sophus-1.27.ebuild
+++ b/dev-gap/sophus/sophus-1.27.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="Computing in nilpotent Lie algebras"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="amd64"
+SLOT="0"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND="dev-gap/autpgrp"
 
diff --git a/dev-gap/spinsym/spinsym-1.5.2.ebuild b/dev-gap/spinsym/spinsym-1.5.2.ebuild
index 3d1d493d8e2b8..5282deefa0862 100644
--- a/dev-gap/spinsym/spinsym-1.5.2.ebuild
+++ b/dev-gap/spinsym/spinsym-1.5.2.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="Brauer tables of spin-symmetric groups"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="amd64"
+SLOT="0"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND="dev-gap/ctbllib"
 
diff --git a/dev-gap/tomlib/tomlib-1.2.11.ebuild b/dev-gap/tomlib/tomlib-1.2.11.ebuild
index 2cb24be48ec86..31bdfe2d58785 100644
--- a/dev-gap/tomlib/tomlib-1.2.11.ebuild
+++ b/dev-gap/tomlib/tomlib-1.2.11.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="The GAP library of Tables of Marks"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="amd64"
+SLOT="0"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND="dev-gap/atlasrep"
 
diff --git a/dev-gap/toric/toric-1.9.5.ebuild b/dev-gap/toric/toric-1.9.5.ebuild
index 6cdfa8db665d8..161fefba0d00f 100644
--- a/dev-gap/toric/toric-1.9.5.ebuild
+++ b/dev-gap/toric/toric-1.9.5.ebuild
@@ -13,6 +13,6 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 gap-pkg_enable_tests
diff --git a/dev-gap/transgrp/transgrp-3.6.5.ebuild b/dev-gap/transgrp/transgrp-3.6.5.ebuild
index 09f14ff666294..e7d261bce63b4 100644
--- a/dev-gap/transgrp/transgrp-3.6.5.ebuild
+++ b/dev-gap/transgrp/transgrp-3.6.5.ebuild
@@ -6,14 +6,14 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="GAP transitive groups library"
-SLOT="0"
 SRC_URI="https://www.math.colostate.edu/~hulpke/${PN}/${PN}${PV}.tar.gz"
 S="${WORKDIR}/${PN}"
 
 # Data format is licensed Artistic-2
 # Code is licensed GPL-3
 LICENSE="GPL-3 Artistic-2"
-KEYWORDS="amd64"
+SLOT="0"
+KEYWORDS="amd64 ~riscv"
 
 # This is one of the four required packages whose dependencies are all
 # listed explicitly.
diff --git a/dev-gap/utils/utils-0.84.ebuild b/dev-gap/utils/utils-0.84.ebuild
index 62eca8b3cca40..c0ca2ffc42275 100644
--- a/dev-gap/utils/utils-0.84.ebuild
+++ b/dev-gap/utils/utils-0.84.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit gap-pkg
 
 DESCRIPTION="Utility functions in GAP"
-SLOT="0"
 SRC_URI="https://github.com/gap-packages/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
-KEYWORDS="amd64"
+SLOT="0"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND="dev-gap/autodoc
 	dev-gap/polycyclic"
diff --git a/sci-mathematics/gap/gap-4.13.1.ebuild b/sci-mathematics/gap/gap-4.13.1.ebuild
index 7927d5feec2a5..083b69e86f544 100644
--- a/sci-mathematics/gap/gap-4.13.1.ebuild
+++ b/sci-mathematics/gap/gap-4.13.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${P/_/-}"
 
 LICENSE="GPL-2+"
 SLOT="0/9" # soname
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~riscv"
 IUSE="cpu_flags_x86_popcnt debug memcheck minimal readline test valgrind"
 REQUIRED_USE="?? ( memcheck valgrind )"