gentoo auto-resync : 19:03:2023 - 18:35:20

32 files changed, 223 insertions, 112 deletions

diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 12ed5d38eb44..382d7e5db9bf 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/all-the-icons-ivy-rich/Manifest b/app-emacs/all-the-icons-ivy-rich/Manifest
index c6e6028191d8..47be51bc7de3 100644
--- a/app-emacs/all-the-icons-ivy-rich/Manifest
+++ b/app-emacs/all-the-icons-ivy-rich/Manifest
@@ -1,6 +1,8 @@
 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
 DIST all-the-icons-ivy-rich-1.8.0.tar.gz 26090 BLAKE2B ec0ccd4192007938d38dacf83c34bdae13df55400405dd0d25ba647c8ff0d50f6675fcccf80eb8cf76827111cd73cb189a70f1e8197b04c4d1985dc1600697f0 SHA512 3bc77353890d67b09016260cc47674ca0a1a73199eb50ca52f9a7f97039f99135151cd9e551919a0d4eade01dfd65dac14694e6226f1f7934cc2e213f35a512e
+DIST all-the-icons-ivy-rich-1.9.0.tar.gz 26428 BLAKE2B f2d23fd537921fd48ce26caac35a5ac9516ad2bffdb99c37d507ba2640179aed8c5f88361c5e9e34c2945bdb9619d2416d8c5fea55c0dd25d0fe0fe42cd5c353 SHA512 ac0c3f18d3842eb4b9c6f098e00814f421277b44c4253f9efb28c6d02e94fbb159db40cd9ade877ce218154c30210bb39dc93bfd95a7a61a71b09cbed1af5d70
 EBUILD all-the-icons-ivy-rich-1.7.1.ebuild 527 BLAKE2B 7e0abd723cab3a6a092de68f7e5621f5df6d3dc07ab4cfffb522480fbbaf8aef7f5db0190a70459b83dc956542b5a9fb8829128250d7ce17cd9a09fcba2aeb63 SHA512 f3c1cb9edaafa0032242d304908bcdc21ad2ac26f8e3430c1cf566db5d9acc47de5aac44249374eb611dee52fef221105050e44bf2706eebbb198235340a6027
 EBUILD all-the-icons-ivy-rich-1.8.0.ebuild 526 BLAKE2B 3802466faf408c0763f848ef0603540edbc6b3d74874ebc9dcd7aad43ad0dfc81350da656f64fcc523745f750d58a2e9cd054efa2b5b91ebd058e7c93a4f9f97 SHA512 ebc89270591f0601a981e055058f2317a69913b1057583b9f6b22bcad557eef933a171824646616cf43c15b5fd40e9820b81b34d972ca1c8abdd03bc2084395f
+EBUILD all-the-icons-ivy-rich-1.9.0.ebuild 527 BLAKE2B 0eb5cb9679997f6106714cefd20ab909e873ca2f170fc1c2b547ccb47c47510cf55e8d1079d3a6549c2ed7f3f9d8ab32ecf968314ad94d4378348d751cda43eb SHA512 539e9f7655a5bf6e8c4a25f675e35e0e2f6dd392df15a581b2304971cec7f5cc4dc6d32aa998e6ba9621099d93ffbcb07c874f4ac9d2ccd7fe40f2a5c4eca388
 MISC metadata.xml 455 BLAKE2B 8e42e8f90284961bfa2009e40e212db1665b4624ff14b18689a32ec25361d9eefa65acc7e5b7e189d8e3b3b397eb41bfa36e672732f066a937b6bbf3fb70d5e2 SHA512 01b692b5436521b2a4e781aca48fbbee42979990521ab5b74ae6e0fa8f17725880ef9d096d77eb7dd5ebb087981c11d2d5f3736fab536c587211ffae19f784f1
diff --git a/app-emacs/all-the-icons-ivy-rich/all-the-icons-ivy-rich-1.9.0.ebuild b/app-emacs/all-the-icons-ivy-rich/all-the-icons-ivy-rich-1.9.0.ebuild
new file mode 100644
index 000000000000..05713b242f97
--- /dev/null
+++ b/app-emacs/all-the-icons-ivy-rich/all-the-icons-ivy-rich-1.9.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 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/citar/Manifest b/app-emacs/citar/Manifest
index 4fceb32912d4..8f91183b0ed1 100644
--- a/app-emacs/citar/Manifest
+++ b/app-emacs/citar/Manifest
@@ -1,6 +1,8 @@
 AUX 50citar-gentoo.el 69 BLAKE2B 4852ed7422e341e92f938dceedc3d6f0d0fdf8f955ef93021286d9d10e7c3a5d726175e2e79d34ca67f6815d7d6e0445ca2c9a80a2a6690daf4bda49d9972f96 SHA512 0afe62329cd2dc6ea548bbc28aa3c7fea86fb2a20febc91528ba994c77edf08fd72dcf1a0c417dcd4db75b4a6b8e237ade2257130ff3887499377b8f77fefc46
 DIST citar-1.0.tar.gz 1339812 BLAKE2B 2093cc820199219ec70f99a746c630f2b8e6b4d464b1457d7b7db1c5c953138e7dd5ac55e21b13e7417dd0a764b6f1caaf400af353ecce9fb7e1bc578f570b0d SHA512 7f02a4e41a927c2c7c625189fa38caea8f0fc5616dd3487a93f71a373d1e4a124dd1cc520778a1ff2fa6dd7c3b619b539e3b0e47cb9caf7edd16e27e9d739585
 DIST citar-1.1.tar.gz 1340039 BLAKE2B b2090a35a582918300f5e4bb2188d463630988830305aa4bb5e1e27f45ff8c96ca35458e610e13658b2120af497f9b877054a6fbebda48e0a4d87824ef48e9c8 SHA512 2b1924ef1a05a170eea31f844055b914410cd35613eda6604f08164818a8fc5480fc5a6d6f055ba95331b517305e51a6e671214cc88fccbda2430ae9b06dda49
+DIST citar-1.2.0.tar.gz 1417090 BLAKE2B 40673ee0f2ee5b4f86928e140714a517958d261c632ea1e7bcb3dcd3dde3a0bb9baaaa1107f50447f1d8e87485570033afbf0c652fa6b3f1fbffeda7b7df04c3 SHA512 31f817de77bc8fe9e2fdf96ac7df521ebe5685cf49a2a78cd2b1cd51e538165bde36fc8515c2fd7c20d4c6160372fdf37c1b870b12167f946c0f3934edd5fb7c
 EBUILD citar-1.0.ebuild 979 BLAKE2B 8b40e7b2c88ea5b739db50ffd588be12720330a89c84a11c2e0092fab7c08bc8c411e04e476df97867a7fd0ba59bee8829519a99fc2856c70ecbca7da8c2a29a SHA512 192a72c0a645dde0fabd681769f1dfa1eb9cf5f2cc91a996c7f52f837ef014543b2d2f299b35dcf3ee5c696da66f3fa63fc84caa64692d599293f95b67424bf0
 EBUILD citar-1.1.ebuild 979 BLAKE2B 8243cd6b70792fcf30ba71450389a1475cb4c5a66b794824feb4861cde560f34fc9b8fc09cb56b9ebd88baf322f9f9b296daeb8e294ee6a15ccefbb3db298774 SHA512 23566dbc5ff4ad70d61e382fbe4107295e0b1c36946d957434c92e04e8662585fe3b3f89eb09637acaea6725ad6a411a46cd3b657e66256caecbddb6356d766b
+EBUILD citar-1.2.0.ebuild 979 BLAKE2B 8243cd6b70792fcf30ba71450389a1475cb4c5a66b794824feb4861cde560f34fc9b8fc09cb56b9ebd88baf322f9f9b296daeb8e294ee6a15ccefbb3db298774 SHA512 23566dbc5ff4ad70d61e382fbe4107295e0b1c36946d957434c92e04e8662585fe3b3f89eb09637acaea6725ad6a411a46cd3b657e66256caecbddb6356d766b
 MISC metadata.xml 1034 BLAKE2B 10d658566f58e3a91deab1c4d2035bcd25ee216777aa105b1e8c8853ab103add779f0f439e706496b2468a3fcb8490320ccb454d90c2e70b5b8bbe9f218773e4 SHA512 4b81115dfccc471987c63876c0b282875fe95c5738f69dfdf7a6300c37998102f2fdda829d14938871bd857fbb5d145e6c62b5b4be40b532f46245256d0be259
