11 files changed, 34 insertions, 103 deletions
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 281eac0180f7..beade307b2ff 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/auctex/Manifest b/app-emacs/auctex/Manifest
index b5a20bf4d1a0..c8d792959bf8 100644
--- a/app-emacs/auctex/Manifest
+++ b/app-emacs/auctex/Manifest
@@ -1,10 +1,9 @@
 AUX 50auctex-gentoo.el 157 BLAKE2B c7d59a1ff3fc08b60332f5f578841c942d1a302f9a594409b3cd6509fd254c0d8d4273061d2ec4f444ad9288b073900e4c07e9307ffe0421182e7380c4c73543 SHA512 7cfc10c95da1d920b3861eaa9950d5ddd2388af5086cb81457f084f9c094b15dae9638a8c1e9b662dedba90c2d3c33a972011b99d9e2d71d85f99003de5ebef2
 AUX 60auctex-gentoo.el 97 BLAKE2B 18cad086f4211844f8a32d0f2499d2ecf29cd41f90c9dee6cf87184f81b0ac3836a5a58705677b55f926bdeb5854aa9acd6438f42e29856acf6c6c644592e347 SHA512 2cf945ac36ad5b25afd723d04223556522ac901a469bdd47d0c7562beb985401df957acc100222df6d97f4335b6d3e8d003f6b00b86780eec0a906ff0fc2ccb4
-AUX auctex-12.1-autoload.patch 1373 BLAKE2B 8ef031135245b0f54f3789a8070253f5a32fbf12ed001d1256ec55fb6d349f2fef3fd880cff4c35464c79d2fe041c1744f1918626d671289a46f006973f9aca9 SHA512 935dbc8a145c44d655c85b6725bbe61bc165adf4561d4b6583a63a2c950b5221ed552fe53884ab026a086720d29486c7bb8b07897b8d64b0cf591f5a2db5bd8f
 DIST auctex-11.92.tar.gz 1486606 BLAKE2B 6e34d1da3bacad8f2baee2f13eb44a5b617a342c294ef4d7ba28059b678510e1d161f3f02fbcf38128c09ab4996a035e5ec28898134b967d88ad621b8b477845 SHA512 758bf82903ba0499decf0ade77c7ac70865132a24195d7e8794538b7857c448811b7ef26149a915b60ed3ee34c2ebaddb3282a320bd459c9ee3f461d6ee9b84e
-DIST auctex-12.1.tar.gz 1476296 BLAKE2B 1dd5db94b5b7bb572919fdcb6c7dd2ea4d17f816204bedc69756610b80370ca748a06ab100ef8221107605a5e464b6a8c2587b728ba6a964776ea6dfeb7f7165 SHA512 4c27a3b16eaf98db164832497c497576fcabb274b24c6eb3060625b7711b1de91fce9a52f7c7caaec77a93768a6ce2ec173ab1ccb72f4c56c51cc4740d380d97
 DIST auctex-12.2.tar.gz 1511396 BLAKE2B 02cad76c8846fc10dc1bd94d15fb1d6f56a9beead96deaa32a5e9a43241b232f021d9abe1965e10e53b941a223c500b301b1c467228bf8d9ed2646fa70bae647 SHA512 412e247ad9ba7feb768cade0a7098cc79991ccdf350248836813d572bfe2339f52c4e0e9ce631354e2c2d434217274aa9116e61d122a625a45a7f67aabd2316b
+DIST auctex-12.3.tar.gz 1534283 BLAKE2B b70db839cd82805ed0410f8b92c5f19a78e92ee8f23d18962f0da77bdfdbac4264272805135c7f16ba35c461017aac74030071c85d2ff413f8eff542cad670d2 SHA512 29c411a7f18e0dd2d84edaf935e278cdf694644e01f40c26c26da403efa0a823fc3110c291d218bf930cad208dc249ca665dc20ccad5e2b44bd3caae828079ca
 EBUILD auctex-11.92.ebuild 1426 BLAKE2B 6a2cae3590f384ee0b1c0395d872029e4d83830109953557901975ce074d7464dd291511965f916c03eab1b88acc6c4f5538764ad9d5d29c4ea3d735338459c5 SHA512 7e26c9deed5f567d4c1e075abadbbd85df8391e2df17339523de2d07acf3822e850ab264bc1ec6b28e2ae7e3b5dffadd5de139fc222dd8f28ce8b6c2f149529f
