gentoo resync : 12.05.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-05-12 16:42:50 +0300
committer: V3n3RiX <venerix@koprulu.sector> 2022-05-12 16:42:50 +0300
commit: 752d6256e5204b958b0ef7905675a940b5e9172f (patch)
tree: 330d16e6362a49cbed8875a777fe641a43376cd3 /app-emacs
parent: 0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff)
323 files changed, 3801 insertions, 202 deletions
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 3f26b2e5ee45..a0efaf6b6400 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/ace-window/Manifest b/app-emacs/ace-window/Manifest
new file mode 100644
index 000000000000..59ce7aff68c1
--- /dev/null
+++ b/app-emacs/ace-window/Manifest
@@ -0,0 +1,4 @@
+AUX 50ace-window-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST ace-window-0.10.0.tar.gz 12929 BLAKE2B 7cf6274004d47894471b850054f625af251b7eb3d09a9e7163580e5823b18f62f76ac46722f8885badb56435d04de652cdd81f5c3ef2aa008e601a717f195340 SHA512 15153b3b3e70337804a5fa0f51eba79b4fe4970b431b3a9cabeaf387a4cc83364a916045163e21b89104b23254a612491ae2e9f968a97f3b5232350ef571c5dd
+EBUILD ace-window-0.10.0.ebuild 448 BLAKE2B c137ddb28dabb7958afa7cf136d32e0b5c1249af2133b3c4e4bc697479c7bc00bd23f8df2cddc4b17b36c74c39d33143f84edc390d88c485e4cbf6f082df6b58 SHA512 e008f583ca43ee9fc688ab8cc244243e13a9cbdb099861f8dec0701da3e405f91f57dfd20f40888650a82ef60643d91e14ce08d6494946496d5c74cfafe46a93
+MISC metadata.xml 425 BLAKE2B 8993d044575b4262d8bcd615f026d67d897b7a9ae66049adc19a3bd1c2b7742b979b4e60943b751f7c6e96f6b91c7705503c0dc0126953d4324777ed4ee57ca9 SHA512 693165bd5dc79db87269c2a2f775343d29c1776de3132a483be9c68a33335ddf0f6d87dedc26c8a83c283ae8914ea87804be3782bc0f46ee8ef19e5fce3957bd
diff --git a/app-emacs/ace-window/ace-window-0.10.0.ebuild b/app-emacs/ace-window/ace-window-0.10.0.ebuild
new file mode 100644
index 000000000000..64abbd9be25b
--- /dev/null
+++ b/app-emacs/ace-window/ace-window-0.10.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Quickly switch windows in Emacs"
+HOMEPAGE="https://github.com/abo-abo/ace-window/"
+SRC_URI="https://github.com/abo-abo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+RDEPEND="app-emacs/avy"
+BDEPEND="${RDEPEND}"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/ace-window/files/50ace-window-gentoo.el b/app-emacs/ace-window/files/50ace-window-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/ace-window/files/50ace-window-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/ace-window/metadata.xml b/app-emacs/ace-window/metadata.xml
new file mode 100644
index 000000000000..7a9a52217acc
--- /dev/null
+++ b/app-emacs/ace-window/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/abo-abo/ace-window/issues/</bugs-to>
+    <remote-id type="github">abo-abo/ace-window</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/all-the-icons/Manifest b/app-emacs/all-the-icons/Manifest
index 48838605efd5..a8128a10825b 100644
--- a/app-emacs/all-the-icons/Manifest
+++ b/app-emacs/all-the-icons/Manifest
@@ -1,6 +1,6 @@
 AUX 50all-the-icons-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
 DIST all-the-icons-5.0.0.tar.gz 805496 BLAKE2B c5d81d2ff534bb7ab0000c21fb32107f307d96b1bf09b9227be5900e8160b133cfdc7ea4d4b31a982abb55e29bcf35626af91e3bd9ecbfba00b9b5ed85496a7f SHA512 865db191900dbeb207220df8d91220179dfbbb37e983e9e306ba0a4be576055002beb7335de20327736e8be678056699e8385aa37de766fadc11f4688f99471e
 DIST all-the-icons-5.0.0_p20220325.tar.gz 806105 BLAKE2B bc035ee726bf1d2f9839231ddd3bbaaca93b76c30026a3fcef4579f28f7f9677b37fa8b2652e82ae710f23272b56c884cb9454d54d8c2962f20e0fe9cf3c0bdd SHA512 3e45f208b46e7b1b596b6beb41cc11145db49e3e60e7a42593db94000f226e197b30580ba46d490b456f90349e7db2e49027a572b90f32048bcf0e68af9f22bf
-EBUILD all-the-icons-5.0.0.ebuild 1000 BLAKE2B edbb9634122e62a74cc6601465edd5af266705a77f6834afa12fa76c6a42db5636a8d8f26acf46077b60a435111d36a2d7d826e9b1ed2169d8d2043b00b8b58b SHA512 ff270f803578bb075378ee6a9a8bfe7a12d2b2d57855f12273f7d9c222c746e3bf6881ac2c9bf5219721f879886edeed48adab9307b452922f7ad9f6bb69047b
-EBUILD all-the-icons-5.0.0_p20220325.ebuild 1041 BLAKE2B 1bdc607c82776edeb062c0380f954509a910348fff09de1393663a8ccb1d866adb9a326ebe92167e06015ce3d4df9c5675408e9df78608155674524195a0b516 SHA512 29f5d433b13c1c1e7382ec89fd98e4792868003e0718016eebdb60b51f169eb4b9f66ec6d03b895b198af3ad76a61129d8fbc35baa9371b1bdb2092f6a2638c8
+EBUILD all-the-icons-5.0.0-r1.ebuild 1546 BLAKE2B a9d32a202cfe6ecaddb520b04c5950f1a2bd82649678ec2767ad725925fc9af439e9764d8dce3ec506c96ac65f8d30d865b057cbfe95c193e459e730acd15826 SHA512 c921290c0fb0bf68d5ce94b62add28b914f889b9022d0e4b2e2542061aa896908c9264793258925080d765687966bbf07c4a6876c12d13897063e5980b7f7a05
+EBUILD all-the-icons-5.0.0_p20220325-r1.ebuild 1587 BLAKE2B 768b5596170eb7dbbf26816ba73ba2489276b869acca2e051d4cd54eb8ec29e14b38b2e16043f2e8c7297011cb566c3b637836b997ee7e170ae78351f8a866f2 SHA512 82d6ffb847a3b164cc7dc0720c5f210d31fed0d5016e14b44034949226ba31d8ddcd5320b28b70c0464419a335869da2de56510128364de2f2fae884b3cf0321
 MISC metadata.xml 439 BLAKE2B 29065345d770b5f2725a0a9dfaf2afa77ad082e349b662dca756150c45eefa1b7f022842e5db1efcd8a7d55cde14ddd25f286cb2cc9ce4370fdf9d4a5cf942b3 SHA512 2189e794f2eefda4ac001013c26e91a5631d1cc71aab214b811ef897f94b3c2ea1858b536b18f38211474c87baaf4a2307619744deec577d6e6aa2db1c634458
diff --git a/app-emacs/all-the-icons/all-the-icons-5.0.0.ebuild b/app-emacs/all-the-icons/all-the-icons-5.0.0-r1.ebuild
index cb1873d52bb6..1caaee0f131f 100644
--- a/app-emacs/all-the-icons/all-the-icons-5.0.0.ebuild
+++ b/app-emacs/all-the-icons/all-the-icons-5.0.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 NEED_EMACS=24.3
 
-inherit elisp readme.gentoo-r1
+inherit elisp font readme.gentoo-r1
 
 DESCRIPTION="Various icon fonts propertized for Emacs"
 HOMEPAGE="https://github.com/domtronn/all-the-icons.el/"
@@ -26,6 +26,11 @@ DOC_CONTENTS="You may need to install the required fonts by executing
 DOCS=( README.md logo.png )
 SITEFILE="50${PN}-gentoo.el"
 
+pkg_setup() {
+	elisp_pkg_setup
+	font_pkg_setup
+}
+
 src_compile() {
 	elisp_src_compile
 	elisp-compile data/*.el
@@ -40,4 +45,25 @@ src_test() {
 src_install() {
 	elisp_src_install
 	elisp-install ${PN}/data data/*.el{,c}
+
+	# Install all-the-icons.ttf, special font made explicitly for this library.
+	# NOTICE: "fonts" directory also contains some bundled fonts,
+	# that is why we need this small re-implementation of font eclass,
+	# to suit this specific use case.
+	pushd "${S}"/fonts >/dev/null || die
+	insinto ${FONTDIR}
+	doins ${PN}.ttf
+	font_xfont_config
+	font_fontconfig
+	popd >/dev/null || die
+}
+
+pkg_postinst() {
+	elisp_pkg_postinst
+	font_pkg_postinst
+}
+
+pkg_postrm() {
+	elisp_pkg_postrm
+	font_pkg_postrm
 }
diff --git a/app-emacs/all-the-icons/all-the-icons-5.0.0_p20220325.ebuild b/app-emacs/all-the-icons/all-the-icons-5.0.0_p20220325-r1.ebuild
index cf28205eb9e6..029e12f0222a 100644
--- a/app-emacs/all-the-icons/all-the-icons-5.0.0_p20220325.ebuild
+++ b/app-emacs/all-the-icons/all-the-icons-5.0.0_p20220325-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 H=65c496d3d1d1298345beb9845840067bffb2ffd8
 NEED_EMACS=24.3
 
-inherit elisp readme.gentoo-r1
+inherit elisp font readme.gentoo-r1
 
 DESCRIPTION="Various icon fonts propertized for Emacs"
 HOMEPAGE="https://github.com/domtronn/all-the-icons.el/"
@@ -27,6 +27,11 @@ DOC_CONTENTS="You may need to install the required fonts by executing
 DOCS=( README.md logo.png )
 SITEFILE="50${PN}-gentoo.el"
 
+pkg_setup() {
+	elisp_pkg_setup
+	font_pkg_setup
+}
+
 src_compile() {
 	elisp_src_compile
 	elisp-compile data/*.el
@@ -41,4 +46,25 @@ src_test() {
 src_install() {
 	elisp_src_install
 	elisp-install ${PN}/data data/*.el{,c}
+
+	# Install all-the-icons.ttf, special font made explicitly for this library.
+	# NOTICE: "fonts" directory also contains some bundled fonts,
+	# that is why we need this small re-implementation of font eclass,
+	# to suit this specific use case.
+	pushd "${S}"/fonts >/dev/null || die
+	insinto ${FONTDIR}
+	doins ${PN}.ttf
+	font_xfont_config
+	font_fontconfig
+	popd >/dev/null || die
+}
+
+pkg_postinst() {
+	elisp_pkg_postinst
+	font_pkg_postinst
+}
+
+pkg_postrm() {
+	elisp_pkg_postrm
+	font_pkg_postrm
 }
diff --git a/app-emacs/anaphora/Manifest b/app-emacs/anaphora/Manifest
new file mode 100644
index 000000000000..f681130ce969
--- /dev/null
+++ b/app-emacs/anaphora/Manifest
@@ -0,0 +1,4 @@
+AUX 50anaphora-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST anaphora-1.0.4.tar.gz 9215 BLAKE2B 634cbf68b63bf815755eace47441b40571f9a0a466f552d908358b110e12b75b8256efba915762c53f3280092b12483f6eec6257d78845bd4bef9537d1157f2e SHA512 1cfdb9f91c8fee4598dbc01701cf6cf84296cf18ae244f061c82a753f47f4904fccf8fbc0299e87408e17b4e41df65455f56be393d003c16cf8932f1e9f86d5e
+EBUILD anaphora-1.0.4.ebuild 506 BLAKE2B d36aaa34ad52c121b933f0bd48b93a8333bed45c761f8607733bea819499491c1605456b97d6665be373d318fb045de208768d05897015a2fb64455022cdaddc SHA512 e7256f8ee656bcf07a144d81c071b8b57bbabba76d436dd2010d6a93de60a91d0109196a44e5824beb4e18186c093a8fb74940db7d142a1658ce72dbdd054208
+MISC metadata.xml 712 BLAKE2B f93672af116632423f14e74ede7590e61c054e92a0ef1c0e959839953dbd7cd60091e8742a57ce9660c030f096588a57d21f912eb83539d15919fb3b745d0717 SHA512 7774b90b18e55dc8896fe3084844b7f7cdfbeceee99f78a6233d56c2826983b27513432cc7f855c4c0e5bc21283ff760dfe7b5913d002630543f4db374fb1e6f
diff --git a/app-emacs/anaphora/anaphora-1.0.4.ebuild b/app-emacs/anaphora/anaphora-1.0.4.ebuild
new file mode 100644
index 000000000000..7dc6bcc3fb98
--- /dev/null
+++ b/app-emacs/anaphora/anaphora-1.0.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Anaphoric expressions for Emacs Lisp, providing implicit temporary variables"
+HOMEPAGE="https://github.com/rolandwalker/anaphora/"
+SRC_URI="https://github.com/rolandwalker/${PN}/archive/v${PV}.tar.gz
+			-> ${P}.tar.gz"
+
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+DOCS=( README.markdown )
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	emake test-batch
+}
diff --git a/app-emacs/anaphora/files/50anaphora-gentoo.el b/app-emacs/anaphora/files/50anaphora-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/anaphora/files/50anaphora-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/anaphora/metadata.xml b/app-emacs/anaphora/metadata.xml
new file mode 100644
index 000000000000..bc649256f86a
--- /dev/null
+++ b/app-emacs/anaphora/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="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/rolandwalker/anaphora/issues/</bugs-to>
+    <remote-id type="github">rolandwalker/anaphora</remote-id>
+  </upstream>
+  <longdescription>
+    Anaphoric expressions implicitly create one or more temporary variables
+    which can be referred to during the expression. This technique can improve
+    clarity in certain cases. It also enables recursion for anonymous
+    functions.
+  </longdescription>
+</pkgmetadata>
diff --git a/app-emacs/ansi/Manifest b/app-emacs/ansi/Manifest
new file mode 100644
index 000000000000..010c408a85a8
--- /dev/null
+++ b/app-emacs/ansi/Manifest
@@ -0,0 +1,4 @@
+AUX 50ansi-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST ansi-0.4.1_p20211104.tar.gz 5498 BLAKE2B aabfd9eca6b74e20bc2b435df08aa66971396fc64c9967682c744e53a703b1853af5e72682466fd89e0d4cb06fa264e1c9d7a5970004a2ccd4637ba3ff0d028b SHA512 ea4cf098aec0bace89de9bfebb36be493b4b73311525dd088a081e90aa41b6e4d15519a4e871bb4a2ef9bcd6450943d80f05619fb7290c341a0d5785bac00615
+EBUILD ansi-0.4.1_p20211104.ebuild 1005 BLAKE2B bc4a50f61b30c8285ad862e22fccdfb69bbc93879d436b45df7d36de97711638ec26cc97e7d956e0be268b044af5ac9ba2d455b9ed2427dad2575dedd50145d2 SHA512 1dbd3b8bb70991ffa5e0a46f9fcebf72396e044f9a39a165e0a13ee13061b008f7de2a3c84f882454f4f741e01c5dc64028bf5267a8bf583100ef84c1cc28b39
+MISC metadata.xml 417 BLAKE2B df95ffe5a8a1e7039c2072a44ef7d2365e18a94739c5611e8d9b6982294d953f3f7163421a570c065c618c976710e215d522f5ef529a0eff49c347609d76ff58 SHA512 275b463b8a5a3e5c183c30b1e95465db624342fd3649e5ffce925a996f63b8c7f24cf1ef94aaff5d25a206fb880e0ae8652e963d1a3fe230421aca51a691fa0a
diff --git a/app-emacs/ansi/ansi-0.4.1_p20211104.ebuild b/app-emacs/ansi/ansi-0.4.1_p20211104.ebuild
new file mode 100644
index 000000000000..12ba90c2412a
--- /dev/null
+++ b/app-emacs/ansi/ansi-0.4.1_p20211104.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=2367fba7b3b2340364a30cd6de7f3eb6bb9898a3
+NEED_EMACS=24
+
+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/${H}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}.el-${H}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		app-emacs/dash
+		app-emacs/el-mock
+		app-emacs/f
+		app-emacs/s
+		app-emacs/undercover
+	)
+"
+
+DOCS=( README.markdown )
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	${EMACS} ${EMACSFLAGS} -L . -L test \
+			 -l ansi.el -l test/ansi-color-test.el -l test/ansi-csi-test.el \
+			 -l test/ansi-format-test.el -l test/ansi-init.el \
+			 -l test/ansi-on-color-test.el -l test/ansi-style-test.el \
+			 -l test/ansi-test.el -l test/test-helper.el \
+			 -f ert-run-tests-batch-and-exit || die "tests failed"
+}
diff --git a/app-emacs/ansi/files/50ansi-gentoo.el b/app-emacs/ansi/files/50ansi-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/ansi/files/50ansi-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/ansi/metadata.xml b/app-emacs/ansi/metadata.xml
new file mode 100644
index 000000000000..7ffd242cdb37
--- /dev/null
+++ b/app-emacs/ansi/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/rejeep/ansi.el/issues/</bugs-to>
+    <remote-id type="github">rejeep/ansi.el</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/auctex/Manifest b/app-emacs/auctex/Manifest
index 7529e14d1eae..e2ffc49e32bd 100644
--- a/app-emacs/auctex/Manifest
+++ b/app-emacs/auctex/Manifest
@@ -3,7 +3,9 @@ AUX 60auctex-gentoo.el 97 BLAKE2B 18cad086f4211844f8a32d0f2499d2ecf29cd41f90c9de
 DIST auctex-11.92.tar.gz 1486606 BLAKE2B 6e34d1da3bacad8f2baee2f13eb44a5b617a342c294ef4d7ba28059b678510e1d161f3f02fbcf38128c09ab4996a035e5ec28898134b967d88ad621b8b477845 SHA512 758bf82903ba0499decf0ade77c7ac70865132a24195d7e8794538b7857c448811b7ef26149a915b60ed3ee34c2ebaddb3282a320bd459c9ee3f461d6ee9b84e
 DIST auctex-12.2.tar.gz 1511396 BLAKE2B 02cad76c8846fc10dc1bd94d15fb1d6f56a9beead96deaa32a5e9a43241b232f021d9abe1965e10e53b941a223c500b301b1c467228bf8d9ed2646fa70bae647 SHA512 412e247ad9ba7feb768cade0a7098cc79991ccdf350248836813d572bfe2339f52c4e0e9ce631354e2c2d434217274aa9116e61d122a625a45a7f67aabd2316b
 DIST auctex-12.3.tar.gz 1534283 BLAKE2B b70db839cd82805ed0410f8b92c5f19a78e92ee8f23d18962f0da77bdfdbac4264272805135c7f16ba35c461017aac74030071c85d2ff413f8eff542cad670d2 SHA512 29c411a7f18e0dd2d84edaf935e278cdf694644e01f40c26c26da403efa0a823fc3110c291d218bf930cad208dc249ca665dc20ccad5e2b44bd3caae828079ca
+DIST auctex-13.1.tar.gz 1600209 BLAKE2B e6ab7d19e60b19f54f8af61c0038a0aa656bebfb56f8a1bcea3ad26a249b2c176570fcd1eaceffbc99d4a824b9191eb301a1ead16dc382f31a09729cd99415e9 SHA512 562f106627d244113669654bc683818c7145c2f74d0ce50824765989e894dfe01e34bf96fe11123ebfb76c7053647697c99ae15e80fcd5e3e022683054a962ae
 EBUILD auctex-11.92.ebuild 1426 BLAKE2B 6a2cae3590f384ee0b1c0395d872029e4d83830109953557901975ce074d7464dd291511965f916c03eab1b88acc6c4f5538764ad9d5d29c4ea3d735338459c5 SHA512 7e26c9deed5f567d4c1e075abadbbd85df8391e2df17339523de2d07acf3822e850ab264bc1ec6b28e2ae7e3b5dffadd5de139fc222dd8f28ce8b6c2f149529f
 EBUILD auctex-12.2.ebuild 1442 BLAKE2B 961fb1c1009e2a53b83aaf0fd48dc605e9c99a013d4a30eeef8634753db3ac80069dc55e0048bac4df77cdd6edb8ed8e3a1aa939aa5948280523ad385a168117 SHA512 4be7449a4479faf4d24ebcb9ee50e34bd99bb0b7cbf360ff8210c0ddc20823247e1c4ede0957bc8af74eb8cc0ffe8776fef6d788fda899a822cf260bd798a665
 EBUILD auctex-12.3.ebuild 1442 BLAKE2B 961fb1c1009e2a53b83aaf0fd48dc605e9c99a013d4a30eeef8634753db3ac80069dc55e0048bac4df77cdd6edb8ed8e3a1aa939aa5948280523ad385a168117 SHA512 4be7449a4479faf4d24ebcb9ee50e34bd99bb0b7cbf360ff8210c0ddc20823247e1c4ede0957bc8af74eb8cc0ffe8776fef6d788fda899a822cf260bd798a665
+EBUILD auctex-13.1.ebuild 1450 BLAKE2B 67507801854a11d0d8091dc46892cff408bffc5f725ba82e8764144fc6a13e3b3c53ee91018cf2b827560df6271226c51a1577e8d65291fc6f9731562e214694 SHA512 01d5d6db2d3c0f392a66a28d724d21ffb2889442b71a1d128c7aac9cdcccf883ce29421cf57a99a5248db235b2aa943b101c1aa6dfc4073e074fe0d318e49f6f
 MISC metadata.xml 948 BLAKE2B 8b8d66912a4b4cc3c19413b3cda303b083dea2d7ff18e8d36ff7203a836de192acdaff00c10f9e8bd367d526e717da60d8069f80b596507988bc7e5528305bd9 SHA512 12e6afbe2f695fb822ac10e50212951975858a7aed152d523602195933b359788979b1c4d658b63a0271edb325c5156343db3e318a374f921094c5b989e3181f
diff --git a/app-emacs/auctex/auctex-13.1.ebuild b/app-emacs/auctex/auctex-13.1.ebuild
new file mode 100644
index 000000000000..64b85674a975
--- /dev/null
+++ b/app-emacs/auctex/auctex-13.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=25.1
+
+inherit elisp
+
+DESCRIPTION="Extensible package for writing and formatting TeX files in Emacs"
+HOMEPAGE="https://www.gnu.org/software/auctex/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+ FDL-1.3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE="preview-latex"
+
+RDEPEND="virtual/latex-base
+	preview-latex? (
+		app-text/dvipng
+		app-text/ghostscript-gpl
+	)"
+BDEPEND="${RDEPEND}"
+
+TEXMF="/usr/share/texmf-site"
+
+src_configure() {
+	econf \
+		--with-emacs \
+		--with-auto-dir="${EPREFIX}/var/lib/auctex" \
+		--with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
+		--with-packagelispdir="${EPREFIX}${SITELISP}/${PN}" \
+		--with-packagedatadir="${EPREFIX}${SITEETC}/${PN}" \
+		--with-texmf-dir="${EPREFIX}${TEXMF}" \
+		--disable-build-dir-test \
+		$(use_enable preview-latex preview)
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}"/fonts
+	emake
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install
+	elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
+	if use preview-latex; then
+		elisp-site-file-install "${FILESDIR}/60${PN}-gentoo.el"
+	fi
+	dodoc ChangeLog* CHANGES FAQ INSTALL PROBLEMS.preview README RELEASE TODO
+}
+
+pkg_postinst() {
+	use preview-latex && texmf-update
+	elisp-site-regen
+}
+
+pkg_postrm() {
+	use preview-latex && texmf-update
+	elisp-site-regen
+}
diff --git a/app-emacs/autoconf-mode/Manifest b/app-emacs/autoconf-mode/Manifest
index c84428dcf2e4..0992d12e8073 100644
--- a/app-emacs/autoconf-mode/Manifest
+++ b/app-emacs/autoconf-mode/Manifest
@@ -1,4 +1,4 @@
 AUX 50autoconf-mode-gentoo.el 366 BLAKE2B 9394476da3892a5b857fe35ff9a6ecbacec761adec91465201259b03080a7303a1c5e6fe2767ffabfad1b156f4d362e1f025fef9ab131d89799912e0328090a9 SHA512 e917a5c7e7216da4624ac9463aa575569402383fd77d11b510c4752d1dfb54aa93c3cd29f3e3b198693c4f9ee9452611f5f342ecf57bf2c5f72b5e10ffab2d9f
 DIST autoconf-2.69.tar.xz 1214744 BLAKE2B 71d33d72a06e9a05fbed0eda73bc9d8a3805c7c90bf082959862f93f3c5f01192114176e84d84ecb58fa99512eafbc0ab21ad1407be18c8c63bb3dc1117c482d SHA512 995d3e5a8eb1eb37e2b7fae53c6ec7a9b4df997286b7d643344818f94636756b1bf5ff5ea9155e755cb9461149a853dfbf2886fc6bd7132e5afa9c168e306e9b
-EBUILD autoconf-mode-2.69-r1.ebuild 523 BLAKE2B 096e52c846d722bb4ead1dc98a33961dd9d6c1980fb18179a3cfdc25d4c902bb98b1255e5e0558d01dc39dbe51c6ab8c8b1eb708f66dfe958720ccabc0513376 SHA512 41ed2c27c75433e544951ed724ab79c75f11a33ea37ef67162b9b2fdac59edc63d1dcf44af563a837cc68ef7acfc380fd6c7785c681161b623d14a33aed04255
+EBUILD autoconf-mode-2.69-r1.ebuild 517 BLAKE2B 105a672469466f66d4faf5d7c83b6da3c81dd9e6f5a101c7256ef95070b147f46abd1210fd1ab1505a3075b5d76ae69cedfcb394472f6c20ab0c11f39c858be1 SHA512 74d5d6443298392f0543a0acabd1dbf1f0c210cac63377cd45bf48fe86a972c633cbcf3e263d2daf31188616c7f8de2b833dac1624561e16073a6fe845a381d5
 MISC metadata.xml 283 BLAKE2B 81c49021199f71096079a27f9121390fb8c1285c54b9478583ff2d647277fa106ef12456d7097c4be092fc48b514a1adcf855ca0fac911598232ef9eb7f102c0 SHA512 f32b303760addf5d4db8d18bd10fb677353cdfa4c5e545d47804ef756cf5e5a21f8b8efb631b08f802185913ceb98da820e404e06eb03d01fe9ea85c10d1ac13
diff --git a/app-emacs/autoconf-mode/autoconf-mode-2.69-r1.ebuild b/app-emacs/autoconf-mode/autoconf-mode-2.69-r1.ebuild
index e293c40ca1cb..573cfd0e89bf 100644
--- a/app-emacs/autoconf-mode/autoconf-mode-2.69-r1.ebuild
+++ b/app-emacs/autoconf-mode/autoconf-mode-2.69-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/autoconf/autoconf-${PV}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 S="${WORKDIR}/autoconf-${PV}/lib/emacs"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/bind-chord/Manifest b/app-emacs/bind-chord/Manifest
new file mode 100644
index 000000000000..5dcbcc368a49
--- /dev/null
+++ b/app-emacs/bind-chord/Manifest
@@ -0,0 +1,4 @@
+AUX 50bind-chord-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST use-package-2.4.1.tar.gz 124368 BLAKE2B 5eaa6f500234d86651e155fa5360362c5e2696a8b258d5785a02b94f4ccacc6a9815e0b53f663684cef1cc9aa6c6812a5f59e04de3a3d7c5ac36e9dfb6ea09ea SHA512 7248243dbddd939eb1ef9e76f9410265ed1cc48398745f593b57122261a6bb3bf4ab40392b6f29476ca33922f7087a52596a87968cf4914e5ed82db6c513bbbf
+EBUILD bind-chord-2.4.1-r1.ebuild 679 BLAKE2B b91d83c550532da2aee9a1513d6411728cead14829fe82793906e2671d6d8e7f36ca2732bd281c633cd1a26c8fe8904949c1713a9fa43f645995555c2fc8a0a8 SHA512 d8226beddefa89568d15a27b866a95c91dbc0c50d8456d719b412607de4145f7fd8e68309325e6ef6b049dac5f439f29649201a50cdb2c9541ed9278869c088a
+MISC metadata.xml 429 BLAKE2B 287e6cbe3a1ece1241e6fe22235bdcd346bac4ff92e49ec9b9de52271fdf40d05f7f0646878b3fb6dcf447c79350e91bf62a5aefa0dca351638f7a7914b52446 SHA512 5db5dd382365f331fb8945b0ee319e34aa037f0b23239d9df26433f866e4276558dc1cf450e807f3fcc1f4cbe358e84751cc37a3a5cd85d08b083014a761a838
diff --git a/app-emacs/bind-chord/bind-chord-2.4.1-r1.ebuild b/app-emacs/bind-chord/bind-chord-2.4.1-r1.ebuild
new file mode 100644
index 000000000000..f37f89180fc6
--- /dev/null
+++ b/app-emacs/bind-chord/bind-chord-2.4.1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Key-chord binding helper for use-package-chords"
+HOMEPAGE="https://github.com/jwiegley/use-package/"
+SRC_URI="https://github.com/jwiegley/use-package/archive/${PV}.tar.gz
+			-> use-package-${PV}.tar.gz"
+S="${WORKDIR}"/use-package-${PV}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-emacs/bind-key
+	app-emacs/key-chord
+"
+BDEPEND="${RDEPEND}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp-compile ${PN}.el
+}
+
+src_install() {
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	elisp-install ${PN} ${PN}.el{,c}
+}
diff --git a/app-emacs/bind-chord/files/50bind-chord-gentoo.el b/app-emacs/bind-chord/files/50bind-chord-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/bind-chord/files/50bind-chord-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/bind-chord/metadata.xml b/app-emacs/bind-chord/metadata.xml
new file mode 100644
index 000000000000..3f12e84d7508
--- /dev/null
+++ b/app-emacs/bind-chord/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/jwiegley/use-package/issues/</bugs-to>
+    <remote-id type="github">jwiegley/use-package</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/bind-key/Manifest b/app-emacs/bind-key/Manifest
new file mode 100644
index 000000000000..1bdf39ad85a0
--- /dev/null
+++ b/app-emacs/bind-key/Manifest
@@ -0,0 +1,4 @@
+AUX 50bind-key-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST use-package-2.4.1.tar.gz 124368 BLAKE2B 5eaa6f500234d86651e155fa5360362c5e2696a8b258d5785a02b94f4ccacc6a9815e0b53f663684cef1cc9aa6c6812a5f59e04de3a3d7c5ac36e9dfb6ea09ea SHA512 7248243dbddd939eb1ef9e76f9410265ed1cc48398745f593b57122261a6bb3bf4ab40392b6f29476ca33922f7087a52596a87968cf4914e5ed82db6c513bbbf
+EBUILD bind-key-2.4.1-r1.ebuild 598 BLAKE2B d4fb102ba8f82883582414e7c089671166e78ce84c187a6ebdbe91a9b86d2bcab3495bd24a9edbae33d5a5bf0a3961597a25043f3c23b8482aa771ca94a0a299 SHA512 63b3d61049864a0f13fc3554f08dbc0f164fa7964695cd15c9ab2aac8997acf95dc86f51543161913945593fc2449c00dc675e61c7a55ac9c959a80436db4ac0
+MISC metadata.xml 429 BLAKE2B 287e6cbe3a1ece1241e6fe22235bdcd346bac4ff92e49ec9b9de52271fdf40d05f7f0646878b3fb6dcf447c79350e91bf62a5aefa0dca351638f7a7914b52446 SHA512 5db5dd382365f331fb8945b0ee319e34aa037f0b23239d9df26433f866e4276558dc1cf450e807f3fcc1f4cbe358e84751cc37a3a5cd85d08b083014a761a838
diff --git a/app-emacs/bind-key/bind-key-2.4.1-r1.ebuild b/app-emacs/bind-key/bind-key-2.4.1-r1.ebuild
new file mode 100644
index 000000000000..9a2527d8396d
--- /dev/null
+++ b/app-emacs/bind-key/bind-key-2.4.1-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Simple way to manage personal keybindings"
+HOMEPAGE="https://github.com/jwiegley/use-package/"
+SRC_URI="https://github.com/jwiegley/use-package/archive/${PV}.tar.gz
+			-> use-package-${PV}.tar.gz"
+S="${WORKDIR}"/use-package-${PV}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp-compile ${PN}.el
+}
+
+src_install() {
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	elisp-install ${PN} ${PN}.el{,c}
+}
diff --git a/app-emacs/bind-key/files/50bind-key-gentoo.el b/app-emacs/bind-key/files/50bind-key-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/bind-key/files/50bind-key-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/bind-key/metadata.xml b/app-emacs/bind-key/metadata.xml
new file mode 100644
index 000000000000..3f12e84d7508
--- /dev/null
+++ b/app-emacs/bind-key/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/jwiegley/use-package/issues/</bugs-to>
+    <remote-id type="github">jwiegley/use-package</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/bnf-mode/Manifest b/app-emacs/bnf-mode/Manifest
new file mode 100644
index 000000000000..7b340c7793ad
--- /dev/null
+++ b/app-emacs/bnf-mode/Manifest
@@ -0,0 +1,4 @@
+AUX 50bnf-mode-gentoo.el 172 BLAKE2B d1b8ea4b0e3557be9af576297ead7354d43f199bb9766d4c87299af82717dd3fda7057a7b56589db916a12de4cb896289f1ff699ecf60306fd903d75d395be2c SHA512 925e29ff36a3be50fa207f56457d3d671e723c2800c6f092b1e6b6c84acc63e12253cd7782ccb16ecd67cf6ad535cf3ec96ef9de804a8b0e7d61ecd99345e13c
+DIST bnf-mode-0.4.5_pre20220102.tar.gz 27103 BLAKE2B 816637a440cfbe009873ea1c5033532a24ef1b8e842415665458b18d3ba7e9f37a1521e67e43c6287a598c8eb671b514563b1d255031ad255ec51ad5995579cd SHA512 d3d7215efb19c313aba1a99100616b1ee7345d41933921d5150c6d72c7afc5f4b86e085a07bddce78aac7400cf605d8d0ba1c24232df79ad01fef5744567778f
+EBUILD bnf-mode-0.4.5_pre20220102.ebuild 744 BLAKE2B cfa40c0596f3a4d372efe6c1d832c8a6e8eddbe6e290b4b5f3780bdfa6832922693ff89bbcd4036f30647fabc903e6ded91e57b0b2dfbe8196f8fb8c95730458 SHA512 d52dea0fd1f8c3bd6eca062aad89006e856559087507b73182dd789a0c001dac7f4b1c87caa9edbf30098cc65f8fc5a01ecba48e56c38210f262697246a26fe9
+MISC metadata.xml 427 BLAKE2B 2c065ae81e1fc6ba03fb589859ccf2c0769d3bf703d6e515f3d57f8c2ad019dd5fb0ca33afba2b14fa8d352163ce88d72035fae8faae4a8e5a2887bbec0ec7a3 SHA512 2646248b5df55a5c972c4da58da163558233f3eaf877e5bf366b432ebc0ad5c7939076c7089c3a62c0c790c71f01537489f668a7003ce4b45e6e27ffe1549d44
diff --git a/app-emacs/bnf-mode/bnf-mode-0.4.5_pre20220102.ebuild b/app-emacs/bnf-mode/bnf-mode-0.4.5_pre20220102.ebuild
new file mode 100644
index 000000000000..8c438602742d
--- /dev/null
+++ b/app-emacs/bnf-mode/bnf-mode-0.4.5_pre20220102.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=d9329dd90e5d4f629295e85898362d9682047898
+NEED_EMACS=24.3
+
+inherit elisp
+
+DESCRIPTION="GNU Emacs major mode for editing BNF grammars"
+HOMEPAGE="https://github.com/sergeyklay/bnf-mode/"
+SRC_URI="https://github.com/sergeyklay/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${H}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		app-emacs/buttercup
+		app-emacs/undercover
+	)
+"
+
+DOCS=( NEWS README.org )
+ELISP_REMOVE=".dir-locals.el"
+ELISP_TEXINFO="bnf-mode.texi"
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	buttercup -L . -L test --traceback full || die
+}
diff --git a/app-emacs/bnf-mode/files/50bnf-mode-gentoo.el b/app-emacs/bnf-mode/files/50bnf-mode-gentoo.el
new file mode 100644
index 000000000000..2679585378f2
--- /dev/null
+++ b/app-emacs/bnf-mode/files/50bnf-mode-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'bnf-mode "bnf-mode"
+  "A major mode for editing BNF grammars." t)
+(add-to-list 'auto-mode-alist '("\\.bnf\\'" . bnf-mode))
diff --git a/app-emacs/bnf-mode/metadata.xml b/app-emacs/bnf-mode/metadata.xml
new file mode 100644
index 000000000000..5dc13c7cc06e
--- /dev/null
+++ b/app-emacs/bnf-mode/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/sergeyklay/bnf-mode/issues/</bugs-to>
+    <remote-id type="github">sergeyklay/bnf-mode</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/bui/Manifest b/app-emacs/bui/Manifest
new file mode 100644
index 000000000000..7fd619701793
--- /dev/null
+++ b/app-emacs/bui/Manifest
@@ -0,0 +1,4 @@
+AUX 50bui-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST bui-1.2.1_p20210108.tar.gz 38639 BLAKE2B a1c460db08e75d64247dc071ba80776e35a398d88c323d01a7de0bc79cb843699094626c181328714618a45f5841b07eae79c2c38a57a5d9938af5568dfeb872 SHA512 11c67b9eb34be8350fba029bc7a29703b89aecf8bf1b407f23930c97f883264a69907e079c8b88fa7b7c586d70d5506de3885fa81bbf93f0a7f822b0f576b5e9
+EBUILD bui-1.2.1_p20210108.ebuild 554 BLAKE2B b8c2c61be27228bebe3429c9fcdcaad983d0fff3197b7ba9f4dccbc09829c7f4c50e610c6f9ad62ab983f53f8565bbf19ca37736f78b92f3c99891cb3ff16f36 SHA512 2bfd37b1323f51ee754db40a9e0ea9b25de27046acb50aa688a247cc160588039ff75ca82a10a2eebb12ff49633a0da0b57522c124e2f520008ed72a03030522
+MISC metadata.xml 505 BLAKE2B a338d8f5a53f0aaefbd30c2396e615a3fbccf9d7855bda72025233bd3e2228d77663b94629d232650b13e15b29c8075d55a154012446ee9ad8016a817c3653c5 SHA512 f09cf53db908c107a2ea00b9d3f409940431857a4a4e2ddf6c6310aabbf6f3cec3c0e662674aebfeaccd1bcf07ae7076aedbd2b414098c72f479964858ea30c4
diff --git a/app-emacs/bui/bui-1.2.1_p20210108.ebuild b/app-emacs/bui/bui-1.2.1_p20210108.ebuild
new file mode 100644
index 000000000000..8b85fbff9f3b
--- /dev/null
+++ b/app-emacs/bui/bui-1.2.1_p20210108.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=f3a137628e112a91910fd33c0cff0948fa58d470
+NEED_EMACS=24.3
+
+inherit elisp
+
+DESCRIPTION="Buffer interface library for Emacs"
+HOMEPAGE="https://github.com/alezost/bui.el/"
+SRC_URI="https://github.com/alezost/${PN}.el/archive/${H}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}.el-${H}
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+RDEPEND="app-emacs/dash"
+BDEPEND="${RDEPEND}"
+
+DOCS=( NEWS README.org examples )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/bui/files/50bui-gentoo.el b/app-emacs/bui/files/50bui-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/bui/files/50bui-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/bui/metadata.xml b/app-emacs/bui/metadata.xml
new file mode 100644
index 000000000000..4bd2abf9fc87
--- /dev/null
+++ b/app-emacs/bui/metadata.xml
@@ -0,0 +1,14 @@
+<?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>
+    <changelog>https://raw.githubusercontent.com/alezost/bui.el/master/NEWS</changelog>
+    <bugs-to>https://github.com/alezost/bui.el/issues/</bugs-to>
+    <remote-id type="github">alezost/bui.el</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/buttercup/Manifest b/app-emacs/buttercup/Manifest
index 1b8cf3e9346c..499fd674d852 100644
--- a/app-emacs/buttercup/Manifest
+++ b/app-emacs/buttercup/Manifest
@@ -1,5 +1,7 @@
-AUX 50buttercup-gentoo.el 84 BLAKE2B ef557e509cca97f5ed6b899d4911c6e2419b60721ce8c6f975bdd60647bcff184d564fdfca92c83a6b25d587307fd1333eada20b80105ef23556df9b1caa78a2 SHA512 e404d7a78b58d7547d96d7f91ad844ebf39f76cec816d050485cb570d12f819a9b2e670f63685235b72581eea3576bbd12e7fe072f082851b262396f6af061d1
+AUX 50buttercup-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
 AUX buttercup-1.24-properties-equal.patch 1596 BLAKE2B 384adba33517c2f6677e10aac40c5a939914f74a936d7891e52eb4b706d33c0005f1ce63e0ba8b9672fdad403f6ec36e3191246c252c30574c448408ce24a1aa SHA512 a7dfe3a0d9df701b47287afd8718fbe01886870ab0665cfb73ba240b03facae5b1dc53d5e07ac2cbf21823a203e46a038e64025a82d627d2e8a516997bc8e654
 DIST buttercup-1.24.tar.gz 85337 BLAKE2B fb40d0899f68aff5f2fdb989b2c0e42005e6667ecfe8a4ca806ddb4139f497f0eed5328ba6407136b757a0f13bc6ec5ee488792da3de1e84edba394a781c410c SHA512 0a436f5e5bcf386a3675ef281ac6c9f0125917058de88a5557d879004bbf7cd4298086aa3fb86f2bd807f46c166b0fb02e248cc485878891293147656525f8ca
-EBUILD buttercup-1.24.ebuild 852 BLAKE2B b53348b6d88b0512f9343243fd3f04adc7f8909d777f5cdc362129684f5ff08917582557e60fa2d23413a23b46f9e949251f0e7423089ebb34cbfad19b5be68b SHA512 19bff5996f37a261d3901f1d9ebdf145bdde1da57e5093e578abb47b3e5ff76c819cc0264860533b0c4bf8a84b2f21a4c04d04d808adec648463a457251291dd
+DIST buttercup-1.25.tar.gz 86763 BLAKE2B ccf7ba797517710e66b666cc121766d29886e0e1a8fd5ad63cb8b5fa4ee2d2a0d2644cd413c1095f37b1ba60467c012e507230787e1daaca3e869a4072e61bb4 SHA512 1eb45485fb1de638837da4d97f6043a64e97d167c8c130d9c5ba6ff67a5e0bcae272c8247779ab1c9427668468a3b94e91af07426b5465a7c3f9c54433a0433e
+EBUILD buttercup-1.24-r1.ebuild 804 BLAKE2B 209c2c4c9c1f1cf00c60cf08d50fc56ca5846716de74f8f628233c04737f6622b8839756fa05c54e74bfb32eee0180040f22d815d83fa639504c710de7dca10b SHA512 b231b7049a5b9ef1fb8033bbafc727c02ce5723a7d7255a8f7f84e9a784b4b9f29c376d449247a31feb9f3d14a6f153af1613276f0cc717a9b2738ddd54f9c44
+EBUILD buttercup-1.25.ebuild 668 BLAKE2B 58d00b943b8634db5dfcd694b3d5d3dcb12f2b99e18434d1c31b9f50acb9aec669d6aac0d3fbd38eca545ceb5cdb926dcb274e6a91a0e7e184bc0a084d37129e SHA512 8b0ab6cd74f243390c88004c5b75e58a9461723b3830bf29a20741d13f2f284989d5da06405864a238be40a37f8cff2cc6c4c506c968fa3be1d0cfcf9b643f47
 MISC metadata.xml 392 BLAKE2B 365eddee8c36962902e64b476ca9f21b34bf1faf9dd5ff2ad28d799a8079ea81cfea23adfc81e0a40edee9d4a6551affabaec91c9b931cfb161cf8a5bfbb024f SHA512 899c734fc6bae680c7d44dd0750d0a55a74ef2a5408be0e3a33a920ed283535c1136fc6b04bca86e85304ee1a3972413f18cc047be1e1565ce6c2a7940e087f5
diff --git a/app-emacs/buttercup/buttercup-1.24.ebuild b/app-emacs/buttercup/buttercup-1.24-r1.ebuild
index dd3441cae617..58f468512d73 100644
--- a/app-emacs/buttercup/buttercup-1.24.ebuild
+++ b/app-emacs/buttercup/buttercup-1.24-r1.ebuild
@@ -9,24 +9,20 @@ inherit elisp
 
 DESCRIPTION="Behaviour-driven Elisp testing"
 HOMEPAGE="https://github.com/jorgenschaefer/emacs-buttercup"
-SRC_URI="https://github.com/jorgenschaefer/emacs-buttercup/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/emacs-buttercup-${PV}
+SRC_URI="https://github.com/jorgenschaefer/emacs-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/emacs-${P}
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 # https://github.com/jorgenschaefer/emacs-buttercup/pull/210
-PATCHES=( "${FILESDIR}"/${PN}-1.24-properties-equal.patch )
+PATCHES=( "${FILESDIR}"/${P}-properties-equal.patch )
 
 DOCS=( docs/{running,writing}-tests.md  )
+ELISP_REMOVE="buttercup-pkg.el"
 SITEFILE="50${PN}-gentoo.el"
 
-src_compile() {
-	elisp_src_compile
-	elisp-make-autoload-file
-}
-
 src_test() {
 	${EMACS} ${EMACSFLAGS} -L . -l buttercup \
 			 -f buttercup-run-discover || die "tests failed"
diff --git a/app-emacs/buttercup/buttercup-1.25.ebuild b/app-emacs/buttercup/buttercup-1.25.ebuild
new file mode 100644
index 000000000000..cfebece4d7cc
--- /dev/null
+++ b/app-emacs/buttercup/buttercup-1.25.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS="24.3"
+
+inherit elisp
+
+DESCRIPTION="Behaviour-driven Elisp testing"
+HOMEPAGE="https://github.com/jorgenschaefer/emacs-buttercup"
+SRC_URI="https://github.com/jorgenschaefer/emacs-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/emacs-${P}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+DOCS=( docs/{running,writing}-tests.md  )
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	${EMACS} ${EMACSFLAGS} -L . -l buttercup \
+			 -f buttercup-run-discover || die "tests failed"
+}
+
+src_install() {
+	elisp_src_install
+	dobin bin/${PN}
+}
diff --git a/app-emacs/buttercup/files/50buttercup-gentoo.el b/app-emacs/buttercup/files/50buttercup-gentoo.el
index 102ffcd8d3b9..431f7e90ae73 100644
--- a/app-emacs/buttercup/files/50buttercup-gentoo.el
+++ b/app-emacs/buttercup/files/50buttercup-gentoo.el
@@ -1,2 +1 @@
 (add-to-list 'load-path "@SITELISP@")
-(load "@SITELISP@/buttercup-autoloads" nil t)
diff --git a/app-emacs/cask/Manifest b/app-emacs/cask/Manifest
new file mode 100644
index 000000000000..f9ecf50afbf0
--- /dev/null
+++ b/app-emacs/cask/Manifest
@@ -0,0 +1,6 @@
+AUX 50cask-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+AUX cask-bin-launcher-fix.patch 729 BLAKE2B ae3ad72b09509db432cc55f787f6945ae99ce86800541411a9060654005da3195a2e11b175015bc0a0ac078c520b4a06caad0e8e0ca5fb4a677f844a0956be91 SHA512 bee4d324b6714b0ed7aa790417d92ede19a75bd7ae7138fde92759d4d1f40beb816ecc6e067aa43bc50ab5ecebc81907695721681dd09203178315189192de0a
+AUX cask-no-bootstrap.patch 1379 BLAKE2B 1d664cbd60145931964622c380d682e46ac2c1ee7762422cba0129b67b1c36c8c8f8a5b84bd11ec2cdca4efdb4a9bddd7efb8006ed6de60059ba9d2288f61f49 SHA512 73216e7f7b0e9ca2f6722c0065d725e2071c0cb831f05381e64082f2de9957633d1ab3bdaed990786f1f9142c7f599fa03b2b8602fa7936a715d4460d6133109
+DIST cask-0.8.8.tar.gz 348574 BLAKE2B 9eb2b18b6082a3500642660eebb471bff3bcbb00656a8a3c66bede3cf756e738b1cb8affbdeed97373bbdc0031d093a6ad5c7e4659e14732fbc531a416c78b99 SHA512 2708fa431dc17cb5d4fe56f0c73c3089a213d8ff0bca19091ab4ebf26c4e416c0a500a980daa424bf16b54d0e72b004762f5260329189eb4f8e803de38bc0ace
+EBUILD cask-0.8.8.ebuild 972 BLAKE2B d37051e019d6dbd1dd5bc2927811e09e61ba3eef63fd013c4516f59548541a4115f3c55fe0e5482fbf2286c2c045461e1cea80fd207bbeb16e62111de2428eb0 SHA512 a4c0a3dc995e4b403b55855273f4f03db28f75a42add7aec4e4a58a23289db548e4ab1469b992246362b31708fd13e2fefcedd41b328668f729a862346607d67
+MISC metadata.xml 407 BLAKE2B 32b050dc6363c12a4acab60daf2bc6d197531c6f4d6e34fa2505e9044d38b3bbf4072e3a49509471770571a593a1b977fc47a77068185a5d6db5e15cbdd778a8 SHA512 795657b75bcec2758afcd4215b9281c0cc14c78fd834ac871e4cc18fe3ca91c92f721a084802db5e443ec1800f0def755d5ed5314318123fb948a9de8ba5c855
diff --git a/app-emacs/cask/cask-0.8.8.ebuild b/app-emacs/cask/cask-0.8.8.ebuild
new file mode 100644
index 000000000000..40b12d37cde6
--- /dev/null
+++ b/app-emacs/cask/cask-0.8.8.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=25.1
+
+inherit elisp
+
+DESCRIPTION="Project management for Emacs package development"
+HOMEPAGE="https://github.com/cask/cask/"
+SRC_URI="https://github.com/cask/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="test"  # Most tests fail
+
+RDEPEND="
+	app-emacs/ansi
+	app-emacs/commander
+	app-emacs/epl
+	app-emacs/f
+	app-emacs/package-build
+	app-emacs/s
+	app-emacs/shut-up
+"
+BDEPEND="${RDEPEND}"
+
+DOCS=( README.org cask_small.png )
+PATCHES=(
+	"${FILESDIR}"/${PN}-bin-launcher-fix.patch
+	"${FILESDIR}"/${PN}-no-bootstrap.patch
+)
+
+ELISP_REMOVE="${PN}-bootstrap.el
+	package-build-legacy.el package-recipe-legacy.el"
+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}
+}
diff --git a/app-emacs/cask/files/50cask-gentoo.el b/app-emacs/cask/files/50cask-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/cask/files/50cask-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/cask/files/cask-bin-launcher-fix.patch b/app-emacs/cask/files/cask-bin-launcher-fix.patch
new file mode 100644
index 000000000000..704d284a13dc
--- /dev/null
+++ b/app-emacs/cask/files/cask-bin-launcher-fix.patch
@@ -0,0 +1,24 @@
+diff --git a/bin/cask b/bin/cask
+index 55d4d86..37a5c9c 100755
+--- a/bin/cask
++++ b/bin/cask
+@@ -39,17 +39,7 @@ case $subcommand in
+ 	*)
+ 		WHICH=${WHICH:-which}
+ 		READLINK=$($WHICH readlink || true)
+-		if [ "$(uname || true)" == "Darwin" ] ; then
+-			READLINK=
+-		fi
+-		READLINK=${READLINK:-$($WHICH greadlink || true)}
+-		if [ ! -z "$READLINK" ] ; then
+-			SRCDIR__=$($READLINK -f "$CASK")
+-		else
+-			SRCDIR__=$(python -c "import os, sys; print(os.path.realpath(sys.argv[1]))" "$CASK")
+-		fi
+-		SRCDIR_=$(dirname "$SRCDIR__")
+-		SRCDIR=$(dirname "$SRCDIR_")
+-		"$EMACS" -Q --script "$SRCDIR/cask-cli.el" -- $subcommand "$@"
++		SRCDIR="@SITELISP@"
++		"$EMACS" -q --script "$SRCDIR/cask-cli.el" -- $subcommand "$@"
+ 		;;
+ esac
diff --git a/app-emacs/cask/files/cask-no-bootstrap.patch b/app-emacs/cask/files/cask-no-bootstrap.patch
new file mode 100644
index 000000000000..c0d691a98b4e
--- /dev/null
+++ b/app-emacs/cask/files/cask-no-bootstrap.patch
@@ -0,0 +1,43 @@
+diff --git a/cask-cli.el b/cask-cli.el
+index f97a28a..eda6d8f 100644
+--- a/cask-cli.el
++++ b/cask-cli.el
+@@ -34,8 +34,7 @@
+       (or load-file-name byte-compile-current-file buffer-file-name)))
+     "Path to Cask root."))
+ 
+-(require 'cask-bootstrap (expand-file-name "cask-bootstrap" cask-directory))
+-(require 'cask (expand-file-name "cask" cask-directory))
++(require 'cask)
+ 
+ (when noninteractive
+   (shut-up-silence-emacs))
+diff --git a/cask.el b/cask.el
+index 7828f49..0bfc7ab 100644
+--- a/cask.el
++++ b/cask.el
+@@ -1,4 +1,4 @@
+-;;; cask.el --- Cask: Project management for package development  -*- lexical-binding: t; no-byte-compile: t -*-
++;;; cask.el --- Cask: Project management for package development  -*- lexical-binding: t -*-
+ 
+ ;; Copyright (C) 2012-2022 Johan Andersson
+ ;; Copyright (C) 2013 Sebastian Wiesner <swiesner@lunaryorn.com>
+@@ -45,7 +45,17 @@
+       (:else (buffer-file-name))))
+     "Path to Cask root."))
+ 
+-(require 'cask-bootstrap (expand-file-name "cask-bootstrap" cask-directory))
++(require 'ansi)
++(require 'cl-generic)
++(require 'cl-lib)
++(require 'commander)
++(require 'eieio)
++(require 'epl)
++(require 'f)
++(require 'package-build)
++(require 'package-recipe)
++(require 's)
++(require 'shut-up)
+ 
+ (setq package-build-verbose nil)        ; Make package-build quiet by
+                                         ; not allowing it to print any
diff --git a/app-emacs/cask/metadata.xml b/app-emacs/cask/metadata.xml
new file mode 100644
index 000000000000..02ee634d0baa
--- /dev/null
+++ b/app-emacs/cask/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/cask/issues/</bugs-to>
+    <remote-id type="github">cask/cask</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/cfrs/Manifest b/app-emacs/cfrs/Manifest
new file mode 100644
index 000000000000..a84392f56c9e
--- /dev/null
+++ b/app-emacs/cfrs/Manifest
@@ -0,0 +1,4 @@
+AUX 50cfrs-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST cfrs-1.6.0.tar.gz 27891 BLAKE2B 7eeaab09b5376382c07d55492126dba4b45124e626ad4671c0ed3d45c65761a5a044dd63452a7d6de6d00336814a7ee59242b4c3f691294a610b028073fb730d SHA512 a56d9329768b4f06ad55f9d351b98bc22a899b5e9e8c261f296f035b6b8d389f7271705a0e268ce4500dcf3d814a7f8eb881e30d8e3c2aa29376f2de872ed725
+EBUILD cfrs-1.6.0.ebuild 547 BLAKE2B 6272dcc5257a4377e7d65c468df757d96eb7d1543141f3d2682bfcad60e38240b4c207a530f68c1d82c217260791b7f5f24990e89046935b5aeee7f5d0e18bfa SHA512 9a165908144fb4b372ce6e1217f0b5453b72e4e8cce345723ee588cc5b3d69be8b63dee63ca62908974738e219f37b19103d23324d1d9325e200f24293eeee39
+MISC metadata.xml 431 BLAKE2B 3d7eb97f06bfcdfe5219fff405a7459bd010c094dbc4db745130407e770d65d691be86819edb3a8df6b079f43d58a0a53638a98fdb0174fed21d5691d82fa4b0 SHA512 230fe6f4f250e6c6141e25609399bd3e892cca2099ae4c328cc9c9ba87bbea618d0b4d44e0bf3f4a02fd5f3a65de3fe5f03eef0a6cf10c81ed776491186515ae
diff --git a/app-emacs/cfrs/cfrs-1.6.0.ebuild b/app-emacs/cfrs/cfrs-1.6.0.ebuild
new file mode 100644
index 000000000000..b95d7c81e888
--- /dev/null
+++ b/app-emacs/cfrs/cfrs-1.6.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=26.1
+
+inherit elisp
+
+DESCRIPTION="Child Frame Read String, alternative to read-string"
+HOMEPAGE="https://github.com/Alexander-Miller/cfrs/"
+SRC_URI="https://github.com/Alexander-Miller/${PN}/archive/${PV}.tar.gz
+			-> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+RDEPEND="
+	app-emacs/dash
+	app-emacs/posframe
+	app-emacs/s
+"
+BDEPEND="${RDEPEND}"
+
+DOCS=( README.org cfrs.png )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/cfrs/files/50cfrs-gentoo.el b/app-emacs/cfrs/files/50cfrs-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/cfrs/files/50cfrs-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/cfrs/metadata.xml b/app-emacs/cfrs/metadata.xml
new file mode 100644
index 000000000000..a8b09c169723
--- /dev/null
+++ b/app-emacs/cfrs/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/Alexander-Miller/cfrs/issues/</bugs-to>
+    <remote-id type="github">Alexander-Miller/cfrs</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/circe/Manifest b/app-emacs/circe/Manifest
index 898f09a76547..6e58828e3933 100644
--- a/app-emacs/circe/Manifest
+++ b/app-emacs/circe/Manifest
@@ -1,4 +1,6 @@
 AUX 50circe-gentoo.el 84 BLAKE2B 256e2b96a42e5662222eeadfb0fe7277a09eec8119903ea6e3e9a1dfac3157e238d383051b0738b1a8d555250181db67546da50743221314a0ba1353474ad81a SHA512 3f3c92f02e0a6ee760e83b83c4685a6b7f3268d0cb99abc9be56bdee8dd794d177f865582e45e90f895d1a2d9bbdc2ce39a3a60c7fc4eb973021eab66d8dbe47
 DIST circe-2.11.tar.gz 237797 BLAKE2B f5a6e72ac51a8e8638d1e05e4781688d83e7cd4fcf3e3e21e517793588c3a32b1686d390ab286d26fce3cbb7dd3ba7a30bb09ec677deacead16057ae8037e1c8 SHA512 aee0b5c7dfa03a190ba697941664e4afc76ec30b8602b2e95ad771fb6172ef2b76f4d05ad8af68f6b274f7f89373e05308b63e9c9cc494b7df0bf2c58fdca4e3
+DIST circe-2.12.tar.gz 240409 BLAKE2B 92eeecc2afe56b8434446aba5c0a090b2c4aa761b401de7aee9cebd39d933cf8e94d4609a28b6cea1610367ca5b824a85add7b266b04a18c4ea0231d35bae7f0 SHA512 679ea9d4edcd681d579ed16657a2f5ac1637382572ce7510426ba7ec75c008baa45062e1085bf9a43ba9f8eec0f68c0c0d21b8f8e6b1763cfe1602433f502b60
 EBUILD circe-2.11.ebuild 531 BLAKE2B 02ee8169f4f6ce70ce222ff9ae8b3a8309c0a797a59cd349be0d323e9d06579a75d6066ca2880a6f80500f386e940549b0d4d9714dd74ac5148e37ba635e11cf SHA512 3bac9db4371569764a35700f5335eff5ccdeb18f344564e4cf9fe5f165ae813b29ac7bee676b52b4a8019b32ca82a5c5b021ef41b4e82fc81b528748b10428fb
+EBUILD circe-2.12.ebuild 686 BLAKE2B e7799c799a4178666972a06e5811ab26d550af6b0ce6475ceb75b258a09a819d8131d5d583a4fc0bd090ca25407dc3d58afd2d268937c9ac8ed434d69e6bdd9e SHA512 468eaf9af95d2f27da45e99ad7d337de78ee9753619edd308816d793868f3aa87a7712a29297f2525dcde8942127618bf8d980f0a4e6c3ad021068d97b35edcf
 MISC metadata.xml 366 BLAKE2B da4de50c63a4245a08247ddea51c62bcc685550ed93bb379903522c17f37d697ced0c56daf98bf3ca59f3ff42e0c66bd3ce2463ea4f4555e141e0078ec9a1471 SHA512 588718268fe1be282ab138986de2961f9a47d8924e61b01212e72f9a5ac7a7f470d82f5787d36f7ae6a4717f0c4976316ab29319faaff35d626f36ca8e31aadf
diff --git a/app-emacs/circe/circe-2.12.ebuild b/app-emacs/circe/circe-2.12.ebuild
new file mode 100644
index 000000000000..3f2b2daf64fb
--- /dev/null
+++ b/app-emacs/circe/circe-2.12.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="A great IRC client for Emacs"
+HOMEPAGE="https://github.com/jorgenschaefer/circe
+	https://www.emacswiki.org/emacs/Circe"
+SRC_URI="https://github.com/jorgenschaefer/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( app-emacs/buttercup )"
+
+DOCS=( AUTHORS.md CONTRIBUTING.md NEWS.md README.md images )
+ELISP_REMOVE="${PN}-pkg.el"
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	buttercup -L . --traceback full tests || die
+}
diff --git a/app-emacs/commander/Manifest b/app-emacs/commander/Manifest
new file mode 100644
index 000000000000..49ae838da1bc
--- /dev/null
+++ b/app-emacs/commander/Manifest
@@ -0,0 +1,4 @@
+AUX 50commander-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST commander-0.7.0.tar.gz 37120 BLAKE2B 61e7262f7909d866f3890854cc695d1d8769ea54fa2a983d72a3e5b61217f1e898036026f71d8ae0d46e8d45af0b9e0e52c2f88d4f647dd50454877b9abd2946 SHA512 10d25d931f1faf88747c397594becc3832dfb56de7440ada2cd40e0329b0ca984eda77c62290329510ab87b53ac273e5d36e7acd628ff68ee0e981ccd9497d10
+EBUILD commander-0.7.0-r1.ebuild 736 BLAKE2B 2111f5f9c73d306a601a609485df5224e5039675cf4cffaaac26d817ff6acd3d662a0ba06308c4c58dfdfad5fa23fbcefc9f45bf62eea3fb6960e4615f560683 SHA512 883da90cdfbe60eb7c8f0d99c6647ead65fbc5ab90aa14b0389ac294f90a712e397773043a47c0cfc5a95f70ae0e40bea3401abe3770b9b62f53a0c2aef2e5ba
+MISC metadata.xml 427 BLAKE2B c2880e0565e76e17608bbb9c604f68d456fa50507619778328e0a7d440de8379ef2b0f6227363c54212fc69216eeaa3fd820cf65afb0fdfd4b196185f421597f SHA512 c0015a2295bbea6a9df5e0e7e25f4f8871c8fde5e359cedc8e0de7ce112e82fce2278ab33c040a93c54722e2aab100cbd3477bb507f33386faa96031928b6543
diff --git a/app-emacs/commander/commander-0.7.0-r1.ebuild b/app-emacs/commander/commander-0.7.0-r1.ebuild
new file mode 100644
index 000000000000..f7609e0868c7
--- /dev/null
+++ b/app-emacs/commander/commander-0.7.0-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+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}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-emacs/dash
+	app-emacs/f
+	app-emacs/s
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		app-emacs/ecukes
+		app-emacs/el-mock
+		app-emacs/ert-runner
+		app-emacs/espuds
+	)
+"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	ert-runner || die
+	ecukes --debug --reporter spec --script	features || die
+}
diff --git a/app-emacs/commander/files/50commander-gentoo.el b/app-emacs/commander/files/50commander-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/commander/files/50commander-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/commander/metadata.xml b/app-emacs/commander/metadata.xml
new file mode 100644
index 000000000000..6041ed51028f
--- /dev/null
+++ b/app-emacs/commander/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/rejeep/commander.el/issues/</bugs-to>
+    <remote-id type="github">rejeep/commander.el</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/dap-mode/Manifest b/app-emacs/dap-mode/Manifest
new file mode 100644
index 000000000000..e8257fa9817d
--- /dev/null
+++ b/app-emacs/dap-mode/Manifest
@@ -0,0 +1,5 @@
+AUX 50dap-mode-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+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
+EBUILD dap-mode-0.7.ebuild 980 BLAKE2B 412893db0272a548685834d675265f737a28d3d8073a57500a78dbd687981bce40f96cbfaa26d896fa740de0f08ea234769833b0e56f940fd32713d4936e8d8f SHA512 bd756a815d4b9d648a0f14c067036faddc47c34b89379cc6e7b9f2f9ce3a03e5cc8aa6f9de4d23e358e5f3564c1c286589acbbfcc886da916aef7f5a08cbec95
+MISC metadata.xml 526 BLAKE2B 1f55ae3dda8c23869f85a281117c57c42078957e710018b146df8d8293e159bdae9297fee626538b55182153eef95206f700da8c0744cc4e3b0a73932afdec9e SHA512 635327c51267e271d0a458c8a12f40cb3ee573180f1d0ccfaf1718cd641fabb9fcd4237a755f1710d569a926d953482da3d3dcf591ab893f74a01895b336c549
diff --git a/app-emacs/dap-mode/dap-mode-0.7.ebuild b/app-emacs/dap-mode/dap-mode-0.7.ebuild
new file mode 100644
index 000000000000..38928cefa99b
--- /dev/null
+++ b/app-emacs/dap-mode/dap-mode-0.7.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 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/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/dap-mode/files/50dap-mode-gentoo.el b/app-emacs/dap-mode/files/50dap-mode-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/dap-mode/files/50dap-mode-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/dap-mode/files/dap-mode-dap-ui-images-root-dir.patch b/app-emacs/dap-mode/files/dap-mode-dap-ui-images-root-dir.patch
new file mode 100644
index 000000000000..53bbb2ad13b2
--- /dev/null
+++ b/app-emacs/dap-mode/files/dap-mode-dap-ui-images-root-dir.patch
@@ -0,0 +1,12 @@
+index ba02fee..56be79f 100644
+--- a/dap-ui.el
++++ b/dap-ui.el
+@@ -486,7 +486,7 @@ DEBUG-SESSION is the debug session triggering the event."
+ 
+ 
+ ;; dap-ui posframe stuff
+-(defvar dap-ui--control-images-root-dir (f-join (f-dirname (file-truename (or load-file-name buffer-file-name))) "icons/vscode"))
++(defvar dap-ui--control-images-root-dir "@SITEETC@/icons/vscode")
+ (defvar dap-ui--control-buffer " *dap-ui*")
+ 
+ (defun dap-ui--create-command (image command hover-text)
diff --git a/app-emacs/dap-mode/metadata.xml b/app-emacs/dap-mode/metadata.xml
new file mode 100644
index 000000000000..c5f3eebffb11
--- /dev/null
+++ b/app-emacs/dap-mode/metadata.xml
@@ -0,0 +1,14 @@
+<?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>
+    <changelog>https://raw.githubusercontent.com/emacs-lsp/dap-mode/master/CHANGELOG.org</changelog>
+    <bugs-to>https://github.com/emacs-lsp/dap-mode/issues/</bugs-to>
+    <remote-id type="github">emacs-lsp/dap-mode</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/deferred/Manifest b/app-emacs/deferred/Manifest
new file mode 100644
index 000000000000..90bb5a2eb1b2
--- /dev/null
+++ b/app-emacs/deferred/Manifest
@@ -0,0 +1,4 @@
+AUX 50deferred-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST deferred-0.5.1.tar.gz 55894 BLAKE2B 61ba363620d56ad4c5f3fb9434f9550015681f6b8eafb318a9e6aa227aa17875218c12338fe377a840bdc429972d6e285a9744ec6640f277bfe7e4bdaee4a733 SHA512 357890f73917c7929cbb79f71a26901ac24abe9ea532181b730deee8eba97709b41c360904e2a2a8028ee1295e7ae845da5c702c74256a450f3d144080960a2b
+EBUILD deferred-0.5.1.ebuild 852 BLAKE2B 8ffce52a393e31cc432baff3e8595016d381cb0b00a3507c721970054fc4344f5b979b33227c8c0ef2e0a524d224378da3c5008f5b476b0da81414b8439861e9 SHA512 ed1dfff32f7609ec1c32484faf638e84689cbd1ad729b92a393a32791beac37143e6dec56761af3fa67d6372251483335536358ce82fa3334f7434c143a7e8ff
+MISC metadata.xml 435 BLAKE2B 50ce940d588ca40bbe43a84b98ab49cf8caf22c834b91b1d5964537ebb8e3c1e6d36e3585efd437938e7fa7845f555c1b4d433e45d3053a60044ed101b60390c SHA512 dd497ff5d533ba9026520476c6bd63c0c702911fb1609ee021e9fd34ad72742cd9abf6acf2312340cfc4f0ea044a6e588989ad55bbed857f762ebcb0d7f58458
diff --git a/app-emacs/deferred/deferred-0.5.1.ebuild b/app-emacs/deferred/deferred-0.5.1.ebuild
new file mode 100644
index 000000000000..a128977ca6b4
--- /dev/null
+++ b/app-emacs/deferred/deferred-0.5.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24.4
+
+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}
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		app-emacs/ert-runner
+		app-emacs/undercover
+	)
+"
+
+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"
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	ert-runner --reporter ert+duration || die
+}
diff --git a/app-emacs/deferred/files/50deferred-gentoo.el b/app-emacs/deferred/files/50deferred-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/deferred/files/50deferred-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/deferred/metadata.xml b/app-emacs/deferred/metadata.xml
new file mode 100644
index 000000000000..1ee0a0b8a641
--- /dev/null
+++ b/app-emacs/deferred/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/kiwanami/emacs-deferred/issues/</bugs-to>
+    <remote-id type="github">kiwanami/emacs-deferred</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/diminish/Manifest b/app-emacs/diminish/Manifest
new file mode 100644
index 000000000000..25e61180c383
--- /dev/null
+++ b/app-emacs/diminish/Manifest
@@ -0,0 +1,4 @@
+AUX 50diminish-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST diminish-0.46_pre20220128.tar.gz 18515 BLAKE2B 102dcb37d83ef74371f0e09fb62daf4686802eddee060905e3081d1e77f6ed11a1a6ed0d698b4ae37f2b1899f010e86e6e4c320296e628b14d7bc272be8c7283 SHA512 cc5db5fdbffa58cde04725e5c1e0829142027d171c54e27a0bf960939bdbaebaceef7fb1ce1a31293e319705694d4e2be353fac9c37306416497f2a4c5e8a6fd
+EBUILD diminish-0.46_pre20220128.ebuild 525 BLAKE2B d5aefd65620f2b963ae90fd540e53c6f72c564c7a4f08c9220921d7e1ef2aee7a8109eca6d0bff3dbc57e42eb53e1b7c0271026e49317b0ef15ebaff909ac542 SHA512 dda906c37969240fbf3f440e2ae2303aaf62a2e75a42a05fa35f578766fd77a751d5480288999fadc6820cef1705e53bc959a8b15fa1ace4b15074225efa197d
+MISC metadata.xml 427 BLAKE2B 20a1803ee7e223b5f84ba544720ecfef2124479f80c5e7f2211477db630205dbfe0a2d5a6df1f8041853a2c13c9439062894212bd4ed08ba3360cda3f1520273 SHA512 875cf65754a9d57d3bcbda52f7fcef1ef1d45d5920f2938e9a15afc191e1cc086341d56a4872b759b28c568d903f6ade033fdd254776405b5a040bff1d7d55f9
diff --git a/app-emacs/diminish/diminish-0.46_pre20220128.ebuild b/app-emacs/diminish/diminish-0.46_pre20220128.ebuild
new file mode 100644
index 000000000000..ca948d12b66a
--- /dev/null
+++ b/app-emacs/diminish/diminish-0.46_pre20220128.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=6b7e837b0cf0129e9d7d6abae48093cf599bb9e8
+NEED_EMACS=24.3
+
+inherit elisp
+
+DESCRIPTION="Hiding or abbreviation of the mode line displays (lighters)"
+HOMEPAGE="https://github.com/myrjola/diminish.el/"
+SRC_URI="https://github.com/myrjola/${PN}.el/archive/${H}.tar.gz
+			-> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}.el-${H}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/diminish/files/50diminish-gentoo.el b/app-emacs/diminish/files/50diminish-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/diminish/files/50diminish-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/diminish/metadata.xml b/app-emacs/diminish/metadata.xml
new file mode 100644
index 000000000000..1a8ed85dd20c
--- /dev/null
+++ b/app-emacs/diminish/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/myrjola/diminish.el/issues/</bugs-to>
+    <remote-id type="github">myrjola/diminish.el</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/doctest-mode/Manifest b/app-emacs/doctest-mode/Manifest
index 59dec4495f21..40582c82a003 100644
--- a/app-emacs/doctest-mode/Manifest
+++ b/app-emacs/doctest-mode/Manifest
@@ -1,4 +1,4 @@
 AUX 60doctest-mode-gentoo.el 191 BLAKE2B 92514ec6c9b9c193f9693d3a2bebb2574a58ca723679688542726d2d8d502c3a7bffbb7b89b7b5e2538c9a3f57ea7dd138586895d6e0b9d8ea7c73d4c32338ec SHA512 b8cd1cc6a2f8fed8b7c979736422050182a008d78665d4dd0897bcd34dde7a214b9e62533a1df6a1021f7028a22e78cd8f31a2515835c60ab492cff6e294a8fe
 DIST doctest-mode.el 75232 BLAKE2B aefe0953e66ebf5a3dd8a650a013af66d9eda41a496411012caf49098daa67d5576b5e1fb149cdfe4d088bc3342b83943676b58d088e685ee724875ab9aa0c15 SHA512 e32326644cb66bf5cfa9a597364a46b2279636368c751940eb418c670219cd907ecb60f6d2b6a8a4ec8970df4f17500be053b9fc6b75fece908dc37329d9aa9c
-EBUILD doctest-mode-0.4.ebuild 559 BLAKE2B d12bcb8de8b96e7a85ba6375a42cc14ea5553b0bab9c30445d926b1db88edf9b8475dac805054f53b9bd2bf3b39ac9520d380c9cae04dc8c825711693f2b6646 SHA512 9559f19742aeec27afe936167643760cd4caf296ee1df29600c207a199cdb58b91deca108f23e0755aeb9d1ab4237e503b2e14d1c4d9ba7bd8b04ba2a93b7b14
+EBUILD doctest-mode-0.4.ebuild 553 BLAKE2B 28c7d618caa37ddeaa9652ca5e8bd39cd78a165318347636f00902173b7ea523db8948219ce75a33f409247b55be74b7771ecf1a38db128b07b7b1764d2d3113 SHA512 5ded5b434e6239c2be399a4b8c90e121e658d80e014f15311eb4ff85995c8b65627a8dc7be2d37c6fd8137663da147e54c041b2a9e4b791ebf8fabec57dc9b79
 MISC metadata.xml 366 BLAKE2B c5c470440c6aeb0592f484aec674ee949c75094f428f7392df1fc8de99f16f4eeadbcb0ca1dbcf573e812a16cee49bfaa59e7769a951d5c92dcac118f8b3233b SHA512 79b1ca69158fd688006e1589fd7a6c558cc7064053a3580fb2c0891cd3de73410ad9ad6034949a7cd8963c85206858ac6b35a556e3fe57dde2c1fb2b850fbb6f
diff --git a/app-emacs/doctest-mode/doctest-mode-0.4.ebuild b/app-emacs/doctest-mode/doctest-mode-0.4.ebuild
index 6a4d88194c93..c755dbc605ac 100644
--- a/app-emacs/doctest-mode/doctest-mode-0.4.ebuild
+++ b/app-emacs/doctest-mode/doctest-mode-0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://python-mode.svn.sourceforge.net/viewvc/*checkout*/python-mode/tr
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 x86"
+KEYWORDS="amd64 arm ~hppa ~ia64 ppc ppc64 x86"
 
 S="${WORKDIR}"
 SITEFILE="60${PN}-gentoo.el"
diff --git a/app-emacs/dune-format/Manifest b/app-emacs/dune-format/Manifest
new file mode 100644
index 000000000000..686251219795
--- /dev/null
+++ b/app-emacs/dune-format/Manifest
@@ -0,0 +1,4 @@
+AUX 50dune-format-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST dune-format-0.1.tar.gz 2477 BLAKE2B a043e6e6aeeac33e3265794ca5dec4fd1292a19a210e4a3be0f5dc21de4c1516587f25eb0513ba653defbdeba7d781c1a09903cddf0b7f8a0b3c2ce43235672d SHA512 511dcdc5f4413dc680cb1102c35b737c406ef4fb8e69150b60e7bc11bf877d94a039ebe7224c62a304004015471dab7f2b50fae32d9119221d435b06041df9d9
+EBUILD dune-format-0.1.ebuild 601 BLAKE2B 17b616f731739cfc8edb7cd2351f51a99120071eb503825f51210aa8bb6b55a405665a149cb9e5bf1241f35414fadd2679181cb587d48bd690322e4fe2dc7a38 SHA512 9c5a5eca247c01d837622ba3ccde34fc35faf00dcc7d973a6e76691d18a58f37be54db0985889586a3dac2e342d641a32338ba37ccd0a32bf1641b93a7315bf9
+MISC metadata.xml 538 BLAKE2B 6182f7bc6d7b5cbe01fff2a819ea8a4de59391492fda5c00ede086d5489f570d4166c2e2c1d74b4fe738f2c6ac2d9fb18e3cddc084bee554593966082eda7a3e SHA512 9db0da7d81a0a5b87a6ae4a057c6829af1c10b260e54730ef612af6e2a6cf530edfa9ca28d29f1a4c886c2242d07b9049162c6585ea4614103814ce4914eab6d
diff --git a/app-emacs/dune-format/dune-format-0.1.ebuild b/app-emacs/dune-format/dune-format-0.1.ebuild
new file mode 100644
index 000000000000..a2b2acf211da
--- /dev/null
+++ b/app-emacs/dune-format/dune-format-0.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24.1
+
+inherit elisp
+
+DESCRIPTION="Reformat OCaml's dune files automatically"
+HOMEPAGE="https://github.com/purcell/emacs-dune-format/"
+SRC_URI="https://github.com/purcell/emacs-${PN}/archive/${PV}.tar.gz
+			-> ${P}.tar.gz"
+S="${WORKDIR}"/emacs-${P}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="app-emacs/reformatter"
+RDEPEND="
+	${BDEPEND}
+	dev-ml/dune
+"
+
+DOCS=( README.md )
+ELISP_REMOVE="Makefile"  # Makefile downloads pkgs from net
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/dune-format/files/50dune-format-gentoo.el b/app-emacs/dune-format/files/50dune-format-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/dune-format/files/50dune-format-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/dune-format/metadata.xml b/app-emacs/dune-format/metadata.xml
new file mode 100644
index 000000000000..773899dc27c6
--- /dev/null
+++ b/app-emacs/dune-format/metadata.xml
@@ -0,0 +1,17 @@
+<?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>
+  <maintainer type="project">
+    <email>ml@gentoo.org</email>
+    <name>ML</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/purcell/emacs-dune-format/issues/</bugs-to>
+    <remote-id type="github">purcell/emacs-dune-format</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/ebuild-mode/Manifest b/app-emacs/ebuild-mode/Manifest
index 8660c90c4097..5eef3848ef62 100644
--- a/app-emacs/ebuild-mode/Manifest
+++ b/app-emacs/ebuild-mode/Manifest
@@ -1,8 +1,8 @@
 AUX 50ebuild-mode-gentoo-1.54.el 1509 BLAKE2B 98cf2a1672723ffaa3f4d2f57b4b67b897df56cc2d7352366b79df0578b927faae53c3cc703fa70cf23bd0b1006d8c49dd8e59fcaffa3a231fd7ec5e26c7dce5 SHA512 91c59e85ea79733c195985e4a33dfb1aec8ac13457c0dc3fe7353fb2616787ebde4393b671a2943b752725593929070b658c24955d5e2132b6e9b76daa749850
-DIST ebuild-mode-1.54.tar.xz 35768 BLAKE2B 8cfba7230eb61bcdede498c696aedd7c64d01e5a1e7a22ad0edf793fbf6970bddd818d431e717bcc0b5ea07d35b525468131df260206db912f36341947b98d08 SHA512 7e67f3875beb42bc94fe522364212a02ea93e11aa1a64512283ab783c5a41097076b29a3ecf72b4369180253efd26fd3a223d617909953b2c7626f5cbc2aaba1
-DIST ebuild-mode-1.55.tar.xz 36444 BLAKE2B b044f136dcd90608d2e6b3192ea35bdcfb19efb71a1ed9035d22afd9ee1aafe39e12c8e07908df8a222cded58b0549497298fb6cc92844794214d86e67225529 SHA512 ee1b25fcd12d5df56d9898eef49bd6df02d970bb62fa61a12a1a4a2fd165076d31cb99c92ee3bc7b64ad6b6d2d70a16933d84165640f25acfe5fc9252b0cee51
 DIST ebuild-mode-1.56.tar.xz 36448 BLAKE2B 9126dd5d004a5818a5214f10c88db84faee3945ac25ee141a577a868bf7f127490ee34d6ea103fb788f96c391eea3d00d18abe12564a2f6c70650fc8fe9c6cdf SHA512 2b67208d9f553a322761dc9b64e7b891722c2099cc7c9bfc929e1a424b22ec32c594e0ba029554434b51ef233d2d4435b6c639b06c25fd551608fe5dd830cb03
-EBUILD ebuild-mode-1.54-r1.ebuild 736 BLAKE2B 71e62344d03621defdb9be57b0f1da6a4db3e1d84c0d6ef9118273fa5025c5cdb999ed4e509c4d0f8d551fc8a58d9bbaf891e5e61bdb7a64e177fc7314a24d20 SHA512 73dee87d1887bf399a87d22022aa80b6cac9697e5a537b9e953555d4aa3ec84f0d5f74ebcd03be59ceb0e07df22ee2298214f1826d9f0129c4f3708a5d9d6b64
-EBUILD ebuild-mode-1.55.ebuild 729 BLAKE2B a4760a8a7b2f4e7189b7af2a2f7d82e84ecad7b0e3edf67e2b3301f23653766664ebb56091a0b0ae0c8d9e3a9eef25e805fae951f4a9225f0692f63d2d6421c6 SHA512 798294723f21671372eb91c9ce2a747ec31abc9c25869adc5d0c4a00b58dcc7d8c4a60de0ed98b33455f9dd6b8429cdbee5101a0b2e40acaab6d8ff3e97035f1
-EBUILD ebuild-mode-1.56.ebuild 736 BLAKE2B 71e62344d03621defdb9be57b0f1da6a4db3e1d84c0d6ef9118273fa5025c5cdb999ed4e509c4d0f8d551fc8a58d9bbaf891e5e61bdb7a64e177fc7314a24d20 SHA512 73dee87d1887bf399a87d22022aa80b6cac9697e5a537b9e953555d4aa3ec84f0d5f74ebcd03be59ceb0e07df22ee2298214f1826d9f0129c4f3708a5d9d6b64
+DIST ebuild-mode-1.57.tar.xz 36548 BLAKE2B 85f677cc5459077d89536e2032049b8be75f24cfad742955b439a1e94beaf82a2a39a4ddb1de1bb8fa847ede637702356d470556f2fab09a13ae6416419a5e07 SHA512 c7eed4bc8e68909abb3407b5a352816c6eb43ada345a967e9e1b666937a44cacf0476475d2b1eeb3f48ddcea04b31ccf7fc938a8cb70f8655cf2b5946d4c0a04
+DIST ebuild-mode-1.58.tar.xz 36796 BLAKE2B c2762c0d00038206d9ceacb887c2c0a1503e7e5dbdc68796aaa27eec5cab52fae1d6e4baf5155b79842fd2e74d91dab1c203c26d9f68986155426b36635b7722 SHA512 37e393b5c5b6672045dea7aafa77df81f7aee2d16ead90e12841026442eac63fe3eece1538401dc4b7444573aec61f4c920f821b65f8489b5a48d54de4d78b52
+EBUILD ebuild-mode-1.56.ebuild 729 BLAKE2B a4760a8a7b2f4e7189b7af2a2f7d82e84ecad7b0e3edf67e2b3301f23653766664ebb56091a0b0ae0c8d9e3a9eef25e805fae951f4a9225f0692f63d2d6421c6 SHA512 798294723f21671372eb91c9ce2a747ec31abc9c25869adc5d0c4a00b58dcc7d8c4a60de0ed98b33455f9dd6b8429cdbee5101a0b2e40acaab6d8ff3e97035f1
+EBUILD ebuild-mode-1.57.ebuild 736 BLAKE2B 71e62344d03621defdb9be57b0f1da6a4db3e1d84c0d6ef9118273fa5025c5cdb999ed4e509c4d0f8d551fc8a58d9bbaf891e5e61bdb7a64e177fc7314a24d20 SHA512 73dee87d1887bf399a87d22022aa80b6cac9697e5a537b9e953555d4aa3ec84f0d5f74ebcd03be59ceb0e07df22ee2298214f1826d9f0129c4f3708a5d9d6b64
+EBUILD ebuild-mode-1.58.ebuild 736 BLAKE2B 71e62344d03621defdb9be57b0f1da6a4db3e1d84c0d6ef9118273fa5025c5cdb999ed4e509c4d0f8d551fc8a58d9bbaf891e5e61bdb7a64e177fc7314a24d20 SHA512 73dee87d1887bf399a87d22022aa80b6cac9697e5a537b9e953555d4aa3ec84f0d5f74ebcd03be59ceb0e07df22ee2298214f1826d9f0129c4f3708a5d9d6b64
 MISC metadata.xml 427 BLAKE2B 2c0846e1ff38584a4101b645f7242526d43c4b6e2eaa202f7d063de531fca4bcecefbdd81278caf3b9e6fe1492277d4c2aa33104eae3ce99f7c4b30c5709946e SHA512 5f4d98e87b3e28bfeb13476382ad46673cb5896bfaa994b856350609ffe9fce1bf31ff8e63702689f5d0a7e07c2e50c1a8b22b09559d77606321981e63e79467
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.56.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.56.ebuild
index 54add5db8bed..0ecdcc8ea7b9 100644
--- a/app-emacs/ebuild-mode/ebuild-mode-1.56.ebuild
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.56.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 BDEPEND="sys-apps/texinfo"
 
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.54-r1.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.57.ebuild
index 54add5db8bed..54add5db8bed 100644
--- a/app-emacs/ebuild-mode/ebuild-mode-1.54-r1.ebuild
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.57.ebuild
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.55.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.58.ebuild
index 0ecdcc8ea7b9..54add5db8bed 100644
--- a/app-emacs/ebuild-mode/ebuild-mode-1.55.ebuild
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.58.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 BDEPEND="sys-apps/texinfo"
 
diff --git a/app-emacs/ecb/Manifest b/app-emacs/ecb/Manifest
index b7be406bd2c1..71dae3833e6b 100644
--- a/app-emacs/ecb/Manifest
+++ b/app-emacs/ecb/Manifest
@@ -1,5 +1,5 @@
 AUX 70ecb-gentoo.el 63 BLAKE2B aafdd070c44a1f7f4aad23ee1d0ff39f1816bb46fa1e667ef12eb276d1877ca18a81c43ae66c285574b85a089255e6613c92dbe751d382280b42613976829cae SHA512 984cfbfa398bd60008dee83721a55f5c6cad0a71caf0d7cc194a84f0d7c061a9a99398e40e90f0a9cf79d2ff689e374c860612bea16e9fa0049d7a82edc56283
 AUX ecb-2.32-gentoo.patch 3430 BLAKE2B 8d373b5ebc1064d5b2fb713f6d3bc31ec34eddfeb9b9519e655bdaab0ced4e4c4aaca03b3013d0daeceaca20f9210625b84d76264be24d9ea99a5745336c0f06 SHA512 1902cec83e62c9b65a62a1fd4a7c8e2ae309b3bd2217b6f821a5a047cf3bdda24b9b5c68e672c1555196a7d28ce06c22398ef15c3c0e6b87bcce1e15d3c333fb
 DIST ecb-2.50_pre20170728.tar.xz 562144 BLAKE2B 922a1f101d01717c5d078fbb055903c43e91360061b792e96e9aa9421d19df2cd47f7e69aae6dba4f188e26682d2a758ff8aa57ff500e5b6fdeaea6920b21a25 SHA512 074738cc323b595caf3d34d6eaa08d6a1a8d3a53762c9bf48b751ab25a16a26a8c71984996b7e7616f4999a0876c6d03751e1e45b68aad712020778da387a59d
-EBUILD ecb-2.50_pre20170728.ebuild 1188 BLAKE2B a95389be81a77807f50441abd494082d9c0deec50e8e26b10f1e800466e93de3a4312f109e25fa1ccbaec3c29aea17d903a97bc7509950dc65b86b7ef777482e SHA512 8ebf9de92d861d87d4534b8398803bdfad30ac81b00aba09710dfd2d715b94b85551bfa6f93618ee1a7e9a859b6656f3af98681467ea1db7e9ba4c88e09b3aae
+EBUILD ecb-2.50_pre20170728.ebuild 1018 BLAKE2B 11d8181466bcd0935e3fee53c7741e1044f47a85a97e7be5d0813ed85cdc4f090e671f14024e86619b3bff205605b837bd56a6afe5efdbbbc1201b2af00c0081 SHA512 202c0ccf5e7617088d63508a7602daf8c53014a13f6e19bcf5a77df8affd118c9d46fc88ff5d2dba34130980b8511ef1df778b4bd1d7d028f6472383af1b4030
 MISC metadata.xml 1594 BLAKE2B 66e334a19d34ede131561a899b211c6daa38a3c48bd876c111b3f3fdeddf8574b82e6869e4aa3addc7457c2f4f05399efbcdae76d6e4d527e24d0860281e000e SHA512 05474e40ff5bcef5d0822379088796987f4814961c967bdf6389f0c31ae13b1f17d29b9e308eec9e7952b2e2fddfc9af9bd4b6da5e8d2823a85589cf9911a563
diff --git a/app-emacs/ecb/ecb-2.50_pre20170728.ebuild b/app-emacs/ecb/ecb-2.50_pre20170728.ebuild
index 204485437855..9c0199f9da19 100644
--- a/app-emacs/ecb/ecb-2.50_pre20170728.ebuild
+++ b/app-emacs/ecb/ecb-2.50_pre20170728.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,10 +13,6 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="java"
-
-RDEPEND="java? ( app-emacs/jde )"
-DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${PN}-${PV%_*}"
 SITEFILE="70${PN}-gentoo.el"
@@ -31,9 +27,7 @@ src_prepare() {
 }
 
 src_compile() {
-	local loadpath
-	use java && loadpath="${EPREFIX}${SITELISP}"/{elib,jde,jde/lisp}
-	emake LOADPATH="${loadpath}"
+	default
 }
 
 src_install() {
diff --git a/app-emacs/ecukes/Manifest b/app-emacs/ecukes/Manifest
new file mode 100644
index 000000000000..0c4ea8f976df
--- /dev/null
+++ b/app-emacs/ecukes/Manifest
@@ -0,0 +1,5 @@
+AUX 50ecukes-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+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 1118 BLAKE2B 5fdc8114ca4316a3d3a2f5c459a56b5545e2532b208a6f14d297a4de30b0011674c8d74cf6f2398da7cbfe9f5f3e5098942f14ea6a80199d487616c63badb09f SHA512 ff642205e5328c4a1f00444bd8bc2206f96e7bd39649234e3f2dc400785583b7b8e86d7d22702a617de86280fda61459743b0ecaa6c49afdecdf45e128887140
+MISC metadata.xml 415 BLAKE2B b94371a8c502d58931a7faa90a0cf214ab4b66626fc2dee7ebfe6d56942fd6a7ca29bbd4e2802815e810ed85f5732189994a264ba2058e503be8f88921dd1542 SHA512 ae0cb2fd56ef6ac124b2756cba275f4ca8d96066bdf0f3505e58afd62d5d86c8639c174d3b4f13b5f4ede658045e9be56b87f6e23e2e52b27bda26eb00a676fb
diff --git a/app-emacs/ecukes/ecukes-0.6.18-r1.ebuild b/app-emacs/ecukes/ecukes-0.6.18-r1.ebuild
new file mode 100644
index 000000000000..1e8bbe61c27d
--- /dev/null
+++ b/app-emacs/ecukes/ecukes-0.6.18-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Cucumber for Emacs"
+HOMEPAGE="https://github.com/ecukes/ecukes/"
+SRC_URI="https://github.com/ecukes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-emacs/ansi
+	app-emacs/commander
+	app-emacs/dash
+	app-emacs/espuds
+	app-emacs/f
+	app-emacs/s
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		app-emacs/el-mock
+		app-emacs/ert-runner
+	)
+"
+
+DOCS=( README.markdown )
+PATCHES=( "${FILESDIR}"/${PN}-bin-launcher-fix.patch )
+
+# Remove pkg file and failing tests
+ELISP_REMOVE="${PN}-pkg.el test/${PN}-parse-line-test.el"
+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() {
+	ert-runner --reporter ert+duration --script || die
+}
+
+src_install() {
+	elisp_src_install
+	elisp-install ${PN}/reporters reporters/*.el{,c}
+
+	dobin bin/${PN}
+}
diff --git a/app-emacs/ecukes/files/50ecukes-gentoo.el b/app-emacs/ecukes/files/50ecukes-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/ecukes/files/50ecukes-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/ecukes/files/ecukes-bin-launcher-fix.patch b/app-emacs/ecukes/files/ecukes-bin-launcher-fix.patch
new file mode 100644
index 000000000000..254fa28d09b3
--- /dev/null
+++ b/app-emacs/ecukes/files/ecukes-bin-launcher-fix.patch
@@ -0,0 +1,31 @@
+index 45ea622..b20754e 100755
+--- a/bin/ecukes
++++ b/bin/ecukes
+@@ -33,7 +33,7 @@
+ # Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ # Boston, MA 02110-2022, USA.
+ 
+-ECUKES_HOME=$(dirname "$(dirname "$BASH_SOURCE")")
++ECUKES_HOME="@SITELISP@"
+ ECUKES_CLI=$ECUKES_HOME/ecukes-cli.el
+ 
+ if [[ -n "$INSIDE_EMACS" ]]; then
+@@ -60,9 +60,9 @@ if has_option "--win" $@ || has_option "--no-win" $@ ; then
+   export ECUKES_OUTFILE=$(mktemp /tmp/ecukes.XXX)
+ 
+   if has_option "--win" $@; then
+-    "$ECUKES_EMACS" --load "$ECUKES_CLI" -Q
++    "$ECUKES_EMACS" --load "$ECUKES_CLI" -q
+   else
+-    "$ECUKES_EMACS" -nw --load "$ECUKES_CLI" -Q
++    "$ECUKES_EMACS" -nw --load "$ECUKES_CLI" -q
+   fi
+ 
+   STATUS=$?
+@@ -72,5 +72,5 @@ if has_option "--win" $@ || has_option "--no-win" $@ ; then
+ 
+   exit $STATUS
+ else
+-  "$ECUKES_EMACS" --script "$ECUKES_CLI" -Q
++  "$ECUKES_EMACS" --script "$ECUKES_CLI" -q
+ fi
diff --git a/app-emacs/ecukes/metadata.xml b/app-emacs/ecukes/metadata.xml
new file mode 100644
index 000000000000..b97306483f71
--- /dev/null
+++ b/app-emacs/ecukes/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/ecukes/ecukes/issues/</bugs-to>
+    <remote-id type="github">ecukes/ecukes</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/el-mock/Manifest b/app-emacs/el-mock/Manifest
new file mode 100644
index 000000000000..f2c7ae814207
--- /dev/null
+++ b/app-emacs/el-mock/Manifest
@@ -0,0 +1,4 @@
+AUX 50el-mock-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST el-mock-1.25.1.tar.gz 5825 BLAKE2B e04f193e6d27a0081dd8c9eceafc79b585f8556e0c4dc75f7c27e657b939e6320268c90bb63aca15a7261598edbdbf6cd936230b0c1dc64de24de8a67bc51920 SHA512 8b55c94489d6461124c3e39920e5aeb2e1adb492f08aa4312c6029f392c6acdea1c01872995934e500d6ff63c3d2d38c9dde86c55135421a28e3a79ace38d7d8
+EBUILD el-mock-1.25.1.ebuild 431 BLAKE2B 8727cdf3787c5b005804acc014889a88eb1fd1e9e35a70942bd7d262df647d20b2c68d5d7d3d469a602037f85ccf459db2007e80007119b46941362a7edc4e74 SHA512 30760ae7e21ec40061eee6c2255122212831604fdc34270caf419e888d8fdf97bb18290b2c7ac88dfa9f26cc415e1d9ebd271222707af8b44cfe986d12ef531e
+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
new file mode 100644
index 000000000000..335163df7109
--- /dev/null
+++ b/app-emacs/el-mock/el-mock-1.25.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Mocking library for Emacs"
+HOMEPAGE="https://github.com/rejeep/el-mock.el/"
+SRC_URI="https://github.com/rejeep/${PN}.el/archive/v${PV}.tar.gz
+			-> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}.el-${PV}
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/el-mock/files/50el-mock-gentoo.el b/app-emacs/el-mock/files/50el-mock-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/el-mock/files/50el-mock-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/el-mock/metadata.xml b/app-emacs/el-mock/metadata.xml
new file mode 100644
index 000000000000..278694c35599
--- /dev/null
+++ b/app-emacs/el-mock/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/rejeep/el-mock.el/issues/</bugs-to>
+    <remote-id type="github">rejeep/el-mock.el</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/eldev/Manifest b/app-emacs/eldev/Manifest
new file mode 100644
index 000000000000..3d2807b4b2f6
--- /dev/null
+++ b/app-emacs/eldev/Manifest
@@ -0,0 +1,4 @@
+AUX 50eldev-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST eldev-1.1.tar.gz 214028 BLAKE2B 2e4a7b15df3e897df5fd029c9c2e298d46dd75316810dc5b859c933b818b65b53dd33451d6e284ec4a24de7de251f24225c8641d44f545db62f4f1777c776ab7 SHA512 acdea3eba36c7d1f06111c31b6e6467ec3b33ca42e06af64c0f67dbb2cbba631223c41dabba51eddf668920ab1eb4f75eaef2fe03a9bdd44163a2bc903cfb1ed
+EBUILD eldev-1.1.ebuild 1149 BLAKE2B 2934e5c1b708cd0f46b9940452ffdfdfbfcf49bf9db0107f169e76d7128403f8b1bbf545709f64052e8d8410ae54db280714edc97f7836d87f7722c411240469 SHA512 57c6d579e2f77a6738a515f30a6498b2c90010a98f063e43fe9c702267c054111e85374a5b5829595a6df4a02331232509b298d511e7b05e0364bd441ebe20c9
+MISC metadata.xml 982 BLAKE2B db2324ced8f4bc4ba579130677175a9de7a8dc7b8d937cd902edd69a20bc897bf4ee034acb6a9400b88de82c58c2b144e62ec4ac7b75d8dc63cdf56670cacc9e SHA512 3e4d2d7ea4fbada45b4d933d7711266bcd9ffd217ee3c3e3351e9f66145785dc11449b4f09f5ffa4853d2b475db45e501848d259f80fb5aa26429acadcb6da7d
diff --git a/app-emacs/eldev/eldev-1.1.ebuild b/app-emacs/eldev/eldev-1.1.ebuild
new file mode 100644
index 000000000000..3f35959f7270
--- /dev/null
+++ b/app-emacs/eldev/eldev-1.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24.4
+
+inherit elisp
+
+DESCRIPTION="Emacs Lisp Development Tool"
+HOMEPAGE="https://github.com/doublep/eldev/"
+SRC_URI="https://github.com/doublep/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+DOCS=( README.adoc )
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	ELDEV_LOCAL="${S}" ./bin/${PN} test
+}
+
+src_install() {
+	elisp_src_install
+	dobin bin/${PN}
+
+	# NOTICE: If ELDEV_LOCAL is defined Eldev will use it
+	# to load up it's components,
+	# if it is not it will bootstrap itself from network
+	# always check if it uses installed Emacs Lisp files.
+	# Also, do not forget to run `env-update` & reopen your shell.
+	# https://github.com/doublep/eldev#influential-environment-variables
+	echo "ELDEV_LOCAL=${SITELISP}/${PN}" >> "${T}"/99${PN} || die
+	doenvd "${T}"/99${PN}
+}
+
+pkg_postinst() {
+	elisp_pkg_postinst
+
+	ewarn "Remember to run \`env-update && source /etc/profile\` if you plan"
+	ewarn "to use Eldev in a shell before logging out (or restarting"
+	ewarn "your login manager)."
+}
diff --git a/app-emacs/eldev/files/50eldev-gentoo.el b/app-emacs/eldev/files/50eldev-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/eldev/files/50eldev-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/eldev/metadata.xml b/app-emacs/eldev/metadata.xml
new file mode 100644
index 000000000000..cb313e2aec78
--- /dev/null
+++ b/app-emacs/eldev/metadata.xml
@@ -0,0 +1,22 @@
+<?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>
+    <changelog>https://github.com/doublep/eldev/releases/</changelog>
+    <bugs-to>https://github.com/doublep/eldev/issues/</bugs-to>
+    <remote-id type="github">doublep/eldev</remote-id>
+  </upstream>
+  <longdescription>
+    Eldev (Elisp Development Tool) is an Emacs-based build tool, targeted
+    solely at Elisp projects. It is an alternative to Cask. Unlike Cask, Eldev
+    itself is fully written in Elisp and its configuration files are also Elisp
+    programs. If you are familiar with Java world, Cask can be seen as a
+    parallel to Maven — it uses project description, while Eldev is sort of a
+    parallel to Gradle — its configuration is a program on its own.
+  </longdescription>
+</pkgmetadata>
diff --git a/app-emacs/elixir-mode/Manifest b/app-emacs/elixir-mode/Manifest
new file mode 100644
index 000000000000..5267dd28d9ca
--- /dev/null
+++ b/app-emacs/elixir-mode/Manifest
@@ -0,0 +1,4 @@
+AUX 50elixir-mode-gentoo.el 361 BLAKE2B d8616511eb05c9a7e7e02cf9955e27fc22675ee68f46f4cd3c7c3efdb033212da8f1f2dbdc554397f142b9b5fc80276c918a0c7f120381b12ee547af292a6ec1 SHA512 70616fdce937d299a37364dff0f18a1595e3cf65e25ef2fea7e6827cd3a713ecfe4a737e20ac8f7bca200479349293ccb25ca39bcc3c65d722479f2498812582
+DIST elixir-mode-2.3.2_p20220314.tar.gz 35711 BLAKE2B f4d712bce35f1056a2b2baf23077fff6204d572f215bf3afe31e26fc15691927afdbe880f942073e80dbe0ce3937dc619b24f89f821a6655f944a448db995744 SHA512 f4467459918db88408c2fa04fcb053fcdf2987c5907f0481034fa18bc3c7a805a7a01d071d7662f4d0db16aa02faa312f225b2b6f45587ccf06a616a1b6df485
+EBUILD elixir-mode-2.3.2_p20220314.ebuild 725 BLAKE2B b8db9b896a07239122f636a7294bf23756a1c7acb87f5fe96515d0ddbeff54d447c414501ec28d28faf78d42fffc4cc0b6658197cd6a6d6a003140efafeb525f SHA512 ba252e4f1c7335a22fae5ab658b9ceda6f9217695fb5817426311f3dd5f07b0e061a07cebb17ec8b52b08c979f0922c38c4d39486abd8aa41743441479659406
+MISC metadata.xml 443 BLAKE2B 03fd8006b1fafa30cc0e438e9ee2f805492c16cd6075a3f1e7b01a214c61f404537771355eb56db5a1525533eaa000eab1bd572639141f9c6bbbd424e7624fd1 SHA512 1d35ec07722b9acb8f5dc46719d9fbd54e48e42e34bfc93d0200313f64df0c97f51d9c993d70d62994b067384c55948c63d0f7bd15608fcac540f1fb19e5e645
diff --git a/app-emacs/elixir-mode/elixir-mode-2.3.2_p20220314.ebuild b/app-emacs/elixir-mode/elixir-mode-2.3.2_p20220314.ebuild
new file mode 100644
index 000000000000..82a834e2aec9
--- /dev/null
+++ b/app-emacs/elixir-mode/elixir-mode-2.3.2_p20220314.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=e0d0466d83ec80ddb412bb1473908a21baad1ec3
+NEED_EMACS=25
+
+inherit elisp
+
+DESCRIPTION="Emacs major mode for editing Elixir files"
+HOMEPAGE="https://github.com/elixir-editors/emacs-elixir/"
+SRC_URI="https://github.com/elixir-editors/emacs-elixir/archive/${H}.tar.gz
+			-> ${P}.tar.gz"
+S="${WORKDIR}"/emacs-elixir-${H}
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		app-emacs/ert-runner
+		dev-lang/elixir
+	)
+"
+
+DOCS=( CHANGELOG.md README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	ert-runner -L . -L tests --reporter ert+duration tests || die
+}
diff --git a/app-emacs/elixir-mode/files/50elixir-mode-gentoo.el b/app-emacs/elixir-mode/files/50elixir-mode-gentoo.el
new file mode 100644
index 000000000000..d90ae53151be
--- /dev/null
+++ b/app-emacs/elixir-mode/files/50elixir-mode-gentoo.el
@@ -0,0 +1,7 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'elixir-mode "elixir-mode"
+  "Major mode for editing Elixir code." t)
+(add-to-list 'auto-mode-alist '("\\.elixir\\'" . elixir-mode))
+(add-to-list 'auto-mode-alist '("\\.ex\\'" . elixir-mode))
+(add-to-list 'auto-mode-alist '("\\.exs\\'" . elixir-mode))
+(add-to-list 'auto-mode-alist '("mix\\.lock" . elixir-mode))
diff --git a/app-emacs/elixir-mode/metadata.xml b/app-emacs/elixir-mode/metadata.xml
new file mode 100644
index 000000000000..5f5dd3fd1e80
--- /dev/null
+++ b/app-emacs/elixir-mode/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/elixir-editors/emacs-elixir/issues/</bugs-to>
+    <remote-id type="github">elixir-editors/emacs-elixir</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/elpher/Manifest b/app-emacs/elpher/Manifest
new file mode 100644
index 000000000000..45505f7c0390
--- /dev/null
+++ b/app-emacs/elpher/Manifest
@@ -0,0 +1,6 @@
+AUX 50elpher-gentoo.el 112 BLAKE2B 1449734aec6fd3efe344c648f815b3e826e885a7b8d57909ee0eac50a5d1937974c6dffc202147ff319f356a69f329dbdfd52cf410cc50aa3895134d8277342a SHA512 ec9eab724eaf149120eff2476f816ed1b8db6d04da1ad673cb9e55dac17dd96a2209ca842d49ef8039bf17aa4ffff940f0afd87403ab7845f9300423695eab15
+DIST elpher-3.3.3.tar.gz 57439 BLAKE2B f8e3f2acba0faf0eeae06fe86699dc97def0119a6d6e2fa2ad34555e20907deb566f99a669e8f98380c95293c4a38cca9bc47678f36597c898ba1e33dc6d0880 SHA512 ca40dcb92af8b5f3635cd45f0877f750746d0eb61aff71fc16754770709d15f35d0f335a04ecd9ee6b6f13440f9a9e55afb2cdb2934e550157b3218d428fdfa1
+DIST elpher-3.4.1.tar.gz 58460 BLAKE2B e7b0ad033b2ec51b0700128c566c5f50af8cdd9ed2120d12b39a62f0b3486347dd4b2af1cdf0223f9300b7f7fbd767342c654b4a4d02455db105045dc8fb1c4f SHA512 8cb1aa587e373e5cc0957286f9b86dc7958f20db0bb61ed815f45747a6cede328da16017897d83489a9a347055d08e95bd2effdda7cccd2de79ac5e4e525cbc6
+EBUILD elpher-3.3.3.ebuild 571 BLAKE2B 1c1bce496c24eb5d2138b958771127a62f2789b70c2d6272eddd9b566265502c978c5847be88ff6e74f63cdc1c82fe3b2193a6df0229a4394524ad5b4e2f3a75 SHA512 9fbf02207c8f5619ead700b4437b53f1d333cd23e491381241fc14f5fc84771df6a8d4652affb166cb66f8c8325a7471eb0163788c00d302edcc353521e43709
+EBUILD elpher-3.4.1.ebuild 571 BLAKE2B 0fe00d3bf3cfba1b329d1211e84513c1ec38265fd05c557f73bbdd10795cf7b1ea09222c34d62f43e914b5267ee94f5b4983b9e66336f3f322c2db9c16f9b616 SHA512 5aaa7fd505e23932975bc1aeb220b92009ce440d3c3b5dd247d9a874ee5621a923985f7e428d569ab2d8991f36555870d8d0abe9a9e10a067cc42411dc203953
+MISC metadata.xml 269 BLAKE2B e431fc3cbf82ae368f62ce9c0a0779eef2141b1d6aef94a47a87d29c92f5fae3f9cbcfbe59ab14a74bee673698b61a7446e4ade1804f330a9e2926b43ad3e700 SHA512 2899510a1184404b72d35aea6d963bfe2be26922150cd2f1f68107c22055a12e5b9ac54d9c07ad539ddaa204624ddf61990a3272ef4aa3f31e10b0a78b2fcc9a
diff --git a/app-emacs/elpher/elpher-3.3.3.ebuild b/app-emacs/elpher/elpher-3.3.3.ebuild
new file mode 100644
index 000000000000..0213ce72cc37
--- /dev/null
+++ b/app-emacs/elpher/elpher-3.3.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=ab75cff
+NEED_EMACS=27.1
+
+inherit elisp
+
+DESCRIPTION="Practical and friendly Gopher and Gemini client for GNU Emacs"
+HOMEPAGE="https://thelambdalab.xyz/elpher/"
+SRC_URI="https://thelambdalab.xyz/gitweb/index.cgi?p=${PN}.git;a=snapshot;h=${H};sf=tgz
+			-> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${H}
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+DOCS=( ISSUES.org README )
+ELISP_REMOVE="elpher-pkg.el"
+ELISP_TEXINFO="${PN}.texi"
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/elpher/elpher-3.4.1.ebuild b/app-emacs/elpher/elpher-3.4.1.ebuild
new file mode 100644
index 000000000000..121ce7504d4b
--- /dev/null
+++ b/app-emacs/elpher/elpher-3.4.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=bf0dd36
+NEED_EMACS=27.1
+
+inherit elisp
+
+DESCRIPTION="Practical and friendly Gopher and Gemini client for GNU Emacs"
+HOMEPAGE="https://thelambdalab.xyz/elpher/"
+SRC_URI="https://thelambdalab.xyz/gitweb/index.cgi?p=${PN}.git;a=snapshot;h=${H};sf=tgz
+			-> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${H}
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+DOCS=( ISSUES.org README )
+ELISP_REMOVE="elpher-pkg.el"
+ELISP_TEXINFO="${PN}.texi"
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/elpher/files/50elpher-gentoo.el b/app-emacs/elpher/files/50elpher-gentoo.el
new file mode 100644
index 000000000000..a73fc867a088
--- /dev/null
+++ b/app-emacs/elpher/files/50elpher-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'elpher "elpher"
+  "Start elpher with default landing page." t)
diff --git a/app-emacs/elpher/metadata.xml b/app-emacs/elpher/metadata.xml
new file mode 100644
index 000000000000..717a115d639c
--- /dev/null
+++ b/app-emacs/elpher/metadata.xml
@@ -0,0 +1,9 @@
+<?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>
+</pkgmetadata>
diff --git a/app-emacs/emacs-common/Manifest b/app-emacs/emacs-common/Manifest
index 9e9c73fd1c73..4227f2d9fe17 100644
--- a/app-emacs/emacs-common/Manifest
+++ b/app-emacs/emacs-common/Manifest
@@ -1,3 +1,3 @@
 DIST emacs-common-1.8.tar.xz 61352 BLAKE2B 084cf06c03db231c92d0074a2e633d209257941b2840c2c745462050e694756f97679c7078357d9eab7b2fcfb85b00ab390d65254ddd106d0ef1a1fd723b2c4c SHA512 85c4b826c0691fd24f260750f4c3f9ecc3b59d11b4dafcae608e1a2546c064b240084974962b0727ac8183b8f5b0891cf47add901461f77ee275a129341b2b13
-EBUILD emacs-common-1.8.ebuild 2893 BLAKE2B 4b183e81f6012b725f7372f03cf570e6d269c5f7bc4d8b81eac2892eb435cb017310cf2d0e95647ac0b4ce45874472370d52e6772aa1b3e79f035f45c79be1ef SHA512 5c0f949e6a51ad581017c80c2b827cee3c9685dcb7620bc36299524838f03d67303ed242457627d41701334000daac42f1c38d006a0105d69bf8981223ec1395
+EBUILD emacs-common-1.8.ebuild 2887 BLAKE2B 424c23ebee25afba5431f8c16303a700ab33c4d310ee6d671eeeedb564f272f37da0c31f49ca1df87f236552fe1266541521795dc92afd9f32813e5fd9d4a037 SHA512 600a1b41f6cda15f19f82283fd4e3d6583cf641f2f4717ca7d6b9882a1bc884167169ed2943df54045d932aedef2cf4a2e867ea0ddc35d4c5aea39ec5539b7dc
 MISC metadata.xml 361 BLAKE2B d6ce072291bc875d0af89563bd19f9b64b5d7bdf02a369b9885bec238c3b08d4a2b1c7c8b65f5140c80c9e9f0178100bd2932b75b707094c80409157af126026 SHA512 f76df6b1e6606e8bed92b5a86ff26eb9876b2d385f1ca7feeed0df22cd82314735cf90cbffda0c462ae14930de3dd70460e6209281da1993141fe97dfcc88605
diff --git a/app-emacs/emacs-common/emacs-common-1.8.ebuild b/app-emacs/emacs-common/emacs-common-1.8.ebuild
index ab4948b17158..23fd1e952a2e 100644
--- a/app-emacs/emacs-common/emacs-common-1.8.ebuild
+++ b/app-emacs/emacs-common/emacs-common-1.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="games gui"
 
 RDEPEND="games? ( acct-group/gamestat )"
diff --git a/app-emacs/emacs-daemon/Manifest b/app-emacs/emacs-daemon/Manifest
index 5b4de03bad31..ccb3c363b76b 100644
--- a/app-emacs/emacs-daemon/Manifest
+++ b/app-emacs/emacs-daemon/Manifest
@@ -1,3 +1,3 @@
 DIST emacs-daemon-0.22.tar.xz 5276 BLAKE2B a866b14951df94e1d382253dcb7045beb800c9dd754f7eed40eadecde43fd583bb2bc20ad9ccc9f87174b06aadbb26f7875deaf36d9bb5325f98ffa58fded8c7 SHA512 f013cd00d3a24ca348bf718dd20dec7bea89107c0a27c921d6b58595b611991830604fc658d57681708218fbee1dae6dd0b277a2a9da67639e3553e0fd133094
-EBUILD emacs-daemon-0.22.ebuild 1611 BLAKE2B 658d3d3e0b2d2e66f7dfc6f0d1d97dbda36c58354a78a7ba0faf9ae5ef04bb7f74ae19e61c1122978ad2f848c47147042d491aa4197554e65648d012b410c549 SHA512 dc2a84098fb0eee23005e9490f29ee8f72d96725fe6442d298580db91acf8ea8f8480b53290d1ac95a15b60ebec411b3f26fcd8632929cd26472e67fba08e561
+EBUILD emacs-daemon-0.22.ebuild 1605 BLAKE2B b09a01d83b917e85e6cfc1399d5c209a562042a4781c3ceef0d3c832e86f876aad922a9c9e4e0956e459dd9132eec24e0029f63653d13adac5b8c06a1471b388 SHA512 10a2794632df7313018e9eb64ccd09263fdc6e6cac6046faa5864b3450e7154255df327ce4fce377550f937806721e21f07bfa1e5102567b08b39a3a5793e76e
 MISC metadata.xml 283 BLAKE2B 81c49021199f71096079a27f9121390fb8c1285c54b9478583ff2d647277fa106ef12456d7097c4be092fc48b514a1adcf855ca0fac911598232ef9eb7f102c0 SHA512 f32b303760addf5d4db8d18bd10fb677353cdfa4c5e545d47804ef756cf5e5a21f8b8efb631b08f802185913ceb98da820e404e06eb03d01fe9ea85c10d1ac13
diff --git a/app-emacs/emacs-daemon/emacs-daemon-0.22.ebuild b/app-emacs/emacs-daemon/emacs-daemon-0.22.ebuild
index f22b98276df5..3fc5437f04cf 100644
--- a/app-emacs/emacs-daemon/emacs-daemon-0.22.ebuild
+++ b/app-emacs/emacs-daemon/emacs-daemon-0.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 
 SITEFILE="10${PN}-gentoo.el"
 
diff --git a/app-emacs/emacs-ipython-notebook/Manifest b/app-emacs/emacs-ipython-notebook/Manifest
new file mode 100644
index 000000000000..fdccf39a78b4
--- /dev/null
+++ b/app-emacs/emacs-ipython-notebook/Manifest
@@ -0,0 +1,4 @@
+AUX 50emacs-ipython-notebook-gentoo.el 183 BLAKE2B 007608b7763cd9223bad524b5219503687c1e6665a2269a09621a9e381de9373ba299cc6b808c000d65b916f554f6ccef76b3f96fdd665b3ae4ec8443dc909a3 SHA512 be0e3a9e03a944947134a776164f8fdd206943609f7f84e7663363c3745c69d0a4d7fb8986b619e32e15ebe72c14ff1ec8cc9a47ab9b5c2ba16823b598adf648
+DIST emacs-ipython-notebook-0.17.0_p20220419.tar.gz 313340 BLAKE2B 5ab9b82d8d17c3f64c375de7638aa4006e7dc47137260ab0a8222f7c507a54b32aa145d1630b3d0018c8303e0f116da81b61df27cd401875dfad5fd49ecdae13 SHA512 f6c2c293e7d2ddcba9dfac751523e0f8d55047ed01d4546ba1ece1f8833a1d54a1bcc066f34f06e111c34baee21a97c2ede2d90d188d7a05f407631acfd74037
+EBUILD emacs-ipython-notebook-0.17.0_p20220419.ebuild 1743 BLAKE2B cc317a1b3916e0021b51ee4f3dc53e510059a84f7932c2dec00109daa1b8aa40b28aea55af88a9ac0da681d6700239f84de59c8d27f129269ce7aa8f3eee0279 SHA512 83f7a187430311e79a4a84ca85318b50945d6e28a35d13514f8cce47aec3aa9a22b9f72090a3bc99c46c5f0c9f039b771d5f3b610597617e7c18be468a3930a2
+MISC metadata.xml 451 BLAKE2B 22c22fc375f454f2d73aa08aa90ba3ffe5317badf5e9c24a9d3c890ea3fd983861ab85b8c21946801720ba750651d86e5f8d0374e1e72d2d2d0cc0782c8ab558 SHA512 4aad325d63fa41071054835afe506c67e02c720dce4519d9b7a5307c68aae1fbe9fce08f469925137de5c133d6a40c1839de1c837159507882d48198ff82f48a
diff --git a/app-emacs/emacs-ipython-notebook/emacs-ipython-notebook-0.17.0_p20220419.ebuild b/app-emacs/emacs-ipython-notebook/emacs-ipython-notebook-0.17.0_p20220419.ebuild
new file mode 100644
index 000000000000..c920c630fbc1
--- /dev/null
+++ b/app-emacs/emacs-ipython-notebook/emacs-ipython-notebook-0.17.0_p20220419.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# NOTICE: Check package version in "lisp/ein-pkg.el".
+# NOTICE: File "lisp/ein-pkg.el" is needed by the "ein:dev-sys-info" function.
+
+EAPI=8
+
+H=388c8f753cfb99b4f82acbdff26bbe27189d2299
+NEED_EMACS=25
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="Jupyter notebook client in Emacs"
+HOMEPAGE="https://github.com/millejoh/emacs-ipython-notebook/"
+SRC_URI="https://github.com/millejoh/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${H}
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-emacs/anaphora
+	app-emacs/dash
+	app-emacs/deferred
+	app-emacs/polymode
+	app-emacs/request
+	app-emacs/websocket
+	app-emacs/with-editor
+	dev-python/ipython
+	dev-python/notebook
+	www-servers/tornado
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		app-emacs/ert-runner
+		app-emacs/mocker
+	)
+"
+
+DOCS=( README.rst thumbnail.png )
+DOC_CONTENTS="There may be problems with connecting to Jupyter Notebooks
+	because of the tokens, in that case you can try running	\"jupyter
+	notebook\" with --NotebookApp.token=\"\" (and --NotebookApp.ip=127.0.0.1 to
+	limit connections only to local machine), but be warned that this can
+	compromise your system if used without caution! For reference check out
+	https://github.com/millejoh/emacs-ipython-notebook/issues/838"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	BYTECOMPFLAGS="-L lisp" elisp-compile lisp/*.el
+}
+
+src_test() {
+	ert-runner -L lisp -L test -l test/testein.el \
+			   --reporter ert+duration test/test-ein*.el || die
+}
+
+src_install() {
+	elisp-install ${PN} lisp/*.el{,c}
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+	readme.gentoo_create_doc
+}
diff --git a/app-emacs/emacs-ipython-notebook/files/50emacs-ipython-notebook-gentoo.el b/app-emacs/emacs-ipython-notebook/files/50emacs-ipython-notebook-gentoo.el
new file mode 100644
index 000000000000..97bab14bcf69
--- /dev/null
+++ b/app-emacs/emacs-ipython-notebook/files/50emacs-ipython-notebook-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'ein:ipynb-mode "ein-ipynb-mode"
+  "A simple mode for ipynb file." t)
+(add-to-list 'auto-mode-alist '("\\.ipynb\\'" . ein:ipynb-mode))
diff --git a/app-emacs/emacs-ipython-notebook/metadata.xml b/app-emacs/emacs-ipython-notebook/metadata.xml
new file mode 100644
index 000000000000..d0e5ba20a2d5
--- /dev/null
+++ b/app-emacs/emacs-ipython-notebook/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/millejoh/emacs-ipython-notebook/issues/</bugs-to>
+    <remote-id type="github">millejoh/emacs-ipython-notebook</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/emojify/Manifest b/app-emacs/emojify/Manifest
index c17e9ff7ed39..af749dadb75d 100644
--- a/app-emacs/emojify/Manifest
+++ b/app-emacs/emojify/Manifest
@@ -1,5 +1,5 @@
 AUX 50emojify-gentoo.el 176 BLAKE2B 6197ebe5ec99f5ec86d9d9c0b14a8d08695e45ee47ed762bee10a5f31690be5f92a0279a1e1867678b59a25faed0ec589a75d48a3dd783fb558dcf5b42e6e9bf SHA512 4215127c648ad36eae6e8903cc86943e03809c88b97093a8051ca99b2ff9d4c922cea2bd11efe2fad5dcdb6ed325e1cb4ea6819ae15a7553d01910dba791d88c
 AUX emojify-json-data.patch 1184 BLAKE2B ce22ba183077ff5f9e160b477ca2b71f5d19e7bab0e82dd4b3e8791c372b0d762adcb21ea491b265a99cc6f878296c78a0ecf1068be595b63573d08b0e4a8eab SHA512 e75080643ea7058e3630468c1bc2006cef4a339f20dd68dad5a436728731c13d0b246f6442db5ed84b404e1ea2c1bc675deee510d4dd1812e0e2967a73e71b78
 DIST emojify-1.2.tar.gz 1196775 BLAKE2B 5802e391771f93b5181584287a73d6e02b42796a065ab91c0f085debcabb8a7da3bc575e7913b754b1754d0ee5d296fd31196009bdb937babcccc29ae97cdb18 SHA512 a02249d8474f02af1f43058061fa4cfcbccdaa71e632934c6466277eef44f306ea44e0c91dcb83218d6f1f01f3e7379b6d4d82b086113b1a9a41ee5ea3971e39
-EBUILD emojify-1.2.ebuild 899 BLAKE2B 4655b0b733773f3624f1d207269f296ca32148430bc776caee6c8002b431493fdc6428c6f5635e01052cfaf5d66fae800daab64e5605082f3efc74364c9cdc2f SHA512 06ffdf6ba613cf455d3396956054273f07c131af5ee56c37599ad8a03c2a6d7052808c17432004acd2b11d188ac0154fd8dbc61e5676b46324b80ef8aae799f3
+EBUILD emojify-1.2.ebuild 861 BLAKE2B 676b9dab1737da26f256d89f3d990051806469ca334f4c1e63a13606d8c615df33faaf6569b07ddf45e896db717b6cf7219442c4d12917fbc1d64b3f89abbee2 SHA512 24a5d171ac892b5640f56b3ac0b16b1965118f389431169a99081b9532d5d26794cf30151390aeeb7894de23f2f290b406b2239b7a5df2c3998437083d0e5d15
 MISC metadata.xml 439 BLAKE2B ba89fe91967745e01dc07b5070618fcb33d6ba19f12b41bab0a3a30051c2f5d191ab7bcc9524e439cc939e0e87d24544889227201c91bf0602188721c634af99 SHA512 7c2a496354e1113d0a16d9acf9fa6472ddcaf7c2163d9520c01e9bb103dde350baaf6c4859ede3e2ed3bf3c5c50b094a905c3b1cc377221463d04dc741d9f581
diff --git a/app-emacs/emojify/emojify-1.2.ebuild b/app-emacs/emojify/emojify-1.2.ebuild
index b00b264af3f2..1101357d6f26 100644
--- a/app-emacs/emojify/emojify-1.2.ebuild
+++ b/app-emacs/emojify/emojify-1.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/emacs-${P}
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
-RESTRICT="test"  # requires some (5) unpackaged Emacs testing tools
+RESTRICT="test"  # Tests fail
 
 RDEPEND="app-emacs/ht"
 BDEPEND="${RDEPEND}"
diff --git a/app-emacs/epl/Manifest b/app-emacs/epl/Manifest
index b658b7d32e42..e841adf56317 100644
--- a/app-emacs/epl/Manifest
+++ b/app-emacs/epl/Manifest
@@ -1,4 +1,4 @@
 AUX 50epl-gentoo.el 70 BLAKE2B 43d1e89c72988397c7ef15e37b0be47e9c09a9db248980f8d084ae4a8eecf225e86f9b2d0ad9d8b4b8d876f16913f93555d14a63e740d3835e2ce7a21367534c SHA512 1e12936fb71296f6410a3d9c515043bcb37adf1109abcae7879f75a9feac1e6facec190986f2c2a847155714f5448a4a1e9d2045848cb74dbb5f26be3b352998
 DIST epl-0.9.tar.gz 23448 BLAKE2B e403066139223445affcea2dd6a5bb0d4a5a4523235b787d45605c692301625ed784f0f3c338f0154c2f2188a29a565ba287e0958f8f95297556aaeb1e25c0eb SHA512 64d55790e7d34c575cc19786830b5cb795a162fc04356caf4122ce0796d57d94a50e90a4288218a697394ec3bd36c5ab5ddb98d1618411f9fe5eeada44bfd70f
-EBUILD epl-0.9.ebuild 486 BLAKE2B 47eb93513a852173c426a560ef6689400e7af21c625510773183e959c02753096daf6720ab9589d6e3fad51b34c1867bd5bca2ffa050b0dbb56509399e66f3cd SHA512 0ad25fb0333335872441b99d172ce2b5c9efc6db4a19db483a638badb7ecd7ec9341f3692b77b3669afacb2ce0e48a381d62d29a83fda3290f4aa62b07dc67fb
+EBUILD epl-0.9-r1.ebuild 564 BLAKE2B 2c98ad94168311ce5378ab70440a232f8dde1d482eb768316d43dbf40787743711a7101a5b251b568ec5d525083abfc16744b38ba0af0f8e6b06792851f72b21 SHA512 b9cb16734749a28178b9655dd26b4cb88ec956a4d3454be95eb2674cf2c957bd4828f807a4a09841ae4585c8aba8036a74a7f1ef24f39e6f313dc084a699bbb9
 MISC metadata.xml 857 BLAKE2B 4e88bbce5ec198fcdf4a82af30e464343e77594e5982d6e1e66ce338757382c670e9d9dd76d446c8ab74745d232edd6eee52b2041fde3b46a512106544911d04 SHA512 f0c361fde0f64ac34d653a30eedbb10b95bfc0d6fb18540c19a96793d406dd34f196967bb55794a1a9c460245a7bf9045dcc9605ed00a96e8f128b890d792d41
diff --git a/app-emacs/epl/epl-0.9.ebuild b/app-emacs/epl/epl-0.9-r1.ebuild
index 8a13d13e32de..d286d49c557a 100644
--- a/app-emacs/epl/epl-0.9.ebuild
+++ b/app-emacs/epl/epl-0.9-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-NEED_EMACS="24"
+NEED_EMACS=24
 
 inherit elisp
 
@@ -11,10 +11,17 @@ DESCRIPTION="A convenient high-level API for package.el"
 HOMEPAGE="https://github.com/cask/epl"
 SRC_URI="https://github.com/cask/epl/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
-RESTRICT="test" # test requires cask and ert-runner which are not packaged
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( app-emacs/ert-runner )"
 
-SITEFILE="50epl-gentoo.el"
 DOCS=( README.md )
+SITEFILE="50epl-gentoo.el"
+
+src_test() {
+	ert-runner --reporter ert+duration --script || die
+}
diff --git a/app-emacs/ert-async/Manifest b/app-emacs/ert-async/Manifest
new file mode 100644
index 000000000000..60158333a5da
--- /dev/null
+++ b/app-emacs/ert-async/Manifest
@@ -0,0 +1,4 @@
+AUX 50ert-async-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST ert-async-0.1.2_p20200105.tar.gz 14434 BLAKE2B e15d041582beef803d4033e2cad100905c8dff0afc768ea68aafe2d610c13603d7a8f4ed66caf62814964880ea6b0729f4ae3dbc19af6a784b2f69eb3a779097 SHA512 a683a3ab81ac361f2cd852a9ca8a98f7e4994e61c15921bcf6593985c7e59dc171766d7538b81785b44c3142511c25b8d418505365240a9efa7879554ac6624c
+EBUILD ert-async-0.1.2_p20200105.ebuild 483 BLAKE2B fa7d75a54a4e9102c5b7b1bfe601f8a9b5ff85d2eb4bd0ab16f0174d0d0cf94b132bca5796bb4ecc2136807098354261242e9315bf361f8f6ca75748c491cf48 SHA512 e686942492f188370f2157523dc6be453bdd330aedd8025453f433639b8608dc89660b2af4f9604172b03429756db45f2dfdaf6092a80b99939eab7ba0c010f2
+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
new file mode 100644
index 000000000000..42b73c5d0ccb
--- /dev/null
+++ b/app-emacs/ert-async/ert-async-0.1.2_p20200105.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=948cf2faa10e085bda3739034ca5ea1912893433
+NEED_EMACS=24.1
+
+inherit elisp
+
+DESCRIPTION="Async support for ERT"
+HOMEPAGE="https://github.com/rejeep/ert-async.el/"
+SRC_URI="https://github.com/rejeep/${PN}.el/archive/${H}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}.el-${H}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/ert-async/files/50ert-async-gentoo.el b/app-emacs/ert-async/files/50ert-async-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/ert-async/files/50ert-async-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/ert-async/metadata.xml b/app-emacs/ert-async/metadata.xml
new file mode 100644
index 000000000000..bd6cd3f5cd50
--- /dev/null
+++ b/app-emacs/ert-async/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/rejeep/ert-async.el/issues/</bugs-to>
+    <remote-id type="github">rejeep/ert-async.el</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/ert-runner/Manifest b/app-emacs/ert-runner/Manifest
new file mode 100644
index 000000000000..56017cccfd5b
--- /dev/null
+++ b/app-emacs/ert-runner/Manifest
@@ -0,0 +1,5 @@
+AUX 50ert-runner-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+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 976 BLAKE2B 288b09137570fd3842d6e0540fe2560bf985ee9e68ae941e4c2be7083f3676908caf85c2703cfacbea4a334c03837d2bc91d33c12dc6a367ccc9a09b9f824a1e SHA512 c2ab2fe9744072cb8b781647a7c8fca7aa4c062d517ddacfa40eab0ec2499ffbe11b9677aef417997c4cb72fd476554f941a45dcc82730f76cea6e45997b073d
+MISC metadata.xml 429 BLAKE2B c4a916f3c51d567bdf15e23e8c77c711f7bd8420cdfef969b60172915525a8333a901088abfad87117d8244279aadcec453d6247543b084e32d1df68c45430fb SHA512 4459325d760c43ec46f80c3bd4fc05514329f0cb7fa450764659677c82f41eec2946c30c4ff6e9594232a42654ce51b8b7517d8c0a83a27c3e3bdf9814f3e088
diff --git a/app-emacs/ert-runner/ert-runner-0.8.0.ebuild b/app-emacs/ert-runner/ert-runner-0.8.0.ebuild
new file mode 100644
index 000000000000..046b3a467a4e
--- /dev/null
+++ b/app-emacs/ert-runner/ert-runner-0.8.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Opinionated Emacs Ert testing workflow"
+HOMEPAGE="https://github.com/rejeep/ert-runner.el/"
+SRC_URI="https://github.com/rejeep/${PN}.el/archive/v${PV}.tar.gz
+			-> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}.el-${PV}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"  # Tests fail (even with Cask installed)
+
+RDEPEND="
+	app-emacs/ansi
+	app-emacs/commander
+	app-emacs/dash
+	app-emacs/f
+	app-emacs/dash
+	app-emacs/shut-up
+"
+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_compile() {
+	elisp_src_compile
+	elisp-compile reporters/*.el
+}
+
+src_install() {
+	elisp_src_install
+	elisp-install ${PN}/reporters reporters/*.el{,c}
+
+	dobin bin/${PN}
+}
diff --git a/app-emacs/ert-runner/files/50ert-runner-gentoo.el b/app-emacs/ert-runner/files/50ert-runner-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/ert-runner/files/50ert-runner-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/ert-runner/files/ert-runner-bin-launcher-fix.patch b/app-emacs/ert-runner/files/ert-runner-bin-launcher-fix.patch
new file mode 100644
index 000000000000..80f079ba867b
--- /dev/null
+++ b/app-emacs/ert-runner/files/ert-runner-bin-launcher-fix.patch
@@ -0,0 +1,30 @@
+index 97d4ff4..fc14077 100755
+--- a/bin/ert-runner
++++ b/bin/ert-runner
+@@ -1,6 +1,6 @@
+ #!/usr/bin/env bash
+ 
+-ERT_RUNNER="$(dirname $(dirname $0))/ert-runner.el"
++ERT_RUNNER="@SITELISP@/ert-runner.el"
+ 
+ function inside_emacs_24 {
+   if [[ -n $INSIDE_EMACS ]] &&
+@@ -31,9 +31,9 @@ if has_option "--win" $@ || has_option "--no-win" $@ ; then
+   export ERT_RUNNER_OUTFILE=$(mktemp /tmp/ert-runner.XXX)
+ 
+   if has_option "--win" $@; then
+-    "$ERT_RUNNER_EMACS" --load "$ERT_RUNNER" -Q
++    "$ERT_RUNNER_EMACS" --load "$ERT_RUNNER" -q
+   else
+-    "$ERT_RUNNER_EMACS" -nw --load "$ERT_RUNNER" -Q
++    "$ERT_RUNNER_EMACS" -nw --load "$ERT_RUNNER" -q
+   fi
+ 
+   STATUS=$?
+@@ -43,5 +43,5 @@ if has_option "--win" $@ || has_option "--no-win" $@ ; then
+ 
+   exit $STATUS
+ else
+-  "$ERT_RUNNER_EMACS" --script "$ERT_RUNNER" -Q
++  "$ERT_RUNNER_EMACS" --script "$ERT_RUNNER" -q
+ fi
diff --git a/app-emacs/ert-runner/metadata.xml b/app-emacs/ert-runner/metadata.xml
new file mode 100644
index 000000000000..c98b3df1e827
--- /dev/null
+++ b/app-emacs/ert-runner/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/rejeep/ert-runner.el/issues/</bugs-to>
+    <remote-id type="github">rejeep/ert-runner.el</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/eselect-mode/Manifest b/app-emacs/eselect-mode/Manifest
index b614566ce77a..4f742b953d5f 100644
--- a/app-emacs/eselect-mode/Manifest
+++ b/app-emacs/eselect-mode/Manifest
@@ -1,7 +1,7 @@
 AUX 50eselect-mode-gentoo.el 178 BLAKE2B 50fea27e7add6d31f37801593430154636bb58ac6e3f7cc44c68a16d49c9156cf37285778a38bf97a1f4805a22d6d5cf9d597acdcdedfd77c62a5825a0d1d88f SHA512 200da398adf72241112bcda74b432a8a313cf29018c9f6fbdf6021674b23a201ada6ba884d4c9c3a4ee4c042d6c8fc7c3ba59702c8ddb6ea20b652f9ded9d32f
 DIST eselect-1.4.16.tar.xz 178660 BLAKE2B dae97ee324cb67983c5395b5dc54c4b84d2da43f6a0c5c8ab81ff402ab211e9d1f1d3fe5c174b130ac1e11d3dd19e3812056274145415ee029e649cda880cd95 SHA512 264fb6122f5f7c9e73bb2250a94c3c0377e5263e2e5ae653ed58e08ebf6ed1b4aa165ae5c1d70b0156081c4db5672d1ec9d379782919d5b40a2f3e862378ce62
 DIST eselect-1.4.17.tar.xz 178980 BLAKE2B d905ac88bc009080912af75e64c7920d745788866fa3cb35466d68a652efbbd6984d6e1efeed76d9a344aed94705b74c85aa43e9c037d4d548d2e24afa69bd7a SHA512 35dc4c52f44c4f64db9c0dc2aec57b3055a6d36760b1bbbd094ad11b3f9e71a731444802632817b89c3b511f1dc9bb92046b59322d177e13fdc501ed767b591e
-EBUILD eselect-mode-1.4.16.ebuild 538 BLAKE2B 0ba5a4d9152f36bf692ea7491c4996c4aa99bf211a478ffc2c2aa3a223e5cf34d9f4d391ff8f289e0e6f502d46551b89f910a5842d430adf13222c7f94421f46 SHA512 e2639ed1b81d021251e61a875ccfb896770d1bfb39c6c5b363b1fa69bdcec1f5a40561faff7620574d0ddea440caf78b867a7d2c27cc6c4493ac775f73b27018
-EBUILD eselect-mode-1.4.17.ebuild 545 BLAKE2B 554ce1773eaf9c7361f10dadb4769508e4869f07faaef0c524730f24c31b35763375d3f511cf9c25401d2b46bb8aafded691d07f45d19555c4cfe54740237e62 SHA512 b553cd4e8d7874269a622b46e4895429f415be5cc3c24ec138c13d9f819ebfd0023839f647aa46b85f64156ebab8ca7fe69514ff62b8eb2ea348951e6855c60d
+EBUILD eselect-mode-1.4.16.ebuild 532 BLAKE2B f5cd5e0fc05aa47fdeb30dee1bd70baad5ac082ba0d7b0a92257171bfaf40891ddc54b88d7188f0f0aade9686a72b160f40c021bf3772ec05d2837cdb97f0b5c SHA512 0ee1a11e36c445d8511a0911ed7b6b811bbf4e7d00bc296cd6174831b9fb2833d3f8f10ed775527636d5d1bcb68284a2bff30ce72b17fbbf2efbda434439e0b3
+EBUILD eselect-mode-1.4.17.ebuild 539 BLAKE2B d3577d550f337336c34081ef54af222083dc5e8975faaa1c7a22c6df3e76f14b97944095200d43944514d2b24585b4f26d7ba31a61fc25f013a7bba76b3cd301 SHA512 bb7c63b048dd1b78e2d9340e6c3a05cdc817ebcdf5d7bc9a49f877054f00f16a2254ea84b0c5db69a13c58dfe918f1973adc5af44189237b96896beaa62d97e7
 EBUILD eselect-mode-9999.ebuild 455 BLAKE2B 0b2a475c460420afdc6562a94fcef5d57b19d66d0fde52d2cb799f466a71d7948b6349832e58db1dddd3ee0e41b7a413a5f5f1ded177dc2a270a4d46f6970222 SHA512 1040b39298989935448478ffcf8b85d34e9998e40be7f1208650d14aebaa13ec9ac4f0e732a2077b5f928fa6f26c6d29b599ec1759d7fcf030465f32a6fa5348
 MISC metadata.xml 450 BLAKE2B 18abd40eece633f3e8973ace3935ce484a8cbe75ba047963ee0beb3e4dca3f4c7d94b07423de65a0a847d73efb6849dfa1ecc8502424e98a8a6b5321f09be836 SHA512 bb496b4931b553dcf322e71a5f475db8acc8ed445b439f25d3aa7a1e08662d747f386eb043adcb159bf73c9a746c1ddc00d58eee1e7dbfcf7321d41f13e7ac7e
diff --git a/app-emacs/eselect-mode/eselect-mode-1.4.16.ebuild b/app-emacs/eselect-mode/eselect-mode-1.4.16.ebuild
index 7e18d68400c3..a0b7ed47d0c5 100644
--- a/app-emacs/eselect-mode/eselect-mode-1.4.16.ebuild
+++ b/app-emacs/eselect-mode/eselect-mode-1.4.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${MY_P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 S="${WORKDIR}/${MY_P}/misc"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/eselect-mode/eselect-mode-1.4.17.ebuild b/app-emacs/eselect-mode/eselect-mode-1.4.17.ebuild
index 7f76711027a2..13839fba8dd2 100644
--- a/app-emacs/eselect-mode/eselect-mode-1.4.17.ebuild
+++ b/app-emacs/eselect-mode/eselect-mode-1.4.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${MY_P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 S="${WORKDIR}/${MY_P}/misc"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/espuds/Manifest b/app-emacs/espuds/Manifest
new file mode 100644
index 000000000000..073022e7d4cf
--- /dev/null
+++ b/app-emacs/espuds/Manifest
@@ -0,0 +1,4 @@
+AUX 50espuds-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST espuds-0.3.3_p20171111.tar.gz 48779 BLAKE2B de97a922f82a19ee5a6229d4bfbc43baeb8da6a234f7add6f44fe2848657b9587f5471688733a0d9e2d95878408fe462d826a18e6701f15253bcd29cb1687d0d SHA512 34b1f2bfabd24072d30be4df02eceafa833b357c24a2a1c6cc868ce2a72d413d5b2686734f74a27cb2875ad45a7248823efbb2930f1cb89b95ef813100611281
+EBUILD espuds-0.3.3_p20171111.ebuild 580 BLAKE2B 13900ea863263fa313e8e70345240e555c1966b557fc3986f9be15b200d5e3fd680fe9e6d4153bb832f787b286488d25d6aeb2c2a0598eaeacb413b7dc7cca13 SHA512 366f3b52133c69228c4a7412cb3235f863b9906f1c506bbeccd8c316e978e8ba9bd886b55d9ddbc0ad15d2316f2740ebac5da4b6cdb0fc908b36a5baa0dc3959
+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
new file mode 100644
index 000000000000..58a085e56754
--- /dev/null
+++ b/app-emacs/espuds/espuds-0.3.3_p20171111.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=78fc53feaf77a98d63894cd410faee2a18107b00
+
+inherit elisp
+
+DESCRIPTION="Common step definitions for Emacs Ecukes"
+HOMEPAGE="https://github.com/ecukes/espuds/"
+SRC_URI="https://github.com/ecukes/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${H}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"  # Tests fail
+
+RDEPEND="
+	app-emacs/dash
+	app-emacs/f
+	app-emacs/s
+"
+BDEPEND="${RDEPEND}"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/espuds/files/50espuds-gentoo.el b/app-emacs/espuds/files/50espuds-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/espuds/files/50espuds-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/espuds/metadata.xml b/app-emacs/espuds/metadata.xml
new file mode 100644
index 000000000000..1049b503133c
--- /dev/null
+++ b/app-emacs/espuds/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/ecukes/espuds/issues/</bugs-to>
+    <remote-id type="github">ecukes/espuds</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/exwm/Manifest b/app-emacs/exwm/Manifest
new file mode 100644
index 000000000000..317d90dbcf01
--- /dev/null
+++ b/app-emacs/exwm/Manifest
@@ -0,0 +1,4 @@
+AUX 50exwm-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST exwm-0.26.tar.gz 75687 BLAKE2B 59f272339196198f4d8977e8a2a6badb0293dba52b5049fe28e3cf6a46b578ecf58a0cbb874744c25ba868ac9ec78ebde6afcc588f3861dd459cd1392d096b92 SHA512 f8492836105da5e6494ff65f4972a26c9be55bc54de72857b4fea9be84b392e2cb135241b74dede773e0fdcf2b216f2e1d750709ee0a7dc16afe8b6672676a17
+EBUILD exwm-0.26.ebuild 521 BLAKE2B 557f3c318b2e5c6c26e621e31346792c9fb50adfb7a2a1b3c9dde9206e45d9d3edd9f1cf7ae3583f73d48f04ae5f180dfd8fe5ead78edf5e358819ceaa83c421 SHA512 04ff76b9b7fad29d2c740a84ca71b8e9cf423b340a4cd8aefcb8b489bdb769bc62dcb5ce28366820b2dfb7235d17a214a18ed6e1079f28f8c938c2cd869f5eb0
+MISC metadata.xml 411 BLAKE2B 2b893e06fd83dcb476ef7537c08afe908d531d7a500507cda148c39a22020afb95e1498267353ae1c4a03e27b04358b46a08fa49ff0348056954c9ab270e5c36 SHA512 9e1bed1f9a415385b3bf5baf74eb8df85833d92f803500e9edaf9b89b5a1f1727293c99bdfbf7340560abfb2783b9071935132d5762a6be7206f7e538bcacf73
diff --git a/app-emacs/exwm/exwm-0.26.ebuild b/app-emacs/exwm/exwm-0.26.ebuild
new file mode 100644
index 000000000000..e30e29af0fcb
--- /dev/null
+++ b/app-emacs/exwm/exwm-0.26.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Emacs X Window Manager"
+HOMEPAGE="https://github.com/ch11ng/exwm/"
+SRC_URI="https://github.com/ch11ng/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-emacs/xelb"
+BDEPEND="${RDEPEND}"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+src_install() {
+	elisp_src_install
+
+	insinto ${SITEETC}/${PN}/examples
+	doins xinitrc
+}
diff --git a/app-emacs/exwm/files/50exwm-gentoo.el b/app-emacs/exwm/files/50exwm-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/exwm/files/50exwm-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/exwm/metadata.xml b/app-emacs/exwm/metadata.xml
new file mode 100644
index 000000000000..5f5868bcc422
--- /dev/null
+++ b/app-emacs/exwm/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/ch11ng/exwm/issues/</bugs-to>
+    <remote-id type="github">ch11ng/exwm</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/flycheck-package/Manifest b/app-emacs/flycheck-package/Manifest
new file mode 100644
index 000000000000..545469b78c9c
--- /dev/null
+++ b/app-emacs/flycheck-package/Manifest
@@ -0,0 +1,4 @@
+AUX 50flycheck-package-gentoo.el 180 BLAKE2B 71f9e4b2b97d60c5755696276cddb3a3a800ae82567040be96f18ecb1757373d3c3748895c6098c288c17368b895c03c4bd156703ce5e411a1d1c222908b425b SHA512 0193e889449676410d1d69a3cae8a5f05f0685a57f203f0d8211671e18bb921cd74441a21e686ad95c5954184f6abd83f5f23c904ae4eff3c1d0fbe8ecdab5b0
+DIST flycheck-package-0.14.tar.gz 3214 BLAKE2B 8e4eafdd34d4e0e5e00f15ae0684725d4ddff867bc13913012068da95bd3233b8c05e60b7d746b4941c6e4bce02299acfbecf1cae1d4754fd12e61a4fbbc761d SHA512 c1a94ae2c3c460843225f121f4e9c837c8fc86e958987e9a31b95aafc9999c9a7475491f08ed16a5cc95085be5dedee045b08b9ee114688a722b612cef096bfa
+EBUILD flycheck-package-0.14.ebuild 515 BLAKE2B 3937bc24bd9c3bddbf8a3b08042455c1236b5b9064e33d7564f2dbcb0807fc6b44c97384193a85d38d397c2270c5b93585acda1dabcc0aad132d064b0d3ca18b SHA512 d551bbbb3765e9f089d4a6dd1775fca5dc53c0a1b6d129c9a14a30f2d438a2b814316e1b10da3d3982bf515c6939457f30d0c8cb3ae81806be91988c8dfaa22a
+MISC metadata.xml 437 BLAKE2B b47bdd888e348e9ca8af3d52f11507e18c663da00787d07903f8b3cbb8153c0d84634b4eeee8661f75ad85b11b45384e4fcdce23c915a35451aef9584deb11f5 SHA512 cbbee6ca976d2f76aace10bd48aa88a0165a80990f5d47387816eed1f1351dc3ef88a445ee9de6b4f2999dca487b9290fff72e4df18d1fe92f590ef7714259e5
diff --git a/app-emacs/flycheck-package/files/50flycheck-package-gentoo.el b/app-emacs/flycheck-package/files/50flycheck-package-gentoo.el
new file mode 100644
index 000000000000..834c2c4d32fe
--- /dev/null
+++ b/app-emacs/flycheck-package/files/50flycheck-package-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'flycheck-package-setup "flycheck-package"
+  "Setup flycheck-package." t nil)
+(eval-after-load 'flycheck '(flycheck-package-setup))
diff --git a/app-emacs/flycheck-package/flycheck-package-0.14.ebuild b/app-emacs/flycheck-package/flycheck-package-0.14.ebuild
new file mode 100644
index 000000000000..fa804db7e21c
--- /dev/null
+++ b/app-emacs/flycheck-package/flycheck-package-0.14.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24.1
+
+inherit elisp
+
+DESCRIPTION="Flycheck checker for Emacs Lisp package metadata"
+HOMEPAGE="https://github.com/purcell/flycheck-package/"
+SRC_URI="https://github.com/purcell/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64"
+SLOT="0"
+
+RDEPEND="
+	app-emacs/flycheck
+	app-emacs/package-lint
+"
+BDEPEND="${RDEPEND}"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/flycheck-package/metadata.xml b/app-emacs/flycheck-package/metadata.xml
new file mode 100644
index 000000000000..8fb4e80caddb
--- /dev/null
+++ b/app-emacs/flycheck-package/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/purcell/flycheck-package/issues/</bugs-to>
+    <remote-id type="github">purcell/flycheck-package</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/fsharp-mode/Manifest b/app-emacs/fsharp-mode/Manifest
index 3df12039edec..968a296ea607 100644
--- a/app-emacs/fsharp-mode/Manifest
+++ b/app-emacs/fsharp-mode/Manifest
@@ -1,4 +1,4 @@
 AUX 50fsharp-mode-gentoo.el 184 BLAKE2B 381798f016470b06d444b3187161b33aee39cc9512e53b26d925299818dd91a3bea0accef5cc8390e40216cd6db9c1db56399a3f6afe8810f49c62987e718af7 SHA512 d199454deaefaff33e55b7e3af0230de753b9700458366452372ed958bbefeca506f5ce670551e0906905291c6e6a02a5b5169c84dc48dcb459bbdc1d33e24e2
 DIST fsharp-mode-1.10_p20211229.tar.gz 78916 BLAKE2B 4cd9182c62ea0d5c7a23f2120586d4c74d16fad14762ecdb3f11a11d6c78c757b363d5c14473c10c47086c1c0e648911846fe039dfedc04fd1d84301b4aa10c5 SHA512 b02be4c8e56a2c22b7f6e6a302756278d9056e7d8b8c206c183aea5470b98610b73a3403c83e93da295d3b4d0092a4f2f1c0bdf78f701009478a3c8b1e054ab7
-EBUILD fsharp-mode-1.10_p20211229.ebuild 631 BLAKE2B 5cd87f7602cb3848768db5f1dede4b79605d680ec3fc94c0f9eafe2a31efc198686c9d31265e47035e85c262323df9a668a91d0d7cc9488ccfe7c58bf57a79ee SHA512 c81ba425604d49e1e6a5c1648d2b5bda8f10190e7d486b61949745fafc95022d7261549830723b9245998e487701bd1440f165b2f77e9d628d015f30361b0567
+EBUILD fsharp-mode-1.10_p20211229.ebuild 761 BLAKE2B 88844e3e5498fb866fd173073812b313d82e515f6c1419d784529d21916c7bb4be47b650f25bd26a02f08d918b9988603b0824b3675ad67401e31197ae5c149e SHA512 d673df564771e194072664791e8c7584960476022f52f48cea908138903e6ea7c91e2829d01d79c03afda4910e78adce608b0f0929e68677edd16ed1ecaaa6b8
 MISC metadata.xml 533 BLAKE2B d0fff1e8fff09a4d096a94bc372a479a44cbb67c9aa7118ed3080690b136bd446d273b9f00a99536691f3b6bce23e46ede67d505a017b0212e459dd74300ac01 SHA512 a99fa4d18c561c0c8eb4c81a96c4cd477d2f15d8d50f4f5cb951fcafcd77e134977105c186f8ffbe7bd00db126fc218d6a006b7fdc2d29400bb0c6c05dd81b8a
diff --git a/app-emacs/fsharp-mode/fsharp-mode-1.10_p20211229.ebuild b/app-emacs/fsharp-mode/fsharp-mode-1.10_p20211229.ebuild
index f5407ecb598a..38c255fda39b 100644
--- a/app-emacs/fsharp-mode/fsharp-mode-1.10_p20211229.ebuild
+++ b/app-emacs/fsharp-mode/fsharp-mode-1.10_p20211229.ebuild
@@ -16,11 +16,19 @@ S="${WORKDIR}"/emacs-${PN}-${H}
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-RESTRICT="test"  # requires Cask
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="app-emacs/s"
-BDEPEND="${RDEPEND}"
+BDEPEND="
+	${RDEPEND}
+	test? ( app-emacs/buttercup )
+"
 
 DOCS=( CHANGELOG.md README.org )
-ELISP_REMOVE="eglot-fsharp.el"
+ELISP_REMOVE="eglot-fsharp.el test/integration-tests.el"
 SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	buttercup -L . -L test --traceback full || die
+}
diff --git a/app-emacs/gnuplot-mode/Manifest b/app-emacs/gnuplot-mode/Manifest
index c3eb006d4a51..e979482150bd 100644
--- a/app-emacs/gnuplot-mode/Manifest
+++ b/app-emacs/gnuplot-mode/Manifest
@@ -1,4 +1,4 @@
 AUX 50gnuplot-mode-gentoo.el 347 BLAKE2B 6a72d3ac75c8ef7629b8c018f9652b924137f56feb7c1578d7d5b572846bb22b248ae569412e7d9f6969ce6daca4aa21debccac7b7d5b63c4c66b04959d72836 SHA512 eb342c60bee1a9e45a50373093207545b8b37888432b082afb7c4f0911eed08481379094ee5a73888a03a12898c3c41016c2d9161f92a1a7cf7be7f2010c1c83
 DIST gnuplot-mode-0.8.0.tar.gz 352106 BLAKE2B 5408cc682b205ee712d2e0ff94b57a585d4040a62d1c61b3248cac63c16c76899b4ebe9b8e6ff091216beac3c9c79ea1425e018b275145d8ed5aff3b64e524bf SHA512 d1f93f0a28036ed66869ce228ff7c7007cdd463006d29930f01a6c5fa31c0487f603f0394f423fb8831b054e8d465f669f11ec2c3f8115ef1c84d828f77056cf
-EBUILD gnuplot-mode-0.8.0.ebuild 936 BLAKE2B a5ce950e596585dbf40fef284dcad08d02c8b57cbea3e940eeb577678562281cd0eb56ac6a3617c1aa0a916a8c0149ed5e9f9134a90b030c5d177780a8107589 SHA512 3694f09ebec167c28f5e57b48e4a94f1496ea2eede436c37e683f661272933f3d5022ff40da95e006b5a4cec40aa24aef53f7c03abf84f40c13c785c68ac0f4c
+EBUILD gnuplot-mode-0.8.0.ebuild 930 BLAKE2B c5bf242170780970d9a894590e42737bd7afc54967d5940fa0292e850580a8009c5bdedc71f05beadaed7cc1feea8d92f46eaaabd5cd01e15435335bb3326765 SHA512 b548de934051d60346f2b7452a72d6c3168b1d1bebfaf204d53a4380ad7ffb375375ffeae07567dde24def86767dee035fb0039bb4e6de58dbe8acb69631ee62
 MISC metadata.xml 369 BLAKE2B 139d2654a602c21239140953a8c9786a51e3236ebc5988e100f87d79aac42c76584c78cd29694edea85157025ce17f520003b77a5f0e67437db41960fe87e04b SHA512 9850f7e3592e7dceb70332a4a54083f8bed23f011e5ad9b373e630d71b93ecb417ab44dc8acb83111200c1aec000ddf37d9d1016534a64d6c917a2cb4907f467
diff --git a/app-emacs/gnuplot-mode/gnuplot-mode-0.8.0.ebuild b/app-emacs/gnuplot-mode/gnuplot-mode-0.8.0.ebuild
index f65814319ab7..184d2694c411 100644
--- a/app-emacs/gnuplot-mode/gnuplot-mode-0.8.0.ebuild
+++ b/app-emacs/gnuplot-mode/gnuplot-mode-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN%-mode}-${PV}"
 
 LICENSE="GPL-3+ gnuplot"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc"
 
 BDEPEND="doc? ( virtual/latex-base )"
diff --git a/app-emacs/highline/Manifest b/app-emacs/highline/Manifest
index b7aa38289ad5..18e3418e52bc 100644
--- a/app-emacs/highline/Manifest
+++ b/app-emacs/highline/Manifest
@@ -1,4 +1,4 @@
 AUX 50highline-gentoo.el 72 BLAKE2B 0c0f641042009cc056675c7dc4c523821cdb71f641e6cc8ea4f5d8f2885f0c8796386822d172baea078f5f45aae02a58e76dbbc12f967526da50db7ae68b6a07 SHA512 e619a8d2dac5926c4e2d99237dc473949ecb5e4d6e80ee532e258a710b3597e0bdfefc33558b00a1b21276383ce7e3b8196e30548ed8daf8a66173d1a559cb99
 DIST highline-7.2.2.el.xz 8600 BLAKE2B e92007f6ee38e67441b8d9e7b029570e5ef2ecb888f971191f7e1fb919ffe0c58e2e5abc7d4615449e786b882f0e7b511ed37d85de6d3b98658d4ce5a1cb9253 SHA512 353fc034a823d0892c6266fbc48a22e2650c379f904f9a0be78bd2f11e5ac8333cf6070fa7ebc2225c57cc6a85f49c6db9322e31e33f87e481aa117b1290be87
-EBUILD highline-7.2.2.ebuild 527 BLAKE2B 8a864b3a5bc273dbd3184ffb7c7f3561ed1c20c04735b7a775e2c72b8bb420c94e940a985e93ba42834bde28dc0fd41cb38685f3be7062eea0ddd1325b332b9d SHA512 7d0b95c5e33c1a7b567d8a51de34c818486fc22f06b55ace51e6bf596c0e2d9cc5543105b5b53b21ee07aa20ae6827df9492c69d046275dfc7a28913ad2b8dbe
+EBUILD highline-7.2.2.ebuild 521 BLAKE2B 49d59e9bedda9a90e7d029089dea580974ca4a749c5c4f1312284288046cc1733a7affa335c718b9ba107d4ff096a309f6e4712dcac756fdcfd61188a4eb6d70 SHA512 e62ab7046de2b62e1085e1e98d17adef650e5c0be8aa2a42515618e21b69b484f27f082c8e09ad7339c768ebf84960ae18e4efd84fdf3ab84334a060185c5795
 MISC metadata.xml 283 BLAKE2B 81c49021199f71096079a27f9121390fb8c1285c54b9478583ff2d647277fa106ef12456d7097c4be092fc48b514a1adcf855ca0fac911598232ef9eb7f102c0 SHA512 f32b303760addf5d4db8d18bd10fb677353cdfa4c5e545d47804ef756cf5e5a21f8b8efb631b08f802185913ceb98da820e404e06eb03d01fe9ea85c10d1ac13
diff --git a/app-emacs/highline/highline-7.2.2.ebuild b/app-emacs/highline/highline-7.2.2.ebuild
index e4fc90bd7b45..48a3372902cf 100644
--- a/app-emacs/highline/highline-7.2.2.ebuild
+++ b/app-emacs/highline/highline-7.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ppc ~s390 ~sparc x86"
+KEYWORDS="amd64 ppc ~sparc x86"
 
 SITEFILE="50${PN}-gentoo.el"
 
diff --git a/app-emacs/hl-todo/Manifest b/app-emacs/hl-todo/Manifest
index c4f19158cb50..f5c26cfa6bb8 100644
--- a/app-emacs/hl-todo/Manifest
+++ b/app-emacs/hl-todo/Manifest
@@ -1,6 +1,6 @@
 AUX 50hl-todo-gentoo.el 180 BLAKE2B 967e85d2d5738a45f21cc1bb038ac64366a0774d88fda4b542521f76ee204f88b950769eb120d2f537b0a48fdd239d17453263c19aefcbd1f2bf14d886cfcf88 SHA512 9b9b437d6ea14762afac357012a307599677f115bc1659d0c07cfd7db4eefa95b5a7104d03db101cdfefed05a9e510324a11066772e5642891c054675424e533
-DIST hl-todo-3.3.0.tar.gz 5688 BLAKE2B 3e644ab68707ff7fb3f846d07ccec9631f0c84eaabe453efe3f36658cb09024fce3bcb299cbfbb911ff3a2e93a0134bb84cf2e9486881c656b0344b28a3dda82 SHA512 361ea9f36abd2a43731252cdcda420da1661b3f60f9673cf9975eff3846367f7f29c787de515c75fb61fd14c1849b5d24a0f91d813ca00d09512d2218a45ffd1
 DIST hl-todo-3.4.1.tar.gz 5762 BLAKE2B fbc3e2d1c9e6492f55487e6ffc306588e1d27b758e97a538de77f56743f7717a3596bda072aa6cfb249c67e76f32263e07ca299e20fc635e585af32caef120ff SHA512 4cbde1f5c0697cb6906d355aff879f8a8b2ae1fbcb1a16016c1d6663ad520ba4bbc625d038975501b9deee827e52ac84cf0e8ca38ad538395ca1c9f7f82cba57
-EBUILD hl-todo-3.3.0.ebuild 449 BLAKE2B 86f66d1e5d9398cf6d71f3c9a5825af1dec69a07762173cf2bb2a969d385c4925d62122017ac2204ad800ff6c8c1c0ccc204f7becc0d2563aac7d92b964697a2 SHA512 200efe075dadc5a5ceadf1caed92639928dc4460bc23204e00ec9f03fafcb03eaf40ef9305fc6fbbf033d9787c0b13a4a202647b67bd94eeaff96bdbdf7eae7f
+DIST hl-todo-3.4.2.tar.gz 5764 BLAKE2B 17a2569a0ff5423705d079d72c3b7d63d376b8247e80631c014b2874559ef95ea4695a110cc347c1fa35dfe1c2aebc7ff74af49f21e06560357e4f50f664b18a SHA512 a04e2b78a237b11152559a6d029168f24afba67cf2cf6ffeeb5d01a9e65312e30bd2910b41007c04335ce6e43e59163205d52e700dd499d89b19c87e5c3ca5bf
 EBUILD hl-todo-3.4.1.ebuild 449 BLAKE2B 86f66d1e5d9398cf6d71f3c9a5825af1dec69a07762173cf2bb2a969d385c4925d62122017ac2204ad800ff6c8c1c0ccc204f7becc0d2563aac7d92b964697a2 SHA512 200efe075dadc5a5ceadf1caed92639928dc4460bc23204e00ec9f03fafcb03eaf40ef9305fc6fbbf033d9787c0b13a4a202647b67bd94eeaff96bdbdf7eae7f
+EBUILD hl-todo-3.4.2.ebuild 450 BLAKE2B 5b10a661c7636daf1892534d2081d9f2085d027fe6bfba6dd3c55c4b4415eedb3fbe19c4f2f37a6103bb9ce0e199b78cda768ed17bf58dc7b52d0d6ff49afcd7 SHA512 75776564134b26b0976bfd1e4be0ad80845f30417e19a141beedac8a4aa5b5446316e2e5f20b9c518cf0d1692ba647c982fe8c4d4b16b8327f45d22d6ef755bb
 MISC metadata.xml 361 BLAKE2B d64dcf7b0a3a4d6fce92bc067d14e85ef5f4124414269aced39eacbce3fe1f2e96a5342886dbc8bcca39a0dfd6b2c2919ef404b106b408e3894f0c6e595971cb SHA512 3b795dfdb6a9c151218874c8a753474ba352e4d8d701de6f08340e9e11456752fcbeefcb715da11a1930ede0a6cb079bbe99c0d77e772413b5db86749d9a5581
diff --git a/app-emacs/hl-todo/hl-todo-3.3.0.ebuild b/app-emacs/hl-todo/hl-todo-3.4.2.ebuild
index 26992603df8d..9796c73d5221 100644
--- a/app-emacs/hl-todo/hl-todo-3.3.0.ebuild
+++ b/app-emacs/hl-todo/hl-todo-3.4.2.ebuild
@@ -15,4 +15,4 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 SITEFILE="50${PN}-gentoo.el"
-DOCS="README.md"
+DOCS="README.org"
diff --git a/app-emacs/ht/Manifest b/app-emacs/ht/Manifest
index c38c73fe6a7e..add8364d929d 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 566 BLAKE2B 78de77e449963c8500b607f84ce305207a3a8bc91d107b46bd8ff691bee72d26ff0c774f105723d514dc3219e4a51336214ed933361727ccc87d14692ec30a68 SHA512 6b95eedb2193c97b3c85f551957363a44f987a1319217fea48cc1a63445fee2c7dc44856dee6aee6a855839c2659df5daf6d2417e1a0301580ddca7bc9f830c9
+EBUILD ht-2.3.ebuild 656 BLAKE2B b81b144aff04cef5f5c533936d97f7a78fecd0ce8cc1257a975a309dec8a6c2444e3e7054428d010381854d973f4c5556cf66204954a84ed5218e3197b168590 SHA512 8e5c2d01ccc269b413d1fbe84bef4f3393ede1749fd67ea3c02b60c14f537b1d72513070b5ca2bfb1fc1b1bcbaa23d560412bac448dfc664ccae10adf624abdc
 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 2b56bec9cad3..aac3d564cceb 100644
--- a/app-emacs/ht/ht-2.3.ebuild
+++ b/app-emacs/ht/ht-2.3.ebuild
@@ -1,28 +1,35 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit elisp
 
-IUSE=""
-
 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}"
+
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
-DOCS="CHANGELOG.md README.md"
-
-SITEFILE="50${PN}-gentoo.el"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=app-emacs/dash-2.12.0
 "
-DEPEND=${RDEPEND}
+BDEPEND="
+	${RDEPEND}
+	test? (
+		app-emacs/f
+		app-emacs/ert-runner
+	)
+"
 
-S="${WORKDIR}/ht.el-${PV}"
+DOCS="CHANGELOG.md README.md"
+SITEFILE="50${PN}-gentoo.el"
 
-# Requires unpackaged dependencies, e.g. Cask
-RESTRICT="test"
+src_test() {
+	ert-runner --reporter ert+duration --script || die
+}
diff --git a/app-emacs/hydra/Manifest b/app-emacs/hydra/Manifest
new file mode 100644
index 000000000000..5f42eccd7016
--- /dev/null
+++ b/app-emacs/hydra/Manifest
@@ -0,0 +1,4 @@
+AUX 50hydra-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST hydra-0.15.0.tar.gz 36150 BLAKE2B 6e7d1ed6501d5b0fb40f3545d61469e461363dc7ec8900c7c697116cb19704529acfd9e886a1fef09ae50dfd68666e6455c62447140f55b1f4651490855c2b3a SHA512 815a8c425aaeb4d2aeb5d9faa0f66a41e37420b8e9435d93b9e78913c0e0722d1e39cad2e8f4bc12cfe34dad2e3fc1290b23d816181b12fd093f9e4d9d37e814
+EBUILD hydra-0.15.0.ebuild 566 BLAKE2B bfdd82da49bdd037e8f8b3bf59c56539022e6b4884fa606a9d6d17d86769869f354d636aeeff9704c7e21b82d3c7f6622476ec5813e65242cb5c5144ca52705d SHA512 83d2b43efc88dd9efb3716d0f4c1d4f810ff7d1125883ee1f901b7bf5eab912e7ae82e405f910f1298239bb5eee98c48c078e9986d82d1a78d882923f2e4eb57
+MISC metadata.xml 515 BLAKE2B bd57e93dceede7968f995ab8886854f7cdc64ccb343404fb7314723998665cfdb1a540561abc1c67f127d3000298fafc869b488e4015e1ddb65919982119cd3d SHA512 1490149fcda955e2814eb9a354d600f778283f7610ec114ca3eb13ded06f2f6fa49e93b7454e98b7063c6668b930275e25c821052080e6afde9f520aae119a8e
diff --git a/app-emacs/hydra/files/50hydra-gentoo.el b/app-emacs/hydra/files/50hydra-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/hydra/files/50hydra-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/hydra/hydra-0.15.0.ebuild b/app-emacs/hydra/hydra-0.15.0.ebuild
new file mode 100644
index 000000000000..dcfd674f615e
--- /dev/null
+++ b/app-emacs/hydra/hydra-0.15.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Make Emacs bindings that stick around"
+HOMEPAGE="https://github.com/abo-abo/hydra/"
+SRC_URI="https://github.com/abo-abo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64"
+SLOT="0"
+
+RDEPEND="app-emacs/lv"
+BDEPEND="${RDEPEND}"
+
+DOCS=( README.md doc/Changelog.org )
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	rm hydra-test.el{,c} lv.el{,c} || die
+	elisp_src_install
+}
diff --git a/app-emacs/hydra/metadata.xml b/app-emacs/hydra/metadata.xml
new file mode 100644
index 000000000000..9197a9c94fad
--- /dev/null
+++ b/app-emacs/hydra/metadata.xml
@@ -0,0 +1,14 @@
+<?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>
+    <changelog>https://raw.githubusercontent.com/abo-abo/hydra/master/doc/Changelog.org</changelog>
+    <bugs-to>https://github.com/abo-abo/hydra/issues/</bugs-to>
+    <remote-id type="github">abo-abo/hydra</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/jasmin/Manifest b/app-emacs/jasmin/Manifest
index f82e75fa59c4..20abb4c8584b 100644
--- a/app-emacs/jasmin/Manifest
+++ b/app-emacs/jasmin/Manifest
@@ -1,4 +1,4 @@
 AUX 50jasmin-gentoo.el 196 BLAKE2B e805e71db29dd32229ffd902df0fc7618ed12af55c173d8252a5de3c3e908f8d7084b812e7f3e568a9864902fa7a9d5e5bf87705f28469822faaace31a963af8 SHA512 b9923ea9814aa46af4fdc7f9e23bb4cc7f19f2521aa449f53192f0c0ec543a7f83409f315a06138e1e4f861f0e2b457a96547401598d718c86c29ad00e56dd40
 DIST jasmin-1.2.tar.gz 9287 BLAKE2B 2ddc69f61662c66a58c9422a43d88642fea79d678942138d7c7e79276e2c322c3af5b17d82728ce7fdcf7501a171d9c8199b671cf6ac7511bd0e126fd73b2a67 SHA512 2b89fad8e4bdfe71f09af8f2a31347cc63ad6c70008b33500e85d58c0ec872076229d9113170c54f57c969940cb2973b6167e2b7f825a94c1d3f55680f419043
-EBUILD jasmin-1.2-r2.ebuild 393 BLAKE2B c9a8d6cf67fd847e2e5d5f4751fd68bf91fa8d0fb051be433928dca6f2f091210dcc438eea73c2c293ed39c2b1fcdb34edc62511bb773fc7a1b662310c45c56b SHA512 7ea5475f75b81e087d95343d3219cc8c1ac084b81a07335f8ed5f92439ce442d6d26979ce2c6a663d41722943f45139241c700e0495252bd36887474fb3f81bc
+EBUILD jasmin-1.2-r2.ebuild 387 BLAKE2B ff4463fa1be9a3478794ec0266a342b982ba7fa5e8221904f3506118d62ac87f3d320b42857c582e6e9198fbe13e2287f7529b5c3c5490cc907258a77920a125 SHA512 94db591b1f2343b363cd9e232aabdabcf4ee7adfb72f3f15867af1cf2f36d538bb28743256dc86df9f6f149f89c4ccec619ea924680d555731278ce3458f40e4
 MISC metadata.xml 595 BLAKE2B e579ad046f4877a0c8f00d0a061a5fe8a25edf83ed2f3c243b8b0271a1c34c00db3b808acd4fa1cad435685e88793977c677280e79132fe01c85abf664b2668a SHA512 8c2144e054d63cffc645553937e499d7a49cbae7d1c722fdcae3d7e339380bbe11adfef815b64cd2a4e0c7f342fa59d7dd59d0735d34cb342bf6a7e7de3aa574
diff --git a/app-emacs/jasmin/jasmin-1.2-r2.ebuild b/app-emacs/jasmin/jasmin-1.2-r2.ebuild
index ad1f03ec4821..1afcf582c5d5 100644
--- a/app-emacs/jasmin/jasmin-1.2-r2.ebuild
+++ b/app-emacs/jasmin/jasmin-1.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,6 +11,6 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~s390 x86"
+KEYWORDS="~alpha amd64 x86"
 
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/js-comint/Manifest b/app-emacs/js-comint/Manifest
new file mode 100644
index 000000000000..642e09c28819
--- /dev/null
+++ b/app-emacs/js-comint/Manifest
@@ -0,0 +1,4 @@
+AUX 50js-comint-gentoo.el 147 BLAKE2B 4387f8be7efbae7096ff61008fd0e460ad97c059c9997ccccdafc235d2c045076523326a6bdce5a026eb667410def1398ba7c5909afdc68429e82575dd077177 SHA512 81d8f67992d1aa5f4c574930dd820b6d283c6c08bcf8db6ceb0a0fe96e952eb9df778e7b9465a729b5647315cacdbfb48fb4ccb273e151b4c330dd2b74d8a2e0
+DIST js-comint-1.2.0.tar.gz 17976 BLAKE2B 972febde9caf78fca1b7d41cc026b3cc4ef442a9177efaf627295d0cd38e998a5615ac8b84e6ce8fee7b00d0cc55cda576d1191d34c95425d71cb27f930ef844 SHA512 85e802a9198b0da00b6d4ba1b20eebd3d78657b325429b882bfb71ff6781e0483457493803494bcd0751c392eb0b631b68dde16f1b682e2d97e6dad9a1d0918f
+EBUILD js-comint-1.2.0.ebuild 463 BLAKE2B daaabdc46a4f8e980214689036cde87d42cab27707ea3d71012f764bb9da3f8af917de49790f4bf646263ed9aaa6fb4dd6a3721fa96bab499932edbf549f7e81 SHA512 3219a3072fdc765bc14c130e69349b6c50dfb51b696d2726af11c267f9be45724a5e88459b94b3f738471bd61ef4d0a89d30f997bfec97cec97b2aeb94895687
+MISC metadata.xml 431 BLAKE2B b524704fc8b658c9bddc7afc8b8b3fc9fe5ea2d6c0510c3d46b1a9ac81605ca6b564171ed00c04ef37e7a361ac70acda76ed5038420792ef6362cff6ecc9db17 SHA512 d5c73a79f9a45cbf49bc57b475f894beef43b15f4f13fce1ca35a64d566c2c399b91b4e4b33c0fd66c8a01158ae26f77cf9a9a96acc8eed1e897c981dccb9390
diff --git a/app-emacs/js-comint/files/50js-comint-gentoo.el b/app-emacs/js-comint/files/50js-comint-gentoo.el
new file mode 100644
index 000000000000..42df4360c213
--- /dev/null
+++ b/app-emacs/js-comint/files/50js-comint-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'js-comint-start-or-switch-to-repl "js-comint"
+  "Start a new repl or switch to existing repl." t)
diff --git a/app-emacs/js-comint/js-comint-1.2.0.ebuild b/app-emacs/js-comint/js-comint-1.2.0.ebuild
new file mode 100644
index 000000000000..4996400ce15f
--- /dev/null
+++ b/app-emacs/js-comint/js-comint-1.2.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24.3
+
+inherit elisp
+
+DESCRIPTION="Run a JavaScript interpreter in an Emacs inferior process window"
+HOMEPAGE="https://github.com/redguardtoo/js-comint/"
+SRC_URI="https://github.com/redguardtoo/${PN}/archive/${PV}.tar.gz
+			-> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+DOCS=( README.org )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/js-comint/metadata.xml b/app-emacs/js-comint/metadata.xml
new file mode 100644
index 000000000000..d08ca424f201
--- /dev/null
+++ b/app-emacs/js-comint/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/redguardtoo/js-comint/issues/</bugs-to>
+    <remote-id type="github">redguardtoo/js-comint</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/key-chord/Manifest b/app-emacs/key-chord/Manifest
new file mode 100644
index 000000000000..4a046eb7afe0
--- /dev/null
+++ b/app-emacs/key-chord/Manifest
@@ -0,0 +1,4 @@
+AUX 50key-chord-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST key-chord-0.6_p20201222.tar.gz 5302 BLAKE2B 270440de61854e010827b94eb24d8cf15d42b1c506b43b3f51349313fd687fc89b53128356168044bea504e38a22afbb8eede4d3d60e1eaff343c582cd057cda SHA512 92beca695f29dafa2fb9c61e00a9b6afad9c33dba15b11d7474de1a6f145571449700e7cec848046875d73370d92f94571bf309da1c7e170ee0abc5f2e19d629
+EBUILD key-chord-0.6_p20201222.ebuild 522 BLAKE2B 56bd5cbc4a8ca957c630beec554027b08ac7f13c06efd9d17e5c42c7958d705aa44060d7a767f5ab27d5ef111f719b37db225b8c8e22236c1c78720c13591e78 SHA512 77309414d2a3a621382175aaeb6f624582180fc7f20ac30d5bb6e1bff17bfa6a30d074fb951f68f3ab557d0989d3a8fc4a573a9d739a315ce600157f72cc28be
+MISC metadata.xml 437 BLAKE2B 111d317677331323a94ec07f4d080a653f1370026641d72dec2da5dff6379f8a774a49688026a24cf163c262bef806cd217b336e294d979aff57ed62c1e4ffdb SHA512 3e7f85f10226cbfea4f20844441bbccbb6288ad3d9a3779504b4ba492a545a68e346c1c8c95264204dd5e26f0be49b60ff0b9c205cb4f8ebb667f7e61ae9d5fd
diff --git a/app-emacs/key-chord/files/50key-chord-gentoo.el b/app-emacs/key-chord/files/50key-chord-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/key-chord/files/50key-chord-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/key-chord/key-chord-0.6_p20201222.ebuild b/app-emacs/key-chord/key-chord-0.6_p20201222.ebuild
new file mode 100644
index 000000000000..9df5d5964aff
--- /dev/null
+++ b/app-emacs/key-chord/key-chord-0.6_p20201222.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=7f7fd7c5bd2b996fa054779357e1566f7989e07d
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="Map pairs of simultaneously pressed keys to commands"
+HOMEPAGE="https://github.com/emacsorphanage/key-chord/"
+SRC_URI="https://github.com/emacsorphanage/${PN}/archive/${H}.tar.gz
+			-> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${H}
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/key-chord/metadata.xml b/app-emacs/key-chord/metadata.xml
new file mode 100644
index 000000000000..bb68a49b6a13
--- /dev/null
+++ b/app-emacs/key-chord/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/emacsorphanage/key-chord/issues/</bugs-to>
+    <remote-id type="github">emacsorphanage/key-chord</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/lsp-java/Manifest b/app-emacs/lsp-java/Manifest
new file mode 100644
index 000000000000..2538b1745eec
--- /dev/null
+++ b/app-emacs/lsp-java/Manifest
@@ -0,0 +1,5 @@
+AUX 50lsp-java-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+AUX lsp-java-icons.patch 912 BLAKE2B e00bf73b8c3d99bbc597783ed97ce3a4f556da59843b37d526c6600fb87b8c40e45ef1cce5643a18ef507b96c8e0d82637d1b809bae60cf1e8eb78318739631e SHA512 d27a5c13e271b6363bae22dabeaf2b21981fb22991004996b2022d5cd12419bbe78b0e6e6a474c7909a9c7fe7e8cee0b5853505d85abd3a44898d4f56b99ef33
+DIST lsp-java-3.1.tar.gz 823300 BLAKE2B eacf2090822b629ea775e5848ddc9993ba09217e1eb9563ce9532da075a6cfd1f001010ca886f8bd42ac9af95d12c91dac9ac946ddafb1b6e544943cf44a2036 SHA512 34951a1c4a050215d388fb5f273c9f2cb76788b9e2120d4b0f49b20cd5a1151be039351bece6ae311fb7f37a6ee72a2e641a49f6194886c9729b5b5659e02428
+EBUILD lsp-java-3.1.ebuild 934 BLAKE2B 2acb9186acd8338264f8db18ef0a73e10e7404276aacbb218847cfb89de9d13de66461e3724c70122aa8cd66d458d1d8cfd23ce5de85e704cb303223138be02c SHA512 0d34065802ffe10df203c9f43685ab537dc9ddc316749eb0fad6aeb07d295ed733b1b3ede441406a4db51c3a18259a37cf6f766ae962d22d714e8c7703c5dfdf
+MISC metadata.xml 425 BLAKE2B aa0b126c8b256673f723f9454f8cf4592f61619f0d5774f0b4c6267259eccb8040d257f6261981ac75aeac86e15b6e53eb2f16e242fcc410c9a538cdaf3678b7 SHA512 d22e69f9ca8e65c4b9db4f8b7801fb059348fc22c59f7814ee1a1032d53ae26a61efc3fa2d6ed90178490fb42f75c5963583b06cfa8be6218b568c695318e5e6
diff --git a/app-emacs/lsp-java/files/50lsp-java-gentoo.el b/app-emacs/lsp-java/files/50lsp-java-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/lsp-java/files/50lsp-java-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/lsp-java/files/lsp-java-icons.patch b/app-emacs/lsp-java/files/lsp-java-icons.patch
new file mode 100644
index 000000000000..5c89490d8688
--- /dev/null
+++ b/app-emacs/lsp-java/files/lsp-java-icons.patch
@@ -0,0 +1,25 @@
+index b7f8083..571a19e 100644
+--- a/lsp-java.el
++++ b/lsp-java.el
+@@ -78,7 +78,7 @@ Use http://download.eclipse.org/che/che-ls-jdt/snapshots/che-jdt-language-server
+   :risky t
+   :type 'directory)
+ 
+-(defcustom lsp-java-themes-directory (f-join (f-dirname (or load-file-name buffer-file-name)) "icons")
++(defcustom lsp-java-themes-directory "@SITEETC@/icons"
+   "Directory containing themes."
+   :type 'directory
+   :group 'lsp-java)
+diff --git a/lsp-jt.el b/lsp-jt.el
+index 4aecfd9..ea05a51 100644
+--- a/lsp-jt.el
++++ b/lsp-jt.el
+@@ -185,7 +185,7 @@
+   (-uniq (gethash 'jdtls (lsp-session-server-id->folders (lsp-session)))))
+ 
+ (treemacs-modify-theme "Default"
+-  :icon-directory (f-join (f-dirname (or load-file-name buffer-file-name)) "icons/vscode")
++  :icon-directory "@SITEETC@/icons/vscode/"
+   :config
+   (progn
+     (treemacs-create-icon :file "class.png" :extensions (java-test-class) :fallback "-")
diff --git a/app-emacs/lsp-java/lsp-java-3.1.ebuild b/app-emacs/lsp-java/lsp-java-3.1.ebuild
new file mode 100644
index 000000000000..d67e027ae82a
--- /dev/null
+++ b/app-emacs/lsp-java/lsp-java-3.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=25.1
+
+inherit elisp
+
+DESCRIPTION="Emacs Java IDE using Eclipse JDT Language Server"
+HOMEPAGE="https://emacs-lsp.github.io/lsp-java/"
+SRC_URI="https://github.com/emacs-lsp/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64"
+SLOT="0"
+RESTRICT="test"  # Tests are unnecessary, they run "build compile checkdoc lint"
+
+RDEPEND="
+	app-emacs/dap-mode
+	app-emacs/dash
+	app-emacs/f
+	app-emacs/ht
+	app-emacs/lsp-mode
+	app-emacs/markdown-mode
+	app-emacs/request
+	app-emacs/treemacs
+"
+BDEPEND="${RDEPEND}"
+
+DOCS=( README.md images )
+PATCHES=( "${FILESDIR}"/${PN}-icons.patch )
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	elisp_src_prepare
+
+	sed "s|@SITEETC@|${SITEETC}/${PN}|" -i ${PN}.el -i lsp-jt.el || die
+}
+
+src_install() {
+	elisp_src_install
+
+	insinto ${SITEETC}/${PN}
+	doins -r icons
+}
diff --git a/app-emacs/lsp-java/metadata.xml b/app-emacs/lsp-java/metadata.xml
new file mode 100644
index 000000000000..5fcc78f3e9bc
--- /dev/null
+++ b/app-emacs/lsp-java/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/emacs-lsp/lsp-java/issues/</bugs-to>
+    <remote-id type="github">emacs-lsp/lsp-java</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/lsp-mode/Manifest b/app-emacs/lsp-mode/Manifest
index d4637db414a9..66b31e5e44e3 100644
--- a/app-emacs/lsp-mode/Manifest
+++ b/app-emacs/lsp-mode/Manifest
@@ -1,4 +1,4 @@
 AUX 50lsp-mode-gentoo.el 2081 BLAKE2B ac9eee2a41fa09e1ee72cabef2380b6095f469f1c668833b4d6d59964796a974457e2f85f4cdb7b66ea652ad23a6806326f9a43c20b4d1592fc1f19eb33a3773 SHA512 632fb2b9d0af9735c16fffbe6d0aca7ba0a494edd001ea289f17836e9ddd34d9ea60cf22035194e1837505cc214370be31e0dff0637a59361eeb6a4f2d12e816
 DIST lsp-mode-8.0.0.tar.gz 14703640 BLAKE2B ab7993772cfc127ee94ba4a0af75e8d7f6789ac22c76acce8df250b5579c1dd2f41e353b26cbdcf6e1a2e6a8d1f8a179d4736b67914cdec31c23032f93dffd3c SHA512 2620288142cea7b06ad2725b63e5db945b1d62d0b4c215e8d35d79d6c3f05bcdf2736dab34bd10c2b9f8928caf36ef617182c41c309e62e2ce8ddf45df376cbc
-EBUILD lsp-mode-8.0.0.ebuild 770 BLAKE2B a71c666d6657bbf9660564be35f1214f2bdc27e300809452e021e2e759456092b1e50f7ffc53432243de45eedfdea23b1c3b464b5b96213fdf2c5cc99c6394cb SHA512 0bf24d7d6a8077b40bf2197cb684a262407140539187b126c84f99e27855c9d5f06c662ee871e3f9dddeb5cd265bb61e9cf9eea02a36f773f3ff61c304e80246
+EBUILD lsp-mode-8.0.0-r1.ebuild 1205 BLAKE2B 26abed125c70a373a1ac0cc9672af1e174dfd179ab2a5a4c47bb50f41a7d68a5606302e24e2cfb45360f436e65d3299e92af50aafd0ac47c89563ddcc5c3b107 SHA512 85958cca001fca56f0416d75dfab2d9b0e7a621c0f6864cf25770e25abe780256e43c16f4b7b6a88e3a58b2d0a6a04124f8f78d9ec641fa8b8181733424cf0a9
 MISC metadata.xml 364 BLAKE2B d28d1feb1f2948839ed9759bd1d7f22285218f301e2862e50b6a58aad591f81d8d94ff8bf2fce8c399c04839467e89b82c2487b2ff09a129f4636d81555db4f8 SHA512 1b9aff2f7852a2af981b93c1e2ca1a0df378e52d0a0817a7fe4a00e5c74721389979df9367a6e93c3a62ac02adb118fbdfff84272f9f902c5883d0759a422d4c
diff --git a/app-emacs/lsp-mode/lsp-mode-8.0.0-r1.ebuild b/app-emacs/lsp-mode/lsp-mode-8.0.0-r1.ebuild
new file mode 100644
index 000000000000..ec668118c0b9
--- /dev/null
+++ b/app-emacs/lsp-mode/lsp-mode-8.0.0-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=26.1
+
+inherit elisp
+
+DESCRIPTION="Emacs client/library for the Language Server Protocol"
+HOMEPAGE="https://emacs-lsp.github.io/lsp-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/dash-2.18.0
+	>=app-emacs/f-0.20.0
+	app-emacs/ht
+	app-emacs/lv
+	app-emacs/markdown-mode
+	app-emacs/spinner
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		app-emacs/deferred
+		app-emacs/ecukes
+		app-emacs/el-mock
+		app-emacs/ert-runner
+		app-emacs/espuds
+		app-emacs/flycheck
+		app-emacs/undercover
+	)
+"
+
+DOCS=( AUTHORS CHANGELOG.org README.md refcard )
+BYTECOMPFLAGS="-L . -L clients"
+ELISP_REMOVE="test/lsp-clangd-test.el test/lsp-common-test.el
+	test/lsp-integration-test.el"  # Remove failing tests
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp_src_compile
+	elisp-compile clients/*.el
+}
+
+src_test() {
+	ert-runner -L clients --reporter ert+duration -t "!no-win" -t "!org" || die
+}
+
+src_install() {
+	elisp_src_install
+	elisp-install ${PN}/clients clients/*
+}
diff --git a/app-emacs/lsp-mode/lsp-mode-8.0.0.ebuild b/app-emacs/lsp-mode/lsp-mode-8.0.0.ebuild
deleted file mode 100644
index 610948576522..000000000000
--- a/app-emacs/lsp-mode/lsp-mode-8.0.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-NEED_EMACS=26.1
-
-inherit elisp
-
-IUSE=""
-
-DESCRIPTION="Emacs client/library for the Language Server Protocol"
-HOMEPAGE="https://emacs-lsp.github.io/lsp-mode/"
-SRC_URI="https://github.com/emacs-lsp/lsp-mode/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-DOCS="CHANGELOG.org README.md"
-
-SITEFILE="50${PN}-gentoo.el"
-
-RDEPEND="
-	>=app-emacs/dash-2.18.0
-	>=app-emacs/f-0.20.0
-	>=app-emacs/ht-2.3
-	app-emacs/lv
-	>=app-emacs/markdown-mode-2.3
-	>=app-emacs/spinner-1.7.3
-"
-DEPEND=${RDEPEND}
-
-# Requires unpackaged dependencies, e.g. Cask
-RESTRICT="test"
-
-src_install() {
-	elisp_src_install
-
-	elisp-install ${PN}/clients clients/*
-}
diff --git a/app-emacs/lsp-treemacs/Manifest b/app-emacs/lsp-treemacs/Manifest
new file mode 100644
index 000000000000..bac691bd83ac
--- /dev/null
+++ b/app-emacs/lsp-treemacs/Manifest
@@ -0,0 +1,5 @@
+AUX 50lsp-treemacs-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+AUX lsp-treemacs-themes-icon-directory.patch 1405 BLAKE2B 83e634c77566f3eefec1334261edea628d0b86175ac747fafb8f895aafc04381d8e1d591a56b6ed44891d183247a333b8de7bfccd30d88e32c908f394c223de4 SHA512 a8eb2ae98b2bfc6b7a22335bf646df7e90cc9a74bf5baf253cd181b12eff1304727573fad5e9a7eb50d968ebc49405f4230134e49c9abb404fb57f71c6ed0103
+DIST lsp-treemacs-0.4.tar.gz 1414056 BLAKE2B 508032a0514cb32e6f05974966dcc035d35f4780ef936f730901c3b5c9d5ab3f632ae22faf0a37fb81cf0e3388e53453c28e304f48ee5a8e090c9b771db47caf SHA512 e9e7ae5459c924d201fd164eaf245fd872187388bf9ead39e51962ad867919a7511f23543da01c17cad08f3fc0fe7b7607d6a2a5bc4d04dd392c6e6c5f3374d3
+EBUILD lsp-treemacs-0.4.ebuild 803 BLAKE2B e65178d2348824d3de889ce5b3754f02ed0a8475f6777a4cc2178103d73b17fd959cf2616b9c20f792cb96817cfe16d2c93c8fefd81ab3d4b615c605252c9eff SHA512 b4c64a11c91ae81916899a8b020b6f2175cdae083bdc583d03dc5ef7e71cf8edf7318952c57e21476f88d21ef3ec568fde98e9e02fe0a2f7267b3a7c18880bfd
+MISC metadata.xml 433 BLAKE2B 09e6bbad8f2597718758f76bd27762565bb9f6a033576cfc2e2273a92f6e82614e76cb91d3c3c80d873445dbc87553dd7d34ae5944ebbfcf9a250d61a4320ffb SHA512 1bae3db99049d1111fcddc86d9005cea629dfb46e61c33576a71fbee7a1d050eeef30a14b6f14da9e069a64bbbcd8e57dfe7dd0bf5b9bc23b6c84f312999a7da
diff --git a/app-emacs/lsp-treemacs/files/50lsp-treemacs-gentoo.el b/app-emacs/lsp-treemacs/files/50lsp-treemacs-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/lsp-treemacs/files/50lsp-treemacs-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/lsp-treemacs/files/lsp-treemacs-themes-icon-directory.patch b/app-emacs/lsp-treemacs/files/lsp-treemacs-themes-icon-directory.patch
new file mode 100644
index 000000000000..da681081c975
--- /dev/null
+++ b/app-emacs/lsp-treemacs/files/lsp-treemacs-themes-icon-directory.patch
@@ -0,0 +1,39 @@
+index 3a24127..2dbe570 100644
+--- a/lsp-treemacs-themes.el
++++ b/lsp-treemacs-themes.el
+@@ -32,7 +32,7 @@
+   :group 'lsp-treemacs)
+ 
+ (treemacs-modify-theme "Default"
+-  :icon-directory (f-join (f-dirname (or load-file-name buffer-file-name)) "icons/vscode")
++  :icon-directory "@SITEETC@/icons/vscode"
+   :config
+   (progn
+     (treemacs-create-icon :file "BooleanData.png" :extensions (boolean-data) :fallback "-")
+@@ -107,7 +107,7 @@
+ 
+ (treemacs-create-theme "Eclipse"
+   :extends "Default"
+-  :icon-directory (f-join (f-dirname (or load-file-name buffer-file-name)) "icons/eclipse")
++  :icon-directory "@SITEETC@/icons/eclipse"
+   :config
+   (progn
+     (treemacs-create-icon :file "vscode/Namespace.png" :extensions (namespace) :fallback "-")
+@@ -140,7 +140,7 @@
+ 
+ (treemacs-create-theme "Netbeans"
+   :extends "Default"
+-  :icon-directory (f-join (f-dirname (or load-file-name buffer-file-name)) "icons/netbeans")
++  :icon-directory "@SITEETC@/icons/netbeans"
+   :config
+   (progn
+     (treemacs-create-icon :file "vscode/Namespace.png" :extensions (namespace) :fallback "-")
+@@ -173,7 +173,7 @@
+ 
+ (treemacs-create-theme "Idea"
+   :extends "Default"
+-  :icon-directory (f-join (f-dirname (or load-file-name buffer-file-name)) "icons/idea")
++  :icon-directory "@SITEETC@/icons/idea"
+   :config
+   (progn
+     (treemacs-create-icon :file "vscode/template.png" :extensions (template) :fallback "-")
diff --git a/app-emacs/lsp-treemacs/lsp-treemacs-0.4.ebuild b/app-emacs/lsp-treemacs/lsp-treemacs-0.4.ebuild
new file mode 100644
index 000000000000..ef05f39a0638
--- /dev/null
+++ b/app-emacs/lsp-treemacs/lsp-treemacs-0.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=26.1
+
+inherit elisp
+
+DESCRIPTION="Integration between lsp-mode and treemacs"
+HOMEPAGE="https://github.com/emacs-lsp/lsp-treemacs/"
+SRC_URI="https://github.com/emacs-lsp/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64"
+SLOT="0"
+
+RDEPEND="
+	app-emacs/dash
+	app-emacs/f
+	app-emacs/ht
+	app-emacs/lsp-mode
+	app-emacs/treemacs
+"
+BDEPEND="${RDEPEND}"
+
+DOCS=( README.org screenshots )
+PATCHES=( "${FILESDIR}"/${PN}-themes-icon-directory.patch )
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	elisp_src_prepare
+
+	sed "s|@SITEETC@|${SITEETC}/${PN}|" -i ${PN}-themes.el || die
+}
+
+src_install() {
+	elisp_src_install
+
+	insinto ${SITEETC}/${PN}
+	doins -r icons
+}
diff --git a/app-emacs/lsp-treemacs/metadata.xml b/app-emacs/lsp-treemacs/metadata.xml
new file mode 100644
index 000000000000..f1fee62f0029
--- /dev/null
+++ b/app-emacs/lsp-treemacs/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/emacs-lsp/lsp-treemacs/issues/</bugs-to>
+    <remote-id type="github">emacs-lsp/lsp-treemacs</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/lua-mode/Manifest b/app-emacs/lua-mode/Manifest
index 1bbd96e12089..2eab634cee29 100644
--- a/app-emacs/lua-mode/Manifest
+++ b/app-emacs/lua-mode/Manifest
@@ -1,6 +1,6 @@
 AUX 50lua-mode-gentoo.el 206 BLAKE2B 07efd36ded1a442c754102c22bea97ee4bffc2c89e40fbef2d8e644051766da13da6b0d2034f3a4e27fa1522949ff351a1105651d79d9005bf38dddd4bea6577 SHA512 b062343ab77dcaa50355498a63681c8e5bc6f209b1aa5ef82d65be8c19aa52d58c2efcd481f091804726b095a02b97de5b6cbce232ee5d9f328c5e3d888b496b
 DIST lua-mode-20201010.tar.gz 42458 BLAKE2B 7bdfd35a8cb2bd1abea477fc408ee1d36c482310764d95acc0e0032a316bba005c15be9b5b862f249d72a7f6bdb30e71d951182023686f5914f4ec5272eb03f1 SHA512 7df283c4a6445979b4ceb1e398d1b48e8967d2f631f33be3f58171758ceb613ea8a4c7a466975bbe77d2a361b70dc9f30b7a244be34a87de0e6434b61088a6a4
 DIST lua-mode-20210802.tar.gz 53708 BLAKE2B 59532423c87dc0a50401352151756f66cb757e3ffdd7bae066bfbe4e4d90a6ea52b90b106e998c5e2abe05bdd0be9a653b1d226127380b88c5c13def5292a622 SHA512 04a85b6911c295ac02534b812bcd90c8f0224634c77b1fdcff86a24315749af07d86a8b4f8c65caf853849d4a9af9e85af9506606d0e5193e37644130981ccc5
-EBUILD lua-mode-20201010.ebuild 628 BLAKE2B f376b55e3861d32b7cf18628372016e33c8984179639b4358712f8967824ab6f1cdea7cf1aaccd091e707133b69be43f738497e5dd2811f11413732935e09782 SHA512 c6f1a10810ecb55bac8a434b7607a198e8fa573d560c99977b2f2ffc3a07b490a8b147a04269611c05635407550228b75e6e1a25a231638e040d57fe1f188fc6
-EBUILD lua-mode-20210802.ebuild 628 BLAKE2B e6649fef5e742d4accf0dd591ac0b29342890bc7528d2a1ca7ffd14d6cc4d725b58dc941d822cb920428ab80afdd0468e3d3874e7d6c23b1d3738e6cfbbcb84c SHA512 b000e184b6432e8a572b398c9ac9db36753ab558a8114886d7fa020a2cb94fdceef6f77eb5d50a0ba717380026f077fdd916f50c4647535ca23909f03c53d6ab
+EBUILD lua-mode-20201010.ebuild 622 BLAKE2B c5237e3313f92551f12bc3f645ce2f661977ba1e3b6abf51a883022e6a223946be2f3b56f8761de4adb42f83776c246fd0fcbcee62fb36aee6cc0262d165ec01 SHA512 22837e7a807bbba6d321f1c60807a4028f07f3e79e6ef8a17fa32fb3a176749fc0ca30520c6617d60cca864289841a00f8a20a3db736864803509146d403d5e0
+EBUILD lua-mode-20210802.ebuild 622 BLAKE2B 0c178f3d4d7a3a230bbc8330790691e05b691b54ebf8bdcc37008f985611f430eae98144c4b45a5df6fe71667c7fc87d131f5323692a8590323deb74f6a93e9d SHA512 dd1d4b818d9eaaa8e4e89c05ac58a7b77b32e50884bdd559adc1e4c0581fe094aa8a0c371a8061506bf4fe0befd1bc3482a61b14aca89a8a2fdb0e0218db4b8d
 MISC metadata.xml 362 BLAKE2B 34214f3a2a012b497368307bf473bcd67fffa8870407fe6f140c4db0fa66152c6eff1f14cb775e286ce732b9df6df395a43561fcd3304ddbde30702c9cf50843 SHA512 341faebc485a16a7c1e07e20aaef61c12d21e9f462ffb6cb5599c91f08517f1cbfec94752038dafa2a1fe95ad3748a404debec8fe3bac5c0249ce651b1fefbb0
diff --git a/app-emacs/lua-mode/lua-mode-20201010.ebuild b/app-emacs/lua-mode/lua-mode-20201010.ebuild
index 78393cf9f299..e57e6e9d1f8b 100644
--- a/app-emacs/lua-mode/lua-mode-20201010.ebuild
+++ b/app-emacs/lua-mode/lua-mode-20201010.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/immerrr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 RESTRICT="test"		# tests require cask which isn't packaged yet
 
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/lua-mode/lua-mode-20210802.ebuild b/app-emacs/lua-mode/lua-mode-20210802.ebuild
index fbfcabb10963..0f2f90af63fb 100644
--- a/app-emacs/lua-mode/lua-mode-20210802.ebuild
+++ b/app-emacs/lua-mode/lua-mode-20210802.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/immerrr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 RESTRICT="test"		# tests require cask which isn't packaged yet
 
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/mastodon/Manifest b/app-emacs/mastodon/Manifest
new file mode 100644
index 000000000000..0ceea3ad92e5
--- /dev/null
+++ b/app-emacs/mastodon/Manifest
@@ -0,0 +1,4 @@
+AUX 50mastodon-gentoo.el 137 BLAKE2B 1a4d306658bc54fa3b69a6b250a9fc48d8013e79261afad49b71e01fa0096c6f81187eeb4a308d19888045be948c8cf3d726e9ee9865120cb803be2f35969892 SHA512 52bffd9a794108da342152e435aba1fb551e5f058e1ff02d0a094b221a6b1359e39d0bf629472d5e42fff43244303d78cc4bfd7052f5760b512a61d18300074b
+DIST mastodon-1.0.0.tar.gz 91448 BLAKE2B 093599c4e80113fcb91e0419f3fd050dc793965ce5b69ac94aaabefa5c51cf1b02bb9d8b9bb60a6b5cab377780958b30254f0d91c0f3f8309c1b04342415b17d SHA512 206b180e1cbb345ef35182f753e05b57d5ef1649c68aa3a8ff8eee3c4e3157a22457398a04219f4fd052e8af9d94f6978a6c95c399e284eb27449cd9a4c53e8c
+EBUILD mastodon-1.0.0.ebuild 549 BLAKE2B b7e318d8ccea77824e4d3aa516e9220c5ef8212607947a2de03277a9f46e8341512f846fe205d781635fca6ed68f8a418ee07fce060dd40766ef7f273436b468 SHA512 e52bfde37268c66d66efd6c1078159daf77b7d124661e4c93bfaae51cc89cace746b3de30d2fc2935223d551156a26bf5b19274618504051848bc2e49eb2012a
+MISC metadata.xml 448 BLAKE2B 6e886586bfa014f72cc40c103bb3901223a6050e10995929b3f709e275e360c750a5cc6940611575d822b160b37c4d4873ac3b191c3a2ad766c34b6c4b1db265 SHA512 86340bfaa0851d176025f23869cc4b29f0883ed4a1bbd4b615fd9af998aa2e36e5cd887538c88810ed4148628340025c7078a9114d10441f425cbd7ba53c64c3
diff --git a/app-emacs/mastodon/files/50mastodon-gentoo.el b/app-emacs/mastodon/files/50mastodon-gentoo.el
new file mode 100644
index 000000000000..c4056b92a961
--- /dev/null
+++ b/app-emacs/mastodon/files/50mastodon-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'mastodon "mastodon"
+  "Connect Mastodon client to `mastodon-instance-url' instance." t)
diff --git a/app-emacs/mastodon/mastodon-1.0.0.ebuild b/app-emacs/mastodon/mastodon-1.0.0.ebuild
new file mode 100644
index 000000000000..319925f34d35
--- /dev/null
+++ b/app-emacs/mastodon/mastodon-1.0.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=27.1
+
+inherit elisp
+
+DESCRIPTION="Emacs client for Mastodon, federated microblogging social network"
+HOMEPAGE="https://codeberg.org/martianh/mastodon.el/"
+SRC_URI="https://codeberg.org/martianh/${PN}.el/archive/${PV}.tar.gz
+			-> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}.el/lisp
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+RDEPEND="app-emacs/request"
+BDEPEND="${RDEPEND}"
+
+DOCS=( ../README.org )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/mastodon/metadata.xml b/app-emacs/mastodon/metadata.xml
new file mode 100644
index 000000000000..ca48e9f3432a
--- /dev/null
+++ b/app-emacs/mastodon/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>
+    <changelog>https://codeberg.org/martianh/mastodon.el/releases/</changelog>
+    <bugs-to>https://codeberg.org/martianh/mastodon.el/issues/</bugs-to>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/mocker/Manifest b/app-emacs/mocker/Manifest
index 9235d83cb8ba..9afc27d4c06f 100644
--- a/app-emacs/mocker/Manifest
+++ b/app-emacs/mocker/Manifest
@@ -1,4 +1,4 @@
 AUX 50mocker-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
 DIST mocker-0.5.0.tar.gz 7538 BLAKE2B 6998955dad68acf1a1dec8029dcaf0c5670e7594f77deb6d52873c2b9018ca329885120ee12f50c08d2a4014d94f3614f25d3f804df422b33f50cee74a46f935 SHA512 f649f8065734e8591b23f7887157ab0fadaca459a37761d8415e09957ad4a007f0896042511e842cd7d77294483d833552170cbdbb19b03638f7890e85605459
-EBUILD mocker-0.5.0.ebuild 631 BLAKE2B f73c7107f067886dae6d8be7adbb28d2c889ffb005312055c155184c6659ce3d6f5f53045765a35655298ebc74095df2af399eb2324597b24ea16515269dfb2d SHA512 4d9ba2a56766f7f7b47d8b6ee9a2ed1bbe562bda5708321d5a47198a9511a619c46e55bdfa528f94f99aa4ef97e4d59b47898be7826649211f10bb498f6467e2
+EBUILD mocker-0.5.0.ebuild 630 BLAKE2B f673f0ae61569b2f82805beff96b5eab887385be42383192196a8ac4f95323cdde171157d84f90023b43689a27d7fae70543c5df0fc4bd8e01364855b99fdde5 SHA512 d1fd29fe525c0a076f7e342104cba54bbe7b288155644ec46bb193038d6f7e81dd3c62e3a06f728b1dd3e5f77e7852531c826346ec6ddc13102ddfe1c8bca80d
 MISC metadata.xml 419 BLAKE2B b404cbd9a3007416336acff6a1d4caad461145aae28319323edec845d94a2f235991cb5b5fa777c57ddc5066a6da217d642bb7e23b6b71990892407004213b88 SHA512 b6f1a62c6962b5c8c61586621e0306e91a58b20e3ba71700d2097eb819a77c7c1db7b1dfa751b800ffda3dc7a63acbf81948c6511edc473decc2ff5d9977b5ec
diff --git a/app-emacs/mocker/mocker-0.5.0.ebuild b/app-emacs/mocker/mocker-0.5.0.ebuild
index 8c112ede6dc9..68f8742b5d8e 100644
--- a/app-emacs/mocker/mocker-0.5.0.ebuild
+++ b/app-emacs/mocker/mocker-0.5.0.ebuild
@@ -8,7 +8,7 @@ NEED_EMACS=25.1
 
 inherit elisp
 
-DESCRIPTION="Simple mocking framework for Emacs "
+DESCRIPTION="Simple mocking framework for Emacs"
 HOMEPAGE="https://github.com/sigma/mocker.el/"
 SRC_URI="https://github.com/sigma/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}"/${MY_PN}-${PV}
diff --git a/app-emacs/noflet/Manifest b/app-emacs/noflet/Manifest
new file mode 100644
index 000000000000..dc48aa0c8acd
--- /dev/null
+++ b/app-emacs/noflet/Manifest
@@ -0,0 +1,5 @@
+AUX 50noflet-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+AUX noflet-fix-requires.patch 735 BLAKE2B 513a05b2343411771968d4caec6e81f5b8f5b66f8ea5d663aff256160df8a891bb821eb5ea39c60959326ce29677bd9ca1e6a09ab52783cd4cf324c981989f12 SHA512 8b6b21f5e67e57d20e1555201e248eaa6f6f32fb7e9fe68557a27b27708758de714e5031f9c50dcaf50208e216df41455d82a6bf5d34b2897ca89a9d635b91df
+DIST noflet-0.0.15_p20141102.tar.gz 3123 BLAKE2B 0886da1af599e8ca226fbbefa31b6130c76d704d62c5323803543c31e975c375c1cfc12a5a3cfb5e2491488a31fce5538ab80f826de43fa4c77bdc7e8bd84315 SHA512 7007cb09f3ceaba652042a1ba9ff669e73b0a01775de573f0cfab33eef963e7b9125bb16ce1cd809479ea3ec0277eeed757a716538b1ca1f5b559b1ecdf7ed73
+EBUILD noflet-0.0.15_p20141102-r1.ebuild 641 BLAKE2B 4459ad27d23ce9b45c550f2dcb3a00c1b7cb6c653d02390e205dd9ebba63f1808e3d26b263a59ab72055a4141396fc2e0e89fe4881a86942511c2713d14351e4 SHA512 f560f08feae4b5889b24bd1b0440c35b95c2f98bc7b1a1845243467978ad708a34663dd3b653c6fa54f11768fe914a54ae39ff02e023f32ecb6650e37a18d9a3
+MISC metadata.xml 435 BLAKE2B ce7fd39a001c15f061147a3419acc25566ca6db9ac3868f410da7289fba33df1d274fc9efa970b38dc4f27f543219ce7ab125834264daddccdd7c15b3bf26d46 SHA512 2e95b227aebb9f38dc34861a0a56d4edefa20575ec0d0ec0cbf50418f7dcc853512ea170e6fd7e317e6932aa65cb5f4049fc62a413b78e244f4e979f8e4a9f73
diff --git a/app-emacs/noflet/files/50noflet-gentoo.el b/app-emacs/noflet/files/50noflet-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/noflet/files/50noflet-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/noflet/files/noflet-fix-requires.patch b/app-emacs/noflet/files/noflet-fix-requires.patch
new file mode 100644
index 000000000000..142229d547e1
--- /dev/null
+++ b/app-emacs/noflet/files/noflet-fix-requires.patch
@@ -0,0 +1,28 @@
+index 58d3b8d..c003987 100644
+--- a/noflet.el
++++ b/noflet.el
+@@ -28,10 +28,8 @@
+ 
+ ;;; Code:
+ 
+-(eval-when-compile (require 'cl))
+-(if (version< emacs-version "24.4.1")
+-    (load-library "cl-indent")
+-    (require 'cl-indent))
++(require 'dash)
++(require 'cl-lib)
+ 
+ (defun noflet|base ()
+   "A base function."
+index 58d3b8d..73f0719 100644
+--- a/noflet.el
++++ b/noflet.el
+@@ -155,7 +155,7 @@ maintainers refuse to add the correct indentation spec to
+            (indent noflet-indent-func))
+   `(cl-flet ,bindings ,@body))
+ 
+-(defmacro* letn (tag bindings &rest body)
++(cl-defmacro letn (tag bindings &rest body)
+   (declare (debug (sexp sexp &rest form))
+            (indent 2))
+   `(cl-labels ((,tag ,(-map 'car bindings) ,@body))
diff --git a/app-emacs/noflet/metadata.xml b/app-emacs/noflet/metadata.xml
new file mode 100644
index 000000000000..09739af554d8
--- /dev/null
+++ b/app-emacs/noflet/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/nicferrier/emacs-noflet/issues/</bugs-to>
+    <remote-id type="github">nicferrier/emacs-noflet</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/noflet/noflet-0.0.15_p20141102-r1.ebuild b/app-emacs/noflet/noflet-0.0.15_p20141102-r1.ebuild
new file mode 100644
index 000000000000..461c04cef26d
--- /dev/null
+++ b/app-emacs/noflet/noflet-0.0.15_p20141102-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=7ae84dc3257637af7334101456dafe1759c6b68a
+
+inherit elisp
+
+DESCRIPTION="Dynamic, local advice for Emacs-Lisp code"
+HOMEPAGE="https://github.com/nicferrier/emacs-noflet/"
+SRC_URI="https://github.com/nicferrier/emacs-${PN}/archive/${H}.tar.gz
+			-> ${P}.tar.gz"
+S="${WORKDIR}"/emacs-${PN}-${H}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-emacs/dash"
+BDEPEND="${RDEPEND}"
+
+DOCS=( README.creole )
+PATCHES=( "${FILESDIR}"/${PN}-fix-requires.patch )
+
+ELISP_REMOVE="let-while-tests.el"
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/ocaml-mode/Manifest b/app-emacs/ocaml-mode/Manifest
index 840344f93c02..78f5da5de49a 100644
--- a/app-emacs/ocaml-mode/Manifest
+++ b/app-emacs/ocaml-mode/Manifest
@@ -1,4 +1,4 @@
 AUX 50ocaml-mode-gentoo-3.12.1.el 499 BLAKE2B 30d49a4e43fbf4fac02f4a2dd8a9fe7c3aeea623836330e3ed0f8921cc96a02d087f35a32a93f6e404392a1f915539799d1a5c8168b06cb1d8ab76ea0ac6b8fa SHA512 0be69a30c07caeff818e4d6fb0147e18855e88a3bb6a6e876b170edddb32382c0bd19ca960836d8442eecd00e78be09cba7de08030420645c2ef1ba5d9198524
 DIST ocaml-4.05.0.tar.gz 4431750 BLAKE2B c2ab003a13e0a581ebd0e1c96eeb8a9baea9bfe6bee08823b0e4541819201ec109f1846e13fc1aefa51a001eefbb8f73320ba854d41975fc68cef41bc75b1ecc SHA512 9a060ae4b741e1687277403e5bdb8f6eda2e2ebf6c45f7c0149b66ea1213cb26d13febfbb3f11c12543e244cfdd053b786b09c4145e2348e5d89a7206f7de225
-EBUILD ocaml-mode-4.05.0.ebuild 504 BLAKE2B f67f65b745ce2fdc5392a19201a66a65a7ac8186f9f5b5f284fd79c510ad13ac16817b795c8c7116c992d1632ee0a35946fbf141df0178c9dcf273edeb478d96 SHA512 db3855fb0938cdedb4c13dc40b909cfe683b602a2b574ce7d82c09fe3d6c5b7e74cacf28cce796fb55c520b04940ce7a3b2987fd56f9c0e3148a33123eb6737b
+EBUILD ocaml-mode-4.05.0.ebuild 511 BLAKE2B f7cf2f9cf4a0f605e85e471d0f17a3bcf9c6d037b85d6538957863060ee17d50ea236cfa6b73c2519af5433e7e07b356d2035a07b543a871667898fc53bc3c23 SHA512 879b0d92690f765ad9a29bc2895e9fa4b957686c1cfc930637d81d25673d69f1016d262ae761d12906a60cdb6745a5ea66d426f9c34eab87086d93542d3a275d
 MISC metadata.xml 283 BLAKE2B 81c49021199f71096079a27f9121390fb8c1285c54b9478583ff2d647277fa106ef12456d7097c4be092fc48b514a1adcf855ca0fac911598232ef9eb7f102c0 SHA512 f32b303760addf5d4db8d18bd10fb677353cdfa4c5e545d47804ef756cf5e5a21f8b8efb631b08f802185913ceb98da820e404e06eb03d01fe9ea85c10d1ac13
diff --git a/app-emacs/ocaml-mode/ocaml-mode-4.05.0.ebuild b/app-emacs/ocaml-mode/ocaml-mode-4.05.0.ebuild
index 2ee616fb4445..9e7ce51ec9b7 100644
--- a/app-emacs/ocaml-mode/ocaml-mode-4.05.0.ebuild
+++ b/app-emacs/ocaml-mode/ocaml-mode-4.05.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 S="${WORKDIR}/${MY_P}/emacs"
 SITEFILE="50${PN}-gentoo-3.12.1.el"
diff --git a/app-emacs/org-mode/Manifest b/app-emacs/org-mode/Manifest
index 74a789d75b1b..662dbde5d6c3 100644
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@@ -1,7 +1,9 @@
 AUX 50org-mode-gentoo.el 95 BLAKE2B 9c74869edce0915d9793a3b10f61e8002dec553a93fe9856c526d77e5e988a35203c35322a1ea7ce9e19b02ff9a5ce1b2b4d73b8ba19bada30b7fbf453e43b01 SHA512 aa2e47c060d441ef1f631f2a44f3b7adc7cf5306155b9cc3f3f808aa053b411980671a89933c77fe02aac79bb6f25f2fe98c676e13e097dd885f23bc9d8cb000
 DIST org-9.4.6.tar.gz 4729335 BLAKE2B b88edaf8098124b2048ce57d6005d2af0de34e9b8fa94c24eb041a42a6fca1fd6da7f242be89e6b0ca5e7b80d879096f9114dca0ba86b20a5d26d2a185baa537 SHA512 7e50d7e9e2073bc0f06d2c861f59d4c9b8af4cf63c98f730c810a3a8721e65829fe9ef7ba0ac99f49bf9da427a4d5ad1d028e05c1a8ab6a3bea2ff2020c0e61d
 DIST org-mode-release_9.5.2.tar.gz 2047430 BLAKE2B 3df1ea84d3513ff4ceeea69d6afcdbd68ac1dd0112831a4d202d4d8ab730067d9b9d72bc86e40157282d487c0020e4c2161d611f71da40951f3e322923efce9b SHA512 6d61e2db7f3bc736e299f47e85b3fd7c31324d0f60bf4b84f5540b717e7d394957bd5f9196aa8d3840e8798eb2b597818b03fa239fc1427ffb54c8ed74b5c9ae
+DIST org-mode-release_9.5.3.tar.gz 2049323 BLAKE2B e6a93a74d5084ca168fb85d2651c23a0afb75ac649cf6821cf825bb54d69d61ea4694584872b49a23bac1374f0b22d2d7015a346b0dd46fb0795b75c8753c655 SHA512 7062e1075567b7af9b1c39f38930fc1fbc72e53be3c063dbd25cc4e8295932ba501586fcb1e2879da1db4200e63c79a454f4225b5d53dafb1773ebb2e0340ec5
 EBUILD org-mode-9.4.6.ebuild 1710 BLAKE2B 7e412f50607d334b4052596fee8520b7d47c982b43f23245d64c56004a2d8910ca9fc12bf8a4ee269d6556a7406e1a297131ed7d0ff9e5ad17d04bf698575d80 SHA512 5d2004cb82270a425edd181881b0c64866a04c89203695b0d56cedd7b4f4032ec63f36e564ade12e67ed75c322f4bbfeb293ccf20b0b47749cddce277f2849fb
 EBUILD org-mode-9.5.2.ebuild 1354 BLAKE2B 91230d55d675bb6fa2cc1b4b77bd15c1489972aad0ccce952effb43913f2d5efbca723d382253ab8281155ede9d268db87a513fa2616949905c108b3fbfa56f9 SHA512 9b3a68bedb079c7ddaa07edece32241172e5d7939ac979a6ddcd7812c5ea654bb7fd3994d6be767960b11d0ac33ec2c56b7d8ff717d649ef627fc029f54230ea
+EBUILD org-mode-9.5.3.ebuild 1357 BLAKE2B 2a168c412e1f23b11a3d7b14a8befce8ec7f55248507e31258dbf7e2fe900c234a395b066e22ccd30c752f7bb5951475b98ac86236585993840b21f0b4d49917 SHA512 588041db796a8d0a7062eca487071be2f9bbe5da9e44747a3545679efea0ef5a5b70bd96cd43b55c2a8623e178b429d3480999b18434cf6a4572e1a67c1fbdf3
 EBUILD org-mode-9999.ebuild 1537 BLAKE2B a8bd3199be2117253f7e1d4009c98384cac23c3b9d3094e3285a0418e5b3ae4c910251bc278a00cc92225dd8106ba8f472ca32ead00f7fb1a6ff967f57a96400 SHA512 640f00ee00d72c2be2fa373b50b138400c5b2cc9f113eebf385d853cf477aa93d93f70ff8ebfbff5948aa4b57993425c53ab89d2cb5abb544d5a8715c40d7fb3
 MISC metadata.xml 1369 BLAKE2B 4da436ff9e2de1e6f01a37be7cd8a893d49896d00c83a16a47838c3908e04b46f7f07499ce3bdf41a25033ec1313e16b30d6498622e476fdede774ce711d77ff SHA512 d0817690d4662401fcdd28de85b3e7e5f0c69cb37de4ba7ada8499d7ef964217cda8cabed4849c9b48ebecc393d65b2de5067c36db1e98834ac8a86024b901d1
diff --git a/app-emacs/org-mode/org-mode-9.5.3.ebuild b/app-emacs/org-mode/org-mode-9.5.3.ebuild
new file mode 100644
index 000000000000..dafc16ab39bc
--- /dev/null
+++ b/app-emacs/org-mode/org-mode-9.5.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+NEED_EMACS=24
+
+inherit elisp readme.gentoo-r1
+
+MY_P="${PN}-release_${PV}"
+DESCRIPTION="An Emacs mode for notes and project planning"
+HOMEPAGE="https://www.orgmode.org/"
+SRC_URI="https://git.savannah.gnu.org/cgit/emacs/${PN}.git/snapshot/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3+ FDL-1.3+ CC-BY-SA-3.0 odt-schema? ( OASIS-Open )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc odt-schema"
+RESTRICT="test"
+
+BDEPEND="doc? ( virtual/texi2dvi )"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	emake datadir="${EPREFIX}${SITEETC}/${PN}"
+	use doc && emake pdf card
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		ETCDIRS="styles csl $(use odt-schema && echo schema)" \
+		lispdir="${EPREFIX}${SITELISP}/${PN}" \
+		datadir="${EPREFIX}${SITEETC}/${PN}" \
+		infodir="${EPREFIX}/usr/share/info" \
+		install
+
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	dodoc README CONTRIBUTE etc/ORG-NEWS
+	use doc && dodoc doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
+
+	local DOC_CONTENTS="Org mode has a large variety of run-time dependencies,
+		so you may have to install one or more additional packages.
+		A non-exhaustive list of these dependencies may be found at
+		<http://orgmode.org/worg/org-dependencies.html>."
+	readme.gentoo_create_doc
+}
diff --git a/app-emacs/org-static-blog/Manifest b/app-emacs/org-static-blog/Manifest
new file mode 100644
index 000000000000..04f79044a88a
--- /dev/null
+++ b/app-emacs/org-static-blog/Manifest
@@ -0,0 +1,6 @@
+AUX 50org-static-blog-gentoo.el 129 BLAKE2B 4639c08028ed536c3738b1f12d8240bd90b88ef2f9f74cd9b6028114ec5961d080674a8a5d9f79782f1cc86a61fa45539edfdf8f22446fa0fa53a43ef7bc3bcc SHA512 a6e00036ee5b797fa69c1d73001ce853c77b3f636d5715a4907406eb27885f02cbf989ec73d6d7e8b99aa548c87d1162758640200dfadfe56ae6a6a385c6a9bf
+DIST org-static-blog-1.5.0.tar.gz 13504 BLAKE2B a6eaa2e92d715513d69d230863a744c46c4b621dca98b2164eef0ae6d63f0e34b942a0bff99ae197e84fbbb315a1f07f829e958674104aaf651d815c43d1e58c SHA512 6b7d7922b5a4eec4724fa0b3ac94c9f8de7d3a984ced85e938f3e96faf0387d37881abcc0cc159b21d2cfc3e3e62f113f51d5967fca6b07c60ade1d3fe290b6f
+DIST org-static-blog-1.6.0.tar.gz 15519 BLAKE2B 1ce2c33beb54be5ca9d0a82d5eaa53785f2feb3bfc7df7f236d6ed2a2a5cc2735f879aefe2f52038dd8f19d24f60704b0dda92e883d6911e130b65fb99786353 SHA512 1c7bb70faff38526e6d9072b8733c16fb3458a150ffee03e921fbed6fb23007eb23c25cb6379c473a4292c866883780c844e5f7e24f4cdf2e26563877d495f3a
+EBUILD org-static-blog-1.5.0.ebuild 435 BLAKE2B 13ce0fdff245609369b2c7675bc9da16a0e2366a2f5385d70a240de88290c3f902d77bd1b86ea40b70ecb09509b84239967b8268e2a955a48c83c1545ff52932 SHA512 774f604942864172a9466e9bb422e1885b36a6dd8f5e326540be5b08b467621493d07ae042af66430264a491466c5432fc439080d5f909e99ba9455c45af39fb
+EBUILD org-static-blog-1.6.0.ebuild 435 BLAKE2B 13ce0fdff245609369b2c7675bc9da16a0e2366a2f5385d70a240de88290c3f902d77bd1b86ea40b70ecb09509b84239967b8268e2a955a48c83c1545ff52932 SHA512 774f604942864172a9466e9bb422e1885b36a6dd8f5e326540be5b08b467621493d07ae042af66430264a491466c5432fc439080d5f909e99ba9455c45af39fb
+MISC metadata.xml 435 BLAKE2B af69d09f9f194c701026e403720cd32d5197d821469d662c3e6478b90037384f8b10587419b320d18009883bec91f9acfcaa709440d4d8452f5e0df0d712deaa SHA512 1b1790c600f08c10ece759fcc932c946bcc3d2749d3e5d169b9b5705b0fcc78e0932d40888ca8d426c7b7e0f6b1cef751e03c2e8d5714c67453626515a38caee
diff --git a/app-emacs/org-static-blog/files/50org-static-blog-gentoo.el b/app-emacs/org-static-blog/files/50org-static-blog-gentoo.el
new file mode 100644
index 000000000000..19fa211bbbd4
--- /dev/null
+++ b/app-emacs/org-static-blog/files/50org-static-blog-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'org-static-blog-mode "org-static-blog"
+  "Blogging with org-mode and emacs." t)
diff --git a/app-emacs/org-static-blog/metadata.xml b/app-emacs/org-static-blog/metadata.xml
new file mode 100644
index 000000000000..22815e751aca
--- /dev/null
+++ b/app-emacs/org-static-blog/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/bastibe/org-static-blog/issues/</bugs-to>
+    <remote-id type="github">bastibe/org-static-blog</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/org-static-blog/org-static-blog-1.5.0.ebuild b/app-emacs/org-static-blog/org-static-blog-1.5.0.ebuild
new file mode 100644
index 000000000000..92a9f3c0a808
--- /dev/null
+++ b/app-emacs/org-static-blog/org-static-blog-1.5.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24.3
+
+inherit elisp
+
+DESCRIPTION="Static site generator using Emacs's org-mode"
+HOMEPAGE="https://github.com/bastibe/org-static-blog/"
+SRC_URI="https://github.com/bastibe/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.org )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/org-static-blog/org-static-blog-1.6.0.ebuild b/app-emacs/org-static-blog/org-static-blog-1.6.0.ebuild
new file mode 100644
index 000000000000..92a9f3c0a808
--- /dev/null
+++ b/app-emacs/org-static-blog/org-static-blog-1.6.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24.3
+
+inherit elisp
+
+DESCRIPTION="Static site generator using Emacs's org-mode"
+HOMEPAGE="https://github.com/bastibe/org-static-blog/"
+SRC_URI="https://github.com/bastibe/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.org )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/package-build/Manifest b/app-emacs/package-build/Manifest
new file mode 100644
index 000000000000..1c4736ebc15c
--- /dev/null
+++ b/app-emacs/package-build/Manifest
@@ -0,0 +1,6 @@
+AUX 50package-build-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST package-build-2.4.tar.gz 14768 BLAKE2B 404dff528b3240cc0052e3feb556c1f1e3e829e7bda5e2468d2034b19f998245c48c126f8f3c67b2687e3f43da223bc7b917abab056c978edd6dd46040743c2d SHA512 cc06afcf954b44322cd010e3c557ad6222d30f4f5e83e608d49d439ff0a78acadeb9f334da900478624cf4575e5abf3d3bd67590336729ebc16a70c4f9440d87
+DIST package-build-3.0.tar.gz 16318 BLAKE2B d44c3bdceb427bdc608a2b222820e33fb21cc1f91d48563793cd742085c840c05e24c8ecf31422bd7d2e841d187ad708d39b235ed820d2f44e6a0386bb36c939 SHA512 2ee4b1aa15344e19679eb3c30ddd1ac49cdf668393b09a0f72a8bbfd2421e6e218acf644ff99737d50de7bda1cea4e8e0390d56a2630fb23218511b01a0f0d3f
+EBUILD package-build-2.4.ebuild 406 BLAKE2B 89faf117576b9e8e84f790cc6a2c2b14dddaa71b3000815347eceb723f1b6aad374c7b06ed15b15326775cd7c43d0a5ae17fa944e2f5bd428befa062a7c942cb SHA512 2c272d8dd6aa8a61a918649f6315c900fc6cb18faa75fc195e6863066c9204e268633cf82994de2dd6b8b9fe1a216409ae53c17997c34dd286f9b5076feed908
+EBUILD package-build-3.0.ebuild 406 BLAKE2B 89faf117576b9e8e84f790cc6a2c2b14dddaa71b3000815347eceb723f1b6aad374c7b06ed15b15326775cd7c43d0a5ae17fa944e2f5bd428befa062a7c942cb SHA512 2c272d8dd6aa8a61a918649f6315c900fc6cb18faa75fc195e6863066c9204e268633cf82994de2dd6b8b9fe1a216409ae53c17997c34dd286f9b5076feed908
+MISC metadata.xml 452 BLAKE2B 22cb0e741c502768ef7a4a9665f1857d7defb33ee449314d496f48b7571df697a8b675aecf2884cde00d2d0c81b2436c54de87674c7821744bcab475e9e01d9a SHA512 7eb57eece299500dbc7c8909c386290236a2ede60fafcf9bb0296912085d5fbf156215fda4a77207adaa523ee81b338e2330e5901cdeaecd8018c3991c359531
diff --git a/app-emacs/package-build/files/50package-build-gentoo.el b/app-emacs/package-build/files/50package-build-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/package-build/files/50package-build-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/package-build/metadata.xml b/app-emacs/package-build/metadata.xml
new file mode 100644
index 000000000000..4cbe6bac7b4a
--- /dev/null
+++ b/app-emacs/package-build/metadata.xml
@@ -0,0 +1,14 @@
+<?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>
+  <stabilize-allarches/>
+  <upstream>
+    <bugs-to>https://github.com/melpa/package-build/issues/</bugs-to>
+    <remote-id type="github">melpa/package-build</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/package-build/package-build-2.4.ebuild b/app-emacs/package-build/package-build-2.4.ebuild
new file mode 100644
index 000000000000..86af0a97c722
--- /dev/null
+++ b/app-emacs/package-build/package-build-2.4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=25.1
+
+inherit elisp
+
+DESCRIPTION="Tools for assembling a package archive"
+HOMEPAGE="https://github.com/melpa/package-build/"
+SRC_URI="https://github.com/melpa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/package-build/package-build-3.0.ebuild b/app-emacs/package-build/package-build-3.0.ebuild
new file mode 100644
index 000000000000..86af0a97c722
--- /dev/null
+++ b/app-emacs/package-build/package-build-3.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=25.1
+
+inherit elisp
+
+DESCRIPTION="Tools for assembling a package archive"
+HOMEPAGE="https://github.com/melpa/package-build/"
+SRC_URI="https://github.com/melpa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/package-lint/Manifest b/app-emacs/package-lint/Manifest
new file mode 100644
index 000000000000..59b230d855fb
--- /dev/null
+++ b/app-emacs/package-lint/Manifest
@@ -0,0 +1,5 @@
+AUX 50package-lint-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+AUX package-lint-symbol-info-data-directory.patch 1249 BLAKE2B 119c77c1a720bb08be8dc82b74eba56b0ada00bdc769d6efa644613e582613929e4e1a64ef932160053e07275d533dad86db83d0441c69487a7505bf9cb9dbf4 SHA512 ca0bf2708d7d06361b604f1ac0466f0273492629f827939424a5c1bc764bf1756f71b69eab29eab9db76b168db7e45ab370ff0c8e5ac601bff08a4bd4424a745
+DIST package-lint-0.16.tar.gz 224744 BLAKE2B a1d26ae28727e305416498b66da188cbadababc9f415c199eff380dbce4888ee3137b6f13a26147d427142a9d244c784e192d21df3173d0a0c2dde4acb1e8630 SHA512 f5d79b69d37671233614a622cd5fd6c28c230adb0d5b7934ccd6bedc12228adb7bdef6739fdd32be383cefceb65b9538a00f763b49be6499e4b6e3f8b1a34616
+EBUILD package-lint-0.16-r1.ebuild 760 BLAKE2B fd0d1bf986e81c1646066426279cc934a673f90077352baed236c989bbdcdb7f0266715f73c977e4653d8dde39cb27444be841602a0a14123b86110ebba2a536 SHA512 4d9b0b27bde8c7ec8c0695137ae9a5a186035366294bad872355bfcbc5c1dc7ba2fd97ba4a91407d411e5ff079fd23430faf114d13ae51788a0a1d8fcca14f3a
+MISC metadata.xml 1239 BLAKE2B 108fe66a5ec45cea84e75f042a5952af1ef92e4993b55f46e3392758beb9667562101cd7c1024d0089bd8ad66c9247fdb267e737030ae6b02fba7726cd27f1fc SHA512 227780ef543751dbda0bd612eca5e474ded35b199e380cb18c984d8e9e23ace2e5b08289687b169d420cf7f84baead74e2897af392f21a76e3e158b79e6c5f32
diff --git a/app-emacs/package-lint/files/50package-lint-gentoo.el b/app-emacs/package-lint/files/50package-lint-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/package-lint/files/50package-lint-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/package-lint/files/package-lint-symbol-info-data-directory.patch b/app-emacs/package-lint/files/package-lint-symbol-info-data-directory.patch
new file mode 100644
index 000000000000..1b8644976721
--- /dev/null
+++ b/app-emacs/package-lint/files/package-lint-symbol-info-data-directory.patch
@@ -0,0 +1,26 @@
+index 2ecaef5..8178375 100644
+--- a/package-lint.el
++++ b/package-lint.el
+@@ -106,13 +106,15 @@ a backport library shipping the feature and VERSION is an
+ optional minimum version containing the feature.")
+ 
+ (defconst package-lint-symbol-info
+-  (let* ((stdlib-changes (with-temp-buffer
+-                           (insert-file-contents
+-                            (expand-file-name "data/stdlib-changes"
+-                                              (if load-file-name
+-                                                  (file-name-directory load-file-name)
+-                                                default-directory)))
+-                           (read (current-buffer))))
++  (let* ((stdlib-changes
++          (with-temp-buffer
++            (insert-file-contents
++             (let ((siteetc-stdlib-changes
++                    (expand-file-name "data/stdlib-changes" "@SITEETC@")))
++               (if (file-exists-p siteetc-stdlib-changes)
++                   siteetc-stdlib-changes
++                 (expand-file-name "data/stdlib-changes" default-directory))))
++            (read (current-buffer))))
+          (info (make-hash-table)))
+     (pcase-dolist (`(,version . ,data) stdlib-changes)
+       (pcase-dolist (`(,syms . ,action)
diff --git a/app-emacs/package-lint/metadata.xml b/app-emacs/package-lint/metadata.xml
new file mode 100644
index 000000000000..ddaf53faef36
--- /dev/null
+++ b/app-emacs/package-lint/metadata.xml
@@ -0,0 +1,26 @@
+<?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/purcell/package-lint/issues/</bugs-to>
+    <remote-id type="github">purcell/package-lint</remote-id>
+  </upstream>
+  <longdescription>
+    This library provides a linter for the metadata in Emacs Lisp files which
+    are intended to be packages. You can integrate it into your build process.
+    package-lint detects various issues that may make your package
+    uninstallable or unusable for some users, and it warns about significant
+    deviations from the Elisp coding conventions, such as non-compliant symbol
+    naming, and use of reserved keybindings. Among other community uses,
+    package-lint is a prerequisite for submission of packages to MELPA.
+    package-lint can be used standalone, but see also the flycheck-package and
+    package-lint-flymake packages, which both use package-lint to conveniently
+    display packaging errors directly in the buffer while writing elisp
+    packages.
+  </longdescription>
+</pkgmetadata>
diff --git a/app-emacs/package-lint/package-lint-0.16-r1.ebuild b/app-emacs/package-lint/package-lint-0.16-r1.ebuild
new file mode 100644
index 000000000000..4f165583d630
--- /dev/null
+++ b/app-emacs/package-lint/package-lint-0.16-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=26.1
+
+inherit elisp
+
+DESCRIPTION="Linting library for Emacs Lisp package metadata"
+HOMEPAGE="https://github.com/purcell/package-lint/"
+SRC_URI="https://github.com/purcell/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+PATCHES=( "${FILESDIR}"/${PN}-symbol-info-data-directory.patch )
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	elisp_src_prepare
+
+	sed "s|@SITEETC@|${EPREFIX}${SITEETC}/${PN}|" -i ${PN}.el || die
+}
+
+src_install() {
+	elisp-install ${PN} ${PN}{,-flymake}.el{,c}
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+	insinto ${SITEETC}/${PN}
+	doins -r data
+
+	einstalldocs
+}
diff --git a/app-emacs/pfuture/Manifest b/app-emacs/pfuture/Manifest
new file mode 100644
index 000000000000..580b84858580
--- /dev/null
+++ b/app-emacs/pfuture/Manifest
@@ -0,0 +1,4 @@
+AUX 50pfuture-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST pfuture-1.10.3.tar.gz 6187 BLAKE2B e00c7226239c08802d548f03d08aea628ea28dbab9bb22209979d9d7bdee7927485a929979534ae68d9ad28bfc1318e26c6c2e8fedcb4303a802d3bc6b6adc1f SHA512 1dbb0e4f168c36617f8c6890894bb618c4e13b667fae32a00ddfc01b7ccdb5c1742e7f93ddcc2e61e24fd69236debb32107c7a34efe9c19d66796c044d9ea1d5
+EBUILD pfuture-1.10.3.ebuild 451 BLAKE2B b620c1f6ee805c3ef3d2fffea2da370020134b51d43faa1a95962ea728ee84a849799aaa88102ef8cc93b0b94d4c88f839b1bedd04f21af5f2c9bd078ac0fa85 SHA512 5ce2798a99f8d6d09448b88f8cbb065a6b7e4ba14ce85831a97dd1cf493f641c1bb7884d1369f6e2eec3e684926fe09ec42dfee8f279a824b99b23e372618ce2
+MISC metadata.xml 437 BLAKE2B 8d15bb2119b8a194b96d45ad8fa7ec340e21a2306e0d21ef929e98aec2778c0be0588d68c1aaddafb48a9fa371f2a6b0c254b2e807463cfccd06177e64c8ddc6 SHA512 6d9e4a202bc76350e439ff78f9c78ae071a1a6b23351fa9ca643ce7d0c4f0e01ddce4dc0d9244eb177f3ad1a5e2c2ce76238da2d8b8662836e49e882cc4bc75a
diff --git a/app-emacs/pfuture/files/50pfuture-gentoo.el b/app-emacs/pfuture/files/50pfuture-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/pfuture/files/50pfuture-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/pfuture/metadata.xml b/app-emacs/pfuture/metadata.xml
new file mode 100644
index 000000000000..5757b6106d73
--- /dev/null
+++ b/app-emacs/pfuture/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/Alexander-Miller/pfuture/issues/</bugs-to>
+    <remote-id type="github">Alexander-Miller/pfuture</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/pfuture/pfuture-1.10.3.ebuild b/app-emacs/pfuture/pfuture-1.10.3.ebuild
new file mode 100644
index 000000000000..6c894e8c2968
--- /dev/null
+++ b/app-emacs/pfuture/pfuture-1.10.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=25.2
+
+inherit elisp
+
+DESCRIPTION="Simple wrapper around asynchronous processes"
+HOMEPAGE="https://github.com/Alexander-Miller/pfuture/"
+SRC_URI="https://github.com/Alexander-Miller/${PN}/archive/${PV}.tar.gz
+			-> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+DOCS=( README.org )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/pkg-info/Manifest b/app-emacs/pkg-info/Manifest
index 61bb35c57c88..5495417c686f 100644
--- a/app-emacs/pkg-info/Manifest
+++ b/app-emacs/pkg-info/Manifest
@@ -1,4 +1,4 @@
 AUX 50pkg-info-gentoo.el 432 BLAKE2B e422b694035b319ac40367cedeee146f1bcf6b5b69ab734d751fc670f647264b0bd2e0dab96f032cdfe7dd3c24bef9b84691578fdb55dac1abbc10e7e09b3099 SHA512 ca3e6390dd9e3eb12f1db203e4456c786a500566beef8647f204c5ce6218a6f44224ad6c3b6dc6afb02d5269168210231ae842de4fb4ff46d333135faa1a87a5
 DIST pkg-info-0.6.tar.gz 18896 BLAKE2B 464f172ef9e0e6e89f472032b1be0506c49a51fc8e2120ac561be23187fbd0ca64abf021e2ef717267623efe8ff0a49c14ad1af098f9ff20e167b334c49081d2 SHA512 73531a0a7ab54cf3e365a627d2905cc820f1328ad8ca8f985d1954c877f4a1ad7dc5129f52c4e2accd305661a9b952da9adf0a802c8ab6f35e1c16b55966ef54
-EBUILD pkg-info-0.6.ebuild 560 BLAKE2B fe801524ea429fd59a4a43010ba5a6278f6069e6f0e1ab881f680bfd65707b01c0e950cdb75d3a3ed5a6874d57bfa1fafe87f2dfd2ee96ebec6a041a18486c7f SHA512 359faccca9f0634fa3259e1004696452b3a2fcf18e824c1b82e2a269c648c84beb38ec57b1f665cc92a017658f1269a7895c7fe7b517000a89dece2252aaf300
+EBUILD pkg-info-0.6.ebuild 515 BLAKE2B b17bfcd74328f3d8e8c5b741c8c8dafb4968dc3e6e696a57eae932f22f23ba95b76a35b308db7fadfb797a10ea92e8371dcd36521132fb41d472e54d1128c00f SHA512 611f8792d9dbcb8ac4eda37d3c8433077d1f8141daa148f044ebe30d54ee369632a731801948d286ce38056be99d014da08aa734b82deac424194e85dcde266f
 MISC metadata.xml 715 BLAKE2B 119d92195e4fc6c7899fb24f66dc589efd30ca073dccbb77f4818a7f0579caeacae93119e795dd345e482bd51ca9981ed1df33c2900c778a80ba88fb3a7b4dbd SHA512 b741d9876b9131c00807165e82d66c028e62a0511b47f82686b810ea69eee363becd5531fe5ee0409a4b4ad90e6ff35f3117e089e53c50cbd52d1b2b86033e36
diff --git a/app-emacs/pkg-info/pkg-info-0.6.ebuild b/app-emacs/pkg-info/pkg-info-0.6.ebuild
index a9a870f2370a..ff5d00b4f6f3 100644
--- a/app-emacs/pkg-info/pkg-info-0.6.ebuild
+++ b/app-emacs/pkg-info/pkg-info-0.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/emacsorphanage/pkg-info/archive/refs/tags/${PV}.tar.
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-RESTRICT="test" # test requires cask and ert-runner which are not packaged
+RESTRICT="test"  # Tests fail
 
 RDEPEND=">=app-emacs/epl-0.8"
 
diff --git a/app-emacs/po-mode/Manifest b/app-emacs/po-mode/Manifest
index 8d5e7e7e5c57..1f20886dba19 100644
--- a/app-emacs/po-mode/Manifest
+++ b/app-emacs/po-mode/Manifest
@@ -1,4 +1,4 @@
 AUX 50po-mode-gentoo.el 373 BLAKE2B dedf37969c42ac3dbeb4b4cb01af0f9ee79e40aad8586831503bebc1192a110fbecdc0bba339ebe6d7f89a8509e4f6df52f98f7563a90f31d73af279aad81e66 SHA512 48c371afe3f1a1f033ea20cb0a60bc700414108f7dc1f235e62423bda9b94373e49da9bdd3ab76e119b7b6c1b5f0a7601d36ce2710dd23b3de46557cf7d9cd8d
 DIST gettext-0.20.1.tar.xz 9346544 BLAKE2B 6541715b82399b7fac390ccbec82d2878228a19db9a37642b3eb65eb139cf4a5d74f17f876be4946771143b5897d5b4e4ca7948e06bb3edd79f125d1d3954a84 SHA512 82ffa5a28068272d0587262f8d9269f9629c601da5d122b6645c9c4cf98bfe4149df01bb58522ccf8fe25b931672e18551d7fb34de1cbf6a0463a87f9f8ee221
-EBUILD po-mode-0.20.1.ebuild 521 BLAKE2B fb885459cb71eb1d610cf281477425718c96c57608e83d1672c3ddd1dc0f0e374b366008d3d0f112db45d40b3c633a59261d2a6a6ad2d037e2cee7526919046b SHA512 d6e29c5a791179bd665dde9872d6e85e0ab73a527dabf9d3200e44446e937e7593b8b888a6ae2e550cde3045c50259fe070d9cd8a952f81d0fb6e3ec55170d36
+EBUILD po-mode-0.20.1.ebuild 515 BLAKE2B fec0da67c8c9056d7a1eb96f50180568db9efadb1d7742eb095dd1205a2868224bb3e56ad2b4a2e34897934251a90555892898d53564a495c91c415934641381 SHA512 8078adcffc4893741c949f768b3f47686094c2bc38db2d608122b13e22c73641460a6a720fd292f347840cb27f9886e9cbea4a92c6b09732cda5a22cfadc0432
 MISC metadata.xml 283 BLAKE2B 81c49021199f71096079a27f9121390fb8c1285c54b9478583ff2d647277fa106ef12456d7097c4be092fc48b514a1adcf855ca0fac911598232ef9eb7f102c0 SHA512 f32b303760addf5d4db8d18bd10fb677353cdfa4c5e545d47804ef756cf5e5a21f8b8efb631b08f802185913ceb98da820e404e06eb03d01fe9ea85c10d1ac13
diff --git a/app-emacs/po-mode/po-mode-0.20.1.ebuild b/app-emacs/po-mode/po-mode-0.20.1.ebuild
index a49868192c9d..49a4c54857c9 100644
--- a/app-emacs/po-mode/po-mode-0.20.1.ebuild
+++ b/app-emacs/po-mode/po-mode-0.20.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gettext/gettext-${PV}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 S="${WORKDIR}/gettext-${PV}/gettext-tools/emacs"
 ELISP_REMOVE="start-po.el"
diff --git a/app-emacs/polymode/Manifest b/app-emacs/polymode/Manifest
new file mode 100644
index 000000000000..ca481d1f834e
--- /dev/null
+++ b/app-emacs/polymode/Manifest
@@ -0,0 +1,4 @@
+AUX 50polymode-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST polymode-0.2.2_p20220322.tar.gz 417218 BLAKE2B 7f2846a6fed751f7fb0e7d6b50ca2bb40232007e7f8cef801b22b252ca39a65658d0059ddb8ba384ed2f6b1bdbddaf39fcaa09d91787b8523f9872162156f25a SHA512 2e1d49cd3086cb7a8551a4c48cd6655e1c41155f1e518b1cfae5493ac382d566bc7a8969a167063c0384978b70d79f2d2557fc9a6d12e54a985fdbf24315bf0b
+EBUILD polymode-0.2.2_p20220322.ebuild 760 BLAKE2B e4741519a5db558ebe532616ebe6ba639b0e2432deb613eb7c73eb5f2af27bb3e17e18a90256518aacab255bbdfbc7baf935f2e11e61faf619a56b6b1d6cdb48 SHA512 60809cfc2316eaae9fa9d8051091558990dd633d17f3f2345048f709ffd103b00c7956c957f088c3a16f61ee0d5512da3e302b3cec2ba0c8d3f8d331d1c64cee
+MISC metadata.xml 685 BLAKE2B afe87d00ea99966b4b235b95061d46f267aeeb588f369e9a22b87921cc01b74684f5dc33db94a7ee7b6e6c7a029c57f69d72871ec45da92857aa2e27e3911303 SHA512 d42d29fb851d7fd2b0e3b675b6ee56acca5bc1c48ea6f47a9b2249d9c48909d446f450660e9481c271e3d4ab0e4183de7970c765e6fa0a61ba750d674435cbcf
diff --git a/app-emacs/polymode/files/50polymode-gentoo.el b/app-emacs/polymode/files/50polymode-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/polymode/files/50polymode-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/polymode/metadata.xml b/app-emacs/polymode/metadata.xml
new file mode 100644
index 000000000000..f362d712f750
--- /dev/null
+++ b/app-emacs/polymode/metadata.xml
@@ -0,0 +1,18 @@
+<?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/polymode/polymode/issues/</bugs-to>
+    <remote-id type="github">polymode/polymode</remote-id>
+  </upstream>
+  <longdescription>
+    Polymode is a framework for multiple major modes (MMM) inside a single
+    Emacs buffer. It is fast and has a simple but flexible object oriented
+    design. Creating new polymodes normally takes a few lines of code.
+  </longdescription>
+</pkgmetadata>
diff --git a/app-emacs/polymode/polymode-0.2.2_p20220322.ebuild b/app-emacs/polymode/polymode-0.2.2_p20220322.ebuild
new file mode 100644
index 000000000000..c41d8cbfa476
--- /dev/null
+++ b/app-emacs/polymode/polymode-0.2.2_p20220322.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=2094c92403fe395dfb2b8b2521da1012a966e9ab
+NEED_EMACS=25
+
+inherit elisp
+
+DESCRIPTION="Framework for Multiple Major Modes in Emacs"
+HOMEPAGE="https://github.com/polymode/polymode/"
+SRC_URI="https://github.com/polymode/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${H}
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+DOCS=( readme.md )
+# The "compat-tests" downloads resources from network and "define-tests" fails
+ELISP_REMOVE="tests/compat-tests.el tests/define-tests.el"
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	${EMACS} ${EMACSFLAGS} -L . --load targets/test.el
+}
+
+src_install() {
+	elisp_src_install
+
+	dodoc -r samples
+}
diff --git a/app-emacs/posframe/Manifest b/app-emacs/posframe/Manifest
new file mode 100644
index 000000000000..184a93bbe8dd
--- /dev/null
+++ b/app-emacs/posframe/Manifest
@@ -0,0 +1,6 @@
+AUX 50posframe-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST posframe-0.8.5.tar.gz 77569 BLAKE2B bf379f4641ed78f7cd92fcb443f3e01f78360113dc9eec4b1dcbba581ec0df5b11eeeda27eaea6dd28f7aa324c33aa499079afe9665da9d1d2328904117364d9 SHA512 ce9c76f8a943d206f3438b82ba637b96a9f3cf0d1078f8b940ab8a0aaa9940aa308a76be5b678d7394b25716f631ca3305e25b850fd25ffa18d79551baff0586
+DIST posframe-1.1.7.tar.gz 79507 BLAKE2B ad6c12b8733a6db18b53a20c78ca16412206ce782e269500ffa36ff7e29873a4d46e6addbf30c7e5a7a818de3b752cc481a4031c96ff8760e714373ece06db0f SHA512 c3762ec115df4c6967a8a7bff4c8d9447b97da36903e166a2f4d7da382b8e22b2e7f97c5cfa3f40f5461c78821552574a905b4e595ef34f5fb45c8cd17fee95b
+EBUILD posframe-0.8.5.ebuild 430 BLAKE2B dfc035c53a57481e1a9c9db9b40a84de634d9ec83f0b482c96fa4b0348feeddd9ba101c2134685eee143b24ce1a4ac39b61103d7a8fd7e51ac9a34f32f11d668 SHA512 1a73999834d5f2bf363976f4c70812d4bdca0c52b07b9b0cf9df3452a662ea5c01547328c0a026b535be15c65a2ff5dab14b593a3194c35c2d19d741df096da9
+EBUILD posframe-1.1.7.ebuild 434 BLAKE2B 1ae285a35892dfc29e86f4bb310e2d08d8e84851aae2a946c348305a173bb030610d342e71fcc5d195b40da8cf81b05d1c60011de1bdb0d81ea9bbf25f3024b1 SHA512 694b47625222e9de68bfac11bb99dc5b9f99f1070c59e69c3b781dd5e320f837aafd59d1a032532e1b232b17fb63ccb0ed7786a1eb89719870024ba2ac6d3196
+MISC metadata.xml 421 BLAKE2B b8d552d401b53eaf2806df378ffb2dae0401e11db39cc0f5a333ae447b4cc9a4a96e1eb057a0edd323b409255b4c2b99ef9f7e1440b1efa62698c7b1c43cb5fb SHA512 fea6d27d8094b7693e23749959769196906cd11893d372c02ef09c73240bed272e24fa7230723e4e32f4a30424bfc22caa2e2aa075fb88eba0c0f7cb0553d3b8
diff --git a/app-emacs/posframe/files/50posframe-gentoo.el b/app-emacs/posframe/files/50posframe-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/posframe/files/50posframe-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/posframe/metadata.xml b/app-emacs/posframe/metadata.xml
new file mode 100644
index 000000000000..0d737d94d3d1
--- /dev/null
+++ b/app-emacs/posframe/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/tumashu/posframe/issues/</bugs-to>
+    <remote-id type="github">tumashu/posframe</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/posframe/posframe-0.8.5.ebuild b/app-emacs/posframe/posframe-0.8.5.ebuild
new file mode 100644
index 000000000000..b0e865665969
--- /dev/null
+++ b/app-emacs/posframe/posframe-0.8.5.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=26.1
+
+inherit elisp
+
+DESCRIPTION="Pop up a frame at point"
+HOMEPAGE="https://github.com/tumashu/posframe/"
+SRC_URI="https://github.com/tumashu/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+DOCS=( README.md snapshots )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/posframe/posframe-1.1.7.ebuild b/app-emacs/posframe/posframe-1.1.7.ebuild
new file mode 100644
index 000000000000..67370466f98c
--- /dev/null
+++ b/app-emacs/posframe/posframe-1.1.7.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=26.1
+
+inherit elisp
+
+DESCRIPTION="Pop up a frame at point"
+HOMEPAGE="https://github.com/tumashu/posframe/"
+SRC_URI="https://github.com/tumashu/${PN}/archive/refs/tags/v${PV}.tar.gz
+			-> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+DOCS=( README.org snapshots )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/projectile/Manifest b/app-emacs/projectile/Manifest
index 8e725e5940b7..8e6d25640d24 100644
--- a/app-emacs/projectile/Manifest
+++ b/app-emacs/projectile/Manifest
@@ -1,4 +1,4 @@
-AUX 50projectile-gentoo.el 81 BLAKE2B d07c4c72398eed977e337c90f5e7d6a5875135222dc3bcb54dac32611ee8e4a95f1f3a2255dae8643a432b3e4cee094d784b0af8231d19030122bfb2622adaf0 SHA512 7ce3e81946982204e0279ce72ad6c09f94d521f113aa507dd3f09884e29d7e3ccb37c807f426632628001ba36ec749385f0400d3c0d78b40bdea659ad8afd65b
+AUX 50projectile-gentoo.el 141 BLAKE2B e56b9486e81ed169662cb21ca2a19f43b96701b7732c7458d267996d65fc916bc4f067f717c13208332df7d636e9a4deb6917f323cc3ac5e555ca2c82ac6c64f SHA512 31d1d040800cfdc8182b4ed78e27c2a81a36e124192ddf0ad4c54f45f3ceb9c5c068604e3f913a50ade6385c263ff3b57ba80f8639f5b6b03297eaf23824ae31
 DIST projectile-2.5.0.tar.gz 1915860 BLAKE2B 4d215e2c1e44c7f85121fc36445112f3064129fe95866b4fbb2e14b11d31519057d9cc69bcdf44c82cd516768cc73a031da48a7c5352b9825816db54810cafcb SHA512 3faeb7db70e5e2198ad307c1d5d24a5fadd207765387e7094691e40071411506e6df690995f923bf246b7176173ca41882d369276862b631d7436747bfeae3a3
-EBUILD projectile-2.5.0.ebuild 589 BLAKE2B af6445ae895095d2d5bec39a286ce9b811c336ed17cec0e3e690625dc55a68b3fcc11da565a0707552aaa7bebad007e6bc162c4c01a03af0beb194d0468ba93b SHA512 5d84267fce580bb3b4bb1658c128b9ba2865a8de8786ca8dff69806b84e4007ce15241526eedb52b94e66ba888729d76941bebc834efe008937f83df159a32e7
+EBUILD projectile-2.5.0-r1.ebuild 651 BLAKE2B 383618f2b948d33bd2b5843e78c39d0ccc814a4839520380a7359ca01336fcc9a2d10106b37b64ae20a4f83e5b394e6c4def851750833e4488d7a9f5363755d8 SHA512 b58e9b884e7799de55c314b84ccaffb84becda14c4192eb800d010e70344d0fa0ec24fde28ff1bed8d7b5aa1cda027dc7634ce5f9d2200153d3df81a04976ac9
 MISC metadata.xml 730 BLAKE2B 026ad65ade8e08d1874db2ff46be522a975ae4f1c81a04510e46912bdf7ff171e5523c48b863a5d2cfee3818ec28d0dd82aa135de272b60923d200396a09ac44 SHA512 81f9d1c00773d81a5c680e3ee57455b92d85e0e136d5a8125418e419f07c91a6c16cc5e899f995c5610904a605a03aa405f319fc4f5399df5e9b7942a68c1bcd
diff --git a/app-emacs/projectile/files/50projectile-gentoo.el b/app-emacs/projectile/files/50projectile-gentoo.el
index 05c734668e49..8b3f91f32ec4 100644
--- a/app-emacs/projectile/files/50projectile-gentoo.el
+++ b/app-emacs/projectile/files/50projectile-gentoo.el
@@ -1,2 +1,3 @@
 (add-to-list 'load-path "@SITELISP@")
-(load "@SITELISP@/projectile-autoload.el")
+(autoload 'projectile-mode "projectile"
+  "Minor mode to assist project management and navigation." t)
diff --git a/app-emacs/projectile/projectile-2.5.0.ebuild b/app-emacs/projectile/projectile-2.5.0-r1.ebuild
index 6a9e19ad606d..26f4e8b00c5e 100644
--- a/app-emacs/projectile/projectile-2.5.0.ebuild
+++ b/app-emacs/projectile/projectile-2.5.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,12 +14,15 @@ SRC_URI="https://github.com/bbatsov/projectile/archive/refs/tags/v${PV}.tar.gz -
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( app-emacs/buttercup )"
 
 SITEFILE="50projectile-gentoo.el"
 DOCS=( README.md )
-RESTRICT="test" # tests require buttercup which is not packaged
 
-src_install() {
-	elisp-make-autoload-file "${S}"/${PN}-autoload.el "${S}"/
-	elisp_src_install
+src_test() {
+	mkdir -p "${HOME}"/.emacs.d || die  # For "projectile--directory-p" test
+	buttercup -L . -L test --traceback full || die
 }
diff --git a/app-emacs/proofgeneral/Manifest b/app-emacs/proofgeneral/Manifest
index 37e11f80126c..ed378f2a12ef 100644
--- a/app-emacs/proofgeneral/Manifest
+++ b/app-emacs/proofgeneral/Manifest
@@ -5,5 +5,5 @@ AUX proofgeneral-4.5-paths.patch 762 BLAKE2B 77f7b828dfa1648b6d8818951fca2971941
 DIST proofgeneral-4.4.tar.gz 14105056 BLAKE2B 8d45218cde620411d14ab3c703fea37f0482c0e1f6fc8d104b4de7506140d4d0491b5e23ddbf458bfa3aeb683b71f6e4deea31c2a46b902342fc686c2945162a SHA512 8be7f78b61a225fa4770698bbbb251424a0afe093efc3229f74f3a764317dc8cc00a72cb29e751f755dc5fdab59983906c9185f7828a1644a87d160265f12061
 DIST proofgeneral-4.5_pre20220228.tar.gz 1195172 BLAKE2B fe128039d35a46035e3d266871e558e5a65879b04f979d32bd835842683b23645fdcaf2bbe88b62ead675fc7553f83a145a44b926cacf2ef75d8cd0276ea693b SHA512 630f869f8dee90cecd8b61f011d4d8b87681f153f82d8ceda062c234702c098ef9e90cb07590e2c33849103495f84529763084367d68712fe4672ac2f62c7fca
 EBUILD proofgeneral-4.4.ebuild 1630 BLAKE2B f78e6be268f2576d5ca1e01cd1dd20fded60131ada2bc0983ae98a4e416b1ae8eb8692aa6a0bfa2068d639db956a268af4687b05d37e2f8a3ef186628f08a987 SHA512 b81141f5efadb662a269fac178248dede7b5eaeca7394538265ced397a7d9eb89354c87c6cfd8aece39ecadd0ec552e7568183c7e844e8b4fef7eb7edfe2a064
-EBUILD proofgeneral-4.5_pre20220228.ebuild 1493 BLAKE2B 53d54ca00c223c2a86b13d683c6b31e9fa3bf0118c346ccadc4879f889b8ead3b46ad35d49cfa2f66f3b1675f573885b162ba5811667be382a6d10e7bd5a961a SHA512 44f483f80d77628755202839d48a0f6023680a5aa4971914378357fa9710e77f94657f67813b859aa3bfcd20b9423ed5b7d3b8039cb6ab2f82fd4e988ca0e5a8
+EBUILD proofgeneral-4.5_pre20220228.ebuild 1490 BLAKE2B 0b9daae8ebf45d229562ec64ebc02b7ed9c1fc1d6f0d33f88f35750befc72997b94d0ca48bf0bf1698ed47fd491f9fc6794b9dea623910dbc9ab550ee61d7ca9 SHA512 b5aab05798a31bd4ceec59af1af429babf746b577b6167cea8c791f893daa491d0e49618f621d5661e61ca3c01ce32ba45001391e6618a346a6b2d0c3b6eb38f
 MISC metadata.xml 283 BLAKE2B 81c49021199f71096079a27f9121390fb8c1285c54b9478583ff2d647277fa106ef12456d7097c4be092fc48b514a1adcf855ca0fac911598232ef9eb7f102c0 SHA512 f32b303760addf5d4db8d18bd10fb677353cdfa4c5e545d47804ef756cf5e5a21f8b8efb631b08f802185913ceb98da820e404e06eb03d01fe9ea85c10d1ac13
diff --git a/app-emacs/proofgeneral/proofgeneral-4.5_pre20220228.ebuild b/app-emacs/proofgeneral/proofgeneral-4.5_pre20220228.ebuild
index a554b006724d..d5a97d174292 100644
--- a/app-emacs/proofgeneral/proofgeneral-4.5_pre20220228.ebuild
+++ b/app-emacs/proofgeneral/proofgeneral-4.5_pre20220228.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/PG-${H}"
 
 LICENSE="GPL-2+ GPL-2 GPL-3+ HPND CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.4-desktop.patch
diff --git a/app-emacs/puppet-mode/Manifest b/app-emacs/puppet-mode/Manifest
index 8629ce25dde0..a68b3a76af32 100644
--- a/app-emacs/puppet-mode/Manifest
+++ b/app-emacs/puppet-mode/Manifest
@@ -2,5 +2,5 @@ AUX 50puppet-mode-1-gentoo.el 217 BLAKE2B 632d02667437b04642b7d3510d5010a3a7952c
 DIST puppet-mode-0.3.20180813.tar.gz 36999 BLAKE2B 1ba96a5bbe193c88e96e51973e0d742e611c2ffe0264bae998ce07d5e4f78d37e532dcedf578a801c8e6442ce35385b5c5915837da1073895ceeddeff99b65b3 SHA512 27aeb5a3029208180bd94d7f3f762d9a88863f963824636fdb688ccb79a3c41b9370c13a536e3438c94720e04d5a02c2f64f75d5c594fc7bca32d9738dd3b756
 DIST puppet-mode-0.4.tar.gz 37731 BLAKE2B ac32c32941cad23508e0bad51536a6cc4187185cfd2141fda02f82770abb73327758e0ecd3f3789ff48d3d5f986730e51f48784ea6da502cb860c185d06ddd82 SHA512 c1ef464199df1166c09febc4a99572d00eb7e23656d3c09f3f6773450023e364c305ce19fa351f0a1a5f3e9594f5ef5ffa3a595c7ac66227c2a59918bacd161c
 EBUILD puppet-mode-0.3.20180813.ebuild 691 BLAKE2B 8bbcc695c9bb5652f59d09c1e4ee692fb71d395922e0665a02ad01a81ce6abc8d1f2683381b52daf7386a3e6125a731560841a5e9cdb37cd88065ba48233a75f SHA512 0e4ec04298a0da2e3ba20387429f386a8355fe3a2141f9a7e3aa2df0aa8dca19f3c3fdae926cdbc01bc0d02ac22d7341e99fe08228f2fa6528e7af8bf63c047a
-EBUILD puppet-mode-0.4.ebuild 616 BLAKE2B 6dfbe827ded8249f59cb662ccaa827a862456da263d6f13623df9ed7f41e2e5b9e539bed33bfef5f0ba3b9b0a99e5e9ed121b60eb874cdd6b7ed32347f284a8a SHA512 bc44b8885a9e81981a5055a871a79bb2246481830054eb371544a7df180d690fdfe1dbd34f6af2af3f55b4274130f18ae815d1c58edc43b8173360a967f3c690
+EBUILD puppet-mode-0.4.ebuild 614 BLAKE2B 6d6bd2d0f9912ae02a23aa0f639af748848caf379c01d6002259320290f92b9fa0b081cdb92ee1c8573c7170a87055302287ec20f2cef3942d533c19cc9f18ec SHA512 7b2fc535b7671aa1d493f859539d16161ef0bce7985e01c4ab15813e9bbaae96302f9332748e786562d2642ca118b3611c71e9d27bff775ee2d7c6e98b9b8d75
 MISC metadata.xml 283 BLAKE2B 81c49021199f71096079a27f9121390fb8c1285c54b9478583ff2d647277fa106ef12456d7097c4be092fc48b514a1adcf855ca0fac911598232ef9eb7f102c0 SHA512 f32b303760addf5d4db8d18bd10fb677353cdfa4c5e545d47804ef756cf5e5a21f8b8efb631b08f802185913ceb98da820e404e06eb03d01fe9ea85c10d1ac13
diff --git a/app-emacs/puppet-mode/puppet-mode-0.4.ebuild b/app-emacs/puppet-mode/puppet-mode-0.4.ebuild
index 1d5b1a90215e..c93402db6d30 100644
--- a/app-emacs/puppet-mode/puppet-mode-0.4.ebuild
+++ b/app-emacs/puppet-mode/puppet-mode-0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/voxpupuli/puppet-mode/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
 
 DOCS="CHANGES.md README.md"
 SITEFILE="50${PN}-1-gentoo.el"
diff --git a/app-emacs/pymacs/Manifest b/app-emacs/pymacs/Manifest
index af42c2aa6a55..25dad8fdee36 100644
--- a/app-emacs/pymacs/Manifest
+++ b/app-emacs/pymacs/Manifest
@@ -1,4 +1,4 @@
 AUX 50pymacs-gentoo.el 183 BLAKE2B f1a4b874bb339b653c4fb6fb186bd7e531151c34d1df58be6963288d4443438fcae0f82c92a1667b4e7cb739bc2f7c6fd8d8d5f6d4e91413ee5bec47a609cc2e SHA512 f59fed86f859b796c901088b38fb570a5e5527d774a15456105ce75598c31fd20d0afaa62ad9cbf12063810fa592dbbd7c33aaece5871b36b488e5af6de0fac2
 DIST pymacs-0.26.tar.gz 123373 BLAKE2B 0c467435d18ebcbe7b263e90096363e201dd84ba770fa702beefac4318a713954c316f335ee005ea88370be29c3710a7df04fb05b6efd3816beedbb88e38126d SHA512 ae245de130f435d947788c5ac11d8ce6534df80f70a4e35fff903f22d2b79b0f66925059ebaf53bde45cd6660ac0a8a224490f4f9e256a84e3a08f6468c14dd2
-EBUILD pymacs-0.26-r2.ebuild 1139 BLAKE2B 23df9d8078864c9eddf558cf31601059d5a8de317557fa20b1985094aa86d0b943a61550d68fdfffb7f544580b99a790b780ec78a269a30396a87e0b09f4b7a1 SHA512 c9b1036b88d39c9ed4fbcc21832ff7741800192e414b33781962f55547075ab05917a4e23b6ee9e56fcf4b58850eb185c375f6cc10022c4c2f36d145b20d58af
+EBUILD pymacs-0.26-r2.ebuild 1133 BLAKE2B 684c877e88526c3d48441eb967f61185669c8c4ba3489207fd5971f248efdd10202a8b50a295e4c84a78efb9b88b2d41f80f8b4464a5a9c527eb55e4b7abe6c8 SHA512 18891ddd8c2adc9710f12b9207976966fbf78bcec5383794cf30a549fd81f5b03b5323756b648ab1107436c9a0ffd0d5835b866155de4089bc611567c05c7d13
 MISC metadata.xml 436 BLAKE2B 4239aac38b2303531a3792704946f0039b484aaa1561a336ffb4955aecd3a6881051a8de0a8d9c2b2c628e2ef45a448519fa70efd2698a64a4f07d38adb04b07 SHA512 4be8dd1573dee1c631449a512d6da4ff02f9917c4132477ad5383432521087a3f5468698d1a0b9906fc76367b75bca9d25e6da3ce0142be5fb4e4b7e225651d9
diff --git a/app-emacs/pymacs/pymacs-0.26-r2.ebuild b/app-emacs/pymacs/pymacs-0.26-r2.ebuild
index 55d247626659..6969000e028c 100644
--- a/app-emacs/pymacs/pymacs-0.26-r2.ebuild
+++ b/app-emacs/pymacs/pymacs-0.26-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/dgentry/${PN^}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc"
 
 BDEPEND="doc? (
diff --git a/app-emacs/python-mode/Manifest b/app-emacs/python-mode/Manifest
index f348b4b968c9..2c5d7127603b 100644
--- a/app-emacs/python-mode/Manifest
+++ b/app-emacs/python-mode/Manifest
@@ -1,6 +1,6 @@
 AUX 50python-mode-gentoo.el 541 BLAKE2B a1657fc49011246ba1cfed1cd8993a222c4932516c6a8e3be4fcc53200510ad8e9a3e1072c2bce641cded4be1581a9c950991d6864c2136668ddba4de8f2429d SHA512 8e1c2c68409c48f3e7c2ae36128380fd5358a12470db571ffa22b1c9cb11730a2f2a84ec66f23c064e32b504c8ae002033e77640d85e11577c50e31462cd5274
 DIST python-mode-6.3.0.tar.bz2 377148 BLAKE2B f55620dcda63bb074116ad622d0ac2431839277a9f525be857bb4245a6b5b9f7daaefd538e166efb327333bb2186f2998541f3a1816bff76c65a726e78265c01 SHA512 cc4a9e67ec3d751040a1ee453360f7aad127688db9c67385b669aa76ad7504dfea1b15408f4ff130a5103f5266ee4eeb920e66b1c1fd1f2dcbfe6302cc8f847a
 DIST python-mode.el-6.2.3.tar.gz 314461 BLAKE2B 3bd71b47de1284d59db61f829e3419f2fb10e226900392d903256f31ad90f47317b7bde4cde1cf7d86518f9c706d9c844b208a9e2469a41037252a63f7bc1ba6 SHA512 4aeb33d4054d582cd2a3f4834472c7d0cb3fe5e12e10f5117dcbcd90ec2ca490964c774918c83697f283c68e57766c3c67d3853ddbaa3408777fdafc7f2674f2
-EBUILD python-mode-6.2.3.ebuild 686 BLAKE2B 198606ca07bfd459b226a8b555bc14a82e54d5d7b23fbee377cc80851a34f54c0dcb3ea86cfb0b9741a4ae45fc833faa06aa6e8d6e5833cad37a97224edfc98c SHA512 8c34226a45a852fb468cab7c87ceb9f96c422626e0a24f05e9472c2486381cd7f3d31fefc93555b4d7df8e1a7eb781736d253f679e07d1064541bd99d679974e
-EBUILD python-mode-6.3.0.ebuild 713 BLAKE2B 038ceb3b3515efdf5ab7be45bfaafd4865f48f90337662bfcb67bced764e3bd2ec5584af2899291ea0aa7289d94c0efd5da18a84f24a5638e9ee3d0bf4a1eedb SHA512 2bc1c6de00426fe11791ad2fdbe03306de936348d203df49a318e2ecbfdf2d9495c28b902276b895a5e6b247a6870f288836529b39450e4de4559bc2d648917e
+EBUILD python-mode-6.2.3.ebuild 680 BLAKE2B 1f39e45bbcb6342b79ed3f3d67ae3dcd26222f11990030ca517877119f0e53f1ef98832df4bcbd587fb9d40c0b9f8e2c203920f9dd7f1cc920795839f5221033 SHA512 ace07939525ca9138537f6fff7e26119ecb54699d4d53306c218be5b02e3fc380f579d849099f6efc18bae9352c16e50c8afcc29a81a0c42f33d41e5ee5e6b7e
+EBUILD python-mode-6.3.0.ebuild 702 BLAKE2B 6d5118c6ea5464e5979e9c5c2a1b75700c27572440093871a0232106b9f2aa86d8a815d485a0ea294cc262bb7ec465ae92d599f94429e446a3add148e7627ec4 SHA512 2d9683d83414f8f03027ad4b61e4240cac23e23fc9b2b69e7ec665003952f8fe0b3f16902ff3ed1d4168eedaa7f8844e1e5002561cb38e53cb8675a32a5b1e42
 MISC metadata.xml 360 BLAKE2B 45f8523f260073dea339ca644560c2b44187bc4c01037fe63caf546406f0f8ebc016a9cb4f99039bcacd99a7ea96e4a8e529e43632d7ad8c5a9a3c65d75f503c SHA512 705c854935095cd9d3eb54cca4cb23e15a3727337a2b8ef9d7b92dbc11bfd068836e739e399490f01619bac7f4ec5475ea29f74d1f319a93e33a7db465f510c2
diff --git a/app-emacs/python-mode/python-mode-6.2.3.ebuild b/app-emacs/python-mode/python-mode-6.2.3.ebuild
index e1512ee495f9..e20df61fe0b8 100644
--- a/app-emacs/python-mode/python-mode-6.2.3.ebuild
+++ b/app-emacs/python-mode/python-mode-6.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${MY_P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 S="${WORKDIR}/${MY_P}"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/python-mode/python-mode-6.3.0.ebuild b/app-emacs/python-mode/python-mode-6.3.0.ebuild
index 2dd18ba0b96c..235068449147 100644
--- a/app-emacs/python-mode/python-mode-6.3.0.ebuild
+++ b/app-emacs/python-mode/python-mode-6.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/python-mode-devs/${PN}/-/archive/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 ELISP_REMOVE="python-mode-pkg.el"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/racket-mode/Manifest b/app-emacs/racket-mode/Manifest
index a2b1ab6f319b..bcffe168014c 100644
--- a/app-emacs/racket-mode/Manifest
+++ b/app-emacs/racket-mode/Manifest
@@ -1,8 +1,8 @@
 AUX 50racket-mode-gentoo.el 799 BLAKE2B 1f0c19ab171427e5404d40eae1fb95f590059c4265df6041bf5ea00a5aa716489f7fb88eeef1c7309810fb41b909e122986cf3b0881bd43eb512c06f9c873598 SHA512 18db7fb5cd7a69a7a4d979ae604dfa1458fb7fd25329ff46043f206395d09245287512bb2feb9e1f7941d63d0af1d7bd1c060ca8026223c2cbd4021ddce57690
 DIST racket-mode-20220219.tar.gz 298876 BLAKE2B b3dfbcd9b436648da1ecacf4b7434c3e1b6dea9bc904c2f1911be34bc6b1846684c349f38cd418b09e66f426866b805ca6bd0c98724e69740ad841ae482e62ea SHA512 94879fe9aed106d0210ca359a5d3d857eec098b4442256a489356db0c5b3493b44ee9a0dd6eff0a0d3d2f3c752632e91b1c0ef8705b7b305e3c75fbae42e826a
-DIST racket-mode-20220310.tar.gz 300827 BLAKE2B 952cf83a7ddb128b1fe2ede233ed357f0d542682043c36b6c7aa47733579aa09cc00b16c663889bcf00e4099c0aeffd68c9b59a733f692330dfb0acbfeeb9c8f SHA512 a06b22487666af902cae3688429ccf9ce58138568cc76ddcefe4a30dac23cb51a986e0615e143b256fba8b462ebea2fe024649a09dfe7f096553d2a3fc501659
 DIST racket-mode-20220411.tar.gz 303095 BLAKE2B 7fed011b915e86f6d40d6a9f8640ea2b066c201cf28e20a941fae841e96bf3649f3cf0ad7847091984a7cf490e9b98142617e47038dea70c44999510144dda3a SHA512 ec17ade728390f8f8b783703ca319ee15502afa7f82e86d9aa8b60361ecc65af21990cf89532b38bfc211887c00b5aa4c820dc0e66a1b1a1a9aacbc08673d35d
-EBUILD racket-mode-20220219.ebuild 1139 BLAKE2B e4a22c04cbaaaed17b783a0b0a50e161fc319433b724214fc69b186e1b977fa015aff4836c8a78c022e14a94122c941c5beb1407c54848846dddf6e66e8870e8 SHA512 2d43dca3838e7b27fdb2dc7bfed221acd59f61c5f30b5bf4a6954a62892e9ca5691a203324b30792bf3d43863bd79ff712a9067045fb48b24879bd5dd6334552
-EBUILD racket-mode-20220310.ebuild 1242 BLAKE2B c4ab934b2b113b65c2eca5d143bde55a51c3ac2edd40a09c8354d35fb9429a9eb9d29740602dcb413752649e38f17e8335473b0b1ab8ec839e6ad5a80035a014 SHA512 64f16ce951a441f5dfa7524cec06cc3093b3669f3c284d385840045df10124a0cf8d5c233e917f7f13c6f2942901abfab9b65a23f2dc435c99e9486eb0b69166
+DIST racket-mode-20220505.tar.gz 305491 BLAKE2B ca6a6ee6ae9f95f397959d9f0fa979e524ab0c6345bc5d7d67b5e681e6059175336303f06a7480d5b7ac51ae13cb851c182175eac44f37b3a21b56409f14079b SHA512 a66b991e0416f60d3a6001d17e24be95caccb627cf0e4d0f3115b7b94eda9d15583d8b94c72326708a0d5f90ab1b51711785c01d566758a4fb329bd26ea7e44c
+EBUILD racket-mode-20220219.ebuild 1138 BLAKE2B 3cb184db500812f19b1c62aff0afcdb1e52358dc0c597fb124c90b792c947e6e098dc61f855c204d19d1e22ca64c032668d5461c6ea00d673ce98acf6f5439e0 SHA512 c7eab6dcd960c37253dd19704de785f97030dd6046a30cd37cb0eb6e8c4f999010d57b55138c53af2b8089c0d14c6b9788f825e9a36184025f1a984cd4bf3dd7
 EBUILD racket-mode-20220411.ebuild 1242 BLAKE2B 38aabde4e518e9b298e0e15df6563822f0dc914eb7f3e53484ba5fc2810c6deb760da7c621eccafda0044d5818ff708d7194661f4bcb7fd1f9ed9f2f522c4923 SHA512 aa16ce86b8f23c6ee0be79472fd2bbe119872d470249d67b5c0b33daf5c2df6246f7c3fcbb853f21797e754aa2905c244c2317f75829c68fd15e40e31f9c21fd
+EBUILD racket-mode-20220505.ebuild 1242 BLAKE2B 499e375b31bc26bdf8a3e26432f366847836a857e777942d9b3923e2e11d192a11fe8c9acfd5698b8a6aab9677dc2af67a3536a72da6df454bf094e46bb959fc SHA512 5533ecfc1cef4697d394171528569d1d97898beab7dbd9cedb44037860526b39e1f487dc5220cba0f08bbdf2ce54c32880401ab468c1f3ab21193f1908f4fcde
 MISC metadata.xml 818 BLAKE2B 6029673bee9510c74b9cf89bbbef03638cdfcfeaaae49f2f94d57cd960c616c7b43c8dc3a0c79892be87dace9e7549b3b4453b13fcc7a23f7b6a02066dbce29a SHA512 8b487cb9f4018d3ec7a2cf130b26d58522772bef05d258100068fc89500577a5f680f480b89f06ef63d99c4a6d4e4fd825ea3338934438715fb83a946f6fe7cc
diff --git a/app-emacs/racket-mode/racket-mode-20220219.ebuild b/app-emacs/racket-mode/racket-mode-20220219.ebuild
index 809f5998bf78..0bd72bea7cf5 100644
--- a/app-emacs/racket-mode/racket-mode-20220219.ebuild
+++ b/app-emacs/racket-mode/racket-mode-20220219.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${H}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="dev-scheme/racket:=[-minimal]"
 BDEPEND="${RDEPEND}"
diff --git a/app-emacs/racket-mode/racket-mode-20220310.ebuild b/app-emacs/racket-mode/racket-mode-20220505.ebuild
index 411ee79988d6..25ccbce138fe 100644
--- a/app-emacs/racket-mode/racket-mode-20220310.ebuild
+++ b/app-emacs/racket-mode/racket-mode-20220505.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-H=e321d8ecfb1bc94c3772ef4d20df0ddf9c9c9d76
+H=fbb4a4664e2cc2b5d21eee62735f73b7f0272e60
 NEED_EMACS=25.1
 
 inherit elisp
@@ -11,7 +11,7 @@ inherit elisp
 DESCRIPTION="Emacs modes for Racket: edit, REPL, check-syntax, debug, profile, and more"
 HOMEPAGE="https://github.com/greghendershott/racket-mode/"
 SRC_URI="https://github.com/greghendershott/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${H}"
+S="${WORKDIR}"/${PN}-${H}
 
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/app-emacs/rainbow-mode/Manifest b/app-emacs/rainbow-mode/Manifest
new file mode 100644
index 000000000000..f2fd2646d780
--- /dev/null
+++ b/app-emacs/rainbow-mode/Manifest
@@ -0,0 +1,4 @@
+AUX 50rainbow-mode-gentoo.el 124 BLAKE2B c05030d9797d02cd6f6052ba63650be266072caa75cbfa76fd6d6fb4dc5bd3e33d51dced59caa73bf0772eab48e27ec0d98b8f2a1a147ac854886c23300ed24b SHA512 3783538fa462187e466241d6c2f511db3a0a2be1f3025d73bd0f58055642f9662d37836e36bcb804d2225fa08e6eaae54fc86a92847a23110aea09bc6ef9908f
+DIST rainbow-mode-1.0.6.tar 51200 BLAKE2B 950da4039eb392d42281d301de05cb669255b95a4382e582258676082516208980540eeb8b69293e2cd73fda3b0438256def408a2804a58bdb745cd72eeef604 SHA512 a7a3f18239dac7e63d022f513e028718552efc13da9589901a0e64377a00d9f3f56a0b708c55eacaf7b438fd29f7bbdb69fafcc4ba65dd6f9e72a82e3ce7efa7
+EBUILD rainbow-mode-1.0.6.ebuild 418 BLAKE2B f14ca87ca689581d47460317b2dedf024c1507a5e91936a3a28d47ea4d5bc8dfaed54d6c30c57aca09428217dab141493f14e0c5435fc588385ba0037bcf9493 SHA512 b144b7ffbea370349efff25c974bde0fb09251c47528256d8a8f4c8af8533368f2632b9b9edfe89676635ff0eb345f4dc22c663d4561b0064fee206a84a90a83
+MISC metadata.xml 362 BLAKE2B 57466b79c1fa4fb860136339636cebce7577af31f69af1e7ef17674cc415e23d889844f5a86cd93fb597f1818f6125389bc5c4c12c0b02de55df13837a7c6471 SHA512 74964f88096fa77a816348c803eb22207cd4b204e10e9ba2cb309c86b12d2ebb2b85df33702943fe7c257d5fbf90364b947292523f9d914d1667237e874ebe57
diff --git a/app-emacs/rainbow-mode/files/50rainbow-mode-gentoo.el b/app-emacs/rainbow-mode/files/50rainbow-mode-gentoo.el
new file mode 100644
index 000000000000..624fcb4663ea
--- /dev/null
+++ b/app-emacs/rainbow-mode/files/50rainbow-mode-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'rainbow-mode "rainbow-mode"
+  "Colorize strings that represent colors." t)
diff --git a/app-emacs/rainbow-mode/metadata.xml b/app-emacs/rainbow-mode/metadata.xml
new file mode 100644
index 000000000000..76127bfcf698
--- /dev/null
+++ b/app-emacs/rainbow-mode/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+    <remote-id type="github">emacsmirror/rainbow-mode</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/rainbow-mode/rainbow-mode-1.0.6.ebuild b/app-emacs/rainbow-mode/rainbow-mode-1.0.6.ebuild
new file mode 100644
index 000000000000..bd405af3dce1
--- /dev/null
+++ b/app-emacs/rainbow-mode/rainbow-mode-1.0.6.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Colorize strings that represent colors inside Emacs buffers"
+HOMEPAGE="https://elpa.gnu.org/packages/rainbow-mode.html"
+SRC_URI="https://elpa.gnu.org/packages/${P}.tar"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+ELISP_REMOVE="${PN}-pkg.el"
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/reformatter/Manifest b/app-emacs/reformatter/Manifest
new file mode 100644
index 000000000000..fbd9bf884f07
--- /dev/null
+++ b/app-emacs/reformatter/Manifest
@@ -0,0 +1,4 @@
+AUX 50reformatter-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST reformatter-0.6.tar.gz 7943 BLAKE2B 72f34b873aacef5ee1dd0edd06effed83dad490f5d57ac3390dbd0d6fb7172adb1b7a3e19c0e90740b300cad8d2a1df60ab1bbfaa660c79621066d402f01b923 SHA512 ff1ad88b3a0a3ca1e70a5e0d7fe6f2264981d88ae64f0fa412d52721fb43991a483f31fb72193f7d67be71f39110051c0dda39e4ed87b4339aa156fa256e013a
+EBUILD reformatter-0.6.ebuild 602 BLAKE2B 0e2c4267aeb9aced7dbf70ae1837b8ba530fe48782b7ec53b59757b9d71c0f6bb22c5e1b3d4ef33a120acb4bbe6929ec0ba798224138bafac27674e21dd9dbf8 SHA512 78d537eb51cd69c68f3584c5d59e1d7af3af2010fcb5dbc23a2bd62555708109720f4656ad426acc48820ced456efcbbedc5852f86a7b26d8f9f08b9bde5aef2
+MISC metadata.xml 439 BLAKE2B 01b361a03c6f00eeb8c6c6ab920097880f6700b4d4e9c8507c76e6e1ab761f85f64841371252dc91bbb92db8dae9d56db7ba20593ff2bf061a04d727cf01779e SHA512 86eb370ab334b24bfb3cf5b7df495f0541ab7b1604bc4a352052a9e7744d346c1492cd63f8bf4d31b5706e6e7ec747f8cd2a90b3b838847ec4613c57100c69a7
diff --git a/app-emacs/reformatter/files/50reformatter-gentoo.el b/app-emacs/reformatter/files/50reformatter-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/reformatter/files/50reformatter-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/reformatter/metadata.xml b/app-emacs/reformatter/metadata.xml
new file mode 100644
index 000000000000..7cdcedd7a960
--- /dev/null
+++ b/app-emacs/reformatter/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/purcell/emacs-reformatter/issues/</bugs-to>
+    <remote-id type="github">purcell/emacs-reformatter</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/reformatter/reformatter-0.6.ebuild b/app-emacs/reformatter/reformatter-0.6.ebuild
new file mode 100644
index 000000000000..81970dc35b99
--- /dev/null
+++ b/app-emacs/reformatter/reformatter-0.6.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24.3
+
+inherit elisp
+
+DESCRIPTION="Define commands which run reformatters on the Emacs buffers"
+HOMEPAGE="https://github.com/purcell/emacs-reformatter/"
+SRC_URI="https://github.com/purcell/emacs-${PN}/archive/${PV}.tar.gz
+			-> ${P}.tar.gz"
+S="${WORKDIR}"/emacs-${P}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"  # Tests need "shfmt"
+
+DOCS=( README.md )
+ELISP_REMOVE="Makefile ${PN}-tests.el"  # Makefile downloads pkgs from net
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/request/Manifest b/app-emacs/request/Manifest
new file mode 100644
index 000000000000..bafbc552edf6
--- /dev/null
+++ b/app-emacs/request/Manifest
@@ -0,0 +1,6 @@
+AUX 50request-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST request-0.3.2.tar.gz 47511 BLAKE2B df01bfd32d1580e416b8f934ee2e9803c052630d366b46134364646e6bf0bba4d0ce18b3a33c675833c6b5c07d28fcc0a03763aa8217e116a03319dd071cc0b6 SHA512 41420a2ede5a8dbc1acb2e04536d7b27b5c973ed4bebc280070b042e28ae6d15e808dad3ba84122a7f680f624bafbe72a027c374413bfd43996a3fb8720fa6b3
+DIST request-0.3.3_p20220318.tar.gz 50821 BLAKE2B f3ee754e43ba6b37fc3218acd8e7472a396949528d5fbdd2ff42af7b5bb18e549a8b159ec794f0d40595ddbf9b9bd3f28f7a66d5549d21dbe706d386ecdcb617 SHA512 fef12c27c37ba735b0fd2df4be83e4101895fbed1ca90a3ad96d3ad6879d24ab49b36222c3124ddbb7ad67f7b571b2a95171635dfe6662a5476c5ab4fc677c09
+EBUILD request-0.3.2.ebuild 516 BLAKE2B 6286f0d809e64a94b0e148ee26f47317e01095f1c3354b42e36c46e113ba799218b16516a17864ddc0181537c21adb561c5a94ed71359bd4f6b08e3b5c459bbd SHA512 98d2bdd9c1f45462ac66bd205950923943473f5b75ba7ff85159c2d463d486a1b440356876bb697a3d79578663c9be499732fcc9195117e96f5320fa37bc167f
+EBUILD request-0.3.3_p20220318.ebuild 563 BLAKE2B 7276ae1d76a99a59e6d2f2115c89f5c1a5223f2930f872746c890516259ed22ec3c89c11a7e09856c13094cc7b88559d39f32bac9df2ca46e8a68429a2a78925 SHA512 2a90283eb20e71319c6d7404c0c5bcb0dc719139180ef62e7cef06e138aedbe227df54099a7a2405554f92de7a3d7a159a859a6d59c96ef89084f76b1b0e7a84
+MISC metadata.xml 423 BLAKE2B 42486d97da1453c09ac51841e57d7b25c3f862b28af44d7682195df15f848fdab52637c52f28c4a20ebda46201d1f6be76d32e0fcc650dc191dc30d9167d0516 SHA512 71a3e19e9daedd0b38ad46742c62fbf3f538f849958760eac0f789902273b27b71c2bfb7c6c61b47c9f418f919b76376bdfd38eeb0d4a0701cbbd70fc27c2438
diff --git a/app-emacs/request/files/50request-gentoo.el b/app-emacs/request/files/50request-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/request/files/50request-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/request/metadata.xml b/app-emacs/request/metadata.xml
new file mode 100644
index 000000000000..4397e5c9d019
--- /dev/null
+++ b/app-emacs/request/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/tkf/emacs-request/issues/</bugs-to>
+    <remote-id type="github">tkf/emacs-request</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/request/request-0.3.2.ebuild b/app-emacs/request/request-0.3.2.ebuild
new file mode 100644
index 000000000000..abf719fc30a0
--- /dev/null
+++ b/app-emacs/request/request-0.3.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24.4
+
+inherit elisp
+
+DESCRIPTION="Compatible layer for URL request"
+HOMEPAGE="https://github.com/tkf/emacs-request/"
+SRC_URI="https://github.com/tkf/emacs-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/emacs-${P}
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+RESTRICT="test"
+
+RDEPEND="app-emacs/deferred"
+BDEPEND="${RDEPEND}"
+
+DOCS=( README.rst )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/request/request-0.3.3_p20220318.ebuild b/app-emacs/request/request-0.3.3_p20220318.ebuild
new file mode 100644
index 000000000000..c9e73cc43e62
--- /dev/null
+++ b/app-emacs/request/request-0.3.3_p20220318.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=c769cf33f2ac0a1a9798b508935c4b260e856ab5
+NEED_EMACS=24.4
+
+inherit elisp
+
+DESCRIPTION="Compatible layer for URL request"
+HOMEPAGE="https://github.com/tkf/emacs-request/"
+SRC_URI="https://github.com/tkf/emacs-${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/emacs-${PN}-${H}
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+RESTRICT="test"
+
+RDEPEND="app-emacs/deferred"
+BDEPEND="${RDEPEND}"
+
+DOCS=( README.rst )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/ruby-mode/Manifest b/app-emacs/ruby-mode/Manifest
index dce517ce00df..b54805ad51dc 100644
--- a/app-emacs/ruby-mode/Manifest
+++ b/app-emacs/ruby-mode/Manifest
@@ -1,10 +1,8 @@
 AUX 50ruby-mode-gentoo-2.5.0.el 493 BLAKE2B d6a26c800c7fe4b3ff7e795be725861bde5115bf0d83845ab55fb686ff445cbc00e24989d69424d30d16a1460dad7e66e56dc18ff2c7714ad6c03f2b5c8fa8fd SHA512 fe876332aca925ae085ab78f77abc5f32aac6eadc9e34decbd337d9f08c1e5f3d27bb72a577717565610e7606a2fc9061ff06d8ed7b5c6293eafe498b904f3f9
-DIST ruby-2.5.5.tar.xz 11459832 BLAKE2B ced1105a87e7df8f82a65ca8d1d329d5a9d110d2f3f88b27a79262c4ac1484dda16d8646c0c03f18c1bb25f8b154075eb03a0614355ec62f677c2fa56ab3c956 SHA512 06b1d58536ebfacb7b56c1e6ed4b8ab816fadc4f48c845a452554cd262e7908199a30e5793f3cbaec2db56a8803aa5c6089abf7bf06c8fc47867e97870b7dfec
 DIST ruby-mode-2.6.3.tar.gz 28460 BLAKE2B 15ab0115cc669f31d656a6af03c061699cfd872130ed51240ecbf80fae413b1d2d8ed87ea1515584f276d15ee164a3c14f9138bf5054418419f6c09b2a72e8e4 SHA512 bbeaa3ae788ea3a536715dc8dc0b4c82803d0a21ce44ae048a5a1c1e331f8c571980feaf38f42455e2de099210bbd4d6f3e8dc2984d6318a70fe04aa6c0d9520
 DIST ruby-mode-2.7.0.tar.gz 28533 BLAKE2B a41bdd88ab6ee56b81d1fefd923967fe7b7219429a2727f62bbff5a76b294c18ec5fa941428dd6b8cd76687e1f362752e598cc8ad9fb8b8813143b0d1cfa25ce SHA512 17644db69d3ea5674d8bf48a87db5e2f396a7d032428e9e8b63dac2a45fafbe506440af7429c440e82d194df670d6dec5e3d6908b49654300493dba1be5450d8
 DIST ruby-mode-3.0.0.tar.gz 17748 BLAKE2B c0fc06ed11be0fa2fe82f1557ab4e55013abe53137557afcc3a8737ee73aa009d0f2b6069e2d8267afbd3d3d60442911c5e0328d7ec76d493719e7dce5c928e4 SHA512 6d1ef6adeff8de90705c25a726491d35476c6c7841f0ec016e9580f8781403a785da6083e76d14b699c054c1eed1cf52572284932797fdeb318426d76d328029
-EBUILD ruby-mode-2.5.5.ebuild 493 BLAKE2B d7e6037f565ff190b2c54ac05dde6a1bcde79edcf31377a73ed99b1b464c94870e92693651aed4ccbf5de097909a9d039fc9d07ce5d71cb349c677da48fd7287 SHA512 7b87b7d397922f6e97429206f942d42dd70c113485435800aa11723c4499eaeef5b41f69d2144816cd62c7f89a0277ef653f4dba89f5c23fd8b2a970bd31469b
-EBUILD ruby-mode-2.6.3.ebuild 557 BLAKE2B c5c180aff47b50e8ec53c107d40e313d721219e96f7785c6477ae08ccb5d533702e2b082764358a004b9d298f8dd6b7905a3a846c715eb923436fe51fa78f977 SHA512 3999d8bb5edad5b43837eccb5cba6bba4bd50941c6a3570e5db60ebd9d83d7ec791ad494e8274a6d3bc8f478f7d9836adaed5ab2dc06b0cf2dc901edc15941b6
-EBUILD ruby-mode-2.7.0.ebuild 563 BLAKE2B 7c0ffdf2c07bdca47996b74b7fbf39285ccb38a51c46e37b1278370ba27ee4d0d91e40ba5d0734f8c690753ccc50dc413ae86f78894f5d90e43fa43c13c0f2c1 SHA512 89163afb05f5f60ea79c556aba66e354cfb71b87637fdddc6c10624358c3b0c919d1358e9ef921b57fe828a67a204d9d62fd1f83f1b6401674c66cbd51619450
-EBUILD ruby-mode-3.0.0.ebuild 563 BLAKE2B cfffadb679a05a1affcc0870927fbc1183eff7df033e4b66d2f8f1ae1a02add3f3d16a0d0c30335097f6b5697231f088c105f2264aa93bc6405beb31dcf99d73 SHA512 103b58f34bd2930836d99cf58dab6a783c55257c92acc73415ceb9804ca62495b6ad65f8e40f3c78a83ed111839e369be63991a5b8063b788704eb6cb6148f82
+EBUILD ruby-mode-2.6.3.ebuild 551 BLAKE2B ff5dc08611dd4c8848c96c2eb176c35f068e9ab2ca3cece8fa4a44984a2adaa1d5e4b2de247a305c6b100fca48958dd96b54dc7f0ab0296072f1c07557e2b7c6 SHA512 556cae41212e1d66432ff1522f6f9ba946c0203bf2f7faa6c3b0df0e0584d986d6e9bf5b453dd2bab6b972f985c9fa49059cb946d4beefa09d5e2a3eee466feb
+EBUILD ruby-mode-2.7.0.ebuild 557 BLAKE2B 3eda73825ecffcde52371049ffcc56291a5c5d709dc46fdb64b1eff46067ea5aad18fc4216e14663e6d039cb4a6238706b1c7caef57f58d8b1e403fd369d45dc SHA512 ac0af4d9ac2ab392b485e1b1852d8c733a869ee5b64ac500c0ab16979d80926e1b0d1668ffd8d705bf450dfd81412ab73955b449cbb90ac378e648f52b84611b
+EBUILD ruby-mode-3.0.0.ebuild 551 BLAKE2B b6809ee67057e7501682dd45b5b2157c5837d1735b9321f555b495392f36851218d83dec63305240f3a74d8fb3c2dd3b556f3a2cdfed1de085465f35cbfa8dce SHA512 cc0f72a1f90c59895aa73513342910b34160b4bd3d2345ffbbeecf2e495759e8c85a0557557a91031897e8c33539731219c8a56ea66afe7bcd6fb1bbee167a90
 MISC metadata.xml 283 BLAKE2B 81c49021199f71096079a27f9121390fb8c1285c54b9478583ff2d647277fa106ef12456d7097c4be092fc48b514a1adcf855ca0fac911598232ef9eb7f102c0 SHA512 f32b303760addf5d4db8d18bd10fb677353cdfa4c5e545d47804ef756cf5e5a21f8b8efb631b08f802185913ceb98da820e404e06eb03d01fe9ea85c10d1ac13
diff --git a/app-emacs/ruby-mode/ruby-mode-2.5.5.ebuild b/app-emacs/ruby-mode/ruby-mode-2.5.5.ebuild
deleted file mode 100644
index 0f0f570ac6b7..000000000000
--- a/app-emacs/ruby-mode/ruby-mode-2.5.5.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp
-
-DESCRIPTION="Emacs major mode for editing Ruby code"
-HOMEPAGE="https://www.ruby-lang.org/"
-SRC_URI="https://cache.ruby-lang.org/pub/ruby/ruby-${PV}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-S="${WORKDIR}/ruby-${PV}/misc"
-DOCS="README"
-SITEFILE="50${PN}-gentoo-2.5.0.el"
diff --git a/app-emacs/ruby-mode/ruby-mode-2.6.3.ebuild b/app-emacs/ruby-mode/ruby-mode-2.6.3.ebuild
index 6cd7b2e93633..9ff9900069c2 100644
--- a/app-emacs/ruby-mode/ruby-mode-2.6.3.ebuild
+++ b/app-emacs/ruby-mode/ruby-mode-2.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ruby/elisp/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 S="${WORKDIR}/elisp-${COMMIT}"
 DOCS="README"
diff --git a/app-emacs/ruby-mode/ruby-mode-2.7.0.ebuild b/app-emacs/ruby-mode/ruby-mode-2.7.0.ebuild
index 0a4a6b7023f5..3318525552bd 100644
--- a/app-emacs/ruby-mode/ruby-mode-2.7.0.ebuild
+++ b/app-emacs/ruby-mode/ruby-mode-2.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ruby/elisp/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 S="${WORKDIR}/elisp-${COMMIT}"
 DOCS="README"
diff --git a/app-emacs/ruby-mode/ruby-mode-3.0.0.ebuild b/app-emacs/ruby-mode/ruby-mode-3.0.0.ebuild
index 2424af40dc80..f025af54a9f6 100644
--- a/app-emacs/ruby-mode/ruby-mode-3.0.0.ebuild
+++ b/app-emacs/ruby-mode/ruby-mode-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ruby/elisp/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 S="${WORKDIR}/elisp-${COMMIT}"
 DOCS="README"
diff --git a/app-emacs/servant/Manifest b/app-emacs/servant/Manifest
new file mode 100644
index 000000000000..275d4ee702a5
--- /dev/null
+++ b/app-emacs/servant/Manifest
@@ -0,0 +1,5 @@
+AUX 50servant-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+AUX servant-bin-launcher-fix.patch 379 BLAKE2B 7330c3e2c1d1d0a34f5a6b565fa0d2ca5c22ae47f2f03096c9d11dd2f7a17ffa32013609ba0da3d9eb5a80fc1d73bb9fa193aa9597a9c62b491932566ebea850 SHA512 883fd468eeb393ce23a580f94715792b9de86e426b594ece750b990e2c2016cb938b74ddadfdcd6e3f18b8759d2775733bc8de4ba0eed6fa3138102d10ef3400
+DIST servant-0.3.0.tar.gz 5440 BLAKE2B 8ff804f01dc60daa5134c3a7bd872ba36508fc6bc94641acb5b10662cccdd808453d4a26ca23198291919ac7fafbfb5dcb727b9091a15ce7c98f7b54bd03caee SHA512 7c7dd448bc1164bb76f7b17c109ee7e1e489b7ef80d7b0cc04257fdcc99158500f9bfb3a733d1b6d879b69dc3a752165ea743044996993ed76fb02d71a6db44a
+EBUILD servant-0.3.0.ebuild 809 BLAKE2B bea5f55cbc9e7ccde3d66da40e85bbf2300408c29ff7a7ab5a85477e59e7d63520d32eb619651a1c2814a679795870cac013e4adb751c9ae14b7a2b8326b826f SHA512 2efb2890215ae2f5d840775b78e04db7e56e1598e96875710e315263e0ce15dbf9ebf9aa82173e192f873cb0a87c1edc42e01b9e981adac1e96d3ba413d33b94
+MISC metadata.xml 413 BLAKE2B 754e2240b40dcb2b936bf106b75f8e8769462195eef9cbcaff2c77c23874071984bc165176f015467b7864ae98715f1f32d864adbf7181fa67864f155d4b356f SHA512 2d706ff78e0df80c115c71c02e2cbb8ca3bbc8e7011b2df322834bf2deebc400807a9718f8db87082b58688abd9d197392630acb94fa4f47b033de780b708842
diff --git a/app-emacs/servant/files/50servant-gentoo.el b/app-emacs/servant/files/50servant-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /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 000000000000..33f33ef928e8
--- /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 000000000000..27e367f4079f
--- /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 000000000000..1da96f816007
--- /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}
+}
diff --git a/app-emacs/shell-split-string/Manifest b/app-emacs/shell-split-string/Manifest
new file mode 100644
index 000000000000..b34532333222
--- /dev/null
+++ b/app-emacs/shell-split-string/Manifest
@@ -0,0 +1,4 @@
+AUX 50shell-split-string-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST shell-split-string-0.1.tar.gz 3453 BLAKE2B 3907501aff6aeee821050980b0c65612e0b76bfc3dc98735d70b2bdabd4bd19d1225d4e5c85bc2910e795e53715d2dfc49b900c24f8ed6bb63751e8e25e41c89 SHA512 55b76a4664cecb1c894559efd8270a567868f1e758b55ea23480cfdb550009af0042d69302b7ac7b73eef54e01c01e9978bfb5421d2db3806a4054e3b7e8f893
+EBUILD shell-split-string-0.1.ebuild 493 BLAKE2B 605e930313d97d752a61c46f68451999d4ce7d28ab492b9b9477637c0ad94a9466cebc0bb192b768382268ca6446124ddd427a7e2ce7a74b243c911865aad145 SHA512 b8ac4a2db8c29b85be2b2eb53ae665ed4d3105d22f4c2cbebdca305149748c7b05bf508d305fca3acf88f8efb5c52d22236da6136c71bc546169a5d111bda889
+MISC metadata.xml 441 BLAKE2B 1340cce7a59a00e5bd2074459c28e821681fcf8900726d4df588dea2ddaafc7e3221c1835d4ad3ecac9723f9799959704fb3ece5079fa83f3a73c99dacc29ce7 SHA512 0baaea911ee3ff150279289e44e8ae3fbd1e63f3910990e272ca969cfcbb8ecbeaae02531dc191eda87b975a3a7ad9b24a6fc8e4b99f52bdb8f70c54bf350a31
diff --git a/app-emacs/shell-split-string/files/50shell-split-string-gentoo.el b/app-emacs/shell-split-string/files/50shell-split-string-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/shell-split-string/files/50shell-split-string-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/shell-split-string/metadata.xml b/app-emacs/shell-split-string/metadata.xml
new file mode 100644
index 000000000000..4f91116c53ca
--- /dev/null
+++ b/app-emacs/shell-split-string/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/10sr/shell-split-string-el/issues/</bugs-to>
+    <remote-id type="github">10sr/shell-split-string-el</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/shell-split-string/shell-split-string-0.1.ebuild b/app-emacs/shell-split-string/shell-split-string-0.1.ebuild
new file mode 100644
index 000000000000..1538d8985c5d
--- /dev/null
+++ b/app-emacs/shell-split-string/shell-split-string-0.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Split Strings Using Shell-Like Syntax"
+HOMEPAGE="https://github.com/10sr/shell-split-string-el/"
+SRC_URI="https://github.com/10sr/${PN}-el/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-el-${PV}
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	emake emacs=${EMACS} test
+}
diff --git a/app-emacs/shut-up/Manifest b/app-emacs/shut-up/Manifest
new file mode 100644
index 000000000000..e15d74783392
--- /dev/null
+++ b/app-emacs/shut-up/Manifest
@@ -0,0 +1,4 @@
+AUX 50shut-up-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST shut-up-0.3.3.tar.gz 4479 BLAKE2B 0cb9ee028386ceb9b80385a6893c203481a79619f8780c641ca76a8878bece3944973ba78a41e1a554d4c9402ec2227d1234a9b6862b01d489dba30db021b731 SHA512 b14110022bd1512985fe40194c419f06cc8f5f6c819f02e681a89c2f80a32140e20eea6e3bb659b1abee85021b01bdc0b48d3ff12d6fac6072635fbdcb808484
+EBUILD shut-up-0.3.3.ebuild 636 BLAKE2B b1408c354c9daa200db0a654a5845e14faa9a324dcddf99c73d713072e5607137a628c01baebe42c82e01bdeffd840394c79bde1dc7c0e12b37bf04b66a3b6fa SHA512 83e48e7cc6d633c79eb9109f056dd2e7271e770bfbda346e925275b60f4e0371a7cda4bc7f37d30080d33ffa761dc47cedd9b9500244c10d426d4c937c0e010e
+MISC metadata.xml 413 BLAKE2B 2d07d61a75f66e64e2a0b1fd32771e84572417daaca31b6c27f5da0ec2d1a4db44668aed9ad2dfe82d5eafdd0a3f45d9f3e3dd3907c059ff00ee5bf4e9620455 SHA512 9f5d7149c0e130afeea13ed28ae9354d1f900db5a884f1772c37ebef2bb09a39b193eaf89d0033697507c5f9a318ab204b8c2711767415306543a02813b968f7
diff --git a/app-emacs/shut-up/files/50shut-up-gentoo.el b/app-emacs/shut-up/files/50shut-up-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/shut-up/files/50shut-up-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/shut-up/metadata.xml b/app-emacs/shut-up/metadata.xml
new file mode 100644
index 000000000000..ed648c38c11b
--- /dev/null
+++ b/app-emacs/shut-up/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/shut-up/issues/</bugs-to>
+    <remote-id type="github">cask/shut-up</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/shut-up/shut-up-0.3.3.ebuild b/app-emacs/shut-up/shut-up-0.3.3.ebuild
new file mode 100644
index 000000000000..f5a6d10ba523
--- /dev/null
+++ b/app-emacs/shut-up/shut-up-0.3.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24
+
+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"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		app-emacs/f
+		app-emacs/s
+	)
+"
+
+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"
+}
diff --git a/app-emacs/slime/Manifest b/app-emacs/slime/Manifest
index abd8fa04f29a..250f227b9be8 100644
--- a/app-emacs/slime/Manifest
+++ b/app-emacs/slime/Manifest
@@ -2,5 +2,5 @@ AUX 70slime-gentoo.el 526 BLAKE2B 6bfd25cf1ef661ac1510d6862d8eea832d1de11d173d7a
 DIST slime-2.21.tar.gz 810610 BLAKE2B d5126e60fb04af2c712426dc9b701cfcabb04a16ab4df6ee138c9f77280fa892e608a04f1af1154b42f7063cc85464146e9a9b10f2a223b5d8015ed49eb1ee1c SHA512 6cc0d865bda2b1a4d806564e4e7d0c9cff739aba16d21ffd47c6a7353e45d332506014ba54f6a0fcfbc97d4c2d3d864f02c2d144cd4d8d06b9b19dafa8f8be3c
 DIST slime-2.27.tar.gz 824013 BLAKE2B 65bf6022d4c0df7fd7b3c8325ce0e8db1bd7b39961b88ea3bca846c316db2a6442d87974f9399557e9ea1ac7f10ec32d13832df3f433ab3b38cf3059a9529069 SHA512 e1d4723d62bd6c9cd964bfc5ff2d383999d0c965ba9e0742dd21453e8f660dc5c05b2bb8f009ac895dd7445a77b82b5c1dec19ec195368f8cfa59f651001da6e
 EBUILD slime-2.21.ebuild 1536 BLAKE2B 9a57dbef9d64de8a0a5a53c9dad65a123ffc2d623c7aded7c95db61a519101a7899908fa9be6ce006393e4c15a1a4e11fa311fa4dda7cba7e77bf106221107b1 SHA512 335950f876002fdb3d78530b09fade01e43ea6e4802b6a7a4fa3c2066c5c16068956cf1e5529356e3da46cd40d738248dd0e6a4941ad4fa794dae122b7db4592
-EBUILD slime-2.27.ebuild 1551 BLAKE2B 013b46362dc334a0303cc559c18bb408a7718aa0ec3a4092198894d324668bf5e74cf3987876f377be7939333091cd5f3ad4b5ce5074baa5d6e5292f293ebcc8 SHA512 ff23d8e2f5a43fdafb079932fec091a26a5329c653a6a3d633ccfe94ee7693fb6257288bfef27535d1d01f71dcf482cf73f8abdeea4a7ec2da5cc6ec389b4b45
+EBUILD slime-2.27.ebuild 1548 BLAKE2B c2e8aa6e8759cb5b866ddb827824b603eaa865f0c0c7a677eece4331650dd07814bb088b00de909b8df37f3dc81a27becdaa53eeb0e9df0cf5f3b6a997b1207c SHA512 f6140ae64602f1ec5d846313ed151f9fedefd72aab2fe40c6945639a61f67bd9d75586c0a1c8ea647d162846e475c31a5fb69daae53bcb42bf6d350e32fd6302
 MISC metadata.xml 1682 BLAKE2B d8f201e0feeac9cb37096887edb806e4623d9f3941f8e1396925d8c20e9d860e0c65eae943d786919865a0278c18cefe09d9d2186e4956001b3e66b6d93f294d SHA512 fe1f25388ab56b6c64a5e624ea8ec11e88bbac53195775f88cb6d8131a15969340d6eff0fb463a7b2ea1834f0fc14de34773589c1cf65ad3a964cd3bfa104142
diff --git a/app-emacs/slime/slime-2.27.ebuild b/app-emacs/slime/slime-2.27.ebuild
index 50412a4930ff..95e56f581be6 100644
--- a/app-emacs/slime/slime-2.27.ebuild
+++ b/app-emacs/slime/slime-2.27.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/slime/slime/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="public-domain GPL-2+ GPL-3+ LLGPL-2.1 ZLIB xref? ( xref.lisp )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc ~sparc x86"
 IUSE="doc xref"
 RESTRICT="test" # tests fail to contact sbcl
 
diff --git a/app-emacs/sly/Manifest b/app-emacs/sly/Manifest
new file mode 100644
index 000000000000..a5967dd57878
--- /dev/null
+++ b/app-emacs/sly/Manifest
@@ -0,0 +1,4 @@
+AUX 50sly-gentoo.el 109 BLAKE2B 3911e261147a0a9ecb177254cdcc210597d71bbad740cc74d0388be7b82a02da58208798cfa9cc38d06ee17afc1ee6684dc0f866cb58abfae810cab50f994bf2 SHA512 b73f7f175a14d49e1822659827c7a01b24a47fcc23768ac91a19702b1486ab38c1f449a9b3440abcc7d1da4e62a6a075b630233134c1cbb3c38aab4477fc4477
+DIST sly-1.0.43.tar.gz 1835404 BLAKE2B ab6868f3ee29d3d98d80984de4dd1ba39076279b86d86de49ce4e95323c419cbd6a16da81d9cbdff8bc8d12fb2d868096ecffd681b276e35a192feb723f99baf SHA512 e2785a34cabc3537efb06cd2ce9da05aef02ce7077ef73e2d82ace4e3534c00d9269969319294207759e11e2682111ca4d150f1d3d8e02b8f682752394640447
+EBUILD sly-1.0.43.ebuild 1491 BLAKE2B cbb6f3a7a50fbe3c3d695e87e8c8ef23a2aebae8e734d7da025913cd77bc8ac04335a3952e8a75bb5bd51326b2acf9e8445c34adfea085cce0b61c39186f6575 SHA512 87d50bb0504ff14c99546b53d9df23b4d4214b90506abce96db7757d4d5847bb469db1a320e071b027f5995776d53b8e2731011699272673f6718e5416b3e35e
+MISC metadata.xml 1537 BLAKE2B c45c4e684435cb2eda5cebc674f295208e29b2008c4273c764060e55b50ebf9bd9c3fa7c211b6c48a94576e006daf355f250be18d513671da357a5f30821a8ad SHA512 b5e10af1f77f87fc878cec9137021cdf6924669a5d4edee1e731bcdda04eb5a4ca53bb444826fa7fdcb816f1f66d0a5054bfa1568a1ee34ae08763012f7fc5d2
diff --git a/app-emacs/sly/files/50sly-gentoo.el b/app-emacs/sly/files/50sly-gentoo.el
new file mode 100644
index 000000000000..c69b93515bcb
--- /dev/null
+++ b/app-emacs/sly/files/50sly-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(add-to-list 'load-path "@SITELISP@/contrib")
+(require 'sly-autoloads)
diff --git a/app-emacs/sly/metadata.xml b/app-emacs/sly/metadata.xml
new file mode 100644
index 000000000000..1f4866127cad
--- /dev/null
+++ b/app-emacs/sly/metadata.xml
@@ -0,0 +1,36 @@
+<?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>
+  <longdescription>
+    SLY is Sylvester the Cat's Common Lisp IDE for Emacs.
+    SLY is a fork of SLIME. All SLIME's familar features (debugger, inspector,
+    xref, etc...) are still available, with improved overall UX. SLY's
+    highlights are:
+    A full-featured REPL based on Emacs's comint.el. Everything can be copied
+    to the REPL;
+    Stickers, or live code annotations that record values as code traverses
+    them.
+    Flex-style completion out-of-the-box, using Emacs's completion API.
+    Company, Helm, and other supported natively, no plugin required;
+    An interactive Trace Dialog;
+    Cleanly ASDF-loaded by default, including contribs, enabled out-of-the-box;
+    Multiple inspectors and multiple REPLs;
+    "Presentations" replaced by interactive backreferences which highlight the
+    object and remain stable throughout the REPL session;
+    Support for NAMED-READTABLES, macrostep.el and quicklisp.
+    A portable, annotation-based stepper in early but functional prototype
+    stage.
+  </longdescription>
+  <use>
+    <flag name="xref">Install xref.lisp cross-referencing tool</flag>
+  </use>
+  <upstream>
+    <bugs-to>https://github.com/joaotavora/sly/issues/</bugs-to>
+    <remote-id type="github">joaotavora/sly</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/sly/sly-1.0.43.ebuild b/app-emacs/sly/sly-1.0.43.ebuild
new file mode 100644
index 000000000000..ebec756037f0
--- /dev/null
+++ b/app-emacs/sly/sly-1.0.43.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Sylvester the Cat's Common Lisp IDE for GNU Emacs"
+HOMEPAGE="https://github.com/joaotavora/sly/"
+SRC_URI="https://github.com/joaotavora/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain GPL-2+ GPL-3+ LLGPL-2.1 ZLIB xref? ( xref.lisp )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc xref"
+
+RDEPEND="
+	dev-lisp/asdf
+	dev-lisp/sbcl
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-apps/texinfo
+	doc? ( virtual/texi2dvi )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	default
+
+	# Remove failing tests (sly-fontifying-fu-tests is a part of "check-fancy")
+	rm test/sly-fontifying-fu-tests.el || die
+
+	# Remove xref.lisp (which is non-free) unless USE flag is set
+	use xref || rm slynk/xref.lisp || die
+}
+
+src_compile() {
+	emake EMACS="${EMACS}" compile compile-contrib
+
+	emake -C doc ${PN}.info
+
+	if use doc ; then
+		VARTEXFONTS="${T}"/fonts emake -C doc all
+	fi
+}
+
+src_test() {
+	# NOTICE: "check-core" has some failing tests under root/portage user
+	emake check-fancy
+}
+
+src_install() {
+	elisp-install ${PN} *el{,c}
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+	elisp-install ${PN}/contrib/ contrib/*
+	elisp-install ${PN}/lib/ lib/* lib/.nosearch
+	elisp-install ${PN}/slynk/ slynk/*
+	elisp-install ${PN}/slynk/backend/ slynk/backend/*
+
+	doinfo doc/${PN}.info
+	dodoc CONTRIBUTING.md NEWS.md PROBLEMS.md README.md
+
+	use doc && dodoc doc/*.pdf
+}
diff --git a/app-emacs/sunrise-commander/Manifest b/app-emacs/sunrise-commander/Manifest
new file mode 100644
index 000000000000..a7ce10224295
--- /dev/null
+++ b/app-emacs/sunrise-commander/Manifest
@@ -0,0 +1,4 @@
+AUX 50sunrise-commander-gentoo.el 153 BLAKE2B 54441aca8b2eb6de362223223bd481dfb67ed5c5bb1b99a29a7d3b35cf058815a00c5fe6f4a263459f5139356a33c1592760a4214ac4c8dcfc25e3c6788b499d SHA512 b0ef9ef47f9f1dffc679fcc46d1e62a452d1f947b19c0f8cc721385862ad5b17efd4c5ef4c49ba16ca63b9fa9c33cb52c51e392d6bbce8dc9c572be98e89fea5
+DIST sunrise-commander-6_p20210927.tar.gz 109761 BLAKE2B f4996bc15243e0064c9acf5418d25c52a3f5aba2de86d256688aac31565a70e882ab1df04946bc8bd92bd379302f3362fd8e14dedcb531b249d971bee8a16e23 SHA512 60fb59f90235277d123ce9a62a2433b2300f0e0c6545802f8bb235e5a34666d9760f2c968f83067cb66259527cbf69213e60f788dd455f097b21e5f913fe949f
+EBUILD sunrise-commander-6_p20210927.ebuild 606 BLAKE2B aaee56b1396378395f1401562dfbbf970b9a7e903a821cd5aec16e7969c5d47ec622b598d9089385fc861bac4826520c662319220ff08de90e1beda0c3bbcb94 SHA512 807e189f93c2cac0da0a47aa65cff7ea05671d4062017688b6897297b62c6c0c36044f0f2cd33e5759ddb1d8d8ccf61893f00f9aac50508c8e70d7703e670bd9
+MISC metadata.xml 459 BLAKE2B 51446e57317227bcdcc9927e601bbbd8632dca3a4ebc9ca5ad86234fbba00fc7cad9df24762f00008191c7682f9add4190c6d9c688870f7c3397574300ce89d4 SHA512 0ebf892c45a21e0c46fb941b43b6e6b11ce303da027231f583fe3c0c099b13ca148a6e9dae006adb7b2f706bbaacfd767a2d111403176e04f102494687721f26
diff --git a/app-emacs/sunrise-commander/files/50sunrise-commander-gentoo.el b/app-emacs/sunrise-commander/files/50sunrise-commander-gentoo.el
new file mode 100644
index 000000000000..4a1369b59d67
--- /dev/null
+++ b/app-emacs/sunrise-commander/files/50sunrise-commander-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'sunrise-toggle "sunrise"
+  "Show or hide the Sunrise Commander." t)
+(defalias 'sunrise 'sunrise-toggle)
diff --git a/app-emacs/sunrise-commander/metadata.xml b/app-emacs/sunrise-commander/metadata.xml
new file mode 100644
index 000000000000..94cb76216849
--- /dev/null
+++ b/app-emacs/sunrise-commander/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/sunrise-commander/sunrise-commander/issues/</bugs-to>
+    <remote-id type="github">sunrise-commander/sunrise-commander</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/sunrise-commander/sunrise-commander-6_p20210927.ebuild b/app-emacs/sunrise-commander/sunrise-commander-6_p20210927.ebuild
new file mode 100644
index 000000000000..2bc5be9f966a
--- /dev/null
+++ b/app-emacs/sunrise-commander/sunrise-commander-6_p20210927.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# NOTICE: Check version of sunrise-commander in it's "Cask" & "sunrise.el".
+
+EAPI=8
+
+H=16e6df7e86c7a383fb4400fae94af32baf9cb24e
+NEED_EMACS=24.3
+
+inherit elisp
+
+DESCRIPTION="Twin-pane file manager for Emacs inspired by Midnight Commander"
+HOMEPAGE="https://www.emacswiki.org/emacs/Sunrise_Commander/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${H}
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/system-packages/Manifest b/app-emacs/system-packages/Manifest
new file mode 100644
index 000000000000..2fd51d70a86a
--- /dev/null
+++ b/app-emacs/system-packages/Manifest
@@ -0,0 +1,4 @@
+AUX 50system-packages-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST system-packages-1.1.0.tar.gz 18634 BLAKE2B ec32510435507bf64c77d7952094eb9fe72d3f7f098335c756fc7d80ce267e02a253fecb406986ec4e09b601868b448b4c9379c29cd5810b634bb07c5f686e5a SHA512 58ecaa8649c086995f68db6abc3bf9cbb012b39b51c553b661368aaed116835984425a6b19d68f8ffad44ecf1818a6281758c56e62ac5230783408e73f9ff776
+EBUILD system-packages-1.1.0.ebuild 461 BLAKE2B 2b2760370484a83ec19e34269611f9d92b79c5f33b62378da51671e7dfa99317b9cfb58f1f0959cd8e2fd1b91aa10abe26714ad5c73937e57ab7fefb6a99e674 SHA512 437922127045e8dfc3606e28170adf8ae0550ecfc8f1007178ca2952fdc7d5e08f764a75a7f832b648510dfccc8a8cc1cb8e02f7d7d668c1d974c175bacc378b
+MISC metadata.xml 441 BLAKE2B 4786f0bacc0545bae309cb51a22e33e0932e1152fdeebf8fa60e39cb04eeeb9f5ac13cc4af84edf2b87d99e28044fcdb450501e35b42a0aadc2fd6e86b1c001a SHA512 c029ef4cf76f34f73f2f910a8ad2df5e28bfe14069bc2f7113543a972f0e24302e77ad37b3ef0f895531c0045fd7925e216f378cc83cf9ff9299cb6f517f5763
diff --git a/app-emacs/system-packages/files/50system-packages-gentoo.el b/app-emacs/system-packages/files/50system-packages-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/system-packages/files/50system-packages-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/system-packages/metadata.xml b/app-emacs/system-packages/metadata.xml
new file mode 100644
index 000000000000..9e1db88b663a
--- /dev/null
+++ b/app-emacs/system-packages/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://gitlab.com/jabranham/system-packages/-/issues/</bugs-to>
+    <remote-id type="gitlab">jabranham/system-packages</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/system-packages/system-packages-1.1.0.ebuild b/app-emacs/system-packages/system-packages-1.1.0.ebuild
new file mode 100644
index 000000000000..0c462895c9ad
--- /dev/null
+++ b/app-emacs/system-packages/system-packages-1.1.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24.3
+
+inherit elisp
+
+DESCRIPTION="Manage your installed packages with Emacs"
+HOMEPAGE="https://gitlab.com/jabranham/system-packages/"
+SRC_URI="https://gitlab.com/jabranham/${PN}/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.org )
+ELISP_REMOVE=".dir-locals.el"
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/treemacs/Manifest b/app-emacs/treemacs/Manifest
new file mode 100644
index 000000000000..644e5b299e46
--- /dev/null
+++ b/app-emacs/treemacs/Manifest
@@ -0,0 +1,7 @@
+AUX 50treemacs-gentoo.el 107 BLAKE2B 8f0b4ae5390e6552c14ab55dbd71ac7e93477d0ab111cd5ae921f33800a15606606b96246e6a3fa1dc1e0aa42df0b3cc50f29602f72685fec47520e53db18c04 SHA512 5098445176a1b4730439e1d3f55d2dd2a27ec095f721b40318fe181f5a89276f0e2b6269505db4248160ca3769981ccecdd2fa0ea89667579faa920ea8d40bf0
+AUX treemacs-icons-icon-directory.patch 415 BLAKE2B d53b7bfcca7ab85953e1d98a71d58d273f625e095c72417d0c3e1bcfa65d4e5b9a34a60f1295f68a22f663643a6460adddfd2b03c38f7a10a0c3edfae232fb61 SHA512 c76ead6a99de0494769f35af8e3a5154fed728736e41d9cfe08c04f947959a972488e9d6e871e05b10763551fdcbda8e31e9b1bc308a043b5b315ea0a6e475f9
+DIST treemacs-2.10.tar.gz 4137468 BLAKE2B 0f832d02f8b0f96f7000c57b1842319155face5cb50c44ff4286f7f28dd74b38739079de9c387dbddbf93af37a5c750c45a598100ed5053674a565b4ec34f0c6 SHA512 9326a3f66c1b38eb7ef39e90900c2ef71d20c6c3478213f61c144ca4face562dccf00d6d400315c264627468a0c3319a24f0ec6cddb795b54e1b7f3c235d1c71
+DIST treemacs-2.9.5.tar.gz 4134227 BLAKE2B 1fbdb278e9524fdb14cbc7699bc787ab694b00d37a91ec3e91e106079bc02f6b8b39207608873d45c70fd6355a22553bf1a0636a948b79df77adfe0b4a3f799f SHA512 adc026d7ad459418fae531c5a1a7df7f9308e63dec82240c1c5e278eb00fdf8d6dff1ee2112ea73d5a05c4266efe24623bb84f8819a6f07fbb4fde6e644ca9ad
+EBUILD treemacs-2.10-r1.ebuild 1183 BLAKE2B ee2b86534058b02c39baebfa771e23dfc41292cf4f2a7020c697cdc353b361b74d33cce3c51dbce61fb53bf97bf4b031699682aaef3c8f60c977a4f9b3b51517 SHA512 42511cfe992fbd4e5b00962ef4c2851e884f871b3b9ca14b4ed0ecc7db67b8a595eb12edf4426b5c0c8075392eb172055ba0d50c3a9c8716b9e9d62f82ea719c
+EBUILD treemacs-2.9.5-r1.ebuild 1183 BLAKE2B ee2b86534058b02c39baebfa771e23dfc41292cf4f2a7020c697cdc353b361b74d33cce3c51dbce61fb53bf97bf4b031699682aaef3c8f60c977a4f9b3b51517 SHA512 42511cfe992fbd4e5b00962ef4c2851e884f871b3b9ca14b4ed0ecc7db67b8a595eb12edf4426b5c0c8075392eb172055ba0d50c3a9c8716b9e9d62f82ea719c
+MISC metadata.xml 439 BLAKE2B a5536ef58177b5a4802017b81c68951ff5585a745ebc38f036bf2ee98bf6f51b0586ff5022cd1da55dbca13430b1811d8ac60e5b920caec7ea15f83f62ed3cad SHA512 cb6043bf4aa0e741f19630393ec1a25ab74e4ac2f17a41d932fce8d6f95663534cf28c277912c1800b252a98f1dc5ba13d6623f12251486e93dc33df1b77f443
diff --git a/app-emacs/treemacs/files/50treemacs-gentoo.el b/app-emacs/treemacs/files/50treemacs-gentoo.el
new file mode 100644
index 000000000000..296e01d5b8b4
--- /dev/null
+++ b/app-emacs/treemacs/files/50treemacs-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'treemacs "treemacs"
+  "Initialise or toggle treemacs." t)
diff --git a/app-emacs/treemacs/files/treemacs-icons-icon-directory.patch b/app-emacs/treemacs/files/treemacs-icons-icon-directory.patch
new file mode 100644
index 000000000000..d1ac5022064a
--- /dev/null
+++ b/app-emacs/treemacs/files/treemacs-icons-icon-directory.patch
@@ -0,0 +1,12 @@
+index 2cd9baf..e6ea521 100644
+--- a/src/elisp/treemacs-icons.el
++++ b/src/elisp/treemacs-icons.el
+@@ -273,7 +273,7 @@ Necessary since root icons are not rectangular."
+        (ht-set! tui-icons it tui-icon))))
+ 
+ (treemacs-create-theme "Default"
+-  :icon-directory (treemacs-join-path treemacs-dir "icons/default")
++  :icon-directory "@SITEETC@/icons/default"
+   :config
+   (progn
+     ;; directory and other icons
diff --git a/app-emacs/treemacs/metadata.xml b/app-emacs/treemacs/metadata.xml
new file mode 100644
index 000000000000..2b59c18813b9
--- /dev/null
+++ b/app-emacs/treemacs/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/Alexander-Miller/treemacs/issues/</bugs-to>
+    <remote-id type="github">Alexander-Miller/treemacs</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/treemacs/treemacs-2.10-r1.ebuild b/app-emacs/treemacs/treemacs-2.10-r1.ebuild
new file mode 100644
index 000000000000..ea3b8ab8544a
--- /dev/null
+++ b/app-emacs/treemacs/treemacs-2.10-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=26.1
+
+inherit elisp
+
+DESCRIPTION="Tree style project file explorer"
+HOMEPAGE="https://github.com/Alexander-Miller/treemacs/"
+SRC_URI="https://github.com/Alexander-Miller/${PN}/archive/${PV}.tar.gz
+			-> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-emacs/ace-window
+	app-emacs/cfrs
+	app-emacs/dash
+	app-emacs/ht
+	app-emacs/hydra
+	app-emacs/pfuture
+	app-emacs/s
+"
+BDEPEND="
+	${RDEPEND}
+	test? ( app-emacs/buttercup )
+"
+
+DOCS=( Changelog.org Extensions.org README.org screenshots )
+PATCHES=( "${FILESDIR}"/${PN}-icons-icon-directory.patch )
+
+BYTECOMPFLAGS="-L . -L src/elisp"
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	elisp_src_prepare
+
+	sed "s|@SITEETC@|${SITEETC}/${PN}|" -i src/elisp/${PN}-icons.el || die
+}
+
+src_compile() {
+	elisp-compile src/elisp/*.el
+}
+
+src_test() {
+	buttercup ${BYTECOMPFLAGS} -L test --traceback full || die
+}
+
+src_install() {
+	elisp-install ${PN} src/elisp/*.el{,c}
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+	insinto ${SITEETC}/${PN}
+	doins -r icons
+}
diff --git a/app-emacs/treemacs/treemacs-2.9.5-r1.ebuild b/app-emacs/treemacs/treemacs-2.9.5-r1.ebuild
new file mode 100644
index 000000000000..ea3b8ab8544a
--- /dev/null
+++ b/app-emacs/treemacs/treemacs-2.9.5-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=26.1
+
+inherit elisp
+
+DESCRIPTION="Tree style project file explorer"
+HOMEPAGE="https://github.com/Alexander-Miller/treemacs/"
+SRC_URI="https://github.com/Alexander-Miller/${PN}/archive/${PV}.tar.gz
+			-> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-emacs/ace-window
+	app-emacs/cfrs
+	app-emacs/dash
+	app-emacs/ht
+	app-emacs/hydra
+	app-emacs/pfuture
+	app-emacs/s
+"
+BDEPEND="
+	${RDEPEND}
+	test? ( app-emacs/buttercup )
+"
+
+DOCS=( Changelog.org Extensions.org README.org screenshots )
+PATCHES=( "${FILESDIR}"/${PN}-icons-icon-directory.patch )
+
+BYTECOMPFLAGS="-L . -L src/elisp"
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	elisp_src_prepare
+
+	sed "s|@SITEETC@|${SITEETC}/${PN}|" -i src/elisp/${PN}-icons.el || die
+}
+
+src_compile() {
+	elisp-compile src/elisp/*.el
+}
+
+src_test() {
+	buttercup ${BYTECOMPFLAGS} -L test --traceback full || die
+}
+
+src_install() {
+	elisp-install ${PN} src/elisp/*.el{,c}
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+	insinto ${SITEETC}/${PN}
+	doins -r icons
+}
diff --git a/app-emacs/typescript-mode/Manifest b/app-emacs/typescript-mode/Manifest
new file mode 100644
index 000000000000..ec5aadf2f7a2
--- /dev/null
+++ b/app-emacs/typescript-mode/Manifest
@@ -0,0 +1,4 @@
+AUX 50typescript-mode-gentoo.el 188 BLAKE2B 842bb64c905de119338975c0717c2ab4db5111644889c1da8d325f55efb67fd29c456d938718eb27e947e0d7c13cbb0ddb39c956099c09a24962e86349ceecda SHA512 2ffd54a6730c7f152a375227482720649865be1097a4f758152dab4b6f113eef5fa3acb9c6cf704db08f27dd85553ed6af2c1a4a25390042cd4e73b8146cb150
+DIST typescript-mode-0.4.tar.gz 65534 BLAKE2B b72047749cac571ad4a109b0d8650319137c2f75672882940092bff097e3a8c877b59cb51aa89b28a6cbeacfddbd6730e634a5a33305c006d401d326fd7f5704 SHA512 5bb38ab14fa9b022744b790e62740a95cee4ca906bab9eaaea8804cfae78c4ead54770d7e53d323ee57799bff5101cc10b7327105b7b0d0b17c74bda64203972
+EBUILD typescript-mode-0.4.ebuild 740 BLAKE2B bff624a7855cb62cde1310470b5a8d819975fbf967322b74afba2680d5a7eaad82d68257a020b6d181eca319fcac3eb62eded8b7a6ac715911628efb40531128 SHA512 35d9ef8ba5236475392d7d4840179a2d4075d46a7a1dac2a98fc2d170f8922364e86259ad6f455a7f442259cb9c787c7575244ba0c5e1197305321c095660368
+MISC metadata.xml 449 BLAKE2B ff09587f78cdef036ea37525c48ec09eff9192d5849256816440477652ea568594eca5e5505a3266ed0834ced527856a01d1093a996c334f657199c445966553 SHA512 6c7ce95e48733f316befb85f986b524b2fcda730ab82979c8dc2ee72c0bd7d58ad6992ce5fb76452375b946c1f502f29e997099064cc1dbce1c790ef872d97cc
diff --git a/app-emacs/typescript-mode/files/50typescript-mode-gentoo.el b/app-emacs/typescript-mode/files/50typescript-mode-gentoo.el
new file mode 100644
index 000000000000..7d8a4986d35f
--- /dev/null
+++ b/app-emacs/typescript-mode/files/50typescript-mode-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'typescript-mode "typescript-mode"
+  "Major mode for editing typescript." t)
+(add-to-list 'auto-mode-alist '("\\.ts\\'" . typescript-mode))
diff --git a/app-emacs/typescript-mode/metadata.xml b/app-emacs/typescript-mode/metadata.xml
new file mode 100644
index 000000000000..96355bfba917
--- /dev/null
+++ b/app-emacs/typescript-mode/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/emacs-typescript/typescript.el/issues/</bugs-to>
+    <remote-id type="github">emacs-typescript/typescript.el</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/typescript-mode/typescript-mode-0.4.ebuild b/app-emacs/typescript-mode/typescript-mode-0.4.ebuild
new file mode 100644
index 000000000000..cdb6b235f506
--- /dev/null
+++ b/app-emacs/typescript-mode/typescript-mode-0.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24.3
+
+inherit elisp
+
+DESCRIPTION="TypeScript-support for Emacs"
+HOMEPAGE="https://github.com/emacs-typescript/typescript.el/"
+SRC_URI="https://github.com/emacs-typescript/typescript.el/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/typescript.el-${PV}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp-compile ${PN}.el
+}
+
+src_test() {
+	${EMACS} ${EMACSFLAGS} -L . -l typescript-mode-tests.el \
+			 -f ert-run-tests-batch-and-exit || die
+}
+
+src_install() {
+	elisp-install ${PN} ${PN}.el{,c}
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+	dodoc README.md
+}
diff --git a/app-emacs/undercover/Manifest b/app-emacs/undercover/Manifest
new file mode 100644
index 000000000000..de0a72653252
--- /dev/null
+++ b/app-emacs/undercover/Manifest
@@ -0,0 +1,4 @@
+AUX 50undercover-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST undercover-0.8.1.tar.gz 20800 BLAKE2B a151366c0897baf22e2ad9e602935409643f9256f42fdc8733e3d98bfcf9373d12b6225851ab6d18cb195abff860842a6a5444886aeffce59ee45c5f1e902feb SHA512 33508f3c6cbacd30ee3ad8312e51b596a7547713837595ec2836f627bcccc90107e5198f541d8bc74ad20fb9c8ea6e0616fd0de8eb46f743d2606397000f0e74
+EBUILD undercover-0.8.1.ebuild 565 BLAKE2B 5f07293ecb9568951d74c149e00966e6bb3f86ad96ba6b17e5a48a6917ae10a84471308ccfb850264d4f6b0ae30930a2160a0679575555145d8bcac8c11f0f8a SHA512 de7fd93d9ac8cbbc26463e04b5f0bf3b31df703d11dcec6b5519305d021ee5c375dec07c1353d08e2271750a4a896359313433965e33ba650d0c305bc9e102b3
+MISC metadata.xml 443 BLAKE2B 30c966d02696c658940fe2818442fc962c7b0f8e4d1a2d5587a11a9fb94ed2ce474b278c5b1572373c64cd2f59c5ddf2c63119f7431e3f3bfa59b6cb63469f4c SHA512 1abdcf39998b3f0b708e403fa6c48eed9dbcd0843055e34e743868c488247e9106c87cd095d51d2f4cb04dd69dadf96ee86a95fcd1dc2b807453ca3bf56d42d7
diff --git a/app-emacs/undercover/files/50undercover-gentoo.el b/app-emacs/undercover/files/50undercover-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/undercover/files/50undercover-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/undercover/metadata.xml b/app-emacs/undercover/metadata.xml
new file mode 100644
index 000000000000..573fc52cf974
--- /dev/null
+++ b/app-emacs/undercover/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/undercover-el/undercover.el/issues/</bugs-to>
+    <remote-id type="github">undercover-el/undercover.el</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/undercover/undercover-0.8.1.ebuild b/app-emacs/undercover/undercover-0.8.1.ebuild
new file mode 100644
index 000000000000..81126487bb99
--- /dev/null
+++ b/app-emacs/undercover/undercover-0.8.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="Test coverage library for Emacs"
+HOMEPAGE="https://github.com/undercover-el/undercover.el/"
+SRC_URI="https://github.com/undercover-el/${PN}.el/archive/v${PV}.tar.gz
+			-> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}.el-${PV}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"  # Tests fail
+
+RDEPEND="
+	app-emacs/dash
+	app-emacs/shut-up
+"
+BDEPEND="${RDEPEND}"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/use-package/Manifest b/app-emacs/use-package/Manifest
new file mode 100644
index 000000000000..4a13d6f51de8
--- /dev/null
+++ b/app-emacs/use-package/Manifest
@@ -0,0 +1,5 @@
+AUX 50use-package-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+AUX use-package-require-diminish.patch 420 BLAKE2B 578e7d2da6e4840ebea2161f9c5c7a765f3c0bbf0dd6fa67b3f151f0bb3181d5472dd28276ee7f54fd8bb08ee4ed586c765156a3820c708b2f5e5adbb4877ad1 SHA512 81bdfdd9430088591c522096f0bb85f2a8ca0a9ed2e68f578ac8dbcefe07c0c4ff06c02b6703daa0f2c940f57b7bada0d71bfda43128d2fae1b1b46e2e9277e7
+DIST use-package-2.4.1.tar.gz 124368 BLAKE2B 5eaa6f500234d86651e155fa5360362c5e2696a8b258d5785a02b94f4ccacc6a9815e0b53f663684cef1cc9aa6c6812a5f59e04de3a3d7c5ac36e9dfb6ea09ea SHA512 7248243dbddd939eb1ef9e76f9410265ed1cc48398745f593b57122261a6bb3bf4ab40392b6f29476ca33922f7087a52596a87968cf4914e5ed82db6c513bbbf
+EBUILD use-package-2.4.1.ebuild 994 BLAKE2B fa76f5a5eac971a88e7592b20b4f3647a63166ce36171c470941e424a2aba65c5759ba66f6c5c4372d0acaa42b48e9107a9643e260c8aece389ccddbd49bcd48 SHA512 63621cd480e20a1963b44c82efa8e04227b259ef196fc0c2401e5c10948b13b96810a291de8c395880874f7ccd2a09d2f41ce062882fba2a820e781efe1b3e27
+MISC metadata.xml 429 BLAKE2B 287e6cbe3a1ece1241e6fe22235bdcd346bac4ff92e49ec9b9de52271fdf40d05f7f0646878b3fb6dcf447c79350e91bf62a5aefa0dca351638f7a7914b52446 SHA512 5db5dd382365f331fb8945b0ee319e34aa037f0b23239d9df26433f866e4276558dc1cf450e807f3fcc1f4cbe358e84751cc37a3a5cd85d08b083014a761a838
diff --git a/app-emacs/use-package/files/50use-package-gentoo.el b/app-emacs/use-package/files/50use-package-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/use-package/files/50use-package-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/use-package/files/use-package-require-diminish.patch b/app-emacs/use-package/files/use-package-require-diminish.patch
new file mode 100644
index 000000000000..afa7f33045ec
--- /dev/null
+++ b/app-emacs/use-package/files/use-package-require-diminish.patch
@@ -0,0 +1,14 @@
+Diminishing is one of core features of use-package, normally
+it would have to be required before using use-package.
+This patch will load diminish when use-package loads.
+index 1f3895f..a38ee48 100644
+--- a/use-package-diminish.el
++++ b/use-package-diminish.el
+@@ -33,6 +33,7 @@
+ 
+ ;;; Code:
+ 
++(require 'diminish)
+ (require 'use-package-core)
+ 
+ (defun use-package-normalize-diminish (name label arg &optional recursed)
diff --git a/app-emacs/use-package/metadata.xml b/app-emacs/use-package/metadata.xml
new file mode 100644
index 000000000000..3f12e84d7508
--- /dev/null
+++ b/app-emacs/use-package/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/jwiegley/use-package/issues/</bugs-to>
+    <remote-id type="github">jwiegley/use-package</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/use-package/use-package-2.4.1.ebuild b/app-emacs/use-package/use-package-2.4.1.ebuild
new file mode 100644
index 000000000000..1e8087eb52ae
--- /dev/null
+++ b/app-emacs/use-package/use-package-2.4.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# NOTICE: This package provides all "use-package" Emacs Lisp libraries except
+# "bind-chord" and "bind-key" which are split into their own packages.
+
+EAPI=8
+
+NEED_EMACS=24.3
+
+inherit elisp
+
+DESCRIPTION="Declaration macro for simplifying your Emacs configuration"
+HOMEPAGE="https://github.com/jwiegley/use-package/"
+SRC_URI="https://github.com/jwiegley/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-emacs/bind-chord
+	app-emacs/bind-key
+	app-emacs/diminish
+	app-emacs/system-packages
+"
+BDEPEND="${RDEPEND}"
+
+DOCS=( NEWS.md README.md use-package.org )
+PATCHES=( "${FILESDIR}"/${PN}-require-diminish.patch )
+
+ELISP_TEXINFO="${PN}.texi"
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	emake BATCH="${EMACS} ${EMACSFLAGS} -L . -l diminish" test
+}
+
+src_install() {
+	rm bind-{chord,key}.el{,c} ${PN}-tests.el || die
+
+	elisp_src_install
+}
diff --git a/app-emacs/vertico/Manifest b/app-emacs/vertico/Manifest
index 6876c171ac30..f5ee62ef8022 100644
--- a/app-emacs/vertico/Manifest
+++ b/app-emacs/vertico/Manifest
@@ -1,4 +1,6 @@
 AUX 50vertico-gentoo.el 82 BLAKE2B 89e0376cb0361d71ad40318455820607ac23fe004dbc80c77c9943a94426c47ee409956e0770a1f8c3157b50f0f105275337b0c94b597755dac59baeac29eecc SHA512 ea5c77218cab48e770cf56d1732b8101bbe453fe5e98fccf92c6adf53fd3aa8c1c3fd4d33e02fcb02d7ef44c56661e9c593588ffefec0852ecd43c00da30a5dd
 DIST vertico-0.20.tar.gz 40899 BLAKE2B 73f42eefc43095c58c38570fac2fc915f7a1d7095f2b1864834eb57d658114ee3a4a98fb834c64793810505e171602801d8a492eecc7349137833442fc02b715 SHA512 0e683a572fec4ba223f03672461b4888667e35202dd1b2efc139127d3327d6d7a6d7eab96549239e6dad6e86054854b49a3be553ce482fd2e683bdb029e3a9c0
+DIST vertico-0.22.tar.gz 42487 BLAKE2B f6863b4078f25fba318685fd16a34abe016c9fb9fd94a7ad6fcbce02c72526786c74f67177a44433ee5aa747382db81762015fcfe98da252f19aa88f219d294d SHA512 108348cb43f07909570dd40e058c1ea612c6a8c39794a365ef0ee0111d7f43dde37f82c46bcac0319eba44e6e5553bde2bc09f8755bb1e3f4b22999fdacc23c2
 EBUILD vertico-0.20.ebuild 520 BLAKE2B edbaf5bc705dfd6c08b2ba2a253ed15c0e7293de324d27bc9745a85417dc49fe4a483a0e6f89d15b7eb4b624f90e9b56dc8adbef7db4975320cac08f9a3baf6b SHA512 4e5554b24d22b0efdc3122b35c9d5717e3a44ece867eb99cd257b270b14b10c277de23a3f8d9463c2e11f9dedb2c02c030f3274ee522310188afc97a9951fecc
+EBUILD vertico-0.22.ebuild 520 BLAKE2B edbaf5bc705dfd6c08b2ba2a253ed15c0e7293de324d27bc9745a85417dc49fe4a483a0e6f89d15b7eb4b624f90e9b56dc8adbef7db4975320cac08f9a3baf6b SHA512 4e5554b24d22b0efdc3122b35c9d5717e3a44ece867eb99cd257b270b14b10c277de23a3f8d9463c2e11f9dedb2c02c030f3274ee522310188afc97a9951fecc
 MISC metadata.xml 359 BLAKE2B d5d9e7f1c0ec1dc75d7fde73aa75f364f15740857e6a2bf39b3374424c3fcff4e79ceda481141598fee17c694b4c3538059f5bf95186aad6d535eacabcdb3341 SHA512 93e435f0f7bdb4d26a48525109688b964049a0b61d4b5633bd61dfd14ab68a5bd7e367d0cb7e45f5f1a57d73b8b63a9b2f8b0da9ac289bd4242da3b6f434b987
diff --git a/app-emacs/vertico/vertico-0.22.ebuild b/app-emacs/vertico/vertico-0.22.ebuild
new file mode 100644
index 000000000000..d2415e174e28
--- /dev/null
+++ b/app-emacs/vertico/vertico-0.22.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+NEED_EMACS=27
+
+inherit elisp
+
+DESCRIPTION="Vertical interactive completion"
+HOMEPAGE="https://github.com/minad/vertico"
+SRC_URI="https://github.com/minad/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	default
+	mv extensions/*.el . || die
+}
+
+src_compile() {
+	elisp_src_compile
+	elisp-make-autoload-file
+}
diff --git a/app-emacs/vhdl-mode/Manifest b/app-emacs/vhdl-mode/Manifest
index f5c5e29cd648..646bf87b7a39 100644
--- a/app-emacs/vhdl-mode/Manifest
+++ b/app-emacs/vhdl-mode/Manifest
@@ -4,5 +4,5 @@ AUX vhdl-mode-info-dir-gentoo.patch 522 BLAKE2B 35204f9ec727ec5ec44ecc03a99cedd5
 DIST vhdl-mode-3.38.1.tar.gz 318400 BLAKE2B 2ddad9f4e8fdb0fafd2e27075f5722fcf7959a2b50ad61c5860af52706d9579065e0880d7b9bd1b884c21cfc902760dff006404490c8cbb1474831aa4c6d841d SHA512 2cc12994e17658d65cffa348c59ac3208cc0f498731941b8f64da68e258ca57d6aa500d72103b005996cf3496e119cf59b52bbc1c4b740401685030b42f272a8
 DIST vhdl-mode-3.38.3.tar.gz 319205 BLAKE2B ec64bd5fb783ef5e295319ca86ef147a021ffce352ddca49f19dcdc6b79c5bc9ed9350ad154321dbf40a84f501d9da70ffd685d2376a8da98cd2426b9df4bd36 SHA512 4738927daa424c5d66bc69e021e6b624cc23a3bf70a6f78ea5a7fc07ad0bd0aaf5429594b6ff71067edbf48802d7d77f38d607708541fb59e259cc1a4221fb60
 EBUILD vhdl-mode-3.38.1.ebuild 521 BLAKE2B 21648410afa0d7a7a10408074a2bbbd96c49f6055d0e18f384eef6bee6b43a7bf8f518c46d722c80590c75c901c1df1218cc77c2257f621cb5ea0362dafa9b08 SHA512 34412a8a861fdaf58f604f411703534d90aee86770a28c03a80c3541d72a39773e05e1153eb23011d31511159240e75966124623112a054fb9e74b0ac7af8971
-EBUILD vhdl-mode-3.38.3.ebuild 584 BLAKE2B 0b8a56b4eb5d81ee51f2b6ae798e8f00dd9688a5d467c4493367435edab8b3c393c47e1accd7afff908e6b81212bd5b909e2895e38192d3b3a70405cd83b7b14 SHA512 d9b2a9b66920be6130227ef4a2e94a1225a1cb5e92ad9d56a1d1fce72e91679cb4dfb5e97f122a777333616fbc9ddcbe99f498c071be8d36ff24eadaf1b3ebc3
+EBUILD vhdl-mode-3.38.3.ebuild 581 BLAKE2B cb745175be84473158d49ca65db1b4db375bc1986ef9fea833bbc83fd4da105c20f3edaa15c12179aed1b1bcf788c921092779de7325fa4a70c6558d52b4c61c SHA512 ccf2357abff9d85d6c233638b63c507267c889210fe28360f186bf6bc717d396a113e49f54d94b3a6762457cefeb7723e387599230712feab7d39fe322145132
 MISC metadata.xml 283 BLAKE2B 81c49021199f71096079a27f9121390fb8c1285c54b9478583ff2d647277fa106ef12456d7097c4be092fc48b514a1adcf855ca0fac911598232ef9eb7f102c0 SHA512 f32b303760addf5d4db8d18bd10fb677353cdfa4c5e545d47804ef756cf5e5a21f8b8efb631b08f802185913ceb98da820e404e06eb03d01fe9ea85c10d1ac13
diff --git a/app-emacs/vhdl-mode/vhdl-mode-3.38.3.ebuild b/app-emacs/vhdl-mode/vhdl-mode-3.38.3.ebuild
index 5099ff5fbfd8..bcd146711d0f 100644
--- a/app-emacs/vhdl-mode/vhdl-mode-3.38.3.ebuild
+++ b/app-emacs/vhdl-mode/vhdl-mode-3.38.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://iis-people.ee.ethz.ch/~zimmi/emacs/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-emacs-28.patch
diff --git a/app-emacs/wanderlust/Manifest b/app-emacs/wanderlust/Manifest
index 5e4c70f48c10..6dc5d62a0771 100644
--- a/app-emacs/wanderlust/Manifest
+++ b/app-emacs/wanderlust/Manifest
@@ -2,5 +2,5 @@ AUX 50wanderlust-gentoo.el 244 BLAKE2B 57be93cdfb9e1854ec5841996b586843ca6e51483
 DIST wanderlust-2.15.9_p20190623.tar.gz 1210223 BLAKE2B 50416e27062a9837c18660ea9a1a7a3ff596639763965b09925ca16c89617d159b9aa5d08d93d8b5c6a504da2b048df8b4c489d4fc11ff6abc530f741a5d8fb9 SHA512 369f8d93af4d0d98f66c4c8500aa3535e3f772d8a1920c1bdc434f0d9078555f40d0d4278937d97bccf0f417cf1b1fdeb6c8a891d42b2675fb7737382425c91d
 DIST wanderlust-2.15.9_p20210629.tar.gz 1177023 BLAKE2B 7af02d833bfa7a2fdb52adc6ee25e43cb5b9ebd79c32685af033e3f24d3f1f9c758940b9fe7ade1295691a774e0530569b0f0567aae57a54d7da30e70f57eb93 SHA512 60cd4be070fde9f24f42ddc6ca5d5d290eddf2c0fa9b584eace50bc569f2ed3003be8f75f26a5ef8cffad4ed059118163bb4ea289d95ee58b445c4d8f34b487e
 EBUILD wanderlust-2.15.9_p20190623.ebuild 1373 BLAKE2B 81925ac4fb0588b1c790f648dc4804ca30da61a38f8822508c94eefebdbc39e1bf6075dcefbead7916ea89ef1d061d5a62a91fe83f82d09fdc81978f0265cee0 SHA512 784f76bd82988061017f6cb4213fa2a4f8716befd109ab4a6215149d61e17677c206ea788a78f07f7ebdcb48eb25773bccb99df70269dca446c9d72afecc0666
-EBUILD wanderlust-2.15.9_p20210629.ebuild 1392 BLAKE2B 0a7ae26f8f7fc99479158707d62dba830bde4d982b369c01cd255eada2e9c53ed9043b26d9a42c687693532337cc7e2b5bc83c7016587992f4a5e1790e3f88b5 SHA512 ab6f2c0f7ab1c4be1b22b1ad6e8fcdafe9e7d9565ccb2f37024fab4dffaece90c8c989978a7130f33051ad3c4d42746accc3e25d8c444defdec2ef1965479a3e
+EBUILD wanderlust-2.15.9_p20210629.ebuild 1389 BLAKE2B 843e9c0bca2d62cf52e3f7ab1775a01cc4252cee3304016905b8578007a8860ce0b6a36f360468ca977472b7f8c214438ac8cb3f0f0921b8cee41a1f41051620 SHA512 d7b3f9d5d5f22559f2ce49b93d9463845830ed008aa016c7c2a0d3bed5e54d98a7f67831ba1c1eeafbfb91f3c4277b5b728a23b7e32724f39c8c7dfde5230848
 MISC metadata.xml 453 BLAKE2B b173046943c58dfff9aa256d5824fc85dc605dafad0409cecc72c79fdd50de4ef475b981cba9a63dd536b47bcf2d98cb3e5fd8d85401997df2fe438811555353 SHA512 a88d7c7c74ef279e33c625ba0d8cf1dc6eaeb03adfa50bccaa781316c1f5561744d2f772ba79438eca2a21c1310f74de8789acde9a1d1c9eccaa485a4df93a11
diff --git a/app-emacs/wanderlust/wanderlust-2.15.9_p20210629.ebuild b/app-emacs/wanderlust/wanderlust-2.15.9_p20210629.ebuild
index 036441e2b356..b4f0dfcd119d 100644
--- a/app-emacs/wanderlust/wanderlust-2.15.9_p20210629.ebuild
+++ b/app-emacs/wanderlust/wanderlust-2.15.9_p20210629.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${GITHUB_SHA1}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="bbdb ssl l10n_ja"
 
 RDEPEND=">=app-emacs/apel-10.8
diff --git a/app-emacs/web-server/Manifest b/app-emacs/web-server/Manifest
new file mode 100644
index 000000000000..350d0203b0de
--- /dev/null
+++ b/app-emacs/web-server/Manifest
@@ -0,0 +1,4 @@
+AUX 50web-server-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST web-server-0.1.2_p20210708.tar.gz 62215 BLAKE2B 66d3a3ed6ff20dd4029f7d5d226df2aead694d63ea07fa33e2ada7a04e75124c9ba31876668c4ba6afc42ed7ee717b804f871e519569d6f6461ab31847391b62 SHA512 2f64be98195bf2bd72a9a61495ff4f57c8bfd1be68c2a396f6f706ff4f0123c3492576e758059d16a320df9a6146d352f65506aa0d43573f497452a90a099b26
+EBUILD web-server-0.1.2_p20210708.ebuild 770 BLAKE2B 4ed25d67dd9f802d578f26eee2159bb93e42e12c07c220c8cab5ebfd420607d17efafea48e31086ca2c561566d4385dd30a6cf5551529c8720b38cc03a114f07 SHA512 ed8733adbd88576e9861e898f1d7e301d222b9780b79c4cce7ae78cd9dc1f05cb470d6d365e0c35bc181c6bb63c523a8a960b5631f09d485550055bfd267f3bd
+MISC metadata.xml 439 BLAKE2B 46ef6ba49e03f742ee5d3692936dc8ae6df3e0c49faa96ca787562f2b9c0d0078e82f4630b52cdfd4122963a8a96708d4c0b26e17a4e9df82fea08287538257e SHA512 79d7513495c0255c6d8254a1cfb01c69ea9c3a0b82a45910f16aee6f70d852329ec5a85ce55a5a82432b70f13d5d4e5b3f521367ff145dd714a9ddac6903b39c
diff --git a/app-emacs/web-server/files/50web-server-gentoo.el b/app-emacs/web-server/files/50web-server-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/web-server/files/50web-server-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/web-server/metadata.xml b/app-emacs/web-server/metadata.xml
new file mode 100644
index 000000000000..a3e7ca53839e
--- /dev/null
+++ b/app-emacs/web-server/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/eschulte/emacs-web-server/issues/</bugs-to>
+    <remote-id type="github">eschulte/emacs-web-server</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/web-server/web-server-0.1.2_p20210708.ebuild b/app-emacs/web-server/web-server-0.1.2_p20210708.ebuild
new file mode 100644
index 000000000000..cbb8ecd21cec
--- /dev/null
+++ b/app-emacs/web-server/web-server-0.1.2_p20210708.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=6357a1c2d1718778503f7ee0909585094117525b
+NEED_EMACS=24.1
+
+inherit elisp
+
+DESCRIPTION="Web server running Emacs Lisp handlers"
+HOMEPAGE="https://github.com/eschulte/emacs-web-server/"
+SRC_URI="https://github.com/eschulte/emacs-${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/emacs-${PN}-${H}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="sys-apps/texinfo"
+
+DOCS=( README NOTES )
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp_src_compile
+
+	emake -C doc
+}
+
+src_test() {
+	emake EMACS=${EMACS} check
+}
+
+src_install() {
+	elisp_src_install
+
+	doinfo doc/${PN}.info
+	dodoc -r doc/${PN}
+
+	insinto ${SITEETC}/${PN}
+	doins -r examples
+}
diff --git a/app-emacs/webpaste/Manifest b/app-emacs/webpaste/Manifest
new file mode 100644
index 000000000000..1741cf57e58a
--- /dev/null
+++ b/app-emacs/webpaste/Manifest
@@ -0,0 +1,4 @@
+AUX 50webpaste-gentoo.el 353 BLAKE2B a41e53efc15304c461cd66f270ac0e51d73c7031820b60e3c9a64c90391fac7dd8cf3d0835302765279aa258bd346f516c90a6767f29072aa55964fed8650beb SHA512 f72a29ebf5914bca572b1c7ab640cab7efa5ef577344644bd5d7708812015de33335fb2cd33434198b59e887f225a0ac0b0980821aceab0a0f0ae9b3bed3a713
+DIST webpaste-3.2.2.tar.gz 27171 BLAKE2B cf766d1eeca07747043a3157da8cb954c63c142531b5e156d5255fb0ec556b59780c463bd6f77763aa42625eb15f4aee75375a0e67c0883000e14eeb0023b6b8 SHA512 700ca6ed2c0171e6c5b4047e2d5db3af04d7196daae93d5705709f0ae92eec268da5fd4818b13c35e73ee839e739d95010efc3c20c4e32e87bccef8becdff810
+EBUILD webpaste-3.2.2.ebuild 748 BLAKE2B 1cdd8b08f19b0746ff8ffab1d0d302fe74f2ccda3029eba9314612eb85440edc020704d52de0e4d8ad185ab9fc5fd06e1121e24f511a840921908476d4e7afa1 SHA512 976f54a1a29eab9bd8d01d6ac3426ff3a5b89ff52ff0d5aff681530c4e604cbcdc543ba36706f0a578d9d851f3dd72b3c86046eaf5b065539eaf06e07a96bbfe
+MISC metadata.xml 707 BLAKE2B 2a5e9d796124dbb9e5f120e69bb47cc9b35e89283ae162978a714460ec5e80ac89a25900920bbd3d00e698319f11dc15c19bd26652710e9ae1b174dff7e45c21 SHA512 bd8bc4f74f19a6a86cb87350d4091b16f6b1a369fe2522be964612d3f6391388715e604ef0881b15cc7d28a1347b21d26b2d968d4eab0ac1bbcf8c652b93628e
diff --git a/app-emacs/webpaste/files/50webpaste-gentoo.el b/app-emacs/webpaste/files/50webpaste-gentoo.el
new file mode 100644
index 000000000000..8f041e6e0d86
--- /dev/null
+++ b/app-emacs/webpaste/files/50webpaste-gentoo.el
@@ -0,0 +1,7 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'webpaste-paste-region "webpaste"
+  "Paste selected region to some paste service." t)
+(autoload 'webpaste-paste-buffer "webpaste"
+  "Paste current buffer to some paste service." t)
+(autoload 'webpaste-paste-buffer-or-region "webpaste"
+  "Paste current buffer or selected region to some paste service." t)
diff --git a/app-emacs/webpaste/metadata.xml b/app-emacs/webpaste/metadata.xml
new file mode 100644
index 000000000000..fd5814f2d240
--- /dev/null
+++ b/app-emacs/webpaste/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="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <upstream>
+    <changelog>https://github.com/etu/webpaste.el/releases/</changelog>
+    <bugs-to>https://github.com/etu/webpaste.el/issues/</bugs-to>
+    <remote-id type="github">etu/webpaste.el</remote-id>
+  </upstream>
+  <longdescription>
+    Webpaste.el allows to paste whole buffers or parts of buffers to
+    pastebin-like services. It supports more than one service and will failover
+    if one service fails.
+  </longdescription>
+</pkgmetadata>
diff --git a/app-emacs/webpaste/webpaste-3.2.2.ebuild b/app-emacs/webpaste/webpaste-3.2.2.ebuild
new file mode 100644
index 000000000000..1d7054734a31
--- /dev/null
+++ b/app-emacs/webpaste/webpaste-3.2.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24.4
+
+inherit elisp
+
+DESCRIPTION="Paste parts of buffers to several pastebin-like services from Emacs"
+HOMEPAGE="https://github.com/etu/webpaste.el/"
+SRC_URI="https://github.com/etu/${PN}.el/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}.el-${PV}
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-emacs/request"
+BDEPEND="
+	${RDEPEND}
+	test? ( app-emacs/buttercup )
+"
+
+DOCS=( README.org )
+# Remove failing tests
+ELISP_REMOVE="tests/unit/test-webpaste-provider-creation.el"
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	buttercup -L . -L tests tests/unit || die
+}
diff --git a/app-emacs/xelb/Manifest b/app-emacs/xelb/Manifest
new file mode 100644
index 000000000000..867a7edce0e2
--- /dev/null
+++ b/app-emacs/xelb/Manifest
@@ -0,0 +1,4 @@
+AUX 50xelb-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST xelb-0.18.tar.gz 127797 BLAKE2B d438bea5142dc233d272959e9ca683d55cf1b61a97b002bf6864425a83c9238fca37aa7387f38dac3c3c8064b9ca8c5a64f934ef60360273df1453a152778785 SHA512 72048e12028811b5beb206102bef27b519bf0524e801f2eec5b3eac8dee785a99dc165e6ecafe14680a5fc0025d7d720db76df5fbbcb9a65070402a29de6ad0b
+EBUILD xelb-0.18.ebuild 462 BLAKE2B 44b80dc2dabcab18caba4c441d015bd3e65a3b6a9632854087c667c6103910d19d3f69c23db55037d5ed3b52756d6f7a07c274079c8b83a98fc6922e71df9545 SHA512 90b0d32597973628ac8205b806cdd0ba95cce5b08fec7ec2c363fe69219bc99ba02ec16554536f20b884463b2f0a3cdbfad51592f620f6d0dfd4c5e28e173ccd
+MISC metadata.xml 411 BLAKE2B e2dfea920c3c12451849e50b06e7477710085df45b8f36297b0d23afbe04f037e19b4aeef855209d465fab0b409e835ed81d6c40f1ab22397039ef0d75c8ae08 SHA512 29f389c3190ed2a58c914a5e4cabf81234b88c9dbdfa1f11d611b3c86bbcfe768e397c9dd4a46e01908d07ce4ba2af553ef4856713065e6b3fb2780ba560f2a4
diff --git a/app-emacs/xelb/files/50xelb-gentoo.el b/app-emacs/xelb/files/50xelb-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/xelb/files/50xelb-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/xelb/metadata.xml b/app-emacs/xelb/metadata.xml
new file mode 100644
index 000000000000..1591137fb9e2
--- /dev/null
+++ b/app-emacs/xelb/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/ch11ng/xelb/issues/</bugs-to>
+    <remote-id type="github">ch11ng/xelb</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/xelb/xelb-0.18.ebuild b/app-emacs/xelb/xelb-0.18.ebuild
new file mode 100644
index 000000000000..04e2fdea468f
--- /dev/null
+++ b/app-emacs/xelb/xelb-0.18.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24.4
+
+inherit elisp
+
+DESCRIPTION="X protocol Emacs Lisp Binding"
+HOMEPAGE="https://github.com/ch11ng/xelb/"
+SRC_URI="https://github.com/ch11ng/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-editors/emacs[gui]
+	x11-apps/xauth
+"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
author	V3n3RiX <venerix@koprulu.sector>	2022-05-12 16:42:50 +0300
committer	V3n3RiX <venerix@koprulu.sector>	2022-05-12 16:42:50 +0300
commit	752d6256e5204b958b0ef7905675a940b5e9172f (patch)
tree	330d16e6362a49cbed8875a777fe641a43376cd3 /app-emacs
parent	0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff)