6 files changed, 54 insertions, 68 deletions
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 1b7212e95d98..61970d9764ce 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/org-mode/Manifest b/app-emacs/org-mode/Manifest
index 96093a3c4f61..f505f2ba00f8 100644
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@@ -1,13 +1,11 @@
 AUX 50org-mode-gentoo.el 95 BLAKE2B 9c74869edce0915d9793a3b10f61e8002dec553a93fe9856c526d77e5e988a35203c35322a1ea7ce9e19b02ff9a5ce1b2b4d73b8ba19bada30b7fbf453e43b01 SHA512 aa2e47c060d441ef1f631f2a44f3b7adc7cf5306155b9cc3f3f808aa053b411980671a89933c77fe02aac79bb6f25f2fe98c676e13e097dd885f23bc9d8cb000
-DIST org-mode-release_9.7.17.tar.gz 2364232 BLAKE2B b0f3c94e92f6721b0ffb4b9196391a0520c2cad8124eb9afda58f3e1705d7031e616cd0549eed2ed16b1d6e8d10113f7f384f4c1ca969a83d9b5975a9cd95d76 SHA512 4bb12ed1aa3be2ab32037450960535f1552395409b49721cae5babf0f2eb3d96497c635d08141efdc7b7fc738b8df8422cf0ee65cb3c329ad4db578c4478dc19
-DIST org-mode-release_9.7.18.tar.gz 2364125 BLAKE2B 6def92460c96c02e4fa0304bf02437819b3a3541db4f30ee6cf354faaa55860886b785940af6cb32d9b6881d6484c3eaf50942b9a788712f84e2a1676f06940f SHA512 c019d82c2bc2bde3ee555f7a99e0b935e3dc9b64bdecdb2f83b2ed8460c822cd1d7a3f318dff637c57ed905070df98aff32cdc82b3c96a10f26038859c540e0a
 DIST org-mode-release_9.7.19.tar.gz 2364122 BLAKE2B d7e65b8af54968a812e012aa11f380f64d65bd5e0829ecdc96d64a539c54f384157a336c192806d9fb32be50a0c6c62e60bc8d067ab581049b0edc8a57ad1327 SHA512 bef652cc8e31f86ccaf6ce0288389f1cb10aa43fd9d8f4191ab30e7d4563b977f4da309c322367a6f2beb27e88c3d771b5c4d4e259ca4c8c6a0b145c1e8d43ca
 DIST org-mode-release_9.7.20.tar.gz 2364571 BLAKE2B 694e709b161a3669191fefa517b93d3629580cd986c48af0e0cf1198a1a7bcbee835c452ec87d4445f5ac91bf10f1127c8ad22283eede9b3eca5f67bed567f15 SHA512 ee81f6be7f544205c256811e90bd9dda9d830b1ad19dde079be7affbe304ee6ce6d059814f6658514af3273630ea3ce99797c6af419f0c9ab3f1f1b64e8bf35c
 DIST org-mode-release_9.7.21.tar.gz 2364695 BLAKE2B 1cd3fe37ecfe4450dce69dd7499b6ddaaf5000edab26fd8f19ab5d09b1cf24aabf3c451d5c5e1f64f0d4436f8a60ce7ff2a28d7f97abf2af834c286fd81c70d3 SHA512 7309db82e95902e4e255e8f9f80095c2e7df80e8036b6aff39fbbe500aac4d8f6bfbaef3cacb67ed72a6ae9c44c90d36d2d59ceaef9f0d94228e0406276a392d
