6 files changed, 20 insertions, 54 deletions
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index d961cbbd9fec..bc60e4ec471e 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/ebuild-mode/Manifest b/app-emacs/ebuild-mode/Manifest
index 4823df6e56a3..24dec30e2bc8 100644
--- a/app-emacs/ebuild-mode/Manifest
+++ b/app-emacs/ebuild-mode/Manifest
@@ -1,10 +1,6 @@
 AUX 50ebuild-mode-gentoo-1.54.el 1509 BLAKE2B 98cf2a1672723ffaa3f4d2f57b4b67b897df56cc2d7352366b79df0578b927faae53c3cc703fa70cf23bd0b1006d8c49dd8e59fcaffa3a231fd7ec5e26c7dce5 SHA512 91c59e85ea79733c195985e4a33dfb1aec8ac13457c0dc3fe7353fb2616787ebde4393b671a2943b752725593929070b658c24955d5e2132b6e9b76daa749850
-DIST ebuild-mode-1.60.tar.xz 36996 BLAKE2B a566c9f602ec6ac4126a4a13610e515faf2a02b8ca89f417a037a28f4b9ea633518d589d78f6deb54084be34cdc30c2a1896546b2f86c1166cedd47289edcfd8 SHA512 b04b37b7a376dc48a7f80ec0e60bf36a8b7ea92edcbdd45fbd002e80e8ea29111905a726177a869d607adffe78094efcdc94b1aad32afe1444a09b4e714dcecd
-DIST ebuild-mode-1.61.tar.xz 38632 BLAKE2B f13f251918cf13533611c4d98a9aeceff10e9253c207a10c047c59952d6c8e50cdddb7c3ff65ed7b9565bd09fb45203c9cb57a277165b9cc7bbb47c5d8978a59 SHA512 a7087894299c3882ff0993a1a33cd192ebec078e7cea2f8964610d758a439350dcf36fe43aa43a42b89446d36b62a9b80bfce531e701b0183f3d69e56528ab62
 DIST ebuild-mode-1.62.tar.xz 39080 BLAKE2B 91bb206f7ca3fecebc80d946d5840ce6e02610171d6179d360b188e270226e4f1dbe4ceddbc1e41f8e627c787b28454a20720d563bbabcffb3a99b7b10a1251d SHA512 9e7caafb45a7538dd66221d2a5dd9fef764c72f6f42db1ad1615e4017b7d4db14dcde09edfa0e8777a528af918e219521072040215d05a9c8a5cdc57ca395bd8
 DIST ebuild-mode-1.63.tar.xz 39600 BLAKE2B 1746e0ab558fd7b48dc778f2287b3a9f2b5f82f5e4e53e353b0b9c3de3436a8ec17f827d93cf1ff990dd780a33435ea946e19ac655fd0f39fee03beb07ce5509 SHA512 264678921d8a2e535fedcc06c9c0932a4898f3d33cc54d79107658d9a77048e00c5ec276d4c74dc55c2ba2c643024453542f16619fde473d417b446bbd78175c
-EBUILD ebuild-mode-1.60.ebuild 736 BLAKE2B f708af9e50ccfc614f5407644adf2aec9c31164697af7d8afbefde86ad6fe383a5bdcad4667eb58f948b5df810cdfc0b2ae769ce9439541c8bff2e3e6ccf47fa SHA512 8fa6f16bc9ee8552852649567391556eb976c4ae54cd02202e4b3226c4d3c2566c5669600ecf76afd5f1b8bf92deb897517c419c2a1b0689ebf2dfc7da7c83a0
-EBUILD ebuild-mode-1.61.ebuild 874 BLAKE2B 1c65faf2ee32a4c4a094ab9eef56342d61ec272000c15e3cef4c0a604a91af8e1157971e173919f95278375511c81393987de8677f713857cfc4400ebbe85b72 SHA512 e704314cd41d61debba4be29f21746501bc7893f55782f3933e276dfd5a3c198f56b7ce18fa7c04468d6ed3a43c573dad69591d5eff590f74f0af40a75ec39b7
 EBUILD ebuild-mode-1.62.ebuild 874 BLAKE2B 1c65faf2ee32a4c4a094ab9eef56342d61ec272000c15e3cef4c0a604a91af8e1157971e173919f95278375511c81393987de8677f713857cfc4400ebbe85b72 SHA512 e704314cd41d61debba4be29f21746501bc7893f55782f3933e276dfd5a3c198f56b7ce18fa7c04468d6ed3a43c573dad69591d5eff590f74f0af40a75ec39b7
 EBUILD ebuild-mode-1.63.ebuild 874 BLAKE2B 1c65faf2ee32a4c4a094ab9eef56342d61ec272000c15e3cef4c0a604a91af8e1157971e173919f95278375511c81393987de8677f713857cfc4400ebbe85b72 SHA512 e704314cd41d61debba4be29f21746501bc7893f55782f3933e276dfd5a3c198f56b7ce18fa7c04468d6ed3a43c573dad69591d5eff590f74f0af40a75ec39b7
 MISC metadata.xml 483 BLAKE2B 203c30fd4195b63532c0462427658547b0805fb23b57c9a04c554eba8ef0a9b9bc7e3100a51c3cb7feb11d1dcb9472357e5e53640e9a94658e35594cd3369f56 SHA512 78804ced19849c5d88cf942117714db3302cb2187e93ab3924b5526d0c6aa973dbda2cdb5a67c9e0639d5ac3278ea8da9df1e20c2b3cb96231f3fee5fc6845fb
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.60.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.60.ebuild
deleted file mode 100644
index c4c5036b54bc..000000000000
--- a/app-emacs/ebuild-mode/ebuild-mode-1.60.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp readme.gentoo-r1
-
-DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
-SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-BDEPEND="sys-apps/texinfo"
-
-DOCS="ChangeLog keyword-generation.sh"
-ELISP_TEXINFO="${PN}.texi"
-SITEFILE="50${PN}-gentoo-1.54.el"
-DOC_CONTENTS="Some optional features may require installation of additional
-	packages, like dev-python/docutils-glep for glep."
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.61.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.61.ebuild
deleted file mode 100644
index a3323770d37c..000000000000
--- a/app-emacs/ebuild-mode/ebuild-mode-1.61.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp optfeature
-
-DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
-SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-BDEPEND="sys-apps/texinfo"
-
-DOCS="ChangeLog keyword-generation.sh"
-ELISP_TEXINFO="${PN}.texi"
-SITEFILE="50${PN}-gentoo-1.54.el"
-
-pkg_postinst() {
-	elisp_pkg_postinst
-	optfeature "ebuild commands support" sys-apps/portage
-	optfeature "additional development tools" dev-util/pkgdev
-	optfeature "ebuild QA utilities" dev-util/pkgcheck
-	optfeature "generating HTML from GLEPs" dev-python/docutils-glep
-}
diff --git a/app-emacs/eselect-mode/Manifest b/app-emacs/eselect-mode/Manifest
index dbf6f37685ca..1be91c3118fb 100644
--- a/app-emacs/eselect-mode/Manifest
+++ b/app-emacs/eselect-mode/Manifest
@@ -1,5 +1,7 @@
 AUX 50eselect-mode-gentoo.el 178 BLAKE2B 50fea27e7add6d31f37801593430154636bb58ac6e3f7cc44c68a16d49c9156cf37285778a38bf97a1f4805a22d6d5cf9d597acdcdedfd77c62a5825a0d1d88f SHA512 200da398adf72241112bcda74b432a8a313cf29018c9f6fbdf6021674b23a201ada6ba884d4c9c3a4ee4c042d6c8fc7c3ba59702c8ddb6ea20b652f9ded9d32f
 DIST eselect-1.4.17.tar.xz 178980 BLAKE2B d905ac88bc009080912af75e64c7920d745788866fa3cb35466d68a652efbbd6984d6e1efeed76d9a344aed94705b74c85aa43e9c037d4d548d2e24afa69bd7a SHA512 35dc4c52f44c4f64db9c0dc2aec57b3055a6d36760b1bbbd094ad11b3f9e71a731444802632817b89c3b511f1dc9bb92046b59322d177e13fdc501ed767b591e
