diff --git a/app-emacs/ebib/ebib-2.40.3.ebuild b/app-emacs/ebib/ebib-2.40.3-r1.ebuild
similarity index 57%
rename from app-emacs/ebib/ebib-2.40.3.ebuild
rename to app-emacs/ebib/ebib-2.40.3-r1.ebuild
index 823cfbb7b24f9..0f5056f76eafb 100644
--- a/app-emacs/ebib/ebib-2.40.3.ebuild
+++ b/app-emacs/ebib/ebib-2.40.3-r1.ebuild
@@ -10,20 +10,28 @@ inherit elisp
 DESCRIPTION="BibTeX database manager for Emacs"
 HOMEPAGE="https://joostkremers.github.io/ebib/
 	https://github.com/joostkremers/ebib/"
-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 )"
 
-RDEPEND="app-emacs/parsebib"
+RDEPEND="
+	>=app-emacs/compat-29.1.4.4
+	app-emacs/parsebib
+"
 BDEPEND="
 	${RDEPEND}
 	test? (
-		app-emacs/ert-runner
 		app-emacs/with-simulated-input
 	)
 "
@@ -31,11 +39,10 @@ BDEPEND="
 DOCS=( README.md docs )
 SITEFILE="50${PN}-gentoo.el"
 
-src_test() {
-	ert-runner -L . -L test --reporter ert+duration --script test || die
-}
+elisp-enable-tests ert-runner test
 
 src_install() {
 	elisp_src_install
-	doinfo ${PN}.info
+
+	doinfo "${PN}.info"
 }