gentoo auto-resync : 07:10:2024 - 04:26:50

47 files changed, 346 insertions, 276 deletions

diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index ce3f7294e31d..e9463621718c 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/ansi/Manifest b/app-emacs/ansi/Manifest
index 0244097489a5..c883abf03dd7 100644
--- a/app-emacs/ansi/Manifest
+++ b/app-emacs/ansi/Manifest
@@ -1,3 +1,3 @@
 DIST ansi-0.4.1_p20211104.tar.gz 5498 BLAKE2B aabfd9eca6b74e20bc2b435df08aa66971396fc64c9967682c744e53a703b1853af5e72682466fd89e0d4cb06fa264e1c9d7a5970004a2ccd4637ba3ff0d028b SHA512 ea4cf098aec0bace89de9bfebb36be493b4b73311525dd088a081e90aa41b6e4d15519a4e871bb4a2ef9bcd6450943d80f05619fb7290c341a0d5785bac00615
-EBUILD ansi-0.4.1_p20211104.ebuild 1019 BLAKE2B 33660e07a04c259b256abd78aecdfbe0730fb4cc7fbeea61c4497559ce297d9e1f95872b5c72410f91f6c8c8449b2f3107c04edcb4f087ad93b0604bf5c609bc SHA512 b244163ca822485420f88dbbcc39235074c5fb26a4dc2903e0ded41f9b66de7e998239706c5a6fda628ae9d73245a3878aead9a873f5f5d0d766a201a258bdb7
+EBUILD ansi-0.4.1_p20211104.ebuild 1162 BLAKE2B 763dd1dacd6ad7827683c294bfbe814e7628f861265baed0d54f02c4af6f4b7112418ae611f463b5f07fb3b700e78ce6ee6a5022b36fdfde27edce249aa9a96a SHA512 0e224f5a44a8bfc56946e6ef4d092d07bfb081ca5f389503100307993e0d7464d1334d1a1dd1a935691140db1596b561a2398dfb921336e040936821b5a94c0a
 MISC metadata.xml 443 BLAKE2B 7c1cbe2a68f4c65a3a643e50a3b5539a90606769175b04b272df25040104afa4f9e1bced7941bf4e23e9111e4ba34af0b5408faa450d40736e274350ac99eb72 SHA512 9a1bc50652baa3afc7526472c3a21e2cef0c880905404959b27943bbcd1002dbf51ae4f76e9d663df755fb7f8eca215c5a176ea721dfb4f47d3786879a5ce67d
diff --git a/app-emacs/ansi/ansi-0.4.1_p20211104.ebuild b/app-emacs/ansi/ansi-0.4.1_p20211104.ebuild
index a03fe0282a8c..5207ba7c70fa 100644
--- a/app-emacs/ansi/ansi-0.4.1_p20211104.ebuild
+++ b/app-emacs/ansi/ansi-0.4.1_p20211104.ebuild
@@ -3,18 +3,27 @@
 
 EAPI=8
 
-COMMIT=2367fba7b3b2340364a30cd6de7f3eb6bb9898a3
+COMMIT="2367fba7b3b2340364a30cd6de7f3eb6bb9898a3"
 
 inherit elisp
 
 DESCRIPTION="Emacs library to convert strings into ansi"
 HOMEPAGE="https://github.com/rejeep/ansi.el/"
-SRC_URI="https://github.com/rejeep/${PN}.el/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}.el-${COMMIT}
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/rejeep/${PN}.el.git"
+else
+	SRC_URI="https://github.com/rejeep/${PN}.el/archive/${COMMIT}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}.el-${COMMIT}"
+
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
+fi
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-emacs/cask-mode/Manifest b/app-emacs/cask-mode/Manifest
index c9be42fdce5a..57a087b74316 100644
--- a/app-emacs/cask-mode/Manifest
+++ b/app-emacs/cask-mode/Manifest
@@ -1,4 +1,4 @@
 AUX 50cask-mode-gentoo.el 170 BLAKE2B 04561e2a93cf163bd9ca76286df64d1876c808f470c59b3072dc4427b0047fe5cc8307a915e83bb429f8b54708c42d17ff581431a494d5892106836c07bfe052 SHA512 753fe32c4a3586fceba21c914c479fedb09c2d97ab1d5863c65a4003b06addc7d6afa9794492426035930c191691e423a56612679d2816e14c8d86289be483c1
 DIST cask-mode-0.1.tar.gz 42693 BLAKE2B 07c3cd998aee36d275c0d3d5dfdb190a1ad59aaa72695272e7dc33e410413de6723003ae28f30e91f96f0ea95142e97cf7fda28a1986fbd509bd281de91693c1 SHA512 4b9861e9fb5a69db476a32b3cc2cfec8e9418d618cb2e348f1476d6aefa22615c539dd3666914be5c42aed1370d5835c7b78775d3bb4578df845b16dbda91727
-EBUILD cask-mode-0.1.ebuild 759 BLAKE2B 8d8d91df59bccb9749016fc21f59ad1b4b149ffe50e48cb4fcbcb645b5a14175601830ff77638e8fa8f67d43f52c40fe55a33a63b74f766b93b44d3ca0c2f55e SHA512 5e67679405037306a0d5cb5f9b0caeadd6c46dc7a890c6b7079228c7ac89c376d47bfb1f780aba0e9f93bdcb822ee7120116f7fcce50ede74a6f9bb40bce208f
+EBUILD cask-mode-0.1.ebuild 775 BLAKE2B 8870d40eefb9b3415bc6be96635abac33baae6af2020153d24bca5e54dff567dd242eecfb45e66c606c5bb99790f82cad8766e4fa4e549318487e9c4adb05b60 SHA512 15ef261da959639a8eeeab9255e219f7a8f4977465bcac2f158753cdfc15db0eed2ce0984c793ddc2ee9065c5985c984d3b2dff90b413db657a8be58850e748a
 MISC metadata.xml 615 BLAKE2B ca8d85e1b0214f815d5c92fbcf54f473ef82b230f818b037f14814154daa032135581344da77e609e1d88280c150cab34d4fa79128f884a1638f0a37625ab547 SHA512 2726ce9169b3e4e4bab0e5b912ab3cd7b7f305adbf3c726dd4d8c7053ecb9f62038c037e14314911ad47325502c4fe5d0923ef26efea0f40b9b9aa70b50fc67f
diff --git a/app-emacs/cask-mode/cask-mode-0.1.ebuild b/app-emacs/cask-mode/cask-mode-0.1.ebuild
index f86dea2e9c3a..03398c956339 100644
--- a/app-emacs/cask-mode/cask-mode-0.1.ebuild
+++ b/app-emacs/cask-mode/cask-mode-0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,32 +7,37 @@ inherit elisp
 
 DESCRIPTION="Major mode for editing Cask files for Emacs"
 HOMEPAGE="https://github.com/Wilfred/cask-mode/"
-SRC_URI="https://github.com/Wilfred/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/Wilfred/${PN}.git"
+else
+	SRC_URI="https://github.com/Wilfred/${PN}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 BDEPEND="
 	test? (
 		app-emacs/assess
-		app-emacs/ert-runner
 	)
 "
 
 DOCS=( README.md )
 SITEFILE="50${PN}-gentoo.el"
 
+elisp-enable-tests ert-runner test
+
 src_prepare() {
 	elisp_src_prepare
 
 	# Silence a broken test
-	sed "s|ert-deftest cask-mode-highlight-comment|lambda|" \
-		-i test/${PN}-test.el || die
-}
-
-src_test() {
-	ert-runner -L . -L test --reporter ert+duration --script test || die
+	sed -i "test/${PN}-test.el" \
+		-e "s|ert-deftest cask-mode-highlight-comment|lambda|" \
+		|| die
 }
diff --git a/app-emacs/commander/Manifest b/app-emacs/commander/Manifest
index b240e85cfa94..5b0941d824cf 100644
--- a/app-emacs/commander/Manifest
+++ b/app-emacs/commander/Manifest
@@ -1,3 +1,3 @@
 DIST commander-0.7.0.tar.gz 37120 BLAKE2B 61e7262f7909d866f3890854cc695d1d8769ea54fa2a983d72a3e5b61217f1e898036026f71d8ae0d46e8d45af0b9e0e52c2f88d4f647dd50454877b9abd2946 SHA512 10d25d931f1faf88747c397594becc3832dfb56de7440ada2cd40e0329b0ca984eda77c62290329510ab87b53ac273e5d36e7acd628ff68ee0e981ccd9497d10
-EBUILD commander-0.7.0-r1.ebuild 749 BLAKE2B 8cc53af053adffbc323ac43ea00502f15c4bede532e8efd763e5aadb5540aa6d1cd3f14724dbe9d4ca6c741a89cf32cfc3c87c947b6fe7bfa37de0ec1cf22bcd SHA512 f3f8d780c3d51dc608cdb9ad74d261fcea9b91acb49575ab79efdffe3a43532950a3a2171318c94f4c7158b8fc636701fa362a4eefb76e7fa5d6748c6fc489d0
+EBUILD commander-0.7.0-r1.ebuild 937 BLAKE2B 78207b0637208d9f4eac774eea661983bec942d7a55d72cd8e98ff3e77cb741926818ba16e5c56eaee6db519c582d3c29f6386b24ae569c2e7093b8a4cab4d46 SHA512 6f2885186d5db1efe898448f3538fdcf9dc49020bb9d99acf3ef89eb2c2049d3eef71c02b05a0896dedc3c4799633f93dad59e3558ddb6a80898cb730d82c544
 MISC metadata.xml 453 BLAKE2B e6c89a0c177d45a51005024560a54b25202a9e603298e2f65935d09a55b8170949df1ff45e541c37d461865dcb0b48d9282f967195e3b6fd596965213006faf0 SHA512 30c2a1be96e04192caa48c863f1dab32013e1054c65c37b72e89224e375bbad51974939696b265d2efb1643d8b9ff3d2252a972f66515ff05674520fd11d4d2e
diff --git a/app-emacs/commander/commander-0.7.0-r1.ebuild b/app-emacs/commander/commander-0.7.0-r1.ebuild
index c61c6bff1a9a..24ef9870b876 100644
--- a/app-emacs/commander/commander-0.7.0-r1.ebuild
+++ b/app-emacs/commander/commander-0.7.0-r1.ebuild
@@ -3,17 +3,25 @@
 
 EAPI=8
 
-inherit elisp
+inherit elisp edo
 
 DESCRIPTION="Emacs command line parser"
 HOMEPAGE="https://github.com/rejeep/commander.el/"
