gentoo resync : 09.07.2022

42 files changed, 529 insertions, 84 deletions

diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 8afe3b3fdb98..36eb98fd37cd 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/bbdb/Manifest b/app-emacs/bbdb/Manifest
index 49ec620d2f2b..78ecb31f58c0 100644
--- a/app-emacs/bbdb/Manifest
+++ b/app-emacs/bbdb/Manifest
@@ -3,6 +3,8 @@ 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.2b.tar.gz 199518 BLAKE2B d6eef625636689d204ed9c6c7f299380924da5b021118e70930ab3b928d547b9cbb5a1cec8d111ce52678fc44b30ee34d164f46a9c6afa98c829ba871382acef SHA512 f730b911d16484c3723f6983b94784a828173797f4732c8d8eb47d50186415e0fdfde62f4f5f5b5b6ac66b78580fcfb2a398840935400fddd5f8143831e35fe2
 EBUILD bbdb-3.1.2-r2.ebuild 1236 BLAKE2B 4fe817fd96846ec01e582eb9852b5e8bfd2ff695206b67ecbb6f47cda5eff6627efaeec21d7b99e87e35c1b499f9fe42dc4e89fb11a60e3956410d96f2f5ccd5 SHA512 ce494c3108c49a36f09160e023575351daad22b0ae4f42c9cc1732019cdaaf6fbff0da245ab4ef8aa4833c0d9d6dfe5ea2b65d6e370702a9c396695a69596f96
 EBUILD bbdb-3.2.2a-r1.ebuild 1553 BLAKE2B 43bc79c22aa12b2abf422087e8210ff02d0aa550c81d9300409a7f79c7fec3a5ba630f3e1007ef73254e6831ea83934d3e4ef583373cb33745862daf3a54c10e SHA512 b8e08a3ebfdf6a7dd9c48bbeb8c3550771c2b130e4d0db0e1f2704687647a9a3c7b62db7d189ca2340f0d52bdc2cae4b8ef159fcd4f12ff16a23db561a5c64d6
+EBUILD bbdb-3.2.2b.ebuild 1484 BLAKE2B 56a9ffd2a784c92b6c5d4e36982566e7ef7432f1cf6654a719abfb1558eb4a7bade4871de0211f621d4a35f6d38be03e071083c3067bc0074f41efac6c26d637 SHA512 b3ae5049f0ad3cb9e500be94833fc26fc819ff70a3d483717819b8650180aa0ba6bee6acce6467e5284a59f993b8f69462d5e4c391cc9892d516f34351963b9f
 MISC metadata.xml 835 BLAKE2B 8079066283e974e301b6f75a0a61907634425cb0b0e1406aaf80003c07b562b93c0e5deabfc6273443f36b7667215f7840ff8bd54febb862ffc23ebb1bb669dc SHA512 2921d9e1f452a42c1752a4f2d533f8ad1eba3a08d48855c8bc81e1b3532990a4728adbfdb4cde12b83b19e02f395bcf2293600ad670a4bcf8b036179e7e783fa
diff --git a/app-emacs/bbdb/bbdb-3.2.2b.ebuild b/app-emacs/bbdb/bbdb-3.2.2b.ebuild
new file mode 100644
index 000000000000..f166a51d8054
--- /dev/null
+++ b/app-emacs/bbdb/bbdb-3.2.2b.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp autotools
+
+DESCRIPTION="The Insidious Big Brother Database"
+HOMEPAGE="https://savannah.nongnu.org/projects/bbdb/"
+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"
+IUSE="doc tex vm wanderlust"
+RESTRICT="test" #631700
+
+RDEPEND="vm? ( app-emacs/vm )
+	wanderlust? ( app-emacs/wanderlust )"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-apps/texinfo
+	doc? ( virtual/texi2dvi )"
+IDEPEND="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")" \
+		"$(use_with wanderlust wl-dir "${EPREFIX}${SITELISP}/wl")"
+}
+
+src_compile() {
+	emake -C lisp
+	emake -C doc info $(usev doc pdf)
+}
+
+src_install() {
+	emake -C lisp DESTDIR="${D}" install
+	emake -C doc DESTDIR="${D}" install-info $(usev doc install-pdf)
+	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/clojure-mode/Manifest b/app-emacs/clojure-mode/Manifest
new file mode 100644
index 000000000000..bbb739a146c7
--- /dev/null
+++ b/app-emacs/clojure-mode/Manifest
@@ -0,0 +1,4 @@
+AUX 50clojure-mode-gentoo.el 484 BLAKE2B e51946e64e18b200b058fab8bbdf3623dbd1520624076b37b3320a7ab0d0b116418a64981c63fa8d214a62474833eeb3d40c861c4e3d9d121f25f5d3e91f23fe SHA512 49e3e58c55be7869a9fe8c8b71b84f7ad86b53b34b78e7e81113b0e622f77756399de0b5bf369c318d47545c4f20fbb21817e834def2df44843a819308a2a807
+DIST clojure-mode-5.14.0.tar.gz 23405449 BLAKE2B f30215834fd4f9599df93f13d94dc9ff7ee8ed55f4e1d3baca373f5665a9ef148af3e918b0db88e604e435b8f4cf4fc4447881ef2d51ee7de88e0a89c76609ae SHA512 4226d23ae2f1337edaef8203b7620f45ebb25f8e6921bd7076aee36916c1c4028add473aa5894d1d8db7a8dd03d5aa037bad05a8e90380d05583a137bef105d6
+EBUILD clojure-mode-5.14.0.ebuild 621 BLAKE2B 5df250c152d36aeaa15e7e669e8dd6d8f577b82746219c2b3a772f0fc2bf8cca5a99e5e3d3043fbff313b4316c6622e60bc6bd971bacc14af8282e7c481a5ec0 SHA512 d50c1002cc8a869653c4e0d3459acf42b4c5fbde788877e2c7301df903eb4c7d09fa4782a3c65bf674b08437accf9eaa025f6f89a8a6d9bd3a8fa671ac308718
+MISC metadata.xml 671 BLAKE2B 0a58fd2987691ffc0c362ab4389a9b6193f02060b0fa14aedd1ce01325d88faf591cd956490763b365b1a969a26fd863ff8097fb0626e610d2da2c747dc6c8c1 SHA512 44f7bcbf20e96fddb17fc0d6b89858e3f627bb0785b48daa290d679e59099c98f866551ba177516822a2c782c359ed033ed6f223a3a06ff49ca6bb3b3bc2ecd5
diff --git a/app-emacs/clojure-mode/clojure-mode-5.14.0.ebuild b/app-emacs/clojure-mode/clojure-mode-5.14.0.ebuild
new file mode 100644
index 000000000000..7072042976c3
--- /dev/null
+++ b/app-emacs/clojure-mode/clojure-mode-5.14.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=25.1
+
+inherit elisp
+
+DESCRIPTION="Major mode for Clojure code"
+HOMEPAGE="https://github.com/clojure-emacs/clojure-mode/"
+SRC_URI="https://github.com/clojure-emacs/${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/s
+		app-emacs/buttercup
+		app-emacs/paredit
+	)
+"
+
+DOCS=( README.md doc )
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	buttercup -L . -L test --traceback full || die
+}
diff --git a/app-emacs/clojure-mode/files/50clojure-mode-gentoo.el b/app-emacs/clojure-mode/files/50clojure-mode-gentoo.el
new file mode 100644
index 000000000000..67f1da6c1bf4
--- /dev/null
+++ b/app-emacs/clojure-mode/files/50clojure-mode-gentoo.el
@@ -0,0 +1,8 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'clojure-mode "clojure-mode"
+  "Major mode for editing Clojure code." t)
+(add-to-list 'auto-mode-alist '("\\(?:build\\|profile\\)\\.boot\\'" . clojure-mode))
+(add-to-list 'auto-mode-alist '("\\.\\(clj\\|cljd\\|dtm\\|edn\\)\\'" . clojure-mode))
+(add-to-list 'auto-mode-alist '("\\.cljc\\'" . clojurec-mode))
+(add-to-list 'auto-mode-alist '("\\.cljs\\'" . clojurescript-mode))
+(add-to-list 'interpreter-mode-alist '("bb" . clojure-mode))
diff --git a/app-emacs/clojure-mode/metadata.xml b/app-emacs/clojure-mode/metadata.xml
new file mode 100644
index 000000000000..f87f4686f8a3
--- /dev/null
+++ b/app-emacs/clojure-mode/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>
+    clojure-mode is an Emacs major mode that provides font-lock (syntax
+    highlighting), indentation, navigation and refactoring support for the
+    Clojure(Script) programming language.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/clojure-emacs/clojure-mode/issues/</bugs-to>
+    <remote-id type="github">clojure-emacs/clojure-mode</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/eldev/Manifest b/app-emacs/eldev/Manifest
index c0607df27f31..5dd6329b31da 100644
--- a/app-emacs/eldev/Manifest
+++ b/app-emacs/eldev/Manifest
@@ -1,8 +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
+DIST eldev-1.1.3.tar.gz 215481 BLAKE2B 9eed051f29be1eda9e7bbb2f55fec69d217d52fda592b206afe39c7f64584140a8e3df75f0963f1f6ba95b555961218663bede39b32f86508f0ade95e627515b SHA512 5d91d3067d82287543d4ec55440874900c3cd52359415da961641af96984f7cee978ded1dc77752d6df55440d48c951c010070657177180aee623647c9dd76b4
 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
