8 files changed, 63 insertions, 8 deletions
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index f2336eff28d0..4a955cb98c0f 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/consult/Manifest b/app-emacs/consult/Manifest
index 7fc27692e38f..d677a6151cb0 100644
--- a/app-emacs/consult/Manifest
+++ b/app-emacs/consult/Manifest
@@ -1,8 +1,8 @@
 AUX 50consult-gentoo.el 82 BLAKE2B 3443827f490db8caacfe842cc7f1d1315f3889dec007210f451909576a76139f70ac5795346a7a1b11befccd3152874fd3c86ad7a20c0fbf84f793f8deb595cd SHA512 dd2ba1149c847d95d6c54265bc03de36e198dfecedc10336f6879fb3a1fc9d92e2c6de190d4f9aaab6c3d15f268fb80e082b49b6e96165697ff786333a50a601
-DIST consult-0.18.tar.gz 93440 BLAKE2B cc67e8cbc49846964114a8e01a10d41454fde2e4a2e98e3af315092fab5631ea1418f649eb92ca798672c0ea153dd2862b555aee6530a1baa84ac4050df7a3c6 SHA512 74005c211ba7af0cf3c0a06fdec8d85da111ea84edb4eef2c60d231ae6eb87905298ee8bbbcdac8bf8b13a21ed9070422383b93433e422d6ad6b743c8bc80938
 DIST consult-0.19.tar.gz 94673 BLAKE2B a0bfacd0eccde14a332e85d31ad37092f418b5d250db8bc5a674881828d198fd2b26d66be1574539c33fcdc70f7165f4be84a4f920f1eb62b6bee0048b46ac54 SHA512 b1f023d57f29ec9443add83aca818a0f7f2c4954e8d5f53246fbb5a2525c03c20c71d69d8e748fe6fe6044393849b33f9589428528d2d0837e5848aab2724f4e
 DIST consult-0.20.tar.gz 96288 BLAKE2B 41d35655b75c6f3901b5b20f743bdf5119d0347a2d2a0dd6884cbf3856146ed30a224da75147063a93f4274772d54bbb6f91d4deb9fbda5f93d57d1b70083ef0 SHA512 d9f847f086e2921a769e84b10439512e0b614b87c424d6b206ed1007bbd67360072e02441a4249ac31ea6aa9ad5d36a042af27c0ebc935de3889e31d604ac8c9
-EBUILD consult-0.18.ebuild 512 BLAKE2B 56b9e691d89d705a6cfee1850c3662f9e23b32d16d9066001c0b88dd2a9e3cbf1142b15f23ce13368300531556c66c69e9d10770495613d00dd93cdf3ef50fd3 SHA512 aedace27479c09512b196fc31d57e882967a5c95958c2d1f8e053866a41d6e7b2828a075127c149e97ff5512a53089e9602c3a0ae47f231186e276a16f699c84
+DIST consult-0.29.tar.gz 98233 BLAKE2B e500e3b48609000934c82832c80c9a253ee260a67c1b7e437f792668f607aa8d8e7909bd889341bf2cfc46bd4e54ed133350862aa2e7fe51fe36948d5b5edc17 SHA512 fff55c1eb435955b48e830626e06eb657cdd7c48722e9583f47842c720d1a3bc1ee8ca97ef758ad4270709fc303ba6c76dfa4c153fc958acee348aadf1e5a1f9
 EBUILD consult-0.19.ebuild 512 BLAKE2B 56b9e691d89d705a6cfee1850c3662f9e23b32d16d9066001c0b88dd2a9e3cbf1142b15f23ce13368300531556c66c69e9d10770495613d00dd93cdf3ef50fd3 SHA512 aedace27479c09512b196fc31d57e882967a5c95958c2d1f8e053866a41d6e7b2828a075127c149e97ff5512a53089e9602c3a0ae47f231186e276a16f699c84
 EBUILD consult-0.20.ebuild 512 BLAKE2B 56b9e691d89d705a6cfee1850c3662f9e23b32d16d9066001c0b88dd2a9e3cbf1142b15f23ce13368300531556c66c69e9d10770495613d00dd93cdf3ef50fd3 SHA512 aedace27479c09512b196fc31d57e882967a5c95958c2d1f8e053866a41d6e7b2828a075127c149e97ff5512a53089e9602c3a0ae47f231186e276a16f699c84
