gentoo auto-resync : 08:10:2024 - 04:26:34

25 files changed, 99 insertions, 59 deletions

diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index e9463621718c..da7b85b450e9 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/assess/Manifest b/app-emacs/assess/Manifest
index 97468d985fd6..03a010ae4b7c 100644
--- a/app-emacs/assess/Manifest
+++ b/app-emacs/assess/Manifest
@@ -1,3 +1,5 @@
 DIST assess-0.6.tar.gz 20771 BLAKE2B 29e8f84c20575314271d9a08ed3ac93f28f1c1b5c2df2ac35e397226f4eea033210ff9b96c90a282a44c60e301f5abc38be88efc74c21a2a7fdc29340d6d43e5 SHA512 ff50731867646f07b8c6f3edd1123695d008fa5265ab8b3543cbf32a54a4a0415a91304067e0dacf53890850b56377594802c9763601616bd828316f7a8cef69
+DIST assess-0.7.tar.gz 21161 BLAKE2B 2dbdc83738004659d94c8e4d507e9b95efe7b98cf9336abca6bb7a75ad5648273dff4455eddfb9350fd1c35c2a1154f6c550bc323e95a3d66a3ab37662595157 SHA512 6ac8d8ff860e95a280154109210aa5a81b6af0b01a20a25a37a9d4d2f35e50d26af217d16d692a6cd4d7af9bdb1ccd39431a96efed5f4d14a1534751a796951e
 EBUILD assess-0.6.ebuild 939 BLAKE2B 42cd75443de80742754582914f72f75ae797c4da84afec22b9b522dc6cd68aa456466b5dde53d60754b7561e54ed5fa99c3d3cbab6d60c16c6ae713a49a0ee05 SHA512 c16fd951cc9f0ce9c68e636064a1f20f5650506da43c6271dad704be5fa3bd2ad1c82ff876d42af8597c0aeccb10b951d342878504a4bf3c2e40ffa6cf9cd117
+EBUILD assess-0.7.ebuild 1040 BLAKE2B d54313d459bc9523074cf0393eea291d46ec96ddf0559f06e6a857299a2334d39d1fed7b86c2a8fa008cfae9c1525bc6ce96ac61cf21ab19d1c351cdf238853b SHA512 1764adfe8c2230d2e29d383cc63e634a8a98d5793258d265d1e5efe1590e04ca413df8bfdcc3d27391ee7630483aa77d5b434c4b794bb0fc034bf032da6b1610
 MISC metadata.xml 1095 BLAKE2B e29668af7cd5fd16e5ac06dc874692b9a480561a569b70d61091eeaeb39a60d69e121b1732bd0bbde9548779f9cca5587032fd8a57f86449001e47abbd392329 SHA512 9d61d5ab2005666ae61375726527ae35b7450d04653ab2171d86da7c12e5f6844ad1311a8772e82705f56851832f9306b29b81f71c789fe438ed26194f5b351a
diff --git a/app-emacs/assess/assess-0.7.ebuild b/app-emacs/assess/assess-0.7.ebuild
new file mode 100644
index 000000000000..8033d6640016
--- /dev/null
+++ b/app-emacs/assess/assess-0.7.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+COMMIT="cadeb24a5d8261fad4bdfdc09e7d571cc395a6ca"
+
+inherit elisp
+
+DESCRIPTION="Test support functions for Emacs"
+HOMEPAGE="https://github.com/phillord/assess/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/phillord/${PN}.git"
+else
+	SRC_URI="https://github.com/phillord/${PN}/archive/${COMMIT}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-emacs/m-buffer
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		app-emacs/load-relative
+	)
+"
+
+# Remove tests failing with Emacs >=29.
+# Remove a test helper accessing the network, luckily unnecessary.
+ELISP_REMOVE="
+	test/assess-robot-test.el
+	test/local-sandbox.el
+"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	${EMACS} ${EMACSFLAGS} -L . -L test \
+			 -l assess-discover -f assess-discover-run-and-exit-batch || die
+}
diff --git a/app-emacs/async/Manifest b/app-emacs/async/Manifest
index 63d4c2b4aac8..d064e105189e 100644
--- a/app-emacs/async/Manifest
+++ b/app-emacs/async/Manifest
@@ -2,6 +2,6 @@ AUX 50async-gentoo.el 80 BLAKE2B e6b27662c8c0d0e38785c4268fedec8da7e9fd72b75c7ad
 DIST emacs-async-1.9.8.tar.gz 33508 BLAKE2B 2e22c67c5bebe3c821d010a0f379aab9728fedb7a6345b81bcb7b093ffc54dbba1c7fa79d41eb5878b24024056607fff7d532b4702a7dc52163837af93c83f41 SHA512 c4c5406ce28dbfea0130b43a7f85d0a47626cf630c73318280896bd28f29bf5a8949077c242cd9c6162fecabbc619b2a270d532df341c4e286f1f7bb499da5f3
 DIST emacs-async-1.9.9.tar.gz 35182 BLAKE2B 80e981289d768d9c69922c7c439ba7bcfe5d803ebf211ebc64d7428b88d3a7a90e9f824a5bb06d21aa90cfe998ce1915be32a9ddd28eafe177162b104f67081a SHA512 ddf4e6bdc3a305f987396a34d80cc957040bc726106ac0f28bb288ce5eb77d4e35d78214834757c90a7bf85f896a5d095493673117ef2a0eeacf3e366ee64714
 EBUILD async-1.9.8.ebuild 543 BLAKE2B 75db79fb82a23602e01374bc55eeb9af8587b18a6ae75ad758cd324e5b303ce69766956afce63a8e243d5ad48c04aed9f728825e1af9ffc64a51aa25ae85cb5e SHA512 f6dc68de9c4b46618fbf7993b3f3fb193f614a7a0ca873be3edf76970de56685874fac21d6b80df982123c6c5f1767362f6114bd4212f66113558a4dd4b3ad47