+EBUILD eldev-1.1.3.ebuild 1149 BLAKE2B 2934e5c1b708cd0f46b9940452ffdfdfbfcf49bf9db0107f169e76d7128403f8b1bbf545709f64052e8d8410ae54db280714edc97f7836d87f7722c411240469 SHA512 57c6d579e2f77a6738a515f30a6498b2c90010a98f063e43fe9c702267c054111e85374a5b5829595a6df4a02331232509b298d511e7b05e0364bd441ebe20c9
 MISC metadata.xml 982 BLAKE2B db2324ced8f4bc4ba579130677175a9de7a8dc7b8d937cd902edd69a20bc897bf4ee034acb6a9400b88de82c58c2b144e62ec4ac7b75d8dc63cdf56670cacc9e SHA512 3e4d2d7ea4fbada45b4d933d7711266bcd9ffd217ee3c3e3351e9f66145785dc11449b4f09f5ffa4853d2b475db45e501848d259f80fb5aa26429acadcb6da7d
diff --git a/app-emacs/eldev/eldev-1.1.ebuild b/app-emacs/eldev/eldev-1.1.3.ebuild
index 3f35959f7270..3f35959f7270 100644
--- a/app-emacs/eldev/eldev-1.1.ebuild
+++ b/app-emacs/eldev/eldev-1.1.3.ebuild
diff --git a/app-emacs/emacs-eix/Manifest b/app-emacs/emacs-eix/Manifest
new file mode 100644
index 000000000000..f5ff1b442b7a
--- /dev/null
+++ b/app-emacs/emacs-eix/Manifest
@@ -0,0 +1,5 @@
+AUX 50emacs-eix-gentoo.el 73 BLAKE2B 5554ab525a28595fc17488ece15cd4dfd5c52451de04c7e605d3901159ee97eaf5ae1403662131d99d6c400799063eeb442269740451c06515272153b898b0df SHA512 4e814ace69cad0598ae029555f6e251248c763a56203906f0908b35875f13bd9c537b8ac57357db9a80793ef20b34d2d2a26509065b7a41d3f68f9204fe1c1c5
+DIST emacs-eix-0.0.0.tar.gz 9522 BLAKE2B 12c91822b644cb3017b434ddc8a46c3eb9f8981ac45ff8e252ba937667e63e92f703f6c77a3675b2b89c6f8ef3188a785bcc7e1f122e2870c623d4330265c2a0 SHA512 6428ef15fa5b2367c727d63fd728e0d4aca24e4c0d8a27b566e664597b174ed94373285cc80979dac96bbfadd2ecdd3545170bd700a1130c41c39d3d8dc55b88
+EBUILD emacs-eix-0.0.0.ebuild 578 BLAKE2B afb242319e1005703019be2cd91ec94f30f703164ee1557827bbc09bb551cb93946c40aad960bd73f9062a5054c3787922f12fb02e8823573e6409d1cc49f1d3 SHA512 bd2b45805cb86668533bfb3780140afd5775eadd13edf5bd80428cd9e9b3e3fed8bbd9a0332c207f715dd2d0c674f874a0ac088fd5a71dcf299791d818bbbc77
+EBUILD emacs-eix-9999.ebuild 578 BLAKE2B afb242319e1005703019be2cd91ec94f30f703164ee1557827bbc09bb551cb93946c40aad960bd73f9062a5054c3787922f12fb02e8823573e6409d1cc49f1d3 SHA512 bd2b45805cb86668533bfb3780140afd5775eadd13edf5bd80428cd9e9b3e3fed8bbd9a0332c207f715dd2d0c674f874a0ac088fd5a71dcf299791d818bbbc77
+MISC metadata.xml 425 BLAKE2B 1f9b04402793c60cfeb44700c96bfd2e17752ccc58fa7ae5aad17c51d85ec905d0d7daa07e8de244927ee045a3c8c8819a1de99bd2ca7e199c84423012db4917 SHA512 0bbb059d0af21bd61657ae9002036689a933f9f8490f4bfcad8f3ecb8e13a59fc6b5b6e53c1d29f6cfd885b3affae714b38098737d3cf8f869fe9695f23bcbb5
diff --git a/app-emacs/emacs-eix/emacs-eix-0.0.0.ebuild b/app-emacs/emacs-eix/emacs-eix-0.0.0.ebuild
new file mode 100644
index 000000000000..2821ddbc8bc4
--- /dev/null
+++ b/app-emacs/emacs-eix/emacs-eix-0.0.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.3
+
+inherit elisp
+
+DESCRIPTION="Eix integration for GNU Emacs"
+HOMEPAGE="https://gitweb.gentoo.org/proj/emacs-eix.git"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitweb.gentoo.org/proj/${PN}.git"
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp_src_compile
+	elisp-make-autoload-file
+}
diff --git a/app-emacs/emacs-eix/emacs-eix-9999.ebuild b/app-emacs/emacs-eix/emacs-eix-9999.ebuild
new file mode 100644
index 000000000000..2821ddbc8bc4
--- /dev/null
+++ b/app-emacs/emacs-eix/emacs-eix-9999.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.3
+
+inherit elisp
+
+DESCRIPTION="Eix integration for GNU Emacs"
+HOMEPAGE="https://gitweb.gentoo.org/proj/emacs-eix.git"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitweb.gentoo.org/proj/${PN}.git"
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp_src_compile
+	elisp-make-autoload-file
+}
diff --git a/app-emacs/emacs-eix/files/50emacs-eix-gentoo.el b/app-emacs/emacs-eix/files/50emacs-eix-gentoo.el
new file mode 100644
index 000000000000..84922cec1265
--- /dev/null
+++ b/app-emacs/emacs-eix/files/50emacs-eix-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(load "emacs-eix-autoloads" nil t)
diff --git a/app-emacs/emacs-eix/metadata.xml b/app-emacs/emacs-eix/metadata.xml
new file mode 100644
index 000000000000..22c7b92b1e0e
--- /dev/null
+++ b/app-emacs/emacs-eix/metadata.xml
@@ -0,0 +1,15 @@
+<?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>
+    <maintainer status="active">
+      <email>emacs@gentoo.org</email>
+      <name>Gentoo Emacs project</name>
+    </maintainer>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/emacs-openrc/Manifest b/app-emacs/emacs-openrc/Manifest
new file mode 100644
index 000000000000..b822d8659ac4
--- /dev/null
+++ b/app-emacs/emacs-openrc/Manifest
@@ -0,0 +1,5 @@
+AUX 50emacs-openrc-gentoo.el 76 BLAKE2B d6feb9a58260c132884226add7fc2c6474d87ed553feebd1d322b580325676bcd4666300f98b9ebbf582f6553dd1e933c80f8fc401bc09f9f56b43c8fd5f8e15 SHA512 2232247e3aa041d742ccda3f47cbce6a82a191f9b4e2b8d4b66d2571be1fcf202fb954c4c9116c32958e9da2b26c86395c8996242a12dd335f4b3da8b1f49959
+DIST emacs-openrc-0.0.0.tar.gz 3453 BLAKE2B eadd1ca5f338263e3d7b5c562c7ba1afd8c68dd0a9dc7c682c7b9f8148cbeecb2d8de6c621c5a63262fdcee173bf001ea56a13e40224ece9c9627b2fa84f8bc9 SHA512 04723bb9f087b5da6cea46898af78c6308bebb9f1fc6ee872d9b054bbaafdcb9afaded4f31b318b2f8558e0831243d0006c923e33653fb418c35569112f1bbb0
+EBUILD emacs-openrc-0.0.0.ebuild 584 BLAKE2B 50af6c74f66cdcac5228f6eaa6e439ccf4e346a1650db5b63b91bc682774092f99f4a4bf3d36354eedde82e8311e7916cd9656cb58e09e3b8169387fa860ec89 SHA512 ae6b5b376c9dc8131a22bc9667da649e6db3d86768aca51e2061ced0539b72a936807d9415d6513afb0f65088a68c9dd846cc6f3d68f7bff6d83241381ea54e6
+EBUILD emacs-openrc-9999.ebuild 584 BLAKE2B 50af6c74f66cdcac5228f6eaa6e439ccf4e346a1650db5b63b91bc682774092f99f4a4bf3d36354eedde82e8311e7916cd9656cb58e09e3b8169387fa860ec89 SHA512 ae6b5b376c9dc8131a22bc9667da649e6db3d86768aca51e2061ced0539b72a936807d9415d6513afb0f65088a68c9dd846cc6f3d68f7bff6d83241381ea54e6
+MISC metadata.xml 425 BLAKE2B 1f9b04402793c60cfeb44700c96bfd2e17752ccc58fa7ae5aad17c51d85ec905d0d7daa07e8de244927ee045a3c8c8819a1de99bd2ca7e199c84423012db4917 SHA512 0bbb059d0af21bd61657ae9002036689a933f9f8490f4bfcad8f3ecb8e13a59fc6b5b6e53c1d29f6cfd885b3affae714b38098737d3cf8f869fe9695f23bcbb5
diff --git a/app-emacs/emacs-openrc/emacs-openrc-0.0.0.ebuild b/app-emacs/emacs-openrc/emacs-openrc-0.0.0.ebuild
new file mode 100644
index 000000000000..f312b46f306e
--- /dev/null
+++ b/app-emacs/emacs-openrc/emacs-openrc-0.0.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.3
+
+inherit elisp
+
+DESCRIPTION="OpenRC integration for GNU Emacs"
+HOMEPAGE="https://gitweb.gentoo.org/proj/emacs-openrc.git"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitweb.gentoo.org/proj/${PN}.git"
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp_src_compile
+	elisp-make-autoload-file
+}
diff --git a/app-emacs/emacs-openrc/emacs-openrc-9999.ebuild b/app-emacs/emacs-openrc/emacs-openrc-9999.ebuild
new file mode 100644
index 000000000000..f312b46f306e
--- /dev/null
+++ b/app-emacs/emacs-openrc/emacs-openrc-9999.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.3
+
+inherit elisp
+
+DESCRIPTION="OpenRC integration for GNU Emacs"
+HOMEPAGE="https://gitweb.gentoo.org/proj/emacs-openrc.git"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitweb.gentoo.org/proj/${PN}.git"
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp_src_compile
+	elisp-make-autoload-file
+}
diff --git a/app-emacs/emacs-openrc/files/50emacs-openrc-gentoo.el b/app-emacs/emacs-openrc/files/50emacs-openrc-gentoo.el
new file mode 100644
index 000000000000..9118d373d849
--- /dev/null
+++ b/app-emacs/emacs-openrc/files/50emacs-openrc-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(load "emacs-openrc-autoloads" nil t)
diff --git a/app-emacs/emacs-openrc/metadata.xml b/app-emacs/emacs-openrc/metadata.xml
new file mode 100644
index 000000000000..22c7b92b1e0e
--- /dev/null
+++ b/app-emacs/emacs-openrc/metadata.xml
@@ -0,0 +1,15 @@
+<?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>
+    <maintainer status="active">
+      <email>emacs@gentoo.org</email>
+      <name>Gentoo Emacs project</name>
+    </maintainer>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/evil/Manifest b/app-emacs/evil/Manifest
index 28ddecfe6b59..ecc5e989e31a 100644
--- a/app-emacs/evil/Manifest
+++ b/app-emacs/evil/Manifest
@@ -3,5 +3,5 @@ AUX evil-1.14.0-emacs-28.patch 340 BLAKE2B 04d82c7e54a07ca2bcd503b89c178237d5a92
 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