diff --git a/app-emacs/citar/citar-1.2.0.ebuild b/app-emacs/citar/citar-1.2.0.ebuild
new file mode 100644
index 000000000000..9c62e000f5a7
--- /dev/null
+++ b/app-emacs/citar/citar-1.2.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=27.1
+
+inherit elisp
+
+DESCRIPTION="Emacs package to quickly find and act on bibliographic references"
+HOMEPAGE="https://github.com/emacs-citar/citar/"
+SRC_URI="https://github.com/emacs-citar/${PN}/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	app-emacs/citeproc-el
+	app-emacs/parsebib
+"
+BDEPEND="${RDEPEND}"
+
+# Embark integration has it's own package on MELPA, and it is probably better
+# to split them. https://melpa.org/#/citar-embark
+ELISP_REMOVE="citar-embark.el"
+
+DOCS=( CHANGELOG.org CONTRIBUTING.org README.org images )
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp_src_compile
+	elisp-make-autoload-file
+}
+
+src_test() {
+	${EMACS} ${EMACSFLAGS} -L . -L test \
+		-l test/citar-file-test.el \
+		-l test/citar-format-test.el \
+		-l test/citar-test.el \
+		-f ert-run-tests-batch-and-exit || die
+}
diff --git a/app-emacs/company-coq/Manifest b/app-emacs/company-coq/Manifest
index edd790f3929c..d4113920e234 100644
--- a/app-emacs/company-coq/Manifest
+++ b/app-emacs/company-coq/Manifest
@@ -2,6 +2,6 @@ AUX 50company-coq-gentoo.el 180 BLAKE2B df1fe948ed5daae78cbe5eee1f41dea6fee8bf09
 AUX company-coq-refman-path.patch 490 BLAKE2B b4fb42289d969b324ebb946c79fb78989e4553910a330007195691b1e1a9add38dac10e12aee8f06b01d4e1575be9dd0f24904ec9376833a5028795a49d5f74e SHA512 097ab6ab479c2f0478877d077cfd6d9792c4b9807a4554e029ce6d76a1a45f728662fb245a94e0e9b9068a33c07a4edcb582f215548eccdb66d5a3bf1cd427f4
 DIST company-coq-1.0.1_p20210708.tar.gz 3803957 BLAKE2B d2bb3022228cc7a103d4343e914ec20cf539405062e475c7be6cd0db776490a7af35f10fc9e712733bd8f7c6667a05f8d3d6c4321820a61da0847b8bc718c182 SHA512 92a7d0bf8326460519e5f47fe1e9779a4cc2d2bf069898e1797fabf483535eca8244c1ea36bc525aac418e2c26036a8580076435ccbfaa5bdc2e6ee6f133b655
 DIST company-coq-1.0.1_p20220314.tar.gz 3804039 BLAKE2B 93458da7615f7c6f4a6c96c56aa14b95abd0a738a6653c5a3564829f3182ce890fdf52d4aa02e7b5079b7dd17db46e2eb9a7dbe271c579755e12606ba001487e SHA512 07b3c7f639e663ac9c114300fc53a729e2877563d9e2c4434010e12fa7ab435465a7daf6f47fc11076506f18d056c9672be4c6f4246a1b559284a0bf739dc696
-EBUILD company-coq-1.0.1_p20210708-r1.ebuild 886 BLAKE2B b3024d1a1e4f253ba3c5d87cd941e616fea32518f9b5610fba0caad8363a5f884d4c1397793db5d925468adb14e845ca35d9b91ffacd184ab98506f519b40b56 SHA512 acfa9b003f9b9b06a4a9ff9e349bcdaf8a656d1eedd7910e8fb48192d8d4f9c5a4743338a7d21b798cbab34b8e6af66ff369a6939b58cedb51e357b5c88d7039
-EBUILD company-coq-1.0.1_p20220314.ebuild 886 BLAKE2B c7efde9f2cc401f16c7fb5330d95316884a675ee468c011551d5d896a4323c2ca5b1b054c84f7a077d8886a36901d0685a79dcc9c8cb6d090a91c917e9be29a5 SHA512 151176ee2a72b5d1f67575350fd75385de1bc467ed623d1251d84f9534071b9599f8f55249d65d5424635894b4ad6b86ba9a8f12f7fbf1d65184195333e5ae17
+EBUILD company-coq-1.0.1_p20210708-r1.ebuild 915 BLAKE2B 2d2bb499c95061a85b1f0bfd737520cceb966929698909e187b5a7d0c63dca54fba171237bbdbe1dffbcf2f4b1ca2878c02de0aba7958a59f7d01ff6815c74bc SHA512 773b49a57ed9111e5ab9dbf5162d77a281867d295da4f5c705ccd0704f3520b2889c3877c6e0af3f51ca813c0a880eea288c5408514568331044c46b23d8e86a
+EBUILD company-coq-1.0.1_p20220314.ebuild 915 BLAKE2B 6f8656fb731597afaf24a97219542f6917d27dd7bebfc0a67078291df674757b48d43a48920776bfbe71b692c535b617389d73c5b4896c32d6f764bd750d016d SHA512 8134f186d40587c6f98b55af56c46ff006e5a8c04c0726cd919f165a33c045133ad0f888c46b8543dadfeab5656a642aca931914cbe74f45e2665cf4273ce23b
 MISC metadata.xml 905 BLAKE2B 85dc026f6b0fe495795fc3d3f8e41c4fc5470c95ab7d006ba181ab2cdbac1fc664ab69ded1a7a8588b30a4e5b58798f4f3c9e10564111c3abaf8d126524a87c8 SHA512 268fe6e3ad1e37417f9912d7af2ac9732d187a5830af63f9c4b8bc06ffbad1841c5bbaa934aa5d339313356c7bebbd4352ee1cab659a6ad89ec0ed9b0f503dd3
diff --git a/app-emacs/company-coq/company-coq-1.0.1_p20210708-r1.ebuild b/app-emacs/company-coq/company-coq-1.0.1_p20210708-r1.ebuild
index e03ba27d4576..4d43b44f080d 100644
--- a/app-emacs/company-coq/company-coq-1.0.1_p20210708-r1.ebuild
+++ b/app-emacs/company-coq/company-coq-1.0.1_p20210708-r1.ebuild
@@ -3,14 +3,14 @@
 
 EAPI=8
 
-COMMIT=382db93374380e5db56f02934ee32bbe39159019
+[[ ${PV} == *_p20210708 ]] && COMMIT=382db93374380e5db56f02934ee32bbe39159019
 
 inherit elisp
 
 DESCRIPTION="Collection of extensions for Proof General's Coq mode"
 HOMEPAGE="https://github.com/cpitclaudel/company-coq/"
 SRC_URI="https://github.com/cpitclaudel/${PN}/archive/${COMMIT}.tar.gz
-		-> ${P}.tar.gz"
+	-> ${P}.tar.gz"
 S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/company-coq/company-coq-1.0.1_p20220314.ebuild b/app-emacs/company-coq/company-coq-1.0.1_p20220314.ebuild
index f6cf92448147..f1c8a7e4b396 100644
--- a/app-emacs/company-coq/company-coq-1.0.1_p20220314.ebuild
+++ b/app-emacs/company-coq/company-coq-1.0.1_p20220314.ebuild
@@ -3,14 +3,14 @@
 
 EAPI=8
 
-COMMIT=a6e349e0131f676a885bd14c908fd26054b2df42
+[[ ${PV} == *_p20220314 ]] && COMMIT=a6e349e0131f676a885bd14c908fd26054b2df42
 
 inherit elisp
 
 DESCRIPTION="Collection of extensions for Proof General's Coq mode"
 HOMEPAGE="https://github.com/cpitclaudel/company-coq/"
 SRC_URI="https://github.com/cpitclaudel/${PN}/archive/${COMMIT}.tar.gz
-		-> ${P}.tar.gz"
+	-> ${P}.tar.gz"
 S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/consult-flycheck/Manifest b/app-emacs/consult-flycheck/Manifest
index 9901ca09eba0..a9d511b0318c 100644
--- a/app-emacs/consult-flycheck/Manifest
+++ b/app-emacs/consult-flycheck/Manifest
@@ -1,6 +1,6 @@
 AUX 50consult-flycheck-gentoo.el 92 BLAKE2B 5532c765040436488578ff7601bba176f89f35090b090c7320226dc63f75182dd5dcb0fa7f99d66feba21fecec1711278b67b62f2e6a0fcbfece329af35ce95e SHA512 3ebed324f0c5a63c9bf6b52e4d297a1d6ee4e461939bd1307ad3189b2830c897a6107f7cc93077ececf8fc4ccd8724b546229ead17ec399133c5ddf999bae69e
 DIST consult-flycheck-0.8.tar.gz 2146 BLAKE2B 9b27456095012818b73484303c9d798595fb7997658952d8878b8ff63cbec860cb562e871e009ab4535f8ae12d67c1283b2ca80ce0927a471a846137a6eec8f4 SHA512 304cb58b164155f95e6c8088949fc3946145a50461388a2c8a085c940c20ada0e8834c861ee1f8900a02f308ed09c0a04d10917e94da8be0500539ddf87fe217
 DIST consult-flycheck-0.9.tar.gz 2189 BLAKE2B 6fd39f9f79af54a9b02b1e1d2884b0caaba45562e13b4f10ec7bf95c9c193a248b24c0eb3160e1a97bae98c5034e24cd379f8ff54d66cf4e7ece8b426aad826a SHA512 ba742a28f37943680739b924dc163cf96d2557e22be420a7a3ca27db79365352a5b6223d988fc45e92c578e00114b2415d1be3f13feb70ac0c5509d5cd915199