-EBUILD org-mode-9.7.17.ebuild 1594 BLAKE2B a4ef3b4d5ad256661ca144994b6caa7e5f728fd762c65374734387941feaa6f07aa4ec7ebb639616a5fa287ce35400e62b88eafdc515af8dfb6b982862b6bc1d SHA512 f8cddec4c3990cb88421640f0df7b06c5cfb4d94944f33f1230109c2f92b81d266fe168d5d8c919e6f8bd588797f443e06c2d9fb6da6c75fc0616efe736442b7
-EBUILD org-mode-9.7.18.ebuild 1597 BLAKE2B 9fc5a6fceb0390c825539b4ba29d672220a014a5e649706c3c25ba9b5fb49d0f7b139ce4315903dc446f573848ad20ed59ad4fac920dcb3a719bb61daeef2c6d SHA512 b49027b63f17c31a3bb9221cb726364233af8be6fd0162e3353df8e5b51bdff978672b74be80671c20f8dc0e3482ff5179cdcf3e6e678809a6d764742c8e4e80
+DIST org-mode-release_9.7.22.tar.gz 2364662 BLAKE2B 10a60b241fc87b141f3c6ea07bd99aae464fcf5bcaaf667c0a2340da85b711118d28059831a27d3eafacfedd1c7119162fdfb4cf19f42c9e46ac650d0afa56ce SHA512 7fb8f141315fa22ab5b87bcf16d104377b3309b1e25a88e93c5f088238112dfe726bd3b28d35530c0f1c7684c42967028e469b1767638ddff89bb891b6922d2f
 EBUILD org-mode-9.7.19.ebuild 1723 BLAKE2B 6e5fff17b6c42e26b3ec12399ee34435603724f6459ba28585042f3bd0477ffcf8b149614da921afafd5c893c9e982fed8f11579afec1dc32402ac51f49fbd29 SHA512 1bffe112acf7a84bafa90c09e8571efb7a3b25d633a61f57dc80cb8624c0e7f80ccbc3367673a8bf534feeac9040d569f37c611d1e92d768c8869b52862df023
 EBUILD org-mode-9.7.20.ebuild 1726 BLAKE2B bac17ce697cd7964f808cdf9cbf90213f4d793e2e3319433ce9f0f88c6257ceb36b4b0fbb65ae232064f5d610b603becabe2bf88bfa7ce8c978a5ea48a25f6f1 SHA512 d92608fe750a87b2ad966d8bb356afdce0c35491ff8a95976458cb788a85ade94a595c5eedbe766f8121325cb4b2cda1c35139786951d868fdc091ddb2986e59
 EBUILD org-mode-9.7.21.ebuild 1726 BLAKE2B bac17ce697cd7964f808cdf9cbf90213f4d793e2e3319433ce9f0f88c6257ceb36b4b0fbb65ae232064f5d610b603becabe2bf88bfa7ce8c978a5ea48a25f6f1 SHA512 d92608fe750a87b2ad966d8bb356afdce0c35491ff8a95976458cb788a85ade94a595c5eedbe766f8121325cb4b2cda1c35139786951d868fdc091ddb2986e59
+EBUILD org-mode-9.7.22.ebuild 1726 BLAKE2B bac17ce697cd7964f808cdf9cbf90213f4d793e2e3319433ce9f0f88c6257ceb36b4b0fbb65ae232064f5d610b603becabe2bf88bfa7ce8c978a5ea48a25f6f1 SHA512 d92608fe750a87b2ad966d8bb356afdce0c35491ff8a95976458cb788a85ade94a595c5eedbe766f8121325cb4b2cda1c35139786951d868fdc091ddb2986e59
 EBUILD org-mode-9999.ebuild 1548 BLAKE2B 426b201cd1c179250baa695a14b4f152a1071bfc2b9afd99035a409b2ebb0be500a21bd43dcc46dadc10eb8466ab1ed8787f8007f09a96849688851d24d4cdab SHA512 154b347979a5bfde974dac21d0e2f65c7bddeaffaf9a0c68054ff97a24ce126f784e473705f45bffa9c40361b106a6042175470e883d1e3faae2a73c345dc160
 MISC metadata.xml 1590 BLAKE2B fe57d840c8c176a9fc193cc97f39e2deb69aaace5a06f582333f745bd1341598d0c1289bd22bb1ebf07476858dc2e04b90ad5a000cdea1f178fba90c5160f96c SHA512 7ccfc23be09c9a29ee82f0fd2ca867b5315b932e52c5176ce810bdb7d963dff5b863b3c17d631872effface7e37f7d17ff0d3d8e7490be2114025d3c8536ceaf
