diff --git a/app-emacs/closql/Manifest b/app-emacs/closql/Manifest
new file mode 100644
index 0000000000000..a404cd1b7c18a
--- /dev/null
+++ b/app-emacs/closql/Manifest
@@ -0,0 +1 @@
+DIST closql-2.0.0.tar.gz 21841 BLAKE2B 605dc82c16be351385275ec086caf95a6096409c21e4a57a6f8694c6143c367b6a9bf56158b358fa1de72cb10f0ff86079d7abfe8689701ed423717656af7980 SHA512 2112f6d14d043a0bea7bc6e88ef30351f890b51ba84234f1c089266c77d919959fe7e3d6c515944553a4e28876700db2eed228441a873aa28523fc2df27cf440
diff --git a/app-emacs/closql/closql-2.0.0.ebuild b/app-emacs/closql/closql-2.0.0.ebuild
new file mode 100644
index 0000000000000..b4284d3d69070
--- /dev/null
+++ b/app-emacs/closql/closql-2.0.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=27.1
+
+inherit elisp
+
+DESCRIPTION="Store EIEIO objects using EmacSQL"
+HOMEPAGE="https://github.com/magit/closql"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/magit/${PN}.git"
+else
+	SRC_URI="https://github.com/magit/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="
+	>=app-emacs/compat-30.0.0.0
+	>=app-emacs/emacsql-4.0.0
+"
+BDEPEND="${RDEPEND}"
+
+DOCS=( README.org )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/closql/closql-9999.ebuild b/app-emacs/closql/closql-9999.ebuild
new file mode 100644
index 0000000000000..b4284d3d69070
--- /dev/null
+++ b/app-emacs/closql/closql-9999.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=27.1
+
+inherit elisp
+
+DESCRIPTION="Store EIEIO objects using EmacSQL"
+HOMEPAGE="https://github.com/magit/closql"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/magit/${PN}.git"
+else
+	SRC_URI="https://github.com/magit/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="
+	>=app-emacs/compat-30.0.0.0
+	>=app-emacs/emacsql-4.0.0
+"
+BDEPEND="${RDEPEND}"
+
+DOCS=( README.org )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/closql/files/50closql-gentoo.el b/app-emacs/closql/files/50closql-gentoo.el
new file mode 100644
index 0000000000000..431f7e90ae738
--- /dev/null
+++ b/app-emacs/closql/files/50closql-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/closql/metadata.xml b/app-emacs/closql/metadata.xml
new file mode 100644
index 0000000000000..62a4a4f104466
--- /dev/null
+++ b/app-emacs/closql/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>arsen@gentoo.org</email>
+    <description>Arsen Arsenović</description>
+  </maintainer>
+  <maintainer type="person">
+    <email>sam@gentoo.org</email>
+    <description>Sam James</description>
+  </maintainer>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">magit/closql</remote-id>
+  </upstream>
+</pkgmetadata>