+EBUILD evil-1.14.2.ebuild 632 BLAKE2B b9e083efc6aa936c23190454ce15d1c8adaca025074877f0c7b160b3a229fbeec0891a891f7a9e76c1246117031a64642b60fbf6434d00b042aec2d8904dfed8 SHA512 c9526ea1f047024282f71684eac46786a4d905d33560f8ee236680d95df8f32a5800080600ca4c7933c6371374eacf765c6167e1ad10afd2ddfdb929378fa7e8
 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
index b81cd5a8431d..47eafb05cf83 100644
--- a/app-emacs/evil/evil-1.14.2.ebuild
+++ b/app-emacs/evil/evil-1.14.2.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 x86"
 RESTRICT="test"
 
 RDEPEND=">=app-emacs/undo-tree-0.6.3"
diff --git a/app-emacs/fennel-mode/Manifest b/app-emacs/fennel-mode/Manifest
index d626e31ba260..baaf56b7a1be 100644
--- a/app-emacs/fennel-mode/Manifest
+++ b/app-emacs/fennel-mode/Manifest
@@ -1,4 +1,6 @@
 AUX 50fennel-mode-gentoo.el 178 BLAKE2B 3e7b9b5b96afa1636fbb20edb8090cea9d74acf173a38be96bf95838343cc92623ab2a0794551b3f528b8e26f8d55412ed5886201d8c5ed67b0a0af6e906af8e SHA512 b3a0512f56278d9e5dd0409d43e5fa361c01803b3cd079cc36763800565dde4d7edd1b11b5a2eea86455d5e2890ea1b4c94cc703d107a4b0207c14544702a6c0
 DIST fennel-mode-0.4.1.tar.gz 12426 BLAKE2B 1440a4a4357afe57b685ef477763ccafd866e79f3d538ed61101577098287562476e8c3b4caa5dc12671a64083f3ec7be3c3bfb1a1f17ff0c85b2d06329d7c3d SHA512 ee138dda43b28ca0e81e5940e8294d94652c1d2522c67fa22bf82c19d2d54f89707631ee2544929116e15a0f09b1b85cbf8c7ea3acd98af10577ea8326b34ae7
