8 files changed, 69 insertions, 67 deletions
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 4548a14f410d..d951d1fcc8fb 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/elixir-mode/Manifest b/app-emacs/elixir-mode/Manifest
index dcbb5eed0822..d507023b3bc9 100644
--- a/app-emacs/elixir-mode/Manifest
+++ b/app-emacs/elixir-mode/Manifest
@@ -1,6 +1,6 @@
 AUX 50elixir-mode-gentoo.el 361 BLAKE2B d8616511eb05c9a7e7e02cf9955e27fc22675ee68f46f4cd3c7c3efdb033212da8f1f2dbdc554397f142b9b5fc80276c918a0c7f120381b12ee547af292a6ec1 SHA512 70616fdce937d299a37364dff0f18a1595e3cf65e25ef2fea7e6827cd3a713ecfe4a737e20ac8f7bca200479349293ccb25ca39bcc3c65d722479f2498812582
-DIST elixir-mode-2.3.2_p20220314.tar.gz 35711 BLAKE2B f4d712bce35f1056a2b2baf23077fff6204d572f215bf3afe31e26fc15691927afdbe880f942073e80dbe0ce3937dc619b24f89f821a6655f944a448db995744 SHA512 f4467459918db88408c2fa04fcb053fcdf2987c5907f0481034fa18bc3c7a805a7a01d071d7662f4d0db16aa02faa312f225b2b6f45587ccf06a616a1b6df485
 DIST elixir-mode-2.4.1.tar.gz 35948 BLAKE2B 0850da18c5897dce2c19fba5a41235c38b5f6841dcd08c3b9cd1a039d743c3c002f8066bdcb4484cfd99b63004329824d5f38321668aae3fa9d162a5145aac3e SHA512 df429d1cff45d9bcad0cd0d5cdd1776f1c419226881bacec1530750f0cb7418f14858af15176824cbc73916049ba091caaac486fce2c3f6d11ae9cb360ef6a87
-EBUILD elixir-mode-2.3.2_p20220314.ebuild 726 BLAKE2B 2732c5532f90d324409c25c7bba05c38591867c5195779dc4f83f1c27743e1f0b63f4fe7863ce8acbcbfa22ba91b875e4d70c1c4fab51caef3a966a5865b8aa8 SHA512 e2740a29c6293350f7f2d141b312883785b39c26406786db7c52ca2869acc2e9fdf94bdb7bfc359579ed4b70bd831b67b7b7db20baed87f9033b38aca116eb5a
+DIST elixir-mode-2.5.0.tar.gz 36761 BLAKE2B cf1157a7b47acc583595b7a80eb7c5717cb605d9188f0d38c41518d21a6eb5729eda5af81d889d11007a899a8e6f38c67d5dd950407c5a89a5290e68ceab3294 SHA512 dfd3d939ab5a46f70f782e8557d39c02d34d502ea43bb93aba754417d2c13c0c8e6743fb974aa2e2def3e29ab22d45a9015ce6e59b33b561387782d8fe0b1389
 EBUILD elixir-mode-2.4.1.ebuild 802 BLAKE2B e5c9703e4574336fa36be9817eb661d2141dd34eb45226d07489ccf9542392bc3720bb3f35cccf1217cf20d815361f59df7d13b50b82f22abc4ac14ff44f4aca SHA512 ff5ba439707b3fd608478194e98807a88798bbc9670d326b09cb8ac5b2b862aaa49e69b0541dfc18dd6b0d410893cf7841fb07078784dc519523a5c62dd377f2
+EBUILD elixir-mode-2.5.0.ebuild 802 BLAKE2B e5c9703e4574336fa36be9817eb661d2141dd34eb45226d07489ccf9542392bc3720bb3f35cccf1217cf20d815361f59df7d13b50b82f22abc4ac14ff44f4aca SHA512 ff5ba439707b3fd608478194e98807a88798bbc9670d326b09cb8ac5b2b862aaa49e69b0541dfc18dd6b0d410893cf7841fb07078784dc519523a5c62dd377f2
 MISC metadata.xml 443 BLAKE2B 03fd8006b1fafa30cc0e438e9ee2f805492c16cd6075a3f1e7b01a214c61f404537771355eb56db5a1525533eaa000eab1bd572639141f9c6bbbd424e7624fd1 SHA512 1d35ec07722b9acb8f5dc46719d9fbd54e48e42e34bfc93d0200313f64df0c97f51d9c993d70d62994b067384c55948c63d0f7bd15608fcac540f1fb19e5e645