-EBUILD auctex-12.1-r1.ebuild 1478 BLAKE2B b71fa62bba04ae93bb1ebb73303a3ec8c025e0d7b3fa0f408c3c5377fc692512c761c945eb001a3d5db23c194aedeb0ad13c160ea96f3d1419410adc5fb02976 SHA512 5c39953895c19dba0cb76ceac9851d21e39a57eae829a8210d08f73a4b7e379f9517155df01807660b69dcde984608b811d794548503f87a88f26fcee70ea231
 EBUILD auctex-12.2.ebuild 1442 BLAKE2B 961fb1c1009e2a53b83aaf0fd48dc605e9c99a013d4a30eeef8634753db3ac80069dc55e0048bac4df77cdd6edb8ed8e3a1aa939aa5948280523ad385a168117 SHA512 4be7449a4479faf4d24ebcb9ee50e34bd99bb0b7cbf360ff8210c0ddc20823247e1c4ede0957bc8af74eb8cc0ffe8776fef6d788fda899a822cf260bd798a665
+EBUILD auctex-12.3.ebuild 1447 BLAKE2B 232132031b6e63d8014bd18c684b6e18170347d040d41703cd2f5fa2475236782dc04ea15db5755d36970622cc5ad8ced01be31028c228368b4455f5b749dccb SHA512 88aae118ee34452ab44481b7328f6ad726838207cd8dd1ed780db94078e86fa74e864b1a56b3990beb973d14b4dfa8fb9a7d2823fb01c9731574fb6c0d3e4acf
 MISC metadata.xml 947 BLAKE2B 0b5e298fd9ca7112b8bd91bdc8cee455fff18d6ef21820c9e3da7058c860462fe96a7fe29792cc143d9e1876495fe3ee87e09e006b203ad448e511c12983c383 SHA512 61629e82f0004763e776db51ace13d583eac8d1199ebb61d17a101d48dd60258db4310fc938b82822c64b0ee9d39d9095fd86c316585e54ea9e7872a1247763a
diff --git a/app-emacs/auctex/auctex-12.1-r1.ebuild b/app-emacs/auctex/auctex-12.3.ebuild
index 965c79c5318b..809f35351cca 100644
--- a/app-emacs/auctex/auctex-12.1-r1.ebuild
+++ b/app-emacs/auctex/auctex-12.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+ FDL-1.3+"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="preview-latex"
 
 RDEPEND="virtual/latex-base
@@ -22,7 +22,6 @@ RDEPEND="virtual/latex-base
 	)"
 BDEPEND="${RDEPEND}"
 
