gentoo resync : 29.12.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-06-29 12:04:12 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-06-29 12:04:12 +0100
commit: 0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree: 037df795519468a25d9362b4e95cdaeb84eb1cf9 /app-emacs
parent: 752d6256e5204b958b0ef7905675a940b5e9172f (diff)
199 files changed, 2118 insertions, 810 deletions
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index a0efaf6b6400..8afe3b3fdb98 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/assess/Manifest b/app-emacs/assess/Manifest
new file mode 100644
index 000000000000..20c593451ff1
--- /dev/null
+++ b/app-emacs/assess/Manifest
@@ -0,0 +1,4 @@
+AUX 50assess-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST assess-0.6.tar.gz 20771 BLAKE2B 29e8f84c20575314271d9a08ed3ac93f28f1c1b5c2df2ac35e397226f4eea033210ff9b96c90a282a44c60e301f5abc38be88efc74c21a2a7fdc29340d6d43e5 SHA512 ff50731867646f07b8c6f3edd1123695d008fa5265ab8b3543cbf32a54a4a0415a91304067e0dacf53890850b56377594802c9763601616bd828316f7a8cef69
+EBUILD assess-0.6.ebuild 757 BLAKE2B e420aca0039852949fdd2878b5e253801847c5dd649d98f6d1cf96d34149976787778a1e985c6bdcc4c73b9ff2259b487a2d515b07a3e9509316b869790e6304 SHA512 ab5fd569b9aaa428171ed4a6737bbb3ef23243dafc3deeaab0e7382757de1d2f6e366f92baebd297e65108224231022e542f2d8b644c6b242e84ed859b048ecc
+MISC metadata.xml 1095 BLAKE2B e29668af7cd5fd16e5ac06dc874692b9a480561a569b70d61091eeaeb39a60d69e121b1732bd0bbde9548779f9cca5587032fd8a57f86449001e47abbd392329 SHA512 9d61d5ab2005666ae61375726527ae35b7450d04653ab2171d86da7c12e5f6844ad1311a8772e82705f56851832f9306b29b81f71c789fe438ed26194f5b351a
diff --git a/app-emacs/assess/assess-0.6.ebuild b/app-emacs/assess/assess-0.6.ebuild
new file mode 100644
index 000000000000..6d09c2dc615c
--- /dev/null
+++ b/app-emacs/assess/assess-0.6.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="Test support functions for Emacs"
+HOMEPAGE="https://github.com/phillord/assess/"
+SRC_URI="https://github.com/phillord/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-emacs/m-buffer"
+BDEPEND="
+	${RDEPEND}
+	test? ( app-emacs/load-relative )
+"
+
+DOCS=( README.md )
+
+# Remove a test helper accessing the network, luckily unnecessary
+ELISP_REMOVE="test/local-sandbox.el"
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	${EMACS} ${EMACSFLAGS} -L . -L test \
+			 -l assess-discover -f assess-discover-run-and-exit-batch || die
+}
diff --git a/app-emacs/assess/files/50assess-gentoo.el b/app-emacs/assess/files/50assess-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/assess/files/50assess-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/assess/metadata.xml b/app-emacs/assess/metadata.xml
new file mode 100644
index 000000000000..79e64c29fbc3
--- /dev/null
+++ b/app-emacs/assess/metadata.xml
@@ -0,0 +1,24 @@
+<?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>
+    Assess provides additional support for testing Emacs packages. It provides:
+    a set of predicates for comparing strings, buffers and file contents,
+    explainer functions for all predicates giving useful output, macros for
+    creating many temporary buffers at once, and for restoring the buffer list,
+    methods for testing indentation, by comparison or "roundtripping", methods
+    for testing fontification.
+    Assess aims to be a stateless as possible, leaving Emacs unchanged whether
+    the tests succeed or fail, with respect to buffers, open files and so on;
+    this helps to keep tests independent from each other.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/phillord/assess/issues/</bugs-to>
+    <remote-id type="github">phillord/assess</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/auctex/Manifest b/app-emacs/auctex/Manifest
index e2ffc49e32bd..58b902601f5e 100644
--- a/app-emacs/auctex/Manifest
+++ b/app-emacs/auctex/Manifest
@@ -1,11 +1,7 @@
 AUX 50auctex-gentoo.el 157 BLAKE2B c7d59a1ff3fc08b60332f5f578841c942d1a302f9a594409b3cd6509fd254c0d8d4273061d2ec4f444ad9288b073900e4c07e9307ffe0421182e7380c4c73543 SHA512 7cfc10c95da1d920b3861eaa9950d5ddd2388af5086cb81457f084f9c094b15dae9638a8c1e9b662dedba90c2d3c33a972011b99d9e2d71d85f99003de5ebef2
 AUX 60auctex-gentoo.el 97 BLAKE2B 18cad086f4211844f8a32d0f2499d2ecf29cd41f90c9dee6cf87184f81b0ac3836a5a58705677b55f926bdeb5854aa9acd6438f42e29856acf6c6c644592e347 SHA512 2cf945ac36ad5b25afd723d04223556522ac901a469bdd47d0c7562beb985401df957acc100222df6d97f4335b6d3e8d003f6b00b86780eec0a906ff0fc2ccb4
-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
+EBUILD auctex-13.1.ebuild 1445 BLAKE2B 08a86f8f5ce3b0856156157f0971855da02af277e637224d552805f71b9890d058a58206c5854db1b3c3b4df2a7398d5469ba09741d87d253ec4fec5605ad709 SHA512 fad87a6058bc13095739e0e80c4811d7d3cf1a3806f6af8263cccf6519a069f80f9f541298b40859e4a0655c8c092d64ed7c3b4ec63ff690b6f107561d97a041
 MISC metadata.xml 948 BLAKE2B 8b8d66912a4b4cc3c19413b3cda303b083dea2d7ff18e8d36ff7203a836de192acdaff00c10f9e8bd367d526e717da60d8069f80b596507988bc7e5528305bd9 SHA512 12e6afbe2f695fb822ac10e50212951975858a7aed152d523602195933b359788979b1c4d658b63a0271edb325c5156343db3e318a374f921094c5b989e3181f
diff --git a/app-emacs/auctex/auctex-11.92.ebuild b/app-emacs/auctex/auctex-11.92.ebuild
deleted file mode 100644
index 9765cb7d27a6..000000000000
--- a/app-emacs/auctex/auctex-11.92.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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"
-
-DEPEND="virtual/latex-base
-	preview-latex? (
-		app-text/dvipng
-		app-text/ghostscript-gpl
-	)"
-RDEPEND="${DEPEND}"
-
-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/auctex/auctex-12.2.ebuild b/app-emacs/auctex/auctex-12.2.ebuild
deleted file mode 100644
index 6ce7fec4acc6..000000000000
--- a/app-emacs/auctex/auctex-12.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-NEED_EMACS=24
-
-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/auctex/auctex-13.1.ebuild b/app-emacs/auctex/auctex-13.1.ebuild
index 64b85674a975..85bec5cd7b70 100644
--- a/app-emacs/auctex/auctex-13.1.ebuild
+++ b/app-emacs/auctex/auctex-13.1.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="preview-latex"
 
 RDEPEND="virtual/latex-base
diff --git a/app-emacs/auto-complete/Manifest b/app-emacs/auto-complete/Manifest
index 7cf8a714de87..879b222acf92 100644
--- a/app-emacs/auto-complete/Manifest
+++ b/app-emacs/auto-complete/Manifest
@@ -1,4 +1,4 @@
 AUX 50auto-complete-gentoo.el 157 BLAKE2B abf93b1a7c9bb3d2ebabacf66c40e3177fc611330f902ef446ae31ed7f140c8fbbc68f35b40b84e83a002fe83e998d393ea4c38ed5e251f6edae08dc0adacb27 SHA512 40d03bf5dbd718aeab5d5f1ad0a15b24bebc86f641570611facf79f58f4a370da2ef1a5ca6edbbcec35d2530bdf5bf097c19c7f56c0c8f81eefa0df1a8dc01b0
 DIST auto-complete-1.5.1.tar.gz 196709 BLAKE2B 1593a6c0b60d9cb25a9597b7283d741042f79d0227c3865386a5d74e03d216a7e96ba7304e23148ac6bd18deb30f36777b88c4b3227b7482f28a224fd027b7b9 SHA512 e01a99d5e393d1d2309d6c616b4af34e8f3f2c585eaefad602ba5b6cf1890a18e851fd58804c4a6669c8131e9e7a5470c7aa650583a0bc1a2298875f7181614e
-EBUILD auto-complete-1.5.1-r1.ebuild 829 BLAKE2B e9c2f1a4bf0c1ee92bf797ffdf9c04090b2b12708b96f55f27f5ab4327708ad94d56e615395a24c7439d31074f4dd7d48fc55d33b6f2d058dc63309839d8aa2e SHA512 69bf9399dc4a1bf2d49f7a6ee3f5fda2ccc330df57b7b8c88c4b7c27c599ed4b96fb316834a3d77d11a86b6b3ed6073b91360041c18d6a3cc6a4821be6688321
+EBUILD auto-complete-1.5.1-r2.ebuild 828 BLAKE2B ff02e3041166dce477ad24a10603a45db4f0b98f97d39b3040243fdd7afc4706419d45c302dbe862e6acb3e7e364fb074c2891ac3c6243f4315010d6c5bb859e SHA512 3e508389b0a69bb56aa5a332980068b84599abfe22947e3e6c227d78bba2c3cf48cb4615e7fc7792587b1c881050965763422c787060037716c07dc6d73e5f23
 MISC metadata.xml 621 BLAKE2B 2d29871551d01ec0c90adc4f5a299c27d5813e62cf32e993d3671ab3be2b0a4cf3e114645262c224d96563eb345d8d99c4dbf17feba669ce3cca337f889b5978 SHA512 b48f173b0061333df79e3f0e2f86c9ed03329ead6b9849ede49add67b85c8f419d733773a11b535bdc388d70aca05be95246c07809f8f8931ab9e9adf8962881
diff --git a/app-emacs/auto-complete/auto-complete-1.5.1-r1.ebuild b/app-emacs/auto-complete/auto-complete-1.5.1-r2.ebuild
index 506527eb2d96..c575c9e9c2a9 100644
--- a/app-emacs/auto-complete/auto-complete-1.5.1-r1.ebuild
+++ b/app-emacs/auto-complete/auto-complete-1.5.1-r2.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
@@ -17,7 +17,7 @@ RESTRICT="test"
 
 RDEPEND="app-emacs/popup"
 BDEPEND="${RDEPEND}
-	doc? ( app-text/pandoc )"
+	doc? ( virtual/pandoc )"
 
 ELISP_REMOVE="${PN}-pkg.el"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/bbdb/Manifest b/app-emacs/bbdb/Manifest
index 838286dffd00..49ec620d2f2b 100644
--- a/app-emacs/bbdb/Manifest
+++ b/app-emacs/bbdb/Manifest
@@ -3,8 +3,6 @@ AUX 50bbdb-gentoo-3.2.el 149 BLAKE2B 7db122f83411995801b658f05dcda71d8eb5382ed1d
 AUX bbdb-3.1.2-no-init.patch 4709 BLAKE2B 3e38c67d8347a8c6202ecddfa68847f0c9feab1593d84e5564607b3d9da104af93b5bb0862e899386555dd1abe5f8b7894c71575fc6a750db2e4332c5ad9c204 SHA512 3f262323cb35636d0249aafa54ff2a2e462df803d19c356bf2b7ed6a68410fa6e6bc41298a1e7fbeef224c84cf4bf9f80ff1ae068c5226ac6bea3ec62d593355
 DIST bbdb-3.1.2.tar.gz 378935 BLAKE2B 3fc862d2d68632c997e3f250aa82cced743c3cc3861c74789bb12015ab99745270c79722dc0342334b90f4dd9071ef809ab670a342ac227c24a927870907c25c SHA512 8b32baadc4eb06b0abf533ccb1f540f4f407f27b8d2e847ae25e62d1405e1de5cfc6af16368eecd4086f281ee7a4016cf25568847b3cb798156c7e18e1912576
 DIST bbdb-3.2.2a.tar.gz 198749 BLAKE2B 9f9bf9eb1414f66e19ab4e0771275cb15716257019063874000adfd3de56d047f531c440f585def481c79bf69b06b2fa1edb5b6f42ad0619bfb44318fdde9a3c SHA512 767aa7a046a9456dbf0b622a6efabe5c1d87c0022507b3bb6bec07be54e57a7285a9fe39f870599a248d5e78883300de870c168dc9918c2d1a139ef31fd53ac8
-DIST bbdb-3.2.tar.gz 189456 BLAKE2B b25efd6a3a156684e0a8f15db056683876c8dd1a44eb585db269746c7424cc18df5407e3a04defcbbd8a2c8438bbe2b16d55ab290e842951f6e475bfc34871fe SHA512 593ba5143b50f2818c19c94452efb2c5d7194ed5dc8deecf1d380da4f80e0fad2542b9a7ee68d8baca2bc2bfd84fa0459eb3cd18faaf998eb0956fcfb62dc5c8
 EBUILD bbdb-3.1.2-r2.ebuild 1236 BLAKE2B 4fe817fd96846ec01e582eb9852b5e8bfd2ff695206b67ecbb6f47cda5eff6627efaeec21d7b99e87e35c1b499f9fe42dc4e89fb11a60e3956410d96f2f5ccd5 SHA512 ce494c3108c49a36f09160e023575351daad22b0ae4f42c9cc1732019cdaaf6fbff0da245ab4ef8aa4833c0d9d6dfe5ea2b65d6e370702a9c396695a69596f96
-EBUILD bbdb-3.2.2a-r1.ebuild 1556 BLAKE2B 159c0827029cd99e7ff0a72668f77eab21672f558e5cf094be069f88d5e304cb58b5c9f072638bcae0e6420c02041f6edffe5591d908dab24d9b942992891cc6 SHA512 4f15ee84b37f6bdd7f593e12c002aa2a3fba65f5d087f7217fdb6bcc9abec2c5d9b7056758b36ac1f4db6666bcbb8df9b0701e7d2a461561d006315200a7eb77
-EBUILD bbdb-3.2_pre20180106.ebuild 1320 BLAKE2B 2436f1a584f6d6abaf66d03c6f8ce9ef5c15aea1010eca6f61661f53fa7e9c2cc39795ec2c2a5659fb5561075be00a2199be208d75032d14b9c42b4a21ac7e0e SHA512 11d3cdd4035e1b2537de3fd4855a51fc94c29477216ae700183efff69d4ac64dc1d307f4941ee71fde79d376718e3c7faf2e4458637e45173d033ec9fbaad21c
+EBUILD bbdb-3.2.2a-r1.ebuild 1553 BLAKE2B 43bc79c22aa12b2abf422087e8210ff02d0aa550c81d9300409a7f79c7fec3a5ba630f3e1007ef73254e6831ea83934d3e4ef583373cb33745862daf3a54c10e SHA512 b8e08a3ebfdf6a7dd9c48bbeb8c3550771c2b130e4d0db0e1f2704687647a9a3c7b62db7d189ca2340f0d52bdc2cae4b8ef159fcd4f12ff16a23db561a5c64d6
 MISC metadata.xml 835 BLAKE2B 8079066283e974e301b6f75a0a61907634425cb0b0e1406aaf80003c07b562b93c0e5deabfc6273443f36b7667215f7840ff8bd54febb862ffc23ebb1bb669dc SHA512 2921d9e1f452a42c1752a4f2d533f8ad1eba3a08d48855c8bc81e1b3532990a4728adbfdb4cde12b83b19e02f395bcf2293600ad670a4bcf8b036179e7e783fa
diff --git a/app-emacs/bbdb/bbdb-3.2.2a-r1.ebuild b/app-emacs/bbdb/bbdb-3.2.2a-r1.ebuild
index 25ffb5ede6b0..492f9d913f89 100644
--- a/app-emacs/bbdb/bbdb-3.2.2a-r1.ebuild
+++ b/app-emacs/bbdb/bbdb-3.2.2a-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://git.savannah.nongnu.org/cgit/bbdb.git/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-3+ FDL-1.3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="doc tex vm wanderlust"
 RESTRICT="test" #631700
 