-EBUILD async-1.9.9.ebuild 821 BLAKE2B 5691be047b8d7e6c5ad6133c411b9fe57df2825d232723b49301e9ecbe9ad5dbdad7a04b3997753cdbcff17c166e9237e767775fe0cc34888ef555333dea7e4b SHA512 daf9dc3aeaa56a1709e25fd148d1474e1f8bdf2b851e19ab2a4b2e7f9b481c9b0640873c9d4379e8dc238813fa4eae95b01313866eaf0955a4b1121884179b3e
+EBUILD async-1.9.9.ebuild 819 BLAKE2B 142e2ef77457cb620b980d1e7622665c00418d40f2d7d5782922c12a14194c6fcb7c5c72e450731c25c5c2a018a4bdee72b17fb0ba2bf6b9c4c5c63fc54feb43 SHA512 bc6c36869747c99b2671d811a8c29b4f0672135fe81634dc234672516dfa44dfe7e6135a5264bfa4f6d21ae043d83ada89a79a168e9140021b1dd1f4a265139e
 EBUILD async-9999.ebuild 737 BLAKE2B 74cc32bd7825a8d46208b26aa52ea1561f4842806990df21441e42db9498001f7ea1ad8ed3cb953f8c9512ae58db9597b23cfab51fe41e21bfd0682cd73eae54 SHA512 0d5f72be164848a6a7a4a9db2ca90740d7c410a2e4f6ed5b3b1fbae364f96ff1f477c9246ea5f24fb727d3f2181720a9ad184702d3741b5f2ff3e6fbf4492051
 MISC metadata.xml 366 BLAKE2B 773ef114fba2a72f9223282cd40b3e46966a015caa04e91610ef5106a6df8b253d37bba5f575260a138e1811b9b57384a035eb3e517b28233e604450ed4f3d1b SHA512 c64120f7a70e14723680475519d82bfa6a4fd2a651b3ada184033fa6894521bd2fdecc058f9f43ec910bad8c2b72efb33add458e5e4269427d092a0300f4c910
diff --git a/app-emacs/async/async-1.9.9.ebuild b/app-emacs/async/async-1.9.9.ebuild
index 842a0084c79e..ffcaefb095d9 100644
--- a/app-emacs/async/async-1.9.9.ebuild
+++ b/app-emacs/async/async-1.9.9.ebuild
@@ -22,7 +22,7 @@ else
 		-> ${REAL_P}.tar.gz"
 	S="${WORKDIR}/${REAL_PN}-${COMMIT}"
 
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2+"
diff --git a/app-emacs/buttercup/Manifest b/app-emacs/buttercup/Manifest
index daf5ba58e4f3..96ac565a3b31 100644
--- a/app-emacs/buttercup/Manifest
+++ b/app-emacs/buttercup/Manifest
@@ -1,6 +1,6 @@
 DIST buttercup-1.35.tar.gz 93375 BLAKE2B 7bedd4a8576f900934e3a39cdb5a58e85e6b9ec682cc1030495d50d686880ef14d73afbd49340856c3b3279548babf7297ba787f1a17bfd3dee81bd8a72f2f4a SHA512 416edb974999e2eac38040ce72c241ab961cc63f40068711b0436e4f3ca49025955d5ee2d93168770da0f251269652e36c1c9c0436f6ee6133c6ca859dbfe487
 DIST buttercup-1.36.tar.gz 94614 BLAKE2B 1c76424188eb09df0b5f46f5c97b8633d11bd324a587cf968de2314f8639b66fc06cb2cee727f4cbc91b3fabeca41f2cfdb5f3ff87d6d2318fffaa3fabfc9280 SHA512 bc7d8d90537687b8d97927f14ac7c401ac9b538b315da6ae418c7af801d1f9461f4b2d9185102e6621240189dda4a8b547cd84332e38bc56458889dab6ec0f66
 EBUILD buttercup-1.35.ebuild 816 BLAKE2B 5ad5f7fe86eb4739e80fe785395dd768aff4b2c85bd0bf52519d1bcd3a1fb147bf92b6f7bf3174de56004df81364aee06a686e53b588b7e47d5f393c5201c834 SHA512 d400ee2ae35755b2f8e49f8035a22c8077ea87204e8719c310d1ad0a6286c72753fa5252a5f25ccd092dfe765995d4b9ff626dbb3f0ab1a0414831e8998d64b7
-EBUILD buttercup-1.36.ebuild 821 BLAKE2B e9de2d21b4893838753e60388a251bc2c8e36cfab1aec76c7adc59d7558f42e5fe6451e45d259c0c1efa3a8499b39d315f458394d2d05737dc6eb35ac68263ad SHA512 562186c59735896cc39c5e5a59b842d95641c0cb72f61a29dc1b0f3989d065bc6d65cd0cbaa62c8fdc083d789eb1950a1359a102f5ae65dc7692e00e55a4c8fa
+EBUILD buttercup-1.36.ebuild 816 BLAKE2B ef24a803241bcf7f96d65b8be3da286de0439f6a43879549eea8d1c19ddb2d72079f3c40afc10fc9326134d77b3b057b5926b0bfe3f14dbb7e07599a6bc76c1a SHA512 7fc64b5080c98e93895f3d07446b430dbf780c9445703f1a766eb8ee39ce54b0cca2d4e50ca98b4ce283ef976d6d60613489ed154ff8a12835ca724be6ac2f0e
 EBUILD buttercup-9999.ebuild 821 BLAKE2B 2df1647719208285dceed1cf90981a04b3f1f57b5deae4ac9254c72a6d2b2b1b9e7e9403a22c10b31dcc4ce666882f93df662f499f4f688cb4269ddee33e5292 SHA512 89024c75d730a1ca4a5f61af5daa2226fe4acd7d751f02554681d0c29b7cec31d3e83b7089ae150ae98e73d6846a2c9874f79c46f02d987cd259131d95cbc037
 MISC metadata.xml 392 BLAKE2B 365eddee8c36962902e64b476ca9f21b34bf1faf9dd5ff2ad28d799a8079ea81cfea23adfc81e0a40edee9d4a6551affabaec91c9b931cfb161cf8a5bfbb024f SHA512 899c734fc6bae680c7d44dd0750d0a55a74ef2a5408be0e3a33a920ed283535c1136fc6b04bca86e85304ee1a3972413f18cc047be1e1565ce6c2a7940e087f5