-SRC_URI="https://github.com/rejeep/${PN}.el/archive/v${PV}.tar.gz
-			-> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}.el-${PV}
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/rejeep/${PN}.el.git"
+else
+	SRC_URI="https://github.com/rejeep/${PN}.el/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}.el-${PV}"
+
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
+fi
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -32,10 +40,14 @@ BDEPEND="
 	)
 "
 
+ELISP_REMOVE="
+	features/usage.feature
+"
+
 DOCS=( README.md )
 SITEFILE="50${PN}-gentoo.el"
 
 src_test() {
-	ert-runner || die
-	ecukes --debug --reporter spec --script	features || die
+	edo ert-runner
+	edo ecukes --debug --reporter spec --script --verbose features
 }
diff --git a/app-emacs/dap-mode/Manifest b/app-emacs/dap-mode/Manifest
index 9edf4b31715c..f662be8efc41 100644
--- a/app-emacs/dap-mode/Manifest
+++ b/app-emacs/dap-mode/Manifest
@@ -1,6 +1,4 @@
 AUX dap-mode-dap-ui-images-root-dir.patch 474 BLAKE2B 5431f14e767d1328249eb4904efb989d7a0e762489749049d95f4ecb4334a86f5821bdb54e602694e83718f14f2f789474075b0d3c59c676d753ae3afd4a7725 SHA512 7ccc2c9abea28103da7f9f4f4b2f42af6b92465269513784bc290e14e309df81cc826a5f19e5c246d2b173d33137db73170817455abe749ff4bf7366b057abd2
-DIST dap-mode-0.7.tar.gz 6147924 BLAKE2B 300a058134e58e5ae5f94fd62251c1c621478b3148e7453ef5acd062a2c6088f0036e3ac2588ce22138d39b77221396c3f310177914b08a2bbc177cfbc14efce SHA512 ba8d8e2b3e9b699b27226b13624b24a6f78ea884fe9e8e7667537e06285354bf996f7f5d621e2576ad34bbf02ede316bf001444b8b5c67fa604aa5dc5d9416ff
 DIST dap-mode-0.8.tar.gz 6376081 BLAKE2B 8823611a6d5b432444ebd880b1295d8553de45aca543eaefad92073da7f3e05a2663ae71920a7c37d8315cbb2134af066631d703d052ac0678416fb9a6692d34 SHA512 2df0cbc216aecbb9b8454ebb7bbd5d20ced051c1d4d64bd2baf589190d8e974d07c7fbb2c57c2fc53007bdf20373f863bf1d483b8b2e1761d165876ee96f5e31
-EBUILD dap-mode-0.7-r1.ebuild 997 BLAKE2B f22d7a098bfeece03fbfe323a884733e5c1bef6ba2a6078475e91d6bdd78a95a9d0d5cf449b64a1b74b54a5779047c879a33627e31ee891d04a3014de08ec25b SHA512 1ae0ff09d015efb4ace11f995b02131db9a80949a61523d100cc2c7964e277260fb8941b804e9717faf9777a3fe2040584573ee509a2c42c41b2611b8fd8597b
 EBUILD dap-mode-0.8.ebuild 1081 BLAKE2B 4a8f2c17192cbdc3394c933be1a51174c9e6e6902fd471ca3c821f653a775d803e233878edf14025eaf89035ca4ff39f01be0f6500c28ff5138788b7a993472f SHA512 4570a2d2cdb680de3aa909904540574921179e987126421cc6dbad685e1b54867e79f3992a2f75e776c31f76ca3ef672d207bf44bb321c779d21a2ac05309d76
 MISC metadata.xml 526 BLAKE2B 1f55ae3dda8c23869f85a281117c57c42078957e710018b146df8d8293e159bdae9297fee626538b55182153eef95206f700da8c0744cc4e3b0a73932afdec9e SHA512 635327c51267e271d0a458c8a12f40cb3ee573180f1d0ccfaf1718cd641fabb9fcd4237a755f1710d569a926d953482da3d3dcf591ab893f74a01895b336c549
diff --git a/app-emacs/dap-mode/dap-mode-0.7-r1.ebuild b/app-emacs/dap-mode/dap-mode-0.7-r1.ebuild
deleted file mode 100644
index e3e29dccd103..000000000000
--- a/app-emacs/dap-mode/dap-mode-0.7-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-NEED_EMACS=26.1
-
-inherit elisp
-
-DESCRIPTION="Debug Adapter Protocol mode"
-HOMEPAGE="https://github.com/emacs-lsp/dap-mode/"
-SRC_URI="https://github.com/emacs-lsp/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-emacs/bui
-	app-emacs/dash
-	app-emacs/f
-	app-emacs/ht
-	app-emacs/hydra
-	app-emacs/lsp-mode
-	app-emacs/lsp-treemacs
-	app-emacs/posframe
-	app-emacs/s
-"
-BDEPEND="
-	${RDEPEND}
-	test? ( app-emacs/ert-runner )
-"
-
-DOCS=( CHANGELOG.org README.org )
-PATCHES=( "${FILESDIR}"/${PN}-dap-ui-images-root-dir.patch )
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	elisp_src_prepare
-
-	sed "s|@SITEETC@|${SITEETC}/${PN}|" -i dap-ui.el || die
-}
-
-src_test() {
-	ert-runner -L . -L test --reporter ert+duration || die
-}
-
-src_install() {
-	elisp_src_install
-
-	insinto ${SITEETC}/${PN}
-	doins -r icons
-}
diff --git a/app-emacs/deferred/Manifest b/app-emacs/deferred/Manifest
index 6c1fc08375c3..2f88c401e247 100644
--- a/app-emacs/deferred/Manifest
+++ b/app-emacs/deferred/Manifest
@@ -1,3 +1,3 @@
 DIST deferred-0.5.1.tar.gz 55894 BLAKE2B 61ba363620d56ad4c5f3fb9434f9550015681f6b8eafb318a9e6aa227aa17875218c12338fe377a840bdc429972d6e285a9744ec6640f277bfe7e4bdaee4a733 SHA512 357890f73917c7929cbb79f71a26901ac24abe9ea532181b730deee8eba97709b41c360904e2a2a8028ee1295e7ae845da5c702c74256a450f3d144080960a2b
-EBUILD deferred-0.5.1.ebuild 841 BLAKE2B c7933593481a3ffa11a1c11033cd96e1b3e26101425acbc1090535c5a9e67e6f656187bbac829d766398a89f2c2f28a5acf4d20ecec557054e93da171c93e971 SHA512 b6da51cbfe0ae8e51a684b8f2129e86a71348a6a220c3955462a970671e94b12b5178a22eca3643321a367694e2247e88ebaef8993560a81fcc7da2429f5057e
+EBUILD deferred-0.5.1.ebuild 887 BLAKE2B 6d15f64e5e404a2c3c39050bffc114a7b0adbe28a90f91003083cc14c6d507a02023ecea566e59e9e266e246483c687a0e296b045d6e116efe0ace6d5c855919 SHA512 482612654b6e00de7c91c34097f5f880e6b8083993f8d400e40bbec27761066d8b0c897aaca2349e4f270cf53b5bd4285744973eb2fb0e15aacab3739bb0f879
 MISC metadata.xml 461 BLAKE2B a9680714c2bdc18d8a7187616d90f94d4a631035e3512bb75425c2b5d969056c4ec4a79b1d72ccebf352a748f9af7d083155cc1b54358b554102c71790a5a791 SHA512 dc93197476455e0c43ffb79ea4175fa16adc8e6147d55a641ebe5c3d908004c1b260bfd7ca542d7f09b947ff76313313bada9528291eb80872397759afff52f3
diff --git a/app-emacs/deferred/deferred-0.5.1.ebuild b/app-emacs/deferred/deferred-0.5.1.ebuild
index a100c8ead3a6..4e20dcf7871a 100644
--- a/app-emacs/deferred/deferred-0.5.1.ebuild
+++ b/app-emacs/deferred/deferred-0.5.1.ebuild
@@ -7,18 +7,24 @@ inherit elisp
 
 DESCRIPTION="Deferred and Concurrent - simple asynchronous functions for Emacs Lisp"
 HOMEPAGE="https://github.com/kiwanami/emacs-deferred/"
-SRC_URI="https://github.com/kiwanami/emacs-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/emacs-${P}
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/kiwanami/emacs-${PN}.git"
+else
+	SRC_URI="https://github.com/kiwanami/emacs-${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}/emacs-${P}"
+
+	KEYWORDS="amd64 ~arm64 ~x86"
+fi
 
 LICENSE="GPL-3+"
-KEYWORDS="amd64 ~arm64 ~x86"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 BDEPEND="
 	test? (
-		app-emacs/ert-runner
 		app-emacs/undercover
 	)
 "
@@ -27,9 +33,10 @@ DOCS=( README-concurrent.ja.markdown README-concurrent.markdown
 	   README.ja.markdown README.markdown sample )
 
 # "Concurrent" tests pass, "Deferred" tests are malformed
-ELISP_REMOVE="test/${PN}-test.el"
+ELISP_REMOVE="
+	test/${PN}-test.el
+"
+
 SITEFILE="50${PN}-gentoo.el"
 
-src_test() {
-	ert-runner --reporter ert+duration || die
-}
+elisp-enable-tests ert-runner test
diff --git a/app-emacs/ecukes/Manifest b/app-emacs/ecukes/Manifest
index c9dae129ba7d..ba3c5ff03c31 100644
--- a/app-emacs/ecukes/Manifest
+++ b/app-emacs/ecukes/Manifest
@@ -1,4 +1,4 @@
 AUX ecukes-bin-launcher-fix.patch 915 BLAKE2B aef7eea5e15b6c8636a407d0d32c8735d193710218a3a1a35732543adc25c1374537de751b7a4f9517f100fbc82d462ae7de3b24ff7568fff91b6e29b3e19df1 SHA512 787e75ee5c3c4cda6db5ac278db3f3117a937b562f1d0d868b8dc9cba4cf6671b5f071e857152f518a5132cd6fd551fe9652c68caf52b18bd65457a280df8c8f
 DIST ecukes-0.6.18.tar.gz 85246 BLAKE2B f4469f155c0f2ce4756e429df2690b1dda3bb2f38f7e5847d14e1d21d0b8170535a2203fafe66649fc8416d41b983f6bc7428f6b4c053dcf0f9372f0973c0b15 SHA512 6d3a16b8dbf021026be5d7134166079bb1495ad4fd6b7e30386aad56c0196c46cbd3ee541ec8c24d5b7e1bb26e3c14fe5f9423b50341867c50b92194139eca02