-EBUILD fennel-mode-0.4.1.ebuild 539 BLAKE2B daecfee1c65680d7ae91214ab28c7fb1b08faa9d1d64494b5a057508237ff896a05c70e0735167bae058f5325ab000236b504ddd2ece21681afe5849a473d948 SHA512 83aae87a2b52c14f944776edc03b5efebb50fc086fcc16d0f596a9a3e9ec173614cb3fc455543fea43fbe8585c52af5702de73410d62e3b3e1e7876b8b752282
+DIST fennel-mode-0.5.0.tar.gz 13995 BLAKE2B 6ccf73a172f28a06221be356c2c0a5ec25342c05b95b3d4cbaf65bb11a8d6a1ad3018e708c59de8aac1069b974a99c3bda57fd42765eebc015360706d53d6e72 SHA512 89dfbf2d70c36a3f1de69af9f2dad5ee93e1ec995470205962b6fd015e779ac8c81159a2d9fb532d14f5afe8485d8e18a82783388565eb1ff4646a714f5113e3
+EBUILD fennel-mode-0.4.1-r1.ebuild 530 BLAKE2B d31d560a8304c1d2ec46572c291b09aac69af9e08c412c6edf0031cf987d962b8c2f1a447b9a42e162e9e0705d6554796a7febdc5e71b0fd2f2658be881d8d88 SHA512 61eb2fbdcd98a22f3f96a7977be5c0e8e01c5c1e3de10b4a10c9c6cdf48101488b132e77f845643884cd12c006bc6ffcee76924cd70e4f173e7a7213c5df1cd7
+EBUILD fennel-mode-0.5.0.ebuild 609 BLAKE2B 9897c89f6be2c3e15a3b9ae094385699c95b9a62e9e8bb7ef68a323a26f96eee860ef4dcbed39bc259413628b5c07a1fed24f47cc067accedb5fd541eefd9b60 SHA512 fa4739bf2232c40c164ca1ef481d561ebdfcbfbcc85c5ea2cf0cbfaa8e7953ef5a70532174551744a2a51cde13175a1f31bd8249e34a825707797364ae23f66d
 MISC metadata.xml 544 BLAKE2B ef9a93f1f55fc58b4c94ee7b655d582c9c4638019a5066509870098ef41fccf3bcfd73830cd814c6ad9d836fecff2a7dfa9def1b719971279c717cae84745aa4 SHA512 56c8c2eadaf510e6585c6f970f0100ed2b0a8d0e0d194e821b91329fbe61cea80f833dffc66da84df239ca5470e9fccf5fe6e72253ab77f7ea0441a68ce93443
diff --git a/app-emacs/fennel-mode/fennel-mode-0.4.1.ebuild b/app-emacs/fennel-mode/fennel-mode-0.4.1-r1.ebuild
index 3528e2bd44cc..5512c751ce89 100644
--- a/app-emacs/fennel-mode/fennel-mode-0.4.1.ebuild
+++ b/app-emacs/fennel-mode/fennel-mode-0.4.1-r1.ebuild
@@ -3,18 +3,18 @@
 
 EAPI=8
 
+NEED_EMACS=26.1
+
 inherit elisp
 
 DESCRIPTION="Emacs support for the Fennel programming language"
-HOMEPAGE="https://gitlab.com/technomancy/fennel-mode/"
+HOMEPAGE="https://git.sr.ht/~technomancy/fennel-mode/"
 SRC_URI="https://gitlab.com/technomancy/${PN}/-/archive/${PV}/${P}.tar.gz"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="dev-lang/fennel"
-
 DOCS=( Readme.md changelog.md )
 SITEFILE="50${PN}-gentoo.el"
 
diff --git a/app-emacs/fennel-mode/fennel-mode-0.5.0.ebuild b/app-emacs/fennel-mode/fennel-mode-0.5.0.ebuild
new file mode 100644
index 000000000000..c315217f2fc4
--- /dev/null
+++ b/app-emacs/fennel-mode/fennel-mode-0.5.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=b3c52964eda7c0267f6e3f0ad6c690c3a1e89da1
+NEED_EMACS=26.1
+
+inherit elisp
+
+DESCRIPTION="Emacs support for the Fennel programming language"
+HOMEPAGE="https://git.sr.ht/~technomancy/fennel-mode/"
+SRC_URI="https://git.sr.ht/~technomancy/${PN}/archive/${H}.tar.gz
+			-> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${H}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( Readme.md changelog.md )
+SITEFILE="50${PN}-gentoo.el"
+
+src_install() {
+	elisp_src_install
+
+	insinto "${SITEETC}"
+	doins syntax.fnl
+}
diff --git a/app-emacs/helm/Manifest b/app-emacs/helm/Manifest
index bea353453bba..b06c2cf8b4e7 100644
--- a/app-emacs/helm/Manifest
+++ b/app-emacs/helm/Manifest
@@ -2,6 +2,8 @@ AUX 50helm-gentoo.el 79 BLAKE2B 7f188281cba0bf1f683977149ffa01f2bf6679cec1d73553
 AUX helm-3.8.0-no-autoload-check.patch 629 BLAKE2B 23ae68b3f15b6a7b8bbe1c7c22c897ead11abf6c7ad4280767f69c58edbb9cbe8528968e859d45e4ff76d13ac3ae4016a0818f674cb5b53d69441733343e958b SHA512 cb8192855f474cf43e3f2247f84d00ca6b2b190164c3a50940e09e771650db5860923256cb482cbd4f1d3f0b5bd964c688d6124a129c80850786c39245c034da
 DIST helm-3.8.4.tar.gz 2346120 BLAKE2B 2f554a6a3fc3a42ba2761c267d085ad1e6679f4913bc19cdbbff11130922d93d2fbe75bcae8230748c39148b6e42d45d4c2c711f731ebd4a1984c5927d93d290 SHA512 011cc4eb79a0a6916404428b9f645e4401b8a0b8b473bec88ac4211d4157b78cc673922c1b74dc93d60cf036135a67bd9c174198b63edd63a6d26a40ba9c1b9d
 DIST helm-3.8.5.tar.gz 2349290 BLAKE2B 84f0c15c2a9f492246defdf9496e8dcc5265b0c60b50ccaaa3b9f6731285a667da919da7fec80d77a4fd11bc83d9f4ae4c0910e31423b58afbdf00d51b070295 SHA512 af727553c29c9fa0ba6eb6a73b25d62855ea4413eebc57baf3ed94be6a0240e4c558193c898430dc21132ba5e32ead584514910bf98b3b8d82adf7828f953652