diff --git a/app-emacs/elixir-mode/elixir-mode-2.3.2_p20220314.ebuild b/app-emacs/elixir-mode/elixir-mode-2.5.0.ebuild
index 0dbacc119375..cc7f9f3b5819 100644
--- a/app-emacs/elixir-mode/elixir-mode-2.3.2_p20220314.ebuild
+++ b/app-emacs/elixir-mode/elixir-mode-2.5.0.ebuild
@@ -3,32 +3,35 @@
 
 EAPI=8
 
-COMMIT=e0d0466d83ec80ddb412bb1473908a21baad1ec3
-
 inherit elisp
 
 DESCRIPTION="Emacs major mode for editing Elixir files"
 HOMEPAGE="https://github.com/elixir-editors/emacs-elixir/"
-SRC_URI="https://github.com/elixir-editors/emacs-elixir/archive/${COMMIT}.tar.gz
-			-> ${P}.tar.gz"
-S="${WORKDIR}"/emacs-elixir-${COMMIT}
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/elixir-editors/emacs-elixir.git"
+else
+	SRC_URI="https://github.com/elixir-editors/emacs-elixir/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}"/emacs-elixir-${PV}
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
-	test? (
-		app-emacs/ert-runner
-		dev-lang/elixir
-	)
+	test? ( dev-lang/elixir )
 "
 
 DOCS=( CHANGELOG.md README.md )
 SITEFILE="50${PN}-gentoo.el"
 
+elisp-enable-tests ert-runner
+
 src_test() {
 	ert-runner -L . -L tests --reporter ert+duration tests || die
 }
diff --git a/app-emacs/embark/Manifest b/app-emacs/embark/Manifest
index 2053a39f0ae1..93a627ff3d8e 100644
--- a/app-emacs/embark/Manifest
+++ b/app-emacs/embark/Manifest
@@ -1,4 +1,5 @@
 AUX 50embark-gentoo.el 84 BLAKE2B 04485be0f020ecfee67d3985e9a4160a68e3f099384fab1c005080bc25342efee20e300bb0e02461b9fbaaf7a54b4ece8cb61d38de8a9fb15f67bde1e94efc64 SHA512 007f925facdedd5584abce60d4ccd64636ba754f1474ab77583399d93e793cbc5e78fdfed39cc5705db7cfb80e4d79e5dff2f9f9e15ea0c87ca96592a2f2c1b8
 DIST embark-0.21.tar.gz 102588 BLAKE2B 5a578fe25018591e4dbbe4b683ce1e8669003fdedef3c6eecdf039fdcdc7b2d5accbd95faebe369b5dac90be8beb3be7c0507190f2cac4556a25a58709aef7c9 SHA512 ab450ab17d17fa4673615d6daef9495d4e567ab612f4a732f7536427b71dffecbb0456accc7adb28cedb3f1a73709fa2e51cb01f20902dc7748755ee1ea2442c
 EBUILD embark-0.21.ebuild 993 BLAKE2B aa96d6503dbc683e0a5966b49e5dde3a11d8fb2f68ee159192d43fd5ac223a955ee84ff7f6705be4cc5519026a216da12be86a840597ecac54976a74a9fdcde4 SHA512 560bb6ec4892fffcc17dfabbf6086360e16ec0df86caf5873a475ad58df8c91bbc558b6112e002be2aca4dec6207df80d14016349d3a3d4ec4041ad5f6d9fa01