-EBUILD ecukes-0.6.18-r1.ebuild 1172 BLAKE2B 418a2db6b968d58bc3d0ebf6a38325608eb013b4bb61d46d22ef49a3f5e6bdff045c58e04d44dbebea7c66dfb3d7c3aae96deb9dc41137a08dc54a071635ed79 SHA512 50e905e0238de5948dd4024df0d9e78d69539eaf9f0abb540db043d02991ae330541777c4bfa938d93e54f13ead8cb24cea59b672988b5d1e9a8c2c26901db87
+EBUILD ecukes-0.6.18-r1.ebuild 1191 BLAKE2B 572a5275ee6c1449943c029af5d5f1f9c391dcf5e627c132a45dd16b18e9dff9445cf003083505f6bd9e417bfc1c19b7d05690803c23113306b13d28b2a96017 SHA512 039e18f4d093493902f9b6312f660c48dd84490f154277fced7c912373ec6579a4d0e905dcdc06570309f4b72e3deb2f548c021a744b8baf11f8e676b5494931
 MISC metadata.xml 441 BLAKE2B e7ffaa4e7fe2b7c1d987c5ecde3d7be7244cc8854fd4012477f65906aeef21b827d0feffc4ebffe84ba514d386d7555cd4da8ee01843416581ab8e453ead7767 SHA512 44699441451e4a054864d6fc8513e24bf6b29aaf060657a2c2d2ceb589af10716a18419232518c660e70da79466abbee6939b37c5f521504926c960d952b6592
diff --git a/app-emacs/ecukes/ecukes-0.6.18-r1.ebuild b/app-emacs/ecukes/ecukes-0.6.18-r1.ebuild
index 901cb1f2e0b9..90c7dad93dfc 100644
--- a/app-emacs/ecukes/ecukes-0.6.18-r1.ebuild
+++ b/app-emacs/ecukes/ecukes-0.6.18-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ecukes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-emacs/el-mock/Manifest b/app-emacs/el-mock/Manifest
index 8887fd934d27..eb287a8ffcd8 100644
--- a/app-emacs/el-mock/Manifest
+++ b/app-emacs/el-mock/Manifest
@@ -1,3 +1,3 @@
 DIST el-mock-1.25.1.tar.gz 5825 BLAKE2B e04f193e6d27a0081dd8c9eceafc79b585f8556e0c4dc75f7c27e657b939e6320268c90bb63aca15a7261598edbdbf6cd936230b0c1dc64de24de8a67bc51920 SHA512 8b55c94489d6461124c3e39920e5aeb2e1adb492f08aa4312c6029f392c6acdea1c01872995934e500d6ff63c3d2d38c9dde86c55135421a28e3a79ace38d7d8
-EBUILD el-mock-1.25.1.ebuild 444 BLAKE2B 7d8897403764277b919e82c5544135fc0cbb250dec9ea5698b96b5ebdc1b72a17746c9b95d913b6d6937675738dac4deafbc61e3eedc8654677ad9a382517753 SHA512 a16315812102c27f301b49931903565372306a97310ec0966da50fd8944cc12745749dccec42d314750937e1a699abc0e883de81c1fe32d522da311da2c9ab7a
+EBUILD el-mock-1.25.1.ebuild 463 BLAKE2B be9cf065d91af7e9dde926192284f87c690fea77c87922546c54ca11cd46368945b4f0488b325c61310e8152a2c605a5f33cadf04f00f440dae1dfbb290a5536 SHA512 ffda5eda54af5e69c862f89c864ccb122785bf3d8d15f8e04a305fd97691b73e3a81c06ea8aa582e95c05fb03a3c65d0be222846d3e0159028e44c66efcc24fb
 MISC metadata.xml 423 BLAKE2B 3f2c87404f1467795c461978afa2ff11234eace1a3444bd422be57d2dfa23645e03fce65815af2b10e1bdb53f18448468d6f9baf900baea2914efc78dc260008 SHA512 5b8ab566e72ce176eb0dc1d2177d1d75497553e46a859c73f2c45bfd21bd9cac527eb4ae1f710f6e6d932f28e4e00680f411b1eaa5c01fcfc68240e6d00a5a99
diff --git a/app-emacs/el-mock/el-mock-1.25.1.ebuild b/app-emacs/el-mock/el-mock-1.25.1.ebuild
index b5059fe82b07..b1b1953ee4bd 100644
--- a/app-emacs/el-mock/el-mock-1.25.1.ebuild
+++ b/app-emacs/el-mock/el-mock-1.25.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${PN}.el-${PV}
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
 
 DOCS=( README.md )
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/elixir-mode/Manifest b/app-emacs/elixir-mode/Manifest
index d507023b3bc9..ab8632ff7245 100644
--- a/app-emacs/elixir-mode/Manifest
+++ b/app-emacs/elixir-mode/Manifest
@@ -1,6 +1,4 @@
 AUX 50elixir-mode-gentoo.el 361 BLAKE2B d8616511eb05c9a7e7e02cf9955e27fc22675ee68f46f4cd3c7c3efdb033212da8f1f2dbdc554397f142b9b5fc80276c918a0c7f120381b12ee547af292a6ec1 SHA512 70616fdce937d299a37364dff0f18a1595e3cf65e25ef2fea7e6827cd3a713ecfe4a737e20ac8f7bca200479349293ccb25ca39bcc3c65d722479f2498812582
-DIST elixir-mode-2.4.1.tar.gz 35948 BLAKE2B 0850da18c5897dce2c19fba5a41235c38b5f6841dcd08c3b9cd1a039d743c3c002f8066bdcb4484cfd99b63004329824d5f38321668aae3fa9d162a5145aac3e SHA512 df429d1cff45d9bcad0cd0d5cdd1776f1c419226881bacec1530750f0cb7418f14858af15176824cbc73916049ba091caaac486fce2c3f6d11ae9cb360ef6a87
 DIST elixir-mode-2.5.0.tar.gz 36761 BLAKE2B cf1157a7b47acc583595b7a80eb7c5717cb605d9188f0d38c41518d21a6eb5729eda5af81d889d11007a899a8e6f38c67d5dd950407c5a89a5290e68ceab3294 SHA512 dfd3d939ab5a46f70f782e8557d39c02d34d502ea43bb93aba754417d2c13c0c8e6743fb974aa2e2def3e29ab22d45a9015ce6e59b33b561387782d8fe0b1389
-EBUILD elixir-mode-2.4.1.ebuild 802 BLAKE2B e5c9703e4574336fa36be9817eb661d2141dd34eb45226d07489ccf9542392bc3720bb3f35cccf1217cf20d815361f59df7d13b50b82f22abc4ac14ff44f4aca SHA512 ff5ba439707b3fd608478194e98807a88798bbc9670d326b09cb8ac5b2b862aaa49e69b0541dfc18dd6b0d410893cf7841fb07078784dc519523a5c62dd377f2
-EBUILD elixir-mode-2.5.0.ebuild 802 BLAKE2B e5c9703e4574336fa36be9817eb661d2141dd34eb45226d07489ccf9542392bc3720bb3f35cccf1217cf20d815361f59df7d13b50b82f22abc4ac14ff44f4aca SHA512 ff5ba439707b3fd608478194e98807a88798bbc9670d326b09cb8ac5b2b862aaa49e69b0541dfc18dd6b0d410893cf7841fb07078784dc519523a5c62dd377f2
+EBUILD elixir-mode-2.5.0.ebuild 697 BLAKE2B 0a4933c125a534cc945d03872173644148547127f3d8668fb27b5a0cb9630cdb1ca82bd89c89ce86acd51520b523337b069163fccaed61e2595ef85c2470f66a SHA512 1cff2f0666882df576d532fe33ff7d135dc613d9fa1c20199116a3f420093a6cc926ba3a1c9231e6e26874298455eb18cf657aeeba8782d7c58ab1e031db5654
 MISC metadata.xml 443 BLAKE2B 03fd8006b1fafa30cc0e438e9ee2f805492c16cd6075a3f1e7b01a214c61f404537771355eb56db5a1525533eaa000eab1bd572639141f9c6bbbd424e7624fd1 SHA512 1d35ec07722b9acb8f5dc46719d9fbd54e48e42e34bfc93d0200313f64df0c97f51d9c993d70d62994b067384c55948c63d0f7bd15608fcac540f1fb19e5e645
diff --git a/app-emacs/elixir-mode/elixir-mode-2.4.1.ebuild b/app-emacs/elixir-mode/elixir-mode-2.4.1.ebuild
deleted file mode 100644
index cc7f9f3b5819..000000000000
--- a/app-emacs/elixir-mode/elixir-mode-2.4.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp
-
-DESCRIPTION="Emacs major mode for editing Elixir files"
-HOMEPAGE="https://github.com/elixir-editors/emacs-elixir/"
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/elixir-editors/emacs-elixir.git"
-else
-	SRC_URI="https://github.com/elixir-editors/emacs-elixir/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-	S="${WORKDIR}"/emacs-elixir-${PV}
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? ( dev-lang/elixir )
-"
-
-DOCS=( CHANGELOG.md README.md )
-SITEFILE="50${PN}-gentoo.el"
-
-elisp-enable-tests ert-runner
-
-src_test() {
-	ert-runner -L . -L tests --reporter ert+duration tests || die
-}
diff --git a/app-emacs/elixir-mode/elixir-mode-2.5.0.ebuild b/app-emacs/elixir-mode/elixir-mode-2.5.0.ebuild
index cc7f9f3b5819..605cde75fb0c 100644
--- a/app-emacs/elixir-mode/elixir-mode-2.5.0.ebuild
+++ b/app-emacs/elixir-mode/elixir-mode-2.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,30 +8,28 @@ inherit elisp
 DESCRIPTION="Emacs major mode for editing Elixir files"
 HOMEPAGE="https://github.com/elixir-editors/emacs-elixir/"
 
-if [[ ${PV} == *9999* ]] ; then
+if [[ "${PV}" == *9999* ]] ; then
 	inherit git-r3
+
 	EGIT_REPO_URI="https://github.com/elixir-editors/emacs-elixir.git"
 else
 	SRC_URI="https://github.com/elixir-editors/emacs-elixir/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
-	S="${WORKDIR}"/emacs-elixir-${PV}
+	S="${WORKDIR}/emacs-elixir-${PV}"
+
 	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 BDEPEND="
-	test? ( dev-lang/elixir )
+	test? (
+		dev-lang/elixir
+	)
 "
 
 DOCS=( CHANGELOG.md README.md )
 SITEFILE="50${PN}-gentoo.el"
 