diff --git a/app-emacs/org-mode/org-mode-9.7.18.ebuild b/app-emacs/org-mode/org-mode-9.7.18.ebuild
deleted file mode 100644
index 86c9f98ba96b..000000000000
--- a/app-emacs/org-mode/org-mode-9.7.18.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp readme.gentoo-r1
-
-DESCRIPTION="An Emacs mode for notes and project planning"
-HOMEPAGE="https://orgmode.org/"
-
-if [[ "${PV}" == 9999 ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs/${PN}.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/org"
-	S="${WORKDIR}/org"
-else
-	MY_P="${PN}-release_${PV}"
-	SRC_URI="https://git.savannah.gnu.org/cgit/emacs/${PN}.git/snapshot/${MY_P}.tar.gz"
-	S="${WORKDIR}/${MY_P}"
-
-	KEYWORDS="~amd64 ~ppc ~x86"
-fi
-
-LICENSE="GPL-3+ FDL-1.3+ CC-BY-SA-3.0 odt-schema? ( OASIS-Open )"
-SLOT="0"
-IUSE="doc odt-schema"
-RESTRICT="test"
-
-BDEPEND="
-	doc? ( virtual/texi2dvi )
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	emake -j1 \
-		ORGVERSION="${PV}" \
-		datadir="${EPREFIX}${SITEETC}/${PN}"
-
-	use doc && emake -j1 pdf card
-}
-
-src_install() {
-	emake -j1 \
-		ORGVERSION="${PV}" \
-		DESTDIR="${D}" \
-		ETCDIRS="styles csl $(use odt-schema && echo schema)" \
-		lispdir="${EPREFIX}${SITELISP}/${PN}" \
-		datadir="${EPREFIX}${SITEETC}/${PN}" \
-		infodir="${EPREFIX}/usr/share/info" \
-		install
-
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	dodoc README.org CONTRIBUTE.org etc/ORG-NEWS
-	use doc && dodoc doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
-
-	local DOC_CONTENTS="Org mode has a large variety of run-time dependencies,
-		so you may have to install one or more additional packages.
-		A non-exhaustive list of these dependencies may be found at
-		<http://orgmode.org/worg/org-dependencies.html>."
-	readme.gentoo_create_doc
-}
diff --git a/app-emacs/org-mode/org-mode-9.7.17.ebuild b/app-emacs/org-mode/org-mode-9.7.22.ebuild
index 8add87a15815..7c045e5649c4 100644
--- a/app-emacs/org-mode/org-mode-9.7.17.ebuild
+++ b/app-emacs/org-mode/org-mode-9.7.22.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI="https://git.savannah.gnu.org/cgit/emacs/${PN}.git/snapshot/${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="amd64 ppc x86"
+	KEYWORDS="~amd64 ~ppc ~x86"
 fi
 
 LICENSE="GPL-3+ FDL-1.3+ CC-BY-SA-3.0 odt-schema? ( OASIS-Open )"
@@ -33,6 +33,13 @@ BDEPEND="
 
 SITEFILE="50${PN}-gentoo.el"
 
+src_prepare() {
+	elisp_src_prepare
+
+	# Remove failing tests.
+	rm ./testing/lisp/test-{ob,ob-exp,ob-tangle,ob-shell}.el || die
+}
+
 src_compile() {
 	emake -j1 \
 		ORGVERSION="${PV}" \
diff --git a/app-emacs/projectile/Manifest b/app-emacs/projectile/Manifest
index 2c692278664d..74b671e8f0f4 100644
--- a/app-emacs/projectile/Manifest
+++ b/app-emacs/projectile/Manifest
@@ -1,4 +1,6 @@
 AUX 50projectile-gentoo.el 141 BLAKE2B e56b9486e81ed169662cb21ca2a19f43b96701b7732c7458d267996d65fc916bc4f067f717c13208332df7d636e9a4deb6917f323cc3ac5e555ca2c82ac6c64f SHA512 31d1d040800cfdc8182b4ed78e27c2a81a36e124192ddf0ad4c54f45f3ceb9c5c068604e3f913a50ade6385c263ff3b57ba80f8639f5b6b03297eaf23824ae31
 DIST projectile-2.8.0.tar.gz 1929750 BLAKE2B c1dff407a12eddd513d0611d5b182da198c20bfaca7810937e5e0829ba3b2124b58139cbfd2e536571be59cd9e1d99ced0a7473ac77f4fd16ac17b7e28f00901 SHA512 492fa5f70af480ec964335c2bead05a23b7ed2b749390e6d3cb8dfa78b8cfe534c1fadfa01360a0b226a044158d3f7365da398825a1986208f25b41493e19f19
+DIST projectile-2.9.1.gh.tar.gz 1935369 BLAKE2B a2f832d0c5c8ee5e5649d7af6c0a22a4311049faca1f9c6e0a387ba726b5d07abf9b9cf6cde88f1489c113e9b1fd60854900d83ad854c2c21b7f9ca89739f208 SHA512 e53d1dcde6498f8125134c482898e316e2565cefdfd5da6a90d880d3d309560295c21577ec0d7efff5f2a96cf09a36181fe3c36f85ff68fa916fe45c72b32da3
 EBUILD projectile-2.8.0-r1.ebuild 957 BLAKE2B 5908e42c6936884330d6dd324349e2b9bac1ddb72e2cb59acdedcb844b32ac68f0d2c5f115906f3f5b50d857a1a9607b2acddab4dfbafa62466ce0ddd8710a5a SHA512 c049ce2b52212ecdd1f153666f959c42cf48d77415c1bf39563421f59ba31643187622be1b965e6a7f3a05bb442b630334b5fd4befd2070ba132fea3d358aa19
+EBUILD projectile-2.9.1.ebuild 1045 BLAKE2B 105894d2e51a2b1fbcf76c055dadec76c78128d0fe1a61c47e83c38326289ed8012e05bd43db0598d0ef6a2e951c799193c1ad2261c30ac172142f8425bc5181 SHA512 5e657bdce859060f5f76078ba890fffbe48130cc7a60609c0016c724a86191892021a0524f20e48b2d8f5de4b2cfaa88cfef1e36036cd65145ae6a5c4f6a2a4f
 MISC metadata.xml 730 BLAKE2B 026ad65ade8e08d1874db2ff46be522a975ae4f1c81a04510e46912bdf7ff171e5523c48b863a5d2cfee3818ec28d0dd82aa135de272b60923d200396a09ac44 SHA512 81f9d1c00773d81a5c680e3ee57455b92d85e0e136d5a8125418e419f07c91a6c16cc5e899f995c5610904a605a03aa405f319fc4f5399df5e9b7942a68c1bcd
diff --git a/app-emacs/projectile/projectile-2.9.1.ebuild b/app-emacs/projectile/projectile-2.9.1.ebuild
new file mode 100644
index 000000000000..ba076ec6d28a
--- /dev/null
+++ b/app-emacs/projectile/projectile-2.9.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2021-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp optfeature
+
+DESCRIPTION="A project interaction library for Emacs"
+HOMEPAGE="https://github.com/bbatsov/projectile/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/bbatsov/${PN}"
+else
+	SRC_URI="https://github.com/bbatsov/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+DOCS=( README.md )
+SITEFILE="50projectile-gentoo.el"
+
+elisp-enable-tests buttercup test
+
+src_test() {
+	mkdir -p "${HOME}/.emacs.d" || die  # For "projectile--directory-p" test.
+
+	elisp-test
+}
+
+pkg_postinst() {
+	# Descriptions for this packages' purpose were taken from Projectile's
+	# home page https://docs.projectile.mx/projectile/usage.html
+	optfeature_header "Install the following packages for improved performance:"
+	optfeature "super-fast alternative to find" sys-apps/fd
+	optfeature "powerful alternative to grep" sys-apps/ripgrep
+}