+EBUILD consult-0.29.ebuild 512 BLAKE2B 56b9e691d89d705a6cfee1850c3662f9e23b32d16d9066001c0b88dd2a9e3cbf1142b15f23ce13368300531556c66c69e9d10770495613d00dd93cdf3ef50fd3 SHA512 aedace27479c09512b196fc31d57e882967a5c95958c2d1f8e053866a41d6e7b2828a075127c149e97ff5512a53089e9602c3a0ae47f231186e276a16f699c84
 MISC metadata.xml 359 BLAKE2B 569bd0c5fe81610f0b67c94e8c431edddb5060800a6e22d0833a4d5f120df34545dc49c879c12a6522ccbe791472df47be42af97fbb228498e79d9e0893697f3 SHA512 8e01b569f019ea43209f43c783fd41b9661a7235d300363a9441179058b10921629cf8b891874c706d2c1ec106248f6c1e0a3501df7bfcdd02000d08f7997c29
diff --git a/app-emacs/consult/consult-0.18.ebuild b/app-emacs/consult/consult-0.29.ebuild
index d2a809943fab..d2a809943fab 100644
--- a/app-emacs/consult/consult-0.18.ebuild
+++ b/app-emacs/consult/consult-0.29.ebuild
diff --git a/app-emacs/corfu/Manifest b/app-emacs/corfu/Manifest
index 919ce33e2fe5..689b047ba2fb 100644
--- a/app-emacs/corfu/Manifest
+++ b/app-emacs/corfu/Manifest
@@ -1,8 +1,8 @@
 AUX 50corfu-gentoo.el 80 BLAKE2B 030035947690cded0580337466f06e7561c996ef27d6dce32cacf28249e71f3a99083e1dcd68e8fb1e2d0bcff75a70881ca88c7f41128123876e6f34230235fa SHA512 cde0d90e0b8bafffafd8d79c6fb4bc7957d1c7e5a6eb86b2c2cdeb73910bfddb6b8b2985bd46af406e5d3f3d1e1205b37ac2bf8cb26aa3d052b06054ae7ba00e
-DIST corfu-0.27.tar.gz 39034 BLAKE2B efc1d2477bfaa891d32516d69aeb5179bfcb9332b579609319f832a7ff03416ef5836cf5124bf9ad9c8f75ad4a6c4183a17257037f6271801515636dc5bfd132 SHA512 fd143b4fe63080e6280be98b93ef84f4b12c5c1211cb1a9294ea4fddde61466f29f68e9aa24dce74c5316d7938c91fdd0b28775c688b451386daf041ac745b82
 DIST corfu-0.28.tar.gz 39100 BLAKE2B 70deefdbe6768efa0c9a8c86b441f177f1c0e6f7c344f9290fd82dd1f02752c4dea5e8810b475e73709c89cc5d62d07f3beb70814f744828700d2d30edc0956c SHA512 85de7be79cc979cd877f9f9fa0e9546f40716215393e8bfa6cfc8e8f71d1289a59702230f8051c3bbb4b968732423b1adc124fae4f661523fb4f5a78591f0c46
 DIST corfu-0.33.tar.gz 44195 BLAKE2B 7995bea510a812ca0772fb2229230ad0f1b1e1ef8ad97e832aa1bd650d7a59b4fe0412fe3f627c37d7027f094a6892856ac02b90aae583c25ce0f03577101ee4 SHA512 e9879a2ecce1fbce9a4750e85f5e5fa998e0f706e67d61b011061275bec7bdb8da3512b4da3d2fbdd6b8dc242887091bf1d68f96a465ee63f9b8e83829b5a3b8
-EBUILD corfu-0.27.ebuild 544 BLAKE2B 8e7b2e689f65d4dcca4934c53564bb8435dae6f06c364d445fce382229231e5e8553d13e25c4451359b00ed453e140a4d1286c8f5584e683474bdc0e12efaf64 SHA512 2f80fc7697c70ab5be781034220f24067b7cc9b648de2520ff159de3c87c6abca72fd7c86739767c58d5ed165525f6b2dc48c3652a60b01f01962e917621ac10
+DIST corfu-0.34.tar.gz 44586 BLAKE2B c2a056cdef8cc536f3512662c442504fd3c973649e58b382eb92fb749bc5b3de2dcdad9f13cbe929b33b001fe9fc1ee2b057620c321f32ad9aefc0b274b71983 SHA512 5a46af83eed319170687e91386d8363416682fb6017d465a2b86c8164903efc128122b9cae81482155d8c710f7b2eb1dc8ff0b636544a0a611bec574fdb188c9
 EBUILD corfu-0.28.ebuild 544 BLAKE2B 8e7b2e689f65d4dcca4934c53564bb8435dae6f06c364d445fce382229231e5e8553d13e25c4451359b00ed453e140a4d1286c8f5584e683474bdc0e12efaf64 SHA512 2f80fc7697c70ab5be781034220f24067b7cc9b648de2520ff159de3c87c6abca72fd7c86739767c58d5ed165525f6b2dc48c3652a60b01f01962e917621ac10
 EBUILD corfu-0.33.ebuild 544 BLAKE2B 8e7b2e689f65d4dcca4934c53564bb8435dae6f06c364d445fce382229231e5e8553d13e25c4451359b00ed453e140a4d1286c8f5584e683474bdc0e12efaf64 SHA512 2f80fc7697c70ab5be781034220f24067b7cc9b648de2520ff159de3c87c6abca72fd7c86739767c58d5ed165525f6b2dc48c3652a60b01f01962e917621ac10