+DIST eselect-1.4.22.tar.xz 183480 BLAKE2B 8f86bdddaf98bc075694bdf7283cbd366e0ef93635472b3bbac11fdd9765984cd82e493b16836bae66e4b2c42a9cb33ad0d2aacaaf8529b59e4898e11f172d26 SHA512 73a10278d604f462aefa099df398eec2b08aee33da69419351ff2faf1cf4c0f3de0f301d92015e52da63046fe7e2c1c388e11ac84b7deb3def505a59fa291dac
 EBUILD eselect-mode-1.4.17.ebuild 539 BLAKE2B d3577d550f337336c34081ef54af222083dc5e8975faaa1c7a22c6df3e76f14b97944095200d43944514d2b24585b4f26d7ba31a61fc25f013a7bba76b3cd301 SHA512 bb7c63b048dd1b78e2d9340e6c3a05cdc817ebcdf5d7bc9a49f877054f00f16a2254ea84b0c5db69a13c58dfe918f1973adc5af44189237b96896beaa62d97e7
+EBUILD eselect-mode-1.4.22.ebuild 546 BLAKE2B 2abc02fb49e85f4d82b900e880b6463543760b3a70bdd1bb1928f1d3d311818896ecddc8df5b9f0955944d48dc63d80fb4c4fa6485cd499492f9ee3a32f0a4c3 SHA512 e10f13c368a9225c6ccb0fbb0b47ff3d80faf8bb0d7f37cffee019ba9a7f39cacaae75ce471a2083e7dcae584aad2dffe6d1c7ad2f7f3d186b50814755180908
 EBUILD eselect-mode-9999.ebuild 455 BLAKE2B 0b2a475c460420afdc6562a94fcef5d57b19d66d0fde52d2cb799f466a71d7948b6349832e58db1dddd3ee0e41b7a413a5f5f1ded177dc2a270a4d46f6970222 SHA512 1040b39298989935448478ffcf8b85d34e9998e40be7f1208650d14aebaa13ec9ac4f0e732a2077b5f928fa6f26c6d29b599ec1759d7fcf030465f32a6fa5348
 MISC metadata.xml 450 BLAKE2B 18abd40eece633f3e8973ace3935ce484a8cbe75ba047963ee0beb3e4dca3f4c7d94b07423de65a0a847d73efb6849dfa1ecc8502424e98a8a6b5321f09be836 SHA512 bb496b4931b553dcf322e71a5f475db8acc8ed445b439f25d3aa7a1e08662d747f386eb043adcb159bf73c9a746c1ddc00d58eee1e7dbfcf7321d41f13e7ac7e
diff --git a/app-emacs/eselect-mode/eselect-mode-1.4.22.ebuild b/app-emacs/eselect-mode/eselect-mode-1.4.22.ebuild
new file mode 100644
index 000000000000..86e72007688c
--- /dev/null
+++ b/app-emacs/eselect-mode/eselect-mode-1.4.22.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+MY_P="eselect-${PV}"
+DESCRIPTION="Emacs major mode for editing eselect files"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Eselect"
+SRC_URI="https://dev.gentoo.org/~ulm/eselect/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P}/misc"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+SITEFILE="50${PN}-gentoo.el"