diff --git a/app-emacs/buttercup/buttercup-1.36.ebuild b/app-emacs/buttercup/buttercup-1.36.ebuild
index c3c99dc78c46..1a71958474a4 100644
--- a/app-emacs/buttercup/buttercup-1.36.ebuild
+++ b/app-emacs/buttercup/buttercup-1.36.ebuild
@@ -17,7 +17,7 @@ else
 		-> ${P}.tar.gz"
 	S="${WORKDIR}/emacs-${P}"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm arm64 ppc ~ppc64 ~riscv sparc x86"
 fi
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/ert-runner/Manifest b/app-emacs/ert-runner/Manifest
index c21a3bc41829..6bd139230953 100644
--- a/app-emacs/ert-runner/Manifest
+++ b/app-emacs/ert-runner/Manifest
@@ -1,5 +1,5 @@
 AUX ert-runner-bin-launcher-fix.patch 875 BLAKE2B 27f860ae14f9b869891ad0ff7ab2a40511231418c5b377db3c04bd7e7366b0ecb6a1d977b93c22cd3759f53986d3d38101c981ee2642e3d036ddd78acd0e14e9 SHA512 750562585a4933a1c9e6c12ddc97e92b5fc987b85013118861f3fb5a25f6317d7838cb8fa2c79ab2c8207d8b64db3e0d39a6aa4f237d84e7e243c0ca374fd4e8
 DIST ert-runner-0.8.0.tar.gz 36263 BLAKE2B 8eceabea446ffde87c10cd5257264b61ad2e2617cd9a3243c9be5548298a61d5872b46359a798180e3bf450fc8c474f4651fb834959c30f93df807d4ba006401 SHA512 a8d17c10b7c4db3fb784725c22d382e7cf213c7a6bc320658b64f1aaf9597cfe9cedc436771ade239cc9ad59e0d3457c257ce9342f9bee8a3fd65f76eb6d9e9b
-EBUILD ert-runner-0.8.0-r1.ebuild 1607 BLAKE2B 958c99de08ea667e136a51f4a1f4bb6d8a21b815e0feb93cd88bfaa9a91914282159e75a9411393cebde43e9710d5543831c71d9c9f45de3db0b19ec66b15d9b SHA512 2646af19a2e54cc1d295e53ae3d0deb12b3efc6c380769712db8631cb00ce5f4431c28006e39d98943d8a1f45dadce97705e1a65d6fe38e84db2bc2b44e54954
+EBUILD ert-runner-0.8.0-r1.ebuild 1882 BLAKE2B 1c22fa8a0646889299ad174b5085bd51974e36f58c432e51c0e17a79f85a75f6cda42ba18702fb4c42dc03a2aa1e1d87832faf5ba8ab2f5ba438e12a3c005810 SHA512 9b640815cd88aecf970fe39b2b32f8fa5a99099ec232ddf9778445b40410d89b7b72f64f65674725b014bcf58fdfabb53f5f227b9739529fc5dbfc5dea986dae
 EBUILD ert-runner-0.8.0.ebuild 1008 BLAKE2B 1a0e705f33f0af3cff93f802ac6414d3d2b21f805304006aa7566c93a446bdb288f3be8e39acfee4049b08657d2f7ccfc1749b0190826247126ccf1d42e2912e SHA512 70893206136ae29101d83abe8497f96d4eb6d03f9aeaf072072bcc7754d57f519036b63c5652cae71ac2c13f73b5f8755c226f97bd82513f2d5ee547e9302d8a
 MISC metadata.xml 455 BLAKE2B cf3956c8743a3ad380f71976e7b7e06e59ecd8def9b7770bd465bad6e1473b25a55f1e58716f8767bcfd6c2966f9ce61954825a690b64808b07b77f00f9acc3b SHA512 8a64a3e7b892ad17614beb7cd829e3a60dc6228bb6a86a3dab3406a1cb89706a3059a9402a6eb070f683eebe01f8269bef35e8559ce4ae617695d10968abb8fc