+EBUILD corfu-0.34.ebuild 544 BLAKE2B 8e7b2e689f65d4dcca4934c53564bb8435dae6f06c364d445fce382229231e5e8553d13e25c4451359b00ed453e140a4d1286c8f5584e683474bdc0e12efaf64 SHA512 2f80fc7697c70ab5be781034220f24067b7cc9b648de2520ff159de3c87c6abca72fd7c86739767c58d5ed165525f6b2dc48c3652a60b01f01962e917621ac10
 MISC metadata.xml 357 BLAKE2B 4a324f2913cf600a98085a72ffc69263205068f54b191101ed2825d3e3c84f951e58af8ebcab481bd50908685dc3603cdba3156772f153bf5a565ab43831b201 SHA512 038f5605bc71c57700f5d34539c8474c667f4434261cdb7dacb28c1dd80a64e656c395dfc2c84329d36e6cee28aaa9986d3cceb25f46d887bf8fdc1cbb348b8c
diff --git a/app-emacs/corfu/corfu-0.27.ebuild b/app-emacs/corfu/corfu-0.34.ebuild
index 3374986f6f57..3374986f6f57 100644
--- a/app-emacs/corfu/corfu-0.27.ebuild
+++ b/app-emacs/corfu/corfu-0.34.ebuild
diff --git a/app-emacs/org-mode/Manifest b/app-emacs/org-mode/Manifest
index 1b70cdd7d3b7..dc76674a3757 100644
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@@ -3,9 +3,11 @@ DIST org-9.4.6.tar.gz 4729335 BLAKE2B b88edaf8098124b2048ce57d6005d2af0de34e9b8f
 DIST org-mode-release_9.5.3.tar.gz 2049323 BLAKE2B e6a93a74d5084ca168fb85d2651c23a0afb75ac649cf6821cf825bb54d69d61ea4694584872b49a23bac1374f0b22d2d7015a346b0dd46fb0795b75c8753c655 SHA512 7062e1075567b7af9b1c39f38930fc1fbc72e53be3c063dbd25cc4e8295932ba501586fcb1e2879da1db4200e63c79a454f4225b5d53dafb1773ebb2e0340ec5
 DIST org-mode-release_9.5.4.tar.gz 2049298 BLAKE2B 7abd01bd78357b09cdc10661ad9b285c2e717c5848be2ff61df023d752659b6636881dfe17fe13486db8c9c37f576edfb02303f552c85e72594af99de7618a24 SHA512 06feb279c8e669fed263f9a3dbd8e0fa25450b1310a968d22b4f4d94b6a0515a1242758ed2c91a4d7c4c6b8315e756fe26951e9f9731ed3e7cfb7a0a8ef6999e
 DIST org-mode-release_9.5.5.tar.gz 2049730 BLAKE2B 382e6585f693fd30def29da740d1329a52b4565382df90a37e3646324ee44106f1a99c2ea0c0862d77721cc9bfbec0736cb03065b59b2fdea0a68d8f8ea37c9a SHA512 ce06bab17ae7944c1623f935bbad0379d06390c72c43633ba0de2bc04ad362e18d9aaae96103eeaa23f7ea9e4e00976a97a914da87fb7941a13746b1fa77f591