-elisp-enable-tests ert-runner
-
-src_test() {
-	ert-runner -L . -L tests --reporter ert+duration tests || die
-}
+elisp-enable-tests ert-runner tests
diff --git a/app-emacs/epc/Manifest b/app-emacs/epc/Manifest
index af02f95085e3..3b2a5de932a3 100644
--- a/app-emacs/epc/Manifest
+++ b/app-emacs/epc/Manifest
@@ -1,3 +1,3 @@
 DIST epc-0.1.1.tar.gz 158462 BLAKE2B afbaa496799ac698af885872ab3409ac0e7b27d1299c0450aec75cad6d213fc4efe5b6c2dc48a383b9b061c457accfea81dd821062a7027b781f005cba67e35e SHA512 c6c6e9c2f241ca275b807a387c4fb6916edb02c390d7bc350388d729e2214d7fe5addb7ea634bebc75aa09e510ab2d141ae6a197b328d1f506ee51660a5b8ddc
-EBUILD epc-0.1.1.ebuild 649 BLAKE2B 8947a807e28a1ae0885a7e0ab486b8a6bba7f5e8d75ba8f6943947f008e2dfc6af5df0d4a108db117e80df36f9e2e321f9d6b0cb14d0f7261547a544f2229f23 SHA512 382105a4269c089e38cc747644602ce368f7cee2cac28ada05898a060c55e2c118f155dce1dc9ea58f5d22412adfd63cfffdd13157ca29b2154a9e68c68671bb
+EBUILD epc-0.1.1.ebuild 702 BLAKE2B de88e0d312760ed5cd036159da720fd8f9d5aa1a0d26977d8657c502810e09b92fdcec8da35b6c21f9e35f152cc3b3e7b50da7efc0123137e3ff3e48ef0a09e6 SHA512 2e688124e846bd0d1e4d6b0232e226e44202ddee6800c20528101681110a7c2b8547efc277d6fa57ad5cd8a5e392695b9039e2135a975ee4ae04e1deb05d4eb1
 MISC metadata.xml 425 BLAKE2B 83112e87e10dc5e7d0bfbaedc9e5f426be8402ca62383dabc37234dfe2bb31e8cdc46cf235140c83e4319e3d0a7a533d8f5445c1f7a7397da3a074a9bb731426 SHA512 56db95632e644c0733ad83ae3d8ffa36f6805087d59ce3f7dac428b1ef2e6e3bb85b72e10af673b047e1aafaf96cde9faef3049c840859af974f886df2ad86e4
diff --git a/app-emacs/epc/epc-0.1.1.ebuild b/app-emacs/epc/epc-0.1.1.ebuild
index 631dd47f8e71..1709c8e7e76c 100644
--- a/app-emacs/epc/epc-0.1.1.ebuild
+++ b/app-emacs/epc/epc-0.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,24 +7,31 @@ inherit elisp
 
 DESCRIPTION="RPC stack for Emacs Lisp"
 HOMEPAGE="https://github.com/kiwanami/emacs-epc/"
-SRC_URI="https://github.com/kiwanami/emacs-epc/archive/${PV}.tar.gz
-			-> ${P}.tar.gz"
-S="${WORKDIR}"/emacs-${P}
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/kiwanami/emacs-epc.git"
+else
+	SRC_URI="https://github.com/kiwanami/emacs-epc/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}/emacs-${P}"
+
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="GPL-3+"
-KEYWORDS="~amd64 ~x86"
 SLOT="0"
 
 RDEPEND="
 	app-emacs/ctable
 	app-emacs/deferred
 "
-BDEPEND="${RDEPEND}"
+BDEPEND="
+	${RDEPEND}
+"
 
 DOCS=( readme.md demo img )
 SITEFILE="50${PN}-gentoo.el"
 
-src_test() {
-	${EMACS} ${EMACSFLAGS} -L . -l epc.el -l epcs.el -l test-epc.el \
-		-f ert-run-tests-batch-and-exit || die "tests failed"
-}
+elisp-enable-tests ert "${S}" -l epc.el -l epcs.el -l test-epc.el
diff --git a/app-emacs/ert-async/Manifest b/app-emacs/ert-async/Manifest
index 7976428c4c4f..d73aad5d7e90 100644
--- a/app-emacs/ert-async/Manifest
+++ b/app-emacs/ert-async/Manifest
@@ -1,3 +1,3 @@
 DIST ert-async-0.1.2_p20200105.tar.gz 14434 BLAKE2B e15d041582beef803d4033e2cad100905c8dff0afc768ea68aafe2d610c13603d7a8f4ed66caf62814964880ea6b0729f4ae3dbc19af6a784b2f69eb3a779097 SHA512 a683a3ab81ac361f2cd852a9ca8a98f7e4994e61c15921bcf6593985c7e59dc171766d7538b81785b44c3142511c25b8d418505365240a9efa7879554ac6624c
-EBUILD ert-async-0.1.2_p20200105.ebuild 496 BLAKE2B a66769949759a5633dd2d06b706d710a16eefde129a932e7fbb132ca4d205453a977a9b15020013357c291d338221f8d5717045631c388b588ad10ff52ff8d11 SHA512 d28480091d1f135c72f5b8390d682e93da798d216a0a932038b4fe504f1dfdef20b22310748fe8215a0ba5892f7602c19810170374294f3631bbb81529251034
+EBUILD ert-async-0.1.2_p20200105.ebuild 515 BLAKE2B a03f9bef00817082e632c5324ff063deff9ed18456ade700ab13c165e7c56cddc3207831b0390cc6538b3431c41bb10e352d2e6040c1dc967ffc13f7f071c059 SHA512 e9b10af30ee2fe3603ecc6ab5dc7a95920e29f437a793c3810fcd3241bc27aa09a32351ffd13a6d75b2244805d8c9c4fb9e26d575f962e12295ebbba0b73a5d2
 MISC metadata.xml 427 BLAKE2B 3d2caac9fb44d3e1e52413dce6824c36632721d4cab6a8ac3581ebf11a2d76af9d8c49804ccf1014a6aecf8a978ef6cae719c1a58641e0d3750aae66e5ebc0af SHA512 ccf88327e38236c22c1665ce0660d89b952d84f7ddd3396c2e6559708a39bdc49e016898deb6430462a955a7740dc1f8daa96a11ea673b4a0d3ad7b64823d58b
diff --git a/app-emacs/ert-async/ert-async-0.1.2_p20200105.ebuild b/app-emacs/ert-async/ert-async-0.1.2_p20200105.ebuild
index 30168547debe..271761811231 100644
--- a/app-emacs/ert-async/ert-async-0.1.2_p20200105.ebuild
+++ b/app-emacs/ert-async/ert-async-0.1.2_p20200105.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"/${PN}.el-${COMMIT}
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
 
 DOCS=( README.md )
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/ert-runner/Manifest b/app-emacs/ert-runner/Manifest
index cce5a0f6ec05..c21a3bc41829 100644
--- a/app-emacs/ert-runner/Manifest
+++ b/app-emacs/ert-runner/Manifest
@@ -1,4 +1,5 @@
 AUX ert-runner-bin-launcher-fix.patch 875 BLAKE2B 27f860ae14f9b869891ad0ff7ab2a40511231418c5b377db3c04bd7e7366b0ecb6a1d977b93c22cd3759f53986d3d38101c981ee2642e3d036ddd78acd0e14e9 SHA512 750562585a4933a1c9e6c12ddc97e92b5fc987b85013118861f3fb5a25f6317d7838cb8fa2c79ab2c8207d8b64db3e0d39a6aa4f237d84e7e243c0ca374fd4e8
 DIST ert-runner-0.8.0.tar.gz 36263 BLAKE2B 8eceabea446ffde87c10cd5257264b61ad2e2617cd9a3243c9be5548298a61d5872b46359a798180e3bf450fc8c474f4651fb834959c30f93df807d4ba006401 SHA512 a8d17c10b7c4db3fb784725c22d382e7cf213c7a6bc320658b64f1aaf9597cfe9cedc436771ade239cc9ad59e0d3457c257ce9342f9bee8a3fd65f76eb6d9e9b
-EBUILD ert-runner-0.8.0.ebuild 989 BLAKE2B 8ec27cd8dbb194884bc118f938196fff615457a634cfcb3934e7e57e84ce4695599e3990b34b54461f8432440dab44b03ea8a4c6311a4b5b28891cf416856b54 SHA512 de3dfceced428cf289f9c6101f2cd4fc8760750e8196b331943e2b536cf194d4363e5eb3658077076f359a1932ff5d6fdadc5a3905b6330901a6303ff3a8f7b6
+EBUILD ert-runner-0.8.0-r1.ebuild 1607 BLAKE2B 958c99de08ea667e136a51f4a1f4bb6d8a21b815e0feb93cd88bfaa9a91914282159e75a9411393cebde43e9710d5543831c71d9c9f45de3db0b19ec66b15d9b SHA512 2646af19a2e54cc1d295e53ae3d0deb12b3efc6c380769712db8631cb00ce5f4431c28006e39d98943d8a1f45dadce97705e1a65d6fe38e84db2bc2b44e54954
+EBUILD ert-runner-0.8.0.ebuild 1008 BLAKE2B 1a0e705f33f0af3cff93f802ac6414d3d2b21f805304006aa7566c93a446bdb288f3be8e39acfee4049b08657d2f7ccfc1749b0190826247126ccf1d42e2912e SHA512 70893206136ae29101d83abe8497f96d4eb6d03f9aeaf072072bcc7754d57f519036b63c5652cae71ac2c13f73b5f8755c226f97bd82513f2d5ee547e9302d8a
 MISC metadata.xml 455 BLAKE2B cf3956c8743a3ad380f71976e7b7e06e59ecd8def9b7770bd465bad6e1473b25a55f1e58716f8767bcfd6c2966f9ce61954825a690b64808b07b77f00f9acc3b SHA512 8a64a3e7b892ad17614beb7cd829e3a60dc6228bb6a86a3dab3406a1cb89706a3059a9402a6eb070f683eebe01f8269bef35e8559ce4ae617695d10968abb8fc
