gentoo resync : 16.04.2022

168 files changed, 2176 insertions, 88 deletions

diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index d4b2492542bd..3f26b2e5ee45 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/all-the-icons-dired/Manifest b/app-emacs/all-the-icons-dired/Manifest
new file mode 100644
index 000000000000..c14ef01d3bd6
--- /dev/null
+++ b/app-emacs/all-the-icons-dired/Manifest
@@ -0,0 +1,4 @@
+AUX 50all-the-icons-dired-gentoo.el 163 BLAKE2B e9c6aaeef3b0a8fa465ad9c886ba1c6ce0896a46858c0521fd476c87a5d1015dc688a520d1434aa29ff66df5b91cec209bceeef5ed8a999ee598f02e1f54c0b0 SHA512 286976673c84a7d0e3bb02871969d5f897942b2bf23bd7cca7becf04e43d10693297475c1f7b2d436b67db3d2fea75edf82c0abd2793415f272f9cbd7409a01a
+DIST all-the-icons-dired-2.0.tar.gz 61391 BLAKE2B 685213693ddf8e009565dc3dbb5b44b3b364553f07733346dfd77a261f1da46cedde11b0de5d87d6769cdca921984a445ab2e4ec79bad172fdae0c9f131f9e34 SHA512 1043f921d84da38fedd2abf140645d984bcc817cec7b1d608e8a08e4a828f8ddc4c977c28d35a67b9be3458147beb52b8364e6ffc8e1846eb10028fd53140f78
+EBUILD all-the-icons-dired-2.0.ebuild 526 BLAKE2B 9fae39b59d5b5d606a66c2171aed90d5abb8671e9678a11d385d26dda8ebd3e65c900acadb21572ac7e308b963c1507fee4db0db8da7d31a095da73c97a90bf8 SHA512 431ab3b49be67b3d232a3749f1eb653486320ab8dba80b9d16aefe4089312b4cb3243d6c7a0ad79d849588326061751727ddcf4405d467c81c1a2b2d0682c96a
+MISC metadata.xml 443 BLAKE2B 774ea111465498eefa4c5e18d335ed306e687b6b18f51bdfcaff53d16fbdcc65d3eb5c918fbde680e8aa189abec8946ddf30e50e7086b33eabb1d67dd4e216f7 SHA512 00a30b28f11a88653b5b3c5ec331b239583063506fdb004d52f249653038be194016ce1c1181d1b2fe40e4f641de2364bdb7372583fba560415ae07c8bebfbd8
diff --git a/app-emacs/all-the-icons-dired/all-the-icons-dired-2.0.ebuild b/app-emacs/all-the-icons-dired/all-the-icons-dired-2.0.ebuild
new file mode 100644
index 000000000000..20d2896a2583
--- /dev/null
+++ b/app-emacs/all-the-icons-dired/all-the-icons-dired-2.0.ebuild
@@ -0,0 +1,22 @@
+# 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="Display all-the-icons icon for each file in Emacs' dired buffer"
+HOMEPAGE="https://github.com/wyuenho/all-the-icons-dired/"
+SRC_URI="https://github.com/wyuenho/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-emacs/all-the-icons"
+BDEPEND="${RDEPEND}"
+
+DOCS=( README.org logo.png )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/all-the-icons-dired/files/50all-the-icons-dired-gentoo.el b/app-emacs/all-the-icons-dired/files/50all-the-icons-dired-gentoo.el
new file mode 100644
index 000000000000..97b86ad2a6e2
--- /dev/null
+++ b/app-emacs/all-the-icons-dired/files/50all-the-icons-dired-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'all-the-icons-dired-mode "all-the-icons-dired"
+  "Display all-the-icons icon for each file in a dired buffer." t)
diff --git a/app-emacs/all-the-icons-dired/metadata.xml b/app-emacs/all-the-icons-dired/metadata.xml
new file mode 100644
index 000000000000..6d28f321438a
--- /dev/null
+++ b/app-emacs/all-the-icons-dired/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/wyuenho/all-the-icons-dired/issues/</bugs-to>
+    <remote-id type="github">wyuenho/all-the-icons-dired</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/all-the-icons-ibuffer/Manifest b/app-emacs/all-the-icons-ibuffer/Manifest
new file mode 100644
index 000000000000..ad23507982a7
--- /dev/null
+++ b/app-emacs/all-the-icons-ibuffer/Manifest
@@ -0,0 +1,4 @@
+AUX 50all-the-icons-ibuffer-gentoo.el 149 BLAKE2B 16bb40261f940124c17ec3c8982408d4decffcf520f06add3b8104e51ead4aa144aed349530489201580fcbd3a5d91c32b60251b94c919bf3e8011d989e10744 SHA512 cd67f05368993997bb61e818bd7eed90fa79e6278a198da0b2428b366ddcb578fa038d6719db367f148c103ea589aa5fc667686f412f7d90ea0df94bf124bb71
+DIST all-the-icons-ibuffer-1.3.0.tar.gz 16247 BLAKE2B 43551d61aeff8f433ee087bd0361c443f95d12828fab7e8742522fd00d323430d3eb5c6205b580482df0be164dd636c151c30ddebdc36f4a2bc15117683748dd SHA512 f1fcde1cf97f02fef7b52d840296504ff621faa0fb35f530d7f20989545c5f24ba6a7762e0a76f5dca209f8e3c8b73a12c23c7f54d688680aa2b9805dcd2c8d2
+EBUILD all-the-icons-ibuffer-1.3.0.ebuild 526 BLAKE2B ffdb48b86a72c7e1ac1d534c72efed9baffca2d85f59d5a01ed87ec07568d7cb428918b3d702f00514dd0c5d875fe3562b2c874e156865d8ffd36fb90f46af78 SHA512 c9cd8e2eb3222cca7862fb276331d3c809c14f5adcd2600c8fdfa8e578d784ec95ad641aa03fd7710342ce35aa012e9635f0b1d971e2eb5c16e96064344fa9ea
+MISC metadata.xml 453 BLAKE2B e089948a9b03d18f99cd84c2925aae7aea619816697511785fb030029656cc00115d525d96c69c8eb7703e701f51814e4a87432fae94c1e2aef6a80b8cc6eca7 SHA512 bd130bf88aa97aea4d07c3ef6c778603794eac6af13b70801c2e6d45dc9c52b2f8aea070013ce8935e5edebae8eeca133b48f4210c186bb78f21e52f544ee254
diff --git a/app-emacs/all-the-icons-ibuffer/all-the-icons-ibuffer-1.3.0.ebuild b/app-emacs/all-the-icons-ibuffer/all-the-icons-ibuffer-1.3.0.ebuild
new file mode 100644
index 000000000000..1e24835199af
--- /dev/null
+++ b/app-emacs/all-the-icons-ibuffer/all-the-icons-ibuffer-1.3.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24.4
+
+inherit elisp
+
+DESCRIPTION="Display all-the-icons icons for all buffers in Emacs' ibuffer"
+HOMEPAGE="https://github.com/seagle0128/all-the-icons-ibuffer/"
+SRC_URI="https://github.com/seagle0128/${PN}/archive/v${PV}.tar.gz
+			-> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-emacs/all-the-icons"
+BDEPEND="${RDEPEND}"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/all-the-icons-ibuffer/files/50all-the-icons-ibuffer-gentoo.el b/app-emacs/all-the-icons-ibuffer/files/50all-the-icons-ibuffer-gentoo.el
new file mode 100644
index 000000000000..cf33c024a408
--- /dev/null
+++ b/app-emacs/all-the-icons-ibuffer/files/50all-the-icons-ibuffer-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'all-the-icons-ibuffer-mode "all-the-icons-ibuffer"
+  "Display icons for all buffers in ibuffer." t)
diff --git a/app-emacs/all-the-icons-ibuffer/metadata.xml b/app-emacs/all-the-icons-ibuffer/metadata.xml
new file mode 100644
index 000000000000..ca81f430464d
--- /dev/null
+++ b/app-emacs/all-the-icons-ibuffer/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/seagle0128/all-the-icons-ibuffer/issues/</bugs-to>
+    <remote-id type="github">seagle0128/all-the-icons-ibuffer</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/all-the-icons-ivy-rich/Manifest b/app-emacs/all-the-icons-ivy-rich/Manifest
new file mode 100644
index 000000000000..972ac6054c14
--- /dev/null
+++ b/app-emacs/all-the-icons-ivy-rich/Manifest
@@ -0,0 +1,4 @@
+AUX 50all-the-icons-ivy-rich-gentoo.el 147 BLAKE2B 9d5dcc2b3537c21444dca4eec0138466c09d4f3b8efcb314001563957e7512caddd41b34573aaf5bd04b5b6ec50d8d50c0fe24a656a485640936cbf9b3728550 SHA512 d843d1714e43e3a893cd46b6c759fee46a24227bf1a8001b4119320411e1921e35a40b304313e3f0b2ee6c15971a67e143c5c2a8bb10f70003dbdd03de9cc406
+DIST all-the-icons-ivy-rich-1.7.1.tar.gz 23806 BLAKE2B 28d85c0a4d486900b444e2aab25c6cb257d91ddb4839ab3e71dced02c7ad85e822f465d0d29404c55421c05a1e14002480f977c898a8374e4c51c66631413413 SHA512 526632f74a674bfcd6c2019649be6e305c0d817a1b29d8e5883b239cd97f8b40a63c34bc39e4f4e8ca2ff71ee3cd15e43e40827f40aa2f6579ec4c96eced40e5
+EBUILD all-the-icons-ivy-rich-1.7.1.ebuild 527 BLAKE2B 7e0abd723cab3a6a092de68f7e5621f5df6d3dc07ab4cfffb522480fbbaf8aef7f5db0190a70459b83dc956542b5a9fb8829128250d7ce17cd9a09fcba2aeb63 SHA512 f3c1cb9edaafa0032242d304908bcdc21ad2ac26f8e3430c1cf566db5d9acc47de5aac44249374eb611dee52fef221105050e44bf2706eebbb198235340a6027
+MISC metadata.xml 455 BLAKE2B 8e42e8f90284961bfa2009e40e212db1665b4624ff14b18689a32ec25361d9eefa65acc7e5b7e189d8e3b3b397eb41bfa36e672732f066a937b6bbf3fb70d5e2 SHA512 01b692b5436521b2a4e781aca48fbbee42979990521ab5b74ae6e0fa8f17725880ef9d096d77eb7dd5ebb087981c11d2d5f3736fab536c587211ffae19f784f1
diff --git a/app-emacs/all-the-icons-ivy-rich/all-the-icons-ivy-rich-1.7.1.ebuild b/app-emacs/all-the-icons-ivy-rich/all-the-icons-ivy-rich-1.7.1.ebuild
new file mode 100644
index 000000000000..b0570fb03e28
--- /dev/null
+++ b/app-emacs/all-the-icons-ivy-rich/all-the-icons-ivy-rich-1.7.1.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=25.1
+
+inherit elisp
+
+DESCRIPTION="Display icons for ivy buffers in Emacs"
+HOMEPAGE="https://github.com/seagle0128/all-the-icons-ivy-rich/"
+SRC_URI="https://github.com/seagle0128/${PN}/archive/v${PV}.tar.gz
+			-> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-emacs/all-the-icons
+	app-emacs/ivy-rich
+"
+BDEPEND="${RDEPEND}"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/all-the-icons-ivy-rich/files/50all-the-icons-ivy-rich-gentoo.el b/app-emacs/all-the-icons-ivy-rich/files/50all-the-icons-ivy-rich-gentoo.el
new file mode 100644
index 000000000000..3b390209616d
--- /dev/null
+++ b/app-emacs/all-the-icons-ivy-rich/files/50all-the-icons-ivy-rich-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'all-the-icons-ivy-rich-mode "all-the-icons-ivy-rich"
+  "Better experience with icons for ivy." t)
diff --git a/app-emacs/all-the-icons-ivy-rich/metadata.xml b/app-emacs/all-the-icons-ivy-rich/metadata.xml
new file mode 100644
index 000000000000..9f1fa8fc0a06
--- /dev/null
+++ b/app-emacs/all-the-icons-ivy-rich/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/seagle0128/all-the-icons-ivy-rich/issues/</bugs-to>
+    <remote-id type="github">seagle0128/all-the-icons-ivy-rich</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/all-the-icons/Manifest b/app-emacs/all-the-icons/Manifest
new file mode 100644
index 000000000000..48838605efd5
--- /dev/null
+++ b/app-emacs/all-the-icons/Manifest
@@ -0,0 +1,6 @@
+AUX 50all-the-icons-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST all-the-icons-5.0.0.tar.gz 805496 BLAKE2B c5d81d2ff534bb7ab0000c21fb32107f307d96b1bf09b9227be5900e8160b133cfdc7ea4d4b31a982abb55e29bcf35626af91e3bd9ecbfba00b9b5ed85496a7f SHA512 865db191900dbeb207220df8d91220179dfbbb37e983e9e306ba0a4be576055002beb7335de20327736e8be678056699e8385aa37de766fadc11f4688f99471e
+DIST all-the-icons-5.0.0_p20220325.tar.gz 806105 BLAKE2B bc035ee726bf1d2f9839231ddd3bbaaca93b76c30026a3fcef4579f28f7f9677b37fa8b2652e82ae710f23272b56c884cb9454d54d8c2962f20e0fe9cf3c0bdd SHA512 3e45f208b46e7b1b596b6beb41cc11145db49e3e60e7a42593db94000f226e197b30580ba46d490b456f90349e7db2e49027a572b90f32048bcf0e68af9f22bf
+EBUILD all-the-icons-5.0.0.ebuild 1000 BLAKE2B edbb9634122e62a74cc6601465edd5af266705a77f6834afa12fa76c6a42db5636a8d8f26acf46077b60a435111d36a2d7d826e9b1ed2169d8d2043b00b8b58b SHA512 ff270f803578bb075378ee6a9a8bfe7a12d2b2d57855f12273f7d9c222c746e3bf6881ac2c9bf5219721f879886edeed48adab9307b452922f7ad9f6bb69047b
+EBUILD all-the-icons-5.0.0_p20220325.ebuild 1041 BLAKE2B 1bdc607c82776edeb062c0380f954509a910348fff09de1393663a8ccb1d866adb9a326ebe92167e06015ce3d4df9c5675408e9df78608155674524195a0b516 SHA512 29f5d433b13c1c1e7382ec89fd98e4792868003e0718016eebdb60b51f169eb4b9f66ec6d03b895b198af3ad76a61129d8fbc35baa9371b1bdb2092f6a2638c8
+MISC metadata.xml 439 BLAKE2B 29065345d770b5f2725a0a9dfaf2afa77ad082e349b662dca756150c45eefa1b7f022842e5db1efcd8a7d55cde14ddd25f286cb2cc9ce4370fdf9d4a5cf942b3 SHA512 2189e794f2eefda4ac001013c26e91a5631d1cc71aab214b811ef897f94b3c2ea1858b536b18f38211474c87baaf4a2307619744deec577d6e6aa2db1c634458
diff --git a/app-emacs/all-the-icons/all-the-icons-5.0.0.ebuild b/app-emacs/all-the-icons/all-the-icons-5.0.0.ebuild
new file mode 100644
index 000000000000..cb1873d52bb6
--- /dev/null
+++ b/app-emacs/all-the-icons/all-the-icons-5.0.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=24.3
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="Various icon fonts propertized for Emacs"
+HOMEPAGE="https://github.com/domtronn/all-the-icons.el/"
+SRC_URI="https://github.com/domtronn/${PN}.el/archive/${PV}.tar.gz
+			-> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}.el-${PV}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( app-emacs/f )"
+
+DOC_CONTENTS="You may need to install the required fonts by executing
+	the \"all-the-icons-install-fonts\" function."
+DOCS=( README.md logo.png )
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp_src_compile
+	elisp-compile data/*.el
+}
+
+src_test() {
+	${EMACS} ${EMACSFLAGS} ${BYTECOMPFLAGS} \
+			 -L . -L data -L test -l test/all-the-icons-test.el \
+			 -f ert-run-tests-batch-and-exit || die "tests failed"
+}
+
+src_install() {
+	elisp_src_install
+	elisp-install ${PN}/data data/*.el{,c}
+}
diff --git a/app-emacs/all-the-icons/all-the-icons-5.0.0_p20220325.ebuild b/app-emacs/all-the-icons/all-the-icons-5.0.0_p20220325.ebuild
new file mode 100644
index 000000000000..cf28205eb9e6
--- /dev/null
+++ b/app-emacs/all-the-icons/all-the-icons-5.0.0_p20220325.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=65c496d3d1d1298345beb9845840067bffb2ffd8
+NEED_EMACS=24.3
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="Various icon fonts propertized for Emacs"
+HOMEPAGE="https://github.com/domtronn/all-the-icons.el/"
+SRC_URI="https://github.com/domtronn/${PN}.el/archive/${H}.tar.gz
+			-> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}.el-${H}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( app-emacs/f )"
+
+DOC_CONTENTS="You may need to install the required fonts by executing
+	the \"all-the-icons-install-fonts\" function."
+DOCS=( README.md logo.png )
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp_src_compile
+	elisp-compile data/*.el
+}
+
+src_test() {
+	${EMACS} ${EMACSFLAGS} ${BYTECOMPFLAGS} \
+			 -L . -L data -L test -l test/all-the-icons-test.el \
+			 -f ert-run-tests-batch-and-exit || die "tests failed"
+}
+
+src_install() {
+	elisp_src_install
+	elisp-install ${PN}/data data/*.el{,c}
+}
diff --git a/app-emacs/all-the-icons/files/50all-the-icons-gentoo.el b/app-emacs/all-the-icons/files/50all-the-icons-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/all-the-icons/files/50all-the-icons-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/all-the-icons/metadata.xml b/app-emacs/all-the-icons/metadata.xml
new file mode 100644
index 000000000000..05396e7cc8b6
--- /dev/null
+++ b/app-emacs/all-the-icons/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/domtronn/all-the-icons.el/issues/</bugs-to>
+    <remote-id type="github">domtronn/all-the-icons.el</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/amx/Manifest b/app-emacs/amx/Manifest
new file mode 100644
index 000000000000..5034221c15bd
--- /dev/null
+++ b/app-emacs/amx/Manifest
@@ -0,0 +1,4 @@
+AUX 50amx-gentoo.el 176 BLAKE2B ebe37d31809cb6e18caab94ca65d1549b28b00c92aa8a45a43305401fdbea87ae1d0fdeb9617f67e2b733ee6d91db2b592ca1561efb05a07a6ce7ae2d8f8e301 SHA512 c1b808f7daebf3d59aecf2cc8dc23ec44ae0e973700d1edf0357e6af38b4feead5cac2e9c9d6e6dcb9afa14af0480538a09beb128920b209baebf6f76ce1a438
+DIST amx-3.4.tar.gz 33916 BLAKE2B b3b6f6d97e10dcb759bf38a812094de528aaeffd0b8fd0f1d055f67696889939a88622151123986bde42d4a1355a8a4d6cf95b286012bcb5245c1edc9b19a71c SHA512 146b8f6acbe4acca63391771fca73d22f5ce60872f4d18abc865d6cb07f4d12ea01fd59235e1e5987d33b169ea7792368b72e92f8c6409846121850efb75511f
+EBUILD amx-3.4.ebuild 573 BLAKE2B c600639289933531b37244157ae4c27101f78d981eaed79a3476a2dbdd1434028f6763c484a670597efa264c822fe543f6e2eb2aa23236b03289e513d769e29f SHA512 d06c9ebc08b9ac0e4a7ef10bf76943953293b212ae3d56f950d276c25cbfeefee719cce0c7db5953cf329c96d35dede5be32d58fe7a226013e250205b86e07e9
+MISC metadata.xml 431 BLAKE2B cfda173fa701b47b27ae72fd7864d61abcd7befe44b7c31744dd99d8f945f6d80e457ec885ee7ed92821a478483aee94542c6b13ab0e201d9c7562b0aeb37efd SHA512 62ebc4bc14e269ec5f0f753767f6ead66fb03fb312034c3967ce60077e18ec64daab8eccfd7b59c11bbb2461449b9848b9d7126987ef5eafc5864b9fa94c166e
diff --git a/app-emacs/amx/amx-3.4.ebuild b/app-emacs/amx/amx-3.4.ebuild
new file mode 100644
index 000000000000..db2ba6d8d419
--- /dev/null
+++ b/app-emacs/amx/amx-3.4.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=24.4
+
+inherit elisp
+
+DESCRIPTION="Alternative M-x interface for GNU Emacs"
+HOMEPAGE="https://github.com/DarwinAwardWinner/amx/"
+SRC_URI="https://github.com/DarwinAwardWinner/${PN}/archive/v${PV}.tar.gz
+			-> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# TODO: When ido is packaged: || ( app-emacs/ido app-emacs/ivy )
+RDEPEND="
+	app-emacs/s
+	app-emacs/ivy
+"
+BDEPEND="${RDEPEND}"
+
+DOCS=( README.mkdn )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/amx/files/50amx-gentoo.el b/app-emacs/amx/files/50amx-gentoo.el
new file mode 100644
index 000000000000..12393aba5772
--- /dev/null
+++ b/app-emacs/amx/files/50amx-gentoo.el
@@ -0,0 +1,5 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'amx-mode "amx"
+  "Use ido/ivy completion for M-x." t)
+(autoload 'amx "amx"
+  "Read a command name and execute the command." t)
diff --git a/app-emacs/amx/metadata.xml b/app-emacs/amx/metadata.xml
new file mode 100644
index 000000000000..9b41a7c40de8
--- /dev/null
+++ b/app-emacs/amx/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/DarwinAwardWinner/amx/issues/</bugs-to>
+    <remote-id type="github">DarwinAwardWinner/amx</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/bbdb/Manifest b/app-emacs/bbdb/Manifest
index 70b9f379070b..838286dffd00 100644
--- a/app-emacs/bbdb/Manifest
+++ b/app-emacs/bbdb/Manifest
@@ -2,7 +2,9 @@ AUX 50bbdb-gentoo-3.1.2.el 63 BLAKE2B 4e066577f6bbc4ddcc7a5b102c1bc650fd957d8246
 AUX 50bbdb-gentoo-3.2.el 149 BLAKE2B 7db122f83411995801b658f05dcda71d8eb5382ed1d5b2216f4a74a4c45328e54f25d393cf797ca335ed4129875b1c7ddf33e95e73479528720d116ace6a6e0c SHA512 650b802917866344dc6748ec213de79d8fe31a03654f1005994020173a143a51e295407350db1ebb0ef6f240047999cd9a1630a82af13997de57ead82cdb3b08
 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
-MISC metadata.xml 754 BLAKE2B bd29d631fcd0b96761a31fc0ff9f4d2088b004f4339369b63f2c30f3dedeaaa1f11f38ca910dd1a3d53c14cea011a9d08746d47b0e074e8a0753d51b5e534abf SHA512 87d06aedcd0705dfb8e269c96d3bd3782dd7d928f9793f4174b4558645111782e72207bb16e8114623a877235ac279baf65a310724cbe28bc6b2b47385fe1f02
+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
new file mode 100644
index 000000000000..25ffb5ede6b0
--- /dev/null
+++ b/app-emacs/bbdb/bbdb-3.2.2a-r1.ebuild
@@ -0,0 +1,66 @@
+# 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://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz"
+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/bbdb/metadata.xml b/app-emacs/bbdb/metadata.xml
index c425401f3513..aaffcca93625 100644
--- a/app-emacs/bbdb/metadata.xml
+++ b/app-emacs/bbdb/metadata.xml
@@ -14,6 +14,7 @@
 <use>
   <flag name="tex">Install plain TeX support files</flag>
   <flag name="vm">Add support for <pkg>app-emacs/vm</pkg></flag>
+  <flag name="wanderlust">Add support for <pkg>app-emacs/wanderlust</pkg></flag>
 </use>
 <upstream>
   <remote-id type="sourceforge">bbdb</remote-id>
diff --git a/app-emacs/company-quickhelp/Manifest b/app-emacs/company-quickhelp/Manifest
new file mode 100644
index 000000000000..fd3be45248e6
--- /dev/null
+++ b/app-emacs/company-quickhelp/Manifest
@@ -0,0 +1,4 @@
+AUX 50company-quickhelp-gentoo.el 278 BLAKE2B a15fdeb2362a2b07e6029603b0c7e62615dea9bcbd3645f28183317334fbe143b21cf35736dfe83cf6e21df51ac86d70c22ef092cbbc66cea954da2418fe5b6c SHA512 edf783572be6f115878afe93ab347043287830963c0c598c21f52c5ec8192a8a5e2866a4697d311c740baca32475d21b3b7224e25b5fb9fa0cf7304c7a5ded24
+DIST company-quickhelp-2.3.0.tar.gz 64663 BLAKE2B 2ca72d4ecea574790bd796217da32c1dbaf0d637deb52ed20978d62bc4eaea07efda5f4e7163212943b19a1de74a6df06e56a5b835f00a23b0c74dd121451018 SHA512 c1df2c58ac6a089c1a1efe44251112a2c1e8591e168c1d94a2107eeaec02cfbe6ec6232e357eb6f94a799b03fb99da087f69ed6d4e1a315fc9ad268e08d785bd
+EBUILD company-quickhelp-2.3.0.ebuild 574 BLAKE2B 1dae12d2c6a8efc14abbec26c32d549e4c4e7f0c58e96ca039cd78354e4a7254a585f33cba3306bf90807158339c7ef94647da4b8caaf9318165ee7550bcf5c8 SHA512 c6ca488aa4c4bb8f904e08fe5f8a227cee542cece7f5fec269c5d522d581ada51ff709f5b23649b0b8c14f22339929476580ae51df927fbce7f9ab016295afe7
+MISC metadata.xml 561 BLAKE2B c0b55818fb46a3fe36264e160079683d3ecc22315d1bf2adf985cf581ef87814a94f9338ab550ebd130cf8101416698012a149cedad373e02b0df094ff978068 SHA512 886c9bc9df3d708cc63553ebac394a3b847ec956ad6243653f15a8596420c21fc382891103360ee67467fdca38208db5715780d2802e5058abb7f058bbb874bd
diff --git a/app-emacs/company-quickhelp/company-quickhelp-2.3.0.ebuild b/app-emacs/company-quickhelp/company-quickhelp-2.3.0.ebuild
new file mode 100644
index 000000000000..2e874826d7ea
--- /dev/null
+++ b/app-emacs/company-quickhelp/company-quickhelp-2.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=24.4
+
+inherit elisp
+
+DESCRIPTION="Company documentation popups for completion candidates"
+HOMEPAGE="https://github.com/company-mode/company-quickhelp/"
+SRC_URI="https://github.com/company-mode/${PN}/archive/${PV}.tar.gz
+			-> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-emacs/company-mode
+	app-emacs/pos-tip
+"
+BDEPEND="${RDEPEND}"
+
+DOCS=( CHANGELOG.md README.md company-quickhelp.png )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/company-quickhelp/files/50company-quickhelp-gentoo.el b/app-emacs/company-quickhelp/files/50company-quickhelp-gentoo.el
new file mode 100644
index 000000000000..c974134302a0
--- /dev/null
+++ b/app-emacs/company-quickhelp/files/50company-quickhelp-gentoo.el
@@ -0,0 +1,5 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'company-quickhelp-local-mode "company-quickhelp"
+  "Provides documentation popups for `company-mode' using `pos-tip'." t)
+(autoload 'company-quickhelp-mode "company-quickhelp"
+  "Toggle Company-Quickhelp mode in all buffers." t)
diff --git a/app-emacs/company-quickhelp/metadata.xml b/app-emacs/company-quickhelp/metadata.xml
new file mode 100644
index 000000000000..1d03dc85b5e9
--- /dev/null
+++ b/app-emacs/company-quickhelp/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <upstream>
+    <changelog>https://raw.githubusercontent.com/company-mode/company-quickhelp/master/CHANGELOG.md</changelog>
+    <bugs-to>https://github.com/company-mode/company-quickhelp/issues/</bugs-to>
+    <remote-id type="github">company-mode/company-quickhelp</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/counsel/Manifest b/app-emacs/counsel/Manifest
new file mode 100644
index 000000000000..53be3b6007ea
--- /dev/null
+++ b/app-emacs/counsel/Manifest
@@ -0,0 +1,4 @@
+AUX 50counsel-gentoo.el 110 BLAKE2B 223dc0b9991156d3494e9e954624ec060515231f5ca979345864dad802ccaaaff02eb43e13a7af5eed581e4189005493bbda3d849ef8c7b9b877993f9e096a78 SHA512 be21f737978b64065af31df15320ddb06f255a258d05d75227f4762a35a6eb86b0012561a40f7f72f154af58c0ce240c50958a8020d3a0dc5054c6b5834b80c8
+DIST swiper-0.13.4.tar.gz 245190 BLAKE2B c4da021b92fcedfec39cc60f670c97e4a421b8d4aef8183f50c4872bed835db79884cff113f58cf21dfa7ce33158218aa0cf25d72fc0081dc1c24a3b4376c60e SHA512 bf096a13f675f87af6ea68c974455896b64921ca4d7880c9ccc444aa3cea7c7e04c61be5deb2fd57d0568ff4d86f96ffcf94494b55d84d7a9f647f49b69aec9a
+EBUILD counsel-0.13.4.ebuild 787 BLAKE2B fcee8cf90e3384599d3a90aab8ec69cffb5e638a16b7853fc095b1900ef7c419bdc1eeb6cab1e96ae514787a9ad2d426e7ad96ae0c5c0ec4a14697a7b5be1468 SHA512 bd748ff39182ee9e9c6ad954d9c1a3a0db9e445d27766d03feaf36f48abe29e4f4e9806fab143d399fe73543912ac8a997488e338f274ecf2fd6be707f20c81b
+MISC metadata.xml 571 BLAKE2B 26ca5a5dfb1bc67ad37086ddc2c2e5976d1b4c763789a27ee83fb08c4a106a21c33b4c9632a3f2858a6b6249c8c49da3e2eafa7efc5267b655c0c9b2066598e2 SHA512 1879881be5eaeb2a6bac023fd06476a2ccbd25909f7c2f722b4af3680db44b4d3a959e1ac864e86580813a0bc68a2120d936f1c2efd67a6738ee8d83a5adb6f4
diff --git a/app-emacs/counsel/counsel-0.13.4.ebuild b/app-emacs/counsel/counsel-0.13.4.ebuild
new file mode 100644
index 000000000000..fe5b3a0a93e8
--- /dev/null
+++ b/app-emacs/counsel/counsel-0.13.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24.5
+
+inherit elisp
+
+DESCRIPTION="Versions of common Emacs commands customized to make the best use of ivy"
+HOMEPAGE="https://github.com/abo-abo/swiper/"
+SRC_URI="https://github.com/abo-abo/swiper/archive/${PV}.tar.gz
+			-> swiper-${PV}.tar.gz"
+S="${WORKDIR}"/swiper-${PV}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"  # Ivy, Swiper and Counsel tests are performed in app-emacs/ivy
+
+RDEPEND="
+	>=app-emacs/ivy-${PV}
+	>=app-emacs/swiper-${PV}
+"
+BDEPEND="${RDEPEND}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp-compile ${PN}.el
+}
+
+src_install() {
+	elisp-install ${PN} ${PN}.el{,c}
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+}
diff --git a/app-emacs/counsel/files/50counsel-gentoo.el b/app-emacs/counsel/files/50counsel-gentoo.el
new file mode 100644
index 000000000000..1da49244a09f
--- /dev/null
+++ b/app-emacs/counsel/files/50counsel-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'counsel-mode "counsel"
+  "Toggle Counsel mode on or off." t)
diff --git a/app-emacs/counsel/metadata.xml b/app-emacs/counsel/metadata.xml
new file mode 100644
index 000000000000..37581bba4db7
--- /dev/null
+++ b/app-emacs/counsel/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>
+    <changelog>https://raw.githubusercontent.com/abo-abo/swiper/master/doc/Changelog.org</changelog>
+    <bugs-to>https://github.com/abo-abo/swiper/issues/</bugs-to>
+    <remote-id type="github">abo-abo/swiper</remote-id>
+    <doc lang="en">https://oremacs.com/swiper/</doc>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/dashboard/Manifest b/app-emacs/dashboard/Manifest
new file mode 100644
index 000000000000..1e11444803fd
--- /dev/null
+++ b/app-emacs/dashboard/Manifest
@@ -0,0 +1,5 @@
+AUX 50dashboard-gentoo.el 130 BLAKE2B e6bbe3301308c1f6676a08586bb50f50f41bdc8e6dcace0b18d27ff6a43517a855c33283d13b5220f05c85bdb843cd6987718b60a58105bc722ce9b4d27eed0c SHA512 64fd0f460b8735de0c833e38e86a22401397cc017e99df22afe11037b0096b871b0fc8423706465478e0bcda8ce34d815f2de47c8ecdacf70ece9f0336b5e217
+AUX dashboard-dashboard-widgets.el-banners.patch 352 BLAKE2B cb6b45429bffe3534e5ed218eb5f69fc4e29587ceadfb665d7385b0169c9aaa6b6ec5acf3fa219f0e08285cb835ae35f92c38a6b9df24ecab62e8e3bb6590068 SHA512 c35592d938afcf6996259a4e0d9043afdfa51af67cea588b119eba669413117ecd88087fc5c9ca268087a2d5d6668d27e06f54995ca62c67f48dfb2996fa72e4
+DIST dashboard-1.8.0_pre20220406.tar.gz 191442 BLAKE2B 8b105d8ed9b31e7439cc55b85c9e0bb46739fcb26f9e1e605492a552cbcfe9799794be6239b6c622bfbfc2f850d20f2944f759010eb502bcb75edb570ae7e5b8 SHA512 b3b714bbee034fecbf1172dccd5eebc38373c11a510c532a7b9ba31cac79daafe7e9ccf7c5e622abbdb44817c966f100ec4f7a447e8b0370f9d7e66ff55e45ca
+EBUILD dashboard-1.8.0_pre20220406.ebuild 953 BLAKE2B 1d572847f8e3432a4f30949ed4cd739a16b60e7622c30e1f025f355299b3dacb71399b37a8ea5be953d76585acb729f587cabc0306bf6fd5a7cc96acff8f5484 SHA512 c6654c6b5dd0815c272ebf0909b44c2bb32d13b9d20f5d3750ed7ed3cd350835010dc0e2cb48041209ac21ee16c1d0b3c8cce7332f20c0a3867d6e3cecc7b808
+MISC metadata.xml 564 BLAKE2B fd3eea99e99ad926d6600df608f5b04f3a44a690a10ffa74a32314838360c637fb618bda7d600236d6ce2eec59a11cac37231941334da756e893e9561acfc933 SHA512 56071ea793b85ba75b1139f4f3f43b69a418fad2ed5b2c23469f281deb47c2b09a1beefa3c13281ee2a001999823d955f600e29100885747f55544ce5af63ee9
diff --git a/app-emacs/dashboard/dashboard-1.8.0_pre20220406.ebuild b/app-emacs/dashboard/dashboard-1.8.0_pre20220406.ebuild
new file mode 100644
index 000000000000..88cc08a233ff
--- /dev/null
+++ b/app-emacs/dashboard/dashboard-1.8.0_pre20220406.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=69f98f5a89451c0881d0abb34ad57dd71616006a
+NEED_EMACS=26.1
+
+inherit elisp
+
+DESCRIPTION="Extensible Emacs dashboard, with sections for bookmarks, projects, agenda and more"
+HOMEPAGE="https://github.com/emacs-dashboard/emacs-dashboard/"
+SRC_URI="https://github.com/emacs-dashboard/emacs-${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/emacs-${PN}-${H}
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"  # tests not in the repository, require "Eask"
+
+DOCS=( CHANGELOG.md README.org etc )
+PATCHES=( "${FILESDIR}"/${PN}-dashboard-widgets.el-banners.patch )
+
+ELISP_REMOVE=( .dir-locals.el )
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	elisp_src_prepare
+
+	sed "s|@SITEETC@|${EPREFIX}${SITEETC}/${PN}|" -i dashboard-widgets.el || die
+}
+
+src_install() {
+	elisp_src_install
+
+	insinto "${SITEETC}"/${PN}
+	doins -r banners
+}
diff --git a/app-emacs/dashboard/files/50dashboard-gentoo.el b/app-emacs/dashboard/files/50dashboard-gentoo.el
new file mode 100644
index 000000000000..99dbca09ee09
--- /dev/null
+++ b/app-emacs/dashboard/files/50dashboard-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'dashboard-setup-startup-hook "dashboard"
+  "Setup post initialization hooks." t)
diff --git a/app-emacs/dashboard/files/dashboard-dashboard-widgets.el-banners.patch b/app-emacs/dashboard/files/dashboard-dashboard-widgets.el-banners.patch
new file mode 100644
index 000000000000..9ce24c2d9bd6
--- /dev/null
+++ b/app-emacs/dashboard/files/dashboard-dashboard-widgets.el-banners.patch
@@ -0,0 +1,12 @@
+index 494ea0d..1ae6ebb 100644
+--- a/dashboard-widgets.el
++++ b/dashboard-widgets.el
+@@ -136,7 +136,7 @@ preserved."
+   :group 'dashboard)
+ 
+ (defconst dashboard-banners-directory
+-  (concat (file-name-directory (locate-library "dashboard")) "banners/")
++  "@SITEETC@/banners/"
+   "Default banner directory.")
+ 
+ (defconst dashboard-banner-official-png
diff --git a/app-emacs/dashboard/metadata.xml b/app-emacs/dashboard/metadata.xml
new file mode 100644
index 000000000000..dbd2fb8bfbca
--- /dev/null
+++ b/app-emacs/dashboard/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <upstream>
+    <changelog>https://raw.githubusercontent.com/emacs-dashboard/emacs-dashboard/master/CHANGELOG.md</changelog>
+    <bugs-to>https://github.com/emacs-dashboard/emacs-dashboard/issues/</bugs-to>
+    <remote-id type="github">emacs-dashboard/emacs-dashboard</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/deft/Manifest b/app-emacs/deft/Manifest
new file mode 100644
index 000000000000..59929c4336b8
--- /dev/null
+++ b/app-emacs/deft/Manifest
@@ -0,0 +1,4 @@
+AUX 50deft-gentoo.el 260 BLAKE2B 77f780e81768d6b9d4ee457db7e7ee0a136424937a29208651d0031ec687e7485c49ce97bfda10c0d42c6579edf8929aaecfea5fcd639684b93bd444467f030e SHA512 baa54e5ad86029473b77581517596c757b8f492e3f69969eae086546135a87913fd59ddc68aa49c89c62220f011f46d7ff174f9b1b08e63ae37e24c889dc1bf6
+DIST deft-08_p20210707.tar.gz 25162 BLAKE2B 0f7f5d2f298887474de5c77f657e1c5e9dafb6a58e4b564dd87e57b76ef263672a8465506c2855d9c10cf38470bdcb5644db457dd2294e9365715b64215482e0 SHA512 8e099249357fa0bec4b3f2c9fad081d2d19efb27820195d27a30cdb02cfe3013f6f68fba2acd645b3a01d9abd809ea032bb51a7cd250d2fdc4d162a45ddd3ea7
+EBUILD deft-08_p20210707.ebuild 496 BLAKE2B d2739651612c98b618b6151a075c53a7a087b09cdb7200cc825ded59a8bbbffe803fa08ead18222ce8af52216f4b6a7e22a69da1b81339a7f42b4b3e126d2022 SHA512 baaef0d33ad42fd88b897af27ff2f41c4d8597bf0017b7126bbe2229895eb5304f1ba3915abb640929ac3fbf3fcce790488c9cf65b82558413cc030e81debdf5
+MISC metadata.xml 415 BLAKE2B 77c168d681381ca41ac8bb1f7eeff9422362cd083bebd8bd1969c6de3c66f3d3034f2864d094fb1f44a3dcac4ba9f8d649cbb4399cb8245f1972859149337325 SHA512 b6de5d53b5c71a96ec0f66a6d271352f2b4be8d91dcd489d83f98e9e97d376603c8f199a99be37dae958fd0a271a2bf1dfa4c318b500ed65761ea74919a82159
diff --git a/app-emacs/deft/deft-08_p20210707.ebuild b/app-emacs/deft/deft-08_p20210707.ebuild
new file mode 100644
index 000000000000..5dd07b4a89c5
--- /dev/null
+++ b/app-emacs/deft/deft-08_p20210707.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=28be94d89bff2e1c7edef7244d7c5ba0636b1296
+
+inherit elisp
+
+DESCRIPTION="Quickly browse, filter and edit directories of plain text notes"
+HOMEPAGE="https://github.com/jrblevin/deft/"
+SRC_URI="https://github.com/jrblevin/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${H}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/deft/files/50deft-gentoo.el b/app-emacs/deft/files/50deft-gentoo.el
new file mode 100644
index 000000000000..cc7fdfa63ed6
--- /dev/null
+++ b/app-emacs/deft/files/50deft-gentoo.el
@@ -0,0 +1,7 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'deft "deft"
+  "Switch to *Deft* buffer and load files." t)
+(autoload 'deft-find-file "deft"
+  "Find FILE interactively using the minibuffer." t)
+(autoload 'deft-new-file "deft"
+  "Create a new file quickly." t)
diff --git a/app-emacs/deft/metadata.xml b/app-emacs/deft/metadata.xml
new file mode 100644
index 000000000000..9e917250ef90
--- /dev/null
+++ b/app-emacs/deft/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/jrblevin/deft/issues/</bugs-to>
+    <remote-id type="github">jrblevin/deft</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/diff-hl/Manifest b/app-emacs/diff-hl/Manifest
new file mode 100644
index 000000000000..866b0b3615c2
--- /dev/null
+++ b/app-emacs/diff-hl/Manifest
@@ -0,0 +1,4 @@
+AUX 50diff-hl-gentoo.el 1736 BLAKE2B c743490ef717dcc1ec72fc44a2c2a05792ff60cee702ac06b105a39d5fb088ee2816d23cf9a54d8686d3db5af6649f5793738273bd054e2f486da949eb3cf9c7 SHA512 ac3c8d3f1566515fe8be749619764febe3fdf24820d5e7a95f1eb9eff8329cb5e4fa7da848e867ece8772b5d7a1e75e159091da5194ec16bd2724febeacb6f8b
+DIST diff-hl-1.8.8_p20220405.tar.gz 241924 BLAKE2B 316326eaca5e37155665436e923b9c8fa2a05cee6cf37bdb4c8538dc2ca8575fa7eff736e125b063c92abc0365c42743907f01edcfb7df2837f58bb2cad2a62e SHA512 4055699146f4244863c2be05a2196db7c51de16c9403ddad926b93b6be87b704efba1b578c2570d25a6e4da2d73863f8298691e26d270513558200169da02e04
+EBUILD diff-hl-1.8.8_p20220405.ebuild 997 BLAKE2B 9ed0d40bb0754f35ff4fac74de99f7284801c61602786c562f5e85fc5180d3f155709efc2ef70916191d2a04163503fe037df25bc2487cffbd29d01bdaadcf89 SHA512 549923a536ea2cfed026b8f9b3e93ba0a44215f00289eeb9676dc83fbc87233f9f32b01f8fe2719bb381e089b90f84401d3eb2cb658e14fe412a15c1650dc395
+MISC metadata.xml 417 BLAKE2B 8008d30c29065e61bd3fe0188f6c882993cfcb3021ed3dc650f9a12e7ef625e1f743ab6e405ce63d7d29a49f54f2987b7dee73025cc936e5356b09a5e0fb7038 SHA512 eaccfd63d897f54a6d2426028eaa1eb47f80fd63136446b5344dcdb599727680a81a13faa917a07d4899ed92f233dd247a161bf8610a701e29270955d3975209
diff --git a/app-emacs/diff-hl/diff-hl-1.8.8_p20220405.ebuild b/app-emacs/diff-hl/diff-hl-1.8.8_p20220405.ebuild
new file mode 100644
index 000000000000..6c4bd522d0a7
--- /dev/null
+++ b/app-emacs/diff-hl/diff-hl-1.8.8_p20220405.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=9d5dc2ffa1e4c7b43734b03dccb5ae6a80800569
+NEED_EMACS=25.1
+
+inherit elisp
+
+DESCRIPTION="Highlight uncommitted changes, jump between and revert them selectively"
+HOMEPAGE="https://github.com/dgutov/diff-hl/"
+SRC_URI="https://github.com/dgutov/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${H}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( dev-vcs/git )"
+
+DOCS=( README.md screenshot.png screenshot-dired.png screenshot-margin.png )
+ELISP_REMOVE=( .dir-locals.el )
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	ebegin "Creating a git repository for tests"
+	git init "${S}" --initial-branch="master" &&
+		git add "${S}" &&
+		git config --local user.email "test@test" &&
+		git config --local user.name "test" &&
+		git commit --message "test" --quiet
+	eend $? || die
+	emake EMACS="${EMACS} ${EMACSFLAGS}" test
+}
diff --git a/app-emacs/diff-hl/files/50diff-hl-gentoo.el b/app-emacs/diff-hl/files/50diff-hl-gentoo.el
new file mode 100644
index 000000000000..3240f13a619b
--- /dev/null
+++ b/app-emacs/diff-hl/files/50diff-hl-gentoo.el
@@ -0,0 +1,33 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'diff-hl-mode "diff-hl"
+  "Toggle VC diff highlighting." t)
+(autoload 'diff-hl-set-reference-rev "diff-hl"
+  "Set the reference revision globally to REV." t)
+(autoload 'diff-hl-reset-reference-rev "diff-hl"
+  "Reset the reference revision globally to the most recent one." t)
+(autoload 'global-diff-hl-mode "diff-hl"
+  "Toggle Diff-Hl mode in all buffers." t)
+(autoload 'diff-hl-amend-mode "diff-hl-amend"
+  "Show changes against the second-last revision in `diff-hl-mode'." t)
+(autoload 'global-diff-hl-amend-mode "diff-hl-amend"
+  "Toggle Diff-Hl-Amend mode in all buffers." t)
+(autoload 'diff-hl-dired-mode "diff-hl-dired"
+  "Toggle VC diff highlighting on the side of a Dired window." t)
+(autoload 'diff-hl-flydiff-mode "diff-hl-flydiff"
+  "Perform highlighting on-the-fly." t)
+(autoload 'diff-hl-inline-popup-hide "diff-hl-inline-popup"
+  "Hide the current inline popup." t)
+(autoload 'diff-hl-margin-mode "diff-hl-margin"
+  "Toggle displaying `diff-hl-mode' highlights on the margin." t)
+(autoload 'diff-hl-margin-local-mode "diff-hl-margin"
+  "Toggle displaying `diff-hl-mode' highlights on the margin locally." t)
+(autoload 'diff-hl-show-hunk-previous "diff-hl-show-hunk"
+  "Go to previous hunk/change and show it." t)
+(autoload 'diff-hl-show-hunk-next "diff-hl-show-hunk"
+  "Go to next hunk/change and show it." t)
+(autoload 'diff-hl-show-hunk "diff-hl-show-hunk"
+  "Show the VC diff hunk at point." t)
+(autoload 'diff-hl-show-hunk-mouse-mode "diff-hl-show-hunk"
+  "Enables the margin and fringe to show a posframe/popup with vc diffs when clicked." t)
+(autoload 'global-diff-hl-show-hunk-mouse-mode "diff-hl-show-hunk"
+  "Toggle Diff-Hl-Show-Hunk-Mouse mode in all buffers." t)
diff --git a/app-emacs/diff-hl/metadata.xml b/app-emacs/diff-hl/metadata.xml
new file mode 100644
index 000000000000..1d385a07e76e
--- /dev/null
+++ b/app-emacs/diff-hl/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/dgutov/diff-hl/issues/</bugs-to>
+    <remote-id type="github">dgutov/diff-hl</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/dockerfile-mode/Manifest b/app-emacs/dockerfile-mode/Manifest
new file mode 100644
index 000000000000..cbe0a2eff119
--- /dev/null
+++ b/app-emacs/dockerfile-mode/Manifest
@@ -0,0 +1,4 @@
+AUX 50dockerfile-mode-gentoo.el 283 BLAKE2B 0ef92381fb8058ce72cea9bdef593401eb279ea521b952f97747b35dbaaf344039dd2ed5e6384c86beafb98f92cea864626ad2bb7a2c61303a9830e257df34a2 SHA512 7b7a72fd9cde179a3e0847c92a2361d09bd6145c9de24236e8da3a56a880b02db9623e8b535f31f94482e05424bc758cd5d977c6d643689ab75894d128c3097b
+DIST dockerfile-mode-1.6.tar.gz 7795 BLAKE2B 3ba19ed2957d6d5bb1c8a43710bfda7c5681159820d313a19d03a00ba7982237ec09c4b1af5d6f304d4fcb9c228b7ff92ec0af1ae0efd4f2f18aedaf2a3a790a SHA512 64077ed231544bc737a5d7fd3bafd43f46861eb39e31908b90a50a6a7c4ea71f82239d7b4eb4cf2abb852da2a619c82aaeb236f7b0c537ff85b0ce4c1090a0de
+EBUILD dockerfile-mode-1.6.ebuild 435 BLAKE2B a81acbf2796981c7ce37c223780c8844af83304deef4188ae8b50fba42c15db2bbfd705c5c49e62300906e3964f7017d7909576a2ee1dcb999e8378ed0c87675 SHA512 4f531f03d4507cc5e5bc565b6ea47b58f04ec49144cc0eb8dddf8e31b1dcfe765665ac19bf0be380bbad94e0cb14a942f65481e98e9b344ab5f70257f3847876
+MISC metadata.xml 460 BLAKE2B 169050e19dd4324eee4cb06d1bb4e5ebefad6e0b94408cc95aaf946222a2d48bb8904d6dfba625de3c0444a6b12e465a4d0ea8ca43f64eef3f971edbe024b1dd SHA512 1ee48f2a4ebbf9b2f321731e69306221cbb5b3c43ad72f0a0cc69fe87f6eba76f1848b383339654dd9f2ca5ff71a7860b3abf12371fbb36c72c160a8eb011fc0
diff --git a/app-emacs/dockerfile-mode/dockerfile-mode-1.6.ebuild b/app-emacs/dockerfile-mode/dockerfile-mode-1.6.ebuild
new file mode 100644
index 000000000000..8ac741485198
--- /dev/null
+++ b/app-emacs/dockerfile-mode/dockerfile-mode-1.6.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
+
+inherit elisp
+
+DESCRIPTION="GNU Emacs mode for handling Dockerfiles"
+HOMEPAGE="https://github.com/spotify/dockerfile-mode/"
+SRC_URI="https://github.com/spotify/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/dockerfile-mode/files/50dockerfile-mode-gentoo.el b/app-emacs/dockerfile-mode/files/50dockerfile-mode-gentoo.el
new file mode 100644
index 000000000000..f4f04b32e72c
--- /dev/null
+++ b/app-emacs/dockerfile-mode/files/50dockerfile-mode-gentoo.el
@@ -0,0 +1,5 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'dockerfile-mode "dockerfile-mode"
+  "A major mode to edit Dockerfiles." t)
+(add-to-list 'auto-mode-alist '("/Dockerfile\\(?:\\.[^/\\]*\\)?\\'" . dockerfile-mode))
+(add-to-list 'auto-mode-alist '("\\.dockerfile\\'" . dockerfile-mode))
diff --git a/app-emacs/dockerfile-mode/metadata.xml b/app-emacs/dockerfile-mode/metadata.xml
new file mode 100644
index 000000000000..6d2d3a593327
--- /dev/null
+++ b/app-emacs/dockerfile-mode/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <stabilize-allarches/>
+  <upstream>
+    <bugs-to>https://github.com/spotify/dockerfile-mode/issues/</bugs-to>
+    <remote-id type="github">spotify/dockerfile-mode</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/editorconfig-emacs/Manifest b/app-emacs/editorconfig-emacs/Manifest
index 1099aad72ef3..080fe7f345a4 100644
--- a/app-emacs/editorconfig-emacs/Manifest
+++ b/app-emacs/editorconfig-emacs/Manifest
@@ -1,6 +1,6 @@
-AUX 50editorconfig-emacs-gentoo.el 315 BLAKE2B caefc75ef9a37e43d2a5de2f9c50a8f2992124fa98030080d5a5dc6c37490e1217e47595e4e894aa264568899d54891db8676348d10984327a4c596bcbf7b923 SHA512 66e86f6af9fa2feadc5477b6b7290320b2544219d8c099f74f94873fa4d4d45dd8f0dad17b14dcb455f1e18f1dd7606ade1ef77e0aff5708102ed5f35df81705
+AUX 50editorconfig-emacs-gentoo.el 436 BLAKE2B 3472733b5554060e3067ac6b4efdfcfb2061c4d94b07379cf73006e81213ce0c2441018354cdc05a9fa6f2d9e9b8b86faf863ec499707c32a31dcfdb9c71ab1f SHA512 d118b13c8ccfcb8e50274db3edd69c2aa392f4012d426a37183adf0eb5efc1b041bd7379a03ff19691f85c41c3c822580d9affa62820ce7284c25dcd164e2d3f
 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-r1.ebuild 643 BLAKE2B e5917b6389fe7f6c620141059dc60f6e34b5bcf55476429b12395b087d2155406581cb8167f25413e12a2d3348f1ab1d3f63fdf1c41be1c595083df0cefee771 SHA512 2f423ca10282652112a89ca8300fb7846900862cfb4949c223d1faf0c82d14b5b8357ffdfbeab5bbb5c9f843b4afc810da77b5b3ea864911a3d68a263a74242c
-EBUILD editorconfig-emacs-0.8.2.ebuild 645 BLAKE2B ac115d62641e0f7db43c60e0a29fb68747cf982e9364496994a6c757af5bc7960716b1ac7595e0d1833d33425b7f41f9ca23e490d054d356732928eb5262d620 SHA512 cae754c60d8583ebd3f232635c48f4b36c25e64fc8feb08830cba9bad4ba33af522671df276d07c85a4af5dea567f68d1fcc0d56baabc4cf77a1f51fbcf3fd0d
+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
 MISC metadata.xml 461 BLAKE2B e8415c92944d44ef9186b4882d7a5b912ccc16f224da3faef90b43ee8077e94496234341b80eaaf20a17118ebe6f8e8b0cfb70910c948a3ef5a8f853a02cba22 SHA512 a679c75eda6a98c3810b3fc1982ed8c7ff9349a63541eaf3c2b5dfdfec4d1a97f7c540d6b6442511c2645aed46e4b6d346f01ed952a51eb12d076aab8d29351f
diff --git a/app-emacs/editorconfig-emacs/editorconfig-emacs-0.7.8-r1.ebuild b/app-emacs/editorconfig-emacs/editorconfig-emacs-0.7.8-r3.ebuild
index 5108959d687f..0fbc0588065e 100644
--- a/app-emacs/editorconfig-emacs/editorconfig-emacs-0.7.8-r1.ebuild
+++ b/app-emacs/editorconfig-emacs/editorconfig-emacs-0.7.8-r3.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
diff --git a/app-emacs/editorconfig-emacs/editorconfig-emacs-0.8.2.ebuild b/app-emacs/editorconfig-emacs/editorconfig-emacs-0.8.2-r2.ebuild
index 28b91eb6580a..d24511f11c4b 100644
--- a/app-emacs/editorconfig-emacs/editorconfig-emacs-0.8.2.ebuild
+++ b/app-emacs/editorconfig-emacs/editorconfig-emacs-0.8.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/app-emacs/editorconfig-emacs/files/50editorconfig-emacs-gentoo.el b/app-emacs/editorconfig-emacs/files/50editorconfig-emacs-gentoo.el
index 93d6816e8e7b..247365df8ecd 100644
--- a/app-emacs/editorconfig-emacs/files/50editorconfig-emacs-gentoo.el
+++ b/app-emacs/editorconfig-emacs/files/50editorconfig-emacs-gentoo.el
@@ -1,7 +1,9 @@
 (add-to-list 'load-path "@SITELISP@")
+(autoload 'editorconfig-core-get-properties-hash "editorconfig-core"
+  "Get EditorConfig properties for FILE." t)
 (autoload 'editorconfig-mode "editorconfig"
   "Toggle EditorConfig feature." t)
 (autoload 'editorconfig-conf-mode "editorconfig-conf-mode"
   "Major mode for editing .editorconfig files." t)
 (add-to-list 'auto-mode-alist
-	     '("/\\.editorconfig\\'" . editorconfig-conf-mode))
+             '("/\\.editorconfig\\'" . editorconfig-conf-mode))
diff --git a/app-emacs/eglot/Manifest b/app-emacs/eglot/Manifest
index 76a03281f966..cfc066c33410 100644
--- a/app-emacs/eglot/Manifest
+++ b/app-emacs/eglot/Manifest
@@ -1,4 +1,6 @@
 AUX 50eglot-gentoo.el 76 BLAKE2B 0f41a5837bd485730c10074ca5c2dba963cf69b96043f3439e9f1e7a41d468cd706e974c7d7b312e51db98d6e7573b4ec284603998c2fe1de05f86496c3ec0cd SHA512 6c06dfa72ac6122c82dc59bb672f796ae86e71548babb2bb0dc2b00e58050e65b51e13aab279d5f3e7f1283ca2e0a64c7d34a55b412c2d81fc58fc495864c8c4
 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
-MISC metadata.xml 573 BLAKE2B cf91f12d06d2e0894d18c725eeef788341d8b1beb48eed71d7da0e31ac45e91e5df4e452613699dbed5f4da1e33c12a138296e983a51203f81c173db741001e2 SHA512 6d869d7cdd14557f758dce45df93822800577226518db4afc1ac9efbae4d97f99b77ef45afaf90f7b248ba5de76ec51ee2231ddea8095ddb09bf40eb0a378442
+EBUILD eglot-1.8.ebuild 670 BLAKE2B a1ca6c70ae3da6d338162f14bb0e778ef8eab25545622f1fcfc0e38df1df31588194cd3e7b8988c33dc39373b2c4bdeaad251cbd3e551ff16273936f33fc8d1b SHA512 77c26b1afba7513e8e3bf286003fd0a82971762b36cf78dfcda6101a03d043201c9d2b4e27a9773043ac62fe2d64c6bf25b74efc946d0b1f639219c928343ef7
+MISC metadata.xml 701 BLAKE2B 436bc9f2720fad7cc3a7bcf9597a820317617ad7522e72c05417d6b9e1cb9c37d171ce5e24741b5730ab6708a0bcafacc8f41df3d4108926868887dc6ee25df3 SHA512 457dec4f625c37429917085c187e7c21ad1155217f79980033a7c0ecf62da941d340433ccbcbd5ae36a028aed7ab0cd1204e74985e36844e31829dab288c4fa8
diff --git a/app-emacs/eglot/eglot-1.8.ebuild b/app-emacs/eglot/eglot-1.8.ebuild
new file mode 100644
index 000000000000..913bb955411f
--- /dev/null
+++ b/app-emacs/eglot/eglot-1.8.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS="26.1"
+
+inherit elisp
+
+DESCRIPTION="A minimal Emacs LSP client"
+HOMEPAGE="https://github.com/joaotavora/eglot"
+SRC_URI="https://github.com/joaotavora/eglot/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+# test requires internet connection to install several language servers, one of which
+# is not packaged
+RESTRICT="test"
+
+SITEFILE="50${PN}-gentoo.el"
+ELISP_REMOVE="eglot-tests.el"
+DOCS=( README.md NEWS.md )
+
+src_install() {
+	elisp-make-autoload-file "${S}"/${PN}-autoload.el "${S}"/
+	elisp_src_install
+}
diff --git a/app-emacs/eglot/metadata.xml b/app-emacs/eglot/metadata.xml
index 4d327b888ffc..d9638f7e735e 100644
--- a/app-emacs/eglot/metadata.xml
+++ b/app-emacs/eglot/metadata.xml
@@ -9,6 +9,10 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">joaotavora/eglot</remote-id>
     <doc>https://github.com/joaotavora/eglot/blob/master/README.md</doc>
diff --git a/app-emacs/elpy/Manifest b/app-emacs/elpy/Manifest
new file mode 100644
index 000000000000..961be1dff404
--- /dev/null
+++ b/app-emacs/elpy/Manifest
@@ -0,0 +1,6 @@
+AUX 50elpy-gentoo.el 220 BLAKE2B e2a2f6e0db08776665bd7e71ceebac1abee5a2d8e399fa3febd62e727c1d70a340d5c4f7db510ac19b92ad56f53467bb6b04a9d33761047b1041d46eb51b64fe SHA512 fbf574fb7746795ffbef5c04ea1391af117bb21ee6143de11670e22f715c007a0db5ad12b59f67e91aa4d51a1eff24ec1b5d595f90cfceee52ad50ca14ed76e7
+AUX elpy-elpy-rpc.el-elpy-rpc-pythonpath.patch 453 BLAKE2B 80a2421d3c25209ed4c6cd2d87021ef994ff1745e9b5a447ea86b7d8c8e22b7511e7f11462a424c0d7fb5ad9c8d60b9f6f34f9cd6e9fc18e17a5af59c707bb86 SHA512 4a354bfc4e16188b91ecb4a33ad9cf7802693b641a3f5753632cee23f8a4beeb716654b872aba6db00d11c45b1ed2e0ef8247649e8fc115f3b0d5cf971205269
+AUX elpy-elpy.el-yas-snippet-dirs.patch 495 BLAKE2B 62aa75ae47c98a20501210d5b53a468298ba7fe7b15cf05785565fa0d706a0bbcdeaf90c49d03a35138fa7752a7d476b323affb864dcf47f63c3299e3148523c SHA512 bda0ded2f6097f5f058c34eb2c0c978318118e9c22260a7efc54c1d92d2cfa10aeaa497a77f2be040c41f47a69e41755ae076a4ba5c1c26544ab86759791d9ae
+DIST elpy-1.35.0_p20220321.tar.gz 177145 BLAKE2B 6362a68efc5997c3d0e26e22c6fe563e1fdba5e6f3a9e1e3c1b53bef8320cc4ac0f929edd177b492a5f2e622c265aeb23d34df8db8ae67bd9a2e48e00adc7c25 SHA512 e8cf579effa0a0bc8f3c05001341b96fd134f8f08c16d95d83200ad94a942e3f60ef4ee4186758a2810de2ca58ee41e7119bc84a7535f28665ec7dad29b07db0
+EBUILD elpy-1.35.0_p20220321.ebuild 1728 BLAKE2B 9c451b481fd4619e2bc7f5d2413a0fdd370b5877054092a10447c3750fad90c4b1a0d4d93dd1bd0196e9015a4fc95f83754f1cc613d22bda636e4acda4793fd5 SHA512 d96530b7f6a31434c9fc3c468c54cf7ec1f201d847c1e1d1530b5a824ee9ab55cb0f26fade671026ea82987733cdfb4ec0e29d2811143105b8dc4ec53d17b169
+MISC metadata.xml 427 BLAKE2B 8711ffb7b4aadb742844dd478544e141159550c8ac041dea7702be583d8ab2ac48793762d70c6a7da0523052585bad40a31438d48d84dc735f827b36b3b42c60 SHA512 8fd5918a278dde43c85186cc67f6634d71cfe7e92d91c2a5adc3dfa86fd77d0d483f72e4c95dacea819da4c946beda835f828bb5e9067a79e7cc6434812d6293
diff --git a/app-emacs/elpy/elpy-1.35.0_p20220321.ebuild b/app-emacs/elpy/elpy-1.35.0_p20220321.ebuild
new file mode 100644
index 000000000000..7e7e2ca9a293
--- /dev/null
+++ b/app-emacs/elpy/elpy-1.35.0_p20220321.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=1746e7009000b7635c0ea6f1559018143aa61642
+
+DISTUTILS_SINGLE_IMPL=ON
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+NEED_EMACS=24.4
+
+inherit distutils-r1 elisp
+
+DESCRIPTION="Emacs Python Development Environment"
+HOMEPAGE="https://github.com/jorgenschaefer/elpy/"
+SRC_URI="https://github.com/jorgenschaefer/${PN}/archive/${H}.tar.gz
+			-> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${H}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-emacs/company-mode
+	app-emacs/highlight-indentation
+	app-emacs/pyvenv
+	app-emacs/s
+	app-emacs/yasnippet
+	$(python_gen_cond_dep 'dev-python/flake8[${PYTHON_USEDEP}]')
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/autopep8[${PYTHON_USEDEP}]
+			dev-python/jedi[${PYTHON_USEDEP}]
+			dev-python/yapf[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+DOCS=( CONTRIBUTING.rst README.rst )
+PATCHES=(
+	"${FILESDIR}"/${PN}-elpy.el-yas-snippet-dirs.patch
+	"${FILESDIR}"/${PN}-elpy-rpc.el-elpy-rpc-pythonpath.patch
+)
+SITEFILE="50${PN}-gentoo.el"
+
+distutils_enable_sphinx docs --no-autodoc
+distutils_enable_tests unittest
+
+pkg_setup() {
+	elisp_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	distutils-r1_src_prepare
+	rm elpy/tests/test_black.py || die
+
+	sed -i "s|@SITEETC@|${EPREFIX}${SITEETC}/${PN}|" ${PN}.el || die
+	sed -i "s|@PYTHONLIB@|${EPREFIX}/usr/lib/${EPYTHON}|" ${PN}-rpc.el || die
+}
+
+src_compile() {
+	distutils-r1_src_compile
+	elisp_src_compile
+}
+
+src_test() {
+	distutils-r1_src_test
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	elisp_src_install
+	insinto ${SITEETC}/${PN}
+	doins -r snippets
+}
diff --git a/app-emacs/elpy/files/50elpy-gentoo.el b/app-emacs/elpy/files/50elpy-gentoo.el
new file mode 100644
index 000000000000..2e45a60a76a8
--- /dev/null
+++ b/app-emacs/elpy/files/50elpy-gentoo.el
@@ -0,0 +1,5 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'elpy-enable "elpy"
+  "Enable Elpy in all future Python buffers." t)
+(autoload 'elpy-mode "elpy"
+  "Minor mode in Python buffers for the Emacs Lisp Python Environment." t)
diff --git a/app-emacs/elpy/files/elpy-elpy-rpc.el-elpy-rpc-pythonpath.patch b/app-emacs/elpy/files/elpy-elpy-rpc.el-elpy-rpc-pythonpath.patch
new file mode 100644
index 000000000000..f64dfd3f563e
--- /dev/null
+++ b/app-emacs/elpy/files/elpy-elpy-rpc.el-elpy-rpc-pythonpath.patch
@@ -0,0 +1,12 @@
+index b228597..aa5fd12 100644
+--- a/elpy-rpc.el
++++ b/elpy-rpc.el
+@@ -100,7 +100,7 @@ for example), set this to the full interpreter path."
+            (elpy-rpc-restart)))
+   :group 'elpy)
+ 
+-(defcustom elpy-rpc-pythonpath (file-name-directory load-file-name)
++(defcustom elpy-rpc-pythonpath "@PYTHONLIB@/site-packages/"
+   "A directory to add to the PYTHONPATH for the RPC process.
+ 
+ This should be a directory where the elpy module can be found. If
diff --git a/app-emacs/elpy/files/elpy-elpy.el-yas-snippet-dirs.patch b/app-emacs/elpy/files/elpy-elpy.el-yas-snippet-dirs.patch
new file mode 100644
index 000000000000..d38b320488cd
--- /dev/null
+++ b/app-emacs/elpy/files/elpy-elpy.el-yas-snippet-dirs.patch
@@ -0,0 +1,14 @@
+diff --git a/elpy.el b/elpy.el
+index f2a24a1..7a9b464 100644
+--- a/elpy.el
++++ b/elpy.el
+@@ -2022,8 +3777,7 @@ If a region is selected, fold that region."
+      (unless (listp yas-snippet-dirs)
+        (setq yas-snippet-dirs (list yas-snippet-dirs)))
+      (add-to-list 'yas-snippet-dirs
+-                  (concat (file-name-directory (locate-library "elpy"))
+-                          "snippets/")
++                  "@SITEETC@/snippets"
+                   t)
+ 
+      ;; Now load yasnippets.
diff --git a/app-emacs/elpy/metadata.xml b/app-emacs/elpy/metadata.xml
new file mode 100644
index 000000000000..231ce3b419da
--- /dev/null
+++ b/app-emacs/elpy/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/jorgenschaefer/elpy/issues/</bugs-to>
+    <remote-id type="github">jorgenschaefer/elpy</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/emojify/Manifest b/app-emacs/emojify/Manifest
new file mode 100644
index 000000000000..c17e9ff7ed39
--- /dev/null
+++ b/app-emacs/emojify/Manifest
@@ -0,0 +1,5 @@
+AUX 50emojify-gentoo.el 176 BLAKE2B 6197ebe5ec99f5ec86d9d9c0b14a8d08695e45ee47ed762bee10a5f31690be5f92a0279a1e1867678b59a25faed0ec589a75d48a3dd783fb558dcf5b42e6e9bf SHA512 4215127c648ad36eae6e8903cc86943e03809c88b97093a8051ca99b2ff9d4c922cea2bd11efe2fad5dcdb6ed325e1cb4ea6819ae15a7553d01910dba791d88c
+AUX emojify-json-data.patch 1184 BLAKE2B ce22ba183077ff5f9e160b477ca2b71f5d19e7bab0e82dd4b3e8791c372b0d762adcb21ea491b265a99cc6f878296c78a0ecf1068be595b63573d08b0e4a8eab SHA512 e75080643ea7058e3630468c1bc2006cef4a339f20dd68dad5a436728731c13d0b246f6442db5ed84b404e1ea2c1bc675deee510d4dd1812e0e2967a73e71b78
+DIST emojify-1.2.tar.gz 1196775 BLAKE2B 5802e391771f93b5181584287a73d6e02b42796a065ab91c0f085debcabb8a7da3bc575e7913b754b1754d0ee5d296fd31196009bdb937babcccc29ae97cdb18 SHA512 a02249d8474f02af1f43058061fa4cfcbccdaa71e632934c6466277eef44f306ea44e0c91dcb83218d6f1f01f3e7379b6d4d82b086113b1a9a41ee5ea3971e39
+EBUILD emojify-1.2.ebuild 899 BLAKE2B 4655b0b733773f3624f1d207269f296ca32148430bc776caee6c8002b431493fdc6428c6f5635e01052cfaf5d66fae800daab64e5605082f3efc74364c9cdc2f SHA512 06ffdf6ba613cf455d3396956054273f07c131af5ee56c37599ad8a03c2a6d7052808c17432004acd2b11d188ac0154fd8dbc61e5676b46324b80ef8aae799f3
+MISC metadata.xml 439 BLAKE2B ba89fe91967745e01dc07b5070618fcb33d6ba19f12b41bab0a3a30051c2f5d191ab7bcc9524e439cc939e0e87d24544889227201c91bf0602188721c634af99 SHA512 7c2a496354e1113d0a16d9acf9fa6472ddcaf7c2163d9520c01e9bb103dde350baaf6c4859ede3e2ed3bf3c5c50b094a905c3b1cc377221463d04dc741d9f581
diff --git a/app-emacs/emojify/emojify-1.2.ebuild b/app-emacs/emojify/emojify-1.2.ebuild
new file mode 100644
index 000000000000..b00b264af3f2
--- /dev/null
+++ b/app-emacs/emojify/emojify-1.2.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="Display emojis in Emacs, like :smile: or plain ASCII ones like :)"
+HOMEPAGE="https://github.com/iqbalansari/emacs-emojify/"
+SRC_URI="https://github.com/iqbalansari/emacs-${PN}/archive/v${PV}.tar.gz
+			-> ${P}.tar.gz"
+S="${WORKDIR}"/emacs-${P}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="test"  # requires some (5) unpackaged Emacs testing tools
+
+RDEPEND="app-emacs/ht"
+BDEPEND="${RDEPEND}"
+
+DOCS=( CHANGELOG.org README.org screenshots )
+PATCHES=( "${FILESDIR}"/${PN}-json-data.patch )
+ELISP_REMOVE=".dir-locals.el"
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	elisp_src_prepare
+
+	sed -i "s|@SITEETC@|${EPREFIX}${SITEETC}/${PN}|g" ${PN}.el || die
+}
+
+src_install() {
+	elisp_src_install
+
+	insinto ${SITEETC}/${PN}
+	doins -r data
+}
diff --git a/app-emacs/emojify/files/50emojify-gentoo.el b/app-emacs/emojify/files/50emojify-gentoo.el
new file mode 100644
index 000000000000..e76565b0655a
--- /dev/null
+++ b/app-emacs/emojify/files/50emojify-gentoo.el
@@ -0,0 +1,5 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'emojify-mode "emojify"
+  "Emojify mode" t)
+(autoload 'global-emojify-mode "emojify"
+  "Toggle Emojify mode in all buffers." t)
diff --git a/app-emacs/emojify/files/emojify-json-data.patch b/app-emacs/emojify/files/emojify-json-data.patch
new file mode 100644
index 000000000000..50f53f243c88
--- /dev/null
+++ b/app-emacs/emojify/files/emojify-json-data.patch
@@ -0,0 +1,25 @@
+index 033c2f5..ca83044 100644
+--- a/emojify.el
++++ b/emojify.el
+@@ -290,9 +290,7 @@ current window too."
+ 
+ (defcustom emojify-emoji-json
+   (expand-file-name "data/emoji.json"
+-                    (cond (load-file-name (file-name-directory load-file-name))
+-                          ((locate-library "emojify") (file-name-directory (locate-library "emojify")))
+-                          (t default-directory)))
++                    "@SITEETC@")
+   "The path to JSON file containing the configuration for displaying emojis."
+   :type 'file
+   :group 'emojify)
+@@ -301,9 +299,7 @@ current window too."
+   (let ((json-array-type 'list)
+         (json-object-type 'hash-table))
+     (json-read-file (expand-file-name "data/emoji-sets.json"
+-                                      (cond (load-file-name (file-name-directory load-file-name))
+-                                            ((locate-library "emojify") (file-name-directory (locate-library "emojify")))
+-                                            (t default-directory))))))
++                                      "@SITEETC@"))))
+ 
+ (defcustom emojify-emoji-set "emojione-v2.2.6-22"
+   "The emoji set used to display emojis."
diff --git a/app-emacs/emojify/metadata.xml b/app-emacs/emojify/metadata.xml
new file mode 100644
index 000000000000..92ccec1e632d
--- /dev/null
+++ b/app-emacs/emojify/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/iqbalansari/emacs-emojify/issues/</bugs-to>
+    <remote-id type="github">iqbalansari/emacs-emojify</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/epl/Manifest b/app-emacs/epl/Manifest
index 51af607055a8..b658b7d32e42 100644
--- a/app-emacs/epl/Manifest
+++ b/app-emacs/epl/Manifest
@@ -1,4 +1,4 @@
 AUX 50epl-gentoo.el 70 BLAKE2B 43d1e89c72988397c7ef15e37b0be47e9c09a9db248980f8d084ae4a8eecf225e86f9b2d0ad9d8b4b8d876f16913f93555d14a63e740d3835e2ce7a21367534c SHA512 1e12936fb71296f6410a3d9c515043bcb37adf1109abcae7879f75a9feac1e6facec190986f2c2a847155714f5448a4a1e9d2045848cb74dbb5f26be3b352998
 DIST epl-0.9.tar.gz 23448 BLAKE2B e403066139223445affcea2dd6a5bb0d4a5a4523235b787d45605c692301625ed784f0f3c338f0154c2f2188a29a565ba287e0958f8f95297556aaeb1e25c0eb SHA512 64d55790e7d34c575cc19786830b5cb795a162fc04356caf4122ce0796d57d94a50e90a4288218a697394ec3bd36c5ab5ddb98d1618411f9fe5eeada44bfd70f
 EBUILD epl-0.9.ebuild 486 BLAKE2B 47eb93513a852173c426a560ef6689400e7af21c625510773183e959c02753096daf6720ab9589d6e3fad51b34c1867bd5bca2ffa050b0dbb56509399e66f3cd SHA512 0ad25fb0333335872441b99d172ce2b5c9efc6db4a19db483a638badb7ecd7ec9341f3692b77b3669afacb2ce0e48a381d62d29a83fda3290f4aa62b07dc67fb
-MISC metadata.xml 729 BLAKE2B 016c1bb8ccb4e08f9a9f9bdaa19373f15080ae793c596baad084ab532e95e2b52e556b194fd529585c66dfbff473db74f8ab95f608b282ecbcee8aa4a910ceac SHA512 6f650363ef3ff033d2de58e6d293b684a8463978b02b6dceddc3c507ae4297d1f57ae1746075dd21e62be92ca1f49fcb43470681e8559005eb860c4319553f2a
+MISC metadata.xml 857 BLAKE2B 4e88bbce5ec198fcdf4a82af30e464343e77594e5982d6e1e66ce338757382c670e9d9dd76d446c8ab74745d232edd6eee52b2041fde3b46a512106544911d04 SHA512 f0c361fde0f64ac34d653a30eedbb10b95bfc0d6fb18540c19a96793d406dd34f196967bb55794a1a9c460245a7bf9045dcc9605ed00a96e8f128b890d792d41
diff --git a/app-emacs/epl/metadata.xml b/app-emacs/epl/metadata.xml
index 4acb98f80f22..cd06d04e64a7 100644
--- a/app-emacs/epl/metadata.xml
+++ b/app-emacs/epl/metadata.xml
@@ -9,6 +9,10 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">cask/epl</remote-id>
     <doc>https://github.com/cask/epl/blob/master/README.md</doc>
diff --git a/app-emacs/ess/Manifest b/app-emacs/ess/Manifest
index 4712d28f1400..1ef0f53d45f5 100644
--- a/app-emacs/ess/Manifest
+++ b/app-emacs/ess/Manifest
@@ -1,6 +1,5 @@
 AUX 50ess-gentoo.el 58 BLAKE2B a643ea2780e8bb7c211ad438b41d709d39e3484a99ab1d603c86843aad92a66b8bbfc1bbe9a81c25fcc19cb68fa9de7d657bb99889704cc9593e61bff43e227c SHA512 e9023d176d39d3d3c35e004747007892e6f2e2b101b3c8e64fadc37d1fac8d264a786b7bad26c744730fec03580d7fb1170c8d2789e76e12b4eb47481b7f2808
-DIST ess-17.11.tgz 3275703 BLAKE2B 50ec08040135fb05be35494829b347f1ce1c8fdb8bbc5c11f9327800cbfafbb4e7dd5dc46c2b6ce8d506e4e9ade90e369d14c0498e06f990eccbbacbb7d16cec SHA512 b2bb09d079922ed8bded04387e6aecd38d760d7a3b9a521044fb7e2537fdc0cbb59c707e5aa550fc76aa92a6c47eab0fa40f554060707cfc7656b19adbdea222
+AUX ess-18.10.2-emacs-28.patch 702 BLAKE2B e7122c2ffcbce5606432e86109317fa846e9ede24ba67641ec222adef56ad3c6afb0a412c5425bbe49ff22c736c7fac41205401c9588a7ec33b0e420b2389976 SHA512 62a2211e4b1dd0a36bc651f240738b6327f1c5e682d7af7250099b29c848704e125484390eb6a83f8098eccf3e71fa38c1f89c3786268fb98fa615dbf83d4b1d
 DIST ess-18.10.2.tgz 2939425 BLAKE2B f9a6181dfaffc820a55214418d14aef1443945d6b15cb156ecfb70a8f5878df545662f37114a44ea8aa20338a5eaea6a6ce0884b02f108bd3372653db13e1eff SHA512 9bc04c5ec87ed639e56de9fd7817c3adb1a823f091254a91b906e22e8537fb097b21b80020bf245acbd61420d09949d66fc079f3c552d79bf32b95dc7fa1dca9
-EBUILD ess-17.11.ebuild 1114 BLAKE2B 123e1c165ad4663887260bf2dfd04dcd9c69d2092c6d0d15ee4c353c72a8639b46e2421971569074959506f2d5d1ac4b5da5c00104ff3db020aed7356a51f8e7 SHA512 78583fdd03cfb1c514050c56ff78eb8ead6575618eac76389d81051d0e41de08d2dd4828dca383adf53300644baf587513fd3706c90ed82167f4fdccfdfe7681
-EBUILD ess-18.10.2-r1.ebuild 1137 BLAKE2B caff2f46c3154a7ead6fa8826226126bd26fd4daf62a8f0d6f8a0ef91ca47ff3a835fb7b731821cef69698c75603d72a4c0e147d88f8f85a68094ea9142ef2b9 SHA512 d1f3e95fbd29f8691b45d35219626db1f14a17fec7fb92845ff8836ea64713baf238dfdfbdcf5167a4c846b045644115076b7cbc151988be1ec3cbd520662f99
+EBUILD ess-18.10.2-r1.ebuild 1185 BLAKE2B 7d952863b6f7a951aa360114ad05d95a2b7a4c48a24fd7fa253d7e86fb9eb50cbaebd026b341ceb14241148bc21b0beb2335214baccd01d2d1064c7e3c973459 SHA512 59ad7abea15b7c326e5c8f79844d3210fe1ce0913f2345042e9dfd554c7001b9e70f3d6522ad74604012d659e6fbf1315d951c6a3664bd902082d94175cec8b5
 MISC metadata.xml 283 BLAKE2B 81c49021199f71096079a27f9121390fb8c1285c54b9478583ff2d647277fa106ef12456d7097c4be092fc48b514a1adcf855ca0fac911598232ef9eb7f102c0 SHA512 f32b303760addf5d4db8d18bd10fb677353cdfa4c5e545d47804ef756cf5e5a21f8b8efb631b08f802185913ceb98da820e404e06eb03d01fe9ea85c10d1ac13
diff --git a/app-emacs/ess/ess-17.11.ebuild b/app-emacs/ess/ess-17.11.ebuild
deleted file mode 100644
index 668acfe92701..000000000000
--- a/app-emacs/ess/ess-17.11.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit elisp readme.gentoo-r1
-
-DESCRIPTION="Emacs Speaks Statistics"
-HOMEPAGE="http://ess.r-project.org/"
-SRC_URI="http://ess.r-project.org/downloads/ess/${P}.tgz"
-
-LICENSE="GPL-2+ GPL-3+ Texinfo-manual"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
-RESTRICT="test"
-
-BDEPEND="app-text/texi2html
-	virtual/latex-base"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	default
-}
-
-src_install() {
-	emake PREFIX="${ED}/usr" \
-		INFODIR="${ED}/usr/share/info" \
-		LISPDIR="${ED}${SITELISP}/ess" \
-		DOCDIR="${ED}/usr/share/doc/${PF}" \
-		install
-
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-
-	# Most documentation is installed by the package's build system.
-	rm -f "${ED}${SITELISP}/${PN}/ChangeLog"
-	dodoc ChangeLog *NEWS doc/{TODO,ess-intro.pdf}
-	newdoc doc/ChangeLog ChangeLog-doc
-	newdoc lisp/ChangeLog ChangeLog-lisp
-
-	DOC_CONTENTS="Please see /usr/share/doc/${PF} for the complete
-		documentation. Usage hints are in ${SITELISP}/${PN}/ess-site.el ."
-	readme.gentoo_create_doc
-}
diff --git a/app-emacs/ess/ess-18.10.2-r1.ebuild b/app-emacs/ess/ess-18.10.2-r1.ebuild
index 893fb96a64ef..9b0ee42f87c9 100644
--- a/app-emacs/ess/ess-18.10.2-r1.ebuild
+++ b/app-emacs/ess/ess-18.10.2-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
@@ -6,8 +6,8 @@ EAPI=7
 inherit elisp readme.gentoo-r1
 
 DESCRIPTION="Emacs Speaks Statistics"
-HOMEPAGE="http://ess.r-project.org/"
-SRC_URI="http://ess.r-project.org/downloads/ess/${P}.tgz"
+HOMEPAGE="https://ess.r-project.org/"
+SRC_URI="https://ess.r-project.org/downloads/ess/${P}.tgz"
 
 LICENSE="GPL-2+ GPL-3+ Texinfo-manual"
 SLOT="0"
@@ -17,6 +17,7 @@ RESTRICT="test"
 BDEPEND="app-text/texi2html
 	virtual/latex-base"
 
+PATCHES=( "${FILESDIR}"/${P}-emacs-28.patch )
 SITEFILE="50${PN}-gentoo.el"
 
 src_compile() {
diff --git a/app-emacs/ess/files/ess-18.10.2-emacs-28.patch b/app-emacs/ess/files/ess-18.10.2-emacs-28.patch
new file mode 100644
index 000000000000..c8f9b922eddc
--- /dev/null
+++ b/app-emacs/ess/files/ess-18.10.2-emacs-28.patch
@@ -0,0 +1,11 @@
+--- ess-18.10.2/lisp/ess-r-package.el
++++ ess-18.10.2/lisp/ess-r-package.el
+@@ -557,7 +557,7 @@
+   (error "As of ESS 16.04, `ess-developer' is deprecated. Use `ess-r-set-evaluation-env' instead"))
+ 
+ (defalias 'ess-toggle-developer 'ess-developer)
+-(define-obsolete-function-alias 'ess-r-devtools-check-package-buildwin 'ess-r-devtools-check-with-winbuilder)
++(define-obsolete-function-alias 'ess-r-devtools-check-package-buildwin 'ess-r-devtools-check-with-winbuilder "")
+ (define-obsolete-function-alias 'ess-r-devtools-ask 'ess-r-devtools-execute-command "18.04")
+ 
+ (make-obsolete-variable 'ess-developer "Please use `ess-developer-select-package' and `ess-r-set-evaluation-env' instead." "16.04")
diff --git a/app-emacs/flycheck-guile/Manifest b/app-emacs/flycheck-guile/Manifest
new file mode 100644
index 000000000000..c85c66295aee
--- /dev/null
+++ b/app-emacs/flycheck-guile/Manifest
@@ -0,0 +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
+MISC metadata.xml 563 BLAKE2B 30d09ba125549e1a8dc7b873aba8bcbf21dee273f1c31c7a40ec2409cc81f0566f365ac1ef4eb8c6f5b565a4006a5233349b402197fae147a0096a06e0c4778f SHA512 5df30cd0d0b49a9c718d8eeaca573aa85e916f53c81d90cb1794329376f2a737d165983e053676669af3743a4c9c1bbf80a5f15915d7652151b22de4eb0d742a
diff --git a/app-emacs/flycheck-guile/files/50flycheck-guile-gentoo.el b/app-emacs/flycheck-guile/files/50flycheck-guile-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/flycheck-guile/files/50flycheck-guile-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/flycheck-guile/flycheck-guile-0.2.ebuild b/app-emacs/flycheck-guile/flycheck-guile-0.2.ebuild
new file mode 100644
index 000000000000..f20480a76901
--- /dev/null
+++ b/app-emacs/flycheck-guile/flycheck-guile-0.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24.1
+
+inherit elisp
+
+DESCRIPTION="Flycheck checker for the GNU Guile Scheme implementation"
+HOMEPAGE="https://github.com/flatwhatson/flycheck-guile/"
+SRC_URI="https://github.com/flatwhatson/${PN}/archive/${PV}.tar.gz
+			-> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-scheme/guile-2.0.0
+	app-emacs/flycheck
+	app-emacs/geiser-guile
+"
+BDEPEND="${RDEPEND}"
+
+DOCS=( README.md )
+ELISP_REMOVE=".dir-locals.el"
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/flycheck-guile/metadata.xml b/app-emacs/flycheck-guile/metadata.xml
new file mode 100644
index 000000000000..26be2e4194b2
--- /dev/null
+++ b/app-emacs/flycheck-guile/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>scheme@gentoo.org</email>
+    <name>Gentoo Scheme Project</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://gitlab.com/flatwhatson/flycheck-guile/issues/</bugs-to>
+    <remote-id type="gitlab">flatwhatson/flycheck-guile</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/flycheck/Manifest b/app-emacs/flycheck/Manifest
index 412fe039d8a1..edcfdaa1cdbc 100644
--- a/app-emacs/flycheck/Manifest
+++ b/app-emacs/flycheck/Manifest
@@ -1,4 +1,7 @@
+AUX 50flycheck-gentoo-r1.el 77 BLAKE2B db43c9dc9e2527a60f0f47441f98271dd427b83ad65d27805eabff5f3a4c0bff0275cd740a01a3b0f457497d2cdf6b7edc41f2ac2d66e2b28cf0b61528b220d1 SHA512 5df5cd028f22f616459d86bfac2dde03221da27a98c9e721879df1f2bbae1df06fdba7aa4f4a8c26e97f59d717f883b595b808d49b4ed800ca92e8476cf3bac5
 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
-MISC metadata.xml 781 BLAKE2B 34786e0414f89a30ee69426228f2b4cb79eddc511d0574f8d67502a28a52a662bd1af54166266306d5af6c22d82c155ae8d6bdba1994967384f296a9d290ea61 SHA512 a4aba903b34c0d385a4f595b9201a5ccfd4d65a0173982ce840d7229d915c522de1c28987f8c8557b7bde26531f73605d5c82102fd7086280c411d3bf6cea8ba
+EBUILD flycheck-32_p20220328.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
new file mode 100644
index 000000000000..46ab676a9a2a
--- /dev/null
+++ b/app-emacs/flycheck/files/50flycheck-gentoo-r1.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(load "@SITELISP@/flycheck-autoloads")
diff --git a/app-emacs/flycheck/flycheck-32_p20220328.ebuild b/app-emacs/flycheck/flycheck-32_p20220328.ebuild
new file mode 100644
index 000000000000..0d92a6a59ff8
--- /dev/null
+++ b/app-emacs/flycheck/flycheck-32_p20220328.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS="24.3"
+
+inherit elisp
+
+DESCRIPTION="Modern on-the-fly syntax checking extension for GNU Emacs"
+HOMEPAGE="https://www.flycheck.org/"
+COMMIT="3b5b4248074f016922c2674789d4a242528cf4c7"
+SRC_URI="https://github.com/flycheck/flycheck/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="test" # test requires cask and ert-runner which are not packaged yet
+
+RDEPEND=">=app-emacs/dash-2.12.1
+	>=app-emacs/pkg-info-0.4"
+
+SITEFILE="50${PN}-gentoo-r1.el"
+DOCS=( README.md )
+ELISP_REMOVE="flycheck-buttercup.el flycheck-ert.el"
+
+src_compile() {
+	elisp_src_compile
+	elisp-make-autoload-file
+}
diff --git a/app-emacs/flycheck/metadata.xml b/app-emacs/flycheck/metadata.xml
index e96ebcfc18fc..a29ea6e22d25 100644
--- a/app-emacs/flycheck/metadata.xml
+++ b/app-emacs/flycheck/metadata.xml
@@ -9,6 +9,10 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">flycheck/flycheck</remote-id>
     <doc>https://github.com/flycheck/flycheck/blob/master/README.md</doc>
diff --git a/app-emacs/geiser-chez/Manifest b/app-emacs/geiser-chez/Manifest
new file mode 100644
index 000000000000..8826caec9944
--- /dev/null
+++ b/app-emacs/geiser-chez/Manifest
@@ -0,0 +1,6 @@
+AUX 50geiser-chez-gentoo.el 206 BLAKE2B 28c176df2f9e9892252d8d25ab9450eff152e2c5f7a625e109fb2ea5ec32ea5ec90dee1b55954a33bd8a963bc8b5aee3d7be83c90b06b5da67d65dec1a0362e8 SHA512 c6b926fcac1e41c41130abdd7ecba0b86431cb952af2c70ca912aaf9f2cf138d1ba8d3f98714ff13aeac66ea3883907fb46c7d192aebbfbab082c77912b86d9b
+AUX geiser-chez-chez-scheme-binary.patch 329 BLAKE2B b2684a2be111f7733d7b5f7a2da5cfbe74149b53f2b63ce5d82e2a9aeb7e2a9c4c6c3ce54a94e816810b6f23de18494ddcaaa44fa0c10c6785ce45cf7bcc44f7 SHA512 abffb86e7c82baab7e21066b1f0b3b55915cfa8d258eec2d481bb4f85b711894aa530c8ee1e837042226c43fab323a078d8569a550247b1781328d4524734555
+AUX geiser-chez-chez-scheme-src-dir.patch 404 BLAKE2B f2d00fdc70856aa2f17e201a90f3657d6fac3aaabe3fba2157189105a9a4036ce26c784307323da83ee2b0ec8c02a52a3de9555794007d715dcf2579ee499547 SHA512 f4c868d3a1d646449f393cae4af694570234b13213bf2a2f32f98e5fe64b967439fa047b9440fd8c12911f63ca8f1bfaa81d1dd688c35ff6f844545d470acec7
+DIST geiser-chez-0.17.tar.gz 6664 BLAKE2B d4f72de512e9d443a1ea2dc0cf6cf03f59980097ff26dd51df7a618c651c5beef142c42b1dea9bb56f94fe4a97b370c6844231eea8968618f6d0dbff499c601d SHA512 bfb1e77a3a0be3750e0e30c421a2b34179edbdb3585fe318c3f6a5a14d7220b3933c63cb970e80af4e14f8d220b620915192d7a34759cc91dfed45878d63ed6e
+EBUILD geiser-chez-0.17.ebuild 841 BLAKE2B f085d2b95c0e73c3d9c06abbb6a002ae97a57f5a64846800804a67ed7f58aff74baf8d0221dd3818f5fd15bea95127a53ec1a1df3d21d786fd46f501914bd29a SHA512 33b1a86d86d3aa900d151bbe6aecc18d62924885fd7e49bcd9850d42e8862ec112c87bc9c78151e484302670cac712f19ae3ef8ea070d8cc6e1595f422cddbca
+MISC metadata.xml 547 BLAKE2B 86fa034eb7e4c6787f7d708a1fc28ad93252d35f75f34dbb2d3c56a74ddc6d8bc3d84c5bf10c86042ebf9bfb53a062237f7ae5ef8b59d3faac3e343ca1814648 SHA512 d16f5d1d6d4b89b9d88a578d2a60606d0d9209aff3e91f2c75757705b5a27dc66db5f352a174db0f0e404121af89e80e1e326403cfbf3ce135cf0c0af9a01e96
diff --git a/app-emacs/geiser-chez/files/50geiser-chez-gentoo.el b/app-emacs/geiser-chez/files/50geiser-chez-gentoo.el
new file mode 100644
index 000000000000..e839ddce889c
--- /dev/null
+++ b/app-emacs/geiser-chez/files/50geiser-chez-gentoo.el
@@ -0,0 +1,5 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'run-chez "geiser-chez"
+  "Start a Geiser Chez REPL." t)
+(autoload 'switch-to-chez "geiser-chez"
+  "Start a Geiser Chez REPL, or switch to a running one." t)
diff --git a/app-emacs/geiser-chez/files/geiser-chez-chez-scheme-binary.patch b/app-emacs/geiser-chez/files/geiser-chez-chez-scheme-binary.patch
new file mode 100644
index 000000000000..321dffa716f6
--- /dev/null
+++ b/app-emacs/geiser-chez/files/geiser-chez-chez-scheme-binary.patch
@@ -0,0 +1,12 @@
+index 7f29927..45c194e 100644
+--- a/geiser-chez.el
++++ b/geiser-chez.el
+@@ -40,7 +40,7 @@
+   :group 'geiser)
+ 
+ (geiser-custom--defcustom geiser-chez-binary
+-    "scheme"
++    "chezscheme"
+   "Name to use to call the Chez Scheme executable when starting a REPL."
+   :type '(choice string (repeat string))
+   :group 'geiser-chez)
diff --git a/app-emacs/geiser-chez/files/geiser-chez-chez-scheme-src-dir.patch b/app-emacs/geiser-chez/files/geiser-chez-chez-scheme-src-dir.patch
new file mode 100644
index 000000000000..547c8663012b
--- /dev/null
+++ b/app-emacs/geiser-chez/files/geiser-chez-chez-scheme-src-dir.patch
@@ -0,0 +1,12 @@
+index 7f29927..cc1f4ca 100644
+--- a/geiser-chez.el
++++ b/geiser-chez.el
+@@ -78,7 +78,7 @@ init file at this location in remote host."
+     geiser-chez-binary))
+ 
+ (defvar geiser-chez-scheme-dir
+-  (expand-file-name "src" (file-name-directory load-file-name))
++  (expand-file-name "src" "@SITEETC@")
+   "Directory where the Chez scheme geiser modules are installed.")
+ 
+ (defun geiser-chez--parameters ()
diff --git a/app-emacs/geiser-chez/geiser-chez-0.17.ebuild b/app-emacs/geiser-chez/geiser-chez-0.17.ebuild
new file mode 100644
index 000000000000..9aa98f60f933
--- /dev/null
+++ b/app-emacs/geiser-chez/geiser-chez-0.17.ebuild
@@ -0,0 +1,44 @@
+# 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="Chez Scheme's implementation of the Geiser protocols"
+HOMEPAGE="https://gitlab.com/emacs-geiser/chez/"
+SRC_URI="https://gitlab.com/emacs-geiser/chez/-/archive/${PV}/chez-${PV}.tar.gz
+			-> ${P}.tar.gz"
+S="${WORKDIR}"/chez-${PV}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="app-emacs/geiser"
+RDEPEND="
+	${BDEPEND}
+	dev-scheme/chez
+"
+
+DOCS=( readme.org )
+PATCHES=(
+	"${FILESDIR}"/${PN}-chez-scheme-binary.patch
+	"${FILESDIR}"/${PN}-chez-scheme-src-dir.patch
+)
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	elisp_src_prepare
+
+	sed "s|@SITEETC@|${EPREFIX}${SITEETC}/${PN}|" -i ${PN}.el || die
+}
+
+src_install() {
+	elisp_src_install
+
+	insinto ${SITEETC}/${PN}
+	doins -r src
+}
diff --git a/app-emacs/geiser-chez/metadata.xml b/app-emacs/geiser-chez/metadata.xml
new file mode 100644
index 000000000000..a2f55c9af35d
--- /dev/null
+++ b/app-emacs/geiser-chez/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>scheme@gentoo.org</email>
+    <name>Gentoo Scheme Project</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://gitlab.com/emacs-geiser/chez/-/issues/</bugs-to>
+    <remote-id type="gitlab">emacs-geiser/chez</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/geiser-guile/Manifest b/app-emacs/geiser-guile/Manifest
new file mode 100644
index 000000000000..d96338565541
--- /dev/null
+++ b/app-emacs/geiser-guile/Manifest
@@ -0,0 +1,5 @@
+AUX 50geiser-guile-gentoo.el 312 BLAKE2B d7fd0743d54c187697b0b09df60899a9919a49455028acd409f0eed8150a2def13c874da76745986b84e3c252a49e9bd452d09e7f9fed6a75e57477ab19d8132 SHA512 056c4a75d9ed893d03de8ccd4835b3870d8f09305367543a845c870917ba96dc48879be7c96965603665baeb9719bb6e4eaa99d41567f4d4f3e534ca47aba5ad
+AUX geiser-guile-guile-scheme-src-dir.patch 434 BLAKE2B 4d7681379cefcc0b5297ad0d37e5b79a4d30494dae362d834b7d3e25d0b102bddfd34ef18599fd024e9dda57203e58d154dbebec4e32ffe4af60e4a2e7f22004 SHA512 5d7002b86cbb6e566079182bebbaf84a584eeab10edc63269bfa7a0484602bbc1492e5f9edfc3fd37dc8909f5ebb5922ab2b26e288762204b82247a474be8c18
+DIST geiser-guile-0.23.2.tar.gz 15615 BLAKE2B e30f5eef1496f8016be35fa3eda2bf02fc651e5bdb9ac8cf8c90a130bd72dd13b67140f172aab24ed38858294ff83c366eaa4b3e354b0a1107c28a0258b2f787 SHA512 c696bc0e406869d9c68f3cda9bbc2f5f0690148264e221c6fc3217f867a5cae3fd6df59851fdbec8a6c9eb6aab7f9482c3231fe75a509d58d2d9d16c008774b8
+EBUILD geiser-guile-0.23.2.ebuild 821 BLAKE2B 5850687cb12419dc41f22534a40cded96fc0fb749d02b2bc295836c370eb3f558e5487de206ed4482dce71ba18321ccf254543aea82e177b3f401b6e41ea6cea SHA512 3e07169f42f9a2bf3a5ecca1fcba3457d5f2ffd8d284d9c2768e4a935dbddca7a291f2de41460fcef3ed3157072f7edecca08932e476b452c6456fa9db846a7f
+MISC metadata.xml 549 BLAKE2B 24ae701ff497b7fc2d335b939d79697bd2a33c0a3e198156a745528eeac3635d036689f60c5fbc10c46dd9219c58ca6a4bcb484a104fbb82fce5d02480002157 SHA512 20c1411f9d96be4c8e4acc324e5cb74ebc90976c497c30136056cfb829db4fd974269af00da44a6bd8c77a24aec25f747449b45e0e0fb8f03d358880b0295f0b
diff --git a/app-emacs/geiser-guile/files/50geiser-guile-gentoo.el b/app-emacs/geiser-guile/files/50geiser-guile-gentoo.el
new file mode 100644
index 000000000000..c9ac820301e1
--- /dev/null
+++ b/app-emacs/geiser-guile/files/50geiser-guile-gentoo.el
@@ -0,0 +1,7 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'connect-to-guile "geiser-guile"
+  "Start a Guile REPL connected to a remote process." t)
+(autoload 'run-guile "geiser-guile"
+  "Start a Geiser Guile REPL." t)
+(autoload 'switch-to-guile "geiser-guile"
+  "Start a Geiser Guile REPL, or switch to a running one." t)
diff --git a/app-emacs/geiser-guile/files/geiser-guile-guile-scheme-src-dir.patch b/app-emacs/geiser-guile/files/geiser-guile-guile-scheme-src-dir.patch
new file mode 100644
index 000000000000..e86ffaa5edb7
--- /dev/null
+++ b/app-emacs/geiser-guile/files/geiser-guile-guile-scheme-src-dir.patch
@@ -0,0 +1,12 @@
+index db42945..2a6537c 100644
+--- a/geiser-guile.el
++++ b/geiser-guile.el
+@@ -141,7 +141,7 @@ effect on new REPLs.  For existing ones, use the command
+     geiser-guile-binary))
+ 
+ (defvar geiser-guile-scheme-dir
+-  (expand-file-name "src" (file-name-directory load-file-name))
++  (expand-file-name "src" "@SITEETC@")
+   "Directory where the Guile scheme geiser modules are installed.")
+ 
+ (defvar-local geiser-guile-scheme-local-dir
diff --git a/app-emacs/geiser-guile/geiser-guile-0.23.2.ebuild b/app-emacs/geiser-guile/geiser-guile-0.23.2.ebuild
new file mode 100644
index 000000000000..fb3e084e139d
--- /dev/null
+++ b/app-emacs/geiser-guile/geiser-guile-0.23.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=25.1
+
+inherit elisp
+
+DESCRIPTION="Guile's implementation of the Geiser protocols"
+HOMEPAGE="https://gitlab.com/emacs-geiser/guile/"
+SRC_URI="https://gitlab.com/emacs-geiser/guile/-/archive/${PV}/guile-${PV}.tar.gz
+			-> ${P}.tar.gz"
+S="${WORKDIR}"/guile-${PV}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="app-emacs/geiser"
+RDEPEND="
+	${BDEPEND}
+	dev-scheme/guile
+"
+
+DOCS=( readme.org )
+PATCHES=( "${FILESDIR}"/${PN}-guile-scheme-src-dir.patch )
+ELISP_TEXINFO="${PN}.texi"
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	elisp_src_prepare
+
+	sed "s|@SITEETC@|${EPREFIX}${SITEETC}/${PN}|" -i ${PN}.el || die
+}
+
+src_install() {
+	elisp_src_install
+
+	insinto ${SITEETC}/${PN}
+	doins -r src
+}
diff --git a/app-emacs/geiser-guile/metadata.xml b/app-emacs/geiser-guile/metadata.xml
new file mode 100644
index 000000000000..7698a7c42f05
--- /dev/null
+++ b/app-emacs/geiser-guile/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>scheme@gentoo.org</email>
+    <name>Gentoo Scheme Project</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://gitlab.com/emacs-geiser/guile/-/issues/</bugs-to>
+    <remote-id type="gitlab">emacs-geiser/guile</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/geiser/Manifest b/app-emacs/geiser/Manifest
new file mode 100644
index 000000000000..16ac4921b568
--- /dev/null
+++ b/app-emacs/geiser/Manifest
@@ -0,0 +1,4 @@
+AUX 50geiser-gentoo.el 295 BLAKE2B 5dfbb043d11f242fae453719c85c7b5dd6abfa16e390de35c390d4dec9f80e512039e5d7dd6d79986df9e8d0822c12562d32001ad6bc6a33ab8c168299548044 SHA512 1a7ebc8f2b2e95ee5b1e7c81d498d6239fa88110165f54e6926bedcee4d1ba64c11e6946d8129d0a6958b0ecb280011af3c64c283279d183dc843b0328aa178c
+DIST geiser-0.23.2.tar.gz 653228 BLAKE2B ef0ce0a925a9d5df32a2b67b216dc46da535d68d70b706ffc9dd4d3bb01af879c9533337b2e8293c7bed8d3cdebeecd3f4443b3071f865cf1b7280347b202298 SHA512 dd6852d95296aaef44ad0e9a6723986372d58f9beab20bd45330aeffae590fbd5ea45822032fb9cc2712756e3b13ba5c829fbefeead4e5f41c94400bf059110e
+EBUILD geiser-0.23.2.ebuild 834 BLAKE2B b90c8a5c14b9f2dd9f8f69e1c5a93fd7b365c526df5c092b8a3569495326bb93fd4021520626a55b8b84d56f790c80287609f4a6c3ef17253e61dffc86b75095 SHA512 9e9d190d12434c0a657261b3de77d74796d183002243762c1b4ab98a94374bce1abaa12ea4c89f508041c49afbf89f090d53766edd4fbc7200c33d5e349f88dc
+MISC metadata.xml 551 BLAKE2B 2aedbc78837b20f258a94790c4a84f8bfab77f4d71e65354ea6439122c4d84378776c7f9c9a7649c0aadc68df9f33eeca482712961eb8b3af0dffde4d1769ded SHA512 aa663549e7f0710b8629889dd57bb99cc2ec2f2ea93c86d6b75dd85fe4a8467abb4688b38a38b8051655fc0705b8f1e0a7c71c6159abc7170e0bb1b9a0c7c112
diff --git a/app-emacs/geiser/files/50geiser-gentoo.el b/app-emacs/geiser/files/50geiser-gentoo.el
new file mode 100644
index 000000000000..b23f0decf094
--- /dev/null
+++ b/app-emacs/geiser/files/50geiser-gentoo.el
@@ -0,0 +1,7 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'geiser "geiser-repl"
+  "Start a Geiser REPL, or switch to a running one." t)
+(autoload 'geiser-mode "geiser-mode"
+  "Minor mode adding Geiser REPL interaction to Scheme buffers." t)
+(autoload 'run-geiser "geiser-repl"
+  "Start a Geiser REPL." t)
diff --git a/app-emacs/geiser/geiser-0.23.2.ebuild b/app-emacs/geiser/geiser-0.23.2.ebuild
new file mode 100644
index 000000000000..1fc8fadfed40
--- /dev/null
+++ b/app-emacs/geiser/geiser-0.23.2.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=25.1
+
+inherit elisp
+
+DESCRIPTION="Generic interaction mode between Emacs and different Scheme implementations"
+HOMEPAGE="https://gitlab.com/emacs-geiser/geiser/"
+SRC_URI="https://gitlab.com/emacs-geiser/${PN}/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-emacs/transient"
+BDEPEND="
+	${RDEPEND}
+	app-text/texi2html
+	sys-apps/texinfo
+"
+
+DOCS=( readme.org news.org doc/html )
+ELISP_REMOVE=".dir-locals.el"
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	BYTECOMPFLAGS="-L elisp" elisp-compile elisp/*.el
+
+	emake -C doc info web
+}
+
+src_install() {
+	elisp-install ${PN} elisp/*.el{,c}
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+	doinfo doc/*.info
+	einstalldocs
+}
diff --git a/app-emacs/geiser/metadata.xml b/app-emacs/geiser/metadata.xml
new file mode 100644
index 000000000000..c94387f2f223
--- /dev/null
+++ b/app-emacs/geiser/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>scheme@gentoo.org</email>
+    <name>Gentoo Scheme Project</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://gitlab.com/emacs-geiser/geiser/-/issues/</bugs-to>
+    <remote-id type="gitlab">emacs-geiser/geiser</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/highlight-indentation/Manifest b/app-emacs/highlight-indentation/Manifest
new file mode 100644
index 000000000000..46ac950da5d6
--- /dev/null
+++ b/app-emacs/highlight-indentation/Manifest
@@ -0,0 +1,4 @@
+AUX 50highlight-indentation-gentoo.el 322 BLAKE2B 6a9337d363a154b6302642df688b78531302225889916bddede7513a81a7add26eb4ce7739df61c8505853b0b34cdaccbf1311928e93e670d5b94f68ef947034 SHA512 17bb8ba69a747eca543a223e8bee71936b8c13e5c687e83aeacc08a8504d5eb35be6c653d66808d9ca08e8096b82172803b93e55d4eaddd4742c5e3154c8d4ef
+DIST highlight-indentation-0.7.0_p20210221.tar.gz 3848 BLAKE2B f337a9a326e3b246f31a5067a90c2f7227c2433524e82612e96d94c288d44bf353b20815d9b83647d73f37a6152ceda13d75a610b8c1fdfa89a33ec7f5d580e1 SHA512 44d2701d18d0df4a4beb29b6c710048496e7ce4cce3ab90ae06c17862ee86e5a67ef6eb6f66f7e4b8d3a6785560616827519ac9287ce4380ca59b3f4713c3164
+EBUILD highlight-indentation-0.7.0_p20210221.ebuild 556 BLAKE2B e832010ffc3cc9303e499b3e79ee2ccc8ad8a2b2a66c2efceb539d7f9ac8dee480fbdd74650c5ac89752a0e2bfdf3140ec8e3e3fee543484b86244c8073640ef SHA512 690a22d4cde155a9f7688418cae3719a2c2c0742416b40d95329ca1abdd89c9edba435d22c9099ea564a8380bff7dcebba8f79110784b6efcaa436784010ddf8
+MISC metadata.xml 465 BLAKE2B 43d3fb82f3fe6931e3e605be4ccc995e4a2e3f5e88c36930caad0028226788027fcd1b1c4c53c43a8bba13edb633b99c8f9bdd49124ce4c00de045c9922a74ae SHA512 23fb196d0b01513f9b82cb52e82a0d0a5fb3d936a742ae2563cc74e0c6d50dbcbc527c3839121db33209286a821a8729e291f88c6af69f3891e573720eaf9f47
diff --git a/app-emacs/highlight-indentation/files/50highlight-indentation-gentoo.el b/app-emacs/highlight-indentation/files/50highlight-indentation-gentoo.el
new file mode 100644
index 000000000000..a83ebf0e0a8e
--- /dev/null
+++ b/app-emacs/highlight-indentation/files/50highlight-indentation-gentoo.el
@@ -0,0 +1,5 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'highlight-indentation-mode "highlight-indentation"
+  "Highlight indentation minor mode highlights indentation based on spaces." t)
+(autoload 'highlight-indentation-current-column-mode "highlight-indentation"
+  "Highlight Indentation minor mode displays a vertical bar." t)
diff --git a/app-emacs/highlight-indentation/highlight-indentation-0.7.0_p20210221.ebuild b/app-emacs/highlight-indentation/highlight-indentation-0.7.0_p20210221.ebuild
new file mode 100644
index 000000000000..0efeec0e91c5
--- /dev/null
+++ b/app-emacs/highlight-indentation/highlight-indentation-0.7.0_p20210221.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=d88db4248882da2d4316e76ed673b4ac1fa99ce3
+MY_PN=Highlight-Indentation-for-Emacs
+
+inherit elisp
+
+DESCRIPTION="Minor modes to highlight indentation guides in Emacs"
+HOMEPAGE="https://github.com/antonj/Highlight-Indentation-for-Emacs/"
+SRC_URI="https://github.com/antonj/${MY_PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${MY_PN}-${H}
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.org )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/highlight-indentation/metadata.xml b/app-emacs/highlight-indentation/metadata.xml
new file mode 100644
index 000000000000..9d884da68760
--- /dev/null
+++ b/app-emacs/highlight-indentation/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/antonj/Highlight-Indentation-for-Emacs/issues/</bugs-to>
+    <remote-id type="github">antonj/Highlight-Indentation-for-Emacs</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/ivy-rich/Manifest b/app-emacs/ivy-rich/Manifest
new file mode 100644
index 000000000000..f835f1f17e41
--- /dev/null
+++ b/app-emacs/ivy-rich/Manifest
@@ -0,0 +1,4 @@
+AUX 50ivy-rich-gentoo.el 112 BLAKE2B 761def1e583ad0f01b45fde5e3613605c5b98f28a9d8cf7ca9b7f16098be9719bab4c0cee019101a79e8d52ce414bc2cb797eff973476989629599d1921f3751 SHA512 b650c61f12ab695932b3b7f83cf4acd610fbab3bef844067ba60e4befc9df7873f82952f9d6bb9a6d14408baf96383dd0a272916f76aa3a5310aa8bca9a943ba
+DIST ivy-rich-0.1.6_p20210409.tar.gz 606147 BLAKE2B a496ea10438dbe7c90b825b8c6874b277060d068ab8c8193a91f615c6e1719822032857b4b500346c8c40f9777bccd1554471f05cf37b7c3b1386b97d82b1b8e SHA512 cde5922829a1d53167bc2724ef10844c04c47380d380130efb04cc51efb99538e19acdea05bddbbf88e5cf9bf7da65710e85bd6287d4dbbe50d4009c8e696bd1
+EBUILD ivy-rich-0.1.6_p20210409.ebuild 560 BLAKE2B 472dbdfbc85745ae7714aaa8319865ca1f67c5ef0d881c8d80aa000cc82aa3fbaecd16034b8baa54380e4fb6ab94ef7195dfe4551e34b0bc96e47a8cfef09f62 SHA512 8457443008921295bfa8d05678f8ca29b6ded7393bbfa17230fa77d1592785a14f4f79dc0343bd0873851fe6e04c0c6848d80933ea62a0dc52af882c8fa64c70
+MISC metadata.xml 421 BLAKE2B a232ebb68c8383893b9267dc9868ed24c7a6c0fbf2c2a63a13476f9b4a599540df87f39f547b9c154058bef8d0a475306f4ed66c1cae85586fcb932b192ee98d SHA512 9f02a57261c63d7584502572ddadc2fcf6527da80952356d79bd4d3185000fabcfc47c0f34c060b50cb8537a382d523e2f5117bdd31ae19129ee38b149d497c9
diff --git a/app-emacs/ivy-rich/files/50ivy-rich-gentoo.el b/app-emacs/ivy-rich/files/50ivy-rich-gentoo.el
new file mode 100644
index 000000000000..ee705d5c9fc7
--- /dev/null
+++ b/app-emacs/ivy-rich/files/50ivy-rich-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'ivy-rich-mode "ivy-rich"
+  "Toggle ivy-rich mode globally." t)
diff --git a/app-emacs/ivy-rich/ivy-rich-0.1.6_p20210409.ebuild b/app-emacs/ivy-rich/ivy-rich-0.1.6_p20210409.ebuild
new file mode 100644
index 000000000000..776f722b53ff
--- /dev/null
+++ b/app-emacs/ivy-rich/ivy-rich-0.1.6_p20210409.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=600b8183ed0be8668dcc548cc2c8cb94b001363b
+NEED_EMACS=25.1
+
+inherit elisp
+
+DESCRIPTION="More friendly interface for ivy"
+HOMEPAGE="https://github.com/Yevgnen/ivy-rich/"
+SRC_URI="https://github.com/Yevgnen/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${H}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-emacs/ivy"
+BDEPEND="${RDEPEND}"
+
+DOCS=( README.org screenshots.org screenshots )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/ivy-rich/metadata.xml b/app-emacs/ivy-rich/metadata.xml
new file mode 100644
index 000000000000..517c4226ea2d
--- /dev/null
+++ b/app-emacs/ivy-rich/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/Yevgnen/ivy-rich/issues/</bugs-to>
+    <remote-id type="github">Yevgnen/ivy-rich</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/ivy/Manifest b/app-emacs/ivy/Manifest
new file mode 100644
index 000000000000..8fb01188294f
--- /dev/null
+++ b/app-emacs/ivy/Manifest
@@ -0,0 +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
+MISC metadata.xml 571 BLAKE2B 26ca5a5dfb1bc67ad37086ddc2c2e5976d1b4c763789a27ee83fb08c4a106a21c33b4c9632a3f2858a6b6249c8c49da3e2eafa7efc5267b655c0c9b2066598e2 SHA512 1879881be5eaeb2a6bac023fd06476a2ccbd25909f7c2f722b4af3680db44b4d3a959e1ac864e86580813a0bc68a2120d936f1c2efd67a6738ee8d83a5adb6f4
diff --git a/app-emacs/ivy/files/50ivy-gentoo.el b/app-emacs/ivy/files/50ivy-gentoo.el
new file mode 100644
index 000000000000..f9115d44c43a
--- /dev/null
+++ b/app-emacs/ivy/files/50ivy-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'ivy-mode "ivy"
+  "Toggle Ivy mode on or off." t)
diff --git a/app-emacs/ivy/files/ivy-0.13.4-ivy-test.el-skip.patch b/app-emacs/ivy/files/ivy-0.13.4-ivy-test.el-skip.patch
new file mode 100644
index 000000000000..e94070cca9c3
--- /dev/null
+++ b/app-emacs/ivy/files/ivy-0.13.4-ivy-test.el-skip.patch
@@ -0,0 +1,39 @@
+diff --git a/ivy-test.el b/ivy-test.el
+index 2062b81..8613337 100644
+--- a/ivy-test.el
++++ b/ivy-test.el
+@@ -2022,6 +1076,7 @@ Since `execute-kbd-macro' doesn't pick up a let-bound `default-directory'.")
+     (should (eq (ivy--sort-function 'c) fn1))))
+ 
+ (ert-deftest ivy-read-directory-name ()
++  (skip-unless nil)
+   (ivy-mode 1)
+   (unless (file-exists-p ivy-empty)
+     (make-directory ivy-empty))
+@@ -1136,6 +1137,7 @@ Since `execute-kbd-macro' doesn't pick up a let-bound `default-directory'.")
+            :dir "/tmp/"))))
+ 
+ (ert-deftest ivy-partial-files ()
++  (skip-unless nil)
+   (when (file-exists-p "/tmp/ivy-partial-test")
+     (delete-directory "/tmp/ivy-partial-test" t))
+   (mkdir "/tmp/ivy-partial-test/test1" t)
+@@ -1452,8 +1454,7 @@ a buffer visiting a file."
+ 
+ (ert-deftest ivy-swiper-wgrep ()
+   ;; `wgrep' requires Emacs 25 or later.
+-  (skip-unless (and (>= emacs-major-version 25)
+-                    (require 'wgrep nil t)))
++  (skip-unless nil)
+   (dolist (search-cmd '(swiper swiper-isearch))
+     (should
+      (string=
+@@ -1585,7 +1586,7 @@ a buffer visiting a file."
+             '("one" "two"))))
+ 
+ (ert-deftest ivy-avy ()
+-  (skip-unless (require 'avy nil t))
++  (skip-unless nil)
+   (require 'ivy-avy)
+   (let ((enable-recursive-minibuffers t)
+         (read-numbers '(ivy-read "test: " (mapcar #'number-to-string
diff --git a/app-emacs/ivy/ivy-0.13.4.ebuild b/app-emacs/ivy/ivy-0.13.4.ebuild
new file mode 100644
index 000000000000..9736ba05dfd7
--- /dev/null
+++ b/app-emacs/ivy/ivy-0.13.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24.5
+
+inherit elisp
+
+DESCRIPTION="Generic completion mechanism for Emacs"
+HOMEPAGE="https://github.com/abo-abo/swiper/"
+SRC_URI="https://github.com/abo-abo/swiper/archive/${PV}.tar.gz
+			-> swiper-${PV}.tar.gz"
+S="${WORKDIR}"/swiper-${PV}
+
+LICENSE="GPL-3+"
+SLOT="0"
+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"
+SITEFILE="50${PN}-gentoo.el"
+
+# Some tests are broken (but fixed on master as of 2022--04-10),
+# tests depending on Avy and Wgrep we force to skip.
+PATCHES=( "${FILESDIR}"/${P}-ivy-test.el-skip.patch )
+
+# Main Ivy sources. Swiper, Counsel and Ivy extensions have their own packages.
+IVY_SOURCES=( colir.el ivy{,-overlay,-faces}.el )
+
+src_prepare() {
+	elisp_src_prepare
+
+	# Wipe "elpa.el" to prevent initialization of the "package" library.
+	[[ ! -f elpa.el ]] && die "no \"elpa.el\" found"
+	echo "" > elpa.el || die "failed to wipe \"elpa.el\""
+}
+
+src_compile() {
+	elisp-compile ${IVY_SOURCES[@]}
+
+	emake -C doc ivy.info
+}
+
+src_test() {
+	emake emacs="${EMACS} ${EMACSFLAGS} ${BYTECOMPFLAGS}" test
+}
+
+src_install() {
+	elisp-install ${PN} ${IVY_SOURCES[@]} *.elc
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+	doinfo doc/ivy.info
+	einstalldocs
+}
diff --git a/app-emacs/ivy/metadata.xml b/app-emacs/ivy/metadata.xml
new file mode 100644
index 000000000000..37581bba4db7
--- /dev/null
+++ b/app-emacs/ivy/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>
+    <changelog>https://raw.githubusercontent.com/abo-abo/swiper/master/doc/Changelog.org</changelog>
+    <bugs-to>https://github.com/abo-abo/swiper/issues/</bugs-to>
+    <remote-id type="github">abo-abo/swiper</remote-id>
+    <doc lang="en">https://oremacs.com/swiper/</doc>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/mocker/Manifest b/app-emacs/mocker/Manifest
new file mode 100644
index 000000000000..9235d83cb8ba
--- /dev/null
+++ b/app-emacs/mocker/Manifest
@@ -0,0 +1,4 @@
+AUX 50mocker-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST mocker-0.5.0.tar.gz 7538 BLAKE2B 6998955dad68acf1a1dec8029dcaf0c5670e7594f77deb6d52873c2b9018ca329885120ee12f50c08d2a4014d94f3614f25d3f804df422b33f50cee74a46f935 SHA512 f649f8065734e8591b23f7887157ab0fadaca459a37761d8415e09957ad4a007f0896042511e842cd7d77294483d833552170cbdbb19b03638f7890e85605459
+EBUILD mocker-0.5.0.ebuild 631 BLAKE2B f73c7107f067886dae6d8be7adbb28d2c889ffb005312055c155184c6659ce3d6f5f53045765a35655298ebc74095df2af399eb2324597b24ea16515269dfb2d SHA512 4d9ba2a56766f7f7b47d8b6ee9a2ed1bbe562bda5708321d5a47198a9511a619c46e55bdfa528f94f99aa4ef97e4d59b47898be7826649211f10bb498f6467e2
+MISC metadata.xml 419 BLAKE2B b404cbd9a3007416336acff6a1d4caad461145aae28319323edec845d94a2f235991cb5b5fa777c57ddc5066a6da217d642bb7e23b6b71990892407004213b88 SHA512 b6f1a62c6962b5c8c61586621e0306e91a58b20e3ba71700d2097eb819a77c7c1db7b1dfa751b800ffda3dc7a63acbf81948c6511edc473decc2ff5d9977b5ec
diff --git a/app-emacs/mocker/files/50mocker-gentoo.el b/app-emacs/mocker/files/50mocker-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/mocker/files/50mocker-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/mocker/metadata.xml b/app-emacs/mocker/metadata.xml
new file mode 100644
index 000000000000..93a04ebb0d74
--- /dev/null
+++ b/app-emacs/mocker/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/sigma/mocker.el/issues/</bugs-to>
+    <remote-id type="github">sigma/mocker.el</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/mocker/mocker-0.5.0.ebuild b/app-emacs/mocker/mocker-0.5.0.ebuild
new file mode 100644
index 000000000000..8c112ede6dc9
--- /dev/null
+++ b/app-emacs/mocker/mocker-0.5.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=${PN}.el
+NEED_EMACS=25.1
+
+inherit elisp
+
+DESCRIPTION="Simple mocking framework for Emacs "
+HOMEPAGE="https://github.com/sigma/mocker.el/"
+SRC_URI="https://github.com/sigma/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.markdown )
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	${EMACS} ${EMACSFLAGS} ${BYTECOMPFLAGS} \
+			 -L ./test -l ./test/mocker-test.el \
+			 -f ert-run-tests-batch-and-exit || die "tests failed"
+}
diff --git a/app-emacs/org-appear/Manifest b/app-emacs/org-appear/Manifest
new file mode 100644
index 000000000000..1e92b6d5dd17
--- /dev/null
+++ b/app-emacs/org-appear/Manifest
@@ -0,0 +1,4 @@
+AUX 50org-appear-gentoo.el 147 BLAKE2B d544596303f5346afe667fc440c9467c65f23313f16d89293a7cc2a703d60211f034d66de2e9d1e2172b0b2f015572ec64b15d8f963b1fe3c00ff8c388a7a0b5 SHA512 70e9cb67d1aff2e0284cc9f85d4e1127aa84b8e8a03f323476375fb91e6bb47f5821acb3bfdb56ff24416c87001110c7621b98a76165591871459369acb0a1fd
+DIST org-appear-0.3.0.tar.gz 95423 BLAKE2B 925e82f6b2757138d8e3b2f20a1c3bd64644aea463fa5b713e363b8cfe8ca1111a666d3a934c313032e5a8339bcab9962129c92a2b1a5bd454fcfb3aefc0ac1a SHA512 5500e838ddfd5a4000604a284a5a967ed2a42abfcb6f24cf86f60116c0a2afc7dd303f9be9b8b879fc8a0cad09e15e168212e6b6c6b3c18ec649b92c5a3ea2b0
+EBUILD org-appear-0.3.0.ebuild 453 BLAKE2B 54dcc871607cb22dadb93d680452f3820851e93ac79b82ebb84d88b89683d85f29178b833569ac6cf9635b6681e40a7e81a7a293eb387eba9893707b21f5b59b SHA512 4036bece76d9e3b88e49c034cccd3e8c247d18dec2b9a3c28654179c7c3bafcae73977f629961f9aecddfab02698dea25445fb4eee14187002af4c1e601ff6ef
+MISC metadata.xml 423 BLAKE2B 98496b9b392c87849ce144f88f9a966fe6e58ef9015dd476e1ac90824ed782b07e0c12c96b4b7e1c07f3cc1dc13072c6469db04fc0a57824b456264d6927e567 SHA512 7bb84b12302126b4e4a253a8a6e27e07e3c49d1164bff10c0396b64923d9406119495047b48f3a1d3ac6d09bed076f5bf8458a7501ec49447cb01c1460279c12
diff --git a/app-emacs/org-appear/files/50org-appear-gentoo.el b/app-emacs/org-appear/files/50org-appear-gentoo.el
new file mode 100644
index 000000000000..7a2927fd2ebb
--- /dev/null
+++ b/app-emacs/org-appear/files/50org-appear-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'org-appear-mode "org-appear"
+  "A minor mode that automatically toggles elements in Org mode." t)
diff --git a/app-emacs/org-appear/metadata.xml b/app-emacs/org-appear/metadata.xml
new file mode 100644
index 000000000000..201bfe4d549c
--- /dev/null
+++ b/app-emacs/org-appear/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/awth13/org-appear/issues/</bugs-to>
+    <remote-id type="github">awth13/org-appear</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/org-appear/org-appear-0.3.0.ebuild b/app-emacs/org-appear/org-appear-0.3.0.ebuild
new file mode 100644
index 000000000000..f83dd60d6b2d
--- /dev/null
+++ b/app-emacs/org-appear/org-appear-0.3.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=25.1
+
+inherit elisp
+
+DESCRIPTION="Toggle Org mode element visibility upon entering and leaving"
+HOMEPAGE="https://github.com/awth13/org-appear/"
+SRC_URI="https://github.com/awth13/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.org demo.gif )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/pkg-info/Manifest b/app-emacs/pkg-info/Manifest
index 5f8b8419938b..61bb35c57c88 100644
--- a/app-emacs/pkg-info/Manifest
+++ b/app-emacs/pkg-info/Manifest
@@ -1,4 +1,4 @@
 AUX 50pkg-info-gentoo.el 432 BLAKE2B e422b694035b319ac40367cedeee146f1bcf6b5b69ab734d751fc670f647264b0bd2e0dab96f032cdfe7dd3c24bef9b84691578fdb55dac1abbc10e7e09b3099 SHA512 ca3e6390dd9e3eb12f1db203e4456c786a500566beef8647f204c5ce6218a6f44224ad6c3b6dc6afb02d5269168210231ae842de4fb4ff46d333135faa1a87a5
 DIST pkg-info-0.6.tar.gz 18896 BLAKE2B 464f172ef9e0e6e89f472032b1be0506c49a51fc8e2120ac561be23187fbd0ca64abf021e2ef717267623efe8ff0a49c14ad1af098f9ff20e167b334c49081d2 SHA512 73531a0a7ab54cf3e365a627d2905cc820f1328ad8ca8f985d1954c877f4a1ad7dc5129f52c4e2accd305661a9b952da9adf0a802c8ab6f35e1c16b55966ef54
 EBUILD pkg-info-0.6.ebuild 560 BLAKE2B fe801524ea429fd59a4a43010ba5a6278f6069e6f0e1ab881f680bfd65707b01c0e950cdb75d3a3ed5a6874d57bfa1fafe87f2dfd2ee96ebec6a041a18486c7f SHA512 359faccca9f0634fa3259e1004696452b3a2fcf18e824c1b82e2a269c648c84beb38ec57b1f665cc92a017658f1269a7895c7fe7b517000a89dece2252aaf300
-MISC metadata.xml 587 BLAKE2B ae1fa12c08fc93bce6c9a311852865b40412613f78225cf006e587ee10571fbb00c12ad1394c612d867c33022acc2e7ff13149be026664562b536d85a350cc39 SHA512 e42dd471a9dd10bf26d7138374e702e945c9f0a23fb36e2f6c9e69df308b9933b0709b8ca1c20fc1f44612971fd99e3ca3cf6d63bbec7708927f31026b11684a
+MISC metadata.xml 715 BLAKE2B 119d92195e4fc6c7899fb24f66dc589efd30ca073dccbb77f4818a7f0579caeacae93119e795dd345e482bd51ca9981ed1df33c2900c778a80ba88fb3a7b4dbd SHA512 b741d9876b9131c00807165e82d66c028e62a0511b47f82686b810ea69eee363becd5531fe5ee0409a4b4ad90e6ff35f3117e089e53c50cbd52d1b2b86033e36
diff --git a/app-emacs/pkg-info/metadata.xml b/app-emacs/pkg-info/metadata.xml
index 8ff3d9d5f463..fa605d0161df 100644
--- a/app-emacs/pkg-info/metadata.xml
+++ b/app-emacs/pkg-info/metadata.xml
@@ -9,6 +9,10 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">emacsorphanage/pkg-info</remote-id>
     <doc>https://github.com/emacsorphanage/pkg-info/blob/master/README.md</doc>
diff --git a/app-emacs/po-mode/Manifest b/app-emacs/po-mode/Manifest
index a7e627ae4777..8d5e7e7e5c57 100644
--- a/app-emacs/po-mode/Manifest
+++ b/app-emacs/po-mode/Manifest
@@ -1,4 +1,4 @@
 AUX 50po-mode-gentoo.el 373 BLAKE2B dedf37969c42ac3dbeb4b4cb01af0f9ee79e40aad8586831503bebc1192a110fbecdc0bba339ebe6d7f89a8509e4f6df52f98f7563a90f31d73af279aad81e66 SHA512 48c371afe3f1a1f033ea20cb0a60bc700414108f7dc1f235e62423bda9b94373e49da9bdd3ab76e119b7b6c1b5f0a7601d36ce2710dd23b3de46557cf7d9cd8d
-DIST gettext-0.20.1.tar.gz 23267473 BLAKE2B 34e776b985c7db105f8029e0f3400aa645ff6843cd35f778d48450368a31218ddcf590fbc7fd2d10f716b63094d6a15bf40b358e8a6f498d450d2420e7e7a5f2 SHA512 af6d74986da285df0bdd59524bdf01bb12db448e5ea659dda3b60b660c4a9063c80e8c74cc8751334e065e98348ee0db0079e43c67d485a15e86ae236115fe06
-EBUILD po-mode-0.20.1.ebuild 521 BLAKE2B 150a7fbe7b73d0666c0fcad2a47fdd4437d659e3c6cc77513ab8f6bb6a13105143f89ee811044220d3a419146dec30e6ff875ed52e2fddf8b2b989b3d97b1794 SHA512 24def2f8d96d1132c525867e27acfd42bf6778c9f5f4c2196610c8c102d036482531c94be7f690849af7cd2f39bb5813ce5575a44029136655ea4d0ff2b8b452
+DIST gettext-0.20.1.tar.xz 9346544 BLAKE2B 6541715b82399b7fac390ccbec82d2878228a19db9a37642b3eb65eb139cf4a5d74f17f876be4946771143b5897d5b4e4ca7948e06bb3edd79f125d1d3954a84 SHA512 82ffa5a28068272d0587262f8d9269f9629c601da5d122b6645c9c4cf98bfe4149df01bb58522ccf8fe25b931672e18551d7fb34de1cbf6a0463a87f9f8ee221
+EBUILD po-mode-0.20.1.ebuild 521 BLAKE2B fb885459cb71eb1d610cf281477425718c96c57608e83d1672c3ddd1dc0f0e374b366008d3d0f112db45d40b3c633a59261d2a6a6ad2d037e2cee7526919046b SHA512 d6e29c5a791179bd665dde9872d6e85e0ab73a527dabf9d3200e44446e937e7593b8b888a6ae2e550cde3045c50259fe070d9cd8a952f81d0fb6e3ec55170d36
 MISC metadata.xml 283 BLAKE2B 81c49021199f71096079a27f9121390fb8c1285c54b9478583ff2d647277fa106ef12456d7097c4be092fc48b514a1adcf855ca0fac911598232ef9eb7f102c0 SHA512 f32b303760addf5d4db8d18bd10fb677353cdfa4c5e545d47804ef756cf5e5a21f8b8efb631b08f802185913ceb98da820e404e06eb03d01fe9ea85c10d1ac13
diff --git a/app-emacs/po-mode/po-mode-0.20.1.ebuild b/app-emacs/po-mode/po-mode-0.20.1.ebuild
index dcfcff10a2c2..a49868192c9d 100644
--- a/app-emacs/po-mode/po-mode-0.20.1.ebuild
+++ b/app-emacs/po-mode/po-mode-0.20.1.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
@@ -7,7 +7,7 @@ inherit elisp
 
 DESCRIPTION="Major mode for GNU gettext PO files"
 HOMEPAGE="https://www.gnu.org/software/gettext/"
-SRC_URI="mirror://gnu/gettext/gettext-${PV}.tar.gz"
+SRC_URI="mirror://gnu/gettext/gettext-${PV}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
diff --git a/app-emacs/pos-tip/Manifest b/app-emacs/pos-tip/Manifest
new file mode 100644
index 000000000000..2436d3c363b0
--- /dev/null
+++ b/app-emacs/pos-tip/Manifest
@@ -0,0 +1,6 @@
+AUX 50pos-tip-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST pos-tip-0.4.6.tar.gz 9413 BLAKE2B 22257c8a96b6a46cf4678f8cb20fdeba77d63a4dbddd1982331cb7902bd383c1280d13c2a7873ad1aea2f9cf326eaa1692d43c2db2a6ff81d788e80895e5b0bc SHA512 071e65c4a0db0f176fa2520a7951aea20556ca0f96819919627e0b4a9e108ac05bef3e6ad89665ad0a45facf8b201a74158b8b70ad3a03df10e0299c0578966a
+DIST pos-tip-0.4.6_p20191227.tar.gz 9628 BLAKE2B cf610aaf0abcb8b23724c81cdf53b62db95508968f04e7609e874e81f81aa27e7b2976b30f589a60176ded274d2f28581074b59ac753f357e7ec93c468486e1c SHA512 983a844eae33808a22446caff6c2c4574145be65b57c6b7e8fe37c170bd3b3668ff4c4598f9d726be8d3df0b54291f81c732e0f4fbb83e1026a6694bfe30f0ed
+EBUILD pos-tip-0.4.6.ebuild 370 BLAKE2B 71e193aa8c2d7c2f516384b8076b9c334214e51d82f5a618027cc8a9fd211e615a352e3abb06d4d71c80a5cc2f041e8db7c3598f5f38ee9cd6b1e85725294ad1 SHA512 cb3015eede3585905e8a55ddb4961e3bbf4ff11a4d09872f390ab10b0047d74594fa4e8915ea42fb55bad2901a64027651582a26feb6529430b7499f87f3f188
+EBUILD pos-tip-0.4.6_p20191227.ebuild 439 BLAKE2B 0a1ec2d037759b77e15bfa594e64bd56f0aa069c69490c6bbf17e503ae0b44a7799a4298e01997bc0d732bccd281503c692cea866702248ba0b233b0ebb93424 SHA512 014a8b3fcdd4fcd6731c42eb8b76d075543cdc8752ea9974fb4630f95a40ea8059147c8c55ea56239f1b2d82786d0a3555a6aeebf7d53b6b45bd116e916439c1
+MISC metadata.xml 419 BLAKE2B e74c79d9d25489c8929468c96a9676252ed438c02b4d4b9fdbd19d68be76cf609a0b52eaa976507f482459096d0c7378c44521daff6da4455106c2a470ced399 SHA512 c9d1da06f478f07c55441dd0ae4ac3f5b86ae6b592e83012983d670ed4d6eed28730c5c82cc16ab678d64c1738831683d3ea2c0a7e9e7eb18deb57b1866b8705
diff --git a/app-emacs/pos-tip/files/50pos-tip-gentoo.el b/app-emacs/pos-tip/files/50pos-tip-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/pos-tip/files/50pos-tip-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/pos-tip/metadata.xml b/app-emacs/pos-tip/metadata.xml
new file mode 100644
index 000000000000..273d8d46e4f9
--- /dev/null
+++ b/app-emacs/pos-tip/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/pitkali/pos-tip/issues/</bugs-to>
+    <remote-id type="github">pitkali/pos-tip</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/pos-tip/pos-tip-0.4.6.ebuild b/app-emacs/pos-tip/pos-tip-0.4.6.ebuild
new file mode 100644
index 000000000000..5472c5b51f5d
--- /dev/null
+++ b/app-emacs/pos-tip/pos-tip-0.4.6.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Show tooltip at point"
+HOMEPAGE="https://github.com/pitkali/pos-tip/"
+SRC_URI="https://github.com/pitkali/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/pos-tip/pos-tip-0.4.6_p20191227.ebuild b/app-emacs/pos-tip/pos-tip-0.4.6_p20191227.ebuild
new file mode 100644
index 000000000000..e92c55a9782f
--- /dev/null
+++ b/app-emacs/pos-tip/pos-tip-0.4.6_p20191227.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=179cc126b363f72ca12fab1e0dc462ce0ee79742
+
+inherit elisp
+
+DESCRIPTION="Show tooltip at point"
+HOMEPAGE="https://github.com/pitkali/pos-tip/"
+SRC_URI="https://github.com/pitkali/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${H}
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/powershell/Manifest b/app-emacs/powershell/Manifest
new file mode 100644
index 000000000000..b1cb88f9697e
--- /dev/null
+++ b/app-emacs/powershell/Manifest
@@ -0,0 +1,4 @@
+AUX 50powershell-gentoo.el 267 BLAKE2B ca2712812fe037fc498193a1d88476da61765af5308183cfa7537fe3dda797f480d89cb282276d517efad27bc53f520e95d0b9bb507961a84ebc772e01091603 SHA512 99214edd95150f4f366778f0db472bad7869a579e6b0635a6e37e74f7d389a293a226fff4b8eed9009ae388885a2305423530b3eb9306e4f3f6847e606af095b
+DIST powershell-0.3_pre20220402.tar.gz 17009 BLAKE2B c369993bc4ac0e681dde514c4303f6c131198e77f6aa3b293ecedefa552e8f2b94e8ab77978ff2f8d999a4b620fa4e013023a283e0a2c30f6578428bc54fe52d SHA512 2d38f1a968119a2022e1f3eceb8150947559e5e7943d184fec3b8075cc2dc8d97b5a897bc1ac97b14d69d9424b72ca20f01d24589403936b1ca2bc7becc2ea0f
+EBUILD powershell-0.3_pre20220402.ebuild 515 BLAKE2B 638ff0c7898290a2987e7866d2c0048d9ccc611dc101db01d50fefc915b5fa1bc440934391a740212df593c0b8f1003d785d2afab05557171d6740876753a0cb SHA512 705aca3322e1f7b3ca965518139a3effc9049b23658503d05f05bfc7f7989e0920d5104e72b521c7de5b3bcc2c95c2892be20732afadff4ad8c175c3dd9df360
+MISC metadata.xml 454 BLAKE2B 84931c284b0bc9dc20204737b54377498fef87eeb0a7d7d6cf956280f41b25fdd577306a39f5da937d4f4d84f80cffa8e8a11211ead5a98603ff7674214924f2 SHA512 4d3c39a70fefa9b07afb59cc46f438e2f64ceed173dad3e5bcaec342931c40b31b9f4474a851df3d554dbfece7fa5448d147da7d451290d02c640f1b9955b34d
diff --git a/app-emacs/powershell/files/50powershell-gentoo.el b/app-emacs/powershell/files/50powershell-gentoo.el
new file mode 100644
index 000000000000..e97cc3554edc
--- /dev/null
+++ b/app-emacs/powershell/files/50powershell-gentoo.el
@@ -0,0 +1,6 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'powershell "powershell"
+  "Run an inferior PowerShell." t)
+(autoload 'powershell-mode "powershell"
+  "Major mode for editing PowerShell scripts." t)
+(add-to-list 'auto-mode-alist '("\\.ps[dm]?1\\'" . powershell-mode))
diff --git a/app-emacs/powershell/metadata.xml b/app-emacs/powershell/metadata.xml
new file mode 100644
index 000000000000..ed7371a06f5f
--- /dev/null
+++ b/app-emacs/powershell/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <stabilize-allarches/>
+  <upstream>
+    <bugs-to>https://github.com/jschaf/powershell.el/issues/</bugs-to>
+    <remote-id type="github">jschaf/powershell.el</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/powershell/powershell-0.3_pre20220402.ebuild b/app-emacs/powershell/powershell-0.3_pre20220402.ebuild
new file mode 100644
index 000000000000..6d53582ddb59
--- /dev/null
+++ b/app-emacs/powershell/powershell-0.3_pre20220402.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=77b27faf8a292f1dc9f54c872241dc53b6791bf1
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="GNU Emacs mode for editing and running PowerShell code"
+HOMEPAGE="https://github.com/jschaf/powershell.el/"
+SRC_URI="https://github.com/jschaf/${PN}.el/archive/${H}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}.el-${H}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/pyvenv/Manifest b/app-emacs/pyvenv/Manifest
new file mode 100644
index 000000000000..09b552b255cd
--- /dev/null
+++ b/app-emacs/pyvenv/Manifest
@@ -0,0 +1,4 @@
+AUX 50pyvenv-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST pyvenv-1.21.tar.gz 9187 BLAKE2B 59d3eee5f0c3da44c48d6fad8fc6803e6080e54696dd5071d05a716916a2f469f0b6c812bae68eb5f1ab4a99cefae7d7128fe7a0bb2a9ccce68cdc710e02632e SHA512 5b9bf67c2882a6a4b6ff8ec2c2485a21085882c66a265f3eb3ff9650e1e7a19642acd066767c049edf61f8514799c6d24420f68a467c79498223e92cd5be8c66
+EBUILD pyvenv-1.21.ebuild 753 BLAKE2B 0b5c4eff4b20bb5ed3ca14a1b6461e1fa508540aede889646e4eac808ef6b3797588c06bbe6ea733cb29c6706b377994156d7a54c4142dea1a9367c5d93e09ca SHA512 f05ff26bc19547abfdc323663eafd3c8c90ef38a1afa06ace7420d2294034282824cb98d87e94a744105d359ed0775f47f18101574a316ef0aa7e5fed36e23c5
+MISC metadata.xml 431 BLAKE2B 88cfcd29ab7e5af621bb6ccc2bb9cbcc9eebac4d019780638c08bc02c876afbc7b477ca3bfd2ce103ed3bfb21a927c432e1893ec81aad65d0cfdac7a068fc9ba SHA512 b3afe03abb70db9ec1e6c50db8eda52d4d447684275b92e88918b0b017f1730b8ea86f906eb4cfe41bba37ebe00e167787c2835da3ca1fac5d639b63823f683a
diff --git a/app-emacs/pyvenv/files/50pyvenv-gentoo.el b/app-emacs/pyvenv/files/50pyvenv-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/pyvenv/files/50pyvenv-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/pyvenv/metadata.xml b/app-emacs/pyvenv/metadata.xml
new file mode 100644
index 000000000000..b763ca453b21
--- /dev/null
+++ b/app-emacs/pyvenv/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/jorgenschaefer/pyvenv/issues/</bugs-to>
+    <remote-id type="github">jorgenschaefer/pyvenv</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/pyvenv/pyvenv-1.21.ebuild b/app-emacs/pyvenv/pyvenv-1.21.ebuild
new file mode 100644
index 000000000000..c16f57b1102b
--- /dev/null
+++ b/app-emacs/pyvenv/pyvenv-1.21.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="Python virtual environment interface for Emacs"
+HOMEPAGE="https://github.com/jorgenschaefer/pyvenv/"
+SRC_URI="https://github.com/jorgenschaefer/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( app-emacs/mocker )"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	# Other tests require special Python Venv setup
+	${EMACS} ${EMACSFLAGS} -L . -l ./${PN}.el -L ./test \
+			 -l ./test/pyvenv-mode-test.el -l ./test/pyvenv-hook-dir-test.el \
+			 -f ert-run-tests-batch-and-exit || die "tests failed"
+}
diff --git a/app-emacs/racket-mode/Manifest b/app-emacs/racket-mode/Manifest
index cee344887ecf..a2b1ab6f319b 100644
--- a/app-emacs/racket-mode/Manifest
+++ b/app-emacs/racket-mode/Manifest
@@ -1,8 +1,8 @@
 AUX 50racket-mode-gentoo.el 799 BLAKE2B 1f0c19ab171427e5404d40eae1fb95f590059c4265df6041bf5ea00a5aa716489f7fb88eeef1c7309810fb41b909e122986cf3b0881bd43eb512c06f9c873598 SHA512 18db7fb5cd7a69a7a4d979ae604dfa1458fb7fd25329ff46043f206395d09245287512bb2feb9e1f7941d63d0af1d7bd1c060ca8026223c2cbd4021ddce57690
-DIST racket-mode-20220208.tar.gz 298473 BLAKE2B 6fcadfe7040efbc3a5e06ffec7abd05958add51a22fb68d5c7d57e052aa7998b9dd0f60816e94e6b80f967108c161a989a98d5516699fc7a6b0f6576a40423cf SHA512 ec6ff476ca23a1d50aa7355df269175b7994a7f57c58d00c27b9161e1fc9a23cfda833aea73b45379cde58a7a3f49a78b40e63724b7c229bc81a37c873b5fc29
 DIST racket-mode-20220219.tar.gz 298876 BLAKE2B b3dfbcd9b436648da1ecacf4b7434c3e1b6dea9bc904c2f1911be34bc6b1846684c349f38cd418b09e66f426866b805ca6bd0c98724e69740ad841ae482e62ea SHA512 94879fe9aed106d0210ca359a5d3d857eec098b4442256a489356db0c5b3493b44ee9a0dd6eff0a0d3d2f3c752632e91b1c0ef8705b7b305e3c75fbae42e826a
 DIST racket-mode-20220310.tar.gz 300827 BLAKE2B 952cf83a7ddb128b1fe2ede233ed357f0d542682043c36b6c7aa47733579aa09cc00b16c663889bcf00e4099c0aeffd68c9b59a733f692330dfb0acbfeeb9c8f SHA512 a06b22487666af902cae3688429ccf9ce58138568cc76ddcefe4a30dac23cb51a986e0615e143b256fba8b462ebea2fe024649a09dfe7f096553d2a3fc501659
-EBUILD racket-mode-20220208.ebuild 1139 BLAKE2B fbd960f527f0c909b449389e836d020f698cb76237eb31032dcddf4801d1c873b3d7a4cb06c7a59f4cc4d1a20da807872c40f7aa420d3a1ce2bf0f93aaaa3dba SHA512 d93ae11f1a5c7fd099773172b8442e4845eda08a87bdd5a78f1c1e13a2a9c0abc5c5e8e40c9259bcbd479951c87c5b84d2afa372d80108a1c88c632bae68868e
+DIST racket-mode-20220411.tar.gz 303095 BLAKE2B 7fed011b915e86f6d40d6a9f8640ea2b066c201cf28e20a941fae841e96bf3649f3cf0ad7847091984a7cf490e9b98142617e47038dea70c44999510144dda3a SHA512 ec17ade728390f8f8b783703ca319ee15502afa7f82e86d9aa8b60361ecc65af21990cf89532b38bfc211887c00b5aa4c820dc0e66a1b1a1a9aacbc08673d35d
 EBUILD racket-mode-20220219.ebuild 1139 BLAKE2B e4a22c04cbaaaed17b783a0b0a50e161fc319433b724214fc69b186e1b977fa015aff4836c8a78c022e14a94122c941c5beb1407c54848846dddf6e66e8870e8 SHA512 2d43dca3838e7b27fdb2dc7bfed221acd59f61c5f30b5bf4a6954a62892e9ca5691a203324b30792bf3d43863bd79ff712a9067045fb48b24879bd5dd6334552
 EBUILD racket-mode-20220310.ebuild 1242 BLAKE2B c4ab934b2b113b65c2eca5d143bde55a51c3ac2edd40a09c8354d35fb9429a9eb9d29740602dcb413752649e38f17e8335473b0b1ab8ec839e6ad5a80035a014 SHA512 64f16ce951a441f5dfa7524cec06cc3093b3669f3c284d385840045df10124a0cf8d5c233e917f7f13c6f2942901abfab9b65a23f2dc435c99e9486eb0b69166
+EBUILD racket-mode-20220411.ebuild 1242 BLAKE2B 38aabde4e518e9b298e0e15df6563822f0dc914eb7f3e53484ba5fc2810c6deb760da7c621eccafda0044d5818ff708d7194661f4bcb7fd1f9ed9f2f522c4923 SHA512 aa16ce86b8f23c6ee0be79472fd2bbe119872d470249d67b5c0b33daf5c2df6246f7c3fcbb853f21797e754aa2905c244c2317f75829c68fd15e40e31f9c21fd
 MISC metadata.xml 818 BLAKE2B 6029673bee9510c74b9cf89bbbef03638cdfcfeaaae49f2f94d57cd960c616c7b43c8dc3a0c79892be87dace9e7549b3b4453b13fcc7a23f7b6a02066dbce29a SHA512 8b487cb9f4018d3ec7a2cf130b26d58522772bef05d258100068fc89500577a5f680f480b89f06ef63d99c4a6d4e4fd825ea3338934438715fb83a946f6fe7cc
diff --git a/app-emacs/racket-mode/racket-mode-20220208.ebuild b/app-emacs/racket-mode/racket-mode-20220411.ebuild
index 675700b89d37..46f695097f04 100644
--- a/app-emacs/racket-mode/racket-mode-20220208.ebuild
+++ b/app-emacs/racket-mode/racket-mode-20220411.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-H=d2838248611f01721feeab70cc06a9fc5a7d9bb9
+H=e7efbb52fdf2219532230a199153d8a33889c26f
 NEED_EMACS=25.1
 
 inherit elisp
@@ -11,7 +11,7 @@ inherit elisp
 DESCRIPTION="Emacs modes for Racket: edit, REPL, check-syntax, debug, profile, and more"
 HOMEPAGE="https://github.com/greghendershott/racket-mode/"
 SRC_URI="https://github.com/greghendershott/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${H}"
+S="${WORKDIR}"/${PN}-${H}
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -35,7 +35,8 @@ src_compile() {
 }
 
 src_test() {
-	emake test-racket
+	# Set PLTUSERHOME to a safe temp dir to evade writing to ~
+	PLTUSERHOME="${T}"/racket-mode/test-racket emake test-racket
 }
 
 src_install() {
diff --git a/app-emacs/rainbow-delimiters/Manifest b/app-emacs/rainbow-delimiters/Manifest
new file mode 100644
index 000000000000..078a00a995ca
--- /dev/null
+++ b/app-emacs/rainbow-delimiters/Manifest
@@ -0,0 +1,4 @@
+AUX 50rainbow-delimiters-gentoo.el 178 BLAKE2B 707854419da2bd4d1923d52505f5b77fe574cd01b066e701d76b0c19b0336b1f5e42cd8f08cff33a02c7aa29ea79928b0213d5b8bab04dabe0be35671761533b SHA512 49d1a3ce227c34ac3152fc5bde204e62cdd98d29323ab2bf4b0e85a474ee328f1964024670ebecbc98087a522ef587133c6f11b1992f97009227e21c0396722a
+DIST rainbow-delimiters-2.1.5.tar.gz 8201 BLAKE2B 61b3f33cdacf87bcef26c42cfde2d5cdae0c2958b73bd181aae11fe774f8b29efce8ceaf8b28df24626a76e81f5f20ee3ceb9f1f565c988fa7729160104ee113 SHA512 e7d734ad255bbcab17d14dbe0af8430df3ccb094415d19721eb08969b168773e58834f654948bd776215c6c62209d3ccb800cd410a739d35f9f720103f4ed076
+EBUILD rainbow-delimiters-2.1.5.ebuild 1047 BLAKE2B ae07e0902cc21245535974ce5fb1673a5e14240e893efe38319acdd19f4f43330cfc049ed412311f53d381853a8c59a5f7214ef74a8007438e99f2f48e1d414c SHA512 351dd3ce56863379f75fb1433c866da183c12718ec2d849358f3499cb2bb9b437935c742350d5ef0c9d3e480c379b46a4cb84f45d64a4165dcc15bced8a38ed2
+MISC metadata.xml 439 BLAKE2B adfa3bf55ef25ec2f0c959c6a8e4974378d1827f34a5d5ac9b839af74e278d40e7be0a333033dd899a6e2276f80fdadea4a6eb36e29fc4798f1c1971155f4ccc SHA512 bc1dafb4f6a74d1b78a311bcc0c9c88d3c53d6d0408d32cae5c2936b248155e20ce37c0c163f816ba47fab725fe3942c33f18f96d96355865dcde439fb55c826
diff --git a/app-emacs/rainbow-delimiters/files/50rainbow-delimiters-gentoo.el b/app-emacs/rainbow-delimiters/files/50rainbow-delimiters-gentoo.el
new file mode 100644
index 000000000000..b92fdc1fd114
--- /dev/null
+++ b/app-emacs/rainbow-delimiters/files/50rainbow-delimiters-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'rainbow-delimiters-mode "rainbow-delimiters"
+  "Highlight nested parentheses, brackets, and braces according to their depth." t)
diff --git a/app-emacs/rainbow-delimiters/metadata.xml b/app-emacs/rainbow-delimiters/metadata.xml
new file mode 100644
index 000000000000..2ad483954046
--- /dev/null
+++ b/app-emacs/rainbow-delimiters/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/Fanael/rainbow-delimiters/issues/</bugs-to>
+    <remote-id type="github">Fanael/rainbow-delimiters</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/rainbow-delimiters/rainbow-delimiters-2.1.5.ebuild b/app-emacs/rainbow-delimiters/rainbow-delimiters-2.1.5.ebuild
new file mode 100644
index 000000000000..aba0b74e0ccf
--- /dev/null
+++ b/app-emacs/rainbow-delimiters/rainbow-delimiters-2.1.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24.1  # needs ERT for tests
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="Highlight nested parentheses, brackets, and braces according to their depth"
+HOMEPAGE="https://github.com/Fanael/rainbow-delimiters/"
+SRC_URI="https://github.com/Fanael/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
+DOC_CONTENTS="To start the mode automatically in foo-mode,
+	add the following to your init file:
+	\n\t(add-hook 'foo-mode-hook #'rainbow-delimiters-mode)
+	\nTo start the mode automatically in most programming modes
+	(Emacs 24 and above):
+	\n\t(add-hook 'prog-mode-hook #'rainbow-delimiters-mode)"
+
+src_test() {
+	# EMACS_VERSION is for GitHub CI, it can be left blank
+	EMACS_VERSION="" sh ./run-tests.sh || die
+}
+
+src_install() {
+	elisp-install ${PN} ${PN}.el{,c}
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+	einstalldocs
+	readme.gentoo_create_doc
+}
diff --git a/app-emacs/rpm-spec-mode/Manifest b/app-emacs/rpm-spec-mode/Manifest
index 4aa846aec809..c8ccf00d3e4d 100644
--- a/app-emacs/rpm-spec-mode/Manifest
+++ b/app-emacs/rpm-spec-mode/Manifest
@@ -1,4 +1,5 @@
 AUX 50rpm-spec-mode-gentoo.el 188 BLAKE2B 03ce71a3d7383b4a34eca735a312c4d974c1494471bc038cc3a77ca4fd5d11832c2daa56ce2d9f77ccd3dad589173a446d285cb37a302d1d8f0df5f6bc570ab5 SHA512 60a6c11f7ef2c0043c9c2f502d0cf1d2976a5e33eb47735b00a0b4b99cded6f635386a5ad5680b0eac7604e00aee8f508df53a79263bb0dfe82c076ca5fa4657
+AUX rpm-spec-mode-0.15-emacs-28.patch 1249 BLAKE2B f57f3e4a1ef089096527af75b88ba7b51b08910abb168520156e73255354fdebe30b0e29c980965f612fc2c43fa7f1935c6fbe204c2f243e7a487ad6757ed8b8 SHA512 1781ee465ed17ac6ef2db833139390a620851634bb459d8980fe1870d055c1433039dbab7fc25b12e685b1350977cecb59ed259a43433141742283608cf6581d
 DIST rpm-spec-mode-0.15.el.xz 11176 BLAKE2B 209720693ab1d749187ce923534db18ecc57daabf83bd9051988a2ae660df8482370f33aae3730152f99c1267ad366848ba6b7df72ad9a8c7b195ea94313b224 SHA512 cd2f1dc1d3b7bc18512d14bdbc8b73183b0d917e93911aa5c88bd847cbf24f090480cdac46f9f8a82336085ea801abbbed567fce19498cc70661d051dfa287dc
-EBUILD rpm-spec-mode-0.15.ebuild 456 BLAKE2B a8d3a4aa037d56b26078f0d594fcb5bc9cbe87ecfcd7e9b9c884986085e16a3d1d7de8a37a7b5b95326b9fea8236e71e487303aec166af9b5b6fdeb70b022fd4 SHA512 f55c03850e15c8dd505c66c3ad7985285845a34d91f516acea2104272264e8488d99b0c6395dae9d60627cbb808f4a0a46521a30653d93fa1dee49e7567ed4b9
+EBUILD rpm-spec-mode-0.15.ebuild 502 BLAKE2B 2576c9441f36ed7a8c47e8567f5290c82347b26d1a23128da18fe3621c8da17c04985d61046d8a9671019d31149bfedd7b795e6a780443a665c7ddca080588b3 SHA512 faead50b7630c8a7d7544397703ce8f4a415263c9e9a2bc696d9ccc9a57cf0f30557ba7b998f992ad73eebb97a97efd40946523f21e0eea1c3a4890a8c50ba94
 MISC metadata.xml 283 BLAKE2B 81c49021199f71096079a27f9121390fb8c1285c54b9478583ff2d647277fa106ef12456d7097c4be092fc48b514a1adcf855ca0fac911598232ef9eb7f102c0 SHA512 f32b303760addf5d4db8d18bd10fb677353cdfa4c5e545d47804ef756cf5e5a21f8b8efb631b08f802185913ceb98da820e404e06eb03d01fe9ea85c10d1ac13
diff --git a/app-emacs/rpm-spec-mode/files/rpm-spec-mode-0.15-emacs-28.patch b/app-emacs/rpm-spec-mode/files/rpm-spec-mode-0.15-emacs-28.patch
new file mode 100644
index 000000000000..7f13f78dc9dd
--- /dev/null
+++ b/app-emacs/rpm-spec-mode/files/rpm-spec-mode-0.15-emacs-28.patch
@@ -0,0 +1,38 @@
+--- a/rpm-spec-mode.el
++++ b/rpm-spec-mode.el
+@@ -112,7 +112,7 @@
+   :group 'rpm-spec)
+ 
+ (define-obsolete-variable-alias
+-  'rpm-completion-ignore-case 'rpm-spec-completion-ignore-case)
++  'rpm-completion-ignore-case 'rpm-spec-completion-ignore-case "")
+ 
+ (defcustom rpm-spec-completion-ignore-case t
+   "*Non-nil means that case differences are ignored during completion.
+@@ -132,7 +132,7 @@
+   :group 'rpm-spec)
+ 
+ (define-obsolete-variable-alias
+-  'rpm-spec-test 'rpm-spec-nobuild)
++  'rpm-spec-test 'rpm-spec-nobuild "")
+ 
+ (defcustom rpm-spec-nobuild nil
+   "Do not execute any build stages.  Useful for testing out spec files."
+@@ -158,7 +158,7 @@
+   :group 'rpm-spec)
+ 
+ (define-obsolete-variable-alias
+-  'rpm-initialize-sections 'rpm-spec-initialize-sections)
++  'rpm-initialize-sections 'rpm-spec-initialize-sections "")
+ 
+ (defcustom rpm-spec-initialize-sections t
+   "Automatically add empty section headings to new spec files."
+@@ -166,7 +166,7 @@
+   :group 'rpm-spec)
+ 
+ (define-obsolete-variable-alias
+-  'rpm-insert-version 'rpm-spec-insert-changelog-version)
++  'rpm-insert-version 'rpm-spec-insert-changelog-version "")
+ 
+ (defcustom rpm-spec-insert-changelog-version t
+   "Automatically add version in a new change log entry."
diff --git a/app-emacs/rpm-spec-mode/rpm-spec-mode-0.15.ebuild b/app-emacs/rpm-spec-mode/rpm-spec-mode-0.15.ebuild
index 0086ffe7ae34..a7f24a7b33d1 100644
--- a/app-emacs/rpm-spec-mode/rpm-spec-mode-0.15.ebuild
+++ b/app-emacs/rpm-spec-mode/rpm-spec-mode-0.15.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
@@ -14,4 +14,5 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
+PATCHES=( "${FILESDIR}"/${P}-emacs-28.patch )
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/spacemacs-theme/Manifest b/app-emacs/spacemacs-theme/Manifest
new file mode 100644
index 000000000000..ee35af2c278e
--- /dev/null
+++ b/app-emacs/spacemacs-theme/Manifest
@@ -0,0 +1,4 @@
+AUX 50spacemacs-theme-gentoo.el 114 BLAKE2B d8dae7a2e3ed0d55f87f3294acd13cbcde06565c35d19ec8a52451f3c47f341420aa6e9aa036d0a6177e08432edf7b67ad58ca2bdad5bfff3269dadb3935b862 SHA512 f776939f1471433fb063509f4e0733db81a46c1182a2ba0d15ccb4270ae6890e5d8b61272b9ac88483a12789335aff5af07478c28e396c352435c97aab252345
+DIST spacemacs-theme-0.2.tar.gz 688604 BLAKE2B 1806fbe9b2b1b9a625778415aa6df74e4acc62279d811ff782620a7bb18e6a1327b16dacc174267c61fd959191f2ccaecaaf08f30ae5bb2844652bf92919cda2 SHA512 250f15e11c38e16930107bc2bf0c265876ba74383743714c0aa6bdb270f55cb14ee41c1f2c4d1008a6d90d3c361f44f363d36af0fb0e92087df8d320e0a888a0
+EBUILD spacemacs-theme-0.2.ebuild 490 BLAKE2B dd14d856a750926c23a8fde8cec2634e80d9f4a3ec5656d14197a532a81c61314c5e6d5a6f90dc86ae781fbc44d62ac5e9877ad710dd90c09d4bda88406a06a7 SHA512 42bc6f8a0585def2dbca037d5e305da394756ee2f94f4f56ed9711ca191dc11ef29c51494b77401ed4183614001d5296580845c3368d21a8e74a9baf9b96fc4b
+MISC metadata.xml 437 BLAKE2B 36e22919e1f78b39be205814074e044256b7c2ffce32427b508f4e58cb713006a3a89ef0ad4dfe79c76a459d6eeb6c353f0553d9ae4ff9e759f395be0864d938 SHA512 78251c276dd66a11ef5d467136b9b29fdaa6afe8ec2e4c6d68ab2301c4ad93b6c4e65619409e98eb28b6508d15c5ce71f10ec1fe7d1441cc1f35168e2dda0f9a
diff --git a/app-emacs/spacemacs-theme/files/50spacemacs-theme-gentoo.el b/app-emacs/spacemacs-theme/files/50spacemacs-theme-gentoo.el
new file mode 100644
index 000000000000..14e3d2142040
--- /dev/null
+++ b/app-emacs/spacemacs-theme/files/50spacemacs-theme-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(add-to-list 'custom-theme-load-path (file-name-as-directory "@SITELISP@"))
diff --git a/app-emacs/spacemacs-theme/metadata.xml b/app-emacs/spacemacs-theme/metadata.xml
new file mode 100644
index 000000000000..6a0340f0ac33
--- /dev/null
+++ b/app-emacs/spacemacs-theme/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/nashamri/spacemacs-theme/issues/</bugs-to>
+    <remote-id type="github">nashamri/spacemacs-theme</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/spacemacs-theme/spacemacs-theme-0.2.ebuild b/app-emacs/spacemacs-theme/spacemacs-theme-0.2.ebuild
new file mode 100644
index 000000000000..634cda8539e9
--- /dev/null
+++ b/app-emacs/spacemacs-theme/spacemacs-theme-0.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
+
+inherit elisp
+
+DESCRIPTION="Emacs color theme that started as a theme for Spacemacs"
+HOMEPAGE="https://github.com/nashamri/spacemacs-theme/"
+SRC_URI="https://github.com/nashamri/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.md img )
+ELISP_REMOVE="spacemacs-theme-pkg.el"
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/swiper/Manifest b/app-emacs/swiper/Manifest
new file mode 100644
index 000000000000..3cfc2747761f
--- /dev/null
+++ b/app-emacs/swiper/Manifest
@@ -0,0 +1,4 @@
+AUX 50swiper-gentoo.el 108 BLAKE2B fae1fd6258927f672a77b42eb6c826fa246d77e6ce5984c923d272001a6e7f4b523c47fcdec7103845e9705b43cea7e9a91904f6ef0f56fae4de8aa507d57d75 SHA512 1fab726ea0f7288a3f8daee32f2b70f4ca59de0e31144bc88c405a3418f342eb56d96c09754b118831aa33c55e64db8ee9e0df18821d20c1bbf2df4a4034142f
+DIST swiper-0.13.4.tar.gz 245190 BLAKE2B c4da021b92fcedfec39cc60f670c97e4a421b8d4aef8183f50c4872bed835db79884cff113f58cf21dfa7ce33158218aa0cf25d72fc0081dc1c24a3b4376c60e SHA512 bf096a13f675f87af6ea68c974455896b64921ca4d7880c9ccc444aa3cea7c7e04c61be5deb2fd57d0568ff4d86f96ffcf94494b55d84d7a9f647f49b69aec9a
+EBUILD swiper-0.13.4.ebuild 714 BLAKE2B 19c63ae56138b0fcff5a0d410fdbafbf8825a78723c7826100f833c0ba5c1735b446d9cc201fb5a1cf4475aafaa04d7c60c3149161d0d14a4aec80383459dcb6 SHA512 638c3f0c867abf74145bac09b092558983b0f6e1669c538e2c73b44eaafbe83ab324a0ed34a8538cc12c1176654af76f88eee701b03e6c8c2cd7b292a9157523
+MISC metadata.xml 571 BLAKE2B 26ca5a5dfb1bc67ad37086ddc2c2e5976d1b4c763789a27ee83fb08c4a106a21c33b4c9632a3f2858a6b6249c8c49da3e2eafa7efc5267b655c0c9b2066598e2 SHA512 1879881be5eaeb2a6bac023fd06476a2ccbd25909f7c2f722b4af3680db44b4d3a959e1ac864e86580813a0bc68a2120d936f1c2efd67a6738ee8d83a5adb6f4
diff --git a/app-emacs/swiper/files/50swiper-gentoo.el b/app-emacs/swiper/files/50swiper-gentoo.el
new file mode 100644
index 000000000000..321a3b779ff1
--- /dev/null
+++ b/app-emacs/swiper/files/50swiper-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'swiper "swiper"
+  "`isearch-forward' with an overview." t)
diff --git a/app-emacs/swiper/metadata.xml b/app-emacs/swiper/metadata.xml
new file mode 100644
index 000000000000..37581bba4db7
--- /dev/null
+++ b/app-emacs/swiper/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>
+    <changelog>https://raw.githubusercontent.com/abo-abo/swiper/master/doc/Changelog.org</changelog>
+    <bugs-to>https://github.com/abo-abo/swiper/issues/</bugs-to>
+    <remote-id type="github">abo-abo/swiper</remote-id>
+    <doc lang="en">https://oremacs.com/swiper/</doc>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/swiper/swiper-0.13.4.ebuild b/app-emacs/swiper/swiper-0.13.4.ebuild
new file mode 100644
index 000000000000..2f7a22c9eec8
--- /dev/null
+++ b/app-emacs/swiper/swiper-0.13.4.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=24.5
+
+inherit elisp
+
+DESCRIPTION="Alternative to isearch that uses ivy to show overview of all matches"
+HOMEPAGE="https://github.com/abo-abo/swiper/"
+SRC_URI="https://github.com/abo-abo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"  # Ivy, Swiper and Counsel tests are performed in app-emacs/ivy
+
+RDEPEND=">=app-emacs/ivy-${PV}"
+BDEPEND="${RDEPEND}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp-compile ${PN}.el
+}
+
+src_install() {
+	elisp-install ${PN} ${PN}.el{,c}
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+}
diff --git a/app-emacs/switch-window/Manifest b/app-emacs/switch-window/Manifest
new file mode 100644
index 000000000000..0d76daf0add7
--- /dev/null
+++ b/app-emacs/switch-window/Manifest
@@ -0,0 +1,4 @@
+AUX 50switch-window-gentoo.el 142 BLAKE2B 73da220c33ee762fdb4626aeba78ea07f67e66502eac4ec52aa15c859c8d083118c221a1e742ad188893c9e869e035bf7c8c78bc95bbb864aba82b0aaeb65d17 SHA512 a06692d1458448159fc9935c79983dd0b14e33ca1655f17cafd0eaa604d1852066e3862f4a513f04cb4b25ee350b57b6193999d801d70ae97ebfe46a4334710c
+DIST switch-window-1.6.2_p20210808.tar.gz 159948 BLAKE2B 844c4ae1c1d3a71f9ae2667e20a6e47978b0426b68439a9e0ec667884265cbf2291aba8d838c3d4f3292f4820a2f9f6e369095867a06e70a024830a9477fcf95 SHA512 ee9bd40aedbb505ff702d472b9b3888400a65b3d6f4253f4489828accab1b9ace772995be7cd7fd38815e4a87983bf0b9cb7fd394180de255eec9a08ef786648
+EBUILD switch-window-1.6.2_p20210808.ebuild 531 BLAKE2B b4c80761f15062913d5135f03f93fa9004da5fda12be669822c36724212d6fd2fb1ec77c92876800087241be225f559dc0f36a8183f415b4c187cb4d3e4c784e SHA512 799fdce4c553f5630baaf76e99ab092800b16a12cc2e78acd54ad6fc6033d31632ef253dfa63222ac092ae50cc6909c9988eea2e249cda1c3ecb9a43af41ed1a
+MISC metadata.xml 431 BLAKE2B 0712f54ee5e3d1d201f74280c5f5ed345efa3b9e0de6c68e4cb6b7352d46c78523964035fd067155fe0b620f4c7af782de203f8889efced4580931c7e83e6edf SHA512 716427a22e453363779871acf968e062b97dcdf4fa02ef70ff0d02f1c507f1c6cf267ba917b65ee024e172128f2b288f22088106b437e12fd59d79186e9e88d6
diff --git a/app-emacs/switch-window/files/50switch-window-gentoo.el b/app-emacs/switch-window/files/50switch-window-gentoo.el
new file mode 100644
index 000000000000..07dcb8b4eeee
--- /dev/null
+++ b/app-emacs/switch-window/files/50switch-window-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'switch-window "switch-window"
+  "Display an overlay in each window showing a unique key." t)
diff --git a/app-emacs/switch-window/metadata.xml b/app-emacs/switch-window/metadata.xml
new file mode 100644
index 000000000000..e4086111a4ee
--- /dev/null
+++ b/app-emacs/switch-window/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/dimitri/switch-window/issues/</bugs-to>
+    <remote-id type="github">dimitri/switch-window</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/switch-window/switch-window-1.6.2_p20210808.ebuild b/app-emacs/switch-window/switch-window-1.6.2_p20210808.ebuild
new file mode 100644
index 000000000000..cf6f3082dbae
--- /dev/null
+++ b/app-emacs/switch-window/switch-window-1.6.2_p20210808.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+H=8d9fe251d8d38b223d643df975876356ddfc1b98
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="Offer a customizable visual way to choose a window to switch to"
+HOMEPAGE="https://github.com/dimitri/switch-window/"
+SRC_URI="https://github.com/dimitri/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${H}
+
+LICENSE="WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.md snapshots )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/vhdl-mode/Manifest b/app-emacs/vhdl-mode/Manifest
index 31e728b4e7ec..f5c5e29cd648 100644
--- a/app-emacs/vhdl-mode/Manifest
+++ b/app-emacs/vhdl-mode/Manifest
@@ -1,5 +1,8 @@
 AUX 50vhdl-mode-gentoo.el 146 BLAKE2B 4a747d323606390205a52c3cebfd1e54b153e9e18ec3fa5ed557493df1579b783cd29fdef2a031f6b8f8c573fa3eb82e312c8e7449a5e91ffd00ebe9b4c874c1 SHA512 22f1d437f487fc2c0e739000687424271027c2defa87eec696c79ff5df958c6087475c7ff84c2af39e2eb756401ec1d4b1f013a27af1639c416843899333ee21
+AUX vhdl-mode-3.38.3-emacs-28.patch 437 BLAKE2B 33490a56560d45dc66fb03d12a4f7e08271379f37c1dc328e083c936f10b238c640f5baea96a6606e2aef75f23eb023532d92c46cc7ef83e7338007071d7f17e SHA512 664dc025d7105a83f4d5eb654cdcb17c5828dc7b842654b0df30f36498c9cbe1edd3dcc4ba335c0fe874ded898e7ca1473e1fb18aeefb8354426fc6a5f695d58
 AUX vhdl-mode-info-dir-gentoo.patch 522 BLAKE2B 35204f9ec727ec5ec44ecc03a99cedd5a5a3bc62e59dac577ed40dd0099cf08788b149e16d4fc0c2953dbe70bad8810eaed8496165e3b65ae1d8c23298a2aa5d SHA512 7ca2b0ea5c07255bf99e6a9105c120df924178a596e97d6a1bfcedfda4bcdf4f093f1383d1ea2a1383207c19971a110696ef9b49b17542e79d92c4501316039d
 DIST vhdl-mode-3.38.1.tar.gz 318400 BLAKE2B 2ddad9f4e8fdb0fafd2e27075f5722fcf7959a2b50ad61c5860af52706d9579065e0880d7b9bd1b884c21cfc902760dff006404490c8cbb1474831aa4c6d841d SHA512 2cc12994e17658d65cffa348c59ac3208cc0f498731941b8f64da68e258ca57d6aa500d72103b005996cf3496e119cf59b52bbc1c4b740401685030b42f272a8
+DIST vhdl-mode-3.38.3.tar.gz 319205 BLAKE2B ec64bd5fb783ef5e295319ca86ef147a021ffce352ddca49f19dcdc6b79c5bc9ed9350ad154321dbf40a84f501d9da70ffd685d2376a8da98cd2426b9df4bd36 SHA512 4738927daa424c5d66bc69e021e6b624cc23a3bf70a6f78ea5a7fc07ad0bd0aaf5429594b6ff71067edbf48802d7d77f38d607708541fb59e259cc1a4221fb60
 EBUILD vhdl-mode-3.38.1.ebuild 521 BLAKE2B 21648410afa0d7a7a10408074a2bbbd96c49f6055d0e18f384eef6bee6b43a7bf8f518c46d722c80590c75c901c1df1218cc77c2257f621cb5ea0362dafa9b08 SHA512 34412a8a861fdaf58f604f411703534d90aee86770a28c03a80c3541d72a39773e05e1153eb23011d31511159240e75966124623112a054fb9e74b0ac7af8971
+EBUILD vhdl-mode-3.38.3.ebuild 584 BLAKE2B 0b8a56b4eb5d81ee51f2b6ae798e8f00dd9688a5d467c4493367435edab8b3c393c47e1accd7afff908e6b81212bd5b909e2895e38192d3b3a70405cd83b7b14 SHA512 d9b2a9b66920be6130227ef4a2e94a1225a1cb5e92ad9d56a1d1fce72e91679cb4dfb5e97f122a777333616fbc9ddcbe99f498c071be8d36ff24eadaf1b3ebc3
 MISC metadata.xml 283 BLAKE2B 81c49021199f71096079a27f9121390fb8c1285c54b9478583ff2d647277fa106ef12456d7097c4be092fc48b514a1adcf855ca0fac911598232ef9eb7f102c0 SHA512 f32b303760addf5d4db8d18bd10fb677353cdfa4c5e545d47804ef756cf5e5a21f8b8efb631b08f802185913ceb98da820e404e06eb03d01fe9ea85c10d1ac13
diff --git a/app-emacs/vhdl-mode/files/vhdl-mode-3.38.3-emacs-28.patch b/app-emacs/vhdl-mode/files/vhdl-mode-3.38.3-emacs-28.patch
new file mode 100644
index 000000000000..be53bb713da2
--- /dev/null
+++ b/app-emacs/vhdl-mode/files/vhdl-mode-3.38.3-emacs-28.patch
@@ -0,0 +1,11 @@
+--- vhdl-mode-3.38.3/vhdl-mode.el
++++ vhdl-mode-3.38.3/vhdl-mode.el
+@@ -2475,7 +2475,7 @@
+   (defalias 'speedbar-line-directory
+     'speedbar-line-path))
+ 
+-(define-obsolete-variable-alias 'speedbar-key-map 'speedbar-mode-map)
++(define-obsolete-variable-alias 'speedbar-key-map 'speedbar-mode-map "")
+ 
+ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ ;;; Help functions / inline substitutions / macros
diff --git a/app-emacs/vhdl-mode/vhdl-mode-3.38.3.ebuild b/app-emacs/vhdl-mode/vhdl-mode-3.38.3.ebuild
new file mode 100644
index 000000000000..5099ff5fbfd8
--- /dev/null
+++ b/app-emacs/vhdl-mode/vhdl-mode-3.38.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="VHDL-mode for Emacs"
+HOMEPAGE="https://iis-people.ee.ethz.ch/~zimmi/emacs/vhdl-mode.html"
+SRC_URI="https://iis-people.ee.ethz.ch/~zimmi/emacs/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-emacs-28.patch
+	"${FILESDIR}"/${PN}-info-dir-gentoo.patch
+)
+ELISP_REMOVE="site-start.*"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="ChangeLog README"
+
+src_install() {
+	elisp_src_install
+	doinfo vhdl-mode.info
+}
diff --git a/app-emacs/which-key/Manifest b/app-emacs/which-key/Manifest
new file mode 100644
index 000000000000..dacbea346606
--- /dev/null
+++ b/app-emacs/which-key/Manifest
@@ -0,0 +1,4 @@
+AUX 50which-key-gentoo.el 106 BLAKE2B 71254e87973b2d730eb3caad021a07c48681c71f93a2e909663143a95b934469fcd76c204aaa73ed3b9c1457caf9a3c29dcf459bce4aaa2cf3d412ea8be93ef2 SHA512 9cd7f95f75ed3a45c2084164d9bd1bc7e5a01d5153596e8840e6e725a4ba11110b6618cd039be7652b695907d357c1efebd5450f5821e44ca824fb6beb79855d
+DIST which-key-3.6.0.tar.gz 462441 BLAKE2B e56dacff2003192e769e53f728538246f4b3c2f00273022a81382e3afaf4c1b7016a2da468ade1e1f0b3b33df7352a327f75c43fef990c432bbb55f3aad7a934 SHA512 8ecfa3e5d0529cc0e879772d2ea2fcbbdfc8ab559dc8befddd63b91e6ed726baa6c0069bc0f30dc417eb288d02a281f1b07b5c966a361f390cab4d7392c2e56c
+EBUILD which-key-3.6.0.ebuild 916 BLAKE2B 0640a651eb4fd9787900502def0218172490543b03d9362be6902cb654ba75b3edb27831e9ec69987d052cb63f0b952c2aeb1830f991299d5644984e2c1411c8 SHA512 8568a8c377fac738c0d1519b5e9abb3a9190e07b4ce3efd93580ed7a8c2c0ead6004b7fe2468edaa5d7ff0f2e677a420ac839ed7c35f9cfdd7d23803ffc5d845
+MISC metadata.xml 435 BLAKE2B a9b9271949169684743f07fa04c907d33112498d1e258fd6093cfa85425146bb4c2e6e5f326ab4de76704bf294ee8402162855e98440052511ee0f0393fbb458 SHA512 66167f5d8a9c20b093005143d3aa2ddb50423cc2dbe933c644d4551ec4c4e914b7f773a0732ac7b930e87facadbce0e7c6435aac1c7b5982b38d58a41c75376a
diff --git a/app-emacs/which-key/files/50which-key-gentoo.el b/app-emacs/which-key/files/50which-key-gentoo.el
new file mode 100644
index 000000000000..d46c0735a841
--- /dev/null
+++ b/app-emacs/which-key/files/50which-key-gentoo.el
@@ -0,0 +1,3 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'which-key-mode "which-key"
+  "Toggle which-key-mode." t)
diff --git a/app-emacs/which-key/metadata.xml b/app-emacs/which-key/metadata.xml
new file mode 100644
index 000000000000..d1d749f4165a
--- /dev/null
+++ b/app-emacs/which-key/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/justbur/emacs-which-key/issues/</bugs-to>
+    <remote-id type="github">justbur/emacs-which-key</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/which-key/which-key-3.6.0.ebuild b/app-emacs/which-key/which-key-3.6.0.ebuild
new file mode 100644
index 000000000000..e5243f24d20c
--- /dev/null
+++ b/app-emacs/which-key/which-key-3.6.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24.4
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="Display the key bindings following your currently entered keys"
+HOMEPAGE="https://github.com/justbur/emacs-which-key/"
+SRC_URI="https://github.com/justbur/emacs-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/emacs-${P}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.org img )
+SITEFILE="50${PN}-gentoo.el"
+DOC_CONTENTS="To enable \"which-key-mode\" globally,
+	add the following to your init file:
+	\n\t(which-key-mode)"
+
+src_test() {
+	${EMACS} ${EMACSFLAGS} ${BYTECOMPFLAGS} -l ${PN}.el -l ${PN}-tests.el \
+			 -f ert-run-tests-batch-and-exit || die "tests failed"
+}
+
+src_install() {
+	elisp-install ${PN} ${PN}.el{,c}
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+	einstalldocs
+	readme.gentoo_create_doc
+}
diff --git a/app-emacs/yasnippet-snippets/Manifest b/app-emacs/yasnippet-snippets/Manifest
index e97c0233a0a1..554fce91c49a 100644
--- a/app-emacs/yasnippet-snippets/Manifest
+++ b/app-emacs/yasnippet-snippets/Manifest
@@ -1,6 +1,7 @@
-AUX 50yasnippet-snippets-gentoo.el 161 BLAKE2B af28f32bcf248a9557c25e4afd50110b6fdeb8f376b41ba645da1ee3c39429cf6b967bc77ce60f29a28d7dc01903a620997cb9a6bf7a62628bd3ff7495f8a015 SHA512 f675ccdd153f0c386d384df2db90598c08f2d49cadc434d1bba7707a7681b0d1dfa410bf188250b05003544c17bba11b132d9d8f3741865cf64ccce5b117c4d4
+AUX 50yasnippet-snippets-gentoo.el 221 BLAKE2B 608ecd2c72d3ff72c7775bfaeb3edbbc4e066a7ed9e1f10720fb93023319e0141e9694c6bbbb697264b62f9f47721f2f0ac186286a38d1859bf3e5529e8ae118 SHA512 a7a89ab8d5e0c66ada64b04b9bc0917df6c20537c80cebea43ee1210635b20e8b34549455c21217fdaa169dc5eafaa9c5c0032605a17716276437e982653428d
+AUX yasnippet-snippets-dir.patch 523 BLAKE2B b9e0712cae1b65b947b04d5349bb25007ee6f7db0cd8dd56ff7db15192932d88f7c9ab1b1fca77fca450152a52ec19f275f568f947879eab68b755731b48a5ad SHA512 f1a2c1c3db8a752a38e32147d2a8ffbae0666de4657b647ee126b96db0e4a499384148e3d316a72dcfdb5083c06c7c9eb0a47f329a24ac68532052acf994f79d
 DIST yasnippet-snippets-0.3.tar.gz 97229 BLAKE2B 26fe83c35be1b20b6a1e414144149cf1feaf4463833634bbd0a3db6f56b1da46d8e379c3dd19217cfd36f12cb9dc796eac4efef5c2ba472ce79f8c8b8d816969 SHA512 4aaac9d7c880642a1e802abb98bd6d6c94557fe0e609db5ce5b4ce2af921235d3e6bb2488c052adbe2940d41e85297520081ae0847b52642bc97610e6614727f
 DIST yasnippet-snippets-1.0.tar.gz 178027 BLAKE2B 0b44c94c3ad3f2a1208aefba110945aeae74e7278c93078c59677985efc89767b670c99b4b8303b56ea0b748375762ada1e45653e02922b248273af5818514d4 SHA512 2df010f24e51d0156bcb3d488cd6a63a47d2d92e4c5f3cd081e377dc91426d630bde41db6f79d1b5ac1e932e4d0ab11f9be945e94fb35d50b1789adab19bd15b
-EBUILD yasnippet-snippets-0.3.ebuild 614 BLAKE2B 73559131e05601b6a1f80ee513e8a2eef5f718d9b037476adfe2dfdb9d15162ee0dc6e2b249851aa1e3aef2ebf0b9363eab6f9e2996adf1d5c19496d75b3012c SHA512 d9d3d0044e4a527ce6b8b0e93f9ec4e63ac0a331d2834c9d283d9cd5f00c0627ece69b5ae17e346401cd345ec32a2daf97f7c86e1833980de2689b85bf0bb89b
-EBUILD yasnippet-snippets-1.0-r1.ebuild 747 BLAKE2B cb4f16c89083b1cd22fc38c6988808a6dd6a7b77fcdf45216503dd13e39ce0e4f162ac357ad7d9aec9c7085969c0416d39f06bd14fa3281f8d18d5829e462770 SHA512 36d4c6c34ec69e8fcbc003abdbff220f24662f403d38c101d386c3a0f830b46a7afedac12ed830fce911a344020e73ac0a2c2fb1812580ff5fd1f9d1c65455da
+EBUILD yasnippet-snippets-0.3-r1.ebuild 883 BLAKE2B 002e62e94373174fe0ac3d6c5c73c55a264ca375e9516db3d4611bc77088d3058be7ec40fb9b0ce77ccc6d40d63054284d32dd2c78b68b8a6fbab83207d05d2f SHA512 61e17064bc2d8f575759665b64bb3bdf639e95634d9f17254e122a3318b58d6c0204a60c057302de296975ddf2f5087b0901a7ca50c0b32752c7fe1c5c431d61
+EBUILD yasnippet-snippets-1.0-r2.ebuild 883 BLAKE2B 002e62e94373174fe0ac3d6c5c73c55a264ca375e9516db3d4611bc77088d3058be7ec40fb9b0ce77ccc6d40d63054284d32dd2c78b68b8a6fbab83207d05d2f SHA512 61e17064bc2d8f575759665b64bb3bdf639e95634d9f17254e122a3318b58d6c0204a60c057302de296975ddf2f5087b0901a7ca50c0b32752c7fe1c5c431d61
 MISC metadata.xml 377 BLAKE2B 78f369ac63a6ba16eabfbc21367b0e29221a94a8460b877e58b23e4c4176e3d4393ac7cb657057fe239298fc9836365b8a5d6ec789251ed552e684590b40e6e4 SHA512 72e8f247f2bb604ea52229c1aa68abf0fdd6649c87ffaad7f2893131f522cc3d7283251d8e365def16ac5eea831c98472a0ebe591cb6188132e0d7696b559b55
diff --git a/app-emacs/yasnippet-snippets/files/50yasnippet-snippets-gentoo.el b/app-emacs/yasnippet-snippets/files/50yasnippet-snippets-gentoo.el
index 2db51796990b..4c85ffac5510 100644
--- a/app-emacs/yasnippet-snippets/files/50yasnippet-snippets-gentoo.el
+++ b/app-emacs/yasnippet-snippets/files/50yasnippet-snippets-gentoo.el
@@ -1,4 +1,5 @@
-(eval-after-load "yasnippet"
-  '(let ((snippets-dir "@SITEETC@"))
-     (add-to-list 'yas-snippet-dirs snippets-dir t)
-     (yas-load-directory snippets-dir t)))
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'yasnippet-snippets-initialize "yasnippet-snippets"
+  "Load the `yasnippet-snippets' snippets directory." t)
+(eval-after-load 'yasnippet
+  '(yasnippet-snippets-initialize))
diff --git a/app-emacs/yasnippet-snippets/files/yasnippet-snippets-dir.patch b/app-emacs/yasnippet-snippets/files/yasnippet-snippets-dir.patch
new file mode 100644
index 000000000000..2d5c8f2e483b
--- /dev/null
+++ b/app-emacs/yasnippet-snippets/files/yasnippet-snippets-dir.patch
@@ -0,0 +1,18 @@
+index 078ac04..1c84318 100644
+--- a/yasnippet-snippets.el
++++ b/yasnippet-snippets.el
+@@ -35,13 +35,7 @@
+ (defconst yasnippet-snippets-dir
+   (expand-file-name
+    "snippets"
+-   (file-name-directory
+-    ;; Copied from ‘f-this-file’ from f.el.
+-    (cond
+-     (load-in-progress load-file-name)
+-     ((and (boundp 'byte-compile-current-file) byte-compile-current-file)
+-      byte-compile-current-file)
+-     (:else (buffer-file-name))))))
++   "@SITEETC@"))
+ 
+ ;;;###autoload
+ (defun yasnippet-snippets-initialize ()
diff --git a/app-emacs/yasnippet-snippets/yasnippet-snippets-1.0-r1.ebuild b/app-emacs/yasnippet-snippets/yasnippet-snippets-0.3-r1.ebuild
index 3b465cd3954b..e1d0818702d5 100644
--- a/app-emacs/yasnippet-snippets/yasnippet-snippets-1.0-r1.ebuild
+++ b/app-emacs/yasnippet-snippets/yasnippet-snippets-0.3-r1.ebuild
@@ -16,16 +16,26 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND="app-emacs/yasnippet"
 BDEPEND="${RDEPEND}"
 
+DOCS=( README.md )
+PATCHES=( "${FILESDIR}"/${PN}-dir.patch )
 SITEFILE="50${PN}-gentoo.el"
 
+src_prepare() {
+	elisp_src_prepare
+
+	sed "s|@SITEETC@|${EPREFIX}${SITEETC}/${PN}|" -i ${PN}.el || die
+}
+
 src_compile() {
+	elisp_src_compile
+
 	${EMACS} ${EMACSFLAGS} --eval "(require 'yasnippet)" \
 			 --eval "(yas-compile-directory \"${S}/snippets\")" || die
 }
 
 src_install() {
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	elisp_src_install
+
 	insinto "${SITEETC}/${PN}"
-	doins -r snippets/.
-	dodoc README.md
+	doins -r snippets
 }
diff --git a/app-emacs/yasnippet-snippets/yasnippet-snippets-0.3.ebuild b/app-emacs/yasnippet-snippets/yasnippet-snippets-1.0-r2.ebuild
index 693935e3fecf..e1d0818702d5 100644
--- a/app-emacs/yasnippet-snippets/yasnippet-snippets-0.3.ebuild
+++ b/app-emacs/yasnippet-snippets/yasnippet-snippets-1.0-r2.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=7
+EAPI=8
 
 inherit elisp
 
@@ -14,14 +14,28 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="app-emacs/yasnippet"
+BDEPEND="${RDEPEND}"
 
+DOCS=( README.md )
+PATCHES=( "${FILESDIR}"/${PN}-dir.patch )
 SITEFILE="50${PN}-gentoo.el"
 
-src_compile() { :; }
+src_prepare() {
+	elisp_src_prepare
+
+	sed "s|@SITEETC@|${EPREFIX}${SITEETC}/${PN}|" -i ${PN}.el || die
+}
+
+src_compile() {
+	elisp_src_compile
+
+	${EMACS} ${EMACSFLAGS} --eval "(require 'yasnippet)" \
+			 --eval "(yas-compile-directory \"${S}/snippets\")" || die
+}
 
 src_install() {
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	elisp_src_install
+
 	insinto "${SITEETC}/${PN}"
-	doins -r snippets/.
-	dodoc README.md
+	doins -r snippets
 }