+EBUILD embark-9999.ebuild 993 BLAKE2B aa96d6503dbc683e0a5966b49e5dde3a11d8fb2f68ee159192d43fd5ac223a955ee84ff7f6705be4cc5519026a216da12be86a840597ecac54976a74a9fdcde4 SHA512 560bb6ec4892fffcc17dfabbf6086360e16ec0df86caf5873a475ad58df8c91bbc558b6112e002be2aca4dec6207df80d14016349d3a3d4ec4041ad5f6d9fa01
 MISC metadata.xml 1526 BLAKE2B 02def263b6f7219e1764917ef493bb87105508b4bcb9b82364ca366bf73a3d8e9a0097525763659ed4758fdf87726e7be5e31acd701990d7a843a14a2cf211a0 SHA512 2f2e8c30b5e9bd0243577769ef9ce748075877f9c66513e18adafa9f3ce60bbbe3ce3f02704aa0354c01a18865532034e2acbafca9b515ccbddca824dd56f10b
diff --git a/app-emacs/embark/embark-9999.ebuild b/app-emacs/embark/embark-9999.ebuild
new file mode 100644
index 000000000000..38aa5db83044
--- /dev/null
+++ b/app-emacs/embark/embark-9999.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=27.1
+
+inherit elisp optfeature
+
+DESCRIPTION="Conveniently act on minibuffer completions inside GNU Emacs"
+HOMEPAGE="https://github.com/oantolin/embark/"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/oantolin/${PN}.git"
+else
+	SRC_URI="https://github.com/oantolin/${PN}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND=">=app-emacs/compat-29.1.4.0"
+BDEPEND="${RDEPEND}"
+
+ELISP_REMOVE="avy-embark-collect.el embark-consult.el"
+
+DOCS=( README.org )
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp_src_compile
+
+	elisp-make-autoload-file
+}
+
+src_install() {
+	elisp_src_install
+
+	doinfo ${PN}.texi
+}
+
+pkg_postinst() {
+	elisp_pkg_postinst
+
+	optfeature "Avy integration for Embark" app-emacs/avy-embark-collect
+	optfeature "Consult integration for Embark" app-emacs/embark-consult
+}
diff --git a/app-emacs/org-mode/Manifest b/app-emacs/org-mode/Manifest
index d0f32d39733f..df9977b4d657 100644
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@@ -1,15 +1,13 @@
 AUX 50org-mode-gentoo.el 95 BLAKE2B 9c74869edce0915d9793a3b10f61e8002dec553a93fe9856c526d77e5e988a35203c35322a1ea7ce9e19b02ff9a5ce1b2b4d73b8ba19bada30b7fbf453e43b01 SHA512 aa2e47c060d441ef1f631f2a44f3b7adc7cf5306155b9cc3f3f808aa053b411980671a89933c77fe02aac79bb6f25f2fe98c676e13e097dd885f23bc9d8cb000
 DIST org-9.4.6.tar.gz 4729335 BLAKE2B b88edaf8098124b2048ce57d6005d2af0de34e9b8fa94c24eb041a42a6fca1fd6da7f242be89e6b0ca5e7b80d879096f9114dca0ba86b20a5d26d2a185baa537 SHA512 7e50d7e9e2073bc0f06d2c861f59d4c9b8af4cf63c98f730c810a3a8721e65829fe9ef7ba0ac99f49bf9da427a4d5ad1d028e05c1a8ab6a3bea2ff2020c0e61d
 DIST org-mode-release_9.5.5.tar.gz 2049730 BLAKE2B 382e6585f693fd30def29da740d1329a52b4565382df90a37e3646324ee44106f1a99c2ea0c0862d77721cc9bfbec0736cb03065b59b2fdea0a68d8f8ea37c9a SHA512 ce06bab17ae7944c1623f935bbad0379d06390c72c43633ba0de2bc04ad362e18d9aaae96103eeaa23f7ea9e4e00976a97a914da87fb7941a13746b1fa77f591