-EBUILD consult-flycheck-0.8.ebuild 472 BLAKE2B dbf051cbcadf6eaa2b5c2f8edc83f067f707940038aa7523c09ea02fa63d2686a5022a963a11c1f7cc6de7585a21da1b7e02f3d1576b14bca9482e39b6d1a416 SHA512 a900c3bba996a512188c392b81538c10c722c1e6f3bf708f3c26d6a927b1f76d3ae4d82bba512ff42170bd380c10e39f36aeaf4ec9152a29cec494d2990f15dd
-EBUILD consult-flycheck-0.9.ebuild 472 BLAKE2B dbf051cbcadf6eaa2b5c2f8edc83f067f707940038aa7523c09ea02fa63d2686a5022a963a11c1f7cc6de7585a21da1b7e02f3d1576b14bca9482e39b6d1a416 SHA512 a900c3bba996a512188c392b81538c10c722c1e6f3bf708f3c26d6a927b1f76d3ae4d82bba512ff42170bd380c10e39f36aeaf4ec9152a29cec494d2990f15dd
+EBUILD consult-flycheck-0.8-r1.ebuild 479 BLAKE2B 334ebb612a578ef43ac1af47f065c1e0d884c7c9245ce15f27569738089b3a6342d7721add8a3a01a52a871af2a69a25d53a43173b215d3fb7566e035ab1b46e SHA512 69dec47e0b1519664167820125ec4e8c3e8a888c032781e29856a0f210a97578f79293ca3334a2c9ff04d211204c6f0913cca11d2058e92363fcd559640dd441
+EBUILD consult-flycheck-0.9-r1.ebuild 479 BLAKE2B 334ebb612a578ef43ac1af47f065c1e0d884c7c9245ce15f27569738089b3a6342d7721add8a3a01a52a871af2a69a25d53a43173b215d3fb7566e035ab1b46e SHA512 69dec47e0b1519664167820125ec4e8c3e8a888c032781e29856a0f210a97578f79293ca3334a2c9ff04d211204c6f0913cca11d2058e92363fcd559640dd441
 MISC metadata.xml 368 BLAKE2B 691c3ebb7200bbbf6b0b96d1b58ce74fb291bfebd29443b292cd0333687fb99cb79e1455110932bad9c77ac48dcf34ac2f5ae74844636d26542fdbcf571c613f SHA512 3672cd5201ebdcbe22a9412f21c788cb0b07d98bd2f282f530c29597d5d92a811231457e6e8e78bfdf898746b19771c6b345d19fbe8671cb578262cb0684edbd
diff --git a/app-emacs/consult-flycheck/consult-flycheck-0.8.ebuild b/app-emacs/consult-flycheck/consult-flycheck-0.8-r1.ebuild
index 71a13cdc7f92..b28863a7366a 100644
--- a/app-emacs/consult-flycheck/consult-flycheck-0.8.ebuild
+++ b/app-emacs/consult-flycheck/consult-flycheck-0.8-r1.ebuild
@@ -1,21 +1,25 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
+
 NEED_EMACS=26
 
 inherit elisp
 
 DESCRIPTION="Consult integration for Flycheck"
 HOMEPAGE="https://github.com/minad/consult-flycheck"
-SRC_URI="https://github.com/minad/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/minad/${PN}/archive/refs/tags/${PV}.tar.gz
+	-> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
 
-SITEFILE="50${PN}-gentoo.el"
+RDEPEND="
+	app-emacs/consult
+	app-emacs/flycheck
+"
+BDEPEND="${RDEPEND}"
 
-DEPEND="app-emacs/consult
-	app-emacs/flycheck"
-RDEPEND="${DEPEND}"
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/consult-flycheck/consult-flycheck-0.9.ebuild b/app-emacs/consult-flycheck/consult-flycheck-0.9-r1.ebuild
index 71a13cdc7f92..b28863a7366a 100644
--- a/app-emacs/consult-flycheck/consult-flycheck-0.9.ebuild
+++ b/app-emacs/consult-flycheck/consult-flycheck-0.9-r1.ebuild
@@ -1,21 +1,25 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
+
 NEED_EMACS=26
 
 inherit elisp
 
 DESCRIPTION="Consult integration for Flycheck"
 HOMEPAGE="https://github.com/minad/consult-flycheck"
-SRC_URI="https://github.com/minad/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/minad/${PN}/archive/refs/tags/${PV}.tar.gz
+	-> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
 
-SITEFILE="50${PN}-gentoo.el"
+RDEPEND="
+	app-emacs/consult
+	app-emacs/flycheck
+"
+BDEPEND="${RDEPEND}"
 
-DEPEND="app-emacs/consult
-	app-emacs/flycheck"
-RDEPEND="${DEPEND}"
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/eglot/Manifest b/app-emacs/eglot/Manifest
index 9d78a8dd066c..b64b8b420d5f 100644
--- a/app-emacs/eglot/Manifest
+++ b/app-emacs/eglot/Manifest
@@ -1,10 +1,8 @@
 AUX 50eglot-gentoo.el 82 BLAKE2B d5c0e215ceef684ac390a835633aca107f4ea95a83544779724c4fcf9a73963ba87d956aece3406d82bb02f82a5f9b909632d52e3b8fe361d26921f88d0f4e67 SHA512 9039a33b75c7101b04e367432f217700354fd2293914a295adfe3abd4ae1b8626205155fe8c0d809acf5d02b56af3feca22e837e926cba96d872fea4b3354a5d
 DIST eglot-1.11.tar.xz 36900 BLAKE2B 20496e37944127c0e209762d2455fad01e6578fd1fa8350cc1a6782ed3e5dc11b09f8b737cd97d5439ab7ef67caa5cdf725d53d2e9e91bbca10223106a9073ad SHA512 c258c89d8c81b1c1df8ea9798c120a7534c174ce435a4551f503c7477520619ac08bd627372033ed1740dfc67bf7e8004751259769844d6be9adc9411d8ae5ac
-DIST eglot-1.6.tar.gz 288078 BLAKE2B a2214d216d0eeaca32d974c6686696dfcf141b3384741bc8cce0d02abb508eb5713933bc227d12a07f4b87fc34601431845b1b8e519538ae04ecc74b24db4004 SHA512 51227c8e2b0a1dd9a63ededbea592f01616ff728c34c330400c078212fef3f3e747e6dd30ba312523cbe60c7ea663a7af9d83300210cf331ea6162d2db5c7e41
 DIST eglot-1.8.tar.gz 302450 BLAKE2B 7247b11adaf9a65a2e071ca17b55038fe85f5842fb4155b44dbfa82bae5774e4cd2f7a5557d40cb1a7ab7f554233f15abe297e10568a1630b464ab6a600d978f SHA512 0295eff6dfbbf9d7a82349b8e5ed9e7dad700f2f0bfcab879d906e30bfbb4d28b8779fd9076108ac9b1594a60ca5e30c5035e2f8ceae44add99c28a843027609
 DIST eglot-1.9.tar.gz 316541 BLAKE2B 5b9f188ae3f2b26fd7bb95aeb3095fbf5a78f6a15eeccaceaf947f5f91e78253622d2c81d5e57f11762c0370baf9d6c856a4f770c2652840d750f98ee780b418 SHA512 961399e0877a09bd292424715c3fac86e7750e144ba302e61262925b6ded1d30c6ebf3e63067b27b56fa2062461a947425951ac5538e25312d179fa20bd68b79
 EBUILD eglot-1.11.ebuild 581 BLAKE2B 9ca1ee6b890de466cfcc4fcef75117e3845de756ca5d6c9c24551f9383ea39cab090e7ff74ad44898319d4faf9a0db77c760bf19ccf2553f64ae4d05b0b01d83 SHA512 7b65c4ef0771f65277797a8fa91e74ed14244d734db8bf8d6fad6e790decc98f716c98271dc12805120290c47bd8c644c84af21bdb9ac57f6d5a2a76ab1ce496