+DIST helm-3.8.6.tar.gz 2356253 BLAKE2B 62b9af26888526f54726468e04677c401c5e828e588cb6f2c005b9ce9d84935c184b536a97a82e4e6c08c3523a10a32f9348d243d2545c17c9480ad004d92d10 SHA512 71342f347aa5cf8bd3e1990c8633d908e6a5fe66e051554aa2f554fba5d63b2623fe2b6b07540473b481986b1d5d27cb2d8b06f127e727aa8d373bc045d0a602
 EBUILD helm-3.8.4.ebuild 659 BLAKE2B e3cad45c98c77c77b7b4db89070d84fcc5709fa315e7b8a5e0f6df7054665cd4d380d3a2e2d45a8376d02b368efe9477026fefca855365b425366571083aa1d8 SHA512 414fbc4a5080f8ac17607bf41bc2d84d0fffec6b3c8b3b25462133ab55245ed424995e89f3d1c574280bc6e56386162fba7c2ce7de4ca5243ee8302f4786d841
 EBUILD helm-3.8.5.ebuild 659 BLAKE2B e3cad45c98c77c77b7b4db89070d84fcc5709fa315e7b8a5e0f6df7054665cd4d380d3a2e2d45a8376d02b368efe9477026fefca855365b425366571083aa1d8 SHA512 414fbc4a5080f8ac17607bf41bc2d84d0fffec6b3c8b3b25462133ab55245ed424995e89f3d1c574280bc6e56386162fba7c2ce7de4ca5243ee8302f4786d841
+EBUILD helm-3.8.6.ebuild 659 BLAKE2B e3cad45c98c77c77b7b4db89070d84fcc5709fa315e7b8a5e0f6df7054665cd4d380d3a2e2d45a8376d02b368efe9477026fefca855365b425366571083aa1d8 SHA512 414fbc4a5080f8ac17607bf41bc2d84d0fffec6b3c8b3b25462133ab55245ed424995e89f3d1c574280bc6e56386162fba7c2ce7de4ca5243ee8302f4786d841
 MISC metadata.xml 822 BLAKE2B 5de057ddb881d67550d3e8cd0be43d3328b8e7a38b98338ffccec147095cd5d8f8bc68695c797a872e2ed7e455859fc1d6170f414231016edab5a8d742ad2a40 SHA512 08367530e4e47577e1812d229b97094b9c012c4c91eb7e69f5724e98d8790327fe35fb9b480cf33eedd105f1fd85133c39397eda0426461d80bdee704a51c55a
diff --git a/app-emacs/helm/helm-3.8.6.ebuild b/app-emacs/helm/helm-3.8.6.ebuild
new file mode 100644
index 000000000000..68aff2bea3b6
--- /dev/null
+++ b/app-emacs/helm/helm-3.8.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2019-2022 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}/${PN}-3.8.0-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/inf-clojure/Manifest b/app-emacs/inf-clojure/Manifest
new file mode 100644
index 000000000000..9ddcde60a132
--- /dev/null
+++ b/app-emacs/inf-clojure/Manifest
@@ -0,0 +1,4 @@
+AUX 50inf-clojure-gentoo.el 293 BLAKE2B b3a28e9c39caea56f790d757b617e7c567a178bdb6454c57ddf1ebeb887cf8d1314596e1e84243cf00541578d7829711e29a8f376ace97a7fd31f07c83e19e93 SHA512 04f49b73aa1951fc4ec2926be3bd0de324239ee19d2556ceae1b5215c2c922a411bcbce94ff497758fbd400b9649b075ea520deb3cf8864d9ca94b200c761f8e
+DIST inf-clojure-3.1.0.tar.gz 30621 BLAKE2B a3d98e47225b659763ecbb6ea08457a2803dbce3ca8f58a4a141587e10eba0618f8f1b06a6f56062bed0ede987bb78dcb92260020aacd2ba6e1e49bba954b20b SHA512 d96fd0a5db664fff553d94d1ac9bcf1f8c544d0618c24b0d894fec9564f5b1a165755ba25188a7b58ea9314416ed86f3e26921bf1c6dc86ebd4d5d27df604b69
+EBUILD inf-clojure-3.1.0.ebuild 838 BLAKE2B 26a6015136c0fb60994ca908461292f6fa0a67deba3e5e6dae345dda633ddb23060f3730f183d8f0c41ff0aff51061a231e70c6683c9b3933f256739fefe9e6d SHA512 2616c5789e1fac83fb9cbc43332544e20c0db32ab98f68d167544680b04bf1c0e9aa0fde65daf980c5af241394598ee99b213ec7c28a88a96b9618a70f89e752
+MISC metadata.xml 841 BLAKE2B 04937a37f8e22a2e47158afc92521949f455498f1eeae7aba9da638150a02293984d7d38b2cddc3c62b42ef9c300b538bf9b697f2e36f16ad97b068f979d2c41 SHA512 a1b758ca3837e0727bb9a3e5a15ecb11126d9b74c2c066d604b56d8331867cdccbad79bac8ad48742af07fc7b026902eedb7a670c8facf576cea70e6f4bba79f
diff --git a/app-emacs/inf-clojure/files/50inf-clojure-gentoo.el b/app-emacs/inf-clojure/files/50inf-clojure-gentoo.el
new file mode 100644
index 000000000000..429d08e1fcb9
--- /dev/null
+++ b/app-emacs/inf-clojure/files/50inf-clojure-gentoo.el
@@ -0,0 +1,6 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'inf-clojure "inf-clojure"
+  "Run an inferior Clojure process" t)
+(autoload 'inf-clojure-minor-mode "inf-clojure"
+  "Minor mode for interacting with the inferior Clojure process buffer." t)
+(add-hook 'clojure-mode-hook #'inf-clojure-minor-mode)
diff --git a/app-emacs/inf-clojure/inf-clojure-3.1.0.ebuild b/app-emacs/inf-clojure/inf-clojure-3.1.0.ebuild
new file mode 100644
index 000000000000..54ec4c7b8d82
--- /dev/null
+++ b/app-emacs/inf-clojure/inf-clojure-3.1.0.ebuild
@@ -0,0 +1,43 @@
+# 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="Major mode for Clojure code"
+HOMEPAGE="https://github.com/clojure-emacs/inf-clojure/"
+SRC_URI="https://github.com/clojure-emacs/${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/clojure-mode"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		app-emacs/assess
+		app-emacs/buttercup
+	)
+"
+
+DOCS=( CHANGELOG.md README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	elisp_src_prepare
+
+	# Silence a failing test (mark as "PENDING").
+	sed "s|it \"computes no bounds|xit \"computes no bounds|" \
+		-i test/${PN}-tests.el || die
+}
+
+src_test() {
+	buttercup -L . -L test --traceback full || die
+}
diff --git a/app-emacs/inf-clojure/metadata.xml b/app-emacs/inf-clojure/metadata.xml
new file mode 100644
index 000000000000..d7c53d01a39d
--- /dev/null
+++ b/app-emacs/inf-clojure/metadata.xml
@@ -0,0 +1,20 @@
+<?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 basic interaction with a Clojure subprocess (REPL).
+    It's based on ideas from the popular inferior-lisp package. inf-clojure has
+    two components - a nice REPL buffer (inf-clojure) and a REPL interaction
+    minor mode (inf-clojure-minor-mode), which extends clojure-mode with
+    commands to evaluate forms directly in the REPL.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/clojure-emacs/inf-clojure/issues/</bugs-to>
+    <remote-id type="github">clojure-emacs/inf-clojure</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/nxml-gentoo-schemas/Manifest b/app-emacs/nxml-gentoo-schemas/Manifest
index 7c53e19b44a8..400d686ee726 100644
--- a/app-emacs/nxml-gentoo-schemas/Manifest
+++ b/app-emacs/nxml-gentoo-schemas/Manifest
@@ -1,6 +1,4 @@
 AUX 60nxml-gentoo-schemas-gentoo.el 206 BLAKE2B ae9d1fe1da9c86d14796c09597ca34b10dd0e28abb02fdeac4607b8d950bfdf636f5f3c1de49cd5b9cf1fa808513522ab43272f3c26361b871ad0d630a942ed6 SHA512 5592edb5663066fcccaf5b05c3df671b4069d4d259376a8a91ef3f7ae5990687b15dfdf40e6f7aa6cc7d62b7cdaa5090fd851de0ed2718d20ecfe3e3a78530ea
