diff --git a/app-emacs/servant/Manifest b/app-emacs/servant/Manifest
new file mode 100644
index 0000000000000..2f1ee608320d2
--- /dev/null
+++ b/app-emacs/servant/Manifest
@@ -0,0 +1 @@
+DIST servant-0.3.0.tar.gz 5440 BLAKE2B 8ff804f01dc60daa5134c3a7bd872ba36508fc6bc94641acb5b10662cccdd808453d4a26ca23198291919ac7fafbfb5dcb727b9091a15ce7c98f7b54bd03caee SHA512 7c7dd448bc1164bb76f7b17c109ee7e1e489b7ef80d7b0cc04257fdcc99158500f9bfb3a733d1b6d879b69dc3a752165ea743044996993ed76fb02d71a6db44a
diff --git a/app-emacs/servant/files/50servant-gentoo.el b/app-emacs/servant/files/50servant-gentoo.el
new file mode 100644
index 0000000000000..431f7e90ae738
--- /dev/null
+++ b/app-emacs/servant/files/50servant-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/servant/files/servant-bin-launcher-fix.patch b/app-emacs/servant/files/servant-bin-launcher-fix.patch
new file mode 100644
index 0000000000000..33f33ef928e87
--- /dev/null
+++ b/app-emacs/servant/files/servant-bin-launcher-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/bin/servant b/bin/servant
+index dc8fabe..0cfc72c 100755
+--- a/bin/servant
++++ b/bin/servant
+@@ -6,6 +6,6 @@ else
+   SERVANT_EMACS="${EMACS:-emacs}"
+ fi
+ 
+-SERVANT_HOME="$(dirname $(dirname $0))"
++SERVANT_HOME="@SITELISP@"
+ 
+-${SERVANT_EMACS} -Q --script "${SERVANT_HOME}/servant-cli.el" -- "$@"
++${SERVANT_EMACS} -q --script "${SERVANT_HOME}/servant-cli.el" -- "$@"
diff --git a/app-emacs/servant/metadata.xml b/app-emacs/servant/metadata.xml
new file mode 100644
index 0000000000000..27e367f4079f7
--- /dev/null
+++ b/app-emacs/servant/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/cask/servant/issues/</bugs-to>
+    <remote-id type="github">cask/servant</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/servant/servant-0.3.0.ebuild b/app-emacs/servant/servant-0.3.0.ebuild
new file mode 100644
index 0000000000000..1da96f816007f
--- /dev/null
+++ b/app-emacs/servant/servant-0.3.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="ELPA server written in Emacs Lisp"
+HOMEPAGE="https://github.com/cask/servant/"
+SRC_URI="https://github.com/cask/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="test"  # Tests fail
+
+RDEPEND="
+	app-emacs/ansi
+	app-emacs/commander
+	app-emacs/dash
+	app-emacs/epl
+	app-emacs/f
+	app-emacs/s
+	app-emacs/shut-up
+	app-emacs/web-server
+"
+BDEPEND="${RDEPEND}"
+
+DOCS=( README.md )
+PATCHES=( "${FILESDIR}"/${PN}-bin-launcher-fix.patch )
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	elisp_src_prepare
+
+	sed "s|@SITELISP@|${EPREFIX}${SITELISP}/${PN}|" -i bin/${PN} || die
+}
+
+src_install() {
+	elisp_src_install
+
+	dobin bin/${PN}
+}