-EBUILD eglot-1.6-r1.ebuild 675 BLAKE2B de5c3a0d57e367649e80cb8724d9ac06ac20e8fae912faed9b2be8391eb2b23431f504a9116d1ba5064d616c8621cdbe6194710d9016c07cc7d4c9d7b931854d SHA512 d6f9cb4b5b89ec77b34c782f3a4ab2372b6db31f46700a669b0b678f2a537db89154e5d29ea1934b2e8a20cfd2e3cd4b04301823c96b30313af6dbb022477c80
 EBUILD eglot-1.8-r1.ebuild 675 BLAKE2B de5c3a0d57e367649e80cb8724d9ac06ac20e8fae912faed9b2be8391eb2b23431f504a9116d1ba5064d616c8621cdbe6194710d9016c07cc7d4c9d7b931854d SHA512 d6f9cb4b5b89ec77b34c782f3a4ab2372b6db31f46700a669b0b678f2a537db89154e5d29ea1934b2e8a20cfd2e3cd4b04301823c96b30313af6dbb022477c80
 EBUILD eglot-1.9.ebuild 675 BLAKE2B de5c3a0d57e367649e80cb8724d9ac06ac20e8fae912faed9b2be8391eb2b23431f504a9116d1ba5064d616c8621cdbe6194710d9016c07cc7d4c9d7b931854d SHA512 d6f9cb4b5b89ec77b34c782f3a4ab2372b6db31f46700a669b0b678f2a537db89154e5d29ea1934b2e8a20cfd2e3cd4b04301823c96b30313af6dbb022477c80
 MISC metadata.xml 701 BLAKE2B 436bc9f2720fad7cc3a7bcf9597a820317617ad7522e72c05417d6b9e1cb9c37d171ce5e24741b5730ab6708a0bcafacc8f41df3d4108926868887dc6ee25df3 SHA512 457dec4f625c37429917085c187e7c21ad1155217f79980033a7c0ecf62da941d340433ccbcbd5ae36a028aed7ab0cd1204e74985e36844e31829dab288c4fa8
diff --git a/app-emacs/eglot/eglot-1.6-r1.ebuild b/app-emacs/eglot/eglot-1.6-r1.ebuild
deleted file mode 100644
index b5463a817ab2..000000000000
--- a/app-emacs/eglot/eglot-1.6-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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="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/elpher/Manifest b/app-emacs/elpher/Manifest
index 8e1a28e291c7..aaf3e24174de 100644
--- a/app-emacs/elpher/Manifest
+++ b/app-emacs/elpher/Manifest
@@ -2,7 +2,7 @@ AUX 50elpher-gentoo.el 112 BLAKE2B 1449734aec6fd3efe344c648f815b3e826e885a7b8d57
 DIST elpher-3.3.3.tar.gz 57439 BLAKE2B f8e3f2acba0faf0eeae06fe86699dc97def0119a6d6e2fa2ad34555e20907deb566f99a669e8f98380c95293c4a38cca9bc47678f36597c898ba1e33dc6d0880 SHA512 ca40dcb92af8b5f3635cd45f0877f750746d0eb61aff71fc16754770709d15f35d0f335a04ecd9ee6b6f13440f9a9e55afb2cdb2934e550157b3218d428fdfa1
 DIST elpher-3.4.1.tar.gz 58460 BLAKE2B e7b0ad033b2ec51b0700128c566c5f50af8cdd9ed2120d12b39a62f0b3486347dd4b2af1cdf0223f9300b7f7fbd767342c654b4a4d02455db105045dc8fb1c4f SHA512 8cb1aa587e373e5cc0957286f9b86dc7958f20db0bb61ed815f45747a6cede328da16017897d83489a9a347055d08e95bd2effdda7cccd2de79ac5e4e525cbc6
 DIST elpher-3.4.2.tar.gz 58546 BLAKE2B 34f0984a5533fa3049d57867214eb5000c08ca459cdaad61e08b031a1e09343697c7beaf6c83724f2b64fca85975cb27d4be16724a5a7cfb76f99c3bb048e937 SHA512 080eb9812cbcf4e72ba33272461f628892d8abc940328e6e14d56ad2a7bafb3740d75fa07b2693b9937303f9d8427531ea3aa95c228cbf53741c32cfd5408c84
-EBUILD elpher-3.3.3.ebuild 586 BLAKE2B ad495dc62bca8791608cc8f440df5108a5d136707029c0fc64c9cc4a09bb4503baccb36d346da61f82fe0528c1c40b65759b433bde943e5ea9b35de309ce1a3f SHA512 7d744471ce5a1718b7ba94aca8931652c766a456d2b95226798f6f7981a8acededc15182041d6e576c8825c5863caf5261e0cc2a80d8d80a425449bbe85b98b7
-EBUILD elpher-3.4.1.ebuild 586 BLAKE2B dbea834479c827481c113110193811bad92ef7821c93508b7b34beaccc85c72324b27e37c74c4edbcebe0c661f2cef5df6b9ee523c6e07a23bfad2bcee91a0d9 SHA512 3d5c1e17f5d79c8960afc8d169cef328fa510d99eb19f8f0bf19d1ce58bed0898e7ed7e01c32bd799068768e6e7a242b7af89e90c45cf491b55815b45e8b1aeb
-EBUILD elpher-3.4.2.ebuild 584 BLAKE2B ee024c44a0ca1fa0eaf0f0ecb915346d41e5d80245f15132ef9e39363e670e2659b1668395e9a655c54a856f4ef14891caf1d0756eb7b918349b559f90c31c3c SHA512 90775d099972b7a354037f83f42235a55d35585d41642986bde487d1625f5bb81f6a5cebba5d3701eda5ee26565457e5a752dd12738827f8991554820e684376
+EBUILD elpher-3.3.3.ebuild 608 BLAKE2B 74d96a62a7527645bf5b3fe8cbd1d029f7d16e89ce0e8ad0e5715cb1aa8e878be9916a8b4170b6bfb49a7bfa43d175acb00d1fd0921e3274756d675354e9f3ca SHA512 5f36f27c93327621f5c79d8eded4c4b96de0376b68f40c06f1ed065cf7ca32b263f96e8539946062c61dfee2f377f8ba2662a264044a1d95349e3f64869763ad
+EBUILD elpher-3.4.1.ebuild 608 BLAKE2B 74d838263c990200aea2a1487f181dce9949fff38b97ccb933effe7cf91b9d497dd2aaab1e625b91e6a6c5a6b578119970a79e0b9851048e70be8e8c81984da0 SHA512 8f61c33f88b2df6158e639087c0c06de06eeda72234dd708d96bb1a341ac0635c9aa52cf341b68339e67b5d9119eda117c0d5b700f67d4f285819f9c5a1007e1
+EBUILD elpher-3.4.2.ebuild 606 BLAKE2B 6a4acdd18564be135eb45763fd67272d4831da9eedf7c6a954fbaf6dfb5b4fb307e61d14743250db7a2e6fde0c2a2d722eaaac98c2b98e702338910af9e27355 SHA512 9f15aabceb2e55ba9ce39d66092aa332f235710898084cf4ba65e6a210512e7aa98fd7ad2dcd7f04be19591441aff3d89c25af7f439015194927ec89cbe83fac
 MISC metadata.xml 269 BLAKE2B e431fc3cbf82ae368f62ce9c0a0779eef2141b1d6aef94a47a87d29c92f5fae3f9cbcfbe59ab14a74bee673698b61a7446e4ade1804f330a9e2926b43ad3e700 SHA512 2899510a1184404b72d35aea6d963bfe2be26922150cd2f1f68107c22055a12e5b9ac54d9c07ad539ddaa204624ddf61990a3272ef4aa3f31e10b0a78b2fcc9a
diff --git a/app-emacs/elpher/elpher-3.3.3.ebuild b/app-emacs/elpher/elpher-3.3.3.ebuild
index 944e4efca3e3..40280aceb7f3 100644
--- a/app-emacs/elpher/elpher-3.3.3.ebuild
+++ b/app-emacs/elpher/elpher-3.3.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-COMMIT=ab75cff
+[[ ${PV} == 3.3.3 ]] && COMMIT=ab75cff
 NEED_EMACS=27.1
 
 inherit elisp
@@ -11,7 +11,7 @@ inherit elisp
 DESCRIPTION="Practical and friendly Gopher and Gemini client for GNU Emacs"
 HOMEPAGE="https://thelambdalab.xyz/elpher/"
 SRC_URI="https://thelambdalab.xyz/gitweb/index.cgi?p=${PN}.git;a=snapshot;h=${COMMIT};sf=tgz
-			-> ${P}.tar.gz"
+	-> ${P}.tar.gz"
 S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/elpher/elpher-3.4.1.ebuild b/app-emacs/elpher/elpher-3.4.1.ebuild