diff --git a/app-emacs/bbdb/bbdb-3.2_pre20180106.ebuild b/app-emacs/bbdb/bbdb-3.2_pre20180106.ebuild
deleted file mode 100644
index 8dc25fd9b6bd..000000000000
--- a/app-emacs/bbdb/bbdb-3.2_pre20180106.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit elisp autotools
-
-MY_P="${P%_pre*}"
-DESCRIPTION="The Insidious Big Brother Database"
-HOMEPAGE="https://savannah.nongnu.org/projects/bbdb/"
-#SRC_URI="https://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz"
-SRC_URI="https://git.savannah.nongnu.org/cgit/bbdb.git/snapshot/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3+ GPL-1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE="tex vm"
-RESTRICT="test" #631700
-
-BDEPEND="vm? ( app-emacs/vm )"
-RDEPEND="${BDEPEND}
-	tex? ( virtual/latex-base )"
-
-SITEFILE="50${PN}-gentoo-3.2.el"
-TEXMF="/usr/share/texmf-site"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
-		"$(use_with vm vm-dir "${EPREFIX}${SITELISP}/vm")"
-}
-
-src_compile() {
-	emake -C lisp
-}
-
-src_install() {
-	emake -C lisp DESTDIR="${D}" install
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	dodoc AUTHORS ChangeLog NEWS README TODO
-
-	if use tex; then
-		insinto "${TEXMF}"/tex/latex/${PN}
-		doins tex/bbdb.sty
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	use tex && texconfig rehash
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	use tex && texconfig rehash
-}
diff --git a/app-emacs/biblio/Manifest b/app-emacs/biblio/Manifest
new file mode 100644
index 000000000000..658b389fcb1f
--- /dev/null
+++ b/app-emacs/biblio/Manifest
@@ -0,0 +1,5 @@
+AUX 50biblio-gentoo.el 81 BLAKE2B 16a0d5099e2e7ee01db6072a462a90d523b32da123837123c01ff429bfa633b7bd7f6672d99a4df5a922c03bfe18bb3b47cc62f25b58df157ff6cd711a338a09 SHA512 035b49cd150dbb799a14dbcded10c7e5e029a75cfecac5b117644d914f7bb0014e539f4b194a3bbdfe27bb30a519496851831e0ceb36f4c6112027f60e8afd35
+AUX biblio-0.2-tests.patch 2517 BLAKE2B da75066679c09a93f190de90dad09433fc5c4956ef378f534e6022a7e8cbeed43fbc5a7ca8c11dc4879bd314c38c7084a63e4f1cb02736bd8842e267a3b6a33b SHA512 b9ba2774e65ca431dddfe64136d0d64796723b3f6dbc56e21730d3a7d5da307d33a5ba9de9b3a6c638f082ba21273a38975c7eb02dab41ca7e7e9d9d406b6aac
+DIST biblio-0.2_p20210418.tar.gz 205374 BLAKE2B f649cd5130ce79fae346e7121e1be87d2b596a66ca23f27ccb33f0b2fce9bddfbbeda2a41c79084c91f359235dd3806befa1e2e86c6015df132657c24eb1f6b6 SHA512 5245386cd95c2334a49a139c93ec6107378ebd4154d0263f5b982d0a027c8cf116bf8f89d25348e0d82b540f6672889b3325df4fff3573f2262da493431f2a10
+EBUILD biblio-0.2_p20210418-r1.ebuild 973 BLAKE2B fae80d731582ccb3a66cfb62ec2b3ec27dd3ef755302cfe36fb77408951556cf54a186c483181b446a241c9a800d395eafb00f2d63dd1ad28249ca32a86a6e92 SHA512 72e795df4b7d441edd5dc50088764a3488ae6af5242e59ef22a45e9f78ec7ddac825eba5abb25f66bb2a97c35e7336aac19a9a254c91f1cdd43bc815596e36fa
+MISC metadata.xml 705 BLAKE2B f7615e5e1e03a4f79a25c8fc1713eaa25fd1e3b0b8d78a1ce47137529232dc9433cf0a78328356da4e814de71e9b76acbfe1b6895db4ad87254137ffea6b44ca SHA512 ad932d5f0d70207b43b126d17ce7552805734c591581f6ac490b79fff936a3daa65b33e4596ea06a72e05f1b2186099946d38f74b99a096c1e3c9518bbde3c8e
diff --git a/app-emacs/biblio/biblio-0.2_p20210418-r1.ebuild b/app-emacs/biblio/biblio-0.2_p20210418-r1.ebuild
new file mode 100644
index 000000000000..af3f87de6b95
--- /dev/null
+++ b/app-emacs/biblio/biblio-0.2_p20210418-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# NOTICE: This package contains libraries: biblio-core and biblio
+
+EAPI=8
+
+H=517ec18f00f91b61481214b178f7ae0b8fbc499b
+NEED_EMACS=24.4
+
+inherit elisp
+
+DESCRIPTION="Browse and import bibliographic references with Emacs"
+HOMEPAGE="https://github.com/cpitclaudel/biblio.el/"
+SRC_URI="https://github.com/cpitclaudel/${PN}.el/archive/${H}.tar.gz
+			-> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}.el-${H}
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-emacs/dash"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		app-emacs/buttercup
+		app-emacs/noflet
+		app-emacs/undercover
+	)
+"
+
+DOCS=( README.md etc )
+PATCHES=( "${FILESDIR}"/${PN}-0.2-tests.patch )
+
+ELISP_REMOVE="${PN}-pkg.el"
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp_src_compile
+	elisp-make-autoload-file
+}
+
+src_test() {
+	buttercup -L . -L tests --traceback full tests || die
+}
diff --git a/app-emacs/biblio/files/50biblio-gentoo.el b/app-emacs/biblio/files/50biblio-gentoo.el
new file mode 100644
index 000000000000..c107edfe34b6
--- /dev/null
+++ b/app-emacs/biblio/files/50biblio-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(load "@SITELISP@/biblio-autoloads" nil t)
diff --git a/app-emacs/biblio/files/biblio-0.2-tests.patch b/app-emacs/biblio/files/biblio-0.2-tests.patch
new file mode 100644
index 000000000000..eab6e9b50581
--- /dev/null
+++ b/app-emacs/biblio/files/biblio-0.2-tests.patch
@@ -0,0 +1,43 @@
+index d393c1a..866815a 100644
+--- a/tests/biblio-tests.el
++++ b/tests/biblio-tests.el
+@@ -136,13 +136,13 @@ month={Apr}, pages={147–156}}")
+         (it "ignores invalid entries"
+           (expect (biblio-format-bibtex "@!!") :to-equal "@!!")
+           (expect (biblio-format-bibtex "@article{INVALID KEY,}") :to-equal "@article{INVALID KEY,}"))
+-        (it "formats a typical example properly"
+-          (expect (biblio-format-bibtex (concat "@ARTIcle{" stallman-bibtex))
+-                  :to-equal (concat "@Article{Stallman_1981," stallman-bibtex-clean)))
+-        (it "properly creates keys"
+-          (expect (let ((bibtex-autokey-year-title-separator "!"))
+-                    (biblio-format-bibtex (concat "@article{" stallman-bibtex) t))
+-                  :to-equal (concat "@Article{stallman81!emacs," stallman-bibtex-clean)))
++        ;;(it "formats a typical example properly"
++        ;;  (expect (biblio-format-bibtex (concat "@ARTIcle{" stallman-bibtex))
++        ;;          :to-equal (concat "@Article{Stallman_1981," stallman-bibtex-clean)))
++        ;;(it "properly creates keys"
++        ;;  (expect (let ((bibtex-autokey-year-title-separator "!"))
++        ;;            (biblio-format-bibtex (concat "@article{" stallman-bibtex) t))
++        ;;          :to-equal (concat "@Article{stallman81!emacs," stallman-bibtex-clean)))
+         (it "replaces the “@data{” header"
+           (expect (biblio-format-bibtex (concat "@data{" stallman-bibtex))
+                   :to-match "\\`@misc{"))
+@@ -153,12 +153,12 @@ month={Apr}, pages={147–156}}")
+           (let ((biblio-cleanup-bibtex-function nil))
+             (expect (biblio-format-bibtex (concat "@techreport{" stallman-bibtex))
+                     :to-equal (concat "@techreport{" stallman-bibtex))))
+-        (it "doesn't set the BibTeX dialect globally"
+-          (with-temp-buffer
+-            (bibtex-mode)
+-            (let ((bibtex-dialect 'aaa))
+-              (biblio-format-bibtex (concat "@techreport{" stallman-bibtex))
+-              (expect bibtex-dialect :to-equal 'aaa))))
++        ;;(it "doesn't set the BibTeX dialect globally"
++        ;;  (with-temp-buffer
++        ;;    (bibtex-mode)
++        ;;    (let ((bibtex-dialect 'aaa))
++        ;;      (biblio-format-bibtex (concat "@techreport{" stallman-bibtex))
++        ;;      (expect bibtex-dialect :to-equal 'aaa))))
+         (it "uses font-lock-ensure when available"
+           (unless (functionp #'font-lock-ensure)
+             (let ((called-p t))
diff --git a/app-emacs/biblio/metadata.xml b/app-emacs/biblio/metadata.xml
new file mode 100644
index 000000000000..d53736a0d6a5
--- /dev/null
+++ b/app-emacs/biblio/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>
+  <longdescription>
+    biblio.el makes it easy to browse and gather bibliographic references and
+    publications from various sources, by keywords or by DOI. References are
+    automatically fetched from well-curated sources, and formatted as BibTeX.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/cpitclaudel/biblio.el/issues/</bugs-to>
+    <remote-id type="github">cpitclaudel/biblio.el</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/cask-mode/Manifest b/app-emacs/cask-mode/Manifest
new file mode 100644
index 000000000000..5be59b41b99a
--- /dev/null
+++ b/app-emacs/cask-mode/Manifest
@@ -0,0 +1,4 @@
+AUX 50cask-mode-gentoo.el 170 BLAKE2B 04561e2a93cf163bd9ca76286df64d1876c808f470c59b3072dc4427b0047fe5cc8307a915e83bb429f8b54708c42d17ff581431a494d5892106836c07bfe052 SHA512 753fe32c4a3586fceba21c914c479fedb09c2d97ab1d5863c65a4003b06addc7d6afa9794492426035930c191691e423a56612679d2816e14c8d86289be483c1
+DIST cask-mode-0.1.tar.gz 42693 BLAKE2B 07c3cd998aee36d275c0d3d5dfdb190a1ad59aaa72695272e7dc33e410413de6723003ae28f30e91f96f0ea95142e97cf7fda28a1986fbd509bd281de91693c1 SHA512 4b9861e9fb5a69db476a32b3cc2cfec8e9418d618cb2e348f1476d6aefa22615c539dd3666914be5c42aed1370d5835c7b78775d3bb4578df845b16dbda91727
+EBUILD cask-mode-0.1.ebuild 776 BLAKE2B 8a1807e06e341a9d81ca16e933afa799e9b29041b5f19d86a931f4991ed7e14dc55064d89e27e509c394149e7b68186c65a1a1331a4f025d733f842779c586d8 SHA512 6255204eae137c53bd20a73c85a3a4322092c8c10ba986407bc47de11bdbc4c2d1c0c03197b5ce7a4095a68c86ec0f2ecc09fe161d5837f55cb14c3711158346
+MISC metadata.xml 589 BLAKE2B 87f0bec7c6825e5403cb8e70d92f86b3588e77cdc56eeaa1eff06a76fd337a9291b86aa07da97c8d46a103e4977977008ce70cdb3ce8f793a7baf2639869360b SHA512 0635c793aed24cf5a2c4bfc3c6d699cd9c12e423cbaaa6d708be506daa66f92fb8b01488934041a017069dc80bf0dd1d476a0f2dbb1bcf56c82cba9963995abe
diff --git a/app-emacs/cask-mode/cask-mode-0.1.ebuild b/app-emacs/cask-mode/cask-mode-0.1.ebuild
new file mode 100644
index 000000000000..e2eb648d65ea
--- /dev/null
+++ b/app-emacs/cask-mode/cask-mode-0.1.ebuild
@@ -0,0 +1,40 @@
+# 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="Major mode for editing Cask files for Emacs"
+HOMEPAGE="https://github.com/Wilfred/cask-mode/"
+SRC_URI="https://github.com/Wilfred/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		app-emacs/assess
+		app-emacs/ert-runner
+	)
+"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	elisp_src_prepare
+
+	# Silence a broken test
+	sed "s|ert-deftest cask-mode-highlight-comment|lambda|" \
+		-i test/${PN}-test.el || die
+}
+
+src_test() {
+	ert-runner -L . -L test --reporter ert+duration --script test || die
+}
diff --git a/app-emacs/cask-mode/files/50cask-mode-gentoo.el b/app-emacs/cask-mode/files/50cask-mode-gentoo.el
new file mode 100644
index 000000000000..481b1b9dc272
--- /dev/null
+++ b/app-emacs/cask-mode/files/50cask-mode-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'cask-mode "cask-mode"
+  "Major mode for editing Cask files." t)
+(add-to-list 'auto-mode-alist '("/Cask\\'" . cask-mode))
diff --git a/app-emacs/cask-mode/metadata.xml b/app-emacs/cask-mode/metadata.xml
new file mode 100644
index 000000000000..9ffdb8cff63f
--- /dev/null
+++ b/app-emacs/cask-mode/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>
+  <longdescription>
+    cask-mode is a major mode for editing Cask files. It provides syntax
+    highlighting, comment toggling and indentation.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/Wilfred/cask-mode/issues/</bugs-to>
+    <remote-id type="github">Wilfred/cask-mode</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/commenter/Manifest b/app-emacs/commenter/Manifest
new file mode 100644
index 000000000000..9fdcf3526fad
--- /dev/null
+++ b/app-emacs/commenter/Manifest
@@ -0,0 +1,4 @@
+AUX 50commenter-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST commenter-0.5.2.tar.gz 2705 BLAKE2B 062b89892d4410b0964f8b540bac51574dab44ae5fdf42ef98b4286eb4183a82cd2c95bbcc7e3b04345351caf5feb4b31d50ee31bb6bd69f2f08d0ec0119deb1 SHA512 a2bdc675d39fedccc16b3cdde324a17588980bf66e899a8f58ed0e68d545ac955465bcad282dc4434a96baa340244f9b67e375c312a557dffafc20532dec4b51
+EBUILD commenter-0.5.2.ebuild 461 BLAKE2B 88b1dc883f6ed689a1dc79c240c209926849a8b5ae2e8a9e18df20cb4461da81d7b6492ca86919550279cd90307215647363bb10ce7566cfdafda718ecfbf560 SHA512 e7bb6c1f6a85c84e9cec83397fcd927ab32e01496697f7477c37bae9d259637c24ecd664411d446e8bf37caf51d55dd8479587cf5d203f4b4d277122aa4ac7b1
+MISC metadata.xml 431 BLAKE2B 3628e467f2ae78d5868bb13fd5ac783b9cd8093e10e439125e23cc70332bc80de67e1975a19ed72bd7ce844c24f1066dee551cd13d0a8dfb3ee8b25289451657 SHA512 46d8670b7ea727b662b5b122180483bc2e7451e5e13db22f549174d63fb9fe0e21461df4e47bf76484e5253d2595e310feeb3d02b79b127898a1582085a56203
diff --git a/app-emacs/commenter/commenter-0.5.2.ebuild b/app-emacs/commenter/commenter-0.5.2.ebuild
new file mode 100644
index 000000000000..36be4c950275
--- /dev/null
+++ b/app-emacs/commenter/commenter-0.5.2.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.4
+
+inherit elisp
+
+DESCRIPTION="Set both single and multi line comment variables in Emacs Lisp"
+HOMEPAGE="https://github.com/yuutayamada/commenter/"
+SRC_URI="https://github.com/yuutayamada/${PN}/archive/v${PV}.tar.gz
+			-> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/commenter/files/50commenter-gentoo.el b/app-emacs/commenter/files/50commenter-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/commenter/files/50commenter-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/commenter/metadata.xml b/app-emacs/commenter/metadata.xml
new file mode 100644
index 000000000000..309d07daa297
--- /dev/null
+++ b/app-emacs/commenter/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/yuutayamada/commenter/issues/</bugs-to>
+    <remote-id type="github">yuutayamada/commenter</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/compat/Manifest b/app-emacs/compat/Manifest
new file mode 100644
index 000000000000..c070f92af833
--- /dev/null
+++ b/app-emacs/compat/Manifest
@@ -0,0 +1,5 @@
+DIST compat-28.1.1.1.tar.gz 71771 BLAKE2B 48feaada7e32f07b425048f8b993b2936450dbed8ba20e0f6319d4b098bcc8007323416bf300221a00fb13ff152698c2beaeea6e743d46b1d32b9c0a016a895c SHA512 e733836934671cb373f70a92a20084622e160f2731c5e5c6ce9df348820261db399da0e78d6b95293d9b6992469e96298e9fe83e331a4caaa377fc6ce61f7040
+DIST compat-28.1.1.3.tar.gz 72597 BLAKE2B 82186713370fed7f97eb057cb330d77c1d758224ad37c0b7fbbd21221b0d2ffd68be805483f3e9577866f02079c83a5686918c87a1ed7c67c9acdd64aa3a560b SHA512 d65e5ce666607cd6d26cf771d6878caeb6641aff0fc924ec901955c1a03b6fe42e3527220448fa92a8d6c3f5bd65e6f915ed4ada1be01a29d7919f916826e48f
+EBUILD compat-28.1.1.1-r1.ebuild 480 BLAKE2B e0577d26c6c6724d8a7b631ef2856903ac2459657152fed6855eb769bb41834c948227a8a9ac8f0db2ce8911731817683646aae44ba9512fbd7ec520a0f0937b SHA512 718c6a0290929acf3487b6b824d59609fc3f7f4c9b5bd6d25c99f957a2de0412a73d47d86f483e09fae7ccb5486b3e0a287b999ee8fabceb892042ddab9c336b
+EBUILD compat-28.1.1.3.ebuild 996 BLAKE2B 659a6059db70cab8bd9e29255fe7b8ed207dd31e9e1d4858374dc0152f61bb318732d2bd4446dfa7ed25b126ef0b02b3e32c3c70438b86ca06ba8b88d88d0c06 SHA512 a7e0c0d0e24438e548d46cfb7f34f76772afe8dd41dbf4997db5d0026ba5ffd27cf097cd0e7901e80d730860e61afb55f14b17264cc5de41ab04a90bc8643dfa
+MISC metadata.xml 293 BLAKE2B 07085bc46a57a9592b46c4442f0ca6995a5d1857ce51bb85384d389114b3385b71f3977cfed5d7180fd574cc4211824a327c98f5f690a9d959320f9d960af88a SHA512 c3af1c6afe14f621f3d1689ea4fda1b7215c3dd9e3c578e45edda24cc4eae1ec11dc29d42d87c762f3c6decf9f9bdf356b109736d47951c9eaefcca8d9111d56
diff --git a/app-emacs/compat/compat-28.1.1.1-r1.ebuild b/app-emacs/compat/compat-28.1.1.1-r1.ebuild
new file mode 100644
index 000000000000..8964a682162d
--- /dev/null
+++ b/app-emacs/compat/compat-28.1.1.1-r1.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
+
+inherit elisp
+
+DESCRIPTION="Compatibility libraries for Emacs"
+HOMEPAGE="https://git.sr.ht/~pkal/compat"
+SRC_URI="https://git.sr.ht/~pkal/compat/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="sys-apps/texinfo"
+
+ELISP_TEXINFO="compat.texi"
+
+src_prepare() {
+	default
+	rm Makefile compat-tests.el || die
+}
diff --git a/app-emacs/compat/compat-28.1.1.3.ebuild b/app-emacs/compat/compat-28.1.1.3.ebuild
new file mode 100644
index 000000000000..8a61c3a356a2
--- /dev/null
+++ b/app-emacs/compat/compat-28.1.1.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=2c3233c0e09ef34176787b6e3da4319751ad91e7
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="Compatibility libraries for Emacs"
+HOMEPAGE="https://git.sr.ht/~pkal/compat/"
+SRC_URI="https://git.sr.ht/~pkal/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${H}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="sys-apps/texinfo"
+
+ELISP_TEXINFO="${PN}.texi"
+
+src_compile() {
+	emake compile ${PN}.info
+}
+
+src_test() {
+	local has_json="$("${EMACS}" ${EMACSFLAGS} --eval "(princ (fboundp 'json-parse-string))")"
+	if [[ "${has_json}" != t ]] ; then
+		local line
+		while read line ; do
+			ewarn "${line}"
+		done <<-EOF
+		Your current Emacs version does not support native JSON parsing,
+		which is required for running tests of ${CATEGORY}/${PN}.
+		Emerge >=app-editors/emacs-27 with USE="json" and use "eselect emacs"
+		to select that version.
+		EOF
+	else
+		emake test
+	fi
+}
diff --git a/app-emacs/compat/metadata.xml b/app-emacs/compat/metadata.xml
new file mode 100644
index 000000000000..3264e3c57176
--- /dev/null
+++ b/app-emacs/compat/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>
+  <stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/consult/Manifest b/app-emacs/consult/Manifest
index 9a879f244d23..1c000b995896 100644
--- a/app-emacs/consult/Manifest
+++ b/app-emacs/consult/Manifest
@@ -1,4 +1,6 @@
 AUX 50consult-gentoo.el 82 BLAKE2B 3443827f490db8caacfe842cc7f1d1315f3889dec007210f451909576a76139f70ac5795346a7a1b11befccd3152874fd3c86ad7a20c0fbf84f793f8deb595cd SHA512 dd2ba1149c847d95d6c54265bc03de36e198dfecedc10336f6879fb3a1fc9d92e2c6de190d4f9aaab6c3d15f268fb80e082b49b6e96165697ff786333a50a601
 DIST consult-0.15.tar.gz 90201 BLAKE2B 1652d5a2c1f559c67f6899fe26b221bfdf0599a20af7309e2dc57a4701a795c8decd2f878056297204611d045829ee1aa24ccb665e36c15f6a2a3a14eb81f382 SHA512 2b8926638c13633e2ccf48d63a3a76245d075694f046e20575e8c9bcce983a3610ef648374b01dbff4dbf97d116830040c8e76d9d75d05ca23278253e68138e5
+DIST consult-0.18.tar.gz 93440 BLAKE2B cc67e8cbc49846964114a8e01a10d41454fde2e4a2e98e3af315092fab5631ea1418f649eb92ca798672c0ea153dd2862b555aee6530a1baa84ac4050df7a3c6 SHA512 74005c211ba7af0cf3c0a06fdec8d85da111ea84edb4eef2c60d231ae6eb87905298ee8bbbcdac8bf8b13a21ed9070422383b93433e422d6ad6b743c8bc80938
 EBUILD consult-0.15.ebuild 456 BLAKE2B cc4edada3d2a580436f812bcee60e56015f354d10442fc63a9e48d4c57c77cae8f5bea75828478009b28049d715ba46e5042d37e8633f53fdadf70b98b4994d4 SHA512 9ec27b2cbc037a83b5ef583ca0d997863f1c993a6f200feadd9c0f914cd875b29d0194fdc118988e9345c233d0aba3cb869324cbe69016b3dd3bea3eb736e6cd
+EBUILD consult-0.18.ebuild 512 BLAKE2B 56b9e691d89d705a6cfee1850c3662f9e23b32d16d9066001c0b88dd2a9e3cbf1142b15f23ce13368300531556c66c69e9d10770495613d00dd93cdf3ef50fd3 SHA512 aedace27479c09512b196fc31d57e882967a5c95958c2d1f8e053866a41d6e7b2828a075127c149e97ff5512a53089e9602c3a0ae47f231186e276a16f699c84
 MISC metadata.xml 359 BLAKE2B 569bd0c5fe81610f0b67c94e8c431edddb5060800a6e22d0833a4d5f120df34545dc49c879c12a6522ccbe791472df47be42af97fbb228498e79d9e0893697f3 SHA512 8e01b569f019ea43209f43c783fd41b9661a7235d300363a9441179058b10921629cf8b891874c706d2c1ec106248f6c1e0a3501df7bfcdd02000d08f7997c29
diff --git a/app-emacs/consult/consult-0.18.ebuild b/app-emacs/consult/consult-0.18.ebuild
new file mode 100644
index 000000000000..d2a809943fab
--- /dev/null
+++ b/app-emacs/consult/consult-0.18.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=27
+
+inherit elisp
+
+DESCRIPTION="Consulting complete-read"
+HOMEPAGE="https://github.com/minad/consult"
+SRC_URI="https://github.com/minad/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=app-emacs/compat-28.1"
+BDEPEND="${RDEPEND}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp_src_compile
+	elisp-make-autoload-file
+}
diff --git a/app-emacs/corfu/Manifest b/app-emacs/corfu/Manifest
new file mode 100644
index 000000000000..c9bf7419822d
--- /dev/null
+++ b/app-emacs/corfu/Manifest
@@ -0,0 +1,4 @@
+AUX 50corfu-gentoo.el 80 BLAKE2B 030035947690cded0580337466f06e7561c996ef27d6dce32cacf28249e71f3a99083e1dcd68e8fb1e2d0bcff75a70881ca88c7f41128123876e6f34230235fa SHA512 cde0d90e0b8bafffafd8d79c6fb4bc7957d1c7e5a6eb86b2c2cdeb73910bfddb6b8b2985bd46af406e5d3f3d1e1205b37ac2bf8cb26aa3d052b06054ae7ba00e
+DIST corfu-0.25.tar.gz 38366 BLAKE2B 297c8c556d32ee9f0a42265bbcd9b7cdd19881b8d85a9c92b6be84cb52e5558996cb16da596d13349fd1c9c72c7b6247e003ab48fcc41fd4acbe2d151b8e2e90 SHA512 602a9072cfa6a75672e1879e8da95b59355cc720482c8946311446c5722d13d0db6171eab8d899b689a689fe306d11f9b063e6bdc07dc710d9ee8f6f15b5aeee
+EBUILD corfu-0.25.ebuild 521 BLAKE2B a4caf9986c9ee8edf59147fd748765f18c3dce07b6b573c6c8f9b79147449216aeba2ea33578789a10cdb491bd3714cdcd5ed6e0bfa82a2e956952ee821d113b SHA512 4efb8703c33148f8b9c508f5787594c6519e8dbed90cc4e3389d12d7ce3ad4fdae4687f19eead535183a791605fb2b55ef4202a82ac7e73cea34daa94a902d5f
+MISC metadata.xml 357 BLAKE2B 4a324f2913cf600a98085a72ffc69263205068f54b191101ed2825d3e3c84f951e58af8ebcab481bd50908685dc3603cdba3156772f153bf5a565ab43831b201 SHA512 038f5605bc71c57700f5d34539c8474c667f4434261cdb7dacb28c1dd80a64e656c395dfc2c84329d36e6cee28aaa9986d3cceb25f46d887bf8fdc1cbb348b8c
diff --git a/app-emacs/corfu/corfu-0.25.ebuild b/app-emacs/corfu/corfu-0.25.ebuild
new file mode 100644
index 000000000000..7cc6d4bc7c42
--- /dev/null
+++ b/app-emacs/corfu/corfu-0.25.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="Completion Overlay Region FUnction"
+HOMEPAGE="https://github.com/minad/corfu"
+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/corfu/files/50corfu-gentoo.el b/app-emacs/corfu/files/50corfu-gentoo.el
new file mode 100644
index 000000000000..e80eb907bae9
--- /dev/null
+++ b/app-emacs/corfu/files/50corfu-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(load "@SITELISP@/corfu-autoloads" nil t)
diff --git a/app-emacs/corfu/metadata.xml b/app-emacs/corfu/metadata.xml
new file mode 100644
index 000000000000..ab95b8c63633
--- /dev/null
+++ b/app-emacs/corfu/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>
+<stabilize-allarches/>
+<upstream>
+  <remote-id type="github">minad/corfu</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/csv-mode/Manifest b/app-emacs/csv-mode/Manifest
index ff6f167cde54..57223de9e5f3 100644
--- a/app-emacs/csv-mode/Manifest
+++ b/app-emacs/csv-mode/Manifest
@@ -1,6 +1,6 @@
 AUX 50csv-mode-gentoo.el 194 BLAKE2B 6232d9d6d6989647532b496f8c3304b256cd04ec12530a93518621094cc3c652a855dc822059df08ba5d4f6478017888978c5c5c11a495d2afb869dc9a0383dd SHA512 8aa137123c8eccc7551c946e7925ff3a54364acba46d29f401f96330ce97fff289f61e0544db4ed45ce677691d0fca5ed8302587ff4280ba8ff9906f58fec890
-DIST csv-mode-1.10.el.xz 19724 BLAKE2B 91e25d93b62a93b28162e259b68267e3c332befcec937c7db7c2d4c222b998606cf100f121f93d3db5216c1d30bb70a4bb79230f2218293dbff2df9766dc937e SHA512 8cb00db46b3bd120414487dc9eb3856f1e79ef5eebaaadcbedf28be66f5615f365b1b4d3a9cd84f442c2d6504c76643d97d07820997beff495989c00174035d3
 DIST csv-mode-1.18.el.xz 18228 BLAKE2B 36963d268a1f2cac6f9e897c1b5b2b99dd2b36d80eb0a493214cb7ee2c9b74862b43e632ae6ee8d847fb7b4ac330669b79bbe86032385830429735bace2e0276 SHA512 e7b22d545a6f926957f9080ca1a927ce34d35341c8484e66f52d5e1273a4933519c53e813e710e3c818bbdfd2ac8f27da691b4f36fd71638f220ea5c56e68591
-EBUILD csv-mode-1.10.ebuild 490 BLAKE2B c1adeda7ee89c98347a9fd0b2e3fd8b3cb449c278eea7e621b76be3a1fa0d6214180f68c638cf62adcac3f79f8b557a55af57a3d02447834c0bd25029091332c SHA512 9948ee20e61a1d7c2896f8b65a8dc48180f6322e94f80972c900f6d18ac74e875d7f5d7b4bfa39d3c61637b455d7fa121f82f66bddeb77c8e42299d40fc89b57
+DIST csv-mode-1.20.el.xz 19580 BLAKE2B 6942af53e8e494c1b4b063bd75937184f375d5d0bfef57558006d49b168b9786efa11e498ddd92fb7b29c9ac055feeb709b33ec9bc98c6807ee0c35b388cb841 SHA512 c9198ce3cdc60fd5b74a9f93af4dfc8be537638374fb729ad160e89b2bb6cef42112b0342732c7e9151889a254608157b084ee31cdfa330e551bc153020bbbdb
 EBUILD csv-mode-1.18.ebuild 491 BLAKE2B d16db6bea192dd41585788a00cacf2b1c526b477b1cb59641cad26153051d11a1c2d653d98f2de8fd0ec10e42351089d10b76ba847d9917118ff35bdadf967cb SHA512 9eda809ddc3860ca2499de2badaac388d917fd6fca2202ae27c4ca871f0e2d74a0542407ffb371d0cbd9b77dcd60ad7106f44943b8f9622caf3b6fff59e47a94
+EBUILD csv-mode-1.20.ebuild 491 BLAKE2B d16db6bea192dd41585788a00cacf2b1c526b477b1cb59641cad26153051d11a1c2d653d98f2de8fd0ec10e42351089d10b76ba847d9917118ff35bdadf967cb SHA512 9eda809ddc3860ca2499de2badaac388d917fd6fca2202ae27c4ca871f0e2d74a0542407ffb371d0cbd9b77dcd60ad7106f44943b8f9622caf3b6fff59e47a94
 MISC metadata.xml 283 BLAKE2B 81c49021199f71096079a27f9121390fb8c1285c54b9478583ff2d647277fa106ef12456d7097c4be092fc48b514a1adcf855ca0fac911598232ef9eb7f102c0 SHA512 f32b303760addf5d4db8d18bd10fb677353cdfa4c5e545d47804ef756cf5e5a21f8b8efb631b08f802185913ceb98da820e404e06eb03d01fe9ea85c10d1ac13
diff --git a/app-emacs/csv-mode/csv-mode-1.10.ebuild b/app-emacs/csv-mode/csv-mode-1.20.ebuild
index cacaedf1417a..a9ab6cdf30f9 100644
--- a/app-emacs/csv-mode/csv-mode-1.10.ebuild
+++ b/app-emacs/csv-mode/csv-mode-1.20.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit elisp
 
 DESCRIPTION="A major mode for editing comma-separated value files"
 HOMEPAGE="https://elpa.gnu.org/packages/csv-mode.html
 	https://www.emacswiki.org/emacs/CsvMode"
-# Taken from https://elpa.gnu.org/packages/${P}.el
+# Taken from https://elpa.gnu.org/packages/${P}.tar
 SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
 
 LICENSE="GPL-2+"
diff --git a/app-emacs/ctable/Manifest b/app-emacs/ctable/Manifest
new file mode 100644
index 000000000000..258d6397d517
--- /dev/null
+++ b/app-emacs/ctable/Manifest
@@ -0,0 +1,4 @@
+AUX 50ctable-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST ctable-0.1.3.tar.gz 237615 BLAKE2B fe80171389c5e7c96e0867e8464b28bba0901761415b4f06f608f6eb98d825de5a01e4e99cff0657017f0495aba13d51b78734844ea8650b811a8c8706882b1a SHA512 a5b20fd9fa573d6c24b052cc93c83f9012d5de5a097917dcea0f403c9570319a921967e895296d4f8d7a9bcc9d5f46f3c57ee9e6bea44398ac9ad820f8e766c0
+EBUILD ctable-0.1.3.ebuild 618 BLAKE2B a357eb38e6dd4f0612e347437eeea50a1d6bb443030057bb34e1e0d4714aa8cd700d040578f55cee1d29803c558b218bc864fa42dad913b9b683c73b967ee297 SHA512 0c8394b311c14641766fefc913e6570e05382ea7358c3daee3463b75d610deae42c03e33a09a1134e9e969e40556c7b7d626ee1db7eb1791aa040c7f77fa4b26
+MISC metadata.xml 431 BLAKE2B 7aa2fdb2647d625dcd0a440d02a576d54b90ed94949ac0b716e522bf64dc904b4c607cf6d388ea47133882c04996863cdc30ded5156717b1e82c906f46ff84fb SHA512 f3debfb8f28fb4fc0e7e37fcd355de94d5d7520246b9d39ffa4909a801152f1232bf044502ca7922ee38e5c034bf0b46d63cb1c4ed3746dd729d041f03ed3fa3
diff --git a/app-emacs/ctable/ctable-0.1.3.ebuild b/app-emacs/ctable/ctable-0.1.3.ebuild
new file mode 100644
index 000000000000..34cd9d8318f1
--- /dev/null
+++ b/app-emacs/ctable/ctable-0.1.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=04dbcddeba1da1f39e885bc0d36240ff37d829e9  # ctable.el == 0.1.3 without tag
+NEED_EMACS=24.3
+
+inherit elisp
+
+DESCRIPTION="Table Component for Emacs Lisp"
+HOMEPAGE="https://github.com/kiwanami/emacs-ctable/"
+SRC_URI="https://github.com/kiwanami/emacs-${PN}/archive/${H}.tar.gz
+			-> ${P}.tar.gz"
+S="${WORKDIR}"/emacs-${PN}-${H}
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+DOCS=( readme.md img samples )
+ELISP_REMOVE="test-${PN}.el"  # tests are interactive and hang up?
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/ctable/files/50ctable-gentoo.el b/app-emacs/ctable/files/50ctable-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/ctable/files/50ctable-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/ctable/metadata.xml b/app-emacs/ctable/metadata.xml
new file mode 100644
index 000000000000..e7c85f1f56dc
--- /dev/null
+++ b/app-emacs/ctable/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-ctable/issues/</bugs-to>
+    <remote-id type="github">kiwanami/emacs-ctable</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/d-mode/Manifest b/app-emacs/d-mode/Manifest
index ee8d98f91090..488e8b68995f 100644
--- a/app-emacs/d-mode/Manifest
+++ b/app-emacs/d-mode/Manifest
@@ -2,6 +2,8 @@ AUX 50d-mode-gentoo.el 157 BLAKE2B d92e7cb8b7121e989f3e68634db63f175b5145bf7f562
 AUX d-mode-2.0.10-rx-form.patch 728 BLAKE2B 04ce4363c53ea316297c316bd2a5c60f2f6ac9e1bc37a67fc7d979538e3ea33aea1a6d53b8d5565e83c50814401d9330b71a377d6d8df29c8b3d5490c38cb3bc SHA512 b2c0b4a542280b5eb9bfe54bbb0249ad0461002f630829775a78e60db6c9e71b138606625d4ffe9b4322b6facb57e232079ddc372ef6d1820d12ba693c889c84
 DIST d-mode-2.0.10.tar.gz 22394 BLAKE2B 16993c1da1b4362df4ef4674f58645da13466d6bf9a6215667a70868be7f6d3f992f0e60d9a3b6c4bcac7c3f4014fa987bfec2f3ee4e1503740efe316f29d249 SHA512 510ee3b1c1288b4b6772cdc9c436d691cc4c09fd1337886abe9a8c86e64a6fede3d8e2aaf46e847417cb667d36f9c5db3c446e7f5ca88fe2bc8b8fb80bcd1297
 DIST d-mode-2.0.11.tar.gz 22451 BLAKE2B dd9dabaa4e4bf2fe85fe38d9718ae4d058d1572eb86847249fb7c1f43b9d607f89a3f276c974547c3bffbf44a325c68bb4a77c3f2d64c58eb1c565cb2bb58cda SHA512 c9cf19f755e47a2b86c37267711f863e8906bfa95362ccb76c4fb09c4b280f92f46dd18282654e77e43ada8ea2c1d7d66588b5ee8f78c20a6f14df1402209e13
+DIST d-mode-2.0.12.tar.gz 41397 BLAKE2B 008125c5eed9867410f0d57d19ebfc380d74837b38a7d0fd37f375168d33c88ea878a4ec69eda5f3f19322dc430df51aab0a0d05f6db5ea9c9c83395e79e2a3c SHA512 d0decab325f9b847a68aef7be4d3fe057613840fc9a49436781154cde0c3e44f5194e9dd5d2d1d154da9f34cd056c5c71c6a36cfc501817d0bd9a8c993f10e66
 EBUILD d-mode-2.0.10.ebuild 561 BLAKE2B af69024ac739dfa47704ba8f2c7dc4db652e63338a2b0c95173be48f6b9e11f77413327f4884ea5a8f9c7ba4dd88a1d122d250782f2a19bc5cdc1037a265e6f2 SHA512 c85a9c84080611b402359946a8c141103b185413d10c4bdf3ab23afa50c0bb8918255c4318ef5ddb2262c68f92e88600a90441ffad586d79f7ecf48eee2463c0
 EBUILD d-mode-2.0.11.ebuild 518 BLAKE2B a72125d78dccc37afe7f74ae14532a373e72b934f7cfda8032a66beba4b2a9be88577e7ad6ddd70c36ae7baa79215c49c086dc4c4dd68157e87fbe20014163de SHA512 d63bd33d2e6310f73d70800c44262372f1a64a80532289261e2f94a02c606c9996606b389ae5e96c90b6c1795f927a857efd435cb652d272845ba16cb3788579
+EBUILD d-mode-2.0.12.ebuild 631 BLAKE2B 611ff584c73bd92d1c059345154673add6253a41d3529a30d5ccf88916a7bc0b277d2b54bc2e1e5a4cffb27d542eeba68077651d28abab5d637dae980ff84434 SHA512 f7e49b254c1b795ec61b4c58f2cc5d1afa5878a4b2e8cdc4b5a82ee9c09ab7ea190b36374750f81a650262ab2fb5924d3c67e921b37299c50b097dc3abe7cd30
 MISC metadata.xml 383 BLAKE2B 92595822618e1813b3f63bb8388e4f880970dba4fe48e2f219f7426ce148075baefe1dfe4373c46b6c587bafb391f94810ec6c10e24a40a748d27c4030582f7c SHA512 1c4aa7638d33226446a58ba89d0324c62ff6f4ac4e3d9573bb6a06ce4b580b68d7e6bbb9e6f073150a7f0a492751f0518f37d0414a40b2041976a07e4cc7ae4b
diff --git a/app-emacs/d-mode/d-mode-2.0.12.ebuild b/app-emacs/d-mode/d-mode-2.0.12.ebuild
new file mode 100644
index 000000000000..6ee6547bf0a4
--- /dev/null
+++ b/app-emacs/d-mode/d-mode-2.0.12.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=25.1
+
+inherit elisp
+
+DESCRIPTION="Emacs major mode for editing D code"
+HOMEPAGE="https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode
+	https://www.emacswiki.org/emacs/DMode"
+SRC_URI="https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/Emacs-D-Mode-${PV}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	${EMACS} ${EMACSFLAGS} -l ${PN}.el -l ${PN}-test.el \
+		-f ert-run-tests-batch-and-exit || die
+}
diff --git a/app-emacs/demap/Manifest b/app-emacs/demap/Manifest
new file mode 100644
index 000000000000..1a5c91e08d54
--- /dev/null
+++ b/app-emacs/demap/Manifest
@@ -0,0 +1,4 @@
+AUX 50demap-gentoo.el 115 BLAKE2B b51712456a86870f9fd88c87e58b7ac8851038cb2292496feeb28296f0f5151b439700628a2ed5a96c5f8a02e2347e83ea174ae067ad24360c94f9be3e59e09b SHA512 fdb4bdfac92519a2c609b35e4c9d35cb259914aa9e0d924de9eb9d6fef5adb546d22a456d01ad68952d638b38aa42e0674f6b235fc0f6340acce6ba410933478
+DIST demap.el-v1.4.0.tar.gz 26998 BLAKE2B 410cb79fffbe562861c2c91d3a8284303ae71edf5a3c331bd0c86b1aef7cfa18c731853c425bf208073da26815651e02e49faa2f93eeb667f53cf6c0a1920f08 SHA512 4f21e9135645df17fbb9a0d2f8031ad6ab0af23af9c8f4744c1510a534ea7c518bc6d0be4801484121b040e952f182d0b70dc3505e4e7534114f53a1e8ae1723
+EBUILD demap-1.4.0.ebuild 716 BLAKE2B b033e5ebd8d181614731ae593d1d31324e8df6fcb72925b6ef12c1d03f1f83658a32b4510b7a368d12bc9c47d06775c6b4a5737fb279beaf2a9c463a1c946715 SHA512 6c2b31b840177fdfe41bcf34e3bc998a1beda72c79a1a6a019b14a155bac6547937f6738df461191317950aaf9e7f1ef57e40d227ac391b3e790df22cd318e1f
+MISC metadata.xml 1133 BLAKE2B 19cef190c96aa372967158274040ecee70899a44e45d4d7f86ca0bf5ae55f22f4a845888f49ebfcdc4bd4f1d8e8b98da3c79c4d206b8d0fdbfe50bf6ec03aec0 SHA512 b8e5fdd607c9defede6de74c2c4567afbcdb5a531755e89da0eb7e58b7d1b7b04dfab62868ca9713c3664893bd0622bc8f918e885ba1bb79372749306715c3b1
diff --git a/app-emacs/demap/demap-1.4.0.ebuild b/app-emacs/demap/demap-1.4.0.ebuild
new file mode 100644
index 000000000000..8e23040b1ed6
--- /dev/null
+++ b/app-emacs/demap/demap-1.4.0.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=25.1
+
+inherit elisp
+
+DESCRIPTION="Detachable minimap for Emacs"
+HOMEPAGE="https://gitlab.com/sawyerjgardner/demap.el/"
+SRC_URI="https://gitlab.com/sawyerjgardner/${PN}.el/-/archive/v${PV}/${PN}.el-v${PV}.tar.gz"
+S="${WORKDIR}"/${PN}.el-v${PV}
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+# "make test" is just a practical check if "demap-open" works, maintainers of
+# this package could check themselves if it still works after installation.
+# Notice that we autolaod only the "demap-toggle" function (not "demap-open").
+RESTRICT="test"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/demap/files/50demap-gentoo.el b/app-emacs/demap/files/50demap-gentoo.el
new file mode 100644
index 000000000000..bcd35f5b7298
--- /dev/null
+++ b/app-emacs/demap/files/50demap-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'demap-toggle "demap"
+  "Toggle side window showing a minimap." t)
diff --git a/app-emacs/demap/metadata.xml b/app-emacs/demap/metadata.xml
new file mode 100644
index 000000000000..bf3219109fba
--- /dev/null
+++ b/app-emacs/demap/metadata.xml
@@ -0,0 +1,24 @@
+<?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>
+    demap.el adds a minimap that shows a zoomed out view of the active window's
+    buffer. You can toggle showing the minimap in a side window with
+    "demap-toggle". This package has a few advantages over other minimap
+    packages: support for detaching minimaps and having them on a different
+    frame then the active window; support for multiple minimap buffers, with
+    their own buffer local definitions on what buffers it can show and how to
+    show them; having the minimap on the side of the frame rather then on the
+    side of the active window by default.
+  </longdescription>
+  <upstream>
+    <changelog>https://gitlab.com/sawyerjgardner/demap.el/-/releases/</changelog>
+    <bugs-to>https://gitlab.com/sawyerjgardner/demap.el/-/issues/</bugs-to>
+    <remote-id type="gitlab">sawyerjgardner/demap.el</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/doom-themes/Manifest b/app-emacs/doom-themes/Manifest
new file mode 100644
index 000000000000..01ddcc17434b
--- /dev/null
+++ b/app-emacs/doom-themes/Manifest
@@ -0,0 +1,6 @@
+AUX 50doom-themes-gentoo.el 139 BLAKE2B 8060409e94123cb9d0355d3e65a3cd904a2f35e8601ecaf86886ccfcd1f3662b4d64c9c0dc567d77cf2d8c3a767f65a4d699917338337455b3c06b2c51f63ac3 SHA512 e6fbd5d9a40aeb5409a8bbd582b50817232f52e3f9b23227a52e41b2dc2ca655eed976fbb412e0b2345373c6e01edb2e316da8164bb8c7f64609ddfd9466417d
+DIST doom-themes-2.1.6_p20220505.tar.gz 128520 BLAKE2B f7b2f060d2b68427bd9f375cdd8d009d68ffd0839f46aecb41ede32bde815f2b4df68a2df8af9d09c055f4443b4abcaecc0046b4449ffce9449956cf9c43755b SHA512 bc450d964d45e123b96efb6f96e153ed0d4530374197bef484b41b18f51ae49fc7c7cea2aa0aa599992709706510f725ba1943176ae02cafb16b2f2d3b7f824a
+DIST doom-themes-2.3.0.tar.gz 133034 BLAKE2B ea6c4c35f4f4b8e7cdaefd5871c99d53c7648a0421fac2e6a69bd24d2b384c4793666c21ff99e5746796995f37ff526b333418839d30ac50406ae003e0cddf4d SHA512 0197896eabdf548569a4826ff670e47cb113bb2ea252eaa9b06d2bebd68a7fa4833126536c265c15216e4f5403114f6e3e77b9db75b05a5552fae680c85d7af1
+EBUILD doom-themes-2.1.6_p20220505.ebuild 625 BLAKE2B b479c7cfd3a8d5a1a0816d65430596a6265a838a0f6383d3bfdf1d07cffe3b1ab17e0bca92be537fd81672407f69a979f3153516f4fe115295cf90606be7fa49 SHA512 9fcb72ca7ea51d67ca71349ab7b29dac36fbf9f2619e159384e8ef9c2dd7b461c466815a5f06b65f473f14843da8747c1aad10fc8f4d6863af88b02a6d233d9f
+EBUILD doom-themes-2.3.0.ebuild 585 BLAKE2B eff3d57fff5970e35c013398525cdcd367659cc9314557a13fe304d84be3124ea3a9ea902037d8d8d86ee16781fbb40fbf82c41ad2a9e5a1c0610242eb634752 SHA512 2c0d81611d7f1eb50830290ff31897e83a0fc2338856801c20f10a26af85912271212cb2924be92b7c7fb719acf9ca8186f9cff208d5ca6f759af23bf63503c5
+MISC metadata.xml 421 BLAKE2B 0ce555845fe7265c005170e5f7fd7585262d9806d7c52ef3b3a204f364ce6e692509fa47be92d794036cdae5c63ebbf8961e756355277d6502f495d7c73359be SHA512 6a291a43bbc2d0bfa7e4a297a12290e070f9cfa330f966994faf5ff4b24fff830678f5d2eca25221456a437caab24d9e3550366c09aaae984289ce88264e2397
diff --git a/app-emacs/doom-themes/doom-themes-2.1.6_p20220505.ebuild b/app-emacs/doom-themes/doom-themes-2.1.6_p20220505.ebuild
new file mode 100644
index 000000000000..8c3676406d92
--- /dev/null
+++ b/app-emacs/doom-themes/doom-themes-2.1.6_p20220505.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=e9bdd137116fa2037ed60037b8421cf68c64888d
+NEED_EMACS=25.1
+
+inherit elisp
+
+DESCRIPTION="Opinionated megapack of modern color-themes for GNU Emacs"
+HOMEPAGE="https://github.com/doomemacs/themes/"
+SRC_URI="https://github.com/doomemacs/themes/archive/${H}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/themes-${H}
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	elisp_src_install
+
+	insinto "${SITELISP}"/${PN}
+	doins -r themes
+}
diff --git a/app-emacs/doom-themes/doom-themes-2.3.0.ebuild b/app-emacs/doom-themes/doom-themes-2.3.0.ebuild
new file mode 100644
index 000000000000..0b90415d940c
--- /dev/null
+++ b/app-emacs/doom-themes/doom-themes-2.3.0.ebuild
@@ -0,0 +1,31 @@
+# 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="Opinionated megapack of modern color-themes for GNU Emacs"
+HOMEPAGE="https://github.com/doomemacs/themes/"
+SRC_URI="https://github.com/doomemacs/themes/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/themes-${PV}
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	elisp_src_install
+
+	insinto "${SITELISP}"/${PN}
+	doins -r themes
+}
diff --git a/app-emacs/doom-themes/files/50doom-themes-gentoo.el b/app-emacs/doom-themes/files/50doom-themes-gentoo.el
new file mode 100644
index 000000000000..072e7e31bcc3
--- /dev/null
+++ b/app-emacs/doom-themes/files/50doom-themes-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(when (boundp 'custom-theme-load-path)
+  (add-to-list 'custom-theme-load-path "@SITELISP@/themes/"))
diff --git a/app-emacs/doom-themes/metadata.xml b/app-emacs/doom-themes/metadata.xml
new file mode 100644
index 000000000000..20205cdd883d
--- /dev/null
+++ b/app-emacs/doom-themes/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/doomemacs/themes/issues/</bugs-to>
+    <remote-id type="github">doomemacs/themes</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/dts-mode/Manifest b/app-emacs/dts-mode/Manifest
index 5d4628286b55..7f7845fbae5d 100644
--- a/app-emacs/dts-mode/Manifest
+++ b/app-emacs/dts-mode/Manifest
@@ -1,6 +1,8 @@
 AUX 50dts-mode-gentoo.el 304 BLAKE2B 1ec26155386af1029c583b7624df22b8d68bc6150a9293860b9249b5a9212c0bec49610d7b5cc78b730361d55cd19cdb1176925bb496da649d30587511eeab6e SHA512 141a7719e5f348bee8ea96de99428b538d81217b274246c9ee2cc992c5f85637684757c0cc5653072c7182aad2c020eb6d639e0821ef97c830a071107c60c1bf
 DIST dts-mode-0.1.0_pre20161103.tar.gz 2002 BLAKE2B 2dfe222c99d6d1876b6c5ae624f28b2d3fea0a4f8fd98bdebbdb697a03101f3ed1a4e260bb2013b1d40934fce29bc0461df12a0788b7dce189604473e4469819 SHA512 ac7ba1abd64c63f30d5cfd7fc61ca5f0f9ef368d1b8a213acbe897babf8409c551f58b828e4bfc8c862cbaac20634ce90727224f75c3846bde2d64a86c90485a
 DIST dts-mode-0.1.1.tar.xz 3164 BLAKE2B e3ff5455469c53286b9a5f23645122cf7c69d3e974dde6478ab35e2fb52f793884411b06d677b3639e4965f17dfc959ec8742cc44d2cea3fdf2cc6f3f9745de3 SHA512 8afcb815504b6287715e34ddd971d7b1dc17ebd359632cdbb6b120afce89a3f5c6a4396b9583f0058c75d83394499b21768c7f47fafceab79e85bfb30049d481
+DIST dts-mode-1.0.tar 20480 BLAKE2B c5f7f60c907d47d1984ce1961fb4cf9f8cd75052f0bbf0742c233e6e1a117c6525e4124c6ca55017cb300a57dd324b7eac7c2612c0580fed18188d4074b8666b SHA512 995c35629882b8bc78b5ebdaeb2a799019889b2d02ad8990d148f132b171ae4ce999bc0e768fd47d64831daa2b2d9a9ed13099885359106fbc9c7f63ca2659a6
 EBUILD dts-mode-0.1.0_pre20161103.ebuild 491 BLAKE2B 147137a7f68e04354d20ff9c890ea44e944d14218e0b4c5484ea277303dc510d310f79b14cc0253078b3e15bc94a2cf3e3b8e711863c43a9239be76d4499e6da SHA512 9983968864d1f450091e2200c8dcb1c71d1e2ba6804d1cde79b7659fa6681b24c173123f1c4118069d06acda1fa7612c8afd36c7e7bb5aac59adcc80fe344237
 EBUILD dts-mode-0.1.1.ebuild 515 BLAKE2B b0e940462c2a56a8a57ac0ddf2e0005bd62246fc95f724bfda9c3795ed5a76248c3454393c1cf077fdc658dd1f111e4a54a00ba74515feac38d8df6f4daba7f3 SHA512 a4f93e9f7a64689aa320557d1453a6d5c7f4b350edd58123de80728293f20843fe6206eca19b2abe0ba5155ceb33f03a221fe81a293cc91e0f2c8c8e574dc869
+EBUILD dts-mode-1.0.ebuild 455 BLAKE2B da88ffe34aa6bbe629e5632912aae144f1b3f1b838c49b48f6cd1dbaa3910eb510d3455ad39aec229fd91442aad9692038b0e85f7be601e5619f3bf97052e3f7 SHA512 afec6d3c72a8e582d3a2a812667949ea5e68029bbaa0a721e062a60efaf85f69fd4a086cd5f2f4f8e12ac19e892d76411f89e7150eea32952ef12025d2f16ee1
 MISC metadata.xml 362 BLAKE2B 86e839913d0159d77d21647ae35f2822d91c87de2fba75f8839772d047e8721ca6b302d09d40eb3437956532a5d4dbb735367fa1a4b5ef0ca7c7cb9fdd5fb04b SHA512 d5f8f0d19daaba51328bc6bd8c68a21c04eb5c2874d77ee357f7350e0fe852a5c74dbd0ae9cd38ce367f94eb5e9add48ecac02d472a45de21fc039d07aedfd2c
diff --git a/app-emacs/dts-mode/dts-mode-1.0.ebuild b/app-emacs/dts-mode/dts-mode-1.0.ebuild
new file mode 100644
index 000000000000..0c0140b04a56
--- /dev/null
+++ b/app-emacs/dts-mode/dts-mode-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
+
+inherit elisp
+
+DESCRIPTION="Emacs major mode for devicetree sources"
+HOMEPAGE="https://github.com/bgamari/dts-mode
+	https://elpa.gnu.org/packages/dts-mode.html"
+
+SRC_URI="https://elpa.gnu.org/packages/${P}.tar"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+ELISP_REMOVE="dts-mode-pkg.el"
+SITEFILE="50${PN}-gentoo.el"
+DOCS=( README.mkd )
diff --git a/app-emacs/ebib/Manifest b/app-emacs/ebib/Manifest
new file mode 100644
index 000000000000..3a3cb6a5e73f
--- /dev/null
+++ b/app-emacs/ebib/Manifest
@@ -0,0 +1,8 @@
+AUX 50ebib-gentoo.el 175 BLAKE2B 6e790273be0d32b188bf4e429da221e1a0f71036dccb521edb43340a88faf70046b27bc70128a05a81437dbd856f5966ad343f4aef2dffa72b44a1901d3199e8 SHA512 9be24ffce7327c3db49dbec7a1f3cc3610fdc4aac40c25da06906df25123173f3a4b05ec2d96d9ca2a1fc785bdd471ffba73654ee3b642be93c93b412f230fcb
+DIST ebib-2.35.1_p20220501.tar.gz 1043749 BLAKE2B 937b3e00f4f52c5b63949ae993e40ff340477c374914ce308256018d0c86fafb52cbacde74dab552303b6635ff87d57c29661a62971b0649f58a67e3b916a9c8 SHA512 d822edb2584effc6f385e2e71bf57d72e5763129fe84fec60bf1a9841822e3d59cc53a05cab293014dee7c63d14cbae43734a2070746f5c512e417a4085f3ef6
+DIST ebib-2.36.1.tar.gz 1044522 BLAKE2B c280b1123594e10a3cc1dbb67d4db5687d3042b8366b05cc6ab95deb7edc1cf50f6dc516028339d44502c8b1c91503672a511030ff6a895180d1b325566e1874 SHA512 48a54cee6f9ab5e2785c8a4b0f6dcce0ca8fc1f017ea6eb043717d22b326ccff077104fa2907fd9c29eeaafc38fc176e352ad3ca000bfbe2deafa46c54352318
+DIST ebib-2.38.tar.gz 1040337 BLAKE2B 97a61ecf5d4334dd39be287feaa44206d52d3d6687593b8eb2210427901890254b2cefa9cf37e9292f8ae2651c7c11ac0af2938f9a2854b98c3ee81ed6cfc7c4 SHA512 4a6b611759700e8181c09fa80cb631a024bf1d38d6950e040c3e476a194d02e893fe1fe9b749dd737a7eaf7fd9d4b8ecfe4d09be56e788b7692a4253dbbe838d
+EBUILD ebib-2.35.1_p20220501.ebuild 840 BLAKE2B 43d041da367e849ff2ae6883f417c48ac2ca5ec64036e3acca19fc6ece38f4ebb7a2364f2d31b756bd758986087d0e8b4027165fe68474d59edbf912dc755adb SHA512 d7d272bbe9b49950767d140507a2c215ecb963369c77e3ab2f0aa84daeb40e2dc97abf2269aeef71dae1bcbe72f121814673d53a3da59662461194516530b603
+EBUILD ebib-2.36.1.ebuild 772 BLAKE2B fed054ff141b43f06d810c343e8763a0538f0caebc1d20d5bc6cbdf51799e65126c8692336f5e41c21ae1004418c6cdd930fb55fb18c3fb72075a289a19c4f9b SHA512 4226453f712100f1c9378468f5b0fcfcd0cef670836b8b97311ef9514d15a1203c83c707c1dd57b96932d722800943ed11a64000c59eef7a180b5c1be6130e60
+EBUILD ebib-2.38.ebuild 772 BLAKE2B fed054ff141b43f06d810c343e8763a0538f0caebc1d20d5bc6cbdf51799e65126c8692336f5e41c21ae1004418c6cdd930fb55fb18c3fb72075a289a19c4f9b SHA512 4226453f712100f1c9378468f5b0fcfcd0cef670836b8b97311ef9514d15a1203c83c707c1dd57b96932d722800943ed11a64000c59eef7a180b5c1be6130e60
+MISC metadata.xml 730 BLAKE2B de17020c88b38b6d8e3753cbb4d554d1061fd73c39cf8e9e760f3de204c87bec6c3aca60213bc283a5d053da30225232100dadf711072a57b19863c55601fdca SHA512 d20f364400adcb23dc542cf08fed16b0b073fcd6ef7df27644f51d674215f51fc9520ad873ac6f2f783364471c7386d69f8d3ae88ecad8b6a1694e08e211f7b4
diff --git a/app-emacs/ebib/ebib-2.35.1_p20220501.ebuild b/app-emacs/ebib/ebib-2.35.1_p20220501.ebuild
new file mode 100644
index 000000000000..7406f52e2731
--- /dev/null
+++ b/app-emacs/ebib/ebib-2.35.1_p20220501.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=0e243a78f435038dda31953c5b48cbddf2a89e27
+NEED_EMACS=26.1
+
+inherit elisp
+
+DESCRIPTION="BibTeX database manager for Emacs"
+HOMEPAGE="https://joostkremers.github.io/ebib/
+	https://github.com/joostkremers/ebib/"
+SRC_URI="https://github.com/joostkremers/${PN}/archive/${H}.tar.gz
+			-> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${H}
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-emacs/parsebib"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		app-emacs/ert-runner
+		app-emacs/with-simulated-input
+	)
+"
+
+DOCS=( README.md docs )
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	ert-runner -L . -L test --reporter ert+duration --script test || die
+}
+
+src_install() {
+	elisp_src_install
+	doinfo ${PN}.info
+}
diff --git a/app-emacs/ebib/ebib-2.36.1.ebuild b/app-emacs/ebib/ebib-2.36.1.ebuild
new file mode 100644
index 000000000000..d708aa8ac4a8
--- /dev/null
+++ b/app-emacs/ebib/ebib-2.36.1.ebuild
@@ -0,0 +1,41 @@
+# 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="BibTeX database manager for Emacs"
+HOMEPAGE="https://joostkremers.github.io/ebib/
+	https://github.com/joostkremers/ebib/"
+SRC_URI="https://github.com/joostkremers/${PN}/archive/${PV}.tar.gz
+			-> ${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-emacs/parsebib"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		app-emacs/ert-runner
+		app-emacs/with-simulated-input
+	)
+"
+
+DOCS=( README.md docs )
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	ert-runner -L . -L test --reporter ert+duration --script test || die
+}
+
+src_install() {
+	elisp_src_install
+	doinfo ${PN}.info
+}
diff --git a/app-emacs/ebib/ebib-2.38.ebuild b/app-emacs/ebib/ebib-2.38.ebuild
new file mode 100644
index 000000000000..d708aa8ac4a8
--- /dev/null
+++ b/app-emacs/ebib/ebib-2.38.ebuild
@@ -0,0 +1,41 @@
+# 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="BibTeX database manager for Emacs"
+HOMEPAGE="https://joostkremers.github.io/ebib/
+	https://github.com/joostkremers/ebib/"
+SRC_URI="https://github.com/joostkremers/${PN}/archive/${PV}.tar.gz
+			-> ${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-emacs/parsebib"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		app-emacs/ert-runner
+		app-emacs/with-simulated-input
+	)
+"
+
+DOCS=( README.md docs )
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	ert-runner -L . -L test --reporter ert+duration --script test || die
+}
+
+src_install() {
+	elisp_src_install
+	doinfo ${PN}.info
+}
diff --git a/app-emacs/ebib/files/50ebib-gentoo.el b/app-emacs/ebib/files/50ebib-gentoo.el
new file mode 100644
index 000000000000..4345f7ef8470
--- /dev/null
+++ b/app-emacs/ebib/files/50ebib-gentoo.el
@@ -0,0 +1,5 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'ebib "ebib"
+  "Ebib, a BibTeX database manager." t)
+(autoload 'ebib-insert-citation "ebib"
+  "Insert a citation at POINT." t)
diff --git a/app-emacs/ebib/metadata.xml b/app-emacs/ebib/metadata.xml
new file mode 100644
index 000000000000..918804ccf762
--- /dev/null
+++ b/app-emacs/ebib/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/joostkremers/ebib/issues/</bugs-to>
+    <remote-id type="github">joostkremers/ebib</remote-id>
+  </upstream>
+  <longdescription>
+    Ebib is a BibTeX database manager that runs in GNU Emacs. With Ebib, you
+    can create and manage .bib-files, all within Emacs. It supports @string and
+    @preamble definitions, multi-line field values, searching, and integration
+    with Emacs' (La)TeX mode.
+  </longdescription>
+</pkgmetadata>
diff --git a/app-emacs/ebuild-mode/Manifest b/app-emacs/ebuild-mode/Manifest
index 5eef3848ef62..8275768d536b 100644
--- a/app-emacs/ebuild-mode/Manifest
+++ b/app-emacs/ebuild-mode/Manifest
@@ -1,8 +1,6 @@
 AUX 50ebuild-mode-gentoo-1.54.el 1509 BLAKE2B 98cf2a1672723ffaa3f4d2f57b4b67b897df56cc2d7352366b79df0578b927faae53c3cc703fa70cf23bd0b1006d8c49dd8e59fcaffa3a231fd7ec5e26c7dce5 SHA512 91c59e85ea79733c195985e4a33dfb1aec8ac13457c0dc3fe7353fb2616787ebde4393b671a2943b752725593929070b658c24955d5e2132b6e9b76daa749850
 DIST ebuild-mode-1.56.tar.xz 36448 BLAKE2B 9126dd5d004a5818a5214f10c88db84faee3945ac25ee141a577a868bf7f127490ee34d6ea103fb788f96c391eea3d00d18abe12564a2f6c70650fc8fe9c6cdf SHA512 2b67208d9f553a322761dc9b64e7b891722c2099cc7c9bfc929e1a424b22ec32c594e0ba029554434b51ef233d2d4435b6c639b06c25fd551608fe5dd830cb03
-DIST ebuild-mode-1.57.tar.xz 36548 BLAKE2B 85f677cc5459077d89536e2032049b8be75f24cfad742955b439a1e94beaf82a2a39a4ddb1de1bb8fa847ede637702356d470556f2fab09a13ae6416419a5e07 SHA512 c7eed4bc8e68909abb3407b5a352816c6eb43ada345a967e9e1b666937a44cacf0476475d2b1eeb3f48ddcea04b31ccf7fc938a8cb70f8655cf2b5946d4c0a04
-DIST ebuild-mode-1.58.tar.xz 36796 BLAKE2B c2762c0d00038206d9ceacb887c2c0a1503e7e5dbdc68796aaa27eec5cab52fae1d6e4baf5155b79842fd2e74d91dab1c203c26d9f68986155426b36635b7722 SHA512 37e393b5c5b6672045dea7aafa77df81f7aee2d16ead90e12841026442eac63fe3eece1538401dc4b7444573aec61f4c920f821b65f8489b5a48d54de4d78b52
+DIST ebuild-mode-1.60.tar.xz 36996 BLAKE2B a566c9f602ec6ac4126a4a13610e515faf2a02b8ca89f417a037a28f4b9ea633518d589d78f6deb54084be34cdc30c2a1896546b2f86c1166cedd47289edcfd8 SHA512 b04b37b7a376dc48a7f80ec0e60bf36a8b7ea92edcbdd45fbd002e80e8ea29111905a726177a869d607adffe78094efcdc94b1aad32afe1444a09b4e714dcecd
 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
+EBUILD ebuild-mode-1.60.ebuild 729 BLAKE2B a4760a8a7b2f4e7189b7af2a2f7d82e84ecad7b0e3edf67e2b3301f23653766664ebb56091a0b0ae0c8d9e3a9eef25e805fae951f4a9225f0692f63d2d6421c6 SHA512 798294723f21671372eb91c9ce2a747ec31abc9c25869adc5d0c4a00b58dcc7d8c4a60de0ed98b33455f9dd6b8429cdbee5101a0b2e40acaab6d8ff3e97035f1
+MISC metadata.xml 483 BLAKE2B 203c30fd4195b63532c0462427658547b0805fb23b57c9a04c554eba8ef0a9b9bc7e3100a51c3cb7feb11d1dcb9472357e5e53640e9a94658e35594cd3369f56 SHA512 78804ced19849c5d88cf942117714db3302cb2187e93ab3924b5526d0c6aa973dbda2cdb5a67c9e0639d5ac3278ea8da9df1e20c2b3cb96231f3fee5fc6845fb
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.58.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.58.ebuild
deleted file mode 100644
index 54add5db8bed..000000000000
--- a/app-emacs/ebuild-mode/ebuild-mode-1.58.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp readme.gentoo-r1
-
-DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
-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"
-
-BDEPEND="sys-apps/texinfo"
-
-DOCS="ChangeLog keyword-generation.sh"
-ELISP_TEXINFO="${PN}.texi"
-SITEFILE="50${PN}-gentoo-1.54.el"
-DOC_CONTENTS="Some optional features may require installation of additional
-	packages, like dev-python/docutils-glep for glep."
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.57.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.60.ebuild
index 54add5db8bed..0ecdcc8ea7b9 100644
--- a/app-emacs/ebuild-mode/ebuild-mode-1.57.ebuild
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.60.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/metadata.xml b/app-emacs/ebuild-mode/metadata.xml
index 80d8f14ad170..3f5a3e021741 100644
--- a/app-emacs/ebuild-mode/metadata.xml
+++ b/app-emacs/ebuild-mode/metadata.xml
@@ -11,5 +11,6 @@
     <email>emacs@gentoo.org</email>
     <name>Gentoo Emacs project</name>
   </maintainer>
+  <remote-id type="gentoo">proj/ebuild-mode</remote-id>
 </upstream>
 </pkgmetadata>
diff --git a/app-emacs/editorconfig-emacs/Manifest b/app-emacs/editorconfig-emacs/Manifest
index 080fe7f345a4..e18aadd062a0 100644
--- a/app-emacs/editorconfig-emacs/Manifest
+++ b/app-emacs/editorconfig-emacs/Manifest
@@ -2,5 +2,5 @@ AUX 50editorconfig-emacs-gentoo.el 436 BLAKE2B 3472733b5554060e3067ac6b4efdfcfb2
 DIST editorconfig-emacs-0.7.8.tar.gz 28250 BLAKE2B 8c09b7e495ff38d4276cdbaf60109f91b3e32215f2c6a8aceffd80a02cf024d79eac1739b3f2efa3697b78804da32d0cc2969db628d1064a0fb1db1b059a191d SHA512 21815a5a778ffef68b5205e409aa827c1bd6c9a8c542647ebec889a9f00f5b3f71e3a2072bc2f0373e8ce30c1bb57f5f6350953a3c149742a8e2e46ca9846c9a
 DIST editorconfig-emacs-0.8.2.tar.gz 39675 BLAKE2B a2a9641185a00c2908715b59a7e4429008f7587e00552ebc19f6cc38b6a10423c26a25557b887caaddc47d9c136fdec82476ef916e18c06b8228925b4554428b SHA512 6934418fd7890c49d8df7cdac1a0afe066e07ddf6274f674a4624dca47de278a78778f25beca793cdb537852beb7c8df5ea46743fb0bc753acccbb9974448e18
 EBUILD editorconfig-emacs-0.7.8-r3.ebuild 643 BLAKE2B 208c992003325e6032e9e0e4fb8d5a809525fb47df3ce9230ca06e0ded7a1f3d2f784665d523d2f04e9bf68af17c3832c23b99d3e4bf20f243922881a7d623c2 SHA512 a723535a6344b20ade6cc9642c96075abcd6e596f1683231f5b5b436fe3cb611e1dc3ba5c132c4acc70a28c4303ed54c05db48709cd76138113f4e5c955aa10b
-EBUILD editorconfig-emacs-0.8.2-r2.ebuild 645 BLAKE2B 6a50acd15b16fcf9f84ba56ae90ce01730fa0fe08ccfabc8869d9bbd346e7a5ee63ce27ee706345919eff5c82b3f5fd4888343617acf2d7a218c5760f72a6d56 SHA512 62cc565c9d667f7669c1c8e7f4a388b59626b4cb81d3d1c55127c9ace545518edc0c0b2d8c5d52525d0f9f3d8a010013bfab35389704f5ab5f5adca3f3d2d6e3
+EBUILD editorconfig-emacs-0.8.2-r2.ebuild 643 BLAKE2B cd8b1c3edf7fb93e11d195423f0e8a88ed62973d9233fa202f79737a41f2c8b57490d38d05b44f60abcc87f8b1d6a760356ff5be0921707e034e794f5b085b02 SHA512 9147e98b5153d9965a66b67107f1891c9de1994673607dae4b1bb430715ff6db927b2a29ad487223beef5873e59a5478dc990ebc3db17ebf6069821beb1de437
 MISC metadata.xml 461 BLAKE2B e8415c92944d44ef9186b4882d7a5b912ccc16f224da3faef90b43ee8077e94496234341b80eaaf20a17118ebe6f8e8b0cfb70910c948a3ef5a8f853a02cba22 SHA512 a679c75eda6a98c3810b3fc1982ed8c7ff9349a63541eaf3c2b5dfdfec4d1a97f7c540d6b6442511c2645aed46e4b6d346f01ed952a51eb12d076aab8d29351f
diff --git a/app-emacs/editorconfig-emacs/editorconfig-emacs-0.8.2-r2.ebuild b/app-emacs/editorconfig-emacs/editorconfig-emacs-0.8.2-r2.ebuild
index d24511f11c4b..7f577a0477fa 100644
--- a/app-emacs/editorconfig-emacs/editorconfig-emacs-0.8.2-r2.ebuild
+++ b/app-emacs/editorconfig-emacs/editorconfig-emacs-0.8.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/editorconfig/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 RESTRICT="test"		# make test requires a git repo
 
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/eglot/Manifest b/app-emacs/eglot/Manifest
index cfc066c33410..1f55f0fe6176 100644
--- a/app-emacs/eglot/Manifest
+++ b/app-emacs/eglot/Manifest
@@ -1,6 +1,6 @@
-AUX 50eglot-gentoo.el 76 BLAKE2B 0f41a5837bd485730c10074ca5c2dba963cf69b96043f3439e9f1e7a41d468cd706e974c7d7b312e51db98d6e7573b4ec284603998c2fe1de05f86496c3ec0cd SHA512 6c06dfa72ac6122c82dc59bb672f796ae86e71548babb2bb0dc2b00e58050e65b51e13aab279d5f3e7f1283ca2e0a64c7d34a55b412c2d81fc58fc495864c8c4
+AUX 50eglot-gentoo.el 82 BLAKE2B d5c0e215ceef684ac390a835633aca107f4ea95a83544779724c4fcf9a73963ba87d956aece3406d82bb02f82a5f9b909632d52e3b8fe361d26921f88d0f4e67 SHA512 9039a33b75c7101b04e367432f217700354fd2293914a295adfe3abd4ae1b8626205155fe8c0d809acf5d02b56af3feca22e837e926cba96d872fea4b3354a5d
 DIST eglot-1.6.tar.gz 288078 BLAKE2B a2214d216d0eeaca32d974c6686696dfcf141b3384741bc8cce0d02abb508eb5713933bc227d12a07f4b87fc34601431845b1b8e519538ae04ecc74b24db4004 SHA512 51227c8e2b0a1dd9a63ededbea592f01616ff728c34c330400c078212fef3f3e747e6dd30ba312523cbe60c7ea663a7af9d83300210cf331ea6162d2db5c7e41
 DIST eglot-1.8.tar.gz 302450 BLAKE2B 7247b11adaf9a65a2e071ca17b55038fe85f5842fb4155b44dbfa82bae5774e4cd2f7a5557d40cb1a7ab7f554233f15abe297e10568a1630b464ab6a600d978f SHA512 0295eff6dfbbf9d7a82349b8e5ed9e7dad700f2f0bfcab879d906e30bfbb4d28b8779fd9076108ac9b1594a60ca5e30c5035e2f8ceae44add99c28a843027609
-EBUILD eglot-1.6.ebuild 670 BLAKE2B a1ca6c70ae3da6d338162f14bb0e778ef8eab25545622f1fcfc0e38df1df31588194cd3e7b8988c33dc39373b2c4bdeaad251cbd3e551ff16273936f33fc8d1b SHA512 77c26b1afba7513e8e3bf286003fd0a82971762b36cf78dfcda6101a03d043201c9d2b4e27a9773043ac62fe2d64c6bf25b74efc946d0b1f639219c928343ef7
-EBUILD eglot-1.8.ebuild 670 BLAKE2B a1ca6c70ae3da6d338162f14bb0e778ef8eab25545622f1fcfc0e38df1df31588194cd3e7b8988c33dc39373b2c4bdeaad251cbd3e551ff16273936f33fc8d1b SHA512 77c26b1afba7513e8e3bf286003fd0a82971762b36cf78dfcda6101a03d043201c9d2b4e27a9773043ac62fe2d64c6bf25b74efc946d0b1f639219c928343ef7
+EBUILD eglot-1.6-r1.ebuild 675 BLAKE2B de5c3a0d57e367649e80cb8724d9ac06ac20e8fae912faed9b2be8391eb2b23431f504a9116d1ba5064d616c8621cdbe6194710d9016c07cc7d4c9d7b931854d SHA512 d6f9cb4b5b89ec77b34c782f3a4ab2372b6db31f46700a669b0b678f2a537db89154e5d29ea1934b2e8a20cfd2e3cd4b04301823c96b30313af6dbb022477c80
+EBUILD eglot-1.8-r1.ebuild 675 BLAKE2B de5c3a0d57e367649e80cb8724d9ac06ac20e8fae912faed9b2be8391eb2b23431f504a9116d1ba5064d616c8621cdbe6194710d9016c07cc7d4c9d7b931854d SHA512 d6f9cb4b5b89ec77b34c782f3a4ab2372b6db31f46700a669b0b678f2a537db89154e5d29ea1934b2e8a20cfd2e3cd4b04301823c96b30313af6dbb022477c80
 MISC metadata.xml 701 BLAKE2B 436bc9f2720fad7cc3a7bcf9597a820317617ad7522e72c05417d6b9e1cb9c37d171ce5e24741b5730ab6708a0bcafacc8f41df3d4108926868887dc6ee25df3 SHA512 457dec4f625c37429917085c187e7c21ad1155217f79980033a7c0ecf62da941d340433ccbcbd5ae36a028aed7ab0cd1204e74985e36844e31829dab288c4fa8
diff --git a/app-emacs/eglot/eglot-1.6.ebuild b/app-emacs/eglot/eglot-1.6-r1.ebuild
index 913bb955411f..b5463a817ab2 100644
--- a/app-emacs/eglot/eglot-1.6.ebuild
+++ b/app-emacs/eglot/eglot-1.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/app-emacs/eglot/eglot-1.8.ebuild b/app-emacs/eglot/eglot-1.8-r1.ebuild
index 913bb955411f..b5463a817ab2 100644
--- a/app-emacs/eglot/eglot-1.8.ebuild
+++ b/app-emacs/eglot/eglot-1.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/app-emacs/eglot/files/50eglot-gentoo.el b/app-emacs/eglot/files/50eglot-gentoo.el
index b8a7e2b65eed..c3b894cc43c8 100644
--- a/app-emacs/eglot/files/50eglot-gentoo.el
+++ b/app-emacs/eglot/files/50eglot-gentoo.el
@@ -1,2 +1,2 @@
 (add-to-list 'load-path "@SITELISP@")
-(load "@SITELISP@/eglot-autoload.el")
+(load "@SITELISP@/eglot-autoload.el" nil t)
diff --git a/app-emacs/eldev/Manifest b/app-emacs/eldev/Manifest
index 3d2807b4b2f6..c0607df27f31 100644
--- a/app-emacs/eldev/Manifest
+++ b/app-emacs/eldev/Manifest
@@ -1,4 +1,8 @@
 AUX 50eldev-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST eldev-1.1.1.tar.gz 214901 BLAKE2B 42ca0089519fc97cb3cd89718eee2eef5c14d1b4cfd0864524a8a5cd22855e1fbd399233229951f3356b7f9ff6d69bbe5ed8abd8c6ae6129fae67279f900ce53 SHA512 4665bde0337a224e34fb3ec81fc6013a38800770e81e2b0911c7e05cb958fb18846995cba1494f84ae1299e1e4374645de3173ad12b01b379b61759b3c893032
+DIST eldev-1.1.2.tar.gz 215487 BLAKE2B f34af28c43b9799935a73892561fbe0a28feeb864c05bef9d3fd234cff905096bf84cd12570ac3da00b89b99edc891f13e39ed6c6574e07a67d45db0e25d604c SHA512 59742d1b50be10759dd90aa81e5a80c0c52e3f32b45d458a9774f98f37459682cb5de03c248e4c8dd664f53a8f6253db1dc93a3958a4e74306c50e20e578ef56
 DIST eldev-1.1.tar.gz 214028 BLAKE2B 2e4a7b15df3e897df5fd029c9c2e298d46dd75316810dc5b859c933b818b65b53dd33451d6e284ec4a24de7de251f24225c8641d44f545db62f4f1777c776ab7 SHA512 acdea3eba36c7d1f06111c31b6e6467ec3b33ca42e06af64c0f67dbb2cbba631223c41dabba51eddf668920ab1eb4f75eaef2fe03a9bdd44163a2bc903cfb1ed
+EBUILD eldev-1.1.1.ebuild 1149 BLAKE2B 2934e5c1b708cd0f46b9940452ffdfdfbfcf49bf9db0107f169e76d7128403f8b1bbf545709f64052e8d8410ae54db280714edc97f7836d87f7722c411240469 SHA512 57c6d579e2f77a6738a515f30a6498b2c90010a98f063e43fe9c702267c054111e85374a5b5829595a6df4a02331232509b298d511e7b05e0364bd441ebe20c9
+EBUILD eldev-1.1.2.ebuild 1149 BLAKE2B 2934e5c1b708cd0f46b9940452ffdfdfbfcf49bf9db0107f169e76d7128403f8b1bbf545709f64052e8d8410ae54db280714edc97f7836d87f7722c411240469 SHA512 57c6d579e2f77a6738a515f30a6498b2c90010a98f063e43fe9c702267c054111e85374a5b5829595a6df4a02331232509b298d511e7b05e0364bd441ebe20c9
 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.1.ebuild b/app-emacs/eldev/eldev-1.1.1.ebuild
new file mode 100644
index 000000000000..3f35959f7270
--- /dev/null
+++ b/app-emacs/eldev/eldev-1.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/eldev-1.1.2.ebuild b/app-emacs/eldev/eldev-1.1.2.ebuild
new file mode 100644
index 000000000000..3f35959f7270
--- /dev/null
+++ b/app-emacs/eldev/eldev-1.1.2.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/emacs-common/Manifest b/app-emacs/emacs-common/Manifest
index 4227f2d9fe17..f850cdda2900 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 2887 BLAKE2B 424c23ebee25afba5431f8c16303a700ab33c4d310ee6d671eeeedb564f272f37da0c31f49ca1df87f236552fe1266541521795dc92afd9f32813e5fd9d4a037 SHA512 600a1b41f6cda15f19f82283fd4e3d6583cf641f2f4717ca7d6b9882a1bc884167169ed2943df54045d932aedef2cf4a2e867ea0ddc35d4c5aea39ec5539b7dc
-MISC metadata.xml 361 BLAKE2B d6ce072291bc875d0af89563bd19f9b64b5d7bdf02a369b9885bec238c3b08d4a2b1c7c8b65f5140c80c9e9f0178100bd2932b75b707094c80409157af126026 SHA512 f76df6b1e6606e8bed92b5a86ff26eb9876b2d385f1ca7feeed0df22cd82314735cf90cbffda0c462ae14930de3dd70460e6209281da1993141fe97dfcc88605
+MISC metadata.xml 440 BLAKE2B 6a1645bfaa43e74316908aeadd3920b9279ae9b94cb0c9a231b020e16dcd63521aed390d76e00bdc11f10045ff29d02566666b17b826fab2a79bd0e2ec69176d SHA512 7654fa1d91f82e1f9cfdaf7f0e5f8f270fd22e96d63736979e64a018b3a55a5874f838b6dfca07191afda50b46e4fe9f8a4a3db7080ffbb16ce5715852bb967d
diff --git a/app-emacs/emacs-common/metadata.xml b/app-emacs/emacs-common/metadata.xml
index 97d4e64ff0cd..866f5b95b83c 100644
--- a/app-emacs/emacs-common/metadata.xml
+++ b/app-emacs/emacs-common/metadata.xml
@@ -9,4 +9,7 @@
 <use>
   <flag name="games">Support shared score files for games</flag>
 </use>
+<upstream>
+  <remote-id type="gentoo">proj/emacs-tools</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-emacs/emacs-daemon/Manifest b/app-emacs/emacs-daemon/Manifest
index ccb3c363b76b..1cc5c26839da 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 1605 BLAKE2B b09a01d83b917e85e6cfc1399d5c209a562042a4781c3ceef0d3c832e86f876aad922a9c9e4e0956e459dd9132eec24e0029f63653d13adac5b8c06a1471b388 SHA512 10a2794632df7313018e9eb64ccd09263fdc6e6cac6046faa5864b3450e7154255df327ce4fce377550f937806721e21f07bfa1e5102567b08b39a3a5793e76e
-MISC metadata.xml 283 BLAKE2B 81c49021199f71096079a27f9121390fb8c1285c54b9478583ff2d647277fa106ef12456d7097c4be092fc48b514a1adcf855ca0fac911598232ef9eb7f102c0 SHA512 f32b303760addf5d4db8d18bd10fb677353cdfa4c5e545d47804ef756cf5e5a21f8b8efb631b08f802185913ceb98da820e404e06eb03d01fe9ea85c10d1ac13
+MISC metadata.xml 362 BLAKE2B 59c9e3025bdd347e4812d6485bda2b731a1b0adf2eec16aefdd6b0d3379a949cd99c637febfcab0c6314c457eafe0727a986196e4499aa29dbd297a6a0458d66 SHA512 5882c9372b62c44189426a1ea3ac975e29b70fc5b5d30a3f024edced82d9406e118e9acee91b1353c76eb65f19008e4bb1475f859509c933be48c03aa701394b
diff --git a/app-emacs/emacs-daemon/metadata.xml b/app-emacs/emacs-daemon/metadata.xml
index 986088003fe1..0f54c377923e 100644
--- a/app-emacs/emacs-daemon/metadata.xml
+++ b/app-emacs/emacs-daemon/metadata.xml
@@ -6,4 +6,7 @@
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
 <stabilize-allarches/>
+<upstream>
+  <remote-id type="gentoo">proj/emacs-tools</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-emacs/epc/Manifest b/app-emacs/epc/Manifest
new file mode 100644
index 000000000000..045db3c9dc2e
--- /dev/null
+++ b/app-emacs/epc/Manifest
@@ -0,0 +1,4 @@
+AUX 50epc-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST epc-0.1.1.tar.gz 158462 BLAKE2B afbaa496799ac698af885872ab3409ac0e7b27d1299c0450aec75cad6d213fc4efe5b6c2dc48a383b9b061c457accfea81dd821062a7027b781f005cba67e35e SHA512 c6c6e9c2f241ca275b807a387c4fb6916edb02c390d7bc350388d729e2214d7fe5addb7ea634bebc75aa09e510ab2d141ae6a197b328d1f506ee51660a5b8ddc
+EBUILD epc-0.1.1.ebuild 649 BLAKE2B 8947a807e28a1ae0885a7e0ab486b8a6bba7f5e8d75ba8f6943947f008e2dfc6af5df0d4a108db117e80df36f9e2e321f9d6b0cb14d0f7261547a544f2229f23 SHA512 382105a4269c089e38cc747644602ce368f7cee2cac28ada05898a060c55e2c118f155dce1dc9ea58f5d22412adfd63cfffdd13157ca29b2154a9e68c68671bb
+MISC metadata.xml 425 BLAKE2B 83112e87e10dc5e7d0bfbaedc9e5f426be8402ca62383dabc37234dfe2bb31e8cdc46cf235140c83e4319e3d0a7a533d8f5445c1f7a7397da3a074a9bb731426 SHA512 56db95632e644c0733ad83ae3d8ffa36f6805087d59ce3f7dac428b1ef2e6e3bb85b72e10af673b047e1aafaf96cde9faef3049c840859af974f886df2ad86e4
diff --git a/app-emacs/epc/epc-0.1.1.ebuild b/app-emacs/epc/epc-0.1.1.ebuild
new file mode 100644
index 000000000000..631dd47f8e71
--- /dev/null
+++ b/app-emacs/epc/epc-0.1.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="RPC stack for Emacs Lisp"
+HOMEPAGE="https://github.com/kiwanami/emacs-epc/"
+SRC_URI="https://github.com/kiwanami/emacs-epc/archive/${PV}.tar.gz
+			-> ${P}.tar.gz"
+S="${WORKDIR}"/emacs-${P}
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+RDEPEND="
+	app-emacs/ctable
+	app-emacs/deferred
+"
+BDEPEND="${RDEPEND}"
+
+DOCS=( readme.md demo img )
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	${EMACS} ${EMACSFLAGS} -L . -l epc.el -l epcs.el -l test-epc.el \
+		-f ert-run-tests-batch-and-exit || die "tests failed"
+}
diff --git a/app-emacs/epc/files/50epc-gentoo.el b/app-emacs/epc/files/50epc-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/epc/files/50epc-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/epc/metadata.xml b/app-emacs/epc/metadata.xml
new file mode 100644
index 000000000000..582f1c4f32f0
--- /dev/null
+++ b/app-emacs/epc/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-epc/issues/</bugs-to>
+    <remote-id type="github">kiwanami/emacs-epc</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/esup/Manifest b/app-emacs/esup/Manifest
new file mode 100644
index 000000000000..127e154f28f1
--- /dev/null
+++ b/app-emacs/esup/Manifest
@@ -0,0 +1,4 @@
+AUX 50esup-gentoo.el 121 BLAKE2B 07a96ee443b10db2b385f9e1a1cc2937da5fa3707bb983259bb3196f357871a6b77389f614a5a5fb4f7071e161e9745317d9ed71e691fbbf862402eaa020ac8b SHA512 a826c4a4a2c66d29b8abc913373aad21a6a1e8a31c807052438d10a92abe02e083752db896f015bd4075f4038f2e321b6f0a11983ec23358fc4e9855ca96ee1f
+DIST esup-0.7.1_p20220203.tar.gz 54747 BLAKE2B 09d07300796b0874bbfe4c91f91ba9d56000e097c3ead2759d284f113ee3a34701952662f5e37a32cac889e9811b0ec53dbf93c7104d8530434c5fbb6fffb7da SHA512 4b361121273c8791f107e9b883bd6983d6be23f1abd9187347c510a4c11d8e8edf3b533aa7af561f869f9ebc8b1a6f12e5351127d30e8fd4127eface290cf8c7
+EBUILD esup-0.7.1_p20220203.ebuild 768 BLAKE2B fdd105cb9da06a20b6bb0ccf3cc7a34011bd381a139d9d6121033d5c5f81c527546d8f1aee21740e10f2f08cdfe5d65cf72c8473debbd1d5d6504461de8520a6 SHA512 d4dd16cf901fae63b2e95dc0dd933856eab54e13cb7e77069ab466a15c669ce03d857aa624a660a8377d3c876979df9e99259c3054b590a001c88d530a9db8a9
+MISC metadata.xml 713 BLAKE2B 0c4512dcbc81412e13084fde4fb12762492881ca8e69c8108628ed613c5b9fe97391379896c6c37ee0d6917db8fd5b937476f5d2945e8b2eb5696d7bbb660871 SHA512 2d9802de757ae62e32b4870e7f9b3a75ffaacd652717945a1f51479f7f188af92b7a03bb198783330e5a97e0cf3882b7a41c89cdaae1a9791e16333edbf0bde3
diff --git a/app-emacs/esup/esup-0.7.1_p20220203.ebuild b/app-emacs/esup/esup-0.7.1_p20220203.ebuild
new file mode 100644
index 000000000000..e3d78933734e
--- /dev/null
+++ b/app-emacs/esup/esup-0.7.1_p20220203.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=4b49c8d599d4cc0fbf994e9e54a9c78e5ab62a5f
+NEED_EMACS=25.1
+
+inherit elisp
+
+DESCRIPTION="Benchmark Emacs Startup time without ever leaving it"
+HOMEPAGE="https://github.com/jschaf/esup/"
+SRC_URI="https://github.com/jschaf/${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/s"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		app-emacs/buttercup
+		app-emacs/dash
+		app-emacs/noflet
+		app-emacs/undercover
+	)
+"
+
+DOCS=( README.md esup-screenshot.png )
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	buttercup -L . -L test --traceback full test || die
+}
diff --git a/app-emacs/esup/files/50esup-gentoo.el b/app-emacs/esup/files/50esup-gentoo.el
new file mode 100644
index 000000000000..0cd16df3f8e9
--- /dev/null
+++ b/app-emacs/esup/files/50esup-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'esup "esup"
+  "Profile the startup time of Emacs in the background." t)
diff --git a/app-emacs/esup/metadata.xml b/app-emacs/esup/metadata.xml
new file mode 100644
index 000000000000..de9476cad492
--- /dev/null
+++ b/app-emacs/esup/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/jschaf/esup/issues/</bugs-to>
+    <remote-id type="github">jschaf/esup</remote-id>
+  </upstream>
+  <longdescription>
+    Esup profiles your Emacs startup time by examining all top-level
+    S-expressions (sexps). Esup starts a new Emacs process from Emacs to
+    profile each SEXP. After the profiled Emacs is complete, it will exit and
+    your Emacs will display the results.
+  </longdescription>
+</pkgmetadata>
diff --git a/app-emacs/evil/Manifest b/app-emacs/evil/Manifest
index 0de223ee956d..28ddecfe6b59 100644
--- a/app-emacs/evil/Manifest
+++ b/app-emacs/evil/Manifest
@@ -1,5 +1,7 @@
 AUX 50evil-gentoo.el 99 BLAKE2B 9ebd3d4d3a09091e822cbb6bc8d50890c6b46d627ef83d9d6ad8b518f0dd11a766ede08898746b0cd7e2657aa584c58535927716dfacf656802e840e13b4b861 SHA512 fb934f37d51412b59b8d5a7d27a7791d2db547bf1d71fd0a5b85bd31d24e2a663e92272095b6b2fe0cf44cac6ae69ed1a422b6b4ef0c6533e004018cfa6011b3
 AUX evil-1.14.0-emacs-28.patch 340 BLAKE2B 04d82c7e54a07ca2bcd503b89c178237d5a9293e1339cd622b0bf49ef8ae95a9a794c7a9564a5011a5e3667c7dbf7ee36064c874c71f0c98b37293ac9ad09e4f SHA512 02e88ec81760b4dc7e6512f0bf3ec78f91d06ac025fc4028c213e0bfddf5238de41a2838c5228091ae7d25914e44537a87494f2dd7ba316876d0202818a8af1a
 DIST evil-1.14.0.tar.gz 410031 BLAKE2B 85613c3e69812ce9f34b23c57e9d3c86084332ef08b3a87a508db27db6cae3c255087b07bb94d2fa4614ec82f46856b75250d22dbae15cf5194740598975eced SHA512 9d45534ec3242f86cf39884647b495b0c7a4e06875ba7f4581f43b0f22216bd9deb9a09b39b3e5a25c004e5707ed24a275b8a59572bbcaea4ef37787320492f0
+DIST evil-1.14.2.tar.gz 394472 BLAKE2B b73f3995bb799285b738083c9119cf9222a8be78e69d4b5bb54c8d50091fb28395102a9a9c83faeb6668eb77a97c6132cbdb06a78205a43e87a5f5f7f8457bdf SHA512 531b55c5043fed21f175a932a49b62f00a713fea84b6cd91037993c0ed5d64fdfe137b9be6423d8b82da11ba8944805cab7d51f764572a247debe24cab0d4c01
 EBUILD evil-1.14.0.ebuild 678 BLAKE2B 632866bf2a52b50f474cc24be4d05c04134394f5e8f7c5e737d617ca7e8b58d445139362378cab142332fab0e20c64f879c657dcbd27dcf950d82d8d4f5ba526 SHA512 8a4b72d67e90152e1694bbc39add91c4a8ccd4090d0da891d8753d47742684e0524fb5b2329dd471e945918b42a1dd46c2006751e86fb4abdfce5798e3bcfa94
+EBUILD evil-1.14.2.ebuild 634 BLAKE2B 5bc480dcdfe0f183c931eda4cfd48a8afc20c1e5b9d6e4741192e9534d6d81cdd52bcfe4eaa1fa74fcfd0a5ee38e248a5947d5527f4b1726bd85e1fd6d67837e SHA512 066dc58bfd07825a7530f5e444f698cbf60b8fa5ac0f7b7a68b6be44e8ff7d3d754fa79e76bd12c411a95cf207a46902cd03ac060111998a098ba130eb729f00
 MISC metadata.xml 283 BLAKE2B 81c49021199f71096079a27f9121390fb8c1285c54b9478583ff2d647277fa106ef12456d7097c4be092fc48b514a1adcf855ca0fac911598232ef9eb7f102c0 SHA512 f32b303760addf5d4db8d18bd10fb677353cdfa4c5e545d47804ef756cf5e5a21f8b8efb631b08f802185913ceb98da820e404e06eb03d01fe9ea85c10d1ac13
diff --git a/app-emacs/evil/evil-1.14.2.ebuild b/app-emacs/evil/evil-1.14.2.ebuild
new file mode 100644
index 000000000000..b81cd5a8431d
--- /dev/null
+++ b/app-emacs/evil/evil-1.14.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="Extensible vi layer for Emacs"
+HOMEPAGE="https://github.com/emacs-evil/evil"
+SRC_URI="https://github.com/emacs-evil/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+ FDL-1.3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+RDEPEND=">=app-emacs/undo-tree-0.6.3"
+BDEPEND="${RDEPEND}
+	sys-apps/texinfo"
+
+ELISP_REMOVE="evil-pkg.el evil-tests.el evil-test-helpers.el"
+ELISP_TEXINFO="doc/build/texinfo/evil.texi"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="CHANGES.org CONTRIBUTING.md README.md"
diff --git a/app-emacs/f/Manifest b/app-emacs/f/Manifest
index 3fae737772a8..bdaafd8ebd26 100644
--- a/app-emacs/f/Manifest
+++ b/app-emacs/f/Manifest
@@ -1,6 +1,6 @@
 AUX 50f-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
 DIST f-0.19.0.tar.gz 19477 BLAKE2B 47cfb8c876e11cae7eca61815085c4290f65f9d72a7c5d397d8b53f6d57421f46997786556074027de5405acbf38ddb42ecbb767c809763e84d880286e6942dc SHA512 694eca1872cb0a0da7f75f610e4101993a79a5e7601c3f72fd2c642b1a44f5eada24777313b5166d901d9d983c18b4d412b4c6f01c382ace7530bacaa3b67c56
 DIST f-0.20.0.tar.gz 19907 BLAKE2B 20b82a19b227d2e0863e540e75bc5094c0cf267eae00d699ff5b00fa574213d303135c246c454c92785080feae63ba6c529b115aeb1368774dd548852d94fb48 SHA512 0c44e63cd527a37bd5582d5a2a4cb2269d179930d7f41b378b9100ad5bb4518291b02197b1d55e1bf603bb5b1c12181b982d9b9a3f8fbd48860f6e86ea36c03e
-EBUILD f-0.19.0.ebuild 526 BLAKE2B c8f84f7ea67d86cccf39dccb13e887026da2c4a52b16c9cbf9272c62694af5dbf5666a0688d0e8c8bad8d5b3639040676df11cbcad4ef1eb7eb4e325ecfeb4ba SHA512 f56bdbcd85b0aae7c3c70d3b9edee58ef668f9f12939f4f87e705d64d68dccd28f97e2838c0dfcdd6f64be780a5628af349507c9601fc054b6f536a4ca24e356
-EBUILD f-0.20.0.ebuild 541 BLAKE2B 8483c4ea300583a939361c7738abb84d9ac8b524509f79fd8ecc2a500bf061422359e6c7e76b3a3be9b06a04cda7f85c24daba4a54dff7616d5726e6eaf4fc47 SHA512 87510b9d844aa5b99b5048ead021920783747485d924c610d14dd81c21f126e580f612bcc597b976e00a73d1fe79f3621c624c6a4c414bd075ebf69af6633053
+EBUILD f-0.19.0-r1.ebuild 523 BLAKE2B 62e8f52b873e9a4e879689547677301f0d31627bdff7cb3b7ae18f28c1854ba4ce46cb134fbb26240353de5972b24464e5503ca7a7b7e7575fb34dcb134fbea7 SHA512 c11136a9763e32d3ad8fc58000d8849f3c4c1e823483ae1a8c7a711e79c5524b60bfb491f9a8206ad0c018ed432420ffe86516fae2e882c56827e5b61847f42b
+EBUILD f-0.20.0-r1.ebuild 541 BLAKE2B 217d1f81ce726f117401526a646cb9ba65d5af368fa506ced181cc92aeebd3c319f0370212a65dffec8a64d5c9d0f5a52c5071fde6ba0e37240e7bfb892aee4e SHA512 4df9fe0600f0f5300831bf57b875988b642ed2276321ef0d2c3fe6c652a4f657c4b34288b82d11699eb66a4b020fd7012b962e67f3cc0efc34e7b9cd01f43810
 MISC metadata.xml 357 BLAKE2B a60c6938e7ac515ba2a2455784adc08fc1271acbdb8cffe5f78fb28eb532c491fa102dda5207a46b65c45e9eee680e18e5adcbae9ead84eb2ba7fdc785818533 SHA512 3a326f0132b4e6619d3c280d2740b231d03a00c3a9b5d77be10a017435cefe645be2f1c8a83e4a34336da5511a87913406b31be06e8e46de280dee3221b45a3b
diff --git a/app-emacs/f/f-0.19.0.ebuild b/app-emacs/f/f-0.19.0-r1.ebuild
index 72b552759a6e..c87a18f235d6 100644
--- a/app-emacs/f/f-0.19.0.ebuild
+++ b/app-emacs/f/f-0.19.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit elisp
 
diff --git a/app-emacs/f/f-0.20.0.ebuild b/app-emacs/f/f-0.20.0-r1.ebuild
index a26344476647..70ca0a2b0183 100644
--- a/app-emacs/f/f-0.20.0.ebuild
+++ b/app-emacs/f/f-0.20.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit elisp
 
diff --git a/app-emacs/flycheck-guile/Manifest b/app-emacs/flycheck-guile/Manifest
index c85c66295aee..2708ebc725bb 100644
--- a/app-emacs/flycheck-guile/Manifest
+++ b/app-emacs/flycheck-guile/Manifest
@@ -1,4 +1,4 @@
 AUX 50flycheck-guile-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
 DIST flycheck-guile-0.2.tar.gz 15138 BLAKE2B db557f69c3069ff378724438954e65f35dddba15a80211c33f06a12a1f8e72881f2b9e717bbf83d52e6b80f877ac8229ed8431669a1780c8aeaf458a577afa79 SHA512 7689ba434bbb53724bed6c60a36e48578f8f00a4d8bf2a82e2e6e6a08a3180b2b83de2f0659202d500fd04469b1528f5867c4f6a12a3579f143d1b4749149ae2
-EBUILD flycheck-guile-0.2.ebuild 588 BLAKE2B b6b7aec9861afa61bc81ca20cae799b88361c29e9712bc496988be09d88d5e30d9223631afdb0510625119eb800f67963e8d659c5051e314df847e8928738015 SHA512 a458da979fc80236b16ce78f417e2d0089bc90f64bfce2a5e74c1ef0d723bea06d3044209420401ff27e9ac9c141c1756705d6b011ca355fbe035df27f667a03
+EBUILD flycheck-guile-0.2-r1.ebuild 591 BLAKE2B 845e2a984792bb5a5aa1c5dacaf2d0bf68c7410640769c9c19bdd3f6c203c729fea671712602c8e9bd744f5b8675c91c2bce735d92c21913a62ee2d68009473a SHA512 6031fc82937c71484fc6dc0b14a35cedc4624583777dcbdfd8c7c8af4209a26767c1c09a4fe12020dd15f62d230d83cd9860cf8ab1450b21c473ecb1fcf8e161
 MISC metadata.xml 563 BLAKE2B 30d09ba125549e1a8dc7b873aba8bcbf21dee273f1c31c7a40ec2409cc81f0566f365ac1ef4eb8c6f5b565a4006a5233349b402197fae147a0096a06e0c4778f SHA512 5df30cd0d0b49a9c718d8eeaca573aa85e916f53c81d90cb1794329376f2a737d165983e053676669af3743a4c9c1bbf80a5f15915d7652151b22de4eb0d742a
diff --git a/app-emacs/flycheck-guile/flycheck-guile-0.2.ebuild b/app-emacs/flycheck-guile/flycheck-guile-0.2-r1.ebuild
index f20480a76901..b131c4eb444a 100644
--- a/app-emacs/flycheck-guile/flycheck-guile-0.2.ebuild
+++ b/app-emacs/flycheck-guile/flycheck-guile-0.2-r1.ebuild
@@ -16,12 +16,14 @@ LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
 
-RDEPEND="
-	>=dev-scheme/guile-2.0.0
+BDEPEND="
 	app-emacs/flycheck
 	app-emacs/geiser-guile
 "
-BDEPEND="${RDEPEND}"
+RDEPEND="
+	${BDEPEND}
+	>=dev-scheme/guile-2.0.0
+"
 
 DOCS=( README.md )
 ELISP_REMOVE=".dir-locals.el"
diff --git a/app-emacs/flycheck-nimsuggest/Manifest b/app-emacs/flycheck-nimsuggest/Manifest
new file mode 100644
index 000000000000..498e00e1634f
--- /dev/null
+++ b/app-emacs/flycheck-nimsuggest/Manifest
@@ -0,0 +1,4 @@
+AUX 50flycheck-nimsuggest-gentoo.el 207 BLAKE2B b76b4b655986a7b5478fb2eccb826d36a2ff976a390ed732290ebdbac71075c8a603348b58d43d71d69b8ac79ee8a76ce3538dcc9d0950b5a1087db6ce9ca8e0 SHA512 adc9c25b70cbcc903f978157f5ff9eb9f791519a898344f107422d593945dd0bf21e474d04cb595e98936f2ef1ca5ddd0def9e1818496e5bddbef78289ddba37
+DIST flycheck-nimsuggest-0.8.1_p20171027.tar.gz 2651 BLAKE2B 22bb16b6498b5bbaaba9971875a31a58e47849f3a8a03f314c957a7e59e0b61c236eb7325de9cd2899d6d05deea953ac36d7cff1c7f78e5d7d3d0a6e9c2ce81a SHA512 fe84c88617195d8ec5010c5aa551e38edd78326919748b83e8e9a6257cf0d79da70f5f804e57cd343a749816c3c4be3ce1158fd6698bc8382cd92fce0b0e9def
+EBUILD flycheck-nimsuggest-0.8.1_p20171027-r1.ebuild 624 BLAKE2B be62068463dd5c3c6d0dc72565894428bb6b8569056b2cce64598b564cbcc4a4141cb391e466b73dfbe776ab6db6b40590dc07a8048d93c182c2fa24ca5c6bae SHA512 6fa2cf1efdb10625f014d2355c067923f0b1af7a546ed117585bbecdda7422690c96ac956d3c3b97d8f7b2bdb1c0b9de0d0446b9074c35f21a7dcd20c5cc669b
+MISC metadata.xml 451 BLAKE2B a884a62a0b2c25afb38c78a9d3c36cf08994191c6ff59fe6d74041c82e7f420de0b72c69d1eba6a62f5ab6ae5052ddf4afea68e13bf3faa58e08f4b04453b294 SHA512 8dcd0f3388ecb08b0575006b1cf891a07b896021be245cec5b3cfe91e6b300275eb26e299ea331e35452c99024817751c72867c466a63a39f0f478e120932941
diff --git a/app-emacs/flycheck-nimsuggest/files/50flycheck-nimsuggest-gentoo.el b/app-emacs/flycheck-nimsuggest/files/50flycheck-nimsuggest-gentoo.el
new file mode 100644
index 000000000000..c6dd1b34d406
--- /dev/null
+++ b/app-emacs/flycheck-nimsuggest/files/50flycheck-nimsuggest-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'flycheck-nimsuggest-setup "flycheck-nimsuggest"
+  "Setup flycheck configuration for nimsuggest.")
+(add-hook 'nimsuggest-mode-hook 'flycheck-nimsuggest-setup)
diff --git a/app-emacs/flycheck-nimsuggest/flycheck-nimsuggest-0.8.1_p20171027-r1.ebuild b/app-emacs/flycheck-nimsuggest/flycheck-nimsuggest-0.8.1_p20171027-r1.ebuild
new file mode 100644
index 000000000000..531b18f31247
--- /dev/null
+++ b/app-emacs/flycheck-nimsuggest/flycheck-nimsuggest-0.8.1_p20171027-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=dc9a5de1cb3ee05db5794d824610959a1f603bc9
+NEED_EMACS=24.3
+
+inherit elisp
+
+DESCRIPTION="Emacs Flycheck backend for Nim language using nimsuggest"
+HOMEPAGE="https://github.com/yuutayamada/flycheck-nimsuggest/"
+SRC_URI="https://github.com/yuutayamada/${PN}/archive/${H}.tar.gz
+			-> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${H}
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64"
+SLOT="0"
+
+BDEPEND="app-emacs/flycheck"
+RDEPEND="
+	${BDEPEND}
+	dev-lang/nim
+"
+PDEPEND="app-emacs/nim-mode"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/flycheck-nimsuggest/metadata.xml b/app-emacs/flycheck-nimsuggest/metadata.xml
new file mode 100644
index 000000000000..84dbc42ae1d5
--- /dev/null
+++ b/app-emacs/flycheck-nimsuggest/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/yuutayamada/flycheck-nimsuggest/issues/</bugs-to>
+    <remote-id type="github">yuutayamada/flycheck-nimsuggest</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/flycheck/Manifest b/app-emacs/flycheck/Manifest
index edcfdaa1cdbc..77bfa47d6cb0 100644
--- a/app-emacs/flycheck/Manifest
+++ b/app-emacs/flycheck/Manifest
@@ -1,7 +1,7 @@
-AUX 50flycheck-gentoo-r1.el 77 BLAKE2B db43c9dc9e2527a60f0f47441f98271dd427b83ad65d27805eabff5f3a4c0bff0275cd740a01a3b0f457497d2cdf6b7edc41f2ac2d66e2b28cf0b61528b220d1 SHA512 5df5cd028f22f616459d86bfac2dde03221da27a98c9e721879df1f2bbae1df06fdba7aa4f4a8c26e97f59d717f883b595b808d49b4ed800ca92e8476cf3bac5
+AUX 50flycheck-gentoo-r1.el 83 BLAKE2B 5d35105289d99c3e33102c6f5d84135600ad4fcff435a7c691972a259071702cb240e17bee12e9dc61386e7f2397d5a6fdd52187f4beeb91e84855285a4c0f3b SHA512 e89e263133108f2a5be2539abc2fc67134d49217ca8db8da9fe3faa4107b32d42896875797811c879a6f1f4746a1f097acc38e6c1cefe093570d6de023cd4f09
 AUX 50flycheck-gentoo.el 168 BLAKE2B e1a9855c04e42743261f2d1483772fac65c8c6a30702aefbff97cb6e90d631e4e6e862f93b3bdba175d83c4e9dd95db5b13e07fb8a428cdda4e046d58cbae71f SHA512 a1a6bfe0a380d948e3e2e6b7f3d7034aaf25f110966ab991a04f818d493892d9cd50078cb709205189e7a7f59ea052ab16b5e4d4c43f66c1f0b3dfd2ada00988
 DIST flycheck-32_p20210825.tar.gz 1042020 BLAKE2B 1663340de24980b3a1e58929e327841b743495dbd5d5c8306f007d0dfa989707015ceadaf6e5cac673eddb45adf9ec05dc35d8cb35af322c9cde6644194dd75d SHA512 472e25956d804e7f7ba8ebda2e3a7527eaaf3aee47fa5bd43a46ae651f94d857657cf4594f5a1ed0c169ec0ac610139956d182818ffeedf2c4132a5583ca870d
 DIST flycheck-32_p20220328.tar.gz 1037565 BLAKE2B 385d73e9ccae06db09d23819600317b807b7ff8cf0679be510cac27d539e57374fffd67575687067e8d6beeae66472b2831a5ece4adbe7b85da9b484dc8b6346 SHA512 f2c5dad66a1bae826f1b48242d3b1202cf41615fa2eadba55c4aabbbd9616ca873ba93c8c9f53cbefc22587b70ed1a2cd4fcbdcb2d6caf13d0c21c4d36e4ffc7
 EBUILD flycheck-32_p20210825.ebuild 704 BLAKE2B 839051da4eb453f2796f02e08e7c713679d2cc77807bafed0d95fdd99988f7441206024bc1cfd12efc0f7d44cb687852fe654b75d31bda53d1b182fd5457ff8c SHA512 cf5ad3096aeb05ac0e6c13bde5929db94c2a24576033a3c1dbd2bac7864fef83c16ab59e6966f7da61e249e17b6471177cb8fc9bfcd958a72d73288dd11269fb
-EBUILD flycheck-32_p20220328.ebuild 778 BLAKE2B dc923386a63c836ce23477b7387b5ab80967ef809fe8b48887a30ccc876955a3eb67401b2fb41aff8864896fb1c33658bae1d6ab32c96f8421f1b9fae9a8deaf SHA512 ea5fb0122e86fe9f1a6d8df529f473c88de8f0a1d36180f75ad398b62d1c8cc026d0c4fbdd9d02e25edb3a1cece6f5de1aaedf5b513a2882633cca4ae6b5eb58
+EBUILD flycheck-32_p20220328-r1.ebuild 778 BLAKE2B dc923386a63c836ce23477b7387b5ab80967ef809fe8b48887a30ccc876955a3eb67401b2fb41aff8864896fb1c33658bae1d6ab32c96f8421f1b9fae9a8deaf SHA512 ea5fb0122e86fe9f1a6d8df529f473c88de8f0a1d36180f75ad398b62d1c8cc026d0c4fbdd9d02e25edb3a1cece6f5de1aaedf5b513a2882633cca4ae6b5eb58
 MISC metadata.xml 909 BLAKE2B a1d56af4275d1d9dd4a1352981621332404a6d7f1205f7dbe503fae4f4c53cb7d9ab2639a1fd908350e27940ebcb1e2a808be05570d9fb96fc06261c067028fa SHA512 335378ba433d26c7e4992f8cdfc6dc0cb44f64fb28c86c715d602947c63d4ec147904063e3a64933a7d037f3a1ac9f271d2d7b66e065708b17ab3106a6010b2a
diff --git a/app-emacs/flycheck/files/50flycheck-gentoo-r1.el b/app-emacs/flycheck/files/50flycheck-gentoo-r1.el
index 46ab676a9a2a..84a054e0738e 100644
--- a/app-emacs/flycheck/files/50flycheck-gentoo-r1.el
+++ b/app-emacs/flycheck/files/50flycheck-gentoo-r1.el
@@ -1,2 +1,2 @@
 (add-to-list 'load-path "@SITELISP@")
-(load "@SITELISP@/flycheck-autoloads")
+(load "@SITELISP@/flycheck-autoloads" nil t)
diff --git a/app-emacs/flycheck/flycheck-32_p20220328.ebuild b/app-emacs/flycheck/flycheck-32_p20220328-r1.ebuild
index 0d92a6a59ff8..0d92a6a59ff8 100644
--- a/app-emacs/flycheck/flycheck-32_p20220328.ebuild
+++ b/app-emacs/flycheck/flycheck-32_p20220328-r1.ebuild
diff --git a/app-emacs/fsharp-mode/Manifest b/app-emacs/fsharp-mode/Manifest
index 968a296ea607..348d6d149ccc 100644
--- a/app-emacs/fsharp-mode/Manifest
+++ b/app-emacs/fsharp-mode/Manifest
@@ -1,4 +1,6 @@
 AUX 50fsharp-mode-gentoo.el 184 BLAKE2B 381798f016470b06d444b3187161b33aee39cc9512e53b26d925299818dd91a3bea0accef5cc8390e40216cd6db9c1db56399a3f6afe8810f49c62987e718af7 SHA512 d199454deaefaff33e55b7e3af0230de753b9700458366452372ed958bbefeca506f5ce670551e0906905291c6e6a02a5b5169c84dc48dcb459bbdc1d33e24e2
 DIST fsharp-mode-1.10_p20211229.tar.gz 78916 BLAKE2B 4cd9182c62ea0d5c7a23f2120586d4c74d16fad14762ecdb3f11a11d6c78c757b363d5c14473c10c47086c1c0e648911846fe039dfedc04fd1d84301b4aa10c5 SHA512 b02be4c8e56a2c22b7f6e6a302756278d9056e7d8b8c206c183aea5470b98610b73a3403c83e93da295d3b4d0092a4f2f1c0bdf78f701009478a3c8b1e054ab7
+DIST fsharp-mode-2.0.tar.gz 80880 BLAKE2B e8de665216ac9e147d63d168abc9aebf3cf2ca6a5a6ea9f8afe45c3329d692fa0342a1c3afb982dcdb1b59e1f348e1a307e0ce6a09f708c782b32595bc74106f SHA512 bcb95995604404c42147b636d101dfcaba61945b7ef30196a0e41c138bfd0901c744ca73e36438bae14c1727030f05fc4fcc07aef06f25d46394777ff58537db
 EBUILD fsharp-mode-1.10_p20211229.ebuild 761 BLAKE2B 88844e3e5498fb866fd173073812b313d82e515f6c1419d784529d21916c7bb4be47b650f25bd26a02f08d918b9988603b0824b3675ad67401e31197ae5c149e SHA512 d673df564771e194072664791e8c7584960476022f52f48cea908138903e6ea7c91e2829d01d79c03afda4910e78adce608b0f0929e68677edd16ed1ecaaa6b8
+EBUILD fsharp-mode-2.0.ebuild 684 BLAKE2B 77bad1004abd8557923823d6e64c55d470991b0124699167a45aab229cc7677bbf71456c88351b7d85486afd844437b3aa6d80a340cf760fd6d54bc1dd86808e SHA512 2992bb9e1d54d63d9add5aa4a2d41b9e7e09d582bb018443323598782f155b30daf877842e03e2617a2c904dec1ba5fd3ea3bbdae8f505ee5923d13adb92737e
 MISC metadata.xml 533 BLAKE2B d0fff1e8fff09a4d096a94bc372a479a44cbb67c9aa7118ed3080690b136bd446d273b9f00a99536691f3b6bce23e46ede67d505a017b0212e459dd74300ac01 SHA512 a99fa4d18c561c0c8eb4c81a96c4cd477d2f15d8d50f4f5cb951fcafcd77e134977105c186f8ffbe7bd00db126fc218d6a006b7fdc2d29400bb0c6c05dd81b8a
diff --git a/app-emacs/fsharp-mode/fsharp-mode-2.0.ebuild b/app-emacs/fsharp-mode/fsharp-mode-2.0.ebuild
new file mode 100644
index 000000000000..61a5b9cc24b4
--- /dev/null
+++ b/app-emacs/fsharp-mode/fsharp-mode-2.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=25
+
+inherit elisp
+
+DESCRIPTION="Support for the F# programming language"
+HOMEPAGE="https://github.com/fsharp/emacs-fsharp-mode/"
+SRC_URI="https://github.com/fsharp/emacs-${PN}/archive/${PV}.tar.gz
+			-> ${P}.tar.gz"
+S="${WORKDIR}"/emacs-${P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( app-emacs/buttercup )"
+
+DOCS=( CHANGELOG.md README.org )
+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/git-modes/Manifest b/app-emacs/git-modes/Manifest
new file mode 100644
index 000000000000..3c575ea61813
--- /dev/null
+++ b/app-emacs/git-modes/Manifest
@@ -0,0 +1,4 @@
+AUX 50git-modes-gentoo.el 73 BLAKE2B f756bc038b5b0c6dec420176142336902f9a350bb63ac5a10ac51895e28d1f0a5446ef1f959ce10638b97ebd1f6405ece3b2e101238ec835f62d91fe0b189cea SHA512 56c251fa8100e882225d0220f6ce656bf8012fe47ab9dd3a98c240a01e257689ab6867a8fcb6f9d11b911fb958ab3950589cd238434f27e10ca86aaecae74d69
+DIST git-modes-1.4.0.tar.gz 18218 BLAKE2B 7e08ce42d683d4a8224df6255304e3beb7db2a5d97f6c758bf229e020dd3c0e5ed5f75acf9a7fdf8a5d313b904cc59d0de1419244067a5975d5174f45aca0071 SHA512 2511575a4d5d578fca5bde50e103d0fe777eed9bc3c520d5172aff7c65baa47a0a0f633e0950b7efb3eaa891debd3e34df3612d713412d547bb58733c9f00cbc
+EBUILD git-modes-1.4.0.ebuild 501 BLAKE2B 14c50372dd97d8df166e20ad6f8a4bff45f7405b861d6d4cbbc5e5e64fea45d4b46e3a4f63c318a682e79d5f68f41fb0e9adba368de5a779d0b412be79dbc1f4 SHA512 424e4a22002cce2d5bda8dee2c11b1b6dd93cb5672855ea2c19f3ecc3c72fbd1aff060f21eab2a1d45ca2f44bae6c8d6eaad43998b3c59e518cb5a0b32488312
+MISC metadata.xml 419 BLAKE2B 6e3a5051a08003fb5450a0a4a9eb68df7c91878d1f61c7f5dbb58569dc1235ee4101f69a8d6bb35c846c3a78bfbf5f2e0fdfadd69a359e159818b3b145b04a5e SHA512 31f2551caca2dcb46aefdf851e01fc518260b6b8900d76c86106c7789f74de306357d4f0fa2e9852d9a8bad91253284cf5a68e6d66004a1e0abf25ba6a82ad58
diff --git a/app-emacs/git-modes/files/50git-modes-gentoo.el b/app-emacs/git-modes/files/50git-modes-gentoo.el
new file mode 100644
index 000000000000..db930d7eed5c
--- /dev/null
+++ b/app-emacs/git-modes/files/50git-modes-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(load "git-modes-autoloads" nil t)
diff --git a/app-emacs/git-modes/git-modes-1.4.0.ebuild b/app-emacs/git-modes/git-modes-1.4.0.ebuild
new file mode 100644
index 000000000000..42d918ba7cc7
--- /dev/null
+++ b/app-emacs/git-modes/git-modes-1.4.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=24.3
+
+inherit elisp
+
+DESCRIPTION="Emacs major modes for editing Git configuration files"
+HOMEPAGE="https://github.com/magit/git-modes/"
+SRC_URI="https://github.com/magit/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp-compile *.el
+	elisp-make-autoload-file
+}
diff --git a/app-emacs/git-modes/metadata.xml b/app-emacs/git-modes/metadata.xml
new file mode 100644
index 000000000000..8d7670cb22a9
--- /dev/null
+++ b/app-emacs/git-modes/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/magit/git-modes/issues/</bugs-to>
+    <remote-id type="github">magit/git-modes</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/haxe-mode/Manifest b/app-emacs/haxe-mode/Manifest
new file mode 100644
index 000000000000..f59173dc072a
--- /dev/null
+++ b/app-emacs/haxe-mode/Manifest
@@ -0,0 +1,4 @@
+AUX 50haxe-mode-gentoo.el 169 BLAKE2B 60bedbe88c9c0209967b00d106f1ff8ba02e3a3a74e77cf8bfb78ed74367abc05701209da57491a02f2d89ef250b531a17227980ce12febd35579bb949003e16 SHA512 49091b98c8148ff34dc8ec0190bcc58877611e6dfe2f3d71f4d00877694e86991825034de554e41cfa558558d0abe3d89d21a892929b862a727d7602563be500
+DIST haxe-mode-0.3.3.tar.gz 16146 BLAKE2B 17a74cb363cbd4483c1a99cd94fea89dd05f034bd53d339773cd61bd2e2151b58efdf64bef12fbe05709597e5f13c450e4b5a248a8fa0e12b4d8b3500909000a SHA512 14eb2cce5cb158f8d5bab0a948ce8b66ab8cfcf858cae828ec471bf67d95181b3044ad1f2e47c03b58d81ec505c5bb2c30611b612f080a4cf6ae98f3572c41fd
+EBUILD haxe-mode-0.3.3.ebuild 417 BLAKE2B 276021ce7e91a2382a67e898e194d736c830e88842efa1ad383de304fadaf4c589ee563c4bbe8b21dad000c6bc972957a195bd0dc0079d73d6a4fa941d57495c SHA512 0515ef25f7eaebe43b081ca98e35e171ccdd0ecfbc041081b632971f51f12ab78d94d5d67493b5341468da9228d9cd34f665f742ec711f10776e55599df10aae
+MISC metadata.xml 437 BLAKE2B 9d9b65f5a8643e06dfb63e77729c6595af40b22f1c1fdcae57fdedd1a1d9d1f0285571aea86940e0cb66d8697b6a4c6732b154b737a6bfc8740d1ab0fcb8a7e8 SHA512 18c5d688c8df15b2e8e537baf298b5134abfd999bd89969fbbdadc02e87ad50dee2a667254acbb474f6b52ed851c137d484a001446bd2eb387a60914f6e5744a
diff --git a/app-emacs/haxe-mode/files/50haxe-mode-gentoo.el b/app-emacs/haxe-mode/files/50haxe-mode-gentoo.el
new file mode 100644
index 000000000000..8cb604ca7227
--- /dev/null
+++ b/app-emacs/haxe-mode/files/50haxe-mode-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'haxe-mode "haxe-mode"
+  "Major mode for editing Haxe code." t)
+(add-to-list 'auto-mode-alist '("\\.hx\\'" . haxe-mode))
diff --git a/app-emacs/haxe-mode/haxe-mode-0.3.3.ebuild b/app-emacs/haxe-mode/haxe-mode-0.3.3.ebuild
new file mode 100644
index 000000000000..09f43e36f9ba
--- /dev/null
+++ b/app-emacs/haxe-mode/haxe-mode-0.3.3.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="Major mode for editing Haxe files"
+HOMEPAGE="https://github.com/emacsorphanage/haxe-mode/"
+SRC_URI="https://github.com/emacsorphanage/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/haxe-mode/metadata.xml b/app-emacs/haxe-mode/metadata.xml
new file mode 100644
index 000000000000..19adea939501
--- /dev/null
+++ b/app-emacs/haxe-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/emacsorphanage/haxe-mode/issues/</bugs-to>
+    <remote-id type="github">emacsorphanage/haxe-mode</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/helm/Manifest b/app-emacs/helm/Manifest
index ce30d664e3ec..bea353453bba 100644
--- a/app-emacs/helm/Manifest
+++ b/app-emacs/helm/Manifest
@@ -1,9 +1,7 @@
 AUX 50helm-gentoo.el 79 BLAKE2B 7f188281cba0bf1f683977149ffa01f2bf6679cec1d73553e27c445ebcf97d2a6b227d09c77a01dadce49e755d97cc572af4fc5358ca35866a4c12dd8caa61b6 SHA512 30d2ce1f8073f15439cc6d68620e9ca776ed74fdedfca4944d7d749891f33aa2ad1dccffdfb85f1e1049460015daf2104f0b9cd0f5b872c5d5c5ee1eccd25b21
 AUX helm-3.8.0-no-autoload-check.patch 629 BLAKE2B 23ae68b3f15b6a7b8bbe1c7c22c897ead11abf6c7ad4280767f69c58edbb9cbe8528968e859d45e4ff76d13ac3ae4016a0818f674cb5b53d69441733343e958b SHA512 cb8192855f474cf43e3f2247f84d00ca6b2b190164c3a50940e09e771650db5860923256cb482cbd4f1d3f0b5bd964c688d6124a129c80850786c39245c034da
-DIST helm-3.8.0.tar.gz 3943168 BLAKE2B cee9ed8eafdf01cb2109dcf5289522f4a0d9db9a8626097a1ffc3bdeaee792b072b7b27e635ef360815a354c9796b55fc4b3921784e2fd0d655387507df208b6 SHA512 0aec3d4270205c61cabc991dd39d5bac3b10e827f362819e9fb85880985ce2c7e7c7b8f73d2f0cde5b5c168d4b9857e0379f1e4ca9395dbd8f083c1a707ad3f2
 DIST helm-3.8.4.tar.gz 2346120 BLAKE2B 2f554a6a3fc3a42ba2761c267d085ad1e6679f4913bc19cdbbff11130922d93d2fbe75bcae8230748c39148b6e42d45d4c2c711f731ebd4a1984c5927d93d290 SHA512 011cc4eb79a0a6916404428b9f645e4401b8a0b8b473bec88ac4211d4157b78cc673922c1b74dc93d60cf036135a67bd9c174198b63edd63a6d26a40ba9c1b9d
 DIST helm-3.8.5.tar.gz 2349290 BLAKE2B 84f0c15c2a9f492246defdf9496e8dcc5265b0c60b50ccaaa3b9f6731285a667da919da7fec80d77a4fd11bc83d9f4ae4c0910e31423b58afbdf00d51b070295 SHA512 af727553c29c9fa0ba6eb6a73b25d62855ea4413eebc57baf3ed94be6a0240e4c558193c898430dc21132ba5e32ead584514910bf98b3b8d82adf7828f953652
-EBUILD helm-3.8.0.ebuild 652 BLAKE2B 8daea4061ce9eba2fc25791b412e6605fe5ee76a9b3dd58e34b5d72b4547c68389eab20af5d00c23117a026326c2c6e5f247f33c8b02ecacd2d2fce1901ac588 SHA512 e6f3335e3f0ffbaf6e5e812002daecdeef04fbb74aaef431bee64677fdc2d9b4d12ce36bac356c28c35f1303161cbbdc9f6b2b83ddd67b6750a8608998b501f4
 EBUILD helm-3.8.4.ebuild 659 BLAKE2B e3cad45c98c77c77b7b4db89070d84fcc5709fa315e7b8a5e0f6df7054665cd4d380d3a2e2d45a8376d02b368efe9477026fefca855365b425366571083aa1d8 SHA512 414fbc4a5080f8ac17607bf41bc2d84d0fffec6b3c8b3b25462133ab55245ed424995e89f3d1c574280bc6e56386162fba7c2ce7de4ca5243ee8302f4786d841
-EBUILD helm-3.8.5.ebuild 661 BLAKE2B d65c558348be095c07eb87c6ffd38cedccd85b53efb410cae71109145d8b73429416f68701f2b0fe080b130052d06d257d1f3dcba84e60c5ed3212d5ded75722 SHA512 ed8b176c6f6c6540304c5b231d7d422fbc81bdd30297f8cef32ac037507bfbcc5ab6d15dbdec83c155e309834c2e63bd7095ce713acdfbb252db46baae1be84f
+EBUILD helm-3.8.5.ebuild 659 BLAKE2B e3cad45c98c77c77b7b4db89070d84fcc5709fa315e7b8a5e0f6df7054665cd4d380d3a2e2d45a8376d02b368efe9477026fefca855365b425366571083aa1d8 SHA512 414fbc4a5080f8ac17607bf41bc2d84d0fffec6b3c8b3b25462133ab55245ed424995e89f3d1c574280bc6e56386162fba7c2ce7de4ca5243ee8302f4786d841
 MISC metadata.xml 822 BLAKE2B 5de057ddb881d67550d3e8cd0be43d3328b8e7a38b98338ffccec147095cd5d8f8bc68695c797a872e2ed7e455859fc1d6170f414231016edab5a8d742ad2a40 SHA512 08367530e4e47577e1812d229b97094b9c012c4c91eb7e69f5724e98d8790327fe35fb9b480cf33eedd105f1fd85133c39397eda0426461d80bdee704a51c55a
diff --git a/app-emacs/helm/helm-3.8.0.ebuild b/app-emacs/helm/helm-3.8.0.ebuild
deleted file mode 100644
index c7df4d68e4d9..000000000000
--- a/app-emacs/helm/helm-3.8.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp
-
-DESCRIPTION="Emacs incremental completion and selection narrowing framework"
-HOMEPAGE="https://emacs-helm.github.io/helm/"
-SRC_URI="https://github.com/emacs-helm/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="app-emacs/async
-	app-emacs/popup"
-BDEPEND="${RDEPEND}"
-
-PATCHES="${FILESDIR}/${P}-no-autoload-check.patch"
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	elisp-compile *.el
-	elisp-make-autoload-file
-}
-
-src_install() {
-	elisp_src_install
-	dobin emacs-helm.sh
-}
diff --git a/app-emacs/helm/helm-3.8.5.ebuild b/app-emacs/helm/helm-3.8.5.ebuild
index 76b566bbf23a..68aff2bea3b6 100644
--- a/app-emacs/helm/helm-3.8.5.ebuild
+++ b/app-emacs/helm/helm-3.8.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/emacs-helm/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="app-emacs/async
 	app-emacs/popup"
diff --git a/app-emacs/howm/Manifest b/app-emacs/howm/Manifest
index d9bd56e1391a..0dee7a7d9a2a 100644
--- a/app-emacs/howm/Manifest
+++ b/app-emacs/howm/Manifest
@@ -3,4 +3,4 @@ DIST howm-1.4.5.tar.gz 565221 BLAKE2B a28e98e9b955c6172c7b9e51d8f157e22e87846cb2
 DIST howm-1.4.8.tar.gz 566903 BLAKE2B 0c4dee89147acb40051be18833ec4027bebc81102af2571e15fc06a9c6cefd3d1f0334008550321ad81ec28b44151bc9bc5ab4db8ad376cc4726fd571a77076d SHA512 e95a7e3287cd1cdb1c51d99b00627f8824e1c2a470a1a986910b8e79cd79234a0032c9d92dd5009bb6c09911c1d8848cb0fc585ecce8f5d1020cd5bbe2d36aa8
 EBUILD howm-1.4.5.ebuild 586 BLAKE2B 6f328010f39e208a8463f1a0e72ccbc8505b4bd6e1bda58607b3198bddfa0d643f85a5c46971ecdb0891aaaa36c65dba2ed146112796b989070aceed623fda51 SHA512 40f755ba685936fa2cc210bd5e5b8fbc1aad7c6677f585f847a3125fe36bc2a74f70d13d5c423553bf40840dc2b318f09fcb3f95742a20a7aedb6ecdac36c9fd
 EBUILD howm-1.4.8.ebuild 586 BLAKE2B 43770a31054e6017a1b615fff66ea0b134423d398423067d1648cc9b578c80f190d855a8ba70d9dac2d8333442960e4c8c4e085d17bbbb71cbff3029d7865b71 SHA512 92d0b428ce59fb8ab9a175d9016f20c15ed2ca11294a04280fab115967f03dc1bb2bc69dacd35a42d39941d4198c4ed43886d516773c752b2fc40d3d85415f7b
-MISC metadata.xml 358 BLAKE2B 738584fc22a4ab43e8a653795dae70796de589fe529e9f99852d4c6d36f4e536648c0ddddff947f913786fc8447e7560e86e2ac2304916fe29f9c0830ed0b0de SHA512 d1c40d0a2c7514b89b28b150fba1eeb1627cb96f897d22b2aaa90088cf260f3cc7ba0efa02dc2ca58d5b28ea501e5f93c17588be2aa783e7ba80b222b435d244
+MISC metadata.xml 348 BLAKE2B 0e8a3991348e1c85923ce09cb0f7c204f3ed54dceb21ac3e6486639b0aa62b22b2f65b5e27c772de2bce47640b52870351ac383dbc7dda8c1b5664daad21c465 SHA512 a9d32b288103b34a65b9f4c8bc91be29cb68ae8d09d5c23006cd6a99e3691eed953bb99f59f16a701096c77299659165bccaafcb49a6a96d72e0f2542e4ad057
diff --git a/app-emacs/howm/metadata.xml b/app-emacs/howm/metadata.xml
index ed6fc8964aba..2b4e7aa7a84a 100644
--- a/app-emacs/howm/metadata.xml
+++ b/app-emacs/howm/metadata.xml
@@ -7,6 +7,6 @@
 </maintainer>
 <stabilize-allarches/>
 <upstream>
-  <remote-id type="sourceforge-jp">howm</remote-id>
+  <remote-id type="osdn">howm</remote-id>
 </upstream>
 </pkgmetadata>
diff --git a/app-emacs/ivy/Manifest b/app-emacs/ivy/Manifest
index 8fb01188294f..3026af4a0971 100644
--- a/app-emacs/ivy/Manifest
+++ b/app-emacs/ivy/Manifest
@@ -1,5 +1,5 @@
 AUX 50ivy-gentoo.el 98 BLAKE2B 4d474a2c101b1cee20da1c56e5336b31df2a75cf5bf24251ba4c72c9d7cfb6cad9cac61923ca1d5ae83370e94cae545cb276cfa6df3f7bd528bd36fdb9e3156a SHA512 ccd9987b868c613535465b9c3041fb2a8c44561b678fe7bf40a276dff272deafb4bc14ce61228ed9cc27f2d0439652aa888e07c0120f6e2a246b0b5fa30a246e
 AUX ivy-0.13.4-ivy-test.el-skip.patch 1352 BLAKE2B b45c62f336e903d35514c00d8f3f1c922b4191c96c0ad4dfcaede594449f075909d77d012cd162e16d6e442c32101124af10db9e2e7d1dcb1a38270a581562a8 SHA512 f56b610d973b9aa62e5474012c1a3ef61a2be39f1d828e714576e15bb5e53d3e9ea8891915db5cee347b747be8b19c8849ab2912eb3a2f2e522160ee6573c1f2
 DIST swiper-0.13.4.tar.gz 245190 BLAKE2B c4da021b92fcedfec39cc60f670c97e4a421b8d4aef8183f50c4872bed835db79884cff113f58cf21dfa7ce33158218aa0cf25d72fc0081dc1c24a3b4376c60e SHA512 bf096a13f675f87af6ea68c974455896b64921ca4d7880c9ccc444aa3cea7c7e04c61be5deb2fd57d0568ff4d86f96ffcf94494b55d84d7a9f647f49b69aec9a
-EBUILD ivy-0.13.4.ebuild 1399 BLAKE2B 0e2c9dccaf2baced75677fa0e3049a0f204684018362b11b833a5c23f0fec3a8eb2429868b26158c20995e5e0723d2a69b7824585bbdba5a2b61ae2e5e8ca9a4 SHA512 c89d34ca459b4ec5b4b3f2c6b8de83f04f2dacd21e4130a910daeaa55301b587b48b532d2333b5d9dc1012701a7f8af035cb10f9853e15a5d6f390288e76f1d9
+EBUILD ivy-0.13.4.ebuild 1360 BLAKE2B dbdc74b3bc68d7bc02f4ccd99841dbc2fb13dfbd9925733469f19cabfe174c1b1625a03d3f2e126b82babb58228e35025d54cc1ad74483689d78d7c6eb8095f8 SHA512 8eb0073f43936080f7e2faa327db3f6945889347481b074926545d49355d9190c4a368942c79a6da09def0d8d9a74a3d186cfb7ea3c8806f0388b49fe2c0e413
 MISC metadata.xml 571 BLAKE2B 26ca5a5dfb1bc67ad37086ddc2c2e5976d1b4c763789a27ee83fb08c4a106a21c33b4c9632a3f2858a6b6249c8c49da3e2eafa7efc5267b655c0c9b2066598e2 SHA512 1879881be5eaeb2a6bac023fd06476a2ccbd25909f7c2f722b4af3680db44b4d3a959e1ac864e86580813a0bc68a2120d936f1c2efd67a6738ee8d83a5adb6f4
diff --git a/app-emacs/ivy/ivy-0.13.4.ebuild b/app-emacs/ivy/ivy-0.13.4.ebuild
index 9736ba05dfd7..910a40158220 100644
--- a/app-emacs/ivy/ivy-0.13.4.ebuild
+++ b/app-emacs/ivy/ivy-0.13.4.ebuild
@@ -19,8 +19,7 @@ KEYWORDS="~amd64 ~x86"
 
 BDEPEND="sys-apps/texinfo"
 
-DOCS=( CONTRIBUTING.org README.md doc/{ivy-help.org,Changelog.org,ivy.org} )
-ELISP_REMOVE=".dir-locals.el"
+DOCS=( CONTRIBUTING.org README.md doc/{Changelog,ivy-help,ivy}.org )
 SITEFILE="50${PN}-gentoo.el"
 
 # Some tests are broken (but fixed on master as of 2022--04-10),
@@ -40,7 +39,6 @@ src_prepare() {
 
 src_compile() {
 	elisp-compile ${IVY_SOURCES[@]}
-
 	emake -C doc ivy.info
 }
 
diff --git a/app-emacs/jde/Manifest b/app-emacs/jde/Manifest
deleted file mode 100644
index 7264f7586b2f..000000000000
--- a/app-emacs/jde/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX 70jde-gentoo.el 406 BLAKE2B 236be929cb339aedb7025d80eacb0a548b72c50e04ce0020d8a4b99b87886a3a7f32bdde004b8d18cc7328f5b32766589b8b8780a22693fa8f14d0f7c7d1cb23 SHA512 9d7f65d67d897272c4aa24e3fa77abd217b077561d391ccec8181838d4e162f9086f95fb724ee9bba3bdd44f954f14d67c044ebd78a059a69bc0f12c03c0fc28
-AUX jde-2.4.0.1-classpath-gentoo.patch 2291 BLAKE2B 6eed82127107933d274218e72f052ab1d4b2a737f36ad0834b88724d2c9dc550f8480966fddaad902e5b63c98c98135ceb77cc7820fa0d1512dbe6607a69f6e6 SHA512 c18378500f04b2f6cbed5c4a20d03600ea01174faf93d460c1ea274c50ca95891096f49e471160255e4ec27cda2330ee6c28fe29e96633994c3d5f910876f848
-AUX jde-2.4.0.1-fix-paths-gentoo.patch 7175 BLAKE2B ee0e51e50afb1bcd86432f6546a0b2105a987b3b8a616dd88a21817667f362eb554bf6f6af41f3b0efe409654e4a3a6ea85f4f753e7c668081fad79228ce73f7 SHA512 179e6bd8cc0165ee1f0d3383aec76bdb97f6164562663fe577a9ef04ac236afeccf1137594d7d4d8962ce4577befeb81e393d03c08bf68473657de7e18debb7e
-AUX jde-2.4.1-doc-directory.patch 1806 BLAKE2B 6e13265c71beb4247aba97ddb05f7b500822f7a8f619c40dca229533497c101b93ee6d891a3c85e51f9d56f39b2fec229c44f922f1bc2d79b3b5942bed6913a5 SHA512 3818474077c2f387bdef6fb297a40b94529622e1da3fb31c3d7b3734111fb4e607062f9cdca9f1f5b020dec8d8e9e6601d5bf7831a20415f393f2f029e97c101
-DIST jdee-2.4.1.tar.xz 2742232 BLAKE2B f022cb55583acc7846bc04b59e843050947819c6bb2494bbe08ac3895c15d914df28d3c3a50cfd945efa7ed507cda9906a42866c85463907544095377cc1bf07 SHA512 5ce5f0f84b2502e9af808f33210511e8b7682902b1f342d678fe42dd8f9f3690b90ef7bb22583550eb769818782c50f545d6baf47b52bc7f4502fab411ab5359
-EBUILD jde-2.4.1-r2.ebuild 1908 BLAKE2B a563841edc5a24f340ee36ced4f2510a0b36e7e8488889767403a81efc045a1940a0dd5f4a31cad12563acd321e79f1f7bc8bd406a5c154b824da13951e49a00 SHA512 9e2abd3c2c5558237f352c4f56a7fb4b51cc612129994e8211337c5e276c71097f2ac9c796194b34befccc390a3123558a734fb95873e559f99330d1a36d2407
-MISC metadata.xml 991 BLAKE2B 657c5e22e11e634944730d2e8de9db43efa34950c8986fd8c856a0953a98659d648d57046a9a4b4890c3d6b7097a1d4cae3f4359c21d937466c35d5e4b7ba42e SHA512 86ff31fc86cc49666bcab4f446491dd56862b144a3e05f7e88723a500be82be12fffa909230b5a74a2fd67fbd7a9f20c9da9f44d0d264dfa84bc3b8423201e64
diff --git a/app-emacs/jde/files/70jde-gentoo.el b/app-emacs/jde/files/70jde-gentoo.el
deleted file mode 100644
index c7fff6a61b4d..000000000000
--- a/app-emacs/jde/files/70jde-gentoo.el
+++ /dev/null
@@ -1,10 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
-(require 'jde-autoload)
-
-(setq jde-java-directory "/usr/share/jde")
-(setq jde-bsh-jar-file "@BSH_JAR@")
-(setq jde-checkstyle-jar-file "@CHECKSTYLE_JAR@")
-(setq jde-checkstyle-style "/usr/share/checkstyle/checks/sun_checks.xml")
-(setq jde-html-directory "/usr/share/doc/@PF@/html")
-(setq bsh-html-directory "/usr/share/doc/@PF@/html")
-(setq jde-check-version-flag nil)
diff --git a/app-emacs/jde/files/jde-2.4.0.1-classpath-gentoo.patch b/app-emacs/jde/files/jde-2.4.0.1-classpath-gentoo.patch
deleted file mode 100644
index 47fdd4e11e47..000000000000
--- a/app-emacs/jde/files/jde-2.4.0.1-classpath-gentoo.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Initialise classpath for beanshell and checkstyle using java-config.
-Gentoo specific patch.
-
---- jde-orig/lisp/beanshell.el
-+++ jde/lisp/beanshell.el
-@@ -809,6 +809,14 @@
-   "BeanShell intended to be used independently of any other
- Emacs package.")
- 
-+(defun bsh-get-gentoo-classpath ()
-+  (or bsh-classpath
-+      (with-temp-buffer
-+	(call-process "java-config" nil t nil "-d" "-p" "bsh")
-+	(skip-chars-backward "\n")
-+	(setq bsh-classpath
-+	      (split-string (buffer-substring (point-min) (point)) ":+")))))
-+
- (defmethod initialize-instance ((this bsh-standalone-bsh) &rest fields)
-   "Constructor for the standard bsh BeanShell instance."
-   (call-next-method)
-@@ -845,7 +853,7 @@
- 	bsh-vm)
-      (executable-find (if (eq system-type 'windows-nt) "javaw" "java"))))
- 
--  (oset this cp bsh-classpath)
-+  (oset this cp (bsh-get-gentoo-classpath))
- 
-   (oset this startup-dir bsh-startup-directory))
- 
---- jde-orig/lisp/jde-bsh.el
-+++ jde/lisp/jde-bsh.el
-@@ -187,7 +187,7 @@
- 		       (jde-get-tools-jar)
- 		       (if ant-home (expand-file-name "lib" ant-home)))
- 		      (jde-pi-get-bsh-classpath)
--		      bsh-classpath
-+		      (bsh-get-gentoo-classpath)
- 		      (jde-expand-classpath (jde-get-global-classpath)))))))
- 
- ;; Create the BeanShell wrapper object.
---- jde-orig/lisp/jde-checkstyle.el
-+++ jde/lisp/jde-checkstyle.el
-@@ -305,6 +305,14 @@
-        (format "-D%s=%s" (car prop) (cdr prop)))
-      jde-checkstyle-expanded-properties))
- 
-+(defun jde-checkstyle-get-gentoo-classpath ()
-+  (or jde-checkstyle-classpath
-+      (with-temp-buffer
-+	(call-process "java-config" nil t nil "-d" "-p" "checkstyle")
-+	(skip-chars-backward "\n")
-+	(setq jde-checkstyle-classpath
-+	      (split-string (buffer-substring (point-min) (point)) ":+")))))
-+
- (defmethod jde-checkstyle-exec ((this jde-checkstyle-checker))
- 
-   (jde-checkstyle-create-checker-buffer this)
-@@ -327,9 +335,8 @@
- 		  (jde-checkstyle-get-property-args this))
- 		(oref this :interactive-args)
- 		(list "-classpath"
--		      (if jde-checkstyle-classpath
--			  (jde-build-classpath jde-checkstyle-classpath)
--			(jde-normalize-path jde-checkstyle-jar-file)))
-+		      (jde-build-classpath
-+		       (jde-checkstyle-get-gentoo-classpath)))
- 		(list jde-checkstyle-class)
- 		(list "-c"
- 		      (if jde-checkstyle-style
diff --git a/app-emacs/jde/files/jde-2.4.0.1-fix-paths-gentoo.patch b/app-emacs/jde/files/jde-2.4.0.1-fix-paths-gentoo.patch
deleted file mode 100644
index a129b588587c..000000000000
--- a/app-emacs/jde/files/jde-2.4.0.1-fix-paths-gentoo.patch
+++ /dev/null
@@ -1,218 +0,0 @@
-Make paths of directories and jar files configurable.
-
-Part of this patch was taken from Debian and heavily modified, see:
-http://patch-tracking.debian.net/patch/series/view/jde/2.3.5.1-5/0005-Set-the-location-of-needed-files-for-beanshell.el-an.patch
-
---- jde-orig/lisp/beanshell.el
-+++ jde/lisp/beanshell.el
-@@ -891,14 +891,21 @@
- 
- (add-to-list 'auto-mode-alist '("\\.bsh\\'" . bsh-script-mode))
- 
-+(defcustom bsh-html-directory
-+  (let ((jde-dir (jde-find-jde-doc-directory)))
-+    (if jde-dir
-+	(expand-file-name "doc/html/bsh-ug" jde-dir)))
-+  "Directory of the beanshell HTML documentation."
-+  :group 'bsh
-+  :type 'directory)
-+
- ;;;###autoload
- (defun bsh-script-help ()
-   "Display BeanShell User's Guide."
-   (interactive)
--  (let* ((jde-dir (jde-find-jde-doc-directory))
--	 (bsh-help
--	  (if jde-dir
--	      (expand-file-name "doc/html/bsh-ug/bsh-ug.html" jde-dir))))
-+  (let ((bsh-help
-+	 (if bsh-html-directory
-+	     (expand-file-name "bsh-ug.html" bsh-html-directory))))
-     (if (and
- 	 bsh-help
- 	 (file-exists-p bsh-help))
---- jde-orig/lisp/jde-bsh.el
-+++ jde/lisp/jde-bsh.el
-@@ -91,22 +91,59 @@
- 		   "The single instance of the JDEE's BeanShell."))
-   "Class of JDEE BeanShells. There is only one per Emacs session.")
- 
-+(defcustom jde-java-directory
-+  (expand-file-name "java" (jde-find-jde-data-directory))
-+  "Top-level directory of JDE Java files."
-+  :group 'jde-project
-+  :type 'directory)
-+
-+(defcustom jde-bsh-commands-directory
-+  (expand-file-name "bsh-commands" jde-java-directory)
-+  "Directory of beanshell commands."
-+  :group 'bsh
-+  :type 'directory)
-+
-+(defcustom jde-classes-directory
-+  (expand-file-name "classes" jde-java-directory)
-+  "Directory of JDE classes."
-+  :group 'jde-project
-+  :type 'directory)
-+
-+(defcustom jde-checkstyle-jar-file
-+  (expand-file-name "lib/checkstyle-all.jar" jde-java-directory)
-+  "Path of the checkstyle-jar file."
-+  :group 'jde-project
-+  :type 'file)
-+
-+(defcustom jde-regexp-jar-file
-+  (expand-file-name "lib/jakarta-regexp.jar" jde-java-directory)
-+  "Path of the regexp-jar file."
-+  :group 'jde-project
-+  :type 'file)
-+
-+(defcustom jde-jde-jar-file
-+  (expand-file-name "lib/jde.jar" jde-java-directory)
-+  "Path of the jde-jar file."
-+  :group 'jde-project
-+  :type 'file)
-+
-+(defcustom jde-bsh-jar-file
-+  (expand-file-name "lib/bsh.jar" jde-java-directory)
-+  "Path of the bsh-jar file."
-+  :group 'jde-project
-+  :type 'file)
-+
- (defmethod initialize-instance ((this jde-bsh) &rest fields)
-   "Constructor for the JDEE BeanShell instance."
-   (call-next-method)
--  (let* ((jde-java-directory
--	  (concat
--	   (jde-find-jde-data-directory)
--	   "java/")))
--
--    (oset this bsh-cmd-dir (expand-file-name "bsh-commands" jde-java-directory))
--    (oset this checkstyle-jar  (expand-file-name "lib/checkstyle-all.jar" jde-java-directory))
--    (oset this regexp-jar (expand-file-name "lib/jakarta-regexp.jar" jde-java-directory))
--    (oset this jde-classes-dir (expand-file-name "classes" jde-java-directory))
--    (oset this jde-jar (expand-file-name "lib/jde.jar" jde-java-directory))
--    (oset this jar  (expand-file-name "lib/bsh.jar" jde-java-directory))
--    (oset this separate-error-buffer jde-bsh-separate-buffer)
--    (oset-default 'jde-bsh the-bsh this)))
-+  (oset this bsh-cmd-dir jde-bsh-commands-directory)
-+  (oset this checkstyle-jar jde-checkstyle-jar-file)
-+  (oset this regexp-jar jde-regexp-jar-file)
-+  (oset this jde-classes-dir jde-classes-directory)
-+  (oset this jde-jar jde-jde-jar-file)
-+  (oset this jar jde-bsh-jar-file)
-+  (oset this separate-error-buffer jde-bsh-separate-buffer)
-+  (oset-default 'jde-bsh the-bsh this))
- 
- (defmethod bsh-create-buffer ((this jde-bsh))
-   "Creates the JDEE's beanshell buffer."
-@@ -150,6 +187,7 @@
- 		       (jde-get-tools-jar)
- 		       (if ant-home (expand-file-name "lib" ant-home)))
- 		      (jde-pi-get-bsh-classpath)
-+		      bsh-classpath
- 		      (jde-expand-classpath (jde-get-global-classpath)))))))
- 
- ;; Create the BeanShell wrapper object.
---- jde-orig/lisp/jde-bug.el
-+++ jde/lisp/jde-bug.el
-@@ -2438,10 +2438,10 @@
- (defun jde-bug-help ()
-   "Displays the JDEbug User's Guide."
-   (interactive)
--  (let* ((jde-dir (jde-find-jde-doc-directory))
--	 (jdebug-help
--	  (if jde-dir
--	      (expand-file-name "doc/html/jdebug-ug/jdebug-ug.html" jde-dir))))
-+  (let ((jdebug-help
-+	 (if jde-html-directory
-+	     (expand-file-name "jdebug-ug/jdebug-ug.html"
-+			       jde-html-directory))))
-     (if (and
- 	 jdebug-help
- 	 (file-exists-p jdebug-help))
---- jde-orig/lisp/jde-checkstyle.el
-+++ jde/lisp/jde-checkstyle.el
-@@ -322,10 +322,6 @@
- 	 (vm-path (oref (jde-run-get-vm) :path))
- 	 (source-file
- 	  (concat (file-name-nondirectory buffer-file-name)))
--	 (jde-java-directory
--	  (concat
--	   (jde-find-jde-data-directory)
--	   "java/"))
- 	 (args (append
- 		(unless jde-checkstyle-expanded-properties-file
- 		  (jde-checkstyle-get-property-args this))
-@@ -333,13 +329,13 @@
- 		(list "-classpath"
- 		      (if jde-checkstyle-classpath
- 			  (jde-build-classpath jde-checkstyle-classpath)
--			(jde-normalize-path
--			 (expand-file-name "lib/checkstyle-all.jar" jde-java-directory))))
-+			(jde-normalize-path jde-checkstyle-jar-file)))
- 		(list jde-checkstyle-class)
- 		(list "-c"
- 		      (if jde-checkstyle-style
- 			  (jde-normalize-path jde-checkstyle-style)
--			(concat (jde-find-jde-data-directory) "java/lib/sun_checks.xml")))
-+			(expand-file-name "lib/sun_checks.xml"
-+					  jde-java-directory)))
- 		(if jde-checkstyle-expanded-properties-file
- 		    (list "-p" (jde-normalize-path jde-checkstyle-expanded-properties-file)))
- 		(if jde-checkstyle-module-package-names-file
---- jde-orig/lisp/jde-dbs.el
-+++ jde/lisp/jde-dbs.el
-@@ -907,9 +907,6 @@
- 		  (jde-normalize-path 'jde-run-working-directory)
- 		source-directory))
- 	     (vm (oref (jde-run-get-vm) :path))
--	     (jde-java-directory
--	      (expand-file-name "java"
--	       (jde-find-jde-data-directory)))
- 	     (vm-args
- 		(let (args)
- 		  (setq args
---- jde-orig/lisp/jde.el
-+++ jde/lisp/jde.el
-@@ -1722,14 +1722,19 @@
- jde.el."
-   (jde-find-jde-data-directory))
- 
-+(defcustom jde-html-directory
-+  (expand-file-name "doc/html" (jde-find-jde-doc-directory))
-+  "Directory of the JDE HTML documentation."
-+  :group 'jde-project
-+  :type 'directory)
-+
- ;;;###autoload
- (defun jde-show-help ()
-   "Displays the JDE User's Guide in a browser."
-   (interactive)
--  (let* ((jde-dir (jde-find-jde-doc-directory))
--	 (jde-help
--	  (if jde-dir
--	      (expand-file-name "doc/html/jde-ug/jde-ug.html" jde-dir))))
-+  (let ((jde-help
-+	 (if jde-html-directory
-+	     (expand-file-name "jde-ug/jde-ug.html" jde-html-directory))))
-     (if (and
- 	 jde-help
- 	 (file-exists-p jde-help))
---- jde-orig/lisp/jde-jdb.el
-+++ jde/lisp/jde-jdb.el
-@@ -1459,10 +1459,10 @@
- 
- (defun jde-jdb-help ()
-   (interactive)
--  (let* ((jde-dir (jde-find-jde-doc-directory))
--	 (jdb-ug-path
--	  (if jde-dir
--	      (expand-file-name "doc/html/jdb-ug/jdb-ug-frame.html" jde-dir))))
-+  (let ((jdb-ug-path
-+	 (if jde-html-directory
-+	     (expand-file-name "jdb-ug/jdb-ug-frame.html"
-+			       jde-html-directory))))
-     (if (and
- 	 jdb-ug-path
- 	 (file-exists-p jdb-ug-path))
diff --git a/app-emacs/jde/files/jde-2.4.1-doc-directory.patch b/app-emacs/jde/files/jde-2.4.1-doc-directory.patch
deleted file mode 100644
index c96fcd861594..000000000000
--- a/app-emacs/jde/files/jde-2.4.1-doc-directory.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Move definition of jde-find-jde-doc-directory to jde-util.el.
-
---- jdee-orig/lisp/beanshell.el
-+++ jdee/lisp/beanshell.el
-@@ -82,7 +82,7 @@
- (eval-when-compile
-   (require 'cl))
- 
--(declare-function jde-find-jde-doc-directory "jde" nil)
-+(require 'jde-util)
- 
- (defgroup bsh nil
-   "Customizations for the Emacs inteface to Pat Neimeyer's Java
---- jdee-orig/lisp/jde-util.el
-+++ jdee/lisp/jde-util.el
-@@ -139,6 +139,17 @@
- 	  (if dir dir (jde-root)))
-       (jde-root))))
- 
-+(defun jde-find-jde-doc-directory ()
-+  "Return the path of the JDE documentation directory.
-+Returns  nil if the directory cannot be found. At some
-+point, XEmacs will include the JDE. Versions of XEmacs
-+that include JDE will store the JDE doc in a data
-+directory called jde. On all other Emacs versions, the JDE
-+expects to find the documentation in a subdirectory
-+named doc of the directory that contains the file
-+jde.el."
-+  (jde-find-jde-data-directory))
-+
- (defun jde-temp-directory ()
- "Get the location used by the host system to store temporary files."
-   (or (if (boundp 'temporary-file-directory) temporary-file-directory)
---- jdee-orig/lisp/jde.el
-+++ jdee/lisp/jde.el
-@@ -1762,17 +1762,6 @@
- 
- 
- ;; JDE help
--(defun jde-find-jde-doc-directory ()
--  "Return the path of the JDE documentation directory.
--Returns  nil if the directory cannot be found. At some
--point, XEmacs will include the JDE. Versions of XEmacs
--that include JDE will store the JDE doc in a data
--directory called jde. On all other Emacs versions, the JDE
--expects to find the documentation in a subdirectory
--named doc of the directory that contains the file
--jde.el."
--  (jde-find-jde-data-directory))
--
- (defcustom jde-html-directory
-   (expand-file-name "doc/html" (jde-find-jde-doc-directory))
-   "Directory of the JDE HTML documentation."
diff --git a/app-emacs/jde/jde-2.4.1-r2.ebuild b/app-emacs/jde/jde-2.4.1-r2.ebuild
deleted file mode 100644
index a4bcf20cc0e5..000000000000
--- a/app-emacs/jde/jde-2.4.1-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 elisp
-
-DESCRIPTION="Java Development Environment for Emacs"
-HOMEPAGE="http://jdee.sourceforge.net/"
-# snapshot of svn://svn.code.sf.net/p/jdee/code/branches/2.4.1 (rev 292)
-# (upstream's distfile misses build.xml)
-SRC_URI="mirror://gentoo/jdee-${PV}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-RDEPEND=">=virtual/jdk-1.8:*
-	dev-java/bsh:0
-	dev-java/junit:0
-	dev-util/checkstyle:0"
-DEPEND="${RDEPEND}
-	dev-java/ant-contrib:0"
-
-S="${WORKDIR}/jdee-${PV}"
-SITEFILE="70${PN}-gentoo.el"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.0.1-fix-paths-gentoo.patch"
-	"${FILESDIR}/${PN}-2.4.0.1-classpath-gentoo.patch"
-	"${FILESDIR}/${PN}-2.4.1-doc-directory.patch"
-)
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	elisp_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	local bshjar csjar
-	bshjar=$(java-pkg_getjar --build-only bsh bsh.jar) || die
-	csjar=$(java-pkg_getjar --build-only checkstyle checkstyle.jar) || die
-	sed -e "s:@BSH_JAR@:${bshjar}:;s:@CHECKSTYLE_JAR@:${csjar}:" \
-		-e "s:@PF@:${PF}:" "${FILESDIR}/${SITEFILE}" >"${SITEFILE}" || die
-
-	cd java/lib || die
-	java-pkg_jar-from --build-only checkstyle checkstyle.jar checkstyle-all.jar
-	java-pkg_jar-from junit
-	java-pkg_jar-from bsh
-}
-
-src_compile() {
-	ANT_TASKS="ant-contrib" \
-		eant bindist $(usex doc source-doc "")
-}
-
-src_install() {
-	local dist="dist/jdee-${PV%_*}"
-
-	java-pkg_dojar ${dist}/java/lib/jde.jar
-	insinto "${JAVA_PKG_SHAREPATH}"
-	doins -r java/bsh-commands
-
-	use source && java-pkg_dosrc java/src/*
-	use doc && java-pkg_dojavadoc ${dist}/doc/java/api
-
-	elisp-install ${PN} ${dist}/lisp/*.{el,elc}
-	elisp-site-file-install "${SITEFILE}"
-
-	dobin ${dist}/lisp/jtags
-
-	dodoc -r doc/html
-	find "${ED}"/usr/share/doc -iname "*makefile" -delete || die
-}
diff --git a/app-emacs/jde/metadata.xml b/app-emacs/jde/metadata.xml
deleted file mode 100644
index 2a92351c1b18..000000000000
--- a/app-emacs/jde/metadata.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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>java@gentoo.org</email>
-  <name>Java</name>
-</maintainer>
-<longdescription>
-  The Java Development Environment for Emacs is a software package
-  that interfaces Emacs to command-line Java development tools (for
-  example, JavaSoft's JDK). JDEE features include:
-
-    * JDEE menu with compile, run, debug, build, browse, project, and
-      help commands
-    * syntax coloring
-    * auto indentation
-    * compile error to source links
-    * source-level debugging
-    * source code browsing
-    * make file support
-    * automatic code generation
-    * Java source interpreter (Pat Neimeyer's BeanShell)
-</longdescription>
-<upstream>
-  <remote-id type="sourceforge">jdee</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/app-emacs/lean-mode/Manifest b/app-emacs/lean-mode/Manifest
index 384ac2892a38..e52355288389 100644
--- a/app-emacs/lean-mode/Manifest
+++ b/app-emacs/lean-mode/Manifest
@@ -1,6 +1,8 @@
 AUX 50lean-mode-gentoo.el 181 BLAKE2B 9221df43fd3d0693dc02e4730972b6b815c1bc14054b9f0394ba370f03471e7bc68bf271dd13ca8b30289dc88743a15c05ce6c0043ff94a8d099408350264fa0 SHA512 36faf0476fae472bc509efc939036b527fecb67685bc5d8ab4887ab205a9ce3a197c001480967e5cd351901d5a9a7ee57a06de3d74a03dbb9c4237cd4d08ccae
 DIST lean-mode-20211220.tar.gz 46406 BLAKE2B ff7663ae41befed9ce30aeeb0462e6877b827367823e97330b18c741db76162f49b0ce0dca58585892d173e91e290d155320f97416ff4306958dd38f1e452e83 SHA512 23f1d24a4ffdcbff0266cf6e3fd6ddefcd6f380ecab6e21a73cfcbb2a281200f3c22482a19b97988af316a3e206ab3069abf4eb3d45a9ccff7e0f18018b1dab5
 DIST lean-mode-20220124.tar.gz 46725 BLAKE2B 3f1f31cd6005570439d609f3cf9565f5adbd124772264ccc301bf8f9dda23d0b023e0afc703cfc572c3faee3498315852873effa3963203d6567ed029a1e14ed SHA512 292193a83847e034625d60825eec669b3d26591fab9e93448fc8e685935db5bfbb3417ae4e8d32facead40d02031b67f15dbaa52f7214b70343e7e677aa3cd6a
-EBUILD lean-mode-20211220.ebuild 695 BLAKE2B 013dde12604e5e819f823c9c7387101a2ea70225544d8c5747093f904838720959047d43a8800d1d5a318d8af891ee0e67aa81f5a3e87dcd3970b57db28f536c SHA512 a32157e80819b89a9020c5588c65555d46a8cb078d1bde166c6fbf027e8e6780f1e3a77299c58cd45accd81ca8b39d8086f265990725b767b776bad2f5e5d135
-EBUILD lean-mode-20220124.ebuild 695 BLAKE2B 54a638ff8f7198b3b8fba80e5681291359690ebcd5a084b98b204de453ad18d82edb9aceb50011305da77e5164fe9054cfb66a5d0e125ee82fcfa12d1d4ee196 SHA512 cbd4c40b4902a408a41ef6e686fdf76390fc221a1df423d80f498d93f5dc29cb44886e02da4819823ac9a85c2ebecd5ab2bc4acf7c5891fcc65838f61bfdfac5
+DIST lean-mode-20220501.tar.gz 46795 BLAKE2B 1d1024f8eb29f787c26368945086d61d06375ee675379833856b72fd47b6fb35e2b24a4dc6d2bb1cc333fe8fc4ed760e13a1e6978e539a994d1907ce774761b6 SHA512 131d71f863e59a0cdfd5eeab015e9e9869e4edd87b1cb45d5864aa13858aac5d8b05843a82a38db9a6e27fe6d54633bdb473509ab9ce179dc216a3fd8f89ad30
+EBUILD lean-mode-20211220-r1.ebuild 697 BLAKE2B 95921f79a278c7f3c232bf11e9443d369609fb38cab629178aba4b27b73216b3a23e024ef6b9ecf6e8996f084dabe8b5ff4e6013cdc164ee376825ed08cfd663 SHA512 06bc702bdaa19e7782780ead5fab2d8f996b8d4fc9e4bd9aa1d1b7c483d33dc0c5e018382a1eaa1a69912822102a5695d39bed48b8a37006f964ef6c2ed35771
+EBUILD lean-mode-20220124-r1.ebuild 697 BLAKE2B 2fb2fdcb03be4b8978a2bb3dcc11488f2a1058fb8aea76f50e3acdef8813aa4db4013fde37a2bc0f5ebfc92228e2ddf3c2c80d6a06e13ec6efc87dd3e6923ec9 SHA512 62fa66fffee32a343b2500fe92832d059970084287b6af1c54a6cae03179176cea52a86d3f5c4d81d624c1359824806b601047808638f761bc27892af24f6317
+EBUILD lean-mode-20220501.ebuild 697 BLAKE2B 37065b912a10fc1876fe4c66c7ce3098d7aae2895ad74ca396e1ec4c46c2ff0175429ebc6e5acb87f1687ad9ad66c15d610f265629741f3ae743ba0c21678d73 SHA512 cd0650e7c809f3465b92dc9bc3c8187e7b7b2c7b55c61609d94f7bc59469e7537f9584d12a5e112f708c139686a45da216de34537999e1be03816b799043a913
 MISC metadata.xml 642 BLAKE2B 7871c2b174dfa7a9b9c7ef917276de3c13d217842154bfa0b5097e380a10984281fa885a8348a1c201731cac8a95fc44ba596713877c8fa4c70c39c66da010bd SHA512 81f02f626d23e32cc2acf9bf72a3e7c372063c17554afee69a0ceb8aeeecbaac11959b0458a636ad6c7b493cfb6cf3c223e922e5a09dfb0c0213972dd244bf75
diff --git a/app-emacs/lean-mode/lean-mode-20211220.ebuild b/app-emacs/lean-mode/lean-mode-20211220-r1.ebuild
index 493c3005ffb7..d91061721bf4 100644
--- a/app-emacs/lean-mode/lean-mode-20211220.ebuild
+++ b/app-emacs/lean-mode/lean-mode-20211220-r1.ebuild
@@ -17,14 +17,14 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64"
 
-DEPEND="
+BDEPEND="
 	>=app-emacs/dash-2.18.1
 	>=app-emacs/f-0.19.0
 	>=app-emacs/flycheck-32
 	>=app-emacs/s-1.10.0
 "
 RDEPEND="
-	${DEPEND}
+	${BDEPEND}
 	sci-mathematics/lean:0/3
 "
 
diff --git a/app-emacs/lean-mode/lean-mode-20220124.ebuild b/app-emacs/lean-mode/lean-mode-20220124-r1.ebuild
index fab38a5b5d39..b24391f06ca8 100644
--- a/app-emacs/lean-mode/lean-mode-20220124.ebuild
+++ b/app-emacs/lean-mode/lean-mode-20220124-r1.ebuild
@@ -17,14 +17,14 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64"
 
-DEPEND="
+BDEPEND="
 	>=app-emacs/dash-2.18.1
 	>=app-emacs/f-0.19.0
 	>=app-emacs/flycheck-32
 	>=app-emacs/s-1.10.0
 "
 RDEPEND="
-	${DEPEND}
+	${BDEPEND}
 	sci-mathematics/lean:0/3
 "
 
diff --git a/app-emacs/lean-mode/lean-mode-20220501.ebuild b/app-emacs/lean-mode/lean-mode-20220501.ebuild
new file mode 100644
index 000000000000..34d78fe6a7fc
--- /dev/null
+++ b/app-emacs/lean-mode/lean-mode-20220501.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=362bc6fa3efb1874c525ed6b4b6f24f76af22596
+NEED_EMACS=24.3
+
+inherit elisp
+
+DESCRIPTION="Emacs mode for the Lean 3 theorem prover"
+HOMEPAGE="https://github.com/leanprover/lean-mode/"
+SRC_URI="https://github.com/leanprover/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${H}
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	>=app-emacs/dash-2.18.1
+	>=app-emacs/f-0.19.0
+	>=app-emacs/flycheck-32
+	>=app-emacs/s-1.10.0
+"
+RDEPEND="
+	${BDEPEND}
+	sci-mathematics/lean:0/3
+"
+
+DOCS=( README.md )
+ELISP_REMOVE="company-lean.el helm-lean.el"
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/load-relative/Manifest b/app-emacs/load-relative/Manifest
new file mode 100644
index 000000000000..616ab25feb3f
--- /dev/null
+++ b/app-emacs/load-relative/Manifest
@@ -0,0 +1,4 @@
+AUX 50load-relative-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST load-relative-1.3.1.tar.gz 33985 BLAKE2B 5e2f4329d380d9bc001e23ea4dd096422357cf18e3685d0eeff80c319172ab3ac0afeb722a9322e0cccd8d99c809ace42bc3352a38161f1aea0a3d3d3af27241 SHA512 22d31bfeee37a14bb9820df818a6d1d3cd4d2efb98bbf41ef9e866df602bd18ac0896c625c70195b50f98703d9e0ba2797e0095f051e2937455c29d8be5599c0
+EBUILD load-relative-1.3.1.ebuild 532 BLAKE2B 9738d4768e97cf2c8af171b58ad0928f116515b968500c3ecd877fbd0afb362c52e8bd3087cb94206ce4636d13426f4b7cc5f10ca0d400f5edaccaca34b48530 SHA512 9b01961cba1addcbcc8a0b8e0b545a7942a753f7917d839d87cc5176f6fa5a5aaac816ab0969c57dd114b87dd42cebe114bdb26ae84092243fbe411e68beb754
+MISC metadata.xml 589 BLAKE2B 80558a5fda032030a5ac7b378502c5a99ee5e08222ccd7a72842127a397e894c018c94493f5a064ed64985e4d8121ea6136cdd3de586b298b37369b6d5fc341d SHA512 a75c9aa6182f6b7aed9b3f65fcb6520a3e18569c5527ae6af8c9830b9ccd1d6b5f29c234204b2afb538da1108a90370f0c60ef4c687619f68688b7e12b11dd36
diff --git a/app-emacs/load-relative/files/50load-relative-gentoo.el b/app-emacs/load-relative/files/50load-relative-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/load-relative/files/50load-relative-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/load-relative/load-relative-1.3.1.ebuild b/app-emacs/load-relative/load-relative-1.3.1.ebuild
new file mode 100644
index 000000000000..53a2b90b909c
--- /dev/null
+++ b/app-emacs/load-relative/load-relative-1.3.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="Relative loads for Emacs Lisp files"
+HOMEPAGE="https://github.com/rocky/emacs-load-relative/"
+SRC_URI="https://github.com/rocky/emacs-${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/emacs-${P}
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+DOCS=( ChangeLog README.md )
+ELISP_REMOVE="el-get-install.el"  # Unnecessary, used for install using el-get
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/load-relative/metadata.xml b/app-emacs/load-relative/metadata.xml
new file mode 100644
index 000000000000..54ce9d0ed7bb
--- /dev/null
+++ b/app-emacs/load-relative/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>
+  <longdescription>
+    Relative loads for Emacs Lisp files. Adds functions __FILE__ and
+    load-relative and require-relative.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/rocky/emacs-load-relative/issues/</bugs-to>
+    <remote-id type="github">rocky/emacs-load-relative</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/lsp-mode/Manifest b/app-emacs/lsp-mode/Manifest
index 66b31e5e44e3..fdb2e6748b99 100644
--- a/app-emacs/lsp-mode/Manifest
+++ b/app-emacs/lsp-mode/Manifest
@@ -1,4 +1,6 @@
 AUX 50lsp-mode-gentoo.el 2081 BLAKE2B ac9eee2a41fa09e1ee72cabef2380b6095f469f1c668833b4d6d59964796a974457e2f85f4cdb7b66ea652ad23a6806326f9a43c20b4d1592fc1f19eb33a3773 SHA512 632fb2b9d0af9735c16fffbe6d0aca7ba0a494edd001ea289f17836e9ddd34d9ea60cf22035194e1837505cc214370be31e0dff0637a59361eeb6a4f2d12e816
 DIST lsp-mode-8.0.0.tar.gz 14703640 BLAKE2B ab7993772cfc127ee94ba4a0af75e8d7f6789ac22c76acce8df250b5579c1dd2f41e353b26cbdcf6e1a2e6a8d1f8a179d4736b67914cdec31c23032f93dffd3c SHA512 2620288142cea7b06ad2725b63e5db945b1d62d0b4c215e8d35d79d6c3f05bcdf2736dab34bd10c2b9f8928caf36ef617182c41c309e62e2ce8ddf45df376cbc
+DIST lsp-mode-8.0.0_p20220620.tar.gz 15464614 BLAKE2B 10e50a52e2a725b1a275b81514bb268619b128370f8989970c75c87bc37516588e798c5f2531b73689d9d102fbd6b965841c6d8a0c337cb8d9052b632a01e289 SHA512 d464418df6eb99d8a1f4cad8c9e31ca057286f846afbb0078fdff21cfc685ffc158b1b37d22224372bee67eb5298f20bb4db83ed466c09e4b4b3a83db865ef09
 EBUILD lsp-mode-8.0.0-r1.ebuild 1205 BLAKE2B 26abed125c70a373a1ac0cc9672af1e174dfd179ab2a5a4c47bb50f41a7d68a5606302e24e2cfb45360f436e65d3299e92af50aafd0ac47c89563ddcc5c3b107 SHA512 85958cca001fca56f0416d75dfab2d9b0e7a621c0f6864cf25770e25abe780256e43c16f4b7b6a88e3a58b2d0a6a04124f8f78d9ec641fa8b8181733424cf0a9
+EBUILD lsp-mode-8.0.0_p20220620.ebuild 1273 BLAKE2B 79c6c26ad8680450d778118052c50bfc015f213fa4a3ec9e7df12a07c6e37e4e75454e3e4f498f82428aea7d582e845e3608fa3c5ae2dde299183d7219807af6 SHA512 99bc2f3ac451ad7addbe69de4488a16aba0e39417b6d53279c9da6dce5ebc67e392e90f7ba40a0cf5d81eebea0c9c6477d62ae437081302ef128703c4e3f03aa
 MISC metadata.xml 364 BLAKE2B d28d1feb1f2948839ed9759bd1d7f22285218f301e2862e50b6a58aad591f81d8d94ff8bf2fce8c399c04839467e89b82c2487b2ff09a129f4636d81555db4f8 SHA512 1b9aff2f7852a2af981b93c1e2ca1a0df378e52d0a0817a7fe4a00e5c74721389979df9367a6e93c3a62ac02adb118fbdfff84272f9f902c5883d0759a422d4c
diff --git a/app-emacs/lsp-mode/lsp-mode-8.0.0_p20220620.ebuild b/app-emacs/lsp-mode/lsp-mode-8.0.0_p20220620.ebuild
new file mode 100644
index 000000000000..b87fe3e08a74
--- /dev/null
+++ b/app-emacs/lsp-mode/lsp-mode-8.0.0_p20220620.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=9957623d93b13fabaca8ba35b85da8fcceaeef69
+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/${H}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${H}
+
+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/m-buffer/Manifest b/app-emacs/m-buffer/Manifest
new file mode 100644
index 000000000000..947462483c57
--- /dev/null
+++ b/app-emacs/m-buffer/Manifest
@@ -0,0 +1,4 @@
+AUX 50m-buffer-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST m-buffer-0.15.tar.gz 19211 BLAKE2B b4cbb7bdac9e68622db03acba07b5422181599e69e6d92740aa364684c998de9a24c8740cc2d7ec0dc40e9eee56f211a93bcfd734d30b9b44b8ca3b54ec4f39c SHA512 94465cbec24137d82498ce68d7e76f871e3986afae0bb419b8e65b740c54d6c65db8ab0dedf87392cbd2b383c7ca8eb96cf295139bb1322e7652e44ac41937ae
+EBUILD m-buffer-0.15.ebuild 661 BLAKE2B b79981d6657afa089d64e605ab0c7ac9e4ae0e898eed7ed809272f8f69e642015619588d4e588c070b939fc08e91de2b9ff6e990e23d6cbbe4c06a104e454aed SHA512 5500592116bb1b6ddddb4d524fbc6ff70bd94143c6f85ca1d0a9e9106391cec99f6c1b749d04cc09a6fc91ce9fe32dbaa055abe911d56ddc5d4c85a7e1821d97
+MISC metadata.xml 755 BLAKE2B 9b9962af5c52d285c92201219ca6c83399a8993b9d927c73188dd1d9fcf60a6140ac69d331f112961e268bd957038adc20db1ac334b58ee920d6440e04419ec4 SHA512 91bd5c9a64990f3099459be3117f17bc7778d5590b22ae8694ce42bf8c36b1accfcbe0b68e999db372c36dddb224a4796efd0cc19571a464b3cb6cf1962c1c2b
diff --git a/app-emacs/m-buffer/files/50m-buffer-gentoo.el b/app-emacs/m-buffer/files/50m-buffer-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/m-buffer/files/50m-buffer-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/m-buffer/m-buffer-0.15.ebuild b/app-emacs/m-buffer/m-buffer-0.15.ebuild
new file mode 100644
index 000000000000..69f1a9262033
--- /dev/null
+++ b/app-emacs/m-buffer/m-buffer-0.15.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="List Oriented Buffer Operations for Emacs"
+HOMEPAGE="https://github.com/phillord/m-buffer-el/"
+SRC_URI="https://github.com/phillord/${PN}-el/archive/v${PV}.tar.gz
+			-> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-el-${PV}
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( app-emacs/load-relative )"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	${EMACS} ${EMACSFLAGS} -L . -L test \
+		-l dev/assess-discover -f assess-discover-run-and-exit-batch || die
+}
diff --git a/app-emacs/m-buffer/metadata.xml b/app-emacs/m-buffer/metadata.xml
new file mode 100644
index 000000000000..84e803c50139
--- /dev/null
+++ b/app-emacs/m-buffer/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>
+  <longdescription>
+    This package provides a set of list-orientated functions for operating over
+    the contents of Emacs buffers. Functions are generally purish: i.e. they
+    may change the state of one buffer by side-effect, but should not affect
+    point, current buffer, match data or so forth.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/phillord/m-buffer-el/issues/</bugs-to>
+    <remote-id type="github">phillord/m-buffer-el</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/markdown-mode/Manifest b/app-emacs/markdown-mode/Manifest
index 16ec796d5fe0..58b94edd44e1 100644
--- a/app-emacs/markdown-mode/Manifest
+++ b/app-emacs/markdown-mode/Manifest
@@ -4,6 +4,6 @@ AUX markdown-mode-2.5-markdown-command.patch 680 BLAKE2B 16e8c8f8225ee197aee2d11
 AUX markdown-mode-2.5-test.patch 1314 BLAKE2B f238a3bf1426845c83d7882fd745350166cd5cf3721a4f7611619b73c720ae2e4435e7c14b379d3399d3fe21f258ec0368be44ccee87d0da0391d3401496b14f SHA512 87c7a633d9f0fea730d29f240824224a8569fbc4dd9337e40838000b4aad7a056fc0779965b5c2b6b436d6b7fafdf221dac1374df9fccfb807fdc53a453e2f38
 DIST markdown-mode-2.4.tar.gz 211229 BLAKE2B 49a369d1b418634449cdac3103e1b107b5dd839edba6a3329539b80cf21bfb0f01aa436ec6deb256bfb5f03ef73b716943730adc4a87b52262dfccbd7923556e SHA512 8bf2acd7f402c036c57521340d26cea150935964f04f1343c2e17147d63226c815150be62c0b79a2ba48e55b3155d94f38caf1ec43c21d4f32dee6e73cc261a0
 DIST markdown-mode-2.5.tar.gz 218329 BLAKE2B ea4f3e316383951c00e6a68e388db228567b7a06ac87bb268f28c026a8518e9a8516f27d137c79c24727bd71c785a6e9f1217d160e472abc7bdba2c5bda17f16 SHA512 6bb4d79a5a4c3d3891fc8be4d357fa6dccae9f3eeb8f6c04f840da6cfe6875090ebcc0b1a74961e2a4ac1a59389781fa37ef2420383019983705c2cc66db5b8e
-EBUILD markdown-mode-2.4.ebuild 712 BLAKE2B b1ad8291e344d90c847d234d1158db0ada5a60953edf63e00c857780fb36917ec41bf70349a19bc265c5427fbc53ed51777ab1624934986ced9c7b8ae634eb22 SHA512 e30b4f400171a2f9d34590b0e305411dc0ecf06d410cad60e729593825b4176dd5d1f849022807644ba5529bef2698bcf8c317a68a5598cba41faecb99776d01
-EBUILD markdown-mode-2.5.ebuild 810 BLAKE2B f0bac20353eb9225dfe8a359dd4f9ea009138346319e6c74f124040e8a20de28a93189d6c15cee9dc6505fc20c299a64295864f4dbe28bc18851a37a661b187e SHA512 b9b99086592284add04f7dd27fcacce4fe11409f1e0f1843f0d3ee2e236128391f512a81ec53a0594298ce4afff67fdca3fb5eb2571ed6f99851bc927616441f
+EBUILD markdown-mode-2.4-r1.ebuild 710 BLAKE2B efa7775bb49d27324bb5804a82556888b3a854a86409ff55602f4c26fd4df03fef392ac1799a8974c8f63d9a5a4fcc97aaf6931d3396131bae154ca613ecdfc0 SHA512 6363f1f2fed4c3cbfc3491b421f35a1d4a10f6bfdfe68ba1ff1cda6b3e2d78efc67eca184e7db7fd605fe8942dc912ccf0b6774c57734b7961850dd6310e06e0
+EBUILD markdown-mode-2.5-r1.ebuild 808 BLAKE2B c3e65ef9729b2ade49276d06348a742d8251ee1b3a9d526ff7da85af7bb89c6281216436e4c205b2084a1b67fe94fb28973b8fd72b06f40926b753e34d12c4bb SHA512 126ed238c86a4a260389916a6dd0b6fda1a850d3628e899947be5c36f1bc6c0cc59c4e594d0e49cebc9b97c09523fb68116ee73976fdc5c83cdb026e41e6c607
 MISC metadata.xml 391 BLAKE2B 7896c25acf1c0a3665565c068ac5cfea1cee77fda0444553c8f08ce45f6c58b967e5dd882de62596847b8714ad25e4454106a74c91c09a28a1985d0d7d3d0773 SHA512 a023ae9b9c85478974d4512e32b9308013a9fa8646a9aad443d4efe84055b57a2c628cf67f4f63073326dbe5e65ad3c4ef1a21963cc7b6d8b61b5d19ff95bf07
diff --git a/app-emacs/markdown-mode/markdown-mode-2.4.ebuild b/app-emacs/markdown-mode/markdown-mode-2.4-r1.ebuild
index 79c7e94ef8f5..860a8236dc2f 100644
--- a/app-emacs/markdown-mode/markdown-mode-2.4.ebuild
+++ b/app-emacs/markdown-mode/markdown-mode-2.4-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
@@ -17,11 +17,11 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="|| (
-		app-text/pandoc
 		dev-python/markdown2
 		dev-python/markdown
+		virtual/pandoc
 	)"
-BDEPEND="test? ( app-text/pandoc )"
+BDEPEND="test? ( virtual/pandoc )"
 
 PATCHES=( "${FILESDIR}"/${PN}-2.4-markdown-command.patch )
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/markdown-mode/markdown-mode-2.5.ebuild b/app-emacs/markdown-mode/markdown-mode-2.5-r1.ebuild
index ccc41dbe1ba0..f1d8ea07da56 100644
--- a/app-emacs/markdown-mode/markdown-mode-2.5.ebuild
+++ b/app-emacs/markdown-mode/markdown-mode-2.5-r1.ebuild
@@ -17,12 +17,12 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="|| (
-		app-text/pandoc
 		dev-python/markdown2
 		dev-python/markdown
+		virtual/pandoc
 	)"
 BDEPEND="test? (
-	app-text/pandoc
+	virtual/pandoc
 	|| ( app-text/aspell[l10n_en] app-text/hunspell[l10n_en] )
 )"
 
diff --git a/app-emacs/nim-mode/Manifest b/app-emacs/nim-mode/Manifest
new file mode 100644
index 000000000000..4c2279a1131f
--- /dev/null
+++ b/app-emacs/nim-mode/Manifest
@@ -0,0 +1,4 @@
+AUX 50nim-mode-gentoo.el 598 BLAKE2B a8d8e04c46ef99ba09adcc4aae8e5848b97b7fde73529e091fa42af6aab31149da8c9585c7026e012f9beff2a5bd0fe2d92ee2dcad99e67b61ddd9af6166d4fa SHA512 e56df919188a7f8a6ff029f53133200014f8be57f16cc53a36f4b280fafddcf22c4f0e0d6690221fe829a52cf721e7e72786b5d087f72dfc148ae36f28f0e30d
+DIST nim-mode-0.4.2_p20211102.tar.gz 77240 BLAKE2B 54e3acc5f4bbfe5b921a44b71a423aa2bed704ed08075c893d277eaa8922c96b08087abaef0e4999f6dd237041a06593d11bf09299b1e56edc985fbddb43d6ff SHA512 09385e9413832deb86bbe223301c99366a86e81c7ec43b2add559337184ee93ded1f6d1ed9018bcd25b870d60ff4d302c11d10b55d734ef3463432ceef186601
+EBUILD nim-mode-0.4.2_p20211102.ebuild 674 BLAKE2B 5dbe487b4409eadf512d9a007f17bb119e7aa6ede7628224b9dbe5b89be8d7d65ec901b239b260b688447190263b9ebc75225e9da7699335c7c3bc3452f835d9 SHA512 a2aa0d4c913402add57f65b859aebc458e721d42cc77bef65a164dffe9153bd9fe007fcbe3a7abd584f8464ca8c9eb6408533afcc36729e694d274a4c675cc72
+MISC metadata.xml 423 BLAKE2B 2386ef9f443c0e841c41cc9302436ebc3ee394ed9d270c3c103998f2f2e593e1f5311f7ef2e42ad3b73845a2785628105e80bc0fd50f82a5713d3a3f51ae6cfb SHA512 d5a99fbada77f077e6bda75a3f37d99b57f064b047e55c3bd30ef60a4d2a9cf22a586d4c474bfe61a2df7485444867f7e0344e014d7d7695646572be94c44dcf
diff --git a/app-emacs/nim-mode/files/50nim-mode-gentoo.el b/app-emacs/nim-mode/files/50nim-mode-gentoo.el
new file mode 100644
index 000000000000..6c4e00cec245
--- /dev/null
+++ b/app-emacs/nim-mode/files/50nim-mode-gentoo.el
@@ -0,0 +1,13 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'nim-mode "nim-mode"
+  "A major mode for the Nim programming language." t)
+(autoload 'nimscript-mode "nim-mode"
+  "A major-mode for NimScript files." t)
+(autoload 'nimscript-mode-maybe "nim-mode"
+  "Most likely turn on ‘nimscript-mode’." t)
+(autoload 'nimsuggest-mode "nim-suggest"
+  "Minor mode for nimsuggest." t)
+(add-to-list 'auto-mode-alist '("\\.nim\\'" . nim-mode))
+(add-to-list 'auto-mode-alist '("\\.nim\\(ble\\|s\\)\\'" . nimscript-mode-maybe))
+(add-hook 'nim-mode-hook 'nimsuggest-mode)
+(add-hook 'nimsuggest-mode-hook 'flycheck-mode)
diff --git a/app-emacs/nim-mode/metadata.xml b/app-emacs/nim-mode/metadata.xml
new file mode 100644
index 000000000000..13434a3dcb26
--- /dev/null
+++ b/app-emacs/nim-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/nim-lang/nim-mode/issues/</bugs-to>
+    <remote-id type="github">nim-lang/nim-mode</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/nim-mode/nim-mode-0.4.2_p20211102.ebuild b/app-emacs/nim-mode/nim-mode-0.4.2_p20211102.ebuild
new file mode 100644
index 000000000000..afa42d5ff7b6
--- /dev/null
+++ b/app-emacs/nim-mode/nim-mode-0.4.2_p20211102.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=744e076f0bea1c5ddc49f92397d9aa98ffa7eff8
+NEED_EMACS=24.4
+
+inherit elisp
+
+DESCRIPTION="Emacs major mode for the Nim programming language support"
+HOMEPAGE="https://github.com/nim-lang/nim-mode/"
+SRC_URI="https://github.com/nim-lang/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${H}
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64"
+SLOT="0"
+RESTRICT="test"  # some test are broken
+
+RDEPEND="
+	app-emacs/commenter
+	app-emacs/epc
+"
+BDEPEND="${RDEPEND}"
+PDEPEND="app-emacs/flycheck-nimsuggest"
+
+DOCS=( README.md starterKit.nims )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/nxml-gentoo-schemas/Manifest b/app-emacs/nxml-gentoo-schemas/Manifest
index 18c70e01a0ec..7c53e19b44a8 100644
--- a/app-emacs/nxml-gentoo-schemas/Manifest
+++ b/app-emacs/nxml-gentoo-schemas/Manifest
@@ -1,6 +1,6 @@
 AUX 60nxml-gentoo-schemas-gentoo.el 206 BLAKE2B ae9d1fe1da9c86d14796c09597ca34b10dd0e28abb02fdeac4607b8d950bfdf636f5f3c1de49cd5b9cf1fa808513522ab43272f3c26361b871ad0d630a942ed6 SHA512 5592edb5663066fcccaf5b05c3df671b4069d4d259376a8a91ef3f7ae5990687b15dfdf40e6f7aa6cc7d62b7cdaa5090fd851de0ed2718d20ecfe3e3a78530ea
-DIST nxml-gentoo-schemas-20210907.tar.xz 8940 BLAKE2B e1965847d0723c453a11d2522436eb8bd017eb6147b50fe900105f05b74a47fbd91fe94c3a0af41de313480dd0a5a98d51b8b45be1bd27d160f32be8bbcd75f4 SHA512 4defdc0061940fc7dd285c958ec812a7110bb2d7370bd74ceef396e2873d488c78843395bb0e2c122b6ad959cffe5a555c9f96446aef90fc37b3db135477e8aa
 DIST nxml-gentoo-schemas-20220125.tar.xz 8644 BLAKE2B 6f2bb618bb94f9a61ba22526161d8b0457d6177b2a6dc339199fe633652ce1138125d50bc1b681117e8dfedb227ec54e30a51d4724fb5148ab31e1224b16fc9e SHA512 95719c92d9c6c9c883c022baf0593f927b0f24f7e35832ab0dd951fb31fd601888715671a6b8a887464649632bce3c8cb8281aa5d5a066fc115d38ffed8f8adb
-EBUILD nxml-gentoo-schemas-20210907.ebuild 599 BLAKE2B 5f485f439a627a3082afa7197b658c5d0a1a99fd26fefeec165d3ace2f0568dfbd3033f797664a5fbd055088ca7e7c9f0c7faa08375f465346b5f35895d4b634 SHA512 53482d6195969c09a0a8506ca0b3afc5504477122ef0fe8d4078574cf3b36ca83a5a1acb23a8ea77ba4047fe0c0d2ed4acae6134aaeb35d52984469639158f84
+DIST nxml-gentoo-schemas-20220525.tar.xz 8836 BLAKE2B 5506f976b43218d5bb85ae96c31137c51691cef5f3a524d4214584cc0cb1dae26f45b97d636c8361ec06e7bff5cbf2337b8ed82795aba72dd079127db2238ece SHA512 7df23a9d73a09fc26c6e38665d28c3b633d371bf9c84d56b9318045d80ccab23c3b9c115d68efd6733b9048918118612a05405a1a590b41eac4fb7405746b34e
 EBUILD nxml-gentoo-schemas-20220125.ebuild 599 BLAKE2B 94a71309956e567bd635ddcef76e56c8bc59680af81d407f20fc14297bcfffe30cc54fbfc148593d5dde43373a67aa425e059eec58da7d521c339e5fdc04f18d SHA512 1eaeb00a9c24ad4c18d65376a5a0011cc74c7a609aec8ea574fadeb061ba661a3b010e378ad4c76533295cd67c665a4441e7c235258f4613c047684bfa898b3b
-MISC metadata.xml 283 BLAKE2B 81c49021199f71096079a27f9121390fb8c1285c54b9478583ff2d647277fa106ef12456d7097c4be092fc48b514a1adcf855ca0fac911598232ef9eb7f102c0 SHA512 f32b303760addf5d4db8d18bd10fb677353cdfa4c5e545d47804ef756cf5e5a21f8b8efb631b08f802185913ceb98da820e404e06eb03d01fe9ea85c10d1ac13
+EBUILD nxml-gentoo-schemas-20220525.ebuild 601 BLAKE2B 12946ce50c622acab7d3c1b1f6b0059164a6f0b9da4e085bed3a83f6dbc47ab1f23f67b5e43302453a184c3e00ca5b3e5b05286adc729d98d420b53a49bdc78c SHA512 6b7d3c63fd581602012123d4d2a91858e31631e31dd7ebd383e4301635109932a2d479f5cce76f6302c949e6b5580a6bee1be3eb244f8375ddb42bc57ecfeeac
+MISC metadata.xml 370 BLAKE2B 2af6298a56b5da7f2c32b4bed09ae442df3068aecaddf3be04c6d6d4abed1f23430d14a54bb33b13580cfeca7177e2da00c8eab62d17a84427ad1201e105572b SHA512 abaa11228666364188cd1b23903b43b5b49456050287ba12be8a6bd31a1f063c65b3efe50de478614f8f70f953ae22b238989724be5179df71a2ce820d356904
diff --git a/app-emacs/nxml-gentoo-schemas/metadata.xml b/app-emacs/nxml-gentoo-schemas/metadata.xml
index 986088003fe1..76412474bf92 100644
--- a/app-emacs/nxml-gentoo-schemas/metadata.xml
+++ b/app-emacs/nxml-gentoo-schemas/metadata.xml
@@ -6,4 +6,7 @@
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
 <stabilize-allarches/>
+<upstream>
+  <remote-id type="gentoo">proj/nxml-gentoo-schemas</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20210907.ebuild b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20220525.ebuild
index 92ed7f4bf007..e59b183875b9 100644
--- a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20210907.ebuild
+++ b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20220525.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
@@ -9,9 +9,9 @@ DESCRIPTION="Extension for nxml-mode with Gentoo-specific schemas"
 HOMEPAGE="https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/"
 SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 
-LICENSE="HPND MIT GPL-2+"
+LICENSE="MIT GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 SITEFILE="60${PN}-gentoo.el"
 
diff --git a/app-emacs/nxml-libvirt-schemas/Manifest b/app-emacs/nxml-libvirt-schemas/Manifest
index 612ecac91cfc..8873283751a7 100644
--- a/app-emacs/nxml-libvirt-schemas/Manifest
+++ b/app-emacs/nxml-libvirt-schemas/Manifest
@@ -3,6 +3,10 @@ AUX Makefile-trang 108 BLAKE2B 4f80e5f4e0550bd4732668ae5298d890d2293d34379902cf2
 AUX schemas.xml 560 BLAKE2B 32f01d2dd047aa7109112b47155a21825686385845fae2af0f6d052dbd36f3e1ca5027ec39d654735e390ef9aa8a31f7ae5c86b15b0cd9c4ef84128326e87ee9 SHA512 82ef6189610fc4e1a0d5546ae15f2f315e7c0d460fa141201c43a93e59d147613c7186302fdc3e6b2f0ec5c343e5566966892d4e9f55dc4957e4ad58793fc3ff
 DIST libvirt-5.8.0.tar.xz 13129328 BLAKE2B ff49b0b6dca86f35c68edfb880677c88e0aed8021ed01ebd145922821914edd70c355ca777fe470e2b0e4baf36f2813c1100be9377344f81c9df374068307da1 SHA512 73d18fdf307b8029921a9f1a0c84ca31c50c662a3c0339e3850d6d2f31574168807a6f34943b286ed86a44031decbbc1339f27366da7269e29d38c7094503113
 DIST libvirt-7.10.0.tar.xz 8798000 BLAKE2B 6cb2ab5913d382b11d24b46154dc3250355050cd3038f64ba571b35f33ae5bd0a322d4b96469bd6c78fd848c87f2e6fc7213c33e5bdb9d375a9b81d2a40899bb SHA512 c7eecc9538b68852a8cc67565566d64ec7b087b6f009858b2eb524bc3ef0f6ca3c0da67edf801e6a3ae3fcc0364e65e108fa92bcb01ee810c85fa5f37785aa32
+DIST libvirt-8.3.0.tar.xz 8829288 BLAKE2B 37890dac8f46e14c5f0329f7f3318b611bfe3b97b7beddcdb91541e71a619738baa2a3e9847fee2d0b63abb630895860555a5337686702fc6fb06cc4f060f8b5 SHA512 914c8a4884d703f368849b852ba8330d1b17cf598a359f70d344e0a94e02f60337216e9011cbeba90eb4e87fa644e7eb9e8a407ca58632b2b41511d3f598ff71
+DIST libvirt-8.4.0.tar.xz 8846528 BLAKE2B 479d7d47a9d711e0240da09eb295f1a644bc4cfddbe544908f2011eb45dff9cf9ffdfff87ba63ded96f5b69024c65832326f9fb0837c5338114ad5dbbada7af1 SHA512 e9dcaa489f162e3a26fe1ca7bb83a22e3f1952594c3541ddd2a7f8e8a0e6ad37e193fb89421df1efe3d2a4d9bb7cf5455c7b7a0b59e133eb6c0ff3cbbd8403b6
 EBUILD nxml-libvirt-schemas-5.8.0.ebuild 903 BLAKE2B e25b2af04d2bebc9a2aaaf9da8e0d738e33421100812ab1b57caa6324e0951e45029b5a69d0eb9027b3ea85052ed21b14ea085466577254fc3c4f33357425664 SHA512 01dde717faa3ec8f74b5d825aabe207cf2a77afecc2735c689871e6f0281e4bc4a1da7db58ac581998f3521e47785ba5bf46a8c06942373eacb38109bd478525
 EBUILD nxml-libvirt-schemas-7.10.0.ebuild 871 BLAKE2B cb4347ade4bbddd34aca580cae55764a0df9f83f88c38c33c369fb3c49e7b32417678f93c1df1c9a8d63f3f34fb851167066707ed7bc835075afdf176495a28c SHA512 6018fa0bd27b9a53655c1026d92b01f8a61fea3214fe0bc85c4de5caa8da5e4292bd97ca46a9c9fa22c55bf69259e05ae75a798191becfcb3b3f5de33f58502b
+EBUILD nxml-libvirt-schemas-8.3.0.ebuild 1050 BLAKE2B 9b8d41228883ceec3507dfd78117a219ca7427434ecbc1111411fc4638dcb29e803031521c69427d1d563e33617fab99fe8fc2ca1e395ea4ce7ca97c96746238 SHA512 c062b83381c5ee064ada5ed5136c151ebf67fed0d0199a602c614c9a9268ac189ea80fc2952d9e1056106d936a78c01bdac962eee080ad3d3be159c611d984dc
+EBUILD nxml-libvirt-schemas-8.4.0.ebuild 1050 BLAKE2B 9b8d41228883ceec3507dfd78117a219ca7427434ecbc1111411fc4638dcb29e803031521c69427d1d563e33617fab99fe8fc2ca1e395ea4ce7ca97c96746238 SHA512 c062b83381c5ee064ada5ed5136c151ebf67fed0d0199a602c614c9a9268ac189ea80fc2952d9e1056106d936a78c01bdac962eee080ad3d3be159c611d984dc
 MISC metadata.xml 390 BLAKE2B 05bd110c71244cf02d22bcf823d3285e73bdb03f3bb06b8c9e2c13cd346f2367380345747d5eb0861f37983be970dc6c9fe5e7d93b422205a7b447dc3330852e SHA512 bb803aed730418caf43baf132b989963e84f5e0e0d8db915a48cae407f20fb52e27c147725cac88fc94303db070f300a7ce3bf6c18e7dc66dec37bf9ccea5f5b
diff --git a/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-8.3.0.ebuild b/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-8.3.0.ebuild
new file mode 100644
index 000000000000..acb053083ec6
--- /dev/null
+++ b/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-8.3.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Packages which get releases together:
+# app-emacs/nxml-libvirt-schemas
+# dev-python/libvirt-python
+# dev-perl/Sys-Virt
+# app-emulation/libvirt
+# Please bump them together!
+
+inherit elisp
+
+MY_P="libvirt-${PV}"
+DESCRIPTION="Extension for nxml-mode with libvirt schemas"
+HOMEPAGE="http://www.libvirt.org/"
+SRC_URI="http://libvirt.org/sources/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P%-rc*}/src/conf/schemas"
+
+# This is the license of the package, but the schema files are
+# provided without license, maybe it's bad.
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Yes this requires Java, but I'd rather not repackage this, if you
+# know something better in C, I'll be glad to use that.
+BDEPEND="app-text/trang"
+
+SITEFILE="60${PN}-gentoo.el"
+
+src_compile() {
+	emake -f "${FILESDIR}"/Makefile-trang
+}
+
+src_install() {
+	insinto "${SITEETC}/${PN}"
+	doins "${FILESDIR}"/schemas.xml *.rnc
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+}
diff --git a/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-8.4.0.ebuild b/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-8.4.0.ebuild
new file mode 100644
index 000000000000..acb053083ec6
--- /dev/null
+++ b/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-8.4.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Packages which get releases together:
+# app-emacs/nxml-libvirt-schemas
+# dev-python/libvirt-python
+# dev-perl/Sys-Virt
+# app-emulation/libvirt
+# Please bump them together!
+
+inherit elisp
+
+MY_P="libvirt-${PV}"
+DESCRIPTION="Extension for nxml-mode with libvirt schemas"
+HOMEPAGE="http://www.libvirt.org/"
+SRC_URI="http://libvirt.org/sources/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P%-rc*}/src/conf/schemas"
+
+# This is the license of the package, but the schema files are
+# provided without license, maybe it's bad.
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Yes this requires Java, but I'd rather not repackage this, if you
+# know something better in C, I'll be glad to use that.
+BDEPEND="app-text/trang"
+
+SITEFILE="60${PN}-gentoo.el"
+
+src_compile() {
+	emake -f "${FILESDIR}"/Makefile-trang
+}
+
+src_install() {
+	insinto "${SITEETC}/${PN}"
+	doins "${FILESDIR}"/schemas.xml *.rnc
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+}
diff --git a/app-emacs/org-mode/Manifest b/app-emacs/org-mode/Manifest
index 662dbde5d6c3..d73edcd03e2e 100644
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@@ -2,8 +2,10 @@ AUX 50org-mode-gentoo.el 95 BLAKE2B 9c74869edce0915d9793a3b10f61e8002dec553a93fe
 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
+DIST org-mode-release_9.5.4.tar.gz 2049298 BLAKE2B 7abd01bd78357b09cdc10661ad9b285c2e717c5848be2ff61df023d752659b6636881dfe17fe13486db8c9c37f576edfb02303f552c85e72594af99de7618a24 SHA512 06feb279c8e669fed263f9a3dbd8e0fa25450b1310a968d22b4f4d94b6a0515a1242758ed2c91a4d7c4c6b8315e756fe26951e9f9731ed3e7cfb7a0a8ef6999e
 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-9.5.3-r1.ebuild 1400 BLAKE2B 93d99c3e959140b0064b37d275b4b1163624748c5c8cc90caa345bb283a775feb5803cac35b7d51d5b8890da94e6a052bcdda2f8a98b285e7771dc6c6779be45 SHA512 2a97b5b025ea6edbbb3a5168609e3780b944497bed223d5de47e1d6bf5c3229edfe42476bf7264c618c00346f8c3a27021146a80d9a24d1ac172004b455c080a
+EBUILD org-mode-9.5.4.ebuild 1403 BLAKE2B 0a7b076c63baad861be41882805746d054f8d85e88afd9d73a310efeba7a0bf36610f0255093a0b0f5ab43a18f0a417103b436c5a32042af1155dbd6bc3b1be2 SHA512 28293db641d62fc0d6c2ac855c579d0d4e03d1f4f3963914c74f4d78f64ee1a5f0bea3fbc6d80950c87655121f74649a3669e542d8d17f95100c3a726bac84f7
 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-r1.ebuild b/app-emacs/org-mode/org-mode-9.5.3-r1.ebuild
new file mode 100644
index 000000000000..c67b95868b07
--- /dev/null
+++ b/app-emacs/org-mode/org-mode-9.5.3-r1.ebuild
@@ -0,0 +1,51 @@
+# 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 \
+		ORGVERSION=${PV} \
+		datadir="${EPREFIX}${SITEETC}/${PN}"
+	use doc && emake pdf card
+}
+
+src_install() {
+	emake \
+		ORGVERSION=${PV} \
+		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-mode/org-mode-9.5.3.ebuild b/app-emacs/org-mode/org-mode-9.5.4.ebuild
index dafc16ab39bc..3e9e8d36363d 100644
--- a/app-emacs/org-mode/org-mode-9.5.3.ebuild
+++ b/app-emacs/org-mode/org-mode-9.5.4.ebuild
@@ -10,7 +10,7 @@ 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}"
+S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-3+ FDL-1.3+ CC-BY-SA-3.0 odt-schema? ( OASIS-Open )"
 SLOT="0"
@@ -23,12 +23,15 @@ BDEPEND="doc? ( virtual/texi2dvi )"
 SITEFILE="50${PN}-gentoo.el"
 
 src_compile() {
-	emake datadir="${EPREFIX}${SITEETC}/${PN}"
+	emake \
+		ORGVERSION=${PV} \
+		datadir="${EPREFIX}${SITEETC}/${PN}"
 	use doc && emake pdf card
 }
 
 src_install() {
 	emake \
+		ORGVERSION=${PV} \
 		DESTDIR="${D}" \
 		ETCDIRS="styles csl $(use odt-schema && echo schema)" \
 		lispdir="${EPREFIX}${SITELISP}/${PN}" \
diff --git a/app-emacs/package-build/Manifest b/app-emacs/package-build/Manifest
index 1c4736ebc15c..4f3cd32c2a7b 100644
--- a/app-emacs/package-build/Manifest
+++ b/app-emacs/package-build/Manifest
@@ -1,6 +1,8 @@
 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
+DIST package-build-3.1.tar.gz 16074 BLAKE2B 9c07bfb5f748addd98d0e54b07723af667dff7f8a5220e83bce7e580f87f433ef8c8ea281d4997a959571e07de4364b8feb8e06306510d5e5025ac16ce4d6a2c SHA512 aeff30c04cac7423e88b1af3a8cff79f8fc5ea5712414514c603ba66713e59cd14965b0b6b77071f8183c130a60ab94f05ec754d810f1817ad0fcb71062d13fd
 EBUILD package-build-2.4.ebuild 406 BLAKE2B 89faf117576b9e8e84f790cc6a2c2b14dddaa71b3000815347eceb723f1b6aad374c7b06ed15b15326775cd7c43d0a5ae17fa944e2f5bd428befa062a7c942cb SHA512 2c272d8dd6aa8a61a918649f6315c900fc6cb18faa75fc195e6863066c9204e268633cf82994de2dd6b8b9fe1a216409ae53c17997c34dd286f9b5076feed908
 EBUILD package-build-3.0.ebuild 406 BLAKE2B 89faf117576b9e8e84f790cc6a2c2b14dddaa71b3000815347eceb723f1b6aad374c7b06ed15b15326775cd7c43d0a5ae17fa944e2f5bd428befa062a7c942cb SHA512 2c272d8dd6aa8a61a918649f6315c900fc6cb18faa75fc195e6863066c9204e268633cf82994de2dd6b8b9fe1a216409ae53c17997c34dd286f9b5076feed908
+EBUILD package-build-3.1.ebuild 406 BLAKE2B 89faf117576b9e8e84f790cc6a2c2b14dddaa71b3000815347eceb723f1b6aad374c7b06ed15b15326775cd7c43d0a5ae17fa944e2f5bd428befa062a7c942cb SHA512 2c272d8dd6aa8a61a918649f6315c900fc6cb18faa75fc195e6863066c9204e268633cf82994de2dd6b8b9fe1a216409ae53c17997c34dd286f9b5076feed908
 MISC metadata.xml 452 BLAKE2B 22cb0e741c502768ef7a4a9665f1857d7defb33ee449314d496f48b7571df697a8b675aecf2884cde00d2d0c81b2436c54de87674c7821744bcab475e9e01d9a SHA512 7eb57eece299500dbc7c8909c386290236a2ede60fafcf9bb0296912085d5fbf156215fda4a77207adaa523ee81b338e2330e5901cdeaecd8018c3991c359531
diff --git a/app-emacs/package-build/package-build-3.1.ebuild b/app-emacs/package-build/package-build-3.1.ebuild
new file mode 100644
index 000000000000..86af0a97c722
--- /dev/null
+++ b/app-emacs/package-build/package-build-3.1.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/parsebib/Manifest b/app-emacs/parsebib/Manifest
new file mode 100644
index 000000000000..0dd3e962022f
--- /dev/null
+++ b/app-emacs/parsebib/Manifest
@@ -0,0 +1,4 @@
+AUX 50parsebib-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST parsebib-3.1.tar.gz 19298 BLAKE2B 1588a9ef6e1642a612be2abb340d9127f8b8542ac2edda0deb5d9be28903443a33de877e44cefceba110332c022b8e4885a2927f172a447f035e9a5c0e65b5a5 SHA512 10dc25831693d271582b2d561401399e12ac3ccbc994dc95ae22fec800e1b242461deaa6a1c0ae5b20a1834baf88017b3ee42f1a53ac5d73f73a2f69c050c6c2
+EBUILD parsebib-3.1.ebuild 604 BLAKE2B f534310ef65572bad27355e505fa2e5925760dcd218786c3515a4899b6b0e2d78a20b35ff8c03e405e9798c0ed0d8bc427fd049ea9873ae007ff429935e8ef48 SHA512 43c0e3f48f27236e13b3c0ae7b4a28610affd2a9900fbdc72c81f96ea316deb13d13cd3508a5f9b6142c4056da6b1abfbdd8952ee5faea15d7ac5dcbda771459
+MISC metadata.xml 627 BLAKE2B c720728d95d1210afc6015d7472134e9078fbc67f591e4991dd34a780c49c8b30c1dec30c6ce57d81034f71895aafb8637c8181d7cdc9e13819ecceea919cc98 SHA512 a991dcfa3ddc97afc341228c4483c888de999eb79f67cb174e12a8d9725da58468c6e1330d8f5e2ef7e947e108e6eba1edba4fceca7955793b6d8a0c223d1f4a
diff --git a/app-emacs/parsebib/files/50parsebib-gentoo.el b/app-emacs/parsebib/files/50parsebib-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/parsebib/files/50parsebib-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/parsebib/metadata.xml b/app-emacs/parsebib/metadata.xml
new file mode 100644
index 000000000000..0892b478df27
--- /dev/null
+++ b/app-emacs/parsebib/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>
+  <upstream>
+    <bugs-to>https://github.com/joostkremers/parsebib/issues/</bugs-to>
+    <remote-id type="github">joostkremers/parsebib</remote-id>
+  </upstream>
+  <longdescription>
+    Parsebib is an Elisp library for reading bibliographic database files. It
+    supports both BibTeX / biblatex (.bib) files and CSL-JSON (.json) files.
+  </longdescription>
+</pkgmetadata>
diff --git a/app-emacs/parsebib/parsebib-3.1.ebuild b/app-emacs/parsebib/parsebib-3.1.ebuild
new file mode 100644
index 000000000000..6d23c9db04f0
--- /dev/null
+++ b/app-emacs/parsebib/parsebib-3.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=25.1
+
+inherit elisp
+
+DESCRIPTION="Emacs Lisp library for reading .bib files"
+HOMEPAGE="https://github.com/joostkremers/parsebib/"
+SRC_URI="https://github.com/joostkremers/${PN}/archive/${PV}.tar.gz
+			-> ${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( app-emacs/ert-runner )"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	ert-runner -L . -L test --reporter ert+duration --script test || die
+}
diff --git a/app-emacs/pdf-tools/Manifest b/app-emacs/pdf-tools/Manifest
new file mode 100644
index 000000000000..ece83e217537
--- /dev/null
+++ b/app-emacs/pdf-tools/Manifest
@@ -0,0 +1,4 @@
+AUX 50pdf-tools-gentoo.el 84 BLAKE2B d37daa46d1ac2591d7720d6a2d1d2eed5d2a90c5215edf00ad70b18c6c7c9c0fe465901a1363e2a35202c35a144f9999421e6723e38707c7e86cdd0bbfb945f8 SHA512 f5839fdee6f6fc4017ecff986b0460584a9497c13e33fcd09c100c8d0bda50b3408c20b80bee6d5254891e999b984aef6d7730aacf273b8b8a0e7d22565bca29
+DIST pdf-tools-1.0.0_pre20220619.tar.gz 459416 BLAKE2B 79a7c7a59faf9c11047bfb6218a8055cb9c757b928e52ff59ffb910e5aedb95ca7efe1dda1ae821d98a687fc6e700d8194311fc850f534f425534a1572bd34b5 SHA512 74ca8c05ad238c07ca1b6d6a594889d048220bb984b78b83e7af4c59eedfa7a35a03e153aa4d1296781f910eb0b3a68a5148876a30ad0f6e9fdecf831ff58f8e
+EBUILD pdf-tools-1.0.0_pre20220619.ebuild 1288 BLAKE2B 7d3e3269c11f51a47e9fe47b6d99c58ee11878ab0e1ead4efd6097f2cb68197f6c7a3d809366ea19a9f9d0d7fd0b2272e21022c5544e158520e765effec2dc4d SHA512 73e72d528a5d87e75b6874efaea682f397658e2ebc7acbd1c9a6c1598b9014440603415b0d38b2da22c7020bc561cf5665a3ed3ccb7eea4fd486fd290ffae7ae
+MISC metadata.xml 1213 BLAKE2B 8dc34b000f1f156f94630ac4e073af8b42e5cf331cfb0b7c83a094885db2ebdac1f4b376dc195bf14ab371812be25bb256850569e107d4e25dee2cd0427f1d3a SHA512 2044f0015d111d63fb3405adb20d763ea6d8b5bed7d444117e38b4f5fb24e012eb9e665e233aeeebd65da2973125bf1d2e69ee5377d50e0d7ff7d8f21b666b4b
diff --git a/app-emacs/pdf-tools/files/50pdf-tools-gentoo.el b/app-emacs/pdf-tools/files/50pdf-tools-gentoo.el
new file mode 100644
index 000000000000..bab875d73af9
--- /dev/null
+++ b/app-emacs/pdf-tools/files/50pdf-tools-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(load "@SITELISP@/pdf-tools-autoloads" nil t)
diff --git a/app-emacs/pdf-tools/metadata.xml b/app-emacs/pdf-tools/metadata.xml
new file mode 100644
index 000000000000..daf7018f9de6
--- /dev/null
+++ b/app-emacs/pdf-tools/metadata.xml
@@ -0,0 +1,25 @@
+<?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>
+    PDF Tools is, among other things, a replacement of DocView for PDF files.
+    The key difference is that pages are not pre-rendered by e.g. ghostscript
+    and stored in the file-system, but rather created on-demand and stored in
+    memory. This rendering is performed by a special library named, for
+    whatever reason, poppler, running inside a server program. This program is
+    called epdfinfo and its job is to successively read requests from Emacs and
+    produce the proper results, i.e. the PNG image of a PDF page. Actually,
+    displaying PDF files is just one part of pdf-tools. Since poppler can
+    provide us with all kinds of information about a document and is also able
+    to modify it, there is a lot more we can do with it.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/vedang/pdf-tools/issues/</bugs-to>
+    <remote-id type="github">vedang/pdf-tools</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/pdf-tools/pdf-tools-1.0.0_pre20220619.ebuild b/app-emacs/pdf-tools/pdf-tools-1.0.0_pre20220619.ebuild
new file mode 100644
index 000000000000..b4dfd41e3c9f
--- /dev/null
+++ b/app-emacs/pdf-tools/pdf-tools-1.0.0_pre20220619.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=fe42da60ad68e806af1677210249caccd7b99451
+NEED_EMACS=25.1  # Needs Emacs >=25.1 because of the "let-alist" function.
+
+inherit autotools elisp
+
+DESCRIPTION="Emacs Lisp support library for PDF documents"
+HOMEPAGE="https://github.com/vedang/pdf-tools/"
+SRC_URI="https://github.com/vedang/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${H}
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+# Cask is a hard dependency for tests; it is ran by helper functions too.
+RESTRICT="test"
+
+BDEPEND="app-emacs/tablist"
+DEPEND="
+	app-text/poppler:=[cairo,png]
+	dev-libs/glib:2=
+	media-libs/freetype:2=
+	media-libs/harfbuzz:=
+	media-libs/libpng:=
+	x11-libs/cairo:=
+"
+RDEPEND="
+	${DEPEND}
+	${BDEPEND}
+"
+
+DOCS=( NEWS README.org )
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	elisp_src_prepare
+
+	cd server || die
+	eautoreconf
+}
+
+src_configure() {
+	cd server || die
+	econf
+}
+
+src_compile() {
+	BYTECOMPFLAGS="-L lisp" elisp-compile lisp/*.el
+	elisp-make-autoload-file lisp/${PN}-autoloads.el lisp
+
+	emake -C server
+}
+
+src_install() {
+	elisp-install ${PN} lisp/*.el*
+	elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+
+	emake -C server DESTDIR="${D}" install
+
+	einstalldocs
+}
diff --git a/app-emacs/proofgeneral/Manifest b/app-emacs/proofgeneral/Manifest
index ed378f2a12ef..8ba9bc2873a9 100644
--- a/app-emacs/proofgeneral/Manifest
+++ b/app-emacs/proofgeneral/Manifest
@@ -6,4 +6,4 @@ DIST proofgeneral-4.4.tar.gz 14105056 BLAKE2B 8d45218cde620411d14ab3c703fea37f04
 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 1490 BLAKE2B 0b9daae8ebf45d229562ec64ebc02b7ed9c1fc1d6f0d33f88f35750befc72997b94d0ca48bf0bf1698ed47fd491f9fc6794b9dea623910dbc9ab550ee61d7ca9 SHA512 b5aab05798a31bd4ceec59af1af429babf746b577b6167cea8c791f893daa491d0e49618f621d5661e61ca3c01ce32ba45001391e6618a346a6b2d0c3b6eb38f
-MISC metadata.xml 283 BLAKE2B 81c49021199f71096079a27f9121390fb8c1285c54b9478583ff2d647277fa106ef12456d7097c4be092fc48b514a1adcf855ca0fac911598232ef9eb7f102c0 SHA512 f32b303760addf5d4db8d18bd10fb677353cdfa4c5e545d47804ef756cf5e5a21f8b8efb631b08f802185913ceb98da820e404e06eb03d01fe9ea85c10d1ac13
+MISC metadata.xml 656 BLAKE2B 5fde6e347ee778bf4ac7f46bd6b8928eb9fa1a6aaf02b8dff5b533f7dbf989799a6fa948161fccab5716ed7d61866750e8e8e8127a83258075009f2e1dd1a0e9 SHA512 481b819f3541c90b114f79eb831b0d1f0d7f3510e468f4b9d9ec7e98078dc4fc15c7fc983d25accd5a8ab3d588ff820af1d46d479bd11b6134fa1b0842072d2f
diff --git a/app-emacs/proofgeneral/metadata.xml b/app-emacs/proofgeneral/metadata.xml
index 986088003fe1..8cf3eae5dcc1 100644
--- a/app-emacs/proofgeneral/metadata.xml
+++ b/app-emacs/proofgeneral/metadata.xml
@@ -5,5 +5,14 @@
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
+<longdescription>
+  Proof General is a generic Emacs interface for proof assistants. The aim of
+  the Proof General project is to provide a powerful, generic environment for
+  using interactive proof assistants.
+</longdescription>
 <stabilize-allarches/>
+<upstream>
+  <bugs-to>https://github.com/ProofGeneral/PG/issues/</bugs-to>
+  <remote-id type="github">ProofGeneral/PG</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-emacs/pymacs/Manifest b/app-emacs/pymacs/Manifest
index 25dad8fdee36..ff43d8c86331 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 1133 BLAKE2B 684c877e88526c3d48441eb967f61185669c8c4ba3489207fd5971f248efdd10202a8b50a295e4c84a78efb9b88b2d41f80f8b4464a5a9c527eb55e4b7abe6c8 SHA512 18891ddd8c2adc9710f12b9207976966fbf78bcec5383794cf30a549fd81f5b03b5323756b648ab1107436c9a0ffd0d5835b866155de4089bc611567c05c7d13
+EBUILD pymacs-0.26-r3.ebuild 1104 BLAKE2B 2c8f36295ae9c18fa3d34ef05c1feed08dca1ee6998b3f30740e0538eb8e43dfa528878cfee5b385b242cfdac7d74544be6d119e5c7d21c3a3fb40c056b1087a SHA512 43308fb357ba0c483affb6c9f42a4b48e8184a192fa8c728388803f9e4d3c197ec04283ef8f0e6a038315b8347d62390f0fbab09020c75a0d730ca6960ada527
 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-r3.ebuild
index 6969000e028c..d68770ec00be 100644
--- a/app-emacs/pymacs/pymacs-0.26-r2.ebuild
+++ b/app-emacs/pymacs/pymacs-0.26-r3.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 DISTUTILS_IN_SOURCE_BUILD=1
-DISTUTILS_USE_SETUPTOOLS="no"
 
 inherit elisp distutils-r1
 
diff --git a/app-emacs/racket-mode/Manifest b/app-emacs/racket-mode/Manifest
index bcffe168014c..ec8cb7d0b9b7 100644
--- a/app-emacs/racket-mode/Manifest
+++ b/app-emacs/racket-mode/Manifest
@@ -3,6 +3,6 @@ DIST racket-mode-20220219.tar.gz 298876 BLAKE2B b3dfbcd9b436648da1ecacf4b7434c3e
 DIST racket-mode-20220411.tar.gz 303095 BLAKE2B 7fed011b915e86f6d40d6a9f8640ea2b066c201cf28e20a941fae841e96bf3649f3cf0ad7847091984a7cf490e9b98142617e47038dea70c44999510144dda3a SHA512 ec17ade728390f8f8b783703ca319ee15502afa7f82e86d9aa8b60361ecc65af21990cf89532b38bfc211887c00b5aa4c820dc0e66a1b1a1a9aacbc08673d35d
 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
+EBUILD racket-mode-20220411.ebuild 1241 BLAKE2B d1a4ba8103e7a9cb57099e5e8a52c95e6456576484a0caac206a021422484c292f4cbdeb74c2aa9cdce6854145f13a674a9ea46448239a40511d1870965c8311 SHA512 b64a61f4d1849d62612538cf1570312beb4c747b13538d3db037a1ca77cf2e6b48d0d058a30cf4332547f9bf508e31ed3a9ebea2c17169f3a181b483b1df57a5
+EBUILD racket-mode-20220505.ebuild 1241 BLAKE2B 7cc74408126877712fe0952c0c02bed9d7d4fad22aec749520086678471c81618ea3eecceb64080bde07c757934cd54ab0703ac47d1978562f6170ffa77b544e SHA512 000098e2808266f355770c491fbae0ea5d4d7e632345575e10d592861e8fa6f1274a1c1ab0fb4030e5b5563c8753535ce0c4223798fdb53d48207c4d11256d57
 MISC metadata.xml 818 BLAKE2B 6029673bee9510c74b9cf89bbbef03638cdfcfeaaae49f2f94d57cd960c616c7b43c8dc3a0c79892be87dace9e7549b3b4453b13fcc7a23f7b6a02066dbce29a SHA512 8b487cb9f4018d3ec7a2cf130b26d58522772bef05d258100068fc89500577a5f680f480b89f06ef63d99c4a6d4e4fd825ea3338934438715fb83a946f6fe7cc
diff --git a/app-emacs/racket-mode/racket-mode-20220411.ebuild b/app-emacs/racket-mode/racket-mode-20220411.ebuild
index 46f695097f04..7660d6f56ec0 100644
--- a/app-emacs/racket-mode/racket-mode-20220411.ebuild
+++ b/app-emacs/racket-mode/racket-mode-20220411.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-20220505.ebuild b/app-emacs/racket-mode/racket-mode-20220505.ebuild
index 25ccbce138fe..272895d371b3 100644
--- a/app-emacs/racket-mode/racket-mode-20220505.ebuild
+++ b/app-emacs/racket-mode/racket-mode-20220505.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/raku-mode/Manifest b/app-emacs/raku-mode/Manifest
new file mode 100644
index 000000000000..f12eb06f076d
--- /dev/null
+++ b/app-emacs/raku-mode/Manifest
@@ -0,0 +1,4 @@
+AUX 50raku-mode-gentoo.el 378 BLAKE2B 2fad21cf6b472bb3dcf41e1441e8ebc60aa846a43969431900077d146eeb82a713b1f3417febaa65093a65519dec9ff97f5584414e553524b86f55c0e90cd61c SHA512 776eec7d6e6994a485b0a696a649fa3c1afa6934f20f5e8b378124d18b9a1f0c64658c45a305cf2094d25edfef96e72b923823ffa4e67534580b07ba0d5314ab
+DIST raku-mode-0.2.1_p20211121.tar.gz 31506 BLAKE2B 7faa69740ea882482bf8462b4fa1da497bcce1ab46f19b7c54520d53c5e7e8f29f55204fc6f41b6ba4059503efe3057b3b901ec41d4d635975f81e6d90e2ba9a SHA512 ee2bce5ce585d2cdb7c3ca8f387dfa5acc774a5923d53567d655f9a15cefe322f486ba32e9ae4ff9105116a15cc948bc0eb9e7a30fd1b2e57ab90cd741386526
+EBUILD raku-mode-0.2.1_p20211121.ebuild 684 BLAKE2B 0597981e91abc6038ec173398a046fd411abb52a1d85e0be9cebc7b7e0bb4ba4b5a1edaabf351fa6a15574efcec1642ef4eda4e49cc12d5a1679894bd79d389e SHA512 e7e17029c08e04bafe3a49333177ae0a70c81b87ed578078c06eb3d443af3db09281934176cc33c721e38d2299bcf7700d6c4c2222c2f5997b1dababa8822156
+MISC metadata.xml 417 BLAKE2B d1a7d48fed4e51b12f25074826e192319b399ff5c8341fa202d3948d4260857fbff13d1eb6056a22bf8b8ec840573c8a753c9b10194ef588b804d5febcaeead7 SHA512 8096fecd39a7dfba608c0fe59cfe8b2d431db2c4f212c20691e69aa44acb9b67f8c08bf5ffe236a9392d92cb61cc529766824dcabf6faa238219efd978564f86
diff --git a/app-emacs/raku-mode/files/50raku-mode-gentoo.el b/app-emacs/raku-mode/files/50raku-mode-gentoo.el
new file mode 100644
index 000000000000..49f659e0ab11
--- /dev/null
+++ b/app-emacs/raku-mode/files/50raku-mode-gentoo.el
@@ -0,0 +1,7 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'raku-mode "raku-mode"
+  "Major mode for editing Raku code." t)
+(add-to-list 'auto-mode-alist '("\\.nqp\\'" . raku-mode))
+(add-to-list 'auto-mode-alist '("\\.p[lm]?6\\'" . raku-mode))
+(add-to-list 'auto-mode-alist '("\\.raku\\(?:mod\\|test\\)?\\'" . raku-mode))
+(add-to-list 'interpreter-mode-alist '("perl6\\|raku" . raku-mode))
diff --git a/app-emacs/raku-mode/metadata.xml b/app-emacs/raku-mode/metadata.xml
new file mode 100644
index 000000000000..8835f758ecaa
--- /dev/null
+++ b/app-emacs/raku-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/Raku/raku-mode/issues/</bugs-to>
+    <remote-id type="github">Raku/raku-mode</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/raku-mode/raku-mode-0.2.1_p20211121.ebuild b/app-emacs/raku-mode/raku-mode-0.2.1_p20211121.ebuild
new file mode 100644
index 000000000000..0f07259a9572
--- /dev/null
+++ b/app-emacs/raku-mode/raku-mode-0.2.1_p20211121.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=977b14a7c1295ebf2aad2f807d3f8e7c27aeb47f
+NEED_EMACS=24.4
+
+inherit elisp
+
+DESCRIPTION="Major mode for editing Raku code"
+HOMEPAGE="https://github.com/Raku/raku-mode/"
+SRC_URI="https://github.com/Raku/${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 )"
+
+BDEPEND="test? ( app-emacs/ert-runner )"
+
+DOCS=( CHANGELOG.md README.md README.tmp-imenu-notes )
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	ert-runner -L . -L test --reporter ert+duration --script test || die
+}
diff --git a/app-emacs/rust-mode/Manifest b/app-emacs/rust-mode/Manifest
index 5b9e44f46fbb..983e23193c4f 100644
--- a/app-emacs/rust-mode/Manifest
+++ b/app-emacs/rust-mode/Manifest
@@ -1,8 +1,8 @@
 AUX 50rust-mode-gentoo.el 135 BLAKE2B 083a273140a659c1a76c05178990ffe4b0f3ae2ede81878ce8cfaab451df4a5169cea46fa4600e57ea77a9a7d55571cb7c862098e5ee76677dd73213e6a30036 SHA512 bd6f7579408d26900d40e674ff75bac2d1989c9bd068dae4bd4c54271e7b04cfcdf4d7d3622955f949cb60496a0d055f5f436084975bb624415b46ddb330f0fe
-DIST rust-mode-0.3.0_p20190125.tar.xz 37580 BLAKE2B d4d3ae9dac452ba3e2966d5036bd5f4edb4066ca65954b7f18a99c56ad6a8848fd80ef799c7c266c77a844839d87ab9641c77afc089a17e4e459fea27b6af982 SHA512 303d7f183006769b3fdf7a7118b36d29d785c2a29cf88ae286cb86180f84a4e50e66597d3bc984979e2509b872632d750fba96ff522081df5351d8d9511a3272
 DIST rust-mode-0.4.0.tar.gz 41774 BLAKE2B c0263f9fa839dcf5ee74706d8d13c10161d024114fda161dbd5235036eb322d273e8624a23f5e848e9246500d1da0c272420cb89f250f8d1852c7552eb7d0939 SHA512 fe0e1d667ba9595f9cbed22e0f88096508e49ffe8e3c86349cb3319eefea38a1dd86c2b55aef1415ae0cfc3b65ac6807f1863eb0e6eaa9ff49aea989a46e5edc
 DIST rust-mode-1.0.4.tar.gz 52123 BLAKE2B 3b7535d8906da6a477b029991c21520114c516a194f5f627ad544953f5f04c380e9481858e8045db4d96ef42f620c23d4b6002c76464216908c4ecf94c9de650 SHA512 8318c96280760a66841a4549407cb749cf0da15979d92e41d0c4f9ddd9d6a4d4fd22a4292b22fc69107ea6afa729f4c7516a10ceee044211829435078bd2814c
-EBUILD rust-mode-0.3.0_p20190125.ebuild 676 BLAKE2B 17b59d80843fb61ac98a1d3732f0715e249132e16bcd61139640dfee72a85a8137bbcf52a7df02599eb40cebfa55878fa15d081f32e4eea7e2b6be902e811014 SHA512 cfa15e1280fa3481e6b78f2bf4133913a62ad25c14f8b499e6abe075ad9fd1b07a7af200e2f18c4e7b9e4e173d0fef9fde79abbabb2bf477a70efe48d47a0986
+DIST rust-mode-1.0.5.tar.gz 52665 BLAKE2B 3b61372223637b7950ec7a15a80abd3b74972ecda0677f730f3ebc8e574b50985a7427b4531766b1dfd20225f7b718497aa4437dadfa041c5a9cde9413d3cb5c SHA512 7b76384adf7281866fbef0ab507098084a96fe562d1dbd5dd99e03fda2a91c23392c8667c21aa5800b188cd09f5349a7394b0a7215826b9bc668cc36ac902999
 EBUILD rust-mode-0.4.0.ebuild 714 BLAKE2B f3d8f25938f5763ff057137193554cbb84cc00ae964d78517a381610cfa0ed70077c8f906153bc7a4078bcdabd43df8ae160bcd05081f3dc4a7aeb526100d002 SHA512 43e476ab5ce5280dcfff7908f5211beb5f6cd3e0dca4f730be799a8412790e73e5c272ebe18fcabe3ca120babfa3b3beb205043b57d8d7c7c9a3726182f544d8
 EBUILD rust-mode-1.0.4.ebuild 607 BLAKE2B e546d373ea77bb097e66e69e5ec65f458586b0e85cfafdd728a498c25d51426cc41d8e1d7819c7cc1d5f53b7f0b1da51ca7c9f3a43b5340a48a524cb46d2c1b9 SHA512 a940a1f221570e35b3ac13432fdd2b3057640a7df5793352322f29fee61a0df38220da1dab91a5c225bfafcd56e7ce16324005eec9cdb27053fb22d03889fa69
+EBUILD rust-mode-1.0.5.ebuild 607 BLAKE2B e546d373ea77bb097e66e69e5ec65f458586b0e85cfafdd728a498c25d51426cc41d8e1d7819c7cc1d5f53b7f0b1da51ca7c9f3a43b5340a48a524cb46d2c1b9 SHA512 a940a1f221570e35b3ac13432fdd2b3057640a7df5793352322f29fee61a0df38220da1dab91a5c225bfafcd56e7ce16324005eec9cdb27053fb22d03889fa69
 MISC metadata.xml 283 BLAKE2B 81c49021199f71096079a27f9121390fb8c1285c54b9478583ff2d647277fa106ef12456d7097c4be092fc48b514a1adcf855ca0fac911598232ef9eb7f102c0 SHA512 f32b303760addf5d4db8d18bd10fb677353cdfa4c5e545d47804ef756cf5e5a21f8b8efb631b08f802185913ceb98da820e404e06eb03d01fe9ea85c10d1ac13
diff --git a/app-emacs/rust-mode/rust-mode-0.3.0_p20190125.ebuild b/app-emacs/rust-mode/rust-mode-1.0.5.ebuild
index 08710c7798e1..bd23bef33b88 100644
--- a/app-emacs/rust-mode/rust-mode-0.3.0_p20190125.ebuild
+++ b/app-emacs/rust-mode/rust-mode-1.0.5.ebuild
@@ -1,19 +1,21 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 NEED_EMACS=24
 
 inherit elisp
 
 DESCRIPTION="A major emacs mode for editing Rust source code"
 HOMEPAGE="https://github.com/rust-lang/rust-mode"
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+SRC_URI="https://github.com/rust-lang/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( MIT Apache-2.0 )"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+DOCS=( README.md )
 SITEFILE="50${PN}-gentoo.el"
 
 src_test() {
@@ -21,8 +23,3 @@ src_test() {
 		-l rust-mode.el -l rust-mode-tests.el \
 		-f ert-run-tests-batch-and-exit || die "tests failed"
 }
-
-src_install() {
-	elisp-install ${PN} rust-mode.{el,elc}
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-}
diff --git a/app-emacs/s/Manifest b/app-emacs/s/Manifest
index fd2dcc34adff..f3002a4fef2e 100644
--- a/app-emacs/s/Manifest
+++ b/app-emacs/s/Manifest
@@ -1,4 +1,4 @@
 AUX 50s-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
 DIST s-1.12.0.tar.gz 59193 BLAKE2B 89e4c453b6590116a4cc08fc1be73519e6c95586c1e80b37f37d7273232aa707cd030cf74106fdd7eb7f05fe8ebd04253592076573472c3927cc1428b4c029f8 SHA512 036369011295dfde7567ae8bd479be9635de479e8821c3fe117a6c3827bc83492bb91e6ac64d4b20b061da95690f5585ed58f116a2b8c877dceee22153c8c990
-EBUILD s-1.12.0.ebuild 457 BLAKE2B 501820173974c3eec5812c2844849859ada1ef5c8f1cc4ec711f8c8e5727821fdb62bd1097a78c192e63f3fd044f7863c32bd9a45dc9d79fc3d3db4a35daf8d8 SHA512 250638d81585dc593fea52e88add79f9d0ff878f16f9f8e79392a697b4f28aecea59b059a62dbe86c48f3d143056c369df093dffd78a3c5533ed0549ea5ffc5e
+EBUILD s-1.12.0-r1.ebuild 499 BLAKE2B a7add64afde8acf76ff7ac5cf7bdd3193b1555f18135b3a14f2500f6411e5fb634136009e027239e5f6b6ba2237ebe19293d44aff4cfaf9fff1bd59d33adfe07 SHA512 3826bfc67bf5b3992aded1c23297dc6fbdbecfead3a21fa5c22f7d1f2111189b1fb5c885c82916f7a3cb09b731b83c3e386e9577965c90bf0623dcb8dfe33030
 MISC metadata.xml 358 BLAKE2B c966645ca03d9831e511a7b54ab031c9c9764ee8295d5b0a90dc1f80d93a68c95076329af5d8951dc025d86ab0f15580109b2c521178ff68694cfdce5fe0f9bf SHA512 268ef26faa4a736d2301efa6c3f745f90cc41fbc6fbaeb63931a6206a2cd78e66546d30f16dc956c7918a644522a637311047e71dc4318bdc588957085fca914
diff --git a/app-emacs/s/s-1.12.0.ebuild b/app-emacs/s/s-1.12.0-r1.ebuild
index 1d0ca0aa37d0..7c91889d847b 100644
--- a/app-emacs/s/s-1.12.0.ebuild
+++ b/app-emacs/s/s-1.12.0-r1.ebuild
@@ -1,18 +1,22 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit elisp
 
 DESCRIPTION="The long lost Emacs string manipulation library"
 HOMEPAGE="https://github.com/magnars/s.el"
 SRC_URI="https://github.com/magnars/s.el/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/s.el-${PV}
 
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
-S="${WORKDIR}/s.el-${PV}"
+DOCS=( README.md )
 SITEFILE="50${PN}-gentoo.el"
-DOCS="README.md"
+
+src_test() {
+	sh run-tests.sh || die
+}
diff --git a/app-emacs/setup/Manifest b/app-emacs/setup/Manifest
index 2d0389de423a..d0b9737be94c 100644
--- a/app-emacs/setup/Manifest
+++ b/app-emacs/setup/Manifest
@@ -1,4 +1,6 @@
 AUX 50setup-gentoo.el 80 BLAKE2B 4885f94dbe81e40813b5df07e06145f637c4ca784dd587ba67e0d3cb3d50e19dd05220fe2767a73dd839df3c7d391a6ed574d225ec845472a0b0b0116d1b0bd1 SHA512 21ac6b35bbc3dd4a0b82c91747b03c789853a9e398f8b8d5833e9310d151d4afa1833b54ad7b9b0768ec77e7381501bc00ed9544e1d026124f4e82e4d3df5346
 DIST setup-1.2.0.tar.gz 19709 BLAKE2B 704340f9ab8a3e10fdeafed88365fb3151fe8c9600960defcce0021850a1846ffc5e7a3c02a4567371c18b4bdf5b81c80544fe82c22a150ca4d4505818ba8148 SHA512 705e188876316eb76938229395676a9068e735074d63865dd9a2a21d83face2768f958f76cf9c88b6cb3d4668e271ee043d7aa81a40d3b384fb1bc75bb1f0af5
+DIST setup-1.3.0.tar.gz 20112 BLAKE2B 7e8b29c6a2be68572ede8845bc1cdfc8e00acdaf1db972124ab18f2ec6ab216a481dc4c40ff256e7bdefd2558cafb686af8a51728e0b1c093ca369fa4a093c09 SHA512 cd088dba4f258a3440ec78e5742b6a2f5d1dba46e3382ea3b40967b640c80fd292b7edc1421f07561c270c4404d95c0fd55bd166265c79c131e0037f2181cb66
 EBUILD setup-1.2.0.ebuild 610 BLAKE2B ce3b07655764c4bb26cedf48233b306e52c2922ae07a41e3ffaf5b30ed951be6088ef8eeb6cafe528da431208dd381f3318277919c15b98533d73b6b67cb90f0 SHA512 709c163d3d3e4af2a92c7aff0a749852042e0db2316d8fee2f337f4b2be7cf1b109f1fa4b9e89ce224799e3352692a8d770b9b63d231e1c966cb5ca812040dfd
+EBUILD setup-1.3.0.ebuild 610 BLAKE2B 371a96b22537ab8333ad68a67b601aff25536983de29c0d10cfbd9d8e3c7aceb5a23fb5532ee120a013a29570ac61b2209d017211763183383d1029b2e0155ee SHA512 9796019267164c79532958d138ec74d6f83e31f24c99d1ce72a1534c5ac3f7eb192b8cb55de91d6cb2e22d69976e4b7e7d172dd20adefa2f23eabf2e670e9539
 MISC metadata.xml 283 BLAKE2B 81c49021199f71096079a27f9121390fb8c1285c54b9478583ff2d647277fa106ef12456d7097c4be092fc48b514a1adcf855ca0fac911598232ef9eb7f102c0 SHA512 f32b303760addf5d4db8d18bd10fb677353cdfa4c5e545d47804ef756cf5e5a21f8b8efb631b08f802185913ceb98da820e404e06eb03d01fe9ea85c10d1ac13
diff --git a/app-emacs/setup/setup-1.3.0.ebuild b/app-emacs/setup/setup-1.3.0.ebuild
new file mode 100644
index 000000000000..364818701e67
--- /dev/null
+++ b/app-emacs/setup/setup-1.3.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+NEED_EMACS=26
+
+# The upstream does not create git tags for releases.
+MY_HASH=eece09d1151fd641f31d738b8c62742918993e95
+
+inherit elisp
+
+DESCRIPTION="Macro to simplify repetitive configuration patterns"
+HOMEPAGE="https://git.sr.ht/~pkal/setup"
+SRC_URI="https://git.sr.ht/~pkal/${PN}/archive/${MY_HASH}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${MY_HASH}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp_src_compile
+	elisp-make-autoload-file
+}
diff --git a/app-emacs/sumibi/Manifest b/app-emacs/sumibi/Manifest
index fb0d934622f0..14a523c4832f 100644
--- a/app-emacs/sumibi/Manifest
+++ b/app-emacs/sumibi/Manifest
@@ -1,4 +1,4 @@
 AUX 50sumibi-gentoo-0.7.4.el 123 BLAKE2B c93fd2b06ba4fb72501271b517e719c81c95653d384cb916e837e3acca183960ac01c5e6fc3b1e80875578368be491a00b6b214650dfb25665600c28ebb9fc71 SHA512 4432779e38518ce204e93eb908b2d1ef0a0cc90c92b7959f5dafcdc468955789ad81f321c5d15dbcebbf5a5fff7263a71770fcb3c1127b9e4afe61c952298dc8
 DIST sumibi-0.7.4.tar.gz 66886 BLAKE2B 9da3a411bc232061f311e70e9dadcb8399f36842d2e344145604e5c26cdcf46f00f38ef2d8130a2a56dde729a9e0348ad7056d00d764389dde4717d622d24478 SHA512 23c78c445479699551a5a25d67bb909746b6b1377bc81c372ffee02a4baf7968490d454b54340ec0cb46ec92d21a3945b8bb231f8b9833309022c204373d0a2b
 EBUILD sumibi-0.7.4.ebuild 489 BLAKE2B 44419a075f55137f251557c128c5be6b11c4f48b9b90778289d844d0125c8f37896cb8bb93eca72de36f7d5bb9fe226f15631c9c3c303de512c879fda8986291 SHA512 486458d31440b2373be139f778198eb222abf9f41f8f9c05f3858f7e60805db96f044d2e476bbe4f3042ebe5fd8a24a122741457a87b22386335247bc5fae07a
-MISC metadata.xml 453 BLAKE2B d6cd41af46ebad4d8043f76da2988106efe54de83fccde71e3dd40495669f7b0dc564c5e896edead87aa328e45344345186bcff083f7a584b7290888ead838d4 SHA512 9985e16a4e48d252f27f1c0d0e0b7a78ca563284dab13d6a8031d7cf9eaf215aa766ab27ad5669eeb6278c75a6cbcbb14d1be6c29f61ebb6568309673548e2c8
+MISC metadata.xml 443 BLAKE2B 60725ad361f905850a1ae34a3c13574de6830cba02cb73807bf04d6e3af10c3219d4ef8f319a5b817406e61564dbd3b44b29c593886a8298aafcb21e17a62548 SHA512 2acf25379996d9b5f08265424d10fcd7c3ff50abed0e6653263bb2696038971b91e478f2e7538d43f7ada5c344ddacd744ccc64385cdbf1d522fd5626d5d3ccc
diff --git a/app-emacs/sumibi/metadata.xml b/app-emacs/sumibi/metadata.xml
index 46d4419e7a87..a9232ab47149 100644
--- a/app-emacs/sumibi/metadata.xml
+++ b/app-emacs/sumibi/metadata.xml
@@ -11,6 +11,6 @@
 </maintainer>
 <stabilize-allarches/>
 <upstream>
-  <remote-id type="sourceforge-jp">sumibi</remote-id>
+  <remote-id type="osdn">sumibi</remote-id>
 </upstream>
 </pkgmetadata>
diff --git a/app-emacs/tablist/Manifest b/app-emacs/tablist/Manifest
new file mode 100644
index 000000000000..8a57aedbb4d8
--- /dev/null
+++ b/app-emacs/tablist/Manifest
@@ -0,0 +1,4 @@
+AUX 50tablist-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST tablist-1.0.tar.gz 31848 BLAKE2B 11bc943aaf25fb1fe6ecb43a944d70d9b5ab4c423f9df96c881a840570780707a702240808c425e8e91321ad620c1773c80c03e2f6881ccddff84c0d818aa7a4 SHA512 14d32228e9663d218b49563ec07a5f8d094b389e06e532c0710af54d7386fcd19435fae2920163e0c774b7b67bf77ef5fc0a246dfbdb11785dca976ff47eeff2
+EBUILD tablist-1.0.ebuild 424 BLAKE2B 8aa8ada6fe806828b392181ff38e5a1bee9a4ae08b6653dace053c22f7aaddc07ec396fa7d34ca3a860031eae2f049bfc60cbef775a4e48b185e61058572aafe SHA512 e19c2c582a98db4d1f53dc2835b2cf41124f011847e72c2dcba7add0fd4fa93ec782cec74c9cadc8723e1fa94f22118aa9fe2691ca25895a46ed98e141d14e4f
+MISC metadata.xml 733 BLAKE2B dbcaea825af46c7338b5517153b8bed00afe403ff424faacb321b6387d54da853e8a7125d3de8bc9b9087cb0b2089906ec570fe43ab6f37896c0f69b63737205 SHA512 c0f3de87ac79ed940b52dc969eb7c3547c5df0f94962be4ad2ab946ebb42a8dcfe029faa6cf128655bf6676a474100d343e940c447388dc4431c78543c28f9a8
diff --git a/app-emacs/tablist/files/50tablist-gentoo.el b/app-emacs/tablist/files/50tablist-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/tablist/files/50tablist-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/tablist/metadata.xml b/app-emacs/tablist/metadata.xml
new file mode 100644
index 000000000000..55cb7b1f0219
--- /dev/null
+++ b/app-emacs/tablist/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>
+  <longdescription>
+    This package adds marks and filters to tabulated-list-mode. It also puts a
+    dired face on tabulated list buffers. It can be used by deriving from
+    tablist-mode, or with more limited features by enabling tablist-minor-mode
+    inside a tabulated-list-mode buffer.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/politza/tablist/issues/</bugs-to>
+    <remote-id type="github">politza/tablist</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/tablist/tablist-1.0.ebuild b/app-emacs/tablist/tablist-1.0.ebuild
new file mode 100644
index 000000000000..ab4bc1aa5088
--- /dev/null
+++ b/app-emacs/tablist/tablist-1.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="Extended tabulated-list mode fro Emacs"
+HOMEPAGE="https://github.com/politza/tablist/"
+SRC_URI="https://github.com/politza/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/vertico/Manifest b/app-emacs/vertico/Manifest
index f5ee62ef8022..e27f44ea1b96 100644
--- a/app-emacs/vertico/Manifest
+++ b/app-emacs/vertico/Manifest
@@ -1,6 +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
+DIST vertico-0.23.tar.gz 42631 BLAKE2B ccb5a30cb3da9bed0a16af06919635ebc23777d0f19fad4fbbb422b0bf04e38f1de1a51e375263f212b0ae25881f4428e9fc6d665ef46ff9aaabd3964b4ab006 SHA512 7425b33a7628e8fd246386908835ee52ef357ecd3909a6cde0f9ed89dc468590fc854b599c2ed13572003ef6b36bd8df26db3da0764feadc407918ed68ba910a
+DIST vertico-0.24.tar.gz 42777 BLAKE2B 64e3f11dfb425c814665b49d755a52db4146c875969be7621539892f72df6ef9c4186be05373230b48369f1e2e85aee8e97cb829afe3618b9507170c4a8ca1a0 SHA512 67edb7e45e257c2cdf53d7adb2b29eed8cb3a1ac42dcec41bd555d553c60e4fc9806c6ad51b5cc183abb1d3967a4f43ab0e4ce0d317f77eb4d7cdedb9ea39834
+EBUILD vertico-0.23.ebuild 520 BLAKE2B edbaf5bc705dfd6c08b2ba2a253ed15c0e7293de324d27bc9745a85417dc49fe4a483a0e6f89d15b7eb4b624f90e9b56dc8adbef7db4975320cac08f9a3baf6b SHA512 4e5554b24d22b0efdc3122b35c9d5717e3a44ece867eb99cd257b270b14b10c277de23a3f8d9463c2e11f9dedb2c02c030f3274ee522310188afc97a9951fecc
+EBUILD vertico-0.24.ebuild 520 BLAKE2B edbaf5bc705dfd6c08b2ba2a253ed15c0e7293de324d27bc9745a85417dc49fe4a483a0e6f89d15b7eb4b624f90e9b56dc8adbef7db4975320cac08f9a3baf6b SHA512 4e5554b24d22b0efdc3122b35c9d5717e3a44ece867eb99cd257b270b14b10c277de23a3f8d9463c2e11f9dedb2c02c030f3274ee522310188afc97a9951fecc
 MISC metadata.xml 359 BLAKE2B d5d9e7f1c0ec1dc75d7fde73aa75f364f15740857e6a2bf39b3374424c3fcff4e79ceda481141598fee17c694b4c3538059f5bf95186aad6d535eacabcdb3341 SHA512 93e435f0f7bdb4d26a48525109688b964049a0b61d4b5633bd61dfd14ab68a5bd7e367d0cb7e45f5f1a57d73b8b63a9b2f8b0da9ac289bd4242da3b6f434b987
diff --git a/app-emacs/vertico/vertico-0.20.ebuild b/app-emacs/vertico/vertico-0.23.ebuild
index d2415e174e28..d2415e174e28 100644
--- a/app-emacs/vertico/vertico-0.20.ebuild
+++ b/app-emacs/vertico/vertico-0.23.ebuild
diff --git a/app-emacs/vertico/vertico-0.22.ebuild b/app-emacs/vertico/vertico-0.24.ebuild
index d2415e174e28..d2415e174e28 100644
--- a/app-emacs/vertico/vertico-0.22.ebuild
+++ b/app-emacs/vertico/vertico-0.24.ebuild
diff --git a/app-emacs/web-mode/Manifest b/app-emacs/web-mode/Manifest
new file mode 100644
index 000000000000..c853d1efc7c2
--- /dev/null
+++ b/app-emacs/web-mode/Manifest
@@ -0,0 +1,4 @@
+AUX 50web-mode-gentoo.el 114 BLAKE2B fde7e2b5189d353f81b7d29f98b5926ba212c088dfb6b444d81cae21b2167cb5604ce83e1d59860c2f138094515643592ef1e7259e484c6022d7981d4dec1ba5 SHA512 c2f35495eeb30ffe72282fe710ca20ef109aa2a6dc239a106e56ade5f16293b7846a3fce4a38f4583abc7757084246704cb6f914daddcdc5b208c49eae229d94
+DIST web-mode-17.2.1.tar.gz 155440 BLAKE2B bae77ca300f77ad4dd520b048194eb66b592e57086e9720ec98c59c30e06a4f86e55f74f427b5ae1bf7e8a2c7f243168ad9c38c9911dc3ab4f98bad0ee8632a2 SHA512 bfd68cae6a79f9a77b512c94cdb1ce0ffedb763ee741c4c5b1e59caaedf46b40ee2920dce5d1023689b9382d4573975f5d397fc9fc96232deb558d0952d7beef
+EBUILD web-mode-17.2.1.ebuild 425 BLAKE2B fa9d6973a093b119dafe01ca9ca692cadc563a0da19914f3ab04e2c7d44b627a541ecbf15c047a510910eb58d385c82b881c83580c9ea38ec68da5fd04b8fb75 SHA512 9d4f62701cf759fd9a9df87ba557ca6108fef0cc47f76d3dbbb1b8e223564e115c3bc342c5e32327aea104e17b92174b5b16ea5bb642621cf2918d6313f172d9
+MISC metadata.xml 917 BLAKE2B 9a9838fdf06c9a4177912c5f38d907dd9c132c5b0cf7e88a36ca2baa61a8ecc650bfafb928586e98fe738ad2ff46b6b42cf427763f5c38a996ee9de746b832d8 SHA512 b06a22fd3702e458610501c7e3f8c6cb3899f89d5d5e3386bcc2cb75c0b6471b2637962486c0e75d15f9e3f4909b2a7607d5d3f0f8d01c6218e6e75e26469e1d
diff --git a/app-emacs/web-mode/files/50web-mode-gentoo.el b/app-emacs/web-mode/files/50web-mode-gentoo.el
new file mode 100644
index 000000000000..93f8e6529970
--- /dev/null
+++ b/app-emacs/web-mode/files/50web-mode-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'web-mode "web-mode"
+  "Major mode for editing web templates." t)
diff --git a/app-emacs/web-mode/metadata.xml b/app-emacs/web-mode/metadata.xml
new file mode 100644
index 000000000000..8be48d9935f1
--- /dev/null
+++ b/app-emacs/web-mode/metadata.xml
@@ -0,0 +1,21 @@
+<?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>
+    web-mode.el is an emacs major mode for editing web templates aka HTML files
+    embedding parts (CSS/JavaScript) and blocks (pre rendered by client/server
+    side engines). web-mode.el is compatible with many template engines: PHP,
+    JSP, ASP, Django, Twig, Jinja, Mustache, ERB, FreeMarker, Velocity,
+    Cheetah, Smarty, CTemplate, Mustache, Blade, ErlyDTL, Go Template, Dust.js,
+    Google Closure (soy), React/JSX, Angularjs, ejs, Nunjucks, etc.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/fxbois/web-mode/issues/</bugs-to>
+    <remote-id type="github">fxbois/web-mode</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/web-mode/web-mode-17.2.1.ebuild b/app-emacs/web-mode/web-mode-17.2.1.ebuild
new file mode 100644
index 000000000000..edb07d0bd07e
--- /dev/null
+++ b/app-emacs/web-mode/web-mode-17.2.1.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="Web template editing mode for Emacs"
+HOMEPAGE="https://web-mode.org/ https://github.com/fxbois/web-mode/"
+SRC_URI="https://github.com/fxbois/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/with-simulated-input/Manifest b/app-emacs/with-simulated-input/Manifest
new file mode 100644
index 000000000000..0d69459ffed2
--- /dev/null
+++ b/app-emacs/with-simulated-input/Manifest
@@ -0,0 +1,4 @@
+AUX 50with-simulated-input-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST with-simulated-input-3.0.tar.gz 26203 BLAKE2B 2629f28449a71828f67209b84123ee11b9eb838884560836129830f1c6e0dc12e95ba56e806de5eae8b29cbe1b3f199f9a9e292a2f048483b61a64aa138d2848 SHA512 ddb916e51e8f1da76a19a440f0a629ece6e27969be38b70d8b5156ab7c41084ef9a099970e2c74a680e0cdf75463698e60336fcd168f82d62acd1e0994d6897a
+EBUILD with-simulated-input-3.0.ebuild 702 BLAKE2B 1a1c1c4dfdb00f179a5f84229d03286233451e72f0559378e9badcc9b1437d296ee5609c3184ec829c7174a72197d98362ca3a4557f7ef8a51567e14faf74d8e SHA512 f36d91e655bcf8fc437e74ebda412e0dcab0f0b3b986553d097f2bc15fbd35f5ab5a380bf52dcca120da7f5bf06037f23bd5a8e8ce20229f2bc2668d829cea5d
+MISC metadata.xml 920 BLAKE2B 6b853bc4e2ec4ed5e5f89b915ae6bb27d361d7ac7f27debf77434840c6b53e9b68cb082ed9c341a6fa2b05972ff7e71d48c64d12e28feb7bd9e670aae06e7a45 SHA512 30355b0212aae9adfa1e9d887431915704040dbd42135595fb4267d1c8267ad88646cef7776fca439aba9d811ffebc2d84affb728d8a8b54cb7d4817f760e65a
diff --git a/app-emacs/with-simulated-input/files/50with-simulated-input-gentoo.el b/app-emacs/with-simulated-input/files/50with-simulated-input-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/with-simulated-input/files/50with-simulated-input-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/with-simulated-input/metadata.xml b/app-emacs/with-simulated-input/metadata.xml
new file mode 100644
index 000000000000..64bd70a80275
--- /dev/null
+++ b/app-emacs/with-simulated-input/metadata.xml
@@ -0,0 +1,21 @@
+<?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/DarwinAwardWinner/with-simulated-input/issues/</bugs-to>
+    <remote-id type="github">DarwinAwardWinner/with-simulated-input</remote-id>
+  </upstream>
+  <longdescription>
+    This package provides an Emacs Lisp macro, with-simulated-input, which
+    evaluates one or more forms while simulating a sequence of input events for
+    those forms to read. The result is the same as if you had evaluated the
+    forms and then manually typed in the same input. This macro is useful for
+    non-interactive testing of normally interactive commands and functions,
+    such as completing-read.
+  </longdescription>
+</pkgmetadata>
diff --git a/app-emacs/with-simulated-input/with-simulated-input-3.0.ebuild b/app-emacs/with-simulated-input/with-simulated-input-3.0.ebuild
new file mode 100644
index 000000000000..33361e6ac49a
--- /dev/null
+++ b/app-emacs/with-simulated-input/with-simulated-input-3.0.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.4
+
+inherit elisp
+
+DESCRIPTION="Emacs Lisp macro to simulate user input non-interactively"
+HOMEPAGE="https://github.com/DarwinAwardWinner/with-simulated-input/"
+SRC_URI="https://github.com/DarwinAwardWinner/${PN}/archive/v${PV}.tar.gz
+			-> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( app-emacs/buttercup )"
+
+DOCS=( README.md )
+ELISP_REMOVE="tests/test-${PN}.el"  # Remove failing tests; 11/49 specs
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	buttercup -L . -L tests --traceback full tests || die
+}
author	V3n3RiX <venerix@koprulu.sector>	2022-06-29 12:04:12 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-06-29 12:04:12 +0100
commit	0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree	037df795519468a25d9362b4e95cdaeb84eb1cf9 /app-emacs
parent	752d6256e5204b958b0ef7905675a940b5e9172f (diff)