-DIST org-mode-release_9.6.3.tar.gz 2208740 BLAKE2B 77d8e7de2230a3d4b5f3e85336519de1b2d55481522bedc206c5edb2cd56963f729d1e48fe483717fd4c295c6eb1b73e9335ab6a56c2903dd9ee54e15da0a8a0 SHA512 4a7040bab029c8384fa8689782672887baec7eea66ea99a32fd026eddb1659fa15e6c8ba99546fb7b8a16492d1fa476542acba3adef745079f583bd0e2b834e0
-DIST org-mode-release_9.6.4.tar.gz 2208733 BLAKE2B 4ac49b4af872750453dd29eb0fb7de75a140246defb98a1ee62b693fe5083b892eff32ffda6a87cdc4d22486c8246134bb7483e3ec335e23ee131e0f6894475d SHA512 fa117500e0618f20b55af6e7f3cee2d24bbcf396649fabc1420299d99599335c0697e865ac38e49a30d5f2cd00e6daf163f340364e51c306583a7198852df059
 DIST org-mode-release_9.6.5.tar.gz 2209154 BLAKE2B bce49c4cdf51550c83ad78b683e2cb400a4378ffa344e00201450fdbc403248b85ab7a69c64abb5edc45b64c7134bd286e4a7115c255c9f6ff4866425c303711 SHA512 89829a0ccd82a42ba4b612e3ee2208632a0b5d32419192ac47660f6e9ab05e9848a844b6625dab6426a27fc3009bf75925856574d0aab49fefe639b6f31cf2fc
 DIST org-mode-release_9.6.6.tar.gz 2209391 BLAKE2B fd88d0cf686007b7a4f90ad8870f614525efa2edcdf9198eb2576560e8a830ac69c05fe92d1080b191a0c10247669d2cc75306486a0c0ce1c9281ef56a779bd3 SHA512 a8e34bf6766204ac88ab3a0d2d20b5db911c66deef7b252e57691e7032cc0e34bee4d27b1fa4053d5b2011d08c9b1b1b556b5698109150d09018956095e42d5a
+DIST org-mode-release_9.6.7.tar.gz 2209900 BLAKE2B 5e0c63722cba9708018da8e79bfd63a3d632cd7ac27144833e2f816b26cd558dc249c0c8a6b9f78f5c68af1d9218d43fa2f4fab7ab86645215d0ba40cb3d3f12 SHA512 f8225eb3d488faef54d97c812964010fefc19003950fd5b49fc1618b8ff0deb9d001c631820d99439f7527aa72f9c071578484b3b7b8d3c46baa53a7066de2fc
 EBUILD org-mode-9.4.6.ebuild 1696 BLAKE2B 1e2b698f0ba118149cd4e960e5a34b6370c878a917746ecafa9758b5f3ce24d55ea0a7ff3a99b370c972cb0c97c0321bdfe5735d5782d98adcf1ab4c65e4b84e SHA512 76bbc761a82b08a26bb73c0d655b52308487586a8a108a6bc2a29ec66816fdf1f173c626f8594198c00c6a45000686e0876b98dbeb3e566ae212b03005c90ba4
 EBUILD org-mode-9.5.5.ebuild 1386 BLAKE2B 2686e19cbcc0e8298702d9be753b8023e8736feac0d07793c581dfa51a9167d65b072a1d8a268b319b4dd87e04a6e920d400ddb13c50f3da5837bc08cc58f8a7 SHA512 b3417352a09da826becf217c2789d90b25971c4d97ff92225459b50617c04f85bb1cdf53b933ba1c5927a202a4852acf6bb1b6bee3e2c2c40a3fb772669017fb