index b483395d707d..e0d169a965f4 100644
--- a/app-emacs/elpher/elpher-3.4.1.ebuild
+++ b/app-emacs/elpher/elpher-3.4.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-COMMIT=bf0dd36
+[[ ${PV} == 3.4.1 ]] && COMMIT=bf0dd36
 NEED_EMACS=27.1
 
 inherit elisp
@@ -11,7 +11,7 @@ inherit elisp
 DESCRIPTION="Practical and friendly Gopher and Gemini client for GNU Emacs"
 HOMEPAGE="https://thelambdalab.xyz/elpher/"
 SRC_URI="https://thelambdalab.xyz/gitweb/index.cgi?p=${PN}.git;a=snapshot;h=${COMMIT};sf=tgz
-			-> ${P}.tar.gz"
+	-> ${P}.tar.gz"
 S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/elpher/elpher-3.4.2.ebuild b/app-emacs/elpher/elpher-3.4.2.ebuild
index e063d45937f0..48c35ad2cc84 100644
--- a/app-emacs/elpher/elpher-3.4.2.ebuild
+++ b/app-emacs/elpher/elpher-3.4.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-COMMIT=f117f2f
+[[ ${PV} == 3.4.2 ]] && COMMIT=f117f2f
 NEED_EMACS=27.1
 
 inherit elisp
@@ -11,7 +11,7 @@ inherit elisp
 DESCRIPTION="Practical and friendly Gopher and Gemini client for GNU Emacs"
 HOMEPAGE="https://thelambdalab.xyz/elpher/"
 SRC_URI="https://thelambdalab.xyz/gitweb/index.cgi?p=${PN}.git;a=snapshot;h=${COMMIT};sf=tgz
-			-> ${P}.tar.gz"
+	-> ${P}.tar.gz"
 S="${WORKDIR}"/${PN}-${COMMIT}
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/emojify/Manifest b/app-emacs/emojify/Manifest
index 58c35b2e93af..b28d41143b79 100644
--- a/app-emacs/emojify/Manifest
+++ b/app-emacs/emojify/Manifest
@@ -3,5 +3,5 @@ AUX emojify-json-data.patch 1184 BLAKE2B ce22ba183077ff5f9e160b477ca2b71f5d19e7b
 DIST emojify-1.2.tar.gz 1196775 BLAKE2B 5802e391771f93b5181584287a73d6e02b42796a065ab91c0f085debcabb8a7da3bc575e7913b754b1754d0ee5d296fd31196009bdb937babcccc29ae97cdb18 SHA512 a02249d8474f02af1f43058061fa4cfcbccdaa71e632934c6466277eef44f306ea44e0c91dcb83218d6f1f01f3e7379b6d4d82b086113b1a9a41ee5ea3971e39
 DIST emojify-1.2_p20210309.tar.gz 1198300 BLAKE2B 504ce94fdf95cd68467d62e1f4ab842dca0d32b0caad36e2638d7a9fd54be8ab35566c52a025ef78c6e75379f6c6e3843d7c8a92083de8bf5b3a20590880d3b0 SHA512 3d8ea35065e79d83a23a395a6f05a7887fb33bcbb7640def0fda8a78b10a59357cadc4ef0b7632973ee15d7ba4a94cde8f4d09f09feb0ca5c1c0a8086b6fefbe
 EBUILD emojify-1.2.ebuild 861 BLAKE2B 676b9dab1737da26f256d89f3d990051806469ca334f4c1e63a13606d8c615df33faaf6569b07ddf45e896db717b6cf7219442c4d12917fbc1d64b3f89abbee2 SHA512 24a5d171ac892b5640f56b3ac0b16b1965118f389431169a99081b9532d5d26794cf30151390aeeb7894de23f2f290b406b2239b7a5df2c3998437083d0e5d15
-EBUILD emojify-1.2_p20210309.ebuild 922 BLAKE2B d74bcdf4bb271097aed3fd854855b82d1c6a754a2a1f6966c43b3c0bdadea4fa2fca84f5aa8ff72a1e2ad8a7d3e5174465a25e31bf443058a5b1ea9e135300a2 SHA512 f41c4f471177be54ec1f7a7fe31720594b1a454f81e230082cbacf5eb9d6643dfedcf3566c2679025f1af40d7e8f70d1c0d5f156ffa7ae28f6481694b1a3bd86
+EBUILD emojify-1.2_p20210309.ebuild 950 BLAKE2B ed05b2e460bd414d49dd0690d2471d84a7c7820dbf1de1ac1d7eb5724a8b9cbba3ca131443f3c26f1c54292629120b80b47dbbebf6f2375f90cc18863f3fe201 SHA512 76824a9e3ce1dc04742cda0ad49b537bb7b39051b742ff5f2f14fd24014f48e12d27b65fe738798886296ba6e2dfd249600773446a4bd4cee10192312a59dee5
 MISC metadata.xml 439 BLAKE2B ba89fe91967745e01dc07b5070618fcb33d6ba19f12b41bab0a3a30051c2f5d191ab7bcc9524e439cc939e0e87d24544889227201c91bf0602188721c634af99 SHA512 7c2a496354e1113d0a16d9acf9fa6472ddcaf7c2163d9520c01e9bb103dde350baaf6c4859ede3e2ed3bf3c5c50b094a905c3b1cc377221463d04dc741d9f581
diff --git a/app-emacs/emojify/emojify-1.2_p20210309.ebuild b/app-emacs/emojify/emojify-1.2_p20210309.ebuild
index 4474d180376c..50c7c8766728 100644
--- a/app-emacs/emojify/emojify-1.2_p20210309.ebuild
+++ b/app-emacs/emojify/emojify-1.2_p20210309.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-COMMIT=1b726412f19896abf5e4857d4c32220e33400b55
+[[ ${PV} == *_p20210309 ]] && COMMIT=1b726412f19896abf5e4857d4c32220e33400b55
 NEED_EMACS=24.3
 
 inherit elisp
@@ -11,7 +11,7 @@ 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/${COMMIT}.tar.gz
-			-> ${P}.tar.gz"
+	-> ${P}.tar.gz"
 S="${WORKDIR}"/emacs-${PN}-${COMMIT}
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/f/Manifest b/app-emacs/f/Manifest
index 5eea1ebbb6b7..209b50a9517e 100644
--- a/app-emacs/f/Manifest
+++ b/app-emacs/f/Manifest
@@ -1,6 +1,4 @@
 AUX 50f-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
-DIST f-0.19.0.tar.gz 19477 BLAKE2B 47cfb8c876e11cae7eca61815085c4290f65f9d72a7c5d397d8b53f6d57421f46997786556074027de5405acbf38ddb42ecbb767c809763e84d880286e6942dc SHA512 694eca1872cb0a0da7f75f610e4101993a79a5e7601c3f72fd2c642b1a44f5eada24777313b5166d901d9d983c18b4d412b4c6f01c382ace7530bacaa3b67c56
 DIST f-0.20.0.tar.gz 19907 BLAKE2B 20b82a19b227d2e0863e540e75bc5094c0cf267eae00d699ff5b00fa574213d303135c246c454c92785080feae63ba6c529b115aeb1368774dd548852d94fb48 SHA512 0c44e63cd527a37bd5582d5a2a4cb2269d179930d7f41b378b9100ad5bb4518291b02197b1d55e1bf603bb5b1c12181b982d9b9a3f8fbd48860f6e86ea36c03e
-EBUILD f-0.19.0-r1.ebuild 523 BLAKE2B 62e8f52b873e9a4e879689547677301f0d31627bdff7cb3b7ae18f28c1854ba4ce46cb134fbb26240353de5972b24464e5503ca7a7b7e7575fb34dcb134fbea7 SHA512 c11136a9763e32d3ad8fc58000d8849f3c4c1e823483ae1a8c7a711e79c5524b60bfb491f9a8206ad0c018ed432420ffe86516fae2e882c56827e5b61847f42b
-EBUILD f-0.20.0-r1.ebuild 548 BLAKE2B 3a01598b307577540287196315ba88ac993ec82c1328185579f3aa15d317726944d7787b79a2059f957e7199588ac3a50c641803e0204da36d630bb5c17cfbc2 SHA512 990ffee7772912b61c93ff040d1a417730a54d8abb7bebbdfa65e2e5ac9571e5a3f5f8520bc7aa35ad364aba2a285489d60ac0ae81b547c5b4505b5eb25db80f
+EBUILD f-0.20.0-r1.ebuild 557 BLAKE2B 841b5f951ca767cb2a788607e95b711755c03bdbf9716ea43c3533208a1e3bdc985d9ec28352b47a976d729033749982d5ddbd5f842a83fd696e1680c832c257 SHA512 8aa112b9b1a7307d7ceb2c9b6553fd1065499f55f64c565e96d9806955e542ba3910984e275eea4b419e1c9f86fd3392ffb8937b9cc460026f04c6041567c166
 MISC metadata.xml 357 BLAKE2B a60c6938e7ac515ba2a2455784adc08fc1271acbdb8cffe5f78fb28eb532c491fa102dda5207a46b65c45e9eee680e18e5adcbae9ead84eb2ba7fdc785818533 SHA512 3a326f0132b4e6619d3c280d2740b231d03a00c3a9b5d77be10a017435cefe645be2f1c8a83e4a34336da5511a87913406b31be06e8e46de280dee3221b45a3b