+DIST org-mode-release_9.6.tar.gz 2203782 BLAKE2B 2355202c3f570c7b9dfd2613d2cc0401d4bde086111736ec8d7e0d3203d87b3e8888ce91869cf75960f146c2f591387b9ff33a6d5b3c0ee9eba455394d8cbb11 SHA512 d81036d64a8903b33809512858dd5983b925503ca18648131a651a59e616ab2b63621964f1d6a2136ff4aa38cd56eaf099d12471dcca350acac6a240e61908fa
 EBUILD org-mode-9.4.6.ebuild 1710 BLAKE2B 7e412f50607d334b4052596fee8520b7d47c982b43f23245d64c56004a2d8910ca9fc12bf8a4ee269d6556a7406e1a297131ed7d0ff9e5ad17d04bf698575d80 SHA512 5d2004cb82270a425edd181881b0c64866a04c89203695b0d56cedd7b4f4032ec63f36e564ade12e67ed75c322f4bbfeb293ccf20b0b47749cddce277f2849fb
 EBUILD org-mode-9.5.3-r1.ebuild 1400 BLAKE2B 93d99c3e959140b0064b37d275b4b1163624748c5c8cc90caa345bb283a775feb5803cac35b7d51d5b8890da94e6a052bcdda2f8a98b285e7771dc6c6779be45 SHA512 2a97b5b025ea6edbbb3a5168609e3780b944497bed223d5de47e1d6bf5c3229edfe42476bf7264c618c00346f8c3a27021146a80d9a24d1ac172004b455c080a
 EBUILD org-mode-9.5.4.ebuild 1400 BLAKE2B 8dae635a451ccad2b84b274afe2782adf13a200a2cfb4b7f0ad72849d7c37dd51384645894596db8f0adc7a4bc0b6e0b52a4e346ad8bff238169cd3fedc6d5e8 SHA512 7ff47b6781456aed31ac6b5f11a176db98d5f76db66af3288ca970f02e06be41882d3bebb758e421fbb77425082fd2150e258070467184c3d040d957a4fe47aa
 EBUILD org-mode-9.5.5.ebuild 1406 BLAKE2B a080f0c74ce2d3120fb1e6c28e895a424acd5e45e9863c7957c380a11451b6e6d53efef5679e6440e1508e5bb5d87495fc26ef794f08eeb725d90861fd96730b SHA512 1244e80869a648c9b8e1293b7c1017f07a6151deb16c8dc9cb77cf18ea922a653f0249e5c57e1dff3d08f8a4af44133d3167ecf64a1fd7760dbd81ca5f10d20e
-EBUILD org-mode-9999.ebuild 1537 BLAKE2B a8bd3199be2117253f7e1d4009c98384cac23c3b9d3094e3285a0418e5b3ae4c910251bc278a00cc92225dd8106ba8f472ca32ead00f7fb1a6ff967f57a96400 SHA512 640f00ee00d72c2be2fa373b50b138400c5b2cc9f113eebf385d853cf477aa93d93f70ff8ebfbff5948aa4b57993425c53ab89d2cb5abb544d5a8715c40d7fb3
+EBUILD org-mode-9.6.ebuild 1414 BLAKE2B 114a9e1f8aa26bce75f68f4db0c2abe6a246365ea4d9a4a722351f573e7057e529039a2e42a9a80b3306ebc7daa5482cb8578793861615284cdedcc5df57d8a1 SHA512 38bdd3c48a52df0a64acd0615a93f3c8b877368e322e96b4a3f9b804d7eb5a0da78a43d245b9e583cbae110f28b4083d350fb14d272c10f7683d35ecfe43108d
+EBUILD org-mode-9999.ebuild 1548 BLAKE2B bf1ed3bb0ae6a50d6032f1166362806289cffc5f7846517ad77b9c8355a12d657c3d084639809be5db9c5c8f33d5084c21550fdb9cdb2928bfd28e80d792a7fc SHA512 584c1f87a553501a0fedbec2a784bf7615588505fedc486fc8c9e7bda51af5dd83dddd420837998f322b649f8c230d26a304f7cb08a17e965a8b494c6ce56c27
 MISC metadata.xml 1369 BLAKE2B 4da436ff9e2de1e6f01a37be7cd8a893d49896d00c83a16a47838c3908e04b46f7f07499ce3bdf41a25033ec1313e16b30d6498622e476fdede774ce711d77ff SHA512 d0817690d4662401fcdd28de85b3e7e5f0c69cb37de4ba7ada8499d7ef964217cda8cabed4849c9b48ebecc393d65b2de5067c36db1e98834ac8a86024b901d1
diff --git a/app-emacs/org-mode/org-mode-9.6.ebuild b/app-emacs/org-mode/org-mode-9.6.ebuild
new file mode 100644
index 000000000000..90b1759b5191
--- /dev/null
+++ b/app-emacs/org-mode/org-mode-9.6.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=25.1
+
+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 \
+		ORGVERSION=${PV} \
+		datadir="${EPREFIX}${SITEETC}/${PN}"
+	use doc && emake 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-9999.ebuild b/app-emacs/org-mode/org-mode-9999.ebuild
index f95d8ed5365f..4ec54a056a1c 100644
--- a/app-emacs/org-mode/org-mode-9999.ebuild
+++ b/app-emacs/org-mode/org-mode-9999.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-NEED_EMACS=24
+
+NEED_EMACS=25.1
 
 inherit elisp readme.gentoo-r1
 
@@ -45,7 +46,7 @@ src_install() {
 		install
 
 	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	dodoc README CONTRIBUTE etc/ORG-NEWS
+	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,