diff --git a/app-emacs/ert-runner/ert-runner-0.8.0-r1.ebuild b/app-emacs/ert-runner/ert-runner-0.8.0-r1.ebuild
new file mode 100644
index 000000000000..2124baa14fb0
--- /dev/null
+++ b/app-emacs/ert-runner/ert-runner-0.8.0-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp edo
+
+DESCRIPTION="Opinionated Emacs Ert testing workflow"
+HOMEPAGE="https://github.com/rejeep/ert-runner.el/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/rejeep/${PN}.el.git"
+else
+	SRC_URI="https://github.com/rejeep/${PN}.el/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}.el-${PV}"
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-emacs/ansi
+	app-emacs/commander
+	app-emacs/dash
+	app-emacs/f
+	app-emacs/dash
+	app-emacs/shut-up
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		app-emacs/ecukes
+	)
+"
+
+ELISP_REMOVE="
+	Makefile
+	features/reporter.feature
+"
+PATCHES=(
+	"${FILESDIR}/${PN}-bin-launcher-fix.patch"
+)
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	elisp_src_prepare
+
+	sed "s|@SITELISP@|${EPREFIX}${SITELISP}/${PN}|" -i "./bin/${PN}" || die
+}
+
+src_compile() {
+	elisp_src_compile
+	elisp-compile ./reporters/*.el
+}
+
+src_test() {
+	# Set up fake Cask for tests.
+	mkdir -p "${T}/bin" || die
+	cat <<-EOF >> "${T}/bin/cask" || die
+	#!/usr/bin/env bash
+	set -e
+	if [[ "\${1}" != exec ]] ; then echo "Not a exec call!" ; exit 1 ; fi
+	shift
+	"\${@}"
+	EOF
+	chmod +x "${T}/bin/cask" || die
+	local -x PATH="${T}/bin:${PATH}" || die
+
+	edo ecukes --debug --reporter spec --script --verbose features
+}
+
+src_install() {
+	elisp_src_install
+	elisp-install "${PN}/reporters" reporters/*.el{,c}
+
+	exeinto /usr/bin
+	doexe "./bin/${PN}"
+}
diff --git a/app-emacs/ert-runner/ert-runner-0.8.0.ebuild b/app-emacs/ert-runner/ert-runner-0.8.0.ebuild
index 9f08f42be2dd..62cfe6ff54ca 100644
--- a/app-emacs/ert-runner/ert-runner-0.8.0.ebuild
+++ b/app-emacs/ert-runner/ert-runner-0.8.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${PN}.el-${PV}
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
 RESTRICT="test"  # Tests fail (even with Cask installed)
 
 RDEPEND="
diff --git a/app-emacs/espuds/Manifest b/app-emacs/espuds/Manifest
index 94a26ff4c276..1d1c7cec7978 100644
--- a/app-emacs/espuds/Manifest
+++ b/app-emacs/espuds/Manifest
@@ -1,3 +1,3 @@
 DIST espuds-0.3.3_p20171111.tar.gz 48779 BLAKE2B de97a922f82a19ee5a6229d4bfbc43baeb8da6a234f7add6f44fe2848657b9587f5471688733a0d9e2d95878408fe462d826a18e6701f15253bcd29cb1687d0d SHA512 34b1f2bfabd24072d30be4df02eceafa833b357c24a2a1c6cc868ce2a72d413d5b2686734f74a27cb2875ad45a7248823efbb2930f1cb89b95ef813100611281
-EBUILD espuds-0.3.3_p20171111.ebuild 608 BLAKE2B 9549a87299aecf9f200ccdccb671d32b196a8eaf34d11f7be32a2a7ef89be275ecd54c2ea4d85c810f5976cfb38bbba553fcc571416ea5edcaa7b1f6d416df0b SHA512 3801f1ef58aed8af260010f93c86a92c82cc800b9c1c5dba469468fbe1b77223afe9bb22217a6e202d9a479b6dd55fb901815f12d7922c9b9b87132b98a16067
+EBUILD espuds-0.3.3_p20171111.ebuild 627 BLAKE2B a93c4280bdbeae8e83135d6b251aedcb34c5e2681bc6b8fdc324bf7a321a12a19bdcc5a168cfb4d562f6eef8329b33dd7853a9069a875d0cebda22d824fa14e6 SHA512 83dce09cfef88f0cb73e5780ff2c3ffefea645a43c17050436d4535097fa79308e4c362635c4c0541b6263adacd1e05685232ea5ac3287187055dedcbfad6206
 MISC metadata.xml 415 BLAKE2B cdd539badf1e585f6806e8924b4d8d8e4b2e0659465dad83700241bb9d56b828e1a85378af05c5ef1fbf09fafeb29931199605022b0055704bf6c2b306635d56 SHA512 d58d33d11aab4428ffeaa9dd145e699a77d7b7c470e391554abe4455d25d01efcf2dbe55575349bf36b51508b5f3f5ef73f4c850bf330b8c1a2c8d636480bb9e
diff --git a/app-emacs/espuds/espuds-0.3.3_p20171111.ebuild b/app-emacs/espuds/espuds-0.3.3_p20171111.ebuild
index 5152069c39dc..c2fe329e176b 100644
--- a/app-emacs/espuds/espuds-0.3.3_p20171111.ebuild
+++ b/app-emacs/espuds/espuds-0.3.3_p20171111.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
 RESTRICT="test"  # Tests fail
 
 RDEPEND="
diff --git a/app-emacs/groovy-emacs-modes/Manifest b/app-emacs/groovy-emacs-modes/Manifest
index 7db710f9ab2e..80d5fa7fad26 100644
--- a/app-emacs/groovy-emacs-modes/Manifest
+++ b/app-emacs/groovy-emacs-modes/Manifest
@@ -1,4 +1,4 @@
 AUX 50groovy-emacs-modes-gentoo.el 82 BLAKE2B 270fd798ffe0890ffa6d132df7ae7bb732f6573b31aa7e13e73cc55455934350078d5f843c50df5d6b9a159fa757da9bcdebc283e1506b76aba8cbde6ef91e23 SHA512 89424e3a520b538bd9aa3d287980185b60111e4c5f1c8d60885173bd989e8d97880de8f6ddbb40529a73e486036786cec3b11b24e35d7b7a62f675532c04ecca
 DIST groovy-emacs-modes-2.1.tar.gz 116174 BLAKE2B be913268b9ae4c1ca74f3391d9dad11b4804a651098a160d8c4e0ac449ea2d0a381e73c3b7412311f73df8569b5e2933b0c3e169bb57483b9bc87089c9623369 SHA512 c7367248640a4891db144afb16bc8a00545eb0155a87404c653ceed5706f684b34d135c2327659032769fa437c7e5dfd5942b287dc16b9636a9c7645762c670a
-EBUILD groovy-emacs-modes-2.1.ebuild 828 BLAKE2B 5059e1dd0d839c1168f20f8f30836e82354659e2b18fcdcf65edf64d8471848861ecd6a5fd22ef2b97fa27294e415ee9e9026462dac8be2fc2f33cb9031ea33f SHA512 f9e2f2c16c870aa8b73a4102afc9c3fadc4485ae803fa94aa7e6139d510ddc5d22ae825ecc0ba5832c47de0bd43481efe66ca230c814e5db77adc1b7386ca0e5
+EBUILD groovy-emacs-modes-2.1.ebuild 845 BLAKE2B 5c95347a1043c9398bbadd154b5752cb4d59ff3251dce3f55fd41a4803e564394b6c71271f03a981d7da2ee0319255832d02dc587a554ece1eaedaffc9533a5e SHA512 ea9f2eac62d17446614950533e242a55984f9bc47440e2b8a01a95c383d8989719aa025de203caa2eff528d2098b7f0417ce3b1f173975ed324c5d4d6b195dc0
 MISC metadata.xml 697 BLAKE2B 83261a9c66b6383c32404929be77643d6b6be611c707039bf0953ede688a7864c7e7ca14fcb0fa68df554abefbb03c08b0d6f228a72eaa72586ead55361a4776 SHA512 322c7258406737175b23871a84ba4aa4231e8c5bc8ab060c3a09bd0c5b232b540b45aa71489ab954612343021c28c64a4f958a04bbc5516e499eb658ddebd758
diff --git a/app-emacs/groovy-emacs-modes/groovy-emacs-modes-2.1.ebuild b/app-emacs/groovy-emacs-modes/groovy-emacs-modes-2.1.ebuild
index 335b5554baa3..3bceb207d749 100644
--- a/app-emacs/groovy-emacs-modes/groovy-emacs-modes-2.1.ebuild
+++ b/app-emacs/groovy-emacs-modes/groovy-emacs-modes-2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,14 +7,20 @@ inherit elisp
 
 DESCRIPTION="Groovy major mode, grails minor mode, and a groovy inferior mode"
 HOMEPAGE="https://github.com/Groovy-Emacs-Modes/groovy-emacs-modes/"
-SRC_URI="https://github.com/Groovy-Emacs-Modes/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/Groovy-Emacs-Modes/${PN}.git"
+else
+	SRC_URI="https://github.com/Groovy-Emacs-Modes/${PN}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="amd64 ~x86"
+fi
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 DOCS=( README.md groovy-mode.png )
 SITEFILE="50${PN}-gentoo.el"
@@ -26,18 +32,15 @@ RDEPEND="
 BDEPEND="
 	${RDEPEND}
 	test? (
-		app-emacs/ert-runner
 		app-emacs/f
 		app-emacs/shut-up
 		app-emacs/undercover
 	)
 "
 
+elisp-enable-tests ert-runner test
+
 src_compile() {
 	elisp_src_compile
 	elisp-make-autoload-file
 }
-
-src_test() {
-	ert-runner -L . -L test --reporter ert+duration --script test || die
-}
diff --git a/app-emacs/ht/Manifest b/app-emacs/ht/Manifest
index 95b27cf9f224..f2604944e590 100644
--- a/app-emacs/ht/Manifest
+++ b/app-emacs/ht/Manifest
@@ -1,4 +1,4 @@
 AUX 50ht-gentoo.el 71 BLAKE2B 070c0631b9c9b1de3ad792c5f0cb909d95830eefe39689bc19e3e6d503c72fc08b3805226bad96ff6387cfb9f5a982b95a4a49f8162011470f25ecb54946f80a SHA512 f63dac5abc2b84ef07b824c1e16fa92eb62851462ba04574a98fd2e0443e93540d146e93d3b3d163f689f85e7a5a1453096fc174d89091d745e88d05a45fd533
 DIST ht-2.3.tar.gz 8890 BLAKE2B 661163b22e4910ebf0116c22e8a3972def74bc88b467cd70118174ce6bf07cd225007bea9859c8379a46389088792fbbb9985ccf8da89c04c1ad556b3b99cccc SHA512 c66ef8c05a6b164728f1d61e7d4298a5f30545fb57a90dd7ff0d382be2ef083da8a60bfbf2da225e670bf25b98d938afa1c8ac7e5cd1dbd8486d7981ab31c7a2
-EBUILD ht-2.3.ebuild 662 BLAKE2B ff689fd86307e2c220e9feee325190b629d5a5790531671f9642960d3f9a1a7e436d8f2cd127b536f87aa3db9d48707fc5566db7a4d1ee3f7f62b178f10706a6 SHA512 09d636b992bb5b5cd9b2d9cea80ac06bf642343c76d81811bf7b637bc759abcc870c33820e55b54454349e707bb19a68e6704d2fdad7df845e9422d0bd9e57f9
+EBUILD ht-2.3.ebuild 687 BLAKE2B da843961006a1407f822d64c5d29b866ca58984ef861a58529ef5cc858581617bf662125b4e20e43c5cb0c1a97ee546814add6dfde96f0f0689feef0d6c94ff3 SHA512 f72a4c8e6aed80b53c1a4c2208eb5eb262c9def9ca3a563092d7ab4b869422cef58a69e7d0f3f27041cb9365d0a42040eb0f280da172094f8d1d66bec9727f52
 MISC metadata.xml 359 BLAKE2B e101122b24e6925b496d7100f28b925546fe70ea57c8c50921921a939f1c3b989ab7c1d8409a321a6a091b4ad4471149905462bd007c369929a76990d34853f7 SHA512 00983cdf9daa759309ae2ca9e5720dfc10e5c479ff3e2e23d127a645b63711a367330786fe7ffec01a87fce7b0fe0be0768926aa43c5a926f73fa15083a0ab41
diff --git a/app-emacs/ht/ht-2.3.ebuild b/app-emacs/ht/ht-2.3.ebuild
index 57af14755328..c5b952f5298a 100644
--- a/app-emacs/ht/ht-2.3.ebuild
+++ b/app-emacs/ht/ht-2.3.ebuild
@@ -7,14 +7,21 @@ inherit elisp
 
 DESCRIPTION="The missing hash table library for Emacs"
 HOMEPAGE="https://github.com/Wilfred/ht.el"
-SRC_URI="https://github.com/Wilfred/ht.el/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/ht.el-${PV}"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/Wilfred/ht.el.git"
+else
+	SRC_URI="https://github.com/Wilfred/ht.el/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}/ht.el-${PV}"
+
+	KEYWORDS="amd64 ~arm64"
+fi
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=app-emacs/dash-2.12.0
@@ -23,13 +30,10 @@ BDEPEND="
 	${RDEPEND}
 	test? (
 		app-emacs/f
-		app-emacs/ert-runner
 	)
 "
 
-DOCS="CHANGELOG.md README.md"
+DOCS=( CHANGELOG.md README.md )
 SITEFILE="50${PN}-gentoo.el"
 
-src_test() {
-	ert-runner --reporter ert+duration --script || die
-}
+elisp-enable-tests ert-runner .
diff --git a/app-emacs/parsebib/Manifest b/app-emacs/parsebib/Manifest
index 3cd6cad5db0f..fb4da08cb526 100644
--- a/app-emacs/parsebib/Manifest
+++ b/app-emacs/parsebib/Manifest
@@ -1,3 +1,3 @@
 DIST parsebib-4.3.tar.gz 25195 BLAKE2B 9b3031f7f6b8d69b026d1301c95fde6279eedb4cb55a975294d9f32a57508ac14c33c5874da14da7e14de5c58fd7915d9a9132859fb46cf4910d37d963876929 SHA512 b036ff496d4d435cdb6fbcd57b1844601417d94faf34294b593ec7947e40a8f4807de12e17c659e8cc6b0a5a17f62d45c51671b5568cf27f1af9890298324215
-EBUILD parsebib-4.3.ebuild 586 BLAKE2B b8917e2ed193b97dc409e980dfd01e9aba0aad3790fdd4ecf52f42573e279fe2100a1128cf8644596fce41b293af65983970d797602f455e92ec4c1db75d6f9e SHA512 338ea8922ee2f4ebcc17429a543bd3158ad1d320a1939fb45ff3f021f6a1654f160922f385b9b742b1625ef1ac90af01d82a1bab23b586156947a0eac56d9968
+EBUILD parsebib-4.3.ebuild 576 BLAKE2B 313b811b8482882ab88e4d3cb46f1aa97b24195f6ad0850acb39d1811eb50e8ff426ffe9785cf6c92cd6165fcd3b529a9b86a324867f57779a02cb09088282a2 SHA512 bd00d628a088fbb3a0d9685a4257e838bfba9a487f7aa41d559dbd9ef5a62449f6907bc424f3d09499ac91e62ae0e774e63c595380e30141a347ea56b630ae55
 MISC metadata.xml 627 BLAKE2B c720728d95d1210afc6015d7472134e9078fbc67f591e4991dd34a780c49c8b30c1dec30c6ce57d81034f71895aafb8637c8181d7cdc9e13819ecceea919cc98 SHA512 a991dcfa3ddc97afc341228c4483c888de999eb79f67cb174e12a8d9725da58468c6e1330d8f5e2ef7e947e108e6eba1edba4fceca7955793b6d8a0c223d1f4a
diff --git a/app-emacs/parsebib/parsebib-4.3.ebuild b/app-emacs/parsebib/parsebib-4.3.ebuild
index 86b48a11e4ab..eccdb4d8583f 100644
--- a/app-emacs/parsebib/parsebib-4.3.ebuild
+++ b/app-emacs/parsebib/parsebib-4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,20 +7,22 @@ inherit elisp
 
 DESCRIPTION="Emacs Lisp library for reading .bib files"
 HOMEPAGE="https://github.com/joostkremers/parsebib/"
-SRC_URI="https://github.com/joostkremers/${PN}/archive/${PV}.tar.gz
-			-> ${P}.tar.gz"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/joostkremers/${PN}.git"
+else
+	SRC_URI="https://github.com/joostkremers/${PN}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="amd64 ~x86"
+fi
 
 LICENSE="BSD"
-KEYWORDS="amd64 ~x86"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( app-emacs/ert-runner )"
 
 DOCS=( README.md )
 SITEFILE="50${PN}-gentoo.el"
 
-src_test() {
-	ert-runner -L . -L test --reporter ert+duration --script test || die
-}
+elisp-enable-tests ert-runner test
diff --git a/app-emacs/parseclj/Manifest b/app-emacs/parseclj/Manifest
index 57b63501a764..8192aa56701f 100644
--- a/app-emacs/parseclj/Manifest
+++ b/app-emacs/parseclj/Manifest
@@ -1,3 +1,3 @@
 DIST parseclj-1.1.1.tar.gz 39388 BLAKE2B cd0303a9bbec275123389308332bb2f5edaae359d67f50c87a90b20ffe544a32e43b6b3160f16535aff820c6029554ab94029047bc4fd21e1dccf20830b09621 SHA512 b28c91a1d9d649cda041a89d1d6ccddc7aa0d6018e7ed45928a7ecebd59a3c1de8559347e695a64d2385477991280db9451a915868d54e272125ecaab951d6d4
-EBUILD parseclj-1.1.1.ebuild 601 BLAKE2B 2effc59202655dafe5eb4f5536b48c7ca739ed86824f4f6a30209e1f13c020c65a91920e6f47041d43749f379f6d89d017d58ebd50658bf6ed5650dbfd0779a3 SHA512 75596d148d036de994a07c4c483d8fac3e6856352d7f6bea8d8138596751eec3db6857bdf04da9c9ac010e50f16b90f0c1bfd0e3c0c7ea62bc79ff12fc43408d
+EBUILD parseclj-1.1.1.ebuild 594 BLAKE2B 1b19ba2e28c72aa3f41f99c949e5b41320c68d3612da05ebe43867abf786695b9f75eb7ae7890aeb5f3346e347a1c10ba47dd3356a86f012e6dbdd3a37e1b2a2 SHA512 3d857e8a4a93a666cd34b0cc902902041740456e51413293561ddea2658b867b15183d841a204df01ed11c434584ad6bf3b2eb74d3707bbf75711e661b40e496
 MISC metadata.xml 659 BLAKE2B 0228d25161ab040e3d14af307f53239c39da58b5980d1a5bbe4628df1d9559e027a91ed345c696dbc910f75249dabe57a1f518ed74c06d48058a670b0249a35c SHA512 fde89c6cf6f7b41304a1824ec54cfd3293bc197cb7321b89ad9f8009b26f2376f6f62d920fc43d9e0b81851387c38d58e0cef86f3c39984572f642607f5f876e
diff --git a/app-emacs/parseclj/parseclj-1.1.1.ebuild b/app-emacs/parseclj/parseclj-1.1.1.ebuild
index 093bb113f3b6..e17fcc8ef904 100644
--- a/app-emacs/parseclj/parseclj-1.1.1.ebuild
+++ b/app-emacs/parseclj/parseclj-1.1.1.ebuild
@@ -7,20 +7,22 @@ inherit elisp
 
 DESCRIPTION="Clojure Parser for Emacs Lisp"
 HOMEPAGE="https://github.com/clojure-emacs/parseclj/"
-SRC_URI="https://github.com/clojure-emacs/${PN}/archive/v${PV}.tar.gz
-	-> ${P}.tar.gz"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/clojure-emacs/${PN}.git"
+else
+	SRC_URI="https://github.com/clojure-emacs/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="amd64 ~x86"
+fi
 
 LICENSE="GPL-3+"
-KEYWORDS="amd64 ~x86"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( app-emacs/ert-runner )"
 
 DOCS=( CHANGELOG.md DESIGN.md README.md )
 SITEFILE="50${PN}-gentoo.el"
 
-src_test() {
-	ert-runner -L . -L test --reporter ert+duration --script test || die
-}
+elisp-enable-tests ert-runner test
diff --git a/app-emacs/parseedn/Manifest b/app-emacs/parseedn/Manifest
index 859da83a4bd7..63d5a6d80c85 100644
--- a/app-emacs/parseedn/Manifest
+++ b/app-emacs/parseedn/Manifest
@@ -1,3 +1,3 @@
 DIST parseedn-1.2.1.tar.gz 12172 BLAKE2B 54e6f74811190b7773dbeae8d2555f292de293c8158031fc767c58e6515cb759eda1e7ae4d6b53ac42fde79943da7084b48c688e83fbe46d7c5cdb582ecadf7f SHA512 d5251c5af0aa66c43037499d52e227d8ee558482756900af0a3932c599c88a0c69db2077d33b58bdb151d4bb2eba5312ca867483072c32d8ac246d0e28cdadca
-EBUILD parseedn-1.2.1.ebuild 701 BLAKE2B 321218da978b248eb8998f0a9528b62bb6b7b915e6c921dccfa05820555e98fac93e11f235c9c4409f7450f1448313be7b17748cab2b47b29cd161f8065af7b0 SHA512 6b2e474d4aa18958889f35d934c4b621b86f27c2eeb700bf6f78ca1f36aa05bfd92f427319cb1d913cd633d1cd5a08d38ce2ef0aa59156935847771c5c320937
+EBUILD parseedn-1.2.1.ebuild 712 BLAKE2B f282143c1b8ec90d6a687245c6efd1bd5bbdb69c5e986c3584ecf3f56a18fb32dc2a4753a6c1e34f5836bea4e1d3044bcebf456a0a6a0f0b6a37ff286c64aee1 SHA512 7e6f683272ca35aebb02fa91cc1f9d21ecdee5e02d9ef4fd7dc2d9cbd806f24090f17d2a48d5206db5ac450c7b548289759174d54c61c046e1c86c0006cc3c4e
 MISC metadata.xml 935 BLAKE2B 59252290a86d7d03fc9dc71632cad89371d16421cbb3a5347410a25eb65f5f0ced1cb65334769e3e5a6043e6db4456104fccebe4d9aec5f9dd1534b9315d7403 SHA512 86f674633ee4319162836f77aafa94f4fbb50d992716bd66a678ef5db9d4311a7911522fbc6e2ac8351f7c075ba7f49b08e90d4e1a862a091a7790de2b627918
diff --git a/app-emacs/parseedn/parseedn-1.2.1.ebuild b/app-emacs/parseedn/parseedn-1.2.1.ebuild
index 4d4b7b12cefa..1e7379362bd7 100644
--- a/app-emacs/parseedn/parseedn-1.2.1.ebuild
+++ b/app-emacs/parseedn/parseedn-1.2.1.ebuild
@@ -3,31 +3,40 @@
 
 EAPI=8
 
-NEED_EMACS=26
+NEED_EMACS="26"
 
 inherit elisp
 
 DESCRIPTION="EDN parser for Emacs Lisp"
 HOMEPAGE="https://github.com/clojure-emacs/parseedn/"
-SRC_URI="https://github.com/clojure-emacs/${PN}/archive/v${PV}.tar.gz
-	-> ${P}.tar.gz"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/clojure-emacs/${PN}.git"
+else
+	SRC_URI="https://github.com/clojure-emacs/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="amd64 ~x86"
+fi
 
 LICENSE="GPL-3+"
-KEYWORDS="amd64 ~x86"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-RDEPEND="app-emacs/parseclj"
+RDEPEND="
+	app-emacs/parseclj
+"
 BDEPEND="
 	${RDEPEND}
-	test? ( app-emacs/ert-runner )
 "
 
-ELISP_REMOVE="test/${PN}-test.el"  # Remove bad tests.
+# Remove bad tests.
+ELISP_REMOVE="
+	test/${PN}-test.el
+"
+
 DOCS=( CHANGELOG.md README.md )
 SITEFILE="50${PN}-gentoo.el"
 
-src_test() {
-	ert-runner -L . -L test --reporter ert+duration --script test || die
-}
+elisp-enable-tests ert-runner test
diff --git a/app-emacs/raku-mode/Manifest b/app-emacs/raku-mode/Manifest
index 4a41cffd87f2..6e151025acd1 100644
--- a/app-emacs/raku-mode/Manifest
+++ b/app-emacs/raku-mode/Manifest
@@ -1,4 +1,4 @@
 AUX 50raku-mode-gentoo.el 378 BLAKE2B 2fad21cf6b472bb3dcf41e1441e8ebc60aa846a43969431900077d146eeb82a713b1f3417febaa65093a65519dec9ff97f5584414e553524b86f55c0e90cd61c SHA512 776eec7d6e6994a485b0a696a649fa3c1afa6934f20f5e8b378124d18b9a1f0c64658c45a305cf2094d25edfef96e72b923823ffa4e67534580b07ba0d5314ab
 DIST raku-mode-0.2.1_p20211121.tar.gz 31506 BLAKE2B 7faa69740ea882482bf8462b4fa1da497bcce1ab46f19b7c54520d53c5e7e8f29f55204fc6f41b6ba4059503efe3057b3b901ec41d4d635975f81e6d90e2ba9a SHA512 ee2bce5ce585d2cdb7c3ca8f387dfa5acc774a5923d53567d655f9a15cefe322f486ba32e9ae4ff9105116a15cc948bc0eb9e7a30fd1b2e57ab90cd741386526
-EBUILD raku-mode-0.2.1_p20211121.ebuild 683 BLAKE2B 2f0f9a579b77b12baf9622531c255fdfd9b0cdb7180774b2ae2f68cc5c16e1a886afcbff49f01fd15b3abbd6f6de9b34ab1bc78687094ac13d672443d0d0f5da SHA512 135816942f55371cc0f520be61d9636239ddd01871f6bd8cfdb462a42357e24ae65fae75e7de7d4a8c3509fc9b37abe1a1a385144af10fbcde780228e2a538e7
+EBUILD raku-mode-0.2.1_p20211121.ebuild 671 BLAKE2B 157aec4adca5a15612ae3d17218e90d0317bec72ba1737301834ff9a531960bd7a2e96aff050acd216854f6aad4b577d18348a53bd26615260fb8654832133fb SHA512 4e022bfddeb70ea650472161d74eb6b2bc8e0fe39c38f8f70cce3b2c954a1b2a203fc6117bdf89018465c2a69c2326071cfc1b29e2be9ae42bd23838b80845e6
 MISC metadata.xml 417 BLAKE2B d1a7d48fed4e51b12f25074826e192319b399ff5c8341fa202d3948d4260857fbff13d1eb6056a22bf8b8ec840573c8a753c9b10194ef588b804d5febcaeead7 SHA512 8096fecd39a7dfba608c0fe59cfe8b2d431db2c4f212c20691e69aa44acb9b67f8c08bf5ffe236a9392d92cb61cc529766824dcabf6faa238219efd978564f86
diff --git a/app-emacs/raku-mode/raku-mode-0.2.1_p20211121.ebuild b/app-emacs/raku-mode/raku-mode-0.2.1_p20211121.ebuild
index b551d291f2d8..015b978de23b 100644
--- a/app-emacs/raku-mode/raku-mode-0.2.1_p20211121.ebuild
+++ b/app-emacs/raku-mode/raku-mode-0.2.1_p20211121.ebuild
@@ -1,28 +1,31 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-COMMIT=977b14a7c1295ebf2aad2f807d3f8e7c27aeb47f
+COMMIT="977b14a7c1295ebf2aad2f807d3f8e7c27aeb47f"
 
 inherit elisp
 
 DESCRIPTION="Major mode for editing Raku code"
 HOMEPAGE="https://github.com/Raku/raku-mode/"
-SRC_URI="https://github.com/Raku/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${COMMIT}
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/Raku/${PN}.git"
+else
+	SRC_URI="https://github.com/Raku/${PN}/archive/${COMMIT}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="GPL-3+"
-KEYWORDS="~amd64 ~x86"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( app-emacs/ert-runner )"
 
 DOCS=( CHANGELOG.md README.md README.tmp-imenu-notes )
 SITEFILE="50${PN}-gentoo.el"
 
-src_test() {
-	ert-runner -L . -L test --reporter ert+duration --script test || die
-}
+elisp-enable-tests ert-runner test
diff --git a/app-emacs/rescript-mode/Manifest b/app-emacs/rescript-mode/Manifest
index 30a4756a0b48..2fd2901ab182 100644
--- a/app-emacs/rescript-mode/Manifest
+++ b/app-emacs/rescript-mode/Manifest
@@ -1,4 +1,4 @@
 AUX 50rescript-mode-gentoo.el 180 BLAKE2B 3cdd9e7ec989ac7f72143b1684d7ecf24979e5c019652301a421de15b942687bfa8272b0e7d40cfaf508a05ae5e50b879ecd42f7c4c24bac126d949300e3c680 SHA512 b1c76e15113852b8276a02b844074c2120e2e43200ff9dc238ac05d659bca860b55cf1081c2ecdea02a8abaa00630bd76d9830b680094d4d09fd98f5535c5b2d
 DIST rescript-mode-0.1.0_p20220613.tar.gz 111284 BLAKE2B 9c10024ebb5a46be418576d37eb39401ea99be42993add431a4628e64c27d34f1a801a79a3fb64635cdcdb9b2d20346d5ffa71968cadb6ee239099e5bcc39dd0 SHA512 93da6da0abf9bb537c6bc441e350a2b5047726b460083aaccdb1cfb0efd8a845f46d30e7ad85901ffded9d9e5f15846ba181009012ab3dc9c1a7e8982f50e385
-EBUILD rescript-mode-0.1.0_p20220613.ebuild 689 BLAKE2B 37e5dba678267b8c5e654e3042a8b41d8b016667b984f189f7eeeee3241658190ce729fc7c466017bc90630953a3d4850ef45730afbac05d553cdc8f464e53ea SHA512 671cbe693408e79f98a942f83d3acffe6c5c6621d67817cc7b2b280271aec8dd12b15c1b13a217034ddc0abb76381287d79c621c6438ebdf7367c512b78658a5
+EBUILD rescript-mode-0.1.0_p20220613.ebuild 681 BLAKE2B be252b6ee5a74f01eab7f5fb98d0d0ccef371f23890f2671c4d20973ed5bfa5e313a8686f1759a0759467e1fd2850ecff780182dab714297ac44d35395178d0c SHA512 06de6e2aaf3622ead62cdb38992bf8252ec221d984c2efaf06a5c58cf018a301d3d487403fddb98a3dd3cc9c5e510603ce83dbc5846947b1ca32d6cff6e5b018
 MISC metadata.xml 427 BLAKE2B 6837ca4543aa7e9c2079937f12b21cb41ffc669e04fb65037915183d6b99ff2cc5b313f25970a28ed05b73ac23f002b6cc7b50a0168402df910616ce79dd8b52 SHA512 7a0b423edc1217c06af16c03d10e974b89b52c2a927e0dc2454bffaa0c76bf226c9016e7ee3d44d1fabaa6d23d52b6214fb9428f3a39f91fa35d2f0107a048b3
diff --git a/app-emacs/rescript-mode/rescript-mode-0.1.0_p20220613.ebuild b/app-emacs/rescript-mode/rescript-mode-0.1.0_p20220613.ebuild
index 4dd5a9ee9e0c..a14ace999780 100644
--- a/app-emacs/rescript-mode/rescript-mode-0.1.0_p20220613.ebuild
+++ b/app-emacs/rescript-mode/rescript-mode-0.1.0_p20220613.ebuild
@@ -1,29 +1,33 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-COMMIT=2aae2fbd4971dff965c758ec19688780ed7bff21
-NEED_EMACS=26.1
+COMMIT="2aae2fbd4971dff965c758ec19688780ed7bff21"
+
+NEED_EMACS="26.1"
 
 inherit elisp
 
 DESCRIPTION="Emacs major mode for ReScript"
 HOMEPAGE="https://github.com/jjlee/rescript-mode/"
-SRC_URI="https://github.com/jjlee/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${COMMIT}
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/jjlee/${PN}.git"
+else
+	SRC_URI="https://github.com/jjlee/${PN}/archive/${COMMIT}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( app-emacs/ert-runner )"
 
 DOCS=( README.md error.png typeinfo.png )
 SITEFILE="50${PN}-gentoo.el"
 
-src_test() {
-	ert-runner -L . -L test --reporter ert+duration --script test || die
-}
+elisp-enable-tests ert-runner test
diff --git a/app-emacs/rg/Manifest b/app-emacs/rg/Manifest
index e28d2c4b7d87..260f405c123e 100644
--- a/app-emacs/rg/Manifest
+++ b/app-emacs/rg/Manifest
@@ -1,4 +1,4 @@
 AUX 50rg-gentoo.el 66 BLAKE2B 51ca91eda1462dcbcd9ae5bd917ab44b5e1259afd72bfb5cb8eb884dacca545677d00e0feac5e7d90f8b49c5f308afc354f5df08d2cca275e78e008fa15b94a7 SHA512 84a87f247455cfeadd80335fa686c1bfee28b3a006249fc5894880c2e2848bbe4795c71dd212bfc2aae5e599755ae335653e5a78457d1e04324b8b5ca82ed2b3
 DIST rg-2.3.0.tar.gz 204996 BLAKE2B cc233f90a4bd56928053ebace2aa166c0210ddc9720b37b4e67e10e1082ed0ff744bef6d502666a8094d9c57c0afa2b9a32967b290443cc467f2865ea7b95330 SHA512 343626c35bdb26f2a300bac258af112230cf502900852456362f1adaa6bf6551d42d07ced59b8f864cab0663b559262f2e6f982f5b95cfffe1d04218fe6ebbbe
-EBUILD rg-2.3.0.ebuild 971 BLAKE2B 4a924baff9785630c479bd2f1cb84fa1ffe2b02c941944add93bce38d214d6d16429ce8f851c0a25a47f2d74c74bf27d63af15e70c0ad9bff5227547e2f9369c SHA512 c8cb15cd891712242ecf7330c9c0db32df100f982284bc096964e655d65c8c51a9afde74bd8b5d908caee333e37fe670c3ab24313a168e83094797aad11f41bc
+EBUILD rg-2.3.0.ebuild 981 BLAKE2B 7fcae157365f4b77e0d0acb4e86fd52682cc3a76391bf461f51476f507a7c2dfe4d23c0657897dd549c73341dfee09d1ab9eb14a3845fad9262a15a49b0de4b6 SHA512 05af41af34dcd14b4bff114202dabe4fa3f7fce630536b2ad4d4d7744e369e3af88a36cee14e1eb36cca444175bb8c642ebcb286b7836914a96873fbb46ebcc3
 MISC metadata.xml 1083 BLAKE2B aa777fe0b99335ca705401879d333e921bb480798c85a2213822461e4b60a5b8d660592d8dab7f1d81dff98dc2808aeff11992890842fc7657deee2516006288 SHA512 aca5ee92739a5e12ef60f539b74f2bb9449ec472d2ee2169528cb76cc716e0829427c9e3ddbb8ce7857266fc31a5143538a369afb59f5f00f26dd31e8af67d5c
diff --git a/app-emacs/rg/rg-2.3.0.ebuild b/app-emacs/rg/rg-2.3.0.ebuild
index e3cadd443056..9d3045be9e02 100644
--- a/app-emacs/rg/rg-2.3.0.ebuild
+++ b/app-emacs/rg/rg-2.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,15 +8,21 @@ inherit elisp
 DESCRIPTION="GNU Emacs search tool based on ripgrep"
 HOMEPAGE="https://rgel.readthedocs.io/
 	https://github.com/dajva/rg.el/"
-SRC_URI="https://github.com/dajva/rg.el/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-S="${WORKDIR}"/rg.el-${PV}
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/dajva/rg.el.git"
+else
+	SRC_URI="https://github.com/dajva/rg.el/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}/rg.el-${PV}"
+
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
 	app-emacs/transient
@@ -29,25 +35,26 @@ RDEPEND="
 BDEPEND="
 	${COMMON_DEPEND}
 	test? (
-		app-emacs/ert-runner
 		app-emacs/s
 		app-emacs/undercover
 	)
 "
 
+ELISP_REMOVE="
+	test/rg.el-test.el
+	test/rg-isearch.el-test.el
+"
+
 DOCS=( README.md )
-ELISP_REMOVE="test/rg.el-test.el test/rg-isearch.el-test.el"
 SITEFILE="50${PN}-gentoo.el"
 
+elisp-enable-tests ert-runner test
+
 src_compile() {
 	elisp_src_compile
 	elisp-make-autoload-file
 }
 
-src_test() {
-	ert-runner -L . -L test --reporter ert+duration --script test || die
-}
-
 src_install() {
 	elisp_src_install
 	doinfo rgel.info
diff --git a/app-emacs/shut-up/Manifest b/app-emacs/shut-up/Manifest
index 25ac78211979..f045512563df 100644
--- a/app-emacs/shut-up/Manifest
+++ b/app-emacs/shut-up/Manifest
@@ -1,3 +1,3 @@
 DIST shut-up-0.3.3.tar.gz 4479 BLAKE2B 0cb9ee028386ceb9b80385a6893c203481a79619f8780c641ca76a8878bece3944973ba78a41e1a554d4c9402ec2227d1234a9b6862b01d489dba30db021b731 SHA512 b14110022bd1512985fe40194c419f06cc8f5f6c819f02e681a89c2f80a32140e20eea6e3bb659b1abee85021b01bdc0b48d3ff12d6fac6072635fbdcb808484
-EBUILD shut-up-0.3.3.ebuild 659 BLAKE2B c65816d77f811a0d4a52909cacb77dc9f34a9cb75d64e359fddcc886eca1a88f9ba4bee8542ba77a906f8d7860a4ad4d774af8fd67ae6e3af04aef0bbd618552 SHA512 a9fe53a102b2be3686e2f430f801097248a699ac45eb0f267fe9b64c3d285d305e95ed3dd448bc9d092653b4bd592f3204d9bb32774c453a8fbd753ce5ca0722
+EBUILD shut-up-0.3.3.ebuild 669 BLAKE2B 1a8ea3e900cea1274647dae639497f7249e671279f34607f418ca4c7c40fe4025c7d214803704fa12a1a25a453305c761c299c61d2f4e124382dccc13a4f5169 SHA512 8bea22aa7ea17de59be7ea75e3043c3ef8d12f07828abd2c14262efa9b62d5582540c94574a113d4c1db200cb0d83a21a28b88c37abacc4c93f2585f5a8cd5bc
 MISC metadata.xml 439 BLAKE2B cf642ba20d9912c54f6c2d833ecff76f23dc696f03ebe03732fd69d1b4d4ab15a97732e697541e61d7876e5fc2931d49709e09595f20aeca0ff1c90d20b04ec0 SHA512 32c43ece3267e8ad12922493fa81e08414144a6910ea9f95ae5ac2fd35b494204105854664c3dd8b03ee27b7b5de4a3b99b3fd34158519638a8c36ef16630a69
diff --git a/app-emacs/shut-up/shut-up-0.3.3.ebuild b/app-emacs/shut-up/shut-up-0.3.3.ebuild
index 2ec39fef42d5..6765c6368ed6 100644
--- a/app-emacs/shut-up/shut-up-0.3.3.ebuild
+++ b/app-emacs/shut-up/shut-up-0.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,11 +7,20 @@ inherit elisp
 
 DESCRIPTION="Reduce Emacs output of messages"
 HOMEPAGE="https://github.com/cask/shut-up/"
-SRC_URI="https://github.com/cask/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/cask/${PN}.git"
+else
+	SRC_URI="https://github.com/cask/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~alpha amd64 ~arm arm64 ~ppc64 ~riscv ~sparc ~x86"
+fi
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ppc64 ~riscv ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -25,7 +34,4 @@ BDEPEND="
 DOCS=( README.md )
 SITEFILE="50${PN}-gentoo.el"
 
-src_test() {
-	${EMACS} ${EMACSFLAGS} -L . -L test -l test/${PN}-test.el \
-			 -f ert-run-tests-batch-and-exit || die "tests failed"
-}
+elisp-enable-tests ert test
diff --git a/app-emacs/undercover/Manifest b/app-emacs/undercover/Manifest
index 8965e5909d9f..9e890cb3f352 100644
--- a/app-emacs/undercover/Manifest
+++ b/app-emacs/undercover/Manifest
@@ -1,3 +1,3 @@
 DIST undercover-0.8.1.tar.gz 20800 BLAKE2B a151366c0897baf22e2ad9e602935409643f9256f42fdc8733e3d98bfcf9373d12b6225851ab6d18cb195abff860842a6a5444886aeffce59ee45c5f1e902feb SHA512 33508f3c6cbacd30ee3ad8312e51b596a7547713837595ec2836f627bcccc90107e5198f541d8bc74ad20fb9c8ea6e0616fd0de8eb46f743d2606397000f0e74
-EBUILD undercover-0.8.1.ebuild 570 BLAKE2B 573e81f0c0937019381ed0db90fc09da04c5c37b28df13329da18e3f0238ce13714450edc35dd99c66ef1527e8d3945427955cac21c506bbc83e50ecf9f96a27 SHA512 e83bf1965bae37b57c1d4d9416c12a6ce4b2ae3e682b4383b0aa9a02cc37eb3a11b3bcd8e1ae77fbe8b4f3b88b57ab0ab68fc0b8bdfbc1ce26f90e65a4721f7d
+EBUILD undercover-0.8.1.ebuild 582 BLAKE2B 68d5b84af484889bebbd49e3544b6171bc66c6502402873b3ec22a37e12e13a24bf3bbc8b8a3550e177fc7bfc4a4317484b11bc4c85185ba5bf066a4d5bcb952 SHA512 b0528706275f44b3ec5e8e1c5524d96d89163d057248fe8509f0e837bb2bb6137803d60cbc546b5083262e067416961cba070e190827edd2ca0ac27ab5f48b45
 MISC metadata.xml 469 BLAKE2B 264c26348254207af9c3a7bcd924c21752115a4612b4250a625a2df2cab43921ba4dd5c3530d1f77166ae74e71f5b1e2649eccf2772bb81bf094f280f7ac34a5 SHA512 2eab50fdd3a701ae04e2e2287dbc76495a0698f25a7dd5c00d2dce1f6e19fdc3cf7a97eb2ace10843e0f5164f176ac0234e5a333c9fba8da6c63b1efe826b1b1
diff --git a/app-emacs/undercover/undercover-0.8.1.ebuild b/app-emacs/undercover/undercover-0.8.1.ebuild
index 85cf32d46631..cbf3d20fdd4d 100644
--- a/app-emacs/undercover/undercover-0.8.1.ebuild
+++ b/app-emacs/undercover/undercover-0.8.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${PN}.el-${PV}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
 RESTRICT="test"  # Tests fail
 
 RDEPEND="