diff --git a/app-emacs/f/f-0.19.0-r1.ebuild b/app-emacs/f/f-0.19.0-r1.ebuild
deleted file mode 100644
index c87a18f235d6..000000000000
--- a/app-emacs/f/f-0.19.0-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp
-
-DESCRIPTION="Modern API for working with files and directories in Emacs"
-HOMEPAGE="https://github.com/rejeep/f.el"
-SRC_URI="https://github.com/rejeep/f.el/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-RESTRICT="test"
-
-RDEPEND="app-emacs/dash app-emacs/s"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/f.el-${PV}"
-SITEFILE="50${PN}-gentoo.el"
-DOCS="README.md"
diff --git a/app-emacs/f/f-0.20.0-r1.ebuild b/app-emacs/f/f-0.20.0-r1.ebuild
index 017525aa62d8..b3e020303c5b 100644
--- a/app-emacs/f/f-0.20.0-r1.ebuild
+++ b/app-emacs/f/f-0.20.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,17 +6,21 @@ EAPI=8
 inherit elisp
 
 DESCRIPTION="Modern API for working with files and directories in Emacs"
-HOMEPAGE="https://github.com/rejeep/f.el"
-SRC_URI="https://github.com/rejeep/f.el/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/rejeep/f.el/"
+SRC_URI="https://github.com/rejeep/f.el/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+S="${WORKDIR}"/f.el-${PV}
 
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm arm64 ~ppc64 ~riscv x86"
 RESTRICT="test"
 
-RDEPEND="app-emacs/dash app-emacs/s"
-DEPEND="${RDEPEND}"
+RDEPEND="
+	app-emacs/dash
+	app-emacs/s
+"
+BDEPEND="${RDEPEND}"
 
-S="${WORKDIR}/f.el-${PV}"
+DOCS=( README.md )
 SITEFILE="50${PN}-gentoo.el"
-DOCS="README.md"
diff --git a/app-emacs/package-lint/Manifest b/app-emacs/package-lint/Manifest
index 59b230d855fb..4f04dd5f37d2 100644
--- a/app-emacs/package-lint/Manifest
+++ b/app-emacs/package-lint/Manifest
@@ -1,5 +1,7 @@
 AUX 50package-lint-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
 AUX package-lint-symbol-info-data-directory.patch 1249 BLAKE2B 119c77c1a720bb08be8dc82b74eba56b0ada00bdc769d6efa644613e582613929e4e1a64ef932160053e07275d533dad86db83d0441c69487a7505bf9cb9dbf4 SHA512 ca0bf2708d7d06361b604f1ac0466f0273492629f827939424a5c1bc764bf1756f71b69eab29eab9db76b168db7e45ab370ff0c8e5ac601bff08a4bd4424a745
 DIST package-lint-0.16.tar.gz 224744 BLAKE2B a1d26ae28727e305416498b66da188cbadababc9f415c199eff380dbce4888ee3137b6f13a26147d427142a9d244c784e192d21df3173d0a0c2dde4acb1e8630 SHA512 f5d79b69d37671233614a622cd5fd6c28c230adb0d5b7934ccd6bedc12228adb7bdef6739fdd32be383cefceb65b9538a00f763b49be6499e4b6e3f8b1a34616
+DIST package-lint-0.17.tar.gz 284965 BLAKE2B 752adde42a820f54adef63cbe9f0cebef5af1d4d51dfefe9bf1c18929e739137081b722632f1fae8e171f4e25c0b9b15b47d9b3fb2c0f0542b214054c46ea190 SHA512 3f2240e03f67d6575b93643d26abd768bfe71fa1223c38b5b889c0f11784d22d3ad1849fa8f1424dccafc3befafdb49b1d796f175867490db96534c0e4b5f25e
 EBUILD package-lint-0.16-r1.ebuild 760 BLAKE2B fd0d1bf986e81c1646066426279cc934a673f90077352baed236c989bbdcdb7f0266715f73c977e4653d8dde39cb27444be841602a0a14123b86110ebba2a536 SHA512 4d9b0b27bde8c7ec8c0695137ae9a5a186035366294bad872355bfcbc5c1dc7ba2fd97ba4a91407d411e5ff079fd23430faf114d13ae51788a0a1d8fcca14f3a
+EBUILD package-lint-0.17.ebuild 760 BLAKE2B f5bcd09ede30aaaba10ac46efe37858af7e780d5a9d9977701b9a6c4d0a1214c6b77d9eb26d5ec57cce6328f8a7417ae026814fe784262708658cf4a5be09f7d SHA512 7ed7c2bcf8ead737f60d6f199c65e76ac7cde4dd623ee568af3f4870980771fb837524bb89b7f0ae207fa49c94e65ed7dedcb74fe9748abd6ad11718b9c5db6b
 MISC metadata.xml 1239 BLAKE2B 108fe66a5ec45cea84e75f042a5952af1ef92e4993b55f46e3392758beb9667562101cd7c1024d0089bd8ad66c9247fdb267e737030ae6b02fba7726cd27f1fc SHA512 227780ef543751dbda0bd612eca5e474ded35b199e380cb18c984d8e9e23ace2e5b08289687b169d420cf7f84baead74e2897af392f21a76e3e158b79e6c5f32
diff --git a/app-emacs/package-lint/package-lint-0.17.ebuild b/app-emacs/package-lint/package-lint-0.17.ebuild
new file mode 100644
index 000000000000..580fcf939a43
--- /dev/null
+++ b/app-emacs/package-lint/package-lint-0.17.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=26.1
+
+inherit elisp
+
+DESCRIPTION="Linting library for Emacs Lisp package metadata"
+HOMEPAGE="https://github.com/purcell/package-lint/"
+SRC_URI="https://github.com/purcell/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+PATCHES=( "${FILESDIR}"/${PN}-symbol-info-data-directory.patch )
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	elisp_src_prepare
+
+	sed "s|@SITEETC@|${EPREFIX}${SITEETC}/${PN}|" -i ${PN}.el || die
+}
+
+src_install() {
+	elisp-install ${PN} ${PN}{,-flymake}.el{,c}
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+	insinto ${SITEETC}/${PN}
+	doins -r data
+
+	einstalldocs
+}
diff --git a/app-emacs/paredit/Manifest b/app-emacs/paredit/Manifest
index 639220eb7a32..811c0a833d37 100644
--- a/app-emacs/paredit/Manifest
+++ b/app-emacs/paredit/Manifest
@@ -2,6 +2,8 @@ AUX 50paredit-gentoo.el 503 BLAKE2B f08ba9965af5d555de5539b017eb230c9e5eb296f0ea
 DIST paredit-23.html.xz 1920 BLAKE2B 029c09848bb162c135c882ca17e6d5da9c3c17ba3937a809dcd03edb4b1841a0069a72dbd6676003cdf1a9de60a1f88eefa1de050210a37b52a005d28892ab14 SHA512 0ef584787b6094f1d0720aeb4d3a8c106605be62ffaa240d27a190ed9a6dd83d6d1ce68c2d184e84539a0e0658dcbed068335b69f4b1905ae9bf3d9968d5fb9b
 DIST paredit-24.el.xz 24332 BLAKE2B 5243810cfcc40ebfd62ce3f833afa214defe9b91affbeb142ddad308e1fcff3f54a0ed19029a5ebd31f374868abc34f160d2efac65a609e783483ba2c92194d2 SHA512 76d9d2694473aeaab573964d79418fba20bfecef7f3771682f769ef05fb9385f9ef6dda1a5c7edec5d0a6f919d2eca5e75d595bd8cd5220c5179bfcac5f20f94
 DIST paredit-25.tar.xz 33552 BLAKE2B 7fd36e796c754a6bca28d3bbdf59c37bba326870a6ba94380b4c6130a5f0be103ef8ced0071059faa785fbad7cdcfecd0eb491a2b07200cc6e3208b61b0a2af2 SHA512 46ae5eee7007d7ddc2c03955f521dac950b88ee3274faf071983380d83b30b553da7d21fbe791a2c760f0f56b7fd177714085c18a8dbc5c50bc0a240bf7e77aa