diff --git a/app-emacs/ert-runner/ert-runner-0.8.0-r1.ebuild b/app-emacs/ert-runner/ert-runner-0.8.0-r1.ebuild
index 2124baa14fb0..79295684f877 100644
--- a/app-emacs/ert-runner/ert-runner-0.8.0-r1.ebuild
+++ b/app-emacs/ert-runner/ert-runner-0.8.0-r1.ebuild
@@ -54,7 +54,18 @@ SITEFILE="50${PN}-gentoo.el"
 src_prepare() {
 	elisp_src_prepare
 
-	sed "s|@SITELISP@|${EPREFIX}${SITELISP}/${PN}|" -i "./bin/${PN}" || die
+	# There are two "ert-runner" launchers,
+	# the one in "${S}" will be installed,
+	# the one in ./bin/ert-runner will be used only for tests.
+
+	# For later install.
+	sed "./bin/${PN}" \
+		-e "s|@SITELISP@|${EPREFIX}${SITELISP}/${PN}|" \
+		> "./${PN}.bash" \
+		|| die
+
+	# For tests.
+	sed -i "./bin/${PN}" -e "s|@SITELISP@|${S}|" || die
 }
 
 src_compile() {
@@ -75,13 +86,13 @@ src_test() {
 	chmod +x "${T}/bin/cask" || die
 	local -x PATH="${T}/bin:${PATH}" || die
 
-	edo ecukes --debug --reporter spec --script --verbose features
+	edo ecukes --debug --reporter spec --script --verbose ./features
 }
 
 src_install() {
 	elisp_src_install
-	elisp-install "${PN}/reporters" reporters/*.el{,c}
+	elisp-install "${PN}/reporters" ./reporters/*.el{,c}
 
 	exeinto /usr/bin
-	doexe "./bin/${PN}"
+	newexe "./${PN}.bash" "${PN}"
 }
diff --git a/app-emacs/exwm/Manifest b/app-emacs/exwm/Manifest
index 552ea816f87f..3175d32d1339 100644
--- a/app-emacs/exwm/Manifest
+++ b/app-emacs/exwm/Manifest
@@ -1,5 +1,5 @@
-DIST exwm-0.28.tar.gz 93246 BLAKE2B ec6afeeaf7609d68561c9ec87316c0135bc5e0341c3dba91964221e15edc75442097f4c5c0730d7eaf8e00010b6f88e4deb1f283ada61bd8e7333f21088dbf8b SHA512 5b5db21de7ac6c0c9f38ce6fdc66f5fb366fa50c52ba7d5fd76c9764cbda6b19f3c01213c7af2dba7605f66e7527367204fe1b5c10c1dda6d2ed7aae87312749
 DIST exwm-0.31.tar.gz 97908 BLAKE2B 4e6d49f273296696c2b9c77d5a38409feddf3bbda395f8255068138962a7561c23a2b6943b74a87d8ac6bbd4153b7bd30bdb5ea4f799be325c5160b54db0f2e6 SHA512 7ada593f8197ca959ce40e440f411029f1ea49fde60ddd27e799c84ecc0dc4559fbed16d8265833c14b3df332ea630e9fe56c6b160bb2faaadefe37582b8c2a5
-EBUILD exwm-0.28.ebuild 541 BLAKE2B 29cc61c67ee686fc7b000cc59c8d494272a9f92dfb79ba9ff2e5a9dfef5832b23a92e4736ffe80a73b8ab619201518846174dc57bc5e03a665a24e2523cdd8d8 SHA512 f40b613912d9405c4eae06d2ef62b4b179a71af440eb03b36430b425a768814a19d09883646f6cb8832c5ccca345c4c655faa930ee1c950343b3027ec162c009
+DIST exwm-0.32.tar.gz 96383 BLAKE2B 7c066a78b8f4997c135fe6896448cfb6c266310dd207328104b7a089a3fc9a5e4e28884105e349fff3e86286403e797e0bf29af6a14fc2a1ded6c1c95cf2ea8a SHA512 f6522a1cb20be05001900c19103dad828f9cf931d35466d234c111812132d77485a6cb3317880f4eadeab1bf497fa124894fe0b6da6cf1f115967ec7a6d4363c
 EBUILD exwm-0.31-r1.ebuild 724 BLAKE2B 09d72acb0c835960725516ecf39311457cb98d038b587080c9bc0a3a1cfa92187addababc45d5b238b0f77f06d7f3d766d1a3912cf649cd0aed1baa471cc1836 SHA512 63984e1a656bf2d1fc573492120169b1b0d434506f363ce738e9ffd3bd2c44822ccfcc13a153a08dfa36dbe51ef5512d82bb152ad34d15d791949021c941c788
+EBUILD exwm-0.32.ebuild 640 BLAKE2B de0fcc2726babcc91cf584ab8e866f104f58c7022fc1bcf72c1fb306a88077fd6ade72b8412e94f0d055c9b4cf2b6feb4dd074aeda576a374ac1af11f20491ea SHA512 b86dc11028fb6f716df9c84058e4e31977509ba70662e82b14d7f9905e64e419019a8e27f19997d8d416ec243771b18460bd3bce54b558b19761d7414e4a0769
 MISC metadata.xml 411 BLAKE2B 2b893e06fd83dcb476ef7537c08afe908d531d7a500507cda148c39a22020afb95e1498267353ae1c4a03e27b04358b46a08fa49ff0348056954c9ab270e5c36 SHA512 9e1bed1f9a415385b3bf5baf74eb8df85833d92f803500e9edaf9b89b5a1f1727293c99bdfbf7340560abfb2783b9071935132d5762a6be7206f7e538bcacf73
diff --git a/app-emacs/exwm/exwm-0.28.ebuild b/app-emacs/exwm/exwm-0.28.ebuild
deleted file mode 100644
index e8b3a2eabbce..000000000000
--- a/app-emacs/exwm/exwm-0.28.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp
-
-DESCRIPTION="Emacs X Window Manager"
-HOMEPAGE="https://github.com/ch11ng/exwm/"
-SRC_URI="https://github.com/ch11ng/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="app-emacs/xelb"
-RDEPEND="
-	${BDEPEND}
-	x11-apps/xrandr
-"
-
-DOCS=( README.md )
-SITEFILE="50${PN}-gentoo.el"
-
-src_install() {
-	elisp_src_install
-
-	insinto ${SITEETC}/${PN}/examples
-	doins xinitrc
-}
diff --git a/app-emacs/xelb/xelb-0.19.ebuild b/app-emacs/exwm/exwm-0.32.ebuild
index ee22f549a253..d98bd4bbb93b 100644
--- a/app-emacs/xelb/xelb-0.19.ebuild
+++ b/app-emacs/exwm/exwm-0.32.ebuild
@@ -3,10 +3,12 @@
 
 EAPI=8
 
+NEED_EMACS="27.1"
+
 inherit elisp
 
-DESCRIPTION="X protocol Emacs Lisp Binding"
-HOMEPAGE="https://github.com/emacs-exwm/xelb/"
+DESCRIPTION="Emacs X Window Manager"
+HOMEPAGE="https://github.com/emacs-exwm/exwm/"
 
 if [[ "${PV}" == *9999* ]] ; then
 	inherit git-r3
@@ -22,9 +24,13 @@ fi
 LICENSE="GPL-3+"
 SLOT="0"
 
+BDEPEND="
+	>=app-emacs/compat-30.0.0.0
+	>=app-emacs/xelb-0.20
+"
 RDEPEND="
-	app-editors/emacs[gui]
-	x11-apps/xauth
+	${BDEPEND}
+	x11-apps/xrandr
 "
 
 DOCS=( README.md )
diff --git a/app-emacs/geiser/Manifest b/app-emacs/geiser/Manifest
index 8c319b98db18..8d7cafc93a6c 100644
--- a/app-emacs/geiser/Manifest
+++ b/app-emacs/geiser/Manifest
@@ -1,6 +1,6 @@
 AUX 50geiser-gentoo.el 295 BLAKE2B 5dfbb043d11f242fae453719c85c7b5dd6abfa16e390de35c390d4dec9f80e512039e5d7dd6d79986df9e8d0822c12562d32001ad6bc6a33ab8c168299548044 SHA512 1a7ebc8f2b2e95ee5b1e7c81d498d6239fa88110165f54e6926bedcee4d1ba64c11e6946d8129d0a6958b0ecb280011af3c64c283279d183dc843b0328aa178c
 DIST geiser-0.31.1.tar.bz2 657175 BLAKE2B 1297609da647efacc92b9b19d1c5d2df0afe6584a3ed49aa8243d77b8457de1ee32dc8d6cc02100a24938928a09fef003ae19f901d6f3b4be2660d5d2d3f7e5c SHA512 bf3900c3ca13780547e96c3b5d1912686f360087c19632e2f0b41d8aa2f0bd409233d7cbf3e5d22c90bcff9be2867ef11cb8c0610b285b6c97b314fb92e45bb7
 DIST geiser-0.31.tar.bz2 657293 BLAKE2B 10d40b43f914a5483bb18dca79272fd97c9bd091a18b159b9d3a297c51a06e7176eb1cbb0f547719b7e3ff397311db987a235f737254e4b07a3be81a42ee6ed5 SHA512 4595711925c725c423f02bfd1994d0c4266167d4616ccbbcd1c4c6394452c8061aa3d5af1528d9300a06eed7f39a2ae089175c1c653b782d994485da774515c7
-EBUILD geiser-0.31.1.ebuild 941 BLAKE2B 55d78bf868c32be09e8733c1a888aac0894beea163c0c4e5b707d1e4000a5af23ae16b487fb6578afa0a82f6b8c0f4ae3ca681cbf6b90546277ca404c728a986 SHA512 b3b2eeb304fb7da1bede50767d486d0bf26eb1ba9ca140a37d925984992f3bb6e5fcd4220df249325699eace4062fdda5b750fd1357e492bcc6bead2d306e112
+EBUILD geiser-0.31.1.ebuild 940 BLAKE2B ef3bd68fcb316bc27c75062f62ed80ddb9c5aac20521b03beef7f3ea55048c7b67dd2e0dec72aa0b0ca4fc79a4000318e25f87970696a8107b652209e46e49c0 SHA512 5aab2b7245e00fb0f730a7842b1f6a688150435ef8b88215cad655256b3c76e88285edd15df617c2cdc3586316213169b8822165a7265104e9fc846fdaa32929
 EBUILD geiser-0.31.ebuild 921 BLAKE2B ebad80a51a6f524e8756f99ed12ffce509f60c909c82f7edd7e1f0c99c52b3b5a8ab82554b7a3f5660f5589084a529c74d51e812088cb511a045d48844d83fd9 SHA512 d18087017ce04ec4631da4ddc62cdfbdd0dd2f3b65667e64809eff33628b4e7e68a8a18b8af907787c7b4e4b3af40d71e2eb6d6d134ff1abe51f3ee9bbb31254
 MISC metadata.xml 551 BLAKE2B 2aedbc78837b20f258a94790c4a84f8bfab77f4d71e65354ea6439122c4d84378776c7f9c9a7649c0aadc68df9f33eeca482712961eb8b3af0dffde4d1769ded SHA512 aa663549e7f0710b8629889dd57bb99cc2ec2f2ea93c86d6b75dd85fe4a8467abb4688b38a38b8051655fc0705b8f1e0a7c71c6159abc7170e0bb1b9a0c7c112
diff --git a/app-emacs/geiser/geiser-0.31.1.ebuild b/app-emacs/geiser/geiser-0.31.1.ebuild
index 34cb94b620eb..6f88a4b6aca0 100644
--- a/app-emacs/geiser/geiser-0.31.1.ebuild
+++ b/app-emacs/geiser/geiser-0.31.1.ebuild
@@ -17,7 +17,7 @@ if [[ "${PV}" == *9999* ]] ; then
 else
 	SRC_URI="https://gitlab.com/emacs-${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2"
 
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="BSD"
diff --git a/app-emacs/ghub/Manifest b/app-emacs/ghub/Manifest
index 87fc843c0345..36c3b4b04d14 100644
--- a/app-emacs/ghub/Manifest
+++ b/app-emacs/ghub/Manifest
@@ -3,6 +3,6 @@ DIST ghub-4.0.0.tar.gz 63020 BLAKE2B e01df9e093573933e24c39ef9a252d31dda4c9b0304
 DIST ghub-4.1.0.tar.gz 63324 BLAKE2B 9abc543f23e92ed6971817ae141c3a393900d6bd3254a4d3dec66f5ede65f7d69cdcd4bced0a0394fb46d1ed7d9c3ae81613a00e0870dd7e58752bc3b4ab0512 SHA512 3abe39cdcbe5728bc4a0387ae70ae85b5a81498a2cfb12267127e43ad02613492109ad25bb97c8a8a0d5e7283f12cc5b20f40744e30053c698d75d6ce8940cd4
 DIST ghub-4.1.1.tar.gz 63350 BLAKE2B da6ca76f7980887ee7ce5ce7c5482b8314f6fa1b051c906200d72bfcbf787505e5310ca91c47eb762e7d6a6f8b604e86828aabe023a5f451d11513dd2b9ae2b4 SHA512 cb9312956f856a99ef74a53a2c42d9da4e6722ce051eda78910054df64d5a6f8cf847542a56bb81d146ff6028363eda4e98a44ec4ca34c59a0eff893fc654b47
 EBUILD ghub-4.0.0.ebuild 796 BLAKE2B efed74ad49bb51b1c8547f2ba066f7cd42667c240de86a9366d82ef3d769b8225d187271a035337880d6e10ac1d0aa1f44b2e41547841f351516c20628ddc39d SHA512 d66118faeb494227c1df43a7b6e3a6c14565feab82e01857cdf944f8d1e055e366de87b28fe621618e1fcc7ba851d9337d8c36d6267bccb00eaa8928ab284554
-EBUILD ghub-4.1.0.ebuild 785 BLAKE2B e6e9e9c43c42eb4279abad3ab2a72c535dd9fea6acc5c6929d64fff52f2b5ea9cc935159e93c250d7eabbe773927383363a3014207a7165714dedc7074a7e285 SHA512 465b9eb58b5a8dddc5516d5fea455b8a24ecbeda752d92eacd5ed04380096f14652005fb1f2ee5d70fdab7e11d7c36d933d1c4662b23787b1e6cfa0a99e43421
+EBUILD ghub-4.1.0.ebuild 783 BLAKE2B 7024c09ac16c6088a74aeaf81cf308639cd25d3cf0692912292b03089aa6ed5ae52aa87cc490b2a809d4902771d7e9e42c396914d31129d9ba29abf03a2bc024 SHA512 51c775a7730ab4b913c8190250b3a47858a38751d215af71e0a75b6ead08e478a3538befaad362f20770b94e3a93f12f006290677a99a72a2c0e8778ac882ace
 EBUILD ghub-4.1.1.ebuild 785 BLAKE2B e6e9e9c43c42eb4279abad3ab2a72c535dd9fea6acc5c6929d64fff52f2b5ea9cc935159e93c250d7eabbe773927383363a3014207a7165714dedc7074a7e285 SHA512 465b9eb58b5a8dddc5516d5fea455b8a24ecbeda752d92eacd5ed04380096f14652005fb1f2ee5d70fdab7e11d7c36d933d1c4662b23787b1e6cfa0a99e43421
 MISC metadata.xml 1297 BLAKE2B 76a67936c0754ffeba3ca47551417bea6a0996c5197977b2dce2c73bf7acbe421f0c7ac0f8415b529f1ee3109868bc5306d7e714a58f3faec549ddd575cc82b1 SHA512 8cb4ebebcce9526416253b528bd8e2865311a796f10cc176b7d87d0fd06b573a9d7dc094cf3c2ccb916eccffb69dd5a164ad64c8f0310727147bea3804aa79de
diff --git a/app-emacs/ghub/ghub-4.1.0.ebuild b/app-emacs/ghub/ghub-4.1.0.ebuild
index 137580e04d5e..7489aa2ed3a3 100644
--- a/app-emacs/ghub/ghub-4.1.0.ebuild
+++ b/app-emacs/ghub/ghub-4.1.0.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://github.com/magit/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/helm/Manifest b/app-emacs/helm/Manifest
index 5a5c5045adf6..427e03f2dee5 100644
--- a/app-emacs/helm/Manifest
+++ b/app-emacs/helm/Manifest
@@ -3,5 +3,5 @@ AUX helm-3.8.8-no-autoload-check.patch 674 BLAKE2B 1cae635d26e3c5b41b585de585a87
 DIST helm-3.9.9.tar.gz 2384860 BLAKE2B 19ee0114beb2e27c99da5c5df361f01de3a24a106f9c36205e72fd0d7c22bcaecd3399a84f4803b1d0df315977b06ef7a04a0c45860d64f541014aaf229437a5 SHA512 114b25d8c223a11bef327612760e388f49c876e10683f8fed9cc58f380047f932b2782fcb99de1d37cc352fd168c3fc8ba9e358321aca46bbcd130a17e7d37ec
 DIST helm-4.0.tar.gz 2391038 BLAKE2B b3bd0c3736bb20218ed88afda39cebed4853a43915dd9e857d57f459f5531f565435aba19e71a196b808db58d56f54dda1ae9916697f7025055c4b9471df19a1 SHA512 70563293cdd9212ed46bcb13a2dcdb2c669a66314676a34d99102ca517c5e27c6937926c2c063fa1826d7eca4c0c9f61146067d684ca34ac1dacd3d977a0bd77
 EBUILD helm-3.9.9.ebuild 848 BLAKE2B e36186bd0eeabf82d76e1a70bdb63f57937219f8e099eb63c87c61b22add388f9e96cd26a83bff1180539eea8c4982efc9804f1530bc93bcc0e214740cbce609 SHA512 cf58148a2d05fabd2918f721637383e9b7e0b016d67c331ef9848a436fabdfd5e5dc5dd021c6c8840f657aa3cab32423b2d9e75be1304bd5def22449f43f45e8
-EBUILD helm-4.0.ebuild 903 BLAKE2B 936421adf817c71f37b2a9087d0e935ce922b04b981c4e087d9dba9346b9c6d669249271265558840b19a771aa533441e4e5049b8dfe49d3cef013dc70f46da6 SHA512 0f811c7d7fd2da0a507815cc260c4cbbc5b406604e9ab3a347c9b198ffce3a6e51557509384d409a329ace7ed3375d65472355180db508ac9807915cb7dd0183
+EBUILD helm-4.0.ebuild 901 BLAKE2B 660951568780585ff7f69f3e381082294f6c584d9889812fb0bf1b7609a9a690fb47e8580dba101179aff27f8dc044d0596bf011087279b392c0a34c292484b1 SHA512 634ed2d3179e17113a5f73990724c84d6c486729faf6255ef6cdc59da61353880d33601b5db8a4b67039c1d99fadbec73610706a451cbca87a593395de6556c8
 MISC metadata.xml 822 BLAKE2B 5de057ddb881d67550d3e8cd0be43d3328b8e7a38b98338ffccec147095cd5d8f8bc68695c797a872e2ed7e455859fc1d6170f414231016edab5a8d742ad2a40 SHA512 08367530e4e47577e1812d229b97094b9c012c4c91eb7e69f5724e98d8790327fe35fb9b480cf33eedd105f1fd85133c39397eda0426461d80bdee704a51c55a
diff --git a/app-emacs/helm/helm-4.0.ebuild b/app-emacs/helm/helm-4.0.ebuild
index 9c74ab45f838..e2123329ec3f 100644
--- a/app-emacs/helm/helm-4.0.ebuild
+++ b/app-emacs/helm/helm-4.0.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://github.com/emacs-helm/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/magit/Manifest b/app-emacs/magit/Manifest
index 2f1109ad74a9..a236f3df32d4 100644
--- a/app-emacs/magit/Manifest
+++ b/app-emacs/magit/Manifest
@@ -3,7 +3,7 @@ DIST magit-4.0.0.tar.gz 676167 BLAKE2B 2adc7388cddc5230615344b3340ae181feaea1e6c
 DIST magit-4.1.0.tar.gz 673317 BLAKE2B 6457c77f08605e3665b3fadcb4d6bc48d21498e370261d9709305e774de579be4647afb6e598a446a3ddf06e47baef6561a48706609812991a24e3ab2b22d416 SHA512 063c23a7f1a9099d7ec020980be936b30b85756b30bded48264939c5ae7f742820efc3eadc8ba480ad328ca7276a9d35bb168e6b7a42ea8dfa6a2c1e13b8cc90
 DIST magit-4.1.1.tar.gz 674147 BLAKE2B 4878061957f342aa1c76e8f356a59d6e13ceba35dad6ed0adf4ba59484a3cb9585855aaeec91a40f6dddd9bfa53c0ed0733b506c19be70a5b056ba70dbb27f4e SHA512 c1ab5b4dadf11a0eafcb69ac46c7c1aa19595a1a76e0cf3b8afa987e64c4b525007753179da1e146dab89504f1b436e9141c76025019bd1077d2172beab8105b
 EBUILD magit-4.0.0.ebuild 971 BLAKE2B 4a01f3f891ae1424895977e9fbf89beb383ee72711ed9dcc1cf47fd85ea974ddce31430b2f7134c32dcec27c74d8c905d8fa9965f85942f7a7d01576f668f453 SHA512 9ba3d03605578b4e9cda8fd00dd46c475e2b86e1b29e04bd9114014c917a6eb2518da1837ba7ef18fb88a82933c04534664b87f7d6ca17506af3e18e9ed6a1f3
-EBUILD magit-4.1.0.ebuild 973 BLAKE2B 368ebb249bafdb56b1e72b9360905e91680a728db80283d6c59e5aaa060da8747e8cd6208f930b8df4714e2a376fec654206c1d7dae304455752004873c0026d SHA512 87bcb40afe391ebc234ce46ebce02873d1a1063fbb52edc78cf92d533bf6c016891ea7fcb0daed0dda7a19945438aef527b2b31782b92b3616290f56d0220f78
+EBUILD magit-4.1.0.ebuild 971 BLAKE2B 4a01f3f891ae1424895977e9fbf89beb383ee72711ed9dcc1cf47fd85ea974ddce31430b2f7134c32dcec27c74d8c905d8fa9965f85942f7a7d01576f668f453 SHA512 9ba3d03605578b4e9cda8fd00dd46c475e2b86e1b29e04bd9114014c917a6eb2518da1837ba7ef18fb88a82933c04534664b87f7d6ca17506af3e18e9ed6a1f3
 EBUILD magit-4.1.1.ebuild 975 BLAKE2B bde9dc044f8c79c18d7d3f8c9065afbc03f2a00a72edbbc88f84db3d26f7be0b178adf3f5334357c746377415716d4bfe654273846ea512d47a4f726e16e8955 SHA512 8dadb43039efa4ee2181bcec1840bfa9211d5a70cea9e76ab60d6e1e89f94830de6c6418ea67a04a0076cc8de3034fcfa32220aca5b70f13d6ac2c9f6726aa68
 EBUILD magit-9999.ebuild 973 BLAKE2B 368ebb249bafdb56b1e72b9360905e91680a728db80283d6c59e5aaa060da8747e8cd6208f930b8df4714e2a376fec654206c1d7dae304455752004873c0026d SHA512 87bcb40afe391ebc234ce46ebce02873d1a1063fbb52edc78cf92d533bf6c016891ea7fcb0daed0dda7a19945438aef527b2b31782b92b3616290f56d0220f78
 MISC metadata.xml 812 BLAKE2B a00fcce22437d2853e3c6ab16e57e284444eed91cc2ec90e443ac14ab61c60dd476b21504fd41fae27eb0180cebb236f86b35cee557a41ca34c854939c8a0ab8 SHA512 a0aa797e586bdb7657c9f4af4eaa8611a012146abbae4f47f47b124a7ebb9c2a8e65f9e862464bef0cc6f5671da40a2bd6e6cb78e0fb9d6ec02c362bcbd27399
diff --git a/app-emacs/magit/magit-4.1.0.ebuild b/app-emacs/magit/magit-4.1.0.ebuild
index 19d51447f288..f824cd1a5bbc 100644
--- a/app-emacs/magit/magit-4.1.0.ebuild
+++ b/app-emacs/magit/magit-4.1.0.ebuild
@@ -17,7 +17,7 @@ else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 fi
 
 S="${WORKDIR}/${P}/lisp"
diff --git a/app-emacs/oauth2/Manifest b/app-emacs/oauth2/Manifest
index ec7caa76d816..22642747bea2 100644
--- a/app-emacs/oauth2/Manifest
+++ b/app-emacs/oauth2/Manifest
@@ -1,5 +1,5 @@
 DIST oauth2-0.16.tar.gz 3527 BLAKE2B af5ea470267ada0efe7bb28c383576bdd737da1352fff1047f0a26ca133efbb96e2dcb9dd53ad6793b7a73a6fa42c002955ab751389a30f2200f6a00e6de646e SHA512 525408581c146e369df2e2a79c76bc06f631a55c0f42ed537bc05fdeb7d399e6308b3e99135b49e66366941722710340cd18c184c09d510444c765ad19b0eb6f
 DIST oauth2-0.17.tar.gz 4265 BLAKE2B cd18b67e296eec227d12fa75c197fef800b74360efc99cd3357022d1663768c5a4b7063d5cd8342dd25532edfa65331d4f184059ebfb1961d15bc800530ab491 SHA512 a5a0daafeeb2ce9eb336eeaf169800c68db9493cd83b50950bffc81903f7fe854c52a6162785e30068239b4a10c5f14cae2a668f9a1991d87188a761cb4d30bc
 EBUILD oauth2-0.16.ebuild 513 BLAKE2B 1e9bd337e50ca0cea50803513c478638c9f3013f2b4417199d9ede8cd34092d403d07902858f79cbb70f2877e8aa4d1f927a692d9d2b43bdf4ca7fd06edc20c2 SHA512 25d8331282a66cce94fd7be28dc328c03d537c503016b185dc8557a40f14089eba7b849b6e6cb024c5ecf175410b1bfb58c8bb80ec57b3ca0d2cc01a2dbdf75a
-EBUILD oauth2-0.17.ebuild 568 BLAKE2B 7247b63146a212647ded20c7814426277efb9753615ac30d7d097ade7ab8879e775e7e2844e6e1ead4c9792e88cbaca97fa6b94c096d89c0a09aaf6dcd6a696f SHA512 5a9b57da7e099e02f1008918813f9dd6b9065ffc0361e5eb4a1d6c85cbb156186f0fe55a6aff56dc5e9d201e691c042fc1f88dcefaab9c4d1a78d3bab6f7f453
+EBUILD oauth2-0.17.ebuild 564 BLAKE2B 9085ba9195e7e6228fcc6970cf93dd98662728133092f36731288955224da355aa4d2d85eb4b3e84450baa12cc6742163509ff4ebadfda7b09acab3972ac8c21 SHA512 517a94ecd271b9ea5eca22963c376d03e8c26dfce202b3cd18a69c9805c482951134f29bb3a73638de49a73cea75d949f9966ab322e65fc2a3f2f21a69903a5d
 MISC metadata.xml 364 BLAKE2B 84c0e47033fb2ebe7eed99db6ef5e82b7b31c44014156e9c9615d79fbcafa0693bf7d66408af310593eab40ae6d4596faad699b399ce20327b8f3d587e503d99 SHA512 52661def31909412973e45df6d5494ef03171465de37d724e2a657fd6978ec9cedf42d67a936eee5fb4198473a66bac8a93e4723289d675212073ab50edaad4e
diff --git a/app-emacs/oauth2/oauth2-0.17.ebuild b/app-emacs/oauth2/oauth2-0.17.ebuild
index d055dbfa9501..57953f8997bc 100644
--- a/app-emacs/oauth2/oauth2-0.17.ebuild
+++ b/app-emacs/oauth2/oauth2-0.17.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/elpa-${COMMIT:0:7}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 DOCS=( NEWS )
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/org-mode/Manifest b/app-emacs/org-mode/Manifest
index cd8fd2f3b17f..aaf1c33bf701 100644
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@@ -3,7 +3,7 @@ DIST org-mode-release_9.7.10.tar.gz 2362896 BLAKE2B 1f95c6195c1607236daddc1a7724
 DIST org-mode-release_9.7.11.tar.gz 2363004 BLAKE2B 7438d67b834818d06185753fbe9e712c6f7b2381815de86c6f9e2e00715e8e235446c811440971c39ddb6f3f93839d6ab768b6e8b1ad023e94b7cd6f221baf3f SHA512 f2f7a4e2eae6ba2e6f2b85c4bbebae75dc48822b3a2080c3f9ec774e149799f4c97551bb0fc64dd156a34a015cb62f64d6f1697bd3f7fd0b6277d8c2a6f7665a
 DIST org-mode-release_9.7.9.tar.gz 2362703 BLAKE2B afd3b9d9dd2ade96865807ad36cecac949c427682ec5e473174b30cd3648c7413dfe59f70bec50685a684fdc03f095c20c1e7dc2b9cc21546d8a13e8582a109b SHA512 08d6e25670509f86e64cbff2c6998b73cffb2bb109ae531702b3876277f95e39107de70d091eb238f576684995e808969b439670179a14938d2fad6d94fad8a2
 EBUILD org-mode-9.7.10.ebuild 1594 BLAKE2B 0c52014a57510022eb39526b82b6ca5d981d79cb0fe456596eea50a95eda39307bf8cf91c659d07eb62fff761bd68c597ff62560bb2c63d9806e7aa2d18e16ce SHA512 cdce35ad3040a1386fffb0f09ce97c5fe1f6536a4e3d3075b8c8c831040a97bb7e4597bb6ca7fa81fda95aa5eb3c0a2c3ce276881afb1d0871a205a4be4983b0
-EBUILD org-mode-9.7.11.ebuild 1597 BLAKE2B 9fc5a6fceb0390c825539b4ba29d672220a014a5e649706c3c25ba9b5fb49d0f7b139ce4315903dc446f573848ad20ed59ad4fac920dcb3a719bb61daeef2c6d SHA512 b49027b63f17c31a3bb9221cb726364233af8be6fd0162e3353df8e5b51bdff978672b74be80671c20f8dc0e3482ff5179cdcf3e6e678809a6d764742c8e4e80
+EBUILD org-mode-9.7.11.ebuild 1594 BLAKE2B 0c52014a57510022eb39526b82b6ca5d981d79cb0fe456596eea50a95eda39307bf8cf91c659d07eb62fff761bd68c597ff62560bb2c63d9806e7aa2d18e16ce SHA512 cdce35ad3040a1386fffb0f09ce97c5fe1f6536a4e3d3075b8c8c831040a97bb7e4597bb6ca7fa81fda95aa5eb3c0a2c3ce276881afb1d0871a205a4be4983b0
 EBUILD org-mode-9.7.9.ebuild 1594 BLAKE2B 0c52014a57510022eb39526b82b6ca5d981d79cb0fe456596eea50a95eda39307bf8cf91c659d07eb62fff761bd68c597ff62560bb2c63d9806e7aa2d18e16ce SHA512 cdce35ad3040a1386fffb0f09ce97c5fe1f6536a4e3d3075b8c8c831040a97bb7e4597bb6ca7fa81fda95aa5eb3c0a2c3ce276881afb1d0871a205a4be4983b0
 EBUILD org-mode-9999.ebuild 1548 BLAKE2B 426b201cd1c179250baa695a14b4f152a1071bfc2b9afd99035a409b2ebb0be500a21bd43dcc46dadc10eb8466ab1ed8787f8007f09a96849688851d24d4cdab SHA512 154b347979a5bfde974dac21d0e2f65c7bddeaffaf9a0c68054ff97a24ce126f784e473705f45bffa9c40361b106a6042175470e883d1e3faae2a73c345dc160
 MISC metadata.xml 1308 BLAKE2B 5aecc9209e6435d3112633a3dbb154494d20f6e428985f942ea9102d83d03ad08049fc58abe16d189f6744278fb84886990c0dfa94972b7e5669edf05de17223 SHA512 331969bde4138037bb516456a25de2b89a913f06c411375a3303eb95799e5cd214934aad98166f407acb47963ea9ab6ceae6d35fe607c963e62f0279d28a1cf1
diff --git a/app-emacs/org-mode/org-mode-9.7.11.ebuild b/app-emacs/org-mode/org-mode-9.7.11.ebuild
index 86c9f98ba96b..2e6d3986022b 100644
--- a/app-emacs/org-mode/org-mode-9.7.11.ebuild
+++ b/app-emacs/org-mode/org-mode-9.7.11.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 )"
diff --git a/app-emacs/xelb/Manifest b/app-emacs/xelb/Manifest
index ee2d687eb670..40d7e357672b 100644
--- a/app-emacs/xelb/Manifest
+++ b/app-emacs/xelb/Manifest
@@ -1,5 +1,3 @@
-DIST xelb-0.19.tar.gz 143448 BLAKE2B b0bf8fdb36406120cce6e274e7af6577cdc899a8a84e33bdd60a5c26b13ff9f07a03a55b3a079efec578d12f6aecc1317f8638826e8ec33cb25e60f051263a8c SHA512 60ce0cdfd27bfea331ddf92a5c32b318b47ff38d91b5caa26287ace60cd7f7d2199f2553fe36963af1e4395e53432e9a76e83d12bdf6767b48f118a1e414280c
 DIST xelb-0.20.tar.gz 143475 BLAKE2B d72e4c6634065b4900b7f1259ab362576c5f9ec7781ca379564809f32796cc2cd872501c80411d4f90ecda6058b9308ddb747407097bca2dbf662383fc3cad35 SHA512 15eae53bafbb677e53e2b8fa43f2672868c49eb3f294b27ccf03a9e72fe3dc958b46874d15092fc1e57dd0dcb7b969e53104df0c868bfbb18c313a96b9b42528
-EBUILD xelb-0.19.ebuild 575 BLAKE2B bb7f464600f4b659c3e096529e346d1f0d895c9270cee9018ac4c8c2d407b4721f377af261e5c68664e3acba245ca466932fa4f735d739e2a4d08a8022f76ba9 SHA512 61b6fd2feb515187d426363544418f4d7443e32191306c6d3a68bc23a88f9deb6939611e682184630b2fbb3a6156a32cc2f5b76e288e7523ed103f750028c001
 EBUILD xelb-0.20-r1.ebuild 623 BLAKE2B afe85ae32d95ed0852572fb343d33bef232d0863c86059136be576d884ccce738b538a5663dea42616167dbb2df5a3fed0776f6575a3cb57dcfd282e8e25842d SHA512 36878c1e1ed0cd93b3bd6ae0a5ce81394dcc57d8d4adf62e61aaf76a38f74e902a14b0d4787df4171d17764a87b4f6e71af0fbb6b574b1a722f503c7f61c75b3
 MISC metadata.xml 411 BLAKE2B e2dfea920c3c12451849e50b06e7477710085df45b8f36297b0d23afbe04f037e19b4aeef855209d465fab0b409e835ed81d6c40f1ab22397039ef0d75c8ae08 SHA512 29f389c3190ed2a58c914a5e4cabf81234b88c9dbdfa1f11d611b3c86bbcfe768e397c9dd4a46e01908d07ce4ba2af553ef4856713065e6b3fb2780ba560f2a4