-ELISP_PATCHES="${P}-autoload.patch"
 TEXMF="/usr/share/texmf-site"
 
 src_configure() {
diff --git a/app-emacs/auctex/files/auctex-12.1-autoload.patch b/app-emacs/auctex/files/auctex-12.1-autoload.patch
deleted file mode 100644
index 3ee765d94ca2..000000000000
--- a/app-emacs/auctex/files/auctex-12.1-autoload.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-commit 1b88eda687913a3a355a010ed0483bfcfce28301
-Author: Tassilo Horn <tsdh@gnu.org>
-Date:   Fri May 17 22:07:10 2019 +0200
-
-    Fix autoload generation code (bug#35758)
-    
-    * Makefile.in (AUTOLOAD,PREVIEW_AUTOLOAD): Use arg instead of
-      generated-autoload-file (bug#35758).
-
-diff --git a/Makefile.in b/Makefile.in
-index 822eea9f..74659f7a 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -52,12 +52,15 @@ PACKAGE=auctex
- PACKAGE_INFO=auctex preview-latex
- EMACS=@EMACS@
- ELCC=$(EMACS) -batch -q -no-site-file -no-init-file -l lpath.el
--AUTOLOAD=--eval '(let ((generated-autoload-file (expand-file-name "$@"))) \
--  (mapcar (function update-file-autoloads) command-line-args-left) \
-+AUTOLOAD=--eval '(let ((autoload-file (expand-file-name "$@"))) \
-+  (mapcar (lambda (file) \
-+            (update-file-autoloads file nil autoload-file)) \
-+          command-line-args-left) \
-   (save-buffers-kill-emacs t))'
- 
--PREVIEW_AUTOLOAD=--eval '(let ((generated-autoload-file (expand-file-name "$@"))) \
--		(update-file-autoloads "preview.el")(save-buffers-kill-emacs t))'
-+PREVIEW_AUTOLOAD=--eval '(let ((autoload-file (expand-file-name "$@"))) \
-+  (update-file-autoloads "preview.el" nil autoload-file) \
-+  (save-buffers-kill-emacs t))'
- 
- # Files and directories excluded from distributed tar ball.
- EXCLUDEDFILES=autogen.sh .gitignore doc/.gitignore doc/tex-ref.log \
diff --git a/app-emacs/eselect-mode/Manifest b/app-emacs/eselect-mode/Manifest
index 4ea0270678b4..55abb351f07c 100644
--- a/app-emacs/eselect-mode/Manifest
+++ b/app-emacs/eselect-mode/Manifest
@@ -2,6 +2,6 @@ AUX 50eselect-mode-gentoo.el 178 BLAKE2B 50fea27e7add6d31f37801593430154636bb58a
 DIST eselect-1.4.16.tar.xz 178660 BLAKE2B dae97ee324cb67983c5395b5dc54c4b84d2da43f6a0c5c8ab81ff402ab211e9d1f1d3fe5c174b130ac1e11d3dd19e3812056274145415ee029e649cda880cd95 SHA512 264fb6122f5f7c9e73bb2250a94c3c0377e5263e2e5ae653ed58e08ebf6ed1b4aa165ae5c1d70b0156081c4db5672d1ec9d379782919d5b40a2f3e862378ce62
 DIST eselect-1.4.17.tar.xz 178980 BLAKE2B d905ac88bc009080912af75e64c7920d745788866fa3cb35466d68a652efbbd6984d6e1efeed76d9a344aed94705b74c85aa43e9c037d4d548d2e24afa69bd7a SHA512 35dc4c52f44c4f64db9c0dc2aec57b3055a6d36760b1bbbd094ad11b3f9e71a731444802632817b89c3b511f1dc9bb92046b59322d177e13fdc501ed767b591e
 EBUILD eselect-mode-1.4.16.ebuild 538 BLAKE2B 0ba5a4d9152f36bf692ea7491c4996c4aa99bf211a478ffc2c2aa3a223e5cf34d9f4d391ff8f289e0e6f502d46551b89f910a5842d430adf13222c7f94421f46 SHA512 e2639ed1b81d021251e61a875ccfb896770d1bfb39c6c5b363b1fa69bdcec1f5a40561faff7620574d0ddea440caf78b867a7d2c27cc6c4493ac775f73b27018
-EBUILD eselect-mode-1.4.17.ebuild 545 BLAKE2B 5de3f22f23c552af98b5ed0bfaf8451fc385cbd95ec1b679ffd4ce9c8ee3364e274dc1b59d8bd458cf4db3638a5dde5eb815639ac1b6dd7b67cb575fcd686b4c SHA512 e25e0e98672a025649cf1c27b6dca52631d1fb6a6d6828d62f97bf7ac20ee3f4e9cbeb0de7d290d2b00b8e673efc1a954bf24a2524c5d448de69a376d6bc100d
+EBUILD eselect-mode-1.4.17.ebuild 538 BLAKE2B 929277a01a9c1634b3c30c5fe400c1755a5cee0bc43a6ba65869480e3e994c89a0e747ba2b210e10e3756cc7eaeb8ba88ee092220abf99992e8db6e15602de28 SHA512 d4a110190e765c8825fcc3aeea7460c0de8942b2605d5ed3fb124e47223d4534c2addde6f11419c4248880672cdac4a62df6575544529dddfdd0b45dd364ad5c
 EBUILD eselect-mode-9999.ebuild 455 BLAKE2B 0b2a475c460420afdc6562a94fcef5d57b19d66d0fde52d2cb799f466a71d7948b6349832e58db1dddd3ee0e41b7a413a5f5f1ded177dc2a270a4d46f6970222 SHA512 1040b39298989935448478ffcf8b85d34e9998e40be7f1208650d14aebaa13ec9ac4f0e732a2077b5f928fa6f26c6d29b599ec1759d7fcf030465f32a6fa5348
 MISC metadata.xml 449 BLAKE2B 711e97a9feb5a464b81a738024f1f8b1ea4dcf2dab78f1e814fcb30569df5a3192cc6e72308687bffd9f7c806f3ce37ef62856f86737d3e8aa4334f721a2fd7b SHA512 38b645859453423cb80be836dc712364d5650f07f071c44d07ad7f5f629b8efd0d26535ebf61e8c38281e8426109ef5828015e01b3377486ab28f942163d155b
diff --git a/app-emacs/eselect-mode/eselect-mode-1.4.17.ebuild b/app-emacs/eselect-mode/eselect-mode-1.4.17.ebuild
index b754eb4047a3..300a040e1fc9 100644
--- a/app-emacs/eselect-mode/eselect-mode-1.4.17.ebuild
+++ b/app-emacs/eselect-mode/eselect-mode-1.4.17.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${MY_P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 S="${WORKDIR}/${MY_P}/misc"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/nxml-gentoo-schemas/Manifest b/app-emacs/nxml-gentoo-schemas/Manifest
index 776063d31388..19db2d2f4a5c 100644
--- a/app-emacs/nxml-gentoo-schemas/Manifest
+++ b/app-emacs/nxml-gentoo-schemas/Manifest
@@ -1,4 +1,6 @@
 AUX 60nxml-gentoo-schemas-gentoo.el 206 BLAKE2B ae9d1fe1da9c86d14796c09597ca34b10dd0e28abb02fdeac4607b8d950bfdf636f5f3c1de49cd5b9cf1fa808513522ab43272f3c26361b871ad0d630a942ed6 SHA512 5592edb5663066fcccaf5b05c3df671b4069d4d259376a8a91ef3f7ae5990687b15dfdf40e6f7aa6cc7d62b7cdaa5090fd851de0ed2718d20ecfe3e3a78530ea
 DIST nxml-gentoo-schemas-20200303.tar.xz 8452 BLAKE2B bee7e3d58b03e3aaefcd09d93a9b6919ae6b4892ac09e218ac68cbbc048e28def8b49cc4c583ddad04da61d61bb76386f0c0f33e12d2c8a938447e3f590854d5 SHA512 42f8ee48e349423db156d585bdd2c1d333f69693ac541bc44f8c1d0bae412b1793e1d86fc527287225040aa9b4b791ad2922196cf750de6029b4c77eebdc62de
+DIST nxml-gentoo-schemas-20210203.tar.xz 8440 BLAKE2B 733c7949bd39a94e657c829c478b76229cfbe2edca6f973f45a91423fb573ed6ff5717ef7bca74733266d7ff5b31f5426d06df51d79263422dba1467234ae8ba SHA512 bdd28b40d0748f595b6ac035686605b7d7a08e9802d0e497893329b4cbc1195f4e785befb8afe6362eb8eb45132f3928f394546412ba463c47977587b6f88b3d
 EBUILD nxml-gentoo-schemas-20200303.ebuild 599 BLAKE2B f5f68523079760c4d46e7ed486e0270fbeae41772874fe449959c3e83eb924c50a6e46981191b5f8fcd247c98f637487f80eccee1640e79960be6bd04a65c579 SHA512 6ddf82bcf9fda6779b88fff85d9a46eb15450503d55fcb549d2492af1b22006303e1ab33a8f0d972be8f89c6b2c823fe620484a163c79add69dd179d2d867d37
+EBUILD nxml-gentoo-schemas-20210203.ebuild 606 BLAKE2B 6b3f604b78405c74b9488ab95d8d67f77b8d3cf9e70759a7a275c457cb91a14a2fee767c5deab5640c8ec675ee0f2caf3282f46629fb1eccf34f10771c0d242c SHA512 27930759e88402b704eeaae2860cdd680362c16b625cdd6f44a3d1fb9ea8b386e3e2be50e4df1067834c7f01b5b973d46f5fd3b068871b229a546f828fdd7cfa
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20210203.ebuild b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20210203.ebuild
new file mode 100644
index 000000000000..b8b974d25777
--- /dev/null
+++ b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20210203.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="Extension for nxml-mode with Gentoo-specific schemas"
+HOMEPAGE="https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+LICENSE="HPND MIT GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+SITEFILE="60${PN}-gentoo.el"
+
+src_compile() { :; }
+
+src_install() {
+	insinto "${SITEETC}/${PN}"
+	doins schemas.xml *.rnc
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+}
diff --git a/app-emacs/org-mode/Manifest b/app-emacs/org-mode/Manifest
index e81fc87f5b4c..195f976845f7 100644
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@@ -1,8 +1,6 @@
 AUX 50org-mode-gentoo.el 95 BLAKE2B 9c74869edce0915d9793a3b10f61e8002dec553a93fe9856c526d77e5e988a35203c35322a1ea7ce9e19b02ff9a5ce1b2b4d73b8ba19bada30b7fbf453e43b01 SHA512 aa2e47c060d441ef1f631f2a44f3b7adc7cf5306155b9cc3f3f808aa053b411980671a89933c77fe02aac79bb6f25f2fe98c676e13e097dd885f23bc9d8cb000
-DIST org-8.3.2.tar.gz 4442361 BLAKE2B f21f07578e870cd3edaa3721a53f679627c0115c320c666c2086e201e272c0ef03540bfdd90936a624cd4c4dcbac21b91346ba975b6006ada2d46184f73574f3 SHA512 3e1ff47c875a2db3239add8b060f555da357e465161ca62860c0ac2734c2e31c5387d2df4223ab7ea8ea60050f9a845d160b0bcb3afcf36f1d3cabcaa961e6a2
-DIST org-9.3.6.tar.gz 4669953 BLAKE2B 1d221918f8145b789d979ee7822640dd37c5722e9f65ba36e945f7d574cfb89d48e2da1812d5dc727301ef1ad8bd2ef5628f54cbbfef5bffbab48656ed4c1e65 SHA512 47b5b81f47474d399cc7aada0e32f376d4c8758f6e955b7d889035610c20a4c372ea0571a510695822d2b87bd1e8002c2d0d8c73dc730144540c59b5ef25e090
+DIST org-9.4.4.tar.gz 4725983 BLAKE2B 69fcd15e13c55b71a2c0c6185a0b82dfd8f72ef2c68a8ccc5aa9d3e9f134233d7c7c3cb38f4957cc7d5d70a082067412b61be2111b484b6a91a8a2e5f077bb39 SHA512 ec857f9765a869371bd3425aaecdbe1c8bb8f605640d81efebd7ed13afcb05439cf3a5277457ed399bc501f95a6d823bda7f46b6991cd5f21cf53cf0e666d831
 DIST org-9.4.tar.gz 4724986 BLAKE2B 8f56c2459e1718d4982ccdba3a8fb1403ff4a66a5425ec341f6d5ef01b2415c87d77c7ac8a8cd7046b4398a18688ef5fb4f92d0131f6694bc6047b32e3dd5827 SHA512 480377b13950e1f9cfa2ec553f274156ff9a25a5572d5eb6137fa08a3d6f1d5c0a6942f4d139379974861ee467c3be17105bec6b17640beaa308c8fa6825f8f5
-EBUILD org-mode-8.3.2-r1.ebuild 1736 BLAKE2B 82a2822c766fba7a7dda3f3ac378db378f311e282859aeebf9abcceecdbc4ec84cdf735ff5cca09fe289fd7d6ea906c22becc739e61c6d4da51199f319fb7454 SHA512 56ccdbb558f66a17b3b3fb1d0a614d4e6ffb6bded4bb2504cb59d254005339c69b4c07b7ed606dd2bb5ce4c3719a428047d57861ac594f7d4b4dbc61957e9455
-EBUILD org-mode-9.3.6.ebuild 1710 BLAKE2B 4f0a97a455d97ade5ed4743abef2c8027a6e20bec8f758d146cd027123f8ed9cdc6c282e93a7b6325b6bd728158350caf36cd6eadc523d91278f3169b8900436 SHA512 f60a2887ae93d3ff50cc1e2300703b2154d983923e445e63dc8736245c39d80db60ad8d9aa86c8f2780bf051930dea53f865fb611d84e472e13f178f687a693f
+EBUILD org-mode-9.4.4.ebuild 1713 BLAKE2B 9e403b5af66939a1abc64b30ad7ac8585c748a7cd860842ae39e23d95a28817320185e424f5d72b998b9c33c59e240c305833a5f9811b4c7f4b6cbd55402feb2 SHA512 af74d3acb3638926e7ac1315a2601e859432117646b6bb1544fef243f43847c8836cb448c75f6dda0b9ce63fca7fa425337c7bd5d8c500e39461bdd52509c0d6
 EBUILD org-mode-9.4.ebuild 1710 BLAKE2B 4f0a97a455d97ade5ed4743abef2c8027a6e20bec8f758d146cd027123f8ed9cdc6c282e93a7b6325b6bd728158350caf36cd6eadc523d91278f3169b8900436 SHA512 f60a2887ae93d3ff50cc1e2300703b2154d983923e445e63dc8736245c39d80db60ad8d9aa86c8f2780bf051930dea53f865fb611d84e472e13f178f687a693f
 MISC metadata.xml 1368 BLAKE2B 2680c11ca69b9acd8b96b6dc76586037bd1b7ce0e9cdc183781742f373ce8d0be5b8820b7fa4d18c4f59523e10d3b40df3edbba5178169fb993bacc8d10cdfe1 SHA512 6c557a3a3ecb9b1993bd8c976d0a81460cd1ecc6e53fbaeb0d086e8d78497485a1b34470b72a73e779878b4947a22d61ef36259037cf6ff0315a823e15e09c66
diff --git a/app-emacs/org-mode/org-mode-8.3.2-r1.ebuild b/app-emacs/org-mode/org-mode-8.3.2-r1.ebuild
deleted file mode 100644
index 1fae60b6751b..000000000000
--- a/app-emacs/org-mode/org-mode-8.3.2-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp readme.gentoo-r1
-
-DESCRIPTION="An Emacs mode for notes and project planning"
-HOMEPAGE="https://www.orgmode.org/"
-SRC_URI="https://orgmode.org/org-${PV}.tar.gz"
-
-LICENSE="GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="contrib doc odt-schema"
-RESTRICT="test"
-
-DEPEND="doc? ( virtual/texi2dvi )"
-
-S="${WORKDIR}/org-${PV}"
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	emake datadir="${EPREFIX}${SITEETC}/${PN}"
-	use doc && emake pdf card
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		ETCDIRS="styles $(use odt-schema && echo schema)" \
-		lispdir="${EPREFIX}${SITELISP}/${PN}" \
-		datadir="${EPREFIX}${SITEETC}/${PN}" \
-		infodir="${EPREFIX}/usr/share/info" \
-		install
-
-	cp "${FILESDIR}/${SITEFILE}" "${T}/${SITEFILE}" || die
-
-	if use contrib; then
-		elisp-install ${PN}/contrib contrib/lisp/{org,ob,ox}*.el
-		( docinto contrib; dodoc -r contrib/README contrib/scripts )
-		find "${ED}/usr/share/doc/${PF}/contrib" -type f -name '.*' \
-			-exec rm -f '{}' '+'
-		# add the contrib subdirectory to load-path
-		sed -i -e 's:\(.*@SITELISP@\)\(.*\):&\n\1/contrib\2:' \
-			"${T}/${SITEFILE}" || die
-	fi
-
-	elisp-site-file-install "${T}/${SITEFILE}"
-	dodoc README doc/library-of-babel.org doc/orgcard.txt etc/ORG-NEWS
-	use doc && dodoc doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
-
-	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.3.6.ebuild b/app-emacs/org-mode/org-mode-9.4.4.ebuild
index bffbcb8d7146..00545f28b213 100644
--- a/app-emacs/org-mode/org-mode-9.3.6.ebuild
+++ b/app-emacs/org-mode/org-mode-9.4.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://orgmode.org/org-${PV}.tar.gz"
 
 LICENSE="GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="contrib doc odt-schema"
 RESTRICT="test"