+DIST paredit-26.tar.gz 63322 BLAKE2B 6259b17655d0c1ebaa30fad2e46639f1e84e5aaee18980131d9e2cad9711ab469efc75a3ed264213bf3fbe18cddc9c69c0bb3907a3acfcc896aa2070cf00f44a SHA512 1f0a712d6b99740e559208451a3292e52b110a5f40224fdd30e390c4eb63f3b01790d8cc0a3fb0f0681a7739ca26763df6afbb4c2e00b6560dccb29950f70a70
 EBUILD paredit-24.ebuild 731 BLAKE2B 4449d28bb8f69ff9102cc0ba7b9c6f22685cd7f644c6e8c3c7af26dc9fec4f55f39a7f12934b3d17de90e1fb25fcc5f9102f40f1b79ed3a0f52bb737840a3a9b SHA512 8b91cfffda15bca887e66ce9d8554dad2940701b7c0250e6ded031f9c6df4b0db1aa957219fd054eec54de8f643dacb52f0d7ea9e19aa4bb530b32fc8666cf7f
 EBUILD paredit-25.ebuild 560 BLAKE2B ace494e9dd4b49202fd9ba79c96f88ef14f8bf3a97f9819645832baef5c49c78a286fbcf307df6def6b4ca57c62cb2e9075ecc64b4f56f846d77911ac1e074d8 SHA512 88902156a5ac75b078d9a449edef5fc396f8636b57a248f9d99ac4a55780b73063ed110eed922b089347e61ed7b31559fcad7f7bb8571d4a8d9c8f41688478ac
-MISC metadata.xml 283 BLAKE2B 81c49021199f71096079a27f9121390fb8c1285c54b9478583ff2d647277fa106ef12456d7097c4be092fc48b514a1adcf855ca0fac911598232ef9eb7f102c0 SHA512 f32b303760addf5d4db8d18bd10fb677353cdfa4c5e545d47804ef756cf5e5a21f8b8efb631b08f802185913ceb98da820e404e06eb03d01fe9ea85c10d1ac13
+EBUILD paredit-26.ebuild 791 BLAKE2B b7f5de5674d9d6785825e45a22109301e14d7c2ba57edc9be189ec5b303d06f32eadf39a766a2bb57e9a61b16996b5bb5e9f19cecf30ae08a2937b1a62701c5e SHA512 d5c783ca351367ab1300aa69b76a6e347822a50a5cca44848e507bebc215cb8afd108cf32c4a9c14782b47f8ddcbd20ca4dd0e876e1863e38246842857396efe
+MISC metadata.xml 383 BLAKE2B ba6b85b4481d8225fbcccd0f852de340e42556209c64d7432e1c3c6c4aa05ff0708caafe79123a21c5203d62b2acca9cb520394b5c6b73d7bcc31236cf04e9a9 SHA512 7ca29cb9b16f27ee506de3e9709e846db0cb8d4ebac5c6df4a15efb83b96b067fb5f2bd3735c3ab7d60856098648d138b23921b2a43e349713cb72e8aab649a9
diff --git a/app-emacs/paredit/metadata.xml b/app-emacs/paredit/metadata.xml
index 986088003fe1..5e20d8694796 100644
--- a/app-emacs/paredit/metadata.xml
+++ b/app-emacs/paredit/metadata.xml
@@ -1,9 +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>
-<stabilize-allarches/>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <stabilize-allarches />
+  <upstream>
+    <remote-id type="github">emacsmirror/paredit</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-emacs/paredit/paredit-26.ebuild b/app-emacs/paredit/paredit-26.ebuild
new file mode 100644
index 000000000000..57845814dc0c
--- /dev/null
+++ b/app-emacs/paredit/paredit-26.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Minor mode for performing structured editing of S-expressions"
+HOMEPAGE="https://paredit.org/
+	https://www.emacswiki.org/emacs/ParEdit/
+	https://github.com/emacsmirror/paredit/"
+SRC_URI="https://github.com/emacsmirror/${PN}/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DOCS=( CREDITS NEWS ${PN}.html )
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp_src_compile
+
+	sh ./genhtml.sh || die "the script genhtml.sh failed"
+}
+
+src_test() {
+	${EMACS} ${EMACSFLAGS} -l ${PN}.el -l test.el || die "tests failed"
+}
+
+src_install() {
+	rm test.el* || die
+
+	elisp_src_install
+}
diff --git a/app-emacs/php-mode/Manifest b/app-emacs/php-mode/Manifest
index 3a4d4c2fbd78..126ada06052b 100644
--- a/app-emacs/php-mode/Manifest
+++ b/app-emacs/php-mode/Manifest
@@ -1,10 +1,10 @@
 AUX 50php-mode-gentoo.el 286 BLAKE2B 1c823d8244e714811c5f1be402d1cd41e7b81951aafdedd01f36fe93f3cb6150792b5ed09ef5fd859211692f766fb8e931581c5e9cd60401d6eade364696edec SHA512 5f6205a7f3300d02b612a0aba58566dba1ad2a5f090c827c7d2d740af9c425cccb8384b37ac81e05eb81b4e31e649726433105b9862b92913e56752c554eec93
 DIST php-mode-1.23.0.tar.gz 94451 BLAKE2B 324eda995ba8d93ca9bec691c88b05caac3d6786b2d1caac39dc34f513e8a026b3803ad3712729b147a8ee839fe337bf11ebaa1b718cb4c741997a9e1c9279a3 SHA512 051adf317ac1dc4ae14b3aaad9aa15ef650a74c7c1ff134ff9a26664cc7494b522957d9cbed981ec398e9bdc6ccae4437c628b2fe3535e8f2a95da34363ec88a
 DIST php-mode-1.24.0.tar.gz 94715 BLAKE2B 226dfe72153f541d8a7ee396dc3cb49c2b0a26c084a3ea36f812f4e923cf364d3ddca0192b87b5a068a9a19a9cfa1227a91f0793374e513b957764b0c867df3f SHA512 fd26f1f022d20bf3dffb772f3735b244cf7e2b4fe51ed35c6ead4f7a7b21686cecd2db54f882a6622a34e3265b4af68d71b589d5adc79b15be3c5e4019ea026a
-DIST php-mode-1.24.1.tar.gz 98595 BLAKE2B f9f6e6812e7239eb9ec9dfdbb932dc74b85df46d0d4001a745a6ff297d060a5bcb835200b02e0bfb09f2d35b20d0c72e273d84e16ed3e7d95d235a369a0c54cc SHA512 e6459637874aef457b856c8730d6b761de38e251b49a44a51cecbb08ae092d383a59adc77997f2ebe27066cb050db588f0037cf9554a071d4834089e14acd9ac
 DIST php-mode-1.24.2.tar.gz 133018 BLAKE2B d6d5da323f10ffd133b34e672576a1ac7c2c2284aba6bab6c628d5fb335327a9e7c73035f47a709046591e57ff4bd53d386e516f4004d000c4276cb341ac4783 SHA512 52c9770baea00a05a468e91d9af765cb1665980c7acb32220829e7920ae092996b017c396836b171f2affa61bdb6329e7460acde88dd788004750ca21f280a7a
+DIST php-mode-1.24.3.tar.gz 139037 BLAKE2B 07cd54f10f89a937481c523f1f6e4bbe0f006da80dabaf6ce245f9da89d8fc19a7703a6f05ac721eeec46c13e7ac2c6a7a754c731d4a4b7411030b7725c3b36c SHA512 50568799e894c6aafd07416680a3011406a0ef6e906cd5780684c327a696f13411bd01dc71919f12663a8dd7b000435dd8259248e4db56d0a6a7807d8387be29
 EBUILD php-mode-1.23.0.ebuild 489 BLAKE2B 3e5205d2c9e19753905442d8d85ca9bbde730cb100a6d377a006d26a39f88f038e76168e67e2ceee540efdd9623dd155c3a5c3794eec621117107563064095a1 SHA512 4b666428f344d42e2d672eb481d715aefb0b5f45c984f9f1782a004d903a1c21a2bb9d9119f6beb5f306faff3266cb074c79d11756ac34e02253c4dbd45a0f47
 EBUILD php-mode-1.24.0.ebuild 537 BLAKE2B 6faf1cc514f41f78dd3d9b9ea6b0414300817106bb7952fe35591588ae57e962b16fb94c8cf564bc7157f3d5c293fb5c605708e2cf78362ea7c9f1d48434d1c7 SHA512 f03fb746addb867e7ac562ab03eb2377764f2bf619aa63cef7af86bb31c360de15ea2e8499584d355559dfe80e0630ecef56ca0af5bc0a8e0f26db6e651ba09a