-DIST nxml-gentoo-schemas-20220125.tar.xz 8644 BLAKE2B 6f2bb618bb94f9a61ba22526161d8b0457d6177b2a6dc339199fe633652ce1138125d50bc1b681117e8dfedb227ec54e30a51d4724fb5148ab31e1224b16fc9e SHA512 95719c92d9c6c9c883c022baf0593f927b0f24f7e35832ab0dd951fb31fd601888715671a6b8a887464649632bce3c8cb8281aa5d5a066fc115d38ffed8f8adb
 DIST nxml-gentoo-schemas-20220525.tar.xz 8836 BLAKE2B 5506f976b43218d5bb85ae96c31137c51691cef5f3a524d4214584cc0cb1dae26f45b97d636c8361ec06e7bff5cbf2337b8ed82795aba72dd079127db2238ece SHA512 7df23a9d73a09fc26c6e38665d28c3b633d371bf9c84d56b9318045d80ccab23c3b9c115d68efd6733b9048918118612a05405a1a590b41eac4fb7405746b34e
-EBUILD nxml-gentoo-schemas-20220125.ebuild 599 BLAKE2B 94a71309956e567bd635ddcef76e56c8bc59680af81d407f20fc14297bcfffe30cc54fbfc148593d5dde43373a67aa425e059eec58da7d521c339e5fdc04f18d SHA512 1eaeb00a9c24ad4c18d65376a5a0011cc74c7a609aec8ea574fadeb061ba661a3b010e378ad4c76533295cd67c665a4441e7c235258f4613c047684bfa898b3b
-EBUILD nxml-gentoo-schemas-20220525.ebuild 601 BLAKE2B 12946ce50c622acab7d3c1b1f6b0059164a6f0b9da4e085bed3a83f6dbc47ab1f23f67b5e43302453a184c3e00ca5b3e5b05286adc729d98d420b53a49bdc78c SHA512 6b7d3c63fd581602012123d4d2a91858e31631e31dd7ebd383e4301635109932a2d479f5cce76f6302c949e6b5580a6bee1be3eb244f8375ddb42bc57ecfeeac
+EBUILD nxml-gentoo-schemas-20220525.ebuild 594 BLAKE2B a6c1013d056d9aa7e1da051b319f04b367f99b47299c02328eb387bb332b263d657e8d69f1ce4ca70552bbe7cc2e74099e720404f6faafff82d4984730fc4641 SHA512 e00577f5f076d958b80ad080f8febcec2928185d5b3f1f2c353c88e8ded93752af12d20e3a2194ac7663c8110280653277de6660d86db67c23805e7c26b1c41f
 MISC metadata.xml 370 BLAKE2B 2af6298a56b5da7f2c32b4bed09ae442df3068aecaddf3be04c6d6d4abed1f23430d14a54bb33b13580cfeca7177e2da00c8eab62d17a84427ad1201e105572b SHA512 abaa11228666364188cd1b23903b43b5b49456050287ba12be8a6bd31a1f063c65b3efe50de478614f8f70f953ae22b238989724be5179df71a2ce820d356904
diff --git a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20220125.ebuild b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20220125.ebuild
deleted file mode 100644
index 8668c193acfb..000000000000
--- a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20220125.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp
-
-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+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-
-SITEFILE="60${PN}-gentoo.el"
-
-src_compile() { :; }
-
-src_install() {
-	insinto "${SITEETC}/${PN}"
-	doins schemas.xml *.rnc
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-}
diff --git a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20220525.ebuild b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20220525.ebuild
index e59b183875b9..3e5cb28865fe 100644
--- a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20220525.ebuild
+++ b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20220525.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 
 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 8873283751a7..a7a19d51f675 100644
--- a/app-emacs/nxml-libvirt-schemas/Manifest
+++ b/app-emacs/nxml-libvirt-schemas/Manifest
@@ -1,12 +1,10 @@
 AUX 60nxml-libvirt-schemas-gentoo.el 206 BLAKE2B ae9d1fe1da9c86d14796c09597ca34b10dd0e28abb02fdeac4607b8d950bfdf636f5f3c1de49cd5b9cf1fa808513522ab43272f3c26361b871ad0d630a942ed6 SHA512 5592edb5663066fcccaf5b05c3df671b4069d4d259376a8a91ef3f7ae5990687b15dfdf40e6f7aa6cc7d62b7cdaa5090fd851de0ed2718d20ecfe3e3a78530ea
 AUX Makefile-trang 108 BLAKE2B 4f80e5f4e0550bd4732668ae5298d890d2293d34379902cf204c43bbea5db01626847af7ab96854efcbcc34e7fe9b1c32873ad22ef13873a1a06790e9580371d SHA512 3544959cc57ce1b273e4b9de95f51e1e21d23cc35fb48e02f179a055a61ee9092efdc43405f72c3aacb3c74eada7fabf5952eb49e3ff0514fd69a3092268dc4f
 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