-EBUILD org-mode-9.6.3.ebuild 1402 BLAKE2B 6d24234cff61823b747d2bf5acd2c5ea42e44230fff15e7414ce501ac80efbe6aa3a278544f8875af5ca6cda3f34e8ebc52ce58a02805b92cd9ac2173d050748 SHA512 31946a3e38c438325919b05e2d084e8533248e15f68bf74bbebfec4c00fe9f39e66d622e49c3fca9714b22ef35e8eb0583bafe66cc40f85838df327cdd0f064e
-EBUILD org-mode-9.6.4.ebuild 1402 BLAKE2B 6d24234cff61823b747d2bf5acd2c5ea42e44230fff15e7414ce501ac80efbe6aa3a278544f8875af5ca6cda3f34e8ebc52ce58a02805b92cd9ac2173d050748 SHA512 31946a3e38c438325919b05e2d084e8533248e15f68bf74bbebfec4c00fe9f39e66d622e49c3fca9714b22ef35e8eb0583bafe66cc40f85838df327cdd0f064e
 EBUILD org-mode-9.6.5.ebuild 1402 BLAKE2B 6d24234cff61823b747d2bf5acd2c5ea42e44230fff15e7414ce501ac80efbe6aa3a278544f8875af5ca6cda3f34e8ebc52ce58a02805b92cd9ac2173d050748 SHA512 31946a3e38c438325919b05e2d084e8533248e15f68bf74bbebfec4c00fe9f39e66d622e49c3fca9714b22ef35e8eb0583bafe66cc40f85838df327cdd0f064e
 EBUILD org-mode-9.6.6.ebuild 1402 BLAKE2B 6d24234cff61823b747d2bf5acd2c5ea42e44230fff15e7414ce501ac80efbe6aa3a278544f8875af5ca6cda3f34e8ebc52ce58a02805b92cd9ac2173d050748 SHA512 31946a3e38c438325919b05e2d084e8533248e15f68bf74bbebfec4c00fe9f39e66d622e49c3fca9714b22ef35e8eb0583bafe66cc40f85838df327cdd0f064e
+EBUILD org-mode-9.6.7.ebuild 1405 BLAKE2B c72dfd77145677c969a4cedf57a53ddfbf09621b5830ffc96171661d6df7974114d169c5111d8ff346c232201f67d8d79999d7f3589566a132fb0b2de19303c2 SHA512 7ac81d9b86c6317c50c4cdd5d7b8786e1c0fd2a930b0adba139451d32e7d6801f8c38f9eb11723ab50af8da10dde5f4a7d2b5b25e469959b7bf0ac8b2701886f
 EBUILD org-mode-9999.ebuild 1531 BLAKE2B 6c06454ac286f2d681af7e55c151a9855dac8aa3028c41c43753ee907fe4d63ec26e5e8e4a0a4f97b80172b0f8fabc92ba591298bef9b5301a176460a1ce9358 SHA512 5526252d6a1190a8bee375b96e9b85c33e593f6bc77f118a33cd566c8fc5634e9e839dbe931c9ad96252e81d669fdc84f9999ea6b834cf2273d31d1e8cb86d90
 MISC metadata.xml 1369 BLAKE2B 4da436ff9e2de1e6f01a37be7cd8a893d49896d00c83a16a47838c3908e04b46f7f07499ce3bdf41a25033ec1313e16b30d6498622e476fdede774ce711d77ff SHA512 d0817690d4662401fcdd28de85b3e7e5f0c69cb37de4ba7ada8499d7ef964217cda8cabed4849c9b48ebecc393d65b2de5067c36db1e98834ac8a86024b901d1
diff --git a/app-emacs/org-mode/org-mode-9.6.4.ebuild b/app-emacs/org-mode/org-mode-9.6.4.ebuild
deleted file mode 100644
index 2747f4956985..000000000000
--- a/app-emacs/org-mode/org-mode-9.6.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp readme.gentoo-r1
-
-MY_P="${PN}-release_${PV}"
-DESCRIPTION="An Emacs mode for notes and project planning"
-HOMEPAGE="https://www.orgmode.org/"
-SRC_URI="https://git.savannah.gnu.org/cgit/emacs/${PN}.git/snapshot/${MY_P}.tar.gz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-3+ FDL-1.3+ CC-BY-SA-3.0 odt-schema? ( OASIS-Open )"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-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 \
-		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.6.3.ebuild b/app-emacs/org-mode/org-mode-9.6.7.ebuild
index 2747f4956985..77e4614e18c6 100644
--- a/app-emacs/org-mode/org-mode-9.6.3.ebuild
+++ b/app-emacs/org-mode/org-mode-9.6.7.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-3+ FDL-1.3+ CC-BY-SA-3.0 odt-schema? ( OASIS-Open )"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc odt-schema"
 RESTRICT="test"