-EBUILD php-mode-1.24.1.ebuild 755 BLAKE2B 8a732708a74905d13ed512f3c82c4e1433c7d65f2cb6f8a2ec286422f72ac2fdf723bc6a151e009d3f07f8db503258cc6d190ac331786bd5f2923fc6b8f12b04 SHA512 86db8620d5b4393c3856dd1c3b1a40fa5a206ae03ed72b9d6bb6bdca46f5e0630ad20db3c0ba60e74dc58905bac19ae86d7dd6129279f13805f77ebe8f090447
 EBUILD php-mode-1.24.2.ebuild 751 BLAKE2B 7692f83444b5e1a26188dac06151d566ee114888c039dded2c4bb8cc49e50706e73041272eca14ef22d79ad888616d4c3f54be7e2a93d1730af61ed8087e08c8 SHA512 12e8fcf0dc5f043e144281eb6054dc27f7b3a24e5b05872f0d843070fbc92775f9ea5a8c2008b8c2c27337903d6728270ccdcae6b240b58ce9be133f8bb7887e
+EBUILD php-mode-1.24.3.ebuild 755 BLAKE2B 7b526072d55cbbc1e50cf74e04195c810eae7808807aecc35aec8882a99983805217e194f7887491b57d5f4a039e2dc8bec6449902a4e3104297c3ca4f6f431c SHA512 31e8404651b038cf140cdf019f139dd53503a3b685f0d8d7f0bc6759b576d820b887086ed8df92e1dfcf3c64ad263cae0000963fc6027f7769437092103d0a00
 MISC metadata.xml 431 BLAKE2B 9349c1a4abe0f4e86aa6fc3fd5d4ad086c85b7cf3375c7fdafc051b0f8b1d089ab0f48220b1b6d05fde68051223e0f2b5a13698cac27c5b01a244fd42bebd9a7 SHA512 581f83ac18fbb5c1f28eb83fa53c7b8ad19cfb9b2df6123dc18bbd2a9eb53972400b0a84816d6740590926dcdcd1eead1fad5784fe93eea80b78edf420228b79
diff --git a/app-emacs/php-mode/php-mode-1.24.1.ebuild b/app-emacs/php-mode/php-mode-1.24.3.ebuild
index d8261dee74fe..2c8b0eadeb01 100644
--- a/app-emacs/php-mode/php-mode-1.24.1.ebuild
+++ b/app-emacs/php-mode/php-mode-1.24.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/app-emacs/undo-tree/Manifest b/app-emacs/undo-tree/Manifest
index 54924351f863..d75918b69fdd 100644
--- a/app-emacs/undo-tree/Manifest
+++ b/app-emacs/undo-tree/Manifest
@@ -3,6 +3,6 @@ DIST undo-tree-0.6.6.el.xz 31520 BLAKE2B 01ddd3283ab257de91bd3f38969b7426f21df58
 DIST undo-tree-0.8.2.tar.xz 34060 BLAKE2B 4976488fd7ae42eb273c6369758014b96503a3a852ef2a4b4798ec6363e23d3e3219f73c6a2cd2f190de8902dc9705a7a4a5331f0e7b67900f43b192ae25e81b SHA512 403ecdb0a30a53528bbaa64025b96b228249f6d2de85070dec8e20d56e02bbca06bc1dcac411dc4e342652d32626dae4b03e4538b9110b69f50d37c12d3ca391
 DIST undo-tree-release-0.8.1.tar.gz 39499 BLAKE2B 0a47ab86889d1d043ff94ced330f9d9e82a9c6914d44633af85ff7e02d80d8914a59345f50a600eb676a9c46619a7ef13b18e4abb02186e6fd39ab9197cf81a6 SHA512 7a5cb7e949d8dd62ce54b7b7ba136f5c6ffcc5ca998af6552e8c9daddf13e38ddfe4de8c2b5d4732d193990018e003bc0eb6b732d913178efba15bb01064a745
 EBUILD undo-tree-0.6.6.ebuild 489 BLAKE2B 8ff82dacd967f19d5a69658926f7fc1d5e1746225ca60cef478e24f2c746bb9a9893127619d07cd2b813d51a513a2a468ba44dd54f40c973c274cf895b61db20 SHA512 049649cedfa50eef2519ecf6eb7d29a00dc412f792d54174e40df1ec8cbe013a47380c4a75e31f9a4b794b5c9d4173504794e15da914e4a226cce9c8fc8c76a4
-EBUILD undo-tree-0.8.1.ebuild 603 BLAKE2B e5649b917599949d76f85dbebdde4e52785d88df78f95659b7c84cbd4ea1d5f71da408b097701b152ceef1305ef2f3160a9075ef700a421c88ad813fa949a298 SHA512 0f83ebb1804c3c4140f9ccc296b217b34111a677fc1ac77ba767c987d5e1c8a7134c7214d43b8c8bfdcd1629d3dd7e06f7094481714aba4105fb43788cd48aa0
-EBUILD undo-tree-0.8.2.ebuild 551 BLAKE2B c682b16c815a3a23a519063d01b96fc05f2c6678668f32c77d6d1d08d62b058067cac530b72a0c8597745e3ce17a2533d55ab369705013c4dd3804f97aa6c5ef SHA512 ce0c67485a4ca15fb73d6f47452a3450a3ede8fd9b1c092f7ee095fdfd7a3272bc9b6a03c5cd6b05c589d0626a0af7e61dc885a116b2a638e1360a0aa80a70e4
+EBUILD undo-tree-0.8.1-r1.ebuild 606 BLAKE2B c57c0fd4c3231676cb80013d7067b7bb20c912ddad25751d65f1a58d5ba192c634137eb0a00e1b6657b7f9281c6340d3dd5eb0403b44cd6ffde5f3be3121b9a7 SHA512 7b5adbe6fab5f8ce5d2d870f596c4dcabf8d05b17ca0c9df40bdd8a828ad463de088177c5fa1a0b801da20e9769b146dbfed48cb4590e5feec6c1c0e9881853c
+EBUILD undo-tree-0.8.2-r1.ebuild 553 BLAKE2B cb18bc9c256509c6f05d43dee6adc568f30ec59bf220d767ed61b3c1b84629d4fd849c93d4fba96fb742644dbb781f65ab84de583a6e10d784d59d33868db7b2 SHA512 3e70e1ded42ef1fb39be45d95425bbe3d82d7b8c0366973a422e3432855248be1e752ac5af73e75640dd4b64b84c2478692befff7c75dbda48970b7af75ca8cb
 MISC metadata.xml 1694 BLAKE2B 319c93a762a845b738f8a994af521f7bd69d0720bd376ca5303f6666af9e29dfc64ab9f77c8d9c17ef6db5e8900b56433f1f9a1c769ced7566cd251e8939c330 SHA512 50bab2e0942ce4163b3bc8e65cbede775b3370de409991e105d2eafa650b22610e2bcca0d8677678fa4b5d6affc8c010b729d6a0ca0d9491fadb0095d104f0c5
diff --git a/app-emacs/undo-tree/undo-tree-0.8.1.ebuild b/app-emacs/undo-tree/undo-tree-0.8.1-r1.ebuild
index dfeb0ba97404..be73ca2aef7e 100644
--- a/app-emacs/undo-tree/undo-tree-0.8.1.ebuild
+++ b/app-emacs/undo-tree/undo-tree-0.8.1-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
+
 NEED_EMACS=24
 
 inherit readme.gentoo-r1 elisp
@@ -15,9 +16,9 @@ LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
+RDEPEND="app-emacs/queue"
+BDEPEND="${RDEPEND}"
+
 SITEFILE="50${PN}-gentoo.el"
 DOC_CONTENTS="To enable undo trees globally, place '(global-undo-tree-mode)'
 	in your .emacs file."
-
-DEPEND="app-emacs/queue"
-RDEPEND="${DEPEND}"
diff --git a/app-emacs/undo-tree/undo-tree-0.8.2.ebuild b/app-emacs/undo-tree/undo-tree-0.8.2-r1.ebuild
index fc23a69f50bb..be6057114bef 100644
--- a/app-emacs/undo-tree/undo-tree-0.8.2.ebuild
+++ b/app-emacs/undo-tree/undo-tree-0.8.2-r1.ebuild
@@ -15,9 +15,9 @@ LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="app-emacs/queue"
-RDEPEND="${DEPEND}"
+RDEPEND="app-emacs/queue"
+BDEPEND="${RDEPEND}"
 
+SITEFILE="50${PN}-gentoo.el"
 DOC_CONTENTS="To enable undo trees globally, place '(global-undo-tree-mode)'
 	in your .emacs file."
-SITEFILE="50${PN}-gentoo.el"