+DIST libvirt-8.5.0.tar.xz 8886088 BLAKE2B a789b5d4d4f3d359403b53b1b6bdc31ddd8938d12fce3c77e953a30be359a3f75071c385bc8ce3df11ccc7ad682e433c067781948cf107abef84e54d5aadd0d9 SHA512 62b05c5cd58eab0ab2d945b832fd85807aea9b5f12a7ef5d1205fe0edac8d361ba3a9245f60f200a8548c96f718943d4502d87fff87c4495bd1e2637f14aaccf
+EBUILD nxml-libvirt-schemas-7.10.0.ebuild 873 BLAKE2B 02b97f936c302f2657280e597ed595b6061e6c71d6fe4c1e2f06c667da87dc51f5b6554ee4392b85f5f12e29f33df7a5a2ab6c4fa1fbe3fa09e66ab786d1ef5f SHA512 1f143986674b1878271a4c6e49fc7473ebbb8900ebfcf662467a84437f072de2e665395381e619e0cffafaefc24ecaf99ae26ccc22e3c0ae0783ab4a55a5be35
+EBUILD nxml-libvirt-schemas-8.4.0.ebuild 1052 BLAKE2B 2f66499763abab90bc7ff91c49853d5c2be7dda44b0c708443f531db1d2e82fafc8db3c8c5363695b65e40a46cea9838eadd53aca68285e22bd9d31e9b3bc94e SHA512 e633a25db9d1c550952d94b8a37ed74cc37c645e14f01463a62ed4d41c6aae26abd325ec0535691a9be61b6c653853cf99f21633ace83ddc0bd1cc34416583c8
+EBUILD nxml-libvirt-schemas-8.5.0.ebuild 1052 BLAKE2B 2f66499763abab90bc7ff91c49853d5c2be7dda44b0c708443f531db1d2e82fafc8db3c8c5363695b65e40a46cea9838eadd53aca68285e22bd9d31e9b3bc94e SHA512 e633a25db9d1c550952d94b8a37ed74cc37c645e14f01463a62ed4d41c6aae26abd325ec0535691a9be61b6c653853cf99f21633ace83ddc0bd1cc34416583c8
 MISC metadata.xml 390 BLAKE2B 05bd110c71244cf02d22bcf823d3285e73bdb03f3bb06b8c9e2c13cd346f2367380345747d5eb0861f37983be970dc6c9fe5e7d93b422205a7b447dc3330852e SHA512 bb803aed730418caf43baf132b989963e84f5e0e0d8db915a48cae407f20fb52e27c147725cac88fc94303db070f300a7ce3bf6c18e7dc66dec37bf9ccea5f5b
diff --git a/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-5.8.0.ebuild b/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-5.8.0.ebuild
deleted file mode 100644
index ef9c1c674a74..000000000000
--- a/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-5.8.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-# 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"
-RESTRICT="test"
-
-# 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"
-S="${WORKDIR}/${MY_P%-rc*}"
-
-src_compile() {
-	emake -C docs/schemas -f "${FILESDIR}"/Makefile-trang
-}
-
-src_install() {
-	insinto "${SITEETC}/${PN}"
-	doins "${FILESDIR}"/schemas.xml docs/schemas/*.rnc
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-}
diff --git a/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-7.10.0.ebuild b/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-7.10.0.ebuild
index f60678a36ec4..c3597d40e521 100644
--- a/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-7.10.0.ebuild
+++ b/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-7.10.0.ebuild
@@ -7,8 +7,8 @@ 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"
+HOMEPAGE="https://www.libvirt.org/"
+SRC_URI="https://libvirt.org/sources/${MY_P}.tar.xz"
 S="${WORKDIR}/${MY_P%-rc*}/docs/schemas"
 
 # This is the license of the package, but the schema files are
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
index acb053083ec6..1c0188f9655a 100644
--- 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
@@ -14,8 +14,8 @@ 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"
+HOMEPAGE="https://www.libvirt.org/"
+SRC_URI="https://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
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.5.0.ebuild
index acb053083ec6..1c0188f9655a 100644
--- a/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-8.3.0.ebuild
+++ b/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-8.5.0.ebuild
@@ -14,8 +14,8 @@ 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"
+HOMEPAGE="https://www.libvirt.org/"
+SRC_URI="https://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
diff --git a/app-emacs/parsebib/Manifest b/app-emacs/parsebib/Manifest
index 0dd3e962022f..1c858eb8d292 100644
--- a/app-emacs/parsebib/Manifest
+++ b/app-emacs/parsebib/Manifest
@@ -1,4 +1,6 @@
 AUX 50parsebib-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
 DIST parsebib-3.1.tar.gz 19298 BLAKE2B 1588a9ef6e1642a612be2abb340d9127f8b8542ac2edda0deb5d9be28903443a33de877e44cefceba110332c022b8e4885a2927f172a447f035e9a5c0e65b5a5 SHA512 10dc25831693d271582b2d561401399e12ac3ccbc994dc95ae22fec800e1b242461deaa6a1c0ae5b20a1834baf88017b3ee42f1a53ac5d73f73a2f69c050c6c2
+DIST parsebib-4.1.tar.gz 24384 BLAKE2B 4546b49ea49a890b7a640cbbf1103500e6e1d3628d990c1c24c4943024b51f5293919315ab82134cb823799ac8d04e5c174671db3379c9a0a9cf7aa02bb8c36c SHA512 37df3265b51e0a1d2b418f2a862691300c369bcee01beec19abe4ebd160c4a279427f7a4b012828ca5b39f0c2064660c3ed73edfef400f543a9157761aabbbb3
 EBUILD parsebib-3.1.ebuild 604 BLAKE2B f534310ef65572bad27355e505fa2e5925760dcd218786c3515a4899b6b0e2d78a20b35ff8c03e405e9798c0ed0d8bc427fd049ea9873ae007ff429935e8ef48 SHA512 43c0e3f48f27236e13b3c0ae7b4a28610affd2a9900fbdc72c81f96ea316deb13d13cd3508a5f9b6142c4056da6b1abfbdd8952ee5faea15d7ac5dcbda771459
+EBUILD parsebib-4.1.ebuild 604 BLAKE2B f534310ef65572bad27355e505fa2e5925760dcd218786c3515a4899b6b0e2d78a20b35ff8c03e405e9798c0ed0d8bc427fd049ea9873ae007ff429935e8ef48 SHA512 43c0e3f48f27236e13b3c0ae7b4a28610affd2a9900fbdc72c81f96ea316deb13d13cd3508a5f9b6142c4056da6b1abfbdd8952ee5faea15d7ac5dcbda771459
 MISC metadata.xml 627 BLAKE2B c720728d95d1210afc6015d7472134e9078fbc67f591e4991dd34a780c49c8b30c1dec30c6ce57d81034f71895aafb8637c8181d7cdc9e13819ecceea919cc98 SHA512 a991dcfa3ddc97afc341228c4483c888de999eb79f67cb174e12a8d9725da58468c6e1330d8f5e2ef7e947e108e6eba1edba4fceca7955793b6d8a0c223d1f4a
diff --git a/app-emacs/parsebib/parsebib-4.1.ebuild b/app-emacs/parsebib/parsebib-4.1.ebuild
new file mode 100644
index 000000000000..6d23c9db04f0
--- /dev/null
+++ b/app-emacs/parsebib/parsebib-4.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/racket-mode/Manifest b/app-emacs/racket-mode/Manifest
index ec8cb7d0b9b7..9bb5979053b6 100644
--- a/app-emacs/racket-mode/Manifest
+++ b/app-emacs/racket-mode/Manifest
@@ -2,7 +2,9 @@ AUX 50racket-mode-gentoo.el 799 BLAKE2B 1f0c19ab171427e5404d40eae1fb95f590059c42
 DIST racket-mode-20220219.tar.gz 298876 BLAKE2B b3dfbcd9b436648da1ecacf4b7434c3e1b6dea9bc904c2f1911be34bc6b1846684c349f38cd418b09e66f426866b805ca6bd0c98724e69740ad841ae482e62ea SHA512 94879fe9aed106d0210ca359a5d3d857eec098b4442256a489356db0c5b3493b44ee9a0dd6eff0a0d3d2f3c752632e91b1c0ef8705b7b305e3c75fbae42e826a
 DIST racket-mode-20220411.tar.gz 303095 BLAKE2B 7fed011b915e86f6d40d6a9f8640ea2b066c201cf28e20a941fae841e96bf3649f3cf0ad7847091984a7cf490e9b98142617e47038dea70c44999510144dda3a SHA512 ec17ade728390f8f8b783703ca319ee15502afa7f82e86d9aa8b60361ecc65af21990cf89532b38bfc211887c00b5aa4c820dc0e66a1b1a1a9aacbc08673d35d
 DIST racket-mode-20220505.tar.gz 305491 BLAKE2B ca6a6ee6ae9f95f397959d9f0fa979e524ab0c6345bc5d7d67b5e681e6059175336303f06a7480d5b7ac51ae13cb851c182175eac44f37b3a21b56409f14079b SHA512 a66b991e0416f60d3a6001d17e24be95caccb627cf0e4d0f3115b7b94eda9d15583d8b94c72326708a0d5f90ab1b51711785c01d566758a4fb329bd26ea7e44c
+DIST racket-mode-20220628.tar.gz 307029 BLAKE2B 7bde6bdc971059433a1f78119e2436a24c7159f3e43b9d7c721c4a2e813de6b0a407ccc70f827c79d49d5444ba608692095b9e89175ef16070e5c4e294e53ab2 SHA512 e691dd9867ef4bc46b7380be44b8461c12a12c20191067f1ba809f218182569fcc55dc11a3db0a7438180c8f26cb24d6328ad565133e83a35e0144c547d3a5ce
 EBUILD racket-mode-20220219.ebuild 1138 BLAKE2B 3cb184db500812f19b1c62aff0afcdb1e52358dc0c597fb124c90b792c947e6e098dc61f855c204d19d1e22ca64c032668d5461c6ea00d673ce98acf6f5439e0 SHA512 c7eab6dcd960c37253dd19704de785f97030dd6046a30cd37cb0eb6e8c4f999010d57b55138c53af2b8089c0d14c6b9788f825e9a36184025f1a984cd4bf3dd7
 EBUILD racket-mode-20220411.ebuild 1241 BLAKE2B d1a4ba8103e7a9cb57099e5e8a52c95e6456576484a0caac206a021422484c292f4cbdeb74c2aa9cdce6854145f13a674a9ea46448239a40511d1870965c8311 SHA512 b64a61f4d1849d62612538cf1570312beb4c747b13538d3db037a1ca77cf2e6b48d0d058a30cf4332547f9bf508e31ed3a9ebea2c17169f3a181b483b1df57a5
 EBUILD racket-mode-20220505.ebuild 1241 BLAKE2B 7cc74408126877712fe0952c0c02bed9d7d4fad22aec749520086678471c81618ea3eecceb64080bde07c757934cd54ab0703ac47d1978562f6170ffa77b544e SHA512 000098e2808266f355770c491fbae0ea5d4d7e632345575e10d592861e8fa6f1274a1c1ab0fb4030e5b5563c8753535ce0c4223798fdb53d48207c4d11256d57
+EBUILD racket-mode-20220628.ebuild 1266 BLAKE2B 203bcc720eba5b420080c29458121fc255aa67d7769abcb8f1645743939833f2f7b855ce7e88b06b1eddd2178cf391ae4b2a05f7772c23e46227a1ea321ed808 SHA512 c91a68978b1baac88021ba30f42245e08d15ccbbdb804695471337a272a9c336c4405a5d9fcf5468618e74b8b8409e1d40209cf29d690191927c7db2c21988b6
 MISC metadata.xml 818 BLAKE2B 6029673bee9510c74b9cf89bbbef03638cdfcfeaaae49f2f94d57cd960c616c7b43c8dc3a0c79892be87dace9e7549b3b4453b13fcc7a23f7b6a02066dbce29a SHA512 8b487cb9f4018d3ec7a2cf130b26d58522772bef05d258100068fc89500577a5f680f480b89f06ef63d99c4a6d4e4fd825ea3338934438715fb83a946f6fe7cc
diff --git a/app-emacs/racket-mode/racket-mode-20220628.ebuild b/app-emacs/racket-mode/racket-mode-20220628.ebuild
new file mode 100644
index 000000000000..3d6c29530ffe
--- /dev/null
+++ b/app-emacs/racket-mode/racket-mode-20220628.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=77c2d41c9ab041c383dfc60ed6ae562c4e953130
+NEED_EMACS=25.1
+
+inherit elisp
+
+DESCRIPTION="Emacs modes for Racket: edit, REPL, check-syntax, debug, profile, and more"
+HOMEPAGE="https://github.com/greghendershott/racket-mode/"
+SRC_URI="https://github.com/greghendershott/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${H}
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-scheme/racket:=[-minimal]"
+BDEPEND="${RDEPEND}"
+
+DOCS=( CONTRIBUTING.md README.md THANKS.md )
+ELISP_TEXINFO="doc/racket-mode.texi"
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp_src_compile
+
+	# Equivalent to compiling from Emacs with "racket-mode-start-faster",
+	# because this is installed globally we have to compile it now.
+	ebegin "Compiling Racket source files"
+	find "${S}"/racket -type f -name "*.rkt" -exec raco make -v {} +
+	eend $? "failed to compile Racket source files" || die
+}
+
+src_test() {
+	# Set "PLTUSERHOME" to a safe temp directory to prevent writing to ~.
+	PLTUSERHOME="${T}"/racket-mode/test-racket emake test-racket
+}
+
+src_install() {
+	elisp_src_install
+
+	# Install Racket files
+	insinto "${SITEETC}/${PN}"
+	doins -r racket
+}