gentoo Easter resync : 12.04.2020

52 files changed, 166 insertions, 103 deletions

diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index f1abc2fc88c3..2c1e2bfc7b01 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/apel/Manifest b/app-emacs/apel/Manifest
index 4ba53d89dca9..d39242c6e1dc 100644
--- a/app-emacs/apel/Manifest
+++ b/app-emacs/apel/Manifest
@@ -6,6 +6,6 @@ AUX apel-10.8-050_escape-backslash.patch 942 BLAKE2B ab6ed79c8d6a8a75a1023dde38a
 DIST apel-10.8-030_Use-new-style-backquotes.patch.gz 7869 BLAKE2B 93b93a089693a2fec68033b44f1cf96117fcdcb9dad5dbbf4283a79cd19f358c2a3bdc80ce2f7517e8b396182141583a371c21a8df7db7d05156ffd16987a872 SHA512 4074dc612feb2d63637bea2e9303423d4e9e035fad7f440d2da5331a6adc08f5ec61abb5087c2c4c72ec8931d1ccc4db3ffd061bcf3150d20c222c8df2e0b274
 DIST apel-10.8.tar.gz 126326 BLAKE2B 6fc8f04006a971e9d48dbf5f7b43e201a4f5fa515210bb69829bc3b0f05aba2e9f205915e6117e20220ae5b48a6543520533dc95a90754a30ff3fb8094779901 SHA512 39f13f15ec0a078d8f8dfe797899474cf4dfeb0bf7b8432a0c05bb38cf134d805c171a66b3d3efd074fbf294d68006d1e1d49903e45f1991d79cdcb4cca4aa9d
 DIST apel-10.8_p20190407.tar.gz 94808 BLAKE2B 47540e8c3ce96cc91efefe521942a3df4ee8423c7796d7e66b14bed7e9d662469a0767dd4863ae130fb114a1f9335d95abd13d61b6811e039db75e28679ac0f6 SHA512 6c780b0643f248e2a1409f1cea794dc6be515ee2ae766ead0834996bd9c13852492af1b9c343c4efda06fd057fae0c1b8a1ffc6b55b1469afbc7cbf1b579ea68
-EBUILD apel-10.8-r1.ebuild 1482 BLAKE2B 592f7b09c7cc42ebc7357cd730e455dfc818eaf632ddd2c0bf0230305f3fdf0d0cf90c90bccc1619c6a9576b4eea6942502090c24cd722eec1eefdc7f07a9347 SHA512 82dc84b017a84c76a8e61a27b6a14df61aad77cf1c333c876eef5c47a280eb02e2c1f7662e8757cbb9a036820b624756e28a0b154a7d8610ccfccd425cca6a3d
-EBUILD apel-10.8_p20190407.ebuild 1210 BLAKE2B 9fda6e3e40248f461dc7ad202d9f45351448889c5b573134e9359ba2e9c5f2a36a8558f2a5026ecbd210314a5644b51924c16d7ea59ca96635ab0cf71b6f3213 SHA512 a3630b2d6b005d579a1fbd5c748978dd242ad160d8c4337b3c86aee20c21fd3f61e4193ef1ef32f0979d1695d851d0e9d8d54a1ebc73915e0a880dcde9a83306
+EBUILD apel-10.8-r1.ebuild 1484 BLAKE2B 2dc895a09c6f0d50e71fa41c26474927202af5bf7afe88c5e5c45e7865b72d582295ffc3c25524d849d37de56e9c8978b13b50895e5b8a9c6318034250da0c9e SHA512 24f290c7dc3ba4e2626dc1fa6f66047f6ef91c410c0d34494df0cc7fb64415a2a89af29e5a7f21c886ed8ae17854c6afbc1273ef80223d4726cc7f99f3fc406b
+EBUILD apel-10.8_p20190407.ebuild 1212 BLAKE2B df577e007048a4240dcffe45b7793f7d23d87ff8e7b81c8472d9e4d78c6d84c0bc91ad9b65d6db4bd9fb984cdea0dd418fe380ff291c2ef7959c3e672617b017 SHA512 fde5b687a6779b7ff9f8a895b682d5286571767253f6f661c6a222a52ccc004975e09b05887b3742c49678fa4aa6fefb849039ab2719288823ee7f4a3e3ea348
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/apel/apel-10.8-r1.ebuild b/app-emacs/apel/apel-10.8-r1.ebuild
index 2b6a68f234d2..c4fceb83137a 100644
--- a/app-emacs/apel/apel-10.8-r1.ebuild
+++ b/app-emacs/apel/apel-10.8-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.jpl.org/pub/elisp/apel/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 ELISP_PATCHES="${PN}-10.8-020_Prevent-fontset-error.patch
diff --git a/app-emacs/apel/apel-10.8_p20190407.ebuild b/app-emacs/apel/apel-10.8_p20190407.ebuild
index 4e85661052cf..efbc3ace03df 100644
--- a/app-emacs/apel/apel-10.8_p20190407.ebuild
+++ b/app-emacs/apel/apel-10.8_p20190407.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/wanderlust/apel/archive/${GITHUB_SHA1}.tar.gz -> ${P
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 
 S="${WORKDIR}/${PN}-${GITHUB_SHA1}"
 
diff --git a/app-emacs/autoconf-mode/Manifest b/app-emacs/autoconf-mode/Manifest
index bde30460f969..5eead089c1ad 100644
--- a/app-emacs/autoconf-mode/Manifest
+++ b/app-emacs/autoconf-mode/Manifest
@@ -1,4 +1,4 @@
 AUX 50autoconf-mode-gentoo.el 366 BLAKE2B 9394476da3892a5b857fe35ff9a6ecbacec761adec91465201259b03080a7303a1c5e6fe2767ffabfad1b156f4d362e1f025fef9ab131d89799912e0328090a9 SHA512 e917a5c7e7216da4624ac9463aa575569402383fd77d11b510c4752d1dfb54aa93c3cd29f3e3b198693c4f9ee9452611f5f342ecf57bf2c5f72b5e10ffab2d9f
 DIST autoconf-2.69.tar.xz 1214744 BLAKE2B 71d33d72a06e9a05fbed0eda73bc9d8a3805c7c90bf082959862f93f3c5f01192114176e84d84ecb58fa99512eafbc0ab21ad1407be18c8c63bb3dc1117c482d SHA512 995d3e5a8eb1eb37e2b7fae53c6ec7a9b4df997286b7d643344818f94636756b1bf5ff5ea9155e755cb9461149a853dfbf2886fc6bd7132e5afa9c168e306e9b
-EBUILD autoconf-mode-2.69-r1.ebuild 528 BLAKE2B f6f1661f2dd5d9906a923ae648f41d74bcde2dabe3e85a963f742df489993d5421cd58d7fc671d76f50c8d528110a77a8d3e8a86109574b57b6b6af511f493b1 SHA512 b571d8a3146802a6c7d518160008108bd78f93a9c7ce01b5a1530339ae217581017f7d75db600be8705919951678732eaf28d8822b3e8e040a73abcb07aab096
+EBUILD autoconf-mode-2.69-r1.ebuild 526 BLAKE2B 34faae12867b898615d70c9bcc474e9e5db1ddb2fc74f6541e7ec3f19845355c71b226a3244be2537dc4fbc5926b03c93f308a0d8ce8752070169dd37a0114b2 SHA512 fafe1045b68f465201a1136a90e2cab8fb42c9bd3cf8c8cb78890372e296380ee9b97163cf88005356d736427eecb602b730d8ebcaf4fe02def5f0baaf49f7c2
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/autoconf-mode/autoconf-mode-2.69-r1.ebuild b/app-emacs/autoconf-mode/autoconf-mode-2.69-r1.ebuild
index dc1226a1e6e1..dd55624b0393 100644
--- a/app-emacs/autoconf-mode/autoconf-mode-2.69-r1.ebuild
+++ b/app-emacs/autoconf-mode/autoconf-mode-2.69-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/autoconf/autoconf-${PV}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 S="${WORKDIR}/autoconf-${PV}/lib/emacs"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/bbdb/Manifest b/app-emacs/bbdb/Manifest
index 323432c16c24..a8e243f9f1c9 100644
--- a/app-emacs/bbdb/Manifest
+++ b/app-emacs/bbdb/Manifest
@@ -1,5 +1,8 @@
 AUX 50bbdb-gentoo-3.1.2.el 63 BLAKE2B 4e066577f6bbc4ddcc7a5b102c1bc650fd957d82468ed9782a97520db6acb2fb600372c4fcff7c21dd020080a3d4a5f41aaea15e5751ed5f22e17b9d2e04996d SHA512 3cb67cba1e12630c40b7c78572e7af0418c56d821c327c7b963cb00401a13f47da622b3a8e7a67795158b1394e860bcdf5ac3e478f8df9c5e3a97963bbd65a2e
+AUX 50bbdb-gentoo-3.2.el 149 BLAKE2B 7db122f83411995801b658f05dcda71d8eb5382ed1d5b2216f4a74a4c45328e54f25d393cf797ca335ed4129875b1c7ddf33e95e73479528720d116ace6a6e0c SHA512 650b802917866344dc6748ec213de79d8fe31a03654f1005994020173a143a51e295407350db1ebb0ef6f240047999cd9a1630a82af13997de57ead82cdb3b08
 AUX bbdb-3.1.2-no-init.patch 4709 BLAKE2B 3e38c67d8347a8c6202ecddfa68847f0c9feab1593d84e5564607b3d9da104af93b5bb0862e899386555dd1abe5f8b7894c71575fc6a750db2e4332c5ad9c204 SHA512 3f262323cb35636d0249aafa54ff2a2e462df803d19c356bf2b7ed6a68410fa6e6bc41298a1e7fbeef224c84cf4bf9f80ff1ae068c5226ac6bea3ec62d593355
 DIST bbdb-3.1.2.tar.gz 378935 BLAKE2B 3fc862d2d68632c997e3f250aa82cced743c3cc3861c74789bb12015ab99745270c79722dc0342334b90f4dd9071ef809ab670a342ac227c24a927870907c25c SHA512 8b32baadc4eb06b0abf533ccb1f540f4f407f27b8d2e847ae25e62d1405e1de5cfc6af16368eecd4086f281ee7a4016cf25568847b3cb798156c7e18e1912576
-EBUILD bbdb-3.1.2-r1.ebuild 1265 BLAKE2B 1a40d52bfd54f724cf4811c1538c67fc6f51e34f1e2766a1f93a43941b06cfc13ef64ab62b3180160166adca4ce0785b6d182017ca27f8819a61e53e0f5d5f77 SHA512 2c1cb1cca86c94d29d4064adb8bbcd455ba58d5ed63f7c7256b1c84a7d3b50b774696dd367f81e3698c8dd77c987ed3ffbef36004f8642bdff563d9e11b8dc27
+DIST bbdb-3.2.tar.gz 189456 BLAKE2B b25efd6a3a156684e0a8f15db056683876c8dd1a44eb585db269746c7424cc18df5407e3a04defcbbd8a2c8438bbe2b16d55ab290e842951f6e475bfc34871fe SHA512 593ba5143b50f2818c19c94452efb2c5d7194ed5dc8deecf1d380da4f80e0fad2542b9a7ee68d8baca2bc2bfd84fa0459eb3cd18faaf998eb0956fcfb62dc5c8
+EBUILD bbdb-3.1.2-r2.ebuild 1236 BLAKE2B 4fe817fd96846ec01e582eb9852b5e8bfd2ff695206b67ecbb6f47cda5eff6627efaeec21d7b99e87e35c1b499f9fe42dc4e89fb11a60e3956410d96f2f5ccd5 SHA512 ce494c3108c49a36f09160e023575351daad22b0ae4f42c9cc1732019cdaaf6fbff0da245ab4ef8aa4833c0d9d6dfe5ea2b65d6e370702a9c396695a69596f96
+EBUILD bbdb-3.2_pre20180106.ebuild 1320 BLAKE2B 2436f1a584f6d6abaf66d03c6f8ce9ef5c15aea1010eca6f61661f53fa7e9c2cc39795ec2c2a5659fb5561075be00a2199be208d75032d14b9c42b4a21ac7e0e SHA512 11d3cdd4035e1b2537de3fd4855a51fc94c29477216ae700183efff69d4ac64dc1d307f4941ee71fde79d376718e3c7faf2e4458637e45173d033ec9fbaad21c
 MISC metadata.xml 753 BLAKE2B 34f54aee0c3090fa9d9ee231f1f3ada71e889a4c4d7db76be9f0e351a4ae2333230c3338b014c2b267fd24610d788ede12749fe135f14d9760e76bd4e47d2827 SHA512 76dad950ad39c0f3442e2339dbf560154cc1b0685137c81e64224686ee31ff856dbd147aa04202250fa9595510c991d15609aec986dab26ad60bda3744902dda
diff --git a/app-emacs/bbdb/bbdb-3.1.2-r1.ebuild b/app-emacs/bbdb/bbdb-3.1.2-r2.ebuild
index 14b335632f91..f324f803d0c1 100644
--- a/app-emacs/bbdb/bbdb-3.1.2-r1.ebuild
+++ b/app-emacs/bbdb/bbdb-3.1.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ DESCRIPTION="The Insidious Big Brother Database"
 HOMEPAGE="https://savannah.nongnu.org/projects/bbdb/"
 SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz"
 
-LICENSE="GPL-3+ GPL-1+ FDL-1.3+"
+LICENSE="GPL-3+ GPL-1+"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="tex vm"
@@ -41,7 +41,6 @@ src_compile() {
 src_install() {
 	emake -C lisp DESTDIR="${D}" install
 	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	doinfo doc/*.info*
 	dodoc AUTHORS ChangeLog NEWS README TODO
 
 	if use tex; then
diff --git a/app-emacs/bbdb/bbdb-3.2_pre20180106.ebuild b/app-emacs/bbdb/bbdb-3.2_pre20180106.ebuild
new file mode 100644
index 000000000000..8dc25fd9b6bd
--- /dev/null
+++ b/app-emacs/bbdb/bbdb-3.2_pre20180106.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp autotools
+
+MY_P="${P%_pre*}"
+DESCRIPTION="The Insidious Big Brother Database"
+HOMEPAGE="https://savannah.nongnu.org/projects/bbdb/"
+#SRC_URI="https://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz"
+SRC_URI="https://git.savannah.nongnu.org/cgit/bbdb.git/snapshot/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3+ GPL-1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE="tex vm"
+RESTRICT="test" #631700
+
+BDEPEND="vm? ( app-emacs/vm )"
+RDEPEND="${BDEPEND}
+	tex? ( virtual/latex-base )"
+
+SITEFILE="50${PN}-gentoo-3.2.el"
+TEXMF="/usr/share/texmf-site"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
+		"$(use_with vm vm-dir "${EPREFIX}${SITELISP}/vm")"
+}
+
+src_compile() {
+	emake -C lisp
+}
+
+src_install() {
+	emake -C lisp DESTDIR="${D}" install
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	dodoc AUTHORS ChangeLog NEWS README TODO
+
+	if use tex; then
+		insinto "${TEXMF}"/tex/latex/${PN}
+		doins tex/bbdb.sty
+	fi
+}
+
+pkg_postinst() {
+	elisp-site-regen
+	use tex && texconfig rehash
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	use tex && texconfig rehash
+}
diff --git a/app-emacs/bbdb/files/50bbdb-gentoo-3.2.el b/app-emacs/bbdb/files/50bbdb-gentoo-3.2.el
new file mode 100644
index 000000000000..4bbec687fb81
--- /dev/null
+++ b/app-emacs/bbdb/files/50bbdb-gentoo-3.2.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(require 'bbdb-loaddefs)
+;; t indicates that bbdb.sty is in the regular TeX search path
+(setq bbdb-tex-path t)
diff --git a/app-emacs/doctest-mode/Manifest b/app-emacs/doctest-mode/Manifest
index 0f42a10e0f43..676bbe0a347f 100644
--- a/app-emacs/doctest-mode/Manifest
+++ b/app-emacs/doctest-mode/Manifest
@@ -1,4 +1,4 @@
 AUX 60doctest-mode-gentoo.el 191 BLAKE2B 92514ec6c9b9c193f9693d3a2bebb2574a58ca723679688542726d2d8d502c3a7bffbb7b89b7b5e2538c9a3f57ea7dd138586895d6e0b9d8ea7c73d4c32338ec SHA512 b8cd1cc6a2f8fed8b7c979736422050182a008d78665d4dd0897bcd34dde7a214b9e62533a1df6a1021f7028a22e78cd8f31a2515835c60ab492cff6e294a8fe
 DIST doctest-mode.el 75232 BLAKE2B aefe0953e66ebf5a3dd8a650a013af66d9eda41a496411012caf49098daa67d5576b5e1fb149cdfe4d088bc3342b83943676b58d088e685ee724875ab9aa0c15 SHA512 e32326644cb66bf5cfa9a597364a46b2279636368c751940eb418c670219cd907ecb60f6d2b6a8a4ec8970df4f17500be053b9fc6b75fece908dc37329d9aa9c
-EBUILD doctest-mode-0.4.ebuild 561 BLAKE2B 81607159b55c587befd60ff457f2cd718225560718a8bc5381f0b8b2448428004c5f61d9a482a24628ae8329de4082dfc941b4558ba55ca83851449b18f8faa4 SHA512 fe1f3a505fe25abedbf722817c2932ce41fc62ac49cdbecb7f255714d798f6c703bcc25f688fd6eb3d4cb017aeed4978015910e441e8a3e6bc48ad299a470652
+EBUILD doctest-mode-0.4.ebuild 559 BLAKE2B 0ff7595a157c5634c0f8816604d307c999fe0d7a0b64cdb9e8980372231d2420e345464c716fe2932f1f439380bf36fdba146ccfeb72ed99e44819d2781f1ec5 SHA512 e3ec9ceae6a0ac1bc4e427c784dddb635b934b649e3283ea879cc976b51a41a6241d7c5c5fe6277de2b49b273bdb7d5d0042176da4a46addf839c74a851a08ff
 MISC metadata.xml 365 BLAKE2B 0022a468707eac2f753ef622f03d99d41455cddb87c78bd0a33c33f9ad7f9b69900e7b5684859ee8630fd4f973f5dae806aee1fd6837102a826196c5c0e38fa2 SHA512 2965f445a0f0def6b42819c9f9cdbf1e739e20b4998d954e1065c09826e7eef2383735764fe50c99b811aad0736cf4a185095926e24712a94c272c278c3be4d7
diff --git a/app-emacs/doctest-mode/doctest-mode-0.4.ebuild b/app-emacs/doctest-mode/doctest-mode-0.4.ebuild
index 61bda5369fd0..a2b48e63f6f7 100644
--- a/app-emacs/doctest-mode/doctest-mode-0.4.ebuild
+++ b/app-emacs/doctest-mode/doctest-mode-0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://python-mode.svn.sourceforge.net/viewvc/*checkout*/python-mode/tr
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh x86"
+KEYWORDS="amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 x86"
 
 S="${WORKDIR}"
 SITEFILE="60${PN}-gentoo.el"
diff --git a/app-emacs/ebuild-mode/Manifest b/app-emacs/ebuild-mode/Manifest
index 51105f76dc9a..95e579b99e5a 100644
--- a/app-emacs/ebuild-mode/Manifest
+++ b/app-emacs/ebuild-mode/Manifest
@@ -1,8 +1,6 @@
 AUX 50ebuild-mode-gentoo-1.39.el 805 BLAKE2B 3cdb41677c5ef11ef6fb44001cc36b58f923c2be4090fe8635fa85d338af3d170b1ad3d6b2f31704cf24e1528d3ce9b6fd3d305c2e3c1b1923e345e011642307 SHA512 8038b7bac0f3322b1149467152790dac7cd133234afe7c362c0e14686e378bc27eaf432a7194e1748dda80b41483943facb44e1a66466ebdcb4e7a0768e8f629
-DIST ebuild-mode-1.47.tar.xz 34812 BLAKE2B abbc3be110239f9e1765d4f1293856a7fc616d497ac5256a28b7d78fc57c8d725abccbf7b9e5908cb85f9a684dc1be26ab88152d836c2ec3a481802091729717 SHA512 13ee756ef914a314f6705df78735a3926a50d156f4abeff917bed68298aec81f072d53a60f7b985d9bb2caddcdbf65fd26f6c9189e6c5c1822674d9142b7db17
-DIST ebuild-mode-1.48.tar.xz 34764 BLAKE2B cd54e8a1b65232538924aafd10f6dcadd457634313ccf08c97b841d0255f02496a0e3308a4d9cdcd5cbbc41f9f5c373e14641fa31202cfa369fd10f8562cf5da SHA512 d37d7951030877454416dca761c9775eadaa514f29bba8745f61c0f3a5ecb42675c230301286d5a8cce76d8ef7082f5db76151f69b35f6a999118c5e60a5f9c0
 DIST ebuild-mode-1.49.tar.xz 34632 BLAKE2B 3e7814363aedbb5a05193faccc0815a7f4b0f56eacb03fb720fa270ac69faa163bd8164639390b1703bb0a82341975e9bfea143c651b5b0ba2825b2bbb3b3329 SHA512 440e23aa6f63307955a9c970f5cbcc175eb14cca4ff4035da4f10fa22d9c6766b29ca7842b800a43c46063f3045c2ff3b2d6b8e27026f47bd0ed0959a8f2d0e9
-EBUILD ebuild-mode-1.47.ebuild 727 BLAKE2B a8e594c80ec7fe8e86a29a74a762506c9303dce4a4d36860e793b3a1b2baae281de4cf144c71b958078ad639952dc63faba1f4ca654ccbc65de37e260f05c060 SHA512 1f19485a513d11894e71d1e7540b69836510dd314e0d4d3e97eaec28faa7d25c1f30f9823151982fd1160075a3b5ef01a6be99a6e1a2e1a7a8eadb2f24d496b6
-EBUILD ebuild-mode-1.48.ebuild 736 BLAKE2B 1dd6bcc9f6ba1f972a0b2374863447e8e46a66c019e3fa654d38662564dd35633a19ade8333f77d6b9aa14da2b7915aeceecac9d1f93acbb28c7779f75ad5b65 SHA512 3c4ca27c2f9095c1dc9c3d9ee66b40995994e7f183376f0b9b6c59c6375bb4f8536da0d2f5eee8008b650c0eb3e4ba33c492c81fc0543c3e0d5bd8d83301ebfe
-EBUILD ebuild-mode-1.49.ebuild 728 BLAKE2B c37a3933d8652c4d45f7504f6cb419ae8529c85c77a71d4ba06c5667436886e20efe4cbe323b522260b9734c4765b2e819cca013c08446f03a08932a1f57e8dc SHA512 f22b65b248288dea270ca0793eee0a66dcbc116f86629482f609af4c0cf7577a69e092f6215ab23e842806d62376b1c7d6dcf07430b188663376e4f9f6f9296e
+DIST ebuild-mode-1.50.tar.xz 35440 BLAKE2B 281719a0a686ef1c80c8391cc118d14085ac6407dee5ee7ee44229bb529de041d31fcec7c08bb1e4b8b5057823c5d99a49a9786daa0b7b17a766155b7daaaecc SHA512 a7c232103848c7782a4ebad89e064f3bc37a78427228be799d8e1bd3670524b32050229ba7cd48d9e4c2b0bb32828ce95eb2e47038411591d03fa8f998614c1e
+EBUILD ebuild-mode-1.49.ebuild 729 BLAKE2B b9ef061e9ec7c6c86f6e273a8e14418c97d7b6f15e69c4d86d508a8d481181db11c8f1e803e6431d1c4d07d11cace5f2ff99d02781946f11be65a76196afedca SHA512 421366a5d630f2427c7e6ea0aac34bcae9aaf5f1761a06ed53dac7d27361b1494da86bccee90e57b0d52a21ad8302bdf28f8b13a161babc3212cbd184cf53ab2
+EBUILD ebuild-mode-1.50.ebuild 736 BLAKE2B b1354b8019cf64e7c06413dce30b50bbc56efd895acd85bfae1d1e20015ea0be6292bb0a782a637b71b460c7ca70b01babf525838412374dc2c2cc1fc21b0d8d SHA512 e661830c77df5a7e65924d598f02d67e17c71290038fdc352a5740e0f370cb70b98795a1a59670e7374ee4b3b7e232f51c30b340f4a733b2fddef2aaec2fd1bc
 MISC metadata.xml 426 BLAKE2B d0b4dc2bd01fc6fb2f0c58b01676b80d09a4677876adc9681c3c436ebc437b6b034187b19fea30cf980927fec1f6a9feee9a0b7d1a4dd15818d02e4c8ec77af6 SHA512 058df2768030185953c7ac3622819c430681eae3ca60b0d02ad48ed22ab6a0ac7c169d93f8f54a3dddcade3f84c9bf58f662a58bfd78217ea8fc27a580ab9077
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.47.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.47.ebuild
deleted file mode 100644
index c90f143aef6b..000000000000
--- a/app-emacs/ebuild-mode/ebuild-mode-1.47.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit elisp readme.gentoo-r1
-
-DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
-SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-BDEPEND="sys-apps/texinfo"
-
-DOCS="ChangeLog keyword-generation.sh"
-ELISP_TEXINFO="${PN}.texi"
-SITEFILE="50${PN}-gentoo-1.39.el"
-DOC_CONTENTS="Some optional features may require installation of additional
-	packages, like dev-python/docutils-glep for glep."
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.49.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.49.ebuild
index 002cda378759..50fe9824ef55 100644
--- a/app-emacs/ebuild-mode/ebuild-mode-1.49.ebuild
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.49.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 BDEPEND="sys-apps/texinfo"
 
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.48.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.50.ebuild
index d3f4d4b8fc71..648009bb8835 100644
--- a/app-emacs/ebuild-mode/ebuild-mode-1.48.ebuild
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.50.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/app-emacs/elscreen/Manifest b/app-emacs/elscreen/Manifest
index c1927cd221b5..a00c31221369 100644
--- a/app-emacs/elscreen/Manifest
+++ b/app-emacs/elscreen/Manifest
@@ -1,4 +1,4 @@
 AUX 50elscreen-gentoo-20180321.el 82 BLAKE2B 6f7d7f574bc931161a8baac7c4bd43165703c1b4102755950aaffabb2c09d42be3ce546c0c546ffc43a04f5c946f69e43f92d4d3137befb5a299c2542a331029 SHA512 cd303735ee0a8f293e0d0d5e3e7dafd01d398d6eb6cd8871d99e6727f4d3c06711572ef9a199055f639c2a44c1f8833fafde37f2c71ca92bffc4f7e2454ab2fd
 DIST elscreen-20180321.tar.gz 36840 BLAKE2B 7157a2040cb3d1bb60eb5c4f672dde35b5f1437a83a0af32138d252cfe44bf8a23013f5672182ece7f2dda5bfbe266247188d59408005d8963837d0958c100d3 SHA512 777835daf328aeddfd8999c37553bf5f57683292cea4f2fdca774e16d7a137ad26e791515000e8092c2ba5e4c2d0aeb03b260e4a2069c4f8a091b014d69ff201
-EBUILD elscreen-20180321.ebuild 767 BLAKE2B b9d41678b1b376c0998c336f2896083c91fc49a42f09fa571108fb84ef5c574101c6d80094e8adb42223ee4801d938992f3a3a57ec5846df519038e688031da7 SHA512 a570847879a85e6eb8e3dc1d21505aa777e10aa46d00b01e5232c57d658680a12c799ebf64139f56066f401657e00f8e8eb0b618ac46d6c15a4775a87769ad8e
+EBUILD elscreen-20180321.ebuild 768 BLAKE2B 160be74da6f71659452f964332ca1f9df5ff821322a634460dc8a2209d3d59cd7b8e9372145c35c08713a5c3f13dad4758b2c36f7e84e2c627c141dddbbd3fc9 SHA512 902dd122c3177ee1ef8b260c11a924a8979bc34dd84935b937fec8048de642ec35613b8b41b2c0d887c2ccf5478348f5ea90c2f10f5b19fa74306f67682c543c
 MISC metadata.xml 1188 BLAKE2B bbd91c8e116ead86174542013b33e6e83d1a464d96191e76619ec31e6c325390bb8516e70c4f81d4e73a98149be619b466ec62aa61178692c1de57b110699017 SHA512 736c8159defd57e17f46623187edb72f03fad76723062a4de6714d45fb1568838109754e735fd691ee9cfcfcb70c1223d641e112f6fcda74e5b84133cb4bdc08
diff --git a/app-emacs/elscreen/elscreen-20180321.ebuild b/app-emacs/elscreen/elscreen-20180321.ebuild
index 53e0bdc32856..dfa4872cb5cc 100644
--- a/app-emacs/elscreen/elscreen-20180321.ebuild
+++ b/app-emacs/elscreen/elscreen-20180321.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/knu/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE="wanderlust"
 
 RDEPEND="wanderlust? ( app-emacs/wanderlust )"
diff --git a/app-emacs/emacs-common-gentoo/Manifest b/app-emacs/emacs-common-gentoo/Manifest
index 0b885b97c789..646db9cf6465 100644
--- a/app-emacs/emacs-common-gentoo/Manifest
+++ b/app-emacs/emacs-common-gentoo/Manifest
@@ -1,3 +1,3 @@
 DIST emacs-common-gentoo-1.6.tar.xz 61224 BLAKE2B 70e4f30c26c9098fdb02a53cab5d60cb611143d8bac6947707f3c7596b5a81ceb513b5a0809ee90f351472824f1d4216720c02cadb51d25b3dfce5e436e02bdf SHA512 a7daed2241d778ab283482ecc016801e25084eed10fcbbc50e187d5f842df5a0d278a77f94ae950b086c8651e8ca1a18f89c11dffdde9cf9168755288aae926a
-EBUILD emacs-common-gentoo-1.6-r3.ebuild 2830 BLAKE2B 22f4692303b67373e78c588ab938588b92d46fa97515a71515acfb83b66922ac0856a327a231738b314200c962b68d1a398c8de6a17516e8b5c225b1f84c0813 SHA512 783e05d7d6e1a6becfc006b6ed8a1c8293235d0ac06fccc7ec6ab1ac0a75be554fb1793a18df911657db8b7e63776fec36d4eb55210b54ffffd77e0d863de8c5
+EBUILD emacs-common-gentoo-1.6-r3.ebuild 2828 BLAKE2B dbc4d8ec3187bc14e261b5cf5a522a9464da7c06e0efc9541711cd4e4dfdedf2e884ea572729f7418b8abf7f0501d92c029e884aead02cb27a31c37ddf5a4b71 SHA512 aeff68e4854b72c2028335708533f56b50e5f3a23e40150b97d003741caf9b1fa6e9e03ad7079e76ca1e57629ce3088a79f412d2c3a9397464644937e097de99
 MISC metadata.xml 360 BLAKE2B e7e420afb7a8377bffcf2a23f3954bbf4cc80fcd19a8514733e2e0164f4235271e21dc860bf77cb9cfcd1a4026ef3dafe97a10dc397e2d8e6f001f02bf6e9bc7 SHA512 d57f8f097617229f774b06437aaa83595aab2a6d9321d51b97dac8bd56fa94db396c7bdca538570f0912390e25ae8643c5adc374908757f67f1422fa1f872605
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r3.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r3.ebuild
index e5b92a66d627..2b9b81915b24 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r3.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="games X"
 
 RDEPEND="games? ( acct-group/gamestat )"
diff --git a/app-emacs/emacs-daemon/Manifest b/app-emacs/emacs-daemon/Manifest
index dc90568e4192..0af25fe921fe 100644
--- a/app-emacs/emacs-daemon/Manifest
+++ b/app-emacs/emacs-daemon/Manifest
@@ -1,3 +1,3 @@
 DIST emacs-daemon-0.22.tar.xz 5276 BLAKE2B a866b14951df94e1d382253dcb7045beb800c9dd754f7eed40eadecde43fd583bb2bc20ad9ccc9f87174b06aadbb26f7875deaf36d9bb5325f98ffa58fded8c7 SHA512 f013cd00d3a24ca348bf718dd20dec7bea89107c0a27c921d6b58595b611991830604fc658d57681708218fbee1dae6dd0b277a2a9da67639e3553e0fd133094
-EBUILD emacs-daemon-0.22.ebuild 1613 BLAKE2B 6ea1d2fe3a4f9724ac251f15027aeae8be4cee02f56a28ebef86fe56ef27fad18f5c164dab7f9a1dd28c7a99df91bbc17f704ff52244549db59ff97126005a8a SHA512 d7a8d01a2c321bce3353176731915ac654e6530f6a924d797cf86ca27a1ee4a5db81c49607030f86e680088baaa8f7abcf0da4bcd85f37af5b8c6926598e93bf
+EBUILD emacs-daemon-0.22.ebuild 1611 BLAKE2B 658d3d3e0b2d2e66f7dfc6f0d1d97dbda36c58354a78a7ba0faf9ae5ef04bb7f74ae19e61c1122978ad2f848c47147042d491aa4197554e65648d012b410c549 SHA512 dc2a84098fb0eee23005e9490f29ee8f72d96725fe6442d298580db91acf8ea8f8480b53290d1ac95a15b60ebec411b3f26fcd8632929cd26472e67fba08e561
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/emacs-daemon/emacs-daemon-0.22.ebuild b/app-emacs/emacs-daemon/emacs-daemon-0.22.ebuild
index cc425223b2d3..f22b98276df5 100644
--- a/app-emacs/emacs-daemon/emacs-daemon-0.22.ebuild
+++ b/app-emacs/emacs-daemon/emacs-daemon-0.22.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 SITEFILE="10${PN}-gentoo.el"
 
diff --git a/app-emacs/eselect-mode/Manifest b/app-emacs/eselect-mode/Manifest
index 7f639e03bb31..45f6e59503a7 100644
--- a/app-emacs/eselect-mode/Manifest
+++ b/app-emacs/eselect-mode/Manifest
@@ -1,9 +1,7 @@
 AUX 50eselect-mode-gentoo.el 178 BLAKE2B 50fea27e7add6d31f37801593430154636bb58ac6e3f7cc44c68a16d49c9156cf37285778a38bf97a1f4805a22d6d5cf9d597acdcdedfd77c62a5825a0d1d88f SHA512 200da398adf72241112bcda74b432a8a313cf29018c9f6fbdf6021674b23a201ada6ba884d4c9c3a4ee4c042d6c8fc7c3ba59702c8ddb6ea20b652f9ded9d32f
-DIST eselect-1.4.14.tar.xz 177492 BLAKE2B 236ddb09231283a153c20be779d012979a25d42a7043c75af866e777731761406d92896bfef399c3bc63e529af4e36cf538801302dc4bb719f065d6bab8ad9e4 SHA512 b17fb63039577f20515056fae1b0f7e86fa2d96f38a5eec22e637cee0b25f4d68087ef8a5bd4043893db5be66ea201bc8ae6437bb049d208b81e76a57612d658
 DIST eselect-1.4.15.tar.xz 178996 BLAKE2B 4354d975c8af2e1de0f0c6efe2badc92584e947f9b73c05aac144caf8f9d74c850d366c7c225112322a504262b5f285f6e2e8d32223f1b2d4bac87db740a148c SHA512 ceb55fecc2bf70e816679af9b20653b29aa9ce24ca2d4cd0c6e02ab214689459bc2ccd5b3968ac49249b8fb6613c6055e7e76598b86c6a114a9abf847c4a2b58
 DIST eselect-1.4.16.tar.xz 178660 BLAKE2B dae97ee324cb67983c5395b5dc54c4b84d2da43f6a0c5c8ab81ff402ab211e9d1f1d3fe5c174b130ac1e11d3dd19e3812056274145415ee029e649cda880cd95 SHA512 264fb6122f5f7c9e73bb2250a94c3c0377e5263e2e5ae653ed58e08ebf6ed1b4aa165ae5c1d70b0156081c4db5672d1ec9d379782919d5b40a2f3e862378ce62
-EBUILD eselect-mode-1.4.14.ebuild 548 BLAKE2B 753ac5c66a491bb07b0278ebb618563ce87499c73fefc18f62fdd6cc50849c0dccf0dd3fa7ff99a250bd23f1b91a4596324bd985adc72b59deed5208f4a49c1f SHA512 ba8f9d47877b86a5c32ae09879b727878d694d5ae3c9e2f6d3b0ec44277e9ae04f8328364005fd378e5a0d33717f8e212f9652fcc163cc57429ac6f3468863de
-EBUILD eselect-mode-1.4.15.ebuild 551 BLAKE2B 0aa906eaddc159723466f8cae39c4fa4cbf5e46291be9e35aad98654019e6b90b5cf83b9475df72283a5f06331e797b1ed29b9cc9f3d3294c86cc59ca5e7f6af SHA512 380fdad3ce529766c18e622efab24f75f24ab1f2c7f30d56323d0c92aed9c1314665025a63a1dbce06090d493d3a91216ea00598afddeb75eee45b52db7ad1f0
-EBUILD eselect-mode-1.4.16.ebuild 560 BLAKE2B cd1dcda2f1af6632d9347ef5092ad1e1885290904255155c96122a5937bacc44e6742a05dc59481ba08dacceeb9ae44795a20d1e389b8690c4d5e96ef0bdfe79 SHA512 ea79e99c72b48aaa1d7387b7d18dd9665becd3839bfefd0a123a5b737c14c4e7e1b43766dedff992ef278ddd7c9df09762db7ea7f165c596667982e94efcb318
+EBUILD eselect-mode-1.4.15.ebuild 549 BLAKE2B 7697ff1501986aba8748b59b9dcca6cd3265c5478eebad7ddc033c3ebf3ddb56780d44939f18ee62ad8b8c43b00321291dd4ce770e274dcb1d208c9bf869c9ab SHA512 72559257846151ff2f9e14ed953ec3d1e0effa8d9111e6558ccd64c5dd412fd8d7c1813a24c2009cb129f5113842f6867497ec9682e4f25f100b6d61f06e3918
+EBUILD eselect-mode-1.4.16.ebuild 549 BLAKE2B 7697ff1501986aba8748b59b9dcca6cd3265c5478eebad7ddc033c3ebf3ddb56780d44939f18ee62ad8b8c43b00321291dd4ce770e274dcb1d208c9bf869c9ab SHA512 72559257846151ff2f9e14ed953ec3d1e0effa8d9111e6558ccd64c5dd412fd8d7c1813a24c2009cb129f5113842f6867497ec9682e4f25f100b6d61f06e3918
 EBUILD eselect-mode-9999.ebuild 458 BLAKE2B 0a5b748fc09dbfe532ec9b40adbbb939bd5150ecac9ee610ad0dc5b37e7b6ccdcb8c183337d6f0ce04ee5bfad4f1ede0c13cc4dc55c828474b07265fd91ffba3 SHA512 5d11532145273d6956274ce05d732352593a20daa1d86f900b1fa9927aa536131e5ec922996f4e3939803253e5649f6c2a3ec9a81dabd6dac0475422cf0a4ceb
 MISC metadata.xml 449 BLAKE2B 711e97a9feb5a464b81a738024f1f8b1ea4dcf2dab78f1e814fcb30569df5a3192cc6e72308687bffd9f7c806f3ce37ef62856f86737d3e8aa4334f721a2fd7b SHA512 38b645859453423cb80be836dc712364d5650f07f071c44d07ad7f5f629b8efd0d26535ebf61e8c38281e8426109ef5828015e01b3377486ab28f942163d155b
diff --git a/app-emacs/eselect-mode/eselect-mode-1.4.14.ebuild b/app-emacs/eselect-mode/eselect-mode-1.4.14.ebuild
deleted file mode 100644
index 2262a495ef51..000000000000
--- a/app-emacs/eselect-mode/eselect-mode-1.4.14.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp
-
-MY_P="eselect-${PV}"
-DESCRIPTION="Emacs major mode for editing eselect files"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Eselect"
-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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-S="${WORKDIR}/${MY_P}/misc"
-SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/eselect-mode/eselect-mode-1.4.15.ebuild b/app-emacs/eselect-mode/eselect-mode-1.4.15.ebuild
index 6e07032bf856..faa2337419ab 100644
--- a/app-emacs/eselect-mode/eselect-mode-1.4.15.ebuild
+++ b/app-emacs/eselect-mode/eselect-mode-1.4.15.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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 S="${WORKDIR}/${MY_P}/misc"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/eselect-mode/eselect-mode-1.4.16.ebuild b/app-emacs/eselect-mode/eselect-mode-1.4.16.ebuild
index aff09f42da95..faa2337419ab 100644
--- a/app-emacs/eselect-mode/eselect-mode-1.4.16.ebuild
+++ b/app-emacs/eselect-mode/eselect-mode-1.4.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 S="${WORKDIR}/${MY_P}/misc"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/gnuplot-mode/Manifest b/app-emacs/gnuplot-mode/Manifest
index c7111fd2796a..dd12a8e28be2 100644
--- a/app-emacs/gnuplot-mode/Manifest
+++ b/app-emacs/gnuplot-mode/Manifest
@@ -1,4 +1,4 @@
 AUX 50gnuplot-mode-gentoo.el 347 BLAKE2B 6a72d3ac75c8ef7629b8c018f9652b924137f56feb7c1578d7d5b572846bb22b248ae569412e7d9f6969ce6daca4aa21debccac7b7d5b63c4c66b04959d72836 SHA512 eb342c60bee1a9e45a50373093207545b8b37888432b082afb7c4f0911eed08481379094ee5a73888a03a12898c3c41016c2d9161f92a1a7cf7be7f2010c1c83
 DIST gnuplot-mode-0.7.0.tar.gz 373475 BLAKE2B 6aa547b90922fa445de10825ae8f0c05249a335a1cc531118200bc49c4b62f610e07a7c5bd694a3c6bf6605b937a520a8008d67263d2e83cabf009fb855e7a97 SHA512 fdf04a3a32755892d422de8a535682ff44d1b635ecdc814738564376f5c7027a82c23807439835f2b7bf959f4f8b7a7d38d07a643f84ab2056ba187f3558e596
-EBUILD gnuplot-mode-0.7.0.ebuild 1000 BLAKE2B d0a77e6a121313e1f255699a9a25cdc01beee61d0d284460314c3e92e9798b0ed215c5e8cf98d5b8dae57256be77778d806c11a870c5fbd5cb400d361bc7517d SHA512 827b85ed02c8446cdd1f91cbf0f30c15832a33ce6706c87ded319a31a08aeb998a6569e329e4c210792919b4cb469b6512b5c15b4e28ce84a8da8eaf9cbcb4b3
+EBUILD gnuplot-mode-0.7.0.ebuild 1001 BLAKE2B f5dae87c96ca30866f49d99cde2e034f496f35e45ceb079dbb2ef73bf2c2aa4a82c7be2ed2b4ce787b455b08557ed3d525d8f59c8c2967d7398727d5895eea33 SHA512 2b17660d39948db13923c4bcee6a47b7d3067a76d3bfa5f5294c5334161020b98df37188ea2b86dd7e9fc2087abdd67fafa3e86131f6712b4fadc08506708413
 MISC metadata.xml 368 BLAKE2B b1313c69a215b2231db94ed717741bcc3a771b183736a92c8fc81494eeb50fd634572c1dfa550acee7b182f6e587d0fa401738b8bf40403ae92ae37468f24fd5 SHA512 631de1c715d46e3ec59a3e973a508ac4686749f2d2929ec50a17f53c4f7f0615b08a539ea84ca88eb541bd2217817fd47c4941a97a25ac6a2b132ee776041191
diff --git a/app-emacs/gnuplot-mode/gnuplot-mode-0.7.0.ebuild b/app-emacs/gnuplot-mode/gnuplot-mode-0.7.0.ebuild
index fcfb99af0b69..2d97b4b2e684 100644
--- a/app-emacs/gnuplot-mode/gnuplot-mode-0.7.0.ebuild
+++ b/app-emacs/gnuplot-mode/gnuplot-mode-0.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/bruceravel/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc"
 
 DEPEND="doc? ( virtual/latex-base )"
diff --git a/app-emacs/lua-mode/Manifest b/app-emacs/lua-mode/Manifest
index 2a055bc303fd..2f5e366a1f54 100644
--- a/app-emacs/lua-mode/Manifest
+++ b/app-emacs/lua-mode/Manifest
@@ -1,4 +1,4 @@
 AUX 50lua-mode-gentoo.el 206 BLAKE2B 07efd36ded1a442c754102c22bea97ee4bffc2c89e40fbef2d8e644051766da13da6b0d2034f3a4e27fa1522949ff351a1105651d79d9005bf38dddd4bea6577 SHA512 b062343ab77dcaa50355498a63681c8e5bc6f209b1aa5ef82d65be8c19aa52d58c2efcd481f091804726b095a02b97de5b6cbce232ee5d9f328c5e3d888b496b
 DIST lua-mode-20151025.tar.gz 35319 BLAKE2B d84c79622793c51caf7262749d4648baa106f7a2d639706b495097d89fbe8f3ce09482ca12a0473e4a4eaf04cab83ee8b65d62e505b32b12302571efdd1881d4 SHA512 1b2877ba9ba24694b2a820a4e1408d0f475f04bdee424d346fc2248980863aaaf230f757365095304cda763addb32de7e6a2585218770f66d519455d1a32762d
-EBUILD lua-mode-20151025.ebuild 646 BLAKE2B bfabe66131cf53864a285c84d1b2bdd0e6bbe0c7e0e6fd2768acd37a178c0e3f3f225f4562518f2a977041b4e99da588abf9ab992dbc02349c3bbf5ae0d701f8 SHA512 9dcb1d6df183cb995b8b089f074f1dca2708478e67fbb7c675d0260de0d35e2e54d8e080d836227279efe8e896793b7c35f904a2f1d80732bb743e16f6b5d56b
+EBUILD lua-mode-20151025.ebuild 645 BLAKE2B 8d28cea4ab2c1b25b701e5199b1d6ed0afd956e6a1ff4b98857e2a3a52cb5b91142ef414d849de45aef81679ef786087286c452d01e5cb85568a1b8635df5163 SHA512 87453327fbcf94ab575d8069ed39dfbf6a68da8f1e44ade717ee8760d524b847bae4c8b5e016855d855cb647f1b76c6f7c1778b3fef2c0d9272bf3a6e3d4e04f
 MISC metadata.xml 361 BLAKE2B 4953692a3d3c19f162a539ae4167f16289c569f8c379e09f46423556bb8bf5335e95c5a125a29fcabdbf762405920a4d97c4920c304560688d617be0badcb69a SHA512 e7d96df1fb7a061ecba903b1e2ee997a93801e8d367f7b7b6c1394a8366f05e4fe001d96a08496559f16187ad93d21055b93a52ab4afce9631a179635e4e78d1
diff --git a/app-emacs/lua-mode/lua-mode-20151025.ebuild b/app-emacs/lua-mode/lua-mode-20151025.ebuild
index b871d8248c5e..bb8ae68887c9 100644
--- a/app-emacs/lua-mode/lua-mode-20151025.ebuild
+++ b/app-emacs/lua-mode/lua-mode-20151025.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/immerrr/${PN}/archive/rel-${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 RESTRICT="test"		# tests require cask which isn't packaged yet
 
 S="${WORKDIR}/${PN}-rel-${PV}"
diff --git a/app-emacs/lyskom-elisp-client/Manifest b/app-emacs/lyskom-elisp-client/Manifest
index afb515c376fa..dc47dfda181e 100644
--- a/app-emacs/lyskom-elisp-client/Manifest
+++ b/app-emacs/lyskom-elisp-client/Manifest
@@ -3,5 +3,5 @@ AUX lyskom-elisp-client-0.48_p20161231-no-git.patch 898 BLAKE2B 77719e2cf527fd91
 DIST lyskom-elisp-client-0.48_p20180410.tar.xz 889468 BLAKE2B b8a1766b6f6b1d4b01676792f45d66517cdc43d2e29ae6e5b0704b90e4dfc749f8e4155159fd28a25426d79502bcaf7f2cbded32b2e64e22b2b36f11cbdbd123 SHA512 efb04b2100d59fac971898a6db3e48cf45e3bdc4455f06a0cdd065a97db5441edd4eda2e838a5e88c0b0246387dba0e3f71777892b3a6889c51960f0259fbdfc
 DIST lyskom-elisp-client-0.48_p20200226.tar.xz 896372 BLAKE2B e9d2c7db2cbce40fa48a788c09db052ff819db2cb00848c735646c8d6fc72ea808c03881295bf91d5cb37ce63ceebf6d4537674b9a87946c75a0a92c613eb37b SHA512 901257ef054e5700038cc59712d02e855920851782bf0d44090e1db500f545fee44e47c70c8036bb29a92056c2e72ff48ac518ccdb36ab84c18a6ac18e309529
 EBUILD lyskom-elisp-client-0.48_p20180410.ebuild 1196 BLAKE2B fb057585bbf00cc0ae59e235cf4d85ae0ba97723f821883eb76436ae29c4a44a2a3b2faf6c01b0507f7d41da36047fd47b616b57805936229c6cbabdb9b4f3c1 SHA512 254bd3d5c15eeeeae13643e88bce7330cf0e3f3b68c7dd3d93a0bd7be9fb9d8cf545671481ce2764afb5b4476ef24abf05f2556ef38a01d49c8aa4dc48ad79d4
-EBUILD lyskom-elisp-client-0.48_p20200226.ebuild 1196 BLAKE2B 52af8909bb706aadbc8354899f486d6b95f64b93c5aeac94d750fdb763645aef792efc60ba12d2e5f3d45055f6a77534bdb80509966a2cde86c7385a544bb7de SHA512 b66849fc90038a814ef76ab4c8ee23d19ff3afc1fefa4f94ecfc5f39d05c6fa57239e3c91399d9e820a0df15dead580ada3153c64f30d1eab43d1eda46a0f88a
+EBUILD lyskom-elisp-client-0.48_p20200226.ebuild 1193 BLAKE2B d13782df523463417be582eed8b407ec492db03b7d276dba7b2f414def83e6f2baa13778ccdd9d32856e2e2b2edba8aed46e7b01a1b0fe34d824d7f2fe78c22a SHA512 b49e695cff8b453f39325850e3ca4c84dc852c735156e8d3ee3beed7d2bbf09ae871e5a96f5fc7ae57d9ea12f30197a478a371a7310af1ae688ed87e8a3f0102
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/lyskom-elisp-client/lyskom-elisp-client-0.48_p20200226.ebuild b/app-emacs/lyskom-elisp-client/lyskom-elisp-client-0.48_p20200226.ebuild
index ba69615e7276..5205db882cb7 100644
--- a/app-emacs/lyskom-elisp-client/lyskom-elisp-client-0.48_p20200226.ebuild
+++ b/app-emacs/lyskom-elisp-client/lyskom-elisp-client-0.48_p20200226.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="amd64 sparc x86"
 IUSE="l10n_sv"
 
 S="${WORKDIR}/${PN}"
diff --git a/app-emacs/meson-mode/Manifest b/app-emacs/meson-mode/Manifest
new file mode 100644
index 000000000000..4e56f2755799
--- /dev/null
+++ b/app-emacs/meson-mode/Manifest
@@ -0,0 +1,4 @@
+AUX 50meson-mode-gentoo.el 218 BLAKE2B 05d454f80820e17a4b9f74fae44f024568b86fc0e4261fbb129b5bf38c72f9ecabf62dce62e1f29eb46f6dc422f8aac266477eeff7289cde7cb8bf17bec79f9e SHA512 bd6d2646490fe3860595e573b79fb04b76f04cf17efa3f5f743912dc40880f397b828459f385196db755219f1b4760a16c5e54a902c7eefe7e631b8ed18788f0
+DIST meson-mode-0.2.tar.gz 28194 BLAKE2B a11b7659dfb7883a624706ee3a80ab2de69c3f3830d363a767e2a2fc644a9d1d946269a7d30af4ec93180341807519e5bf0bd55e1500513076e7aa07e0ec888b SHA512 05a9554f2ff1520834648ef6b7c27d09d5f9355fe980d19a67eba39e1e0a4a402e64284e17c6d544b8e95bdee3e204b79d73c6166d6d8c48683036821bad532f
+EBUILD meson-mode-0.2-r1.ebuild 434 BLAKE2B 689c2c2143ce8cd3827dd6c2294380b2d49a4f719628b3e18c63c79767b81882ff599446210b498d061336265b894f1e21a710d3afd80a6f9cd98fadb3238ac2 SHA512 9c4ced0c9128f9dd4d0459ccd89ceafa3fd344581d1c763ff88e9dcd12f246dbc414800dd819b2bcb90088dbbd51f2b21a63f52431bc3cf2aae5bcf14e5cb38b
+MISC metadata.xml 353 BLAKE2B 912fc0f45ddc967120eb5dbfc95a69660b9538d7db04dce68c433a7f86e96a07c7ac5bc10a1642a14a32e16799c42f28d0bb1ab6debab193234f13a7c6ace229 SHA512 6bae7e341fa9a63f1ccd204a1c7ad869984c7bf088b016eb50ac0368da8265750af60edc9c22942c66cb11fd045b35c6112233e17731024211b82da98a902098
diff --git a/app-emacs/meson-mode/files/50meson-mode-gentoo.el b/app-emacs/meson-mode/files/50meson-mode-gentoo.el
new file mode 100644
index 000000000000..e1a3b4991dab
--- /dev/null
+++ b/app-emacs/meson-mode/files/50meson-mode-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'meson-mode "meson-mode"
+  "Major mode for editing Meson build-system files" t)
+(add-to-list 'auto-mode-alist '("/meson\\(\\.build\\|_options\\.txt\\)\\'" . meson-mode))
diff --git a/app-emacs/meson-mode/meson-mode-0.2-r1.ebuild b/app-emacs/meson-mode/meson-mode-0.2-r1.ebuild
new file mode 100644
index 000000000000..4280da270001
--- /dev/null
+++ b/app-emacs/meson-mode/meson-mode-0.2-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+NEED_EMACS=24
+inherit elisp
+
+DESCRIPTION="A GNU Emacs major mode for Meson build-system files"
+HOMEPAGE="https://github.com/wentasah/meson-mode"
+SRC_URI="https://github.com/wentasah/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DOCS=( README.md )
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/meson-mode/metadata.xml b/app-emacs/meson-mode/metadata.xml
new file mode 100644
index 000000000000..cfebf4666da4
--- /dev/null
+++ b/app-emacs/meson-mode/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">wentasah/meson-mode</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-emacs/nxml-gentoo-schemas/Manifest b/app-emacs/nxml-gentoo-schemas/Manifest
index 82035508d4f6..7a667734d4c7 100644
--- a/app-emacs/nxml-gentoo-schemas/Manifest
+++ b/app-emacs/nxml-gentoo-schemas/Manifest
@@ -1,8 +1,8 @@
 AUX 60nxml-gentoo-schemas-gentoo.el 206 BLAKE2B ae9d1fe1da9c86d14796c09597ca34b10dd0e28abb02fdeac4607b8d950bfdf636f5f3c1de49cd5b9cf1fa808513522ab43272f3c26361b871ad0d630a942ed6 SHA512 5592edb5663066fcccaf5b05c3df671b4069d4d259376a8a91ef3f7ae5990687b15dfdf40e6f7aa6cc7d62b7cdaa5090fd851de0ed2718d20ecfe3e3a78530ea
 DIST nxml-gentoo-schemas-20180611.tar.xz 11572 BLAKE2B e8a573e79d9531d676b8c52ba9c2869f765e6bb0326f3f00c99dd3ecfd19af6eaedbb06ddf84ae541690962a5e67b87726d6cc90a3bf7dd6d805b5c2c96b6321 SHA512 8473233141a56935e41a9d0371501f3fe055b21600746db29e14ec91d12a43da595e500a876eea8cdddd885358df0825055143e901eb599a2fcbac7147a04fa8
 DIST nxml-gentoo-schemas-20200109.tar.xz 8672 BLAKE2B 8b27e334e0d4aa6d7ca2d85dfacf320fbc6f8ce6d801c2f0c8a12991b7346a8d9f6977d5071b409bdd059e29209130deb90a36556c58d1f98fad55e92e2be7bc SHA512 afbe78b4323ca6cd7a0f5855f0c29e65caed7f6587378cee66da284e3782035fea59171bd28dcd402ffbb65fbcb9261e4a2ed2abfd41b05d6581ae29f6852519
-DIST nxml-gentoo-schemas-20200229.tar.xz 8448 BLAKE2B 2883821546f9243491fd88d56cce6e2acd87de8650cfb8ec4cca25b44cfc2465e521f3ae5d00ed0c7e6d0c8b4785e7e08a43990ac48a178fda036ca3e805be88 SHA512 8c587e19b80fc766989e09d255a3f349c35e373b44607b757b7594dfb4daef0ac11d5724a43f1672226b8922b07112f076649d83e1eb6623012b320653f5c815
+DIST nxml-gentoo-schemas-20200303.tar.xz 8452 BLAKE2B bee7e3d58b03e3aaefcd09d93a9b6919ae6b4892ac09e218ac68cbbc048e28def8b49cc4c583ddad04da61d61bb76386f0c0f33e12d2c8a938447e3f590854d5 SHA512 42f8ee48e349423db156d585bdd2c1d333f69693ac541bc44f8c1d0bae412b1793e1d86fc527287225040aa9b4b791ad2922196cf750de6029b4c77eebdc62de
 EBUILD nxml-gentoo-schemas-20180611.ebuild 569 BLAKE2B 789267b1c9eb33374439e3bf4b3b212588c465b2b6a02c5da65ca8762a9ef6371364bc0bb31532cf7cc17d60495c73a52bc09f2767227f59a0758f3b4f2c86eb SHA512 272b38d9d09a1089dee357a80c780e4cc2ba14d50301d5d9c57a30cbff41db26865ecac9c9ffb209843aec46c6b63cdae767757c09eabd97aeedf03bb507320e
-EBUILD nxml-gentoo-schemas-20200109.ebuild 586 BLAKE2B 4638f7aca301716114112c94c7bce91795457dc079ad20fa54d03c0244967d72a4a944a628bf78e89dc6020d1c288b197cd3108190eabd03992afdfbb7f87388 SHA512 a5f7641532efd9a8df41a14aafbb5fe374b406c9ee4f20e9eadf0ea097a80cfc59b256a5e946d5f3a97142c650cdf8c47554c8b235a4cfc3177ee301d27de76e
-EBUILD nxml-gentoo-schemas-20200229.ebuild 595 BLAKE2B 7d6be323552ba34442df175900bc880fb0323ba6575ab5fdd7da0ecbf3530e80ba29aa512ba725ce473cedb9f14733b3d6c764765b86228f2f2e4c58e9d13342 SHA512 233025dea5bc9de2bfc33e5ff92a9c9c6714dd3979e07e2d738dd5df4bc64590af8de067d189b0724ae8b6bf5d5207a060dc9928b7813784482a8cf1a9406377
+EBUILD nxml-gentoo-schemas-20200109.ebuild 588 BLAKE2B e5bf9c11b375b4574a56c5c55cba78f768cc69cad53488b301066708a3903ee39c46ba01be0db7ca817f80c166ba852144f2a4732ab8f6286337d1325a44315a SHA512 b1ccc6b566c6593c4946b054b16b441c668cc54cee53de9841d27f4195a08dc8f066328b0c92ae7dd17a94d73b720c94457767f114d29ad3c30d1aff6420f801
+EBUILD nxml-gentoo-schemas-20200303.ebuild 595 BLAKE2B 7d6be323552ba34442df175900bc880fb0323ba6575ab5fdd7da0ecbf3530e80ba29aa512ba725ce473cedb9f14733b3d6c764765b86228f2f2e4c58e9d13342 SHA512 233025dea5bc9de2bfc33e5ff92a9c9c6714dd3979e07e2d738dd5df4bc64590af8de067d189b0724ae8b6bf5d5207a060dc9928b7813784482a8cf1a9406377
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20200109.ebuild b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20200109.ebuild
index b5c738bdd165..04efebe9c919 100644
--- a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20200109.ebuild
+++ b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20200109.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 SITEFILE="60${PN}-gentoo.el"
 
diff --git a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20200229.ebuild b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20200303.ebuild
index 51c686ff5574..51c686ff5574 100644
--- a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20200229.ebuild
+++ b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20200303.ebuild
diff --git a/app-emacs/ocaml-mode/Manifest b/app-emacs/ocaml-mode/Manifest
index 7819c259a282..610ac7145519 100644
--- a/app-emacs/ocaml-mode/Manifest
+++ b/app-emacs/ocaml-mode/Manifest
@@ -1,4 +1,4 @@
 AUX 50ocaml-mode-gentoo-3.12.1.el 499 BLAKE2B 30d49a4e43fbf4fac02f4a2dd8a9fe7c3aeea623836330e3ed0f8921cc96a02d087f35a32a93f6e404392a1f915539799d1a5c8168b06cb1d8ab76ea0ac6b8fa SHA512 0be69a30c07caeff818e4d6fb0147e18855e88a3bb6a6e876b170edddb32382c0bd19ca960836d8442eecd00e78be09cba7de08030420645c2ef1ba5d9198524
 DIST ocaml-4.05.0.tar.gz 4431750 BLAKE2B c2ab003a13e0a581ebd0e1c96eeb8a9baea9bfe6bee08823b0e4541819201ec109f1846e13fc1aefa51a001eefbb8f73320ba854d41975fc68cef41bc75b1ecc SHA512 9a060ae4b741e1687277403e5bdb8f6eda2e2ebf6c45f7c0149b66ea1213cb26d13febfbb3f11c12543e244cfdd053b786b09c4145e2348e5d89a7206f7de225
-EBUILD ocaml-mode-4.05.0.ebuild 502 BLAKE2B 2d7bec57147444b24ea942bb4010592d1a8ee76d626598a7cfb3ee296809cd3112eee5498879ea4c98a83be0848d39b4a5cc9dadf39ca753b8d2bdcf89a03947 SHA512 4a53ca1367c5550e90e7f6207ad479e23e825808bd574ff08dfa739aa34cf7ee254e9ef8825cf83ae312416db458f3d51ddd5a19e4c8b198e93b9176657819a2
+EBUILD ocaml-mode-4.05.0.ebuild 504 BLAKE2B f67f65b745ce2fdc5392a19201a66a65a7ac8186f9f5b5f284fd79c510ad13ac16817b795c8c7116c992d1632ee0a35946fbf141df0178c9dcf273edeb478d96 SHA512 db3855fb0938cdedb4c13dc40b909cfe683b602a2b574ce7d82c09fe3d6c5b7e74cacf28cce796fb55c520b04940ce7a3b2987fd56f9c0e3148a33123eb6737b
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/ocaml-mode/ocaml-mode-4.05.0.ebuild b/app-emacs/ocaml-mode/ocaml-mode-4.05.0.ebuild
index 952edacb6da9..2ee616fb4445 100644
--- a/app-emacs/ocaml-mode/ocaml-mode-4.05.0.ebuild
+++ b/app-emacs/ocaml-mode/ocaml-mode-4.05.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 S="${WORKDIR}/${MY_P}/emacs"
 SITEFILE="50${PN}-gentoo-3.12.1.el"
diff --git a/app-emacs/po-mode/Manifest b/app-emacs/po-mode/Manifest
index eb5c16c8d53f..77e5c8205ecb 100644
--- a/app-emacs/po-mode/Manifest
+++ b/app-emacs/po-mode/Manifest
@@ -1,4 +1,4 @@
 AUX 50po-mode-gentoo.el 373 BLAKE2B dedf37969c42ac3dbeb4b4cb01af0f9ee79e40aad8586831503bebc1192a110fbecdc0bba339ebe6d7f89a8509e4f6df52f98f7563a90f31d73af279aad81e66 SHA512 48c371afe3f1a1f033ea20cb0a60bc700414108f7dc1f235e62423bda9b94373e49da9bdd3ab76e119b7b6c1b5f0a7601d36ce2710dd23b3de46557cf7d9cd8d
 DIST gettext-0.20.1.tar.gz 23267473 BLAKE2B 34e776b985c7db105f8029e0f3400aa645ff6843cd35f778d48450368a31218ddcf590fbc7fd2d10f716b63094d6a15bf40b358e8a6f498d450d2420e7e7a5f2 SHA512 af6d74986da285df0bdd59524bdf01bb12db448e5ea659dda3b60b660c4a9063c80e8c74cc8751334e065e98348ee0db0079e43c67d485a15e86ae236115fe06
-EBUILD po-mode-0.20.1.ebuild 526 BLAKE2B e5f11144fd8b91c6d81bea2b1e1536fbbaafad2304334529973e7651f99dafdbb2adf55222c81c3b12040e46c9fd96f3eb5135f5d0a528c9063974e490dd4547 SHA512 ea5c74518f7cc0a4036f32e08d7506cb2be11bb3324cb9850e838061e9bfc9568bc7d984b9f6ba999b3b2bcd302ef9b29b7e6c92094801e383621827757c998a
+EBUILD po-mode-0.20.1.ebuild 524 BLAKE2B b025efda971f4604a048d3122d519a2d60af5f1e933d1193d91da3b385d08ad097a0bd4e8d40ea81ce9433d46307b95154ad92a36c851f1768955e9be4492530 SHA512 546f3a6601898f9da201b82de4fcffc904042ff36873d34aed988e484e973ca16b3b663579b6b3528d1b95214df4dedff284c27237deb5b98649d6bc910db9bc
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/po-mode/po-mode-0.20.1.ebuild b/app-emacs/po-mode/po-mode-0.20.1.ebuild
index 77e3c8608a57..ffd004a0d497 100644
--- a/app-emacs/po-mode/po-mode-0.20.1.ebuild
+++ b/app-emacs/po-mode/po-mode-0.20.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gettext/gettext-${PV}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 S="${WORKDIR}/gettext-${PV}/gettext-tools/emacs"
 ELISP_REMOVE="start-po.el"
diff --git a/app-emacs/pymacs/Manifest b/app-emacs/pymacs/Manifest
index fcefdc6a13ea..76b8f17e56c4 100644
--- a/app-emacs/pymacs/Manifest
+++ b/app-emacs/pymacs/Manifest
@@ -1,4 +1,4 @@
 AUX 50pymacs-gentoo.el 183 BLAKE2B f1a4b874bb339b653c4fb6fb186bd7e531151c34d1df58be6963288d4443438fcae0f82c92a1667b4e7cb739bc2f7c6fd8d8d5f6d4e91413ee5bec47a609cc2e SHA512 f59fed86f859b796c901088b38fb570a5e5527d774a15456105ce75598c31fd20d0afaa62ad9cbf12063810fa592dbbd7c33aaece5871b36b488e5af6de0fac2
 DIST pymacs-0.26.tar.gz 123373 BLAKE2B 0c467435d18ebcbe7b263e90096363e201dd84ba770fa702beefac4318a713954c316f335ee005ea88370be29c3710a7df04fb05b6efd3816beedbb88e38126d SHA512 ae245de130f435d947788c5ac11d8ce6534df80f70a4e35fff903f22d2b79b0f66925059ebaf53bde45cd6660ac0a8a224490f4f9e256a84e3a08f6468c14dd2
-EBUILD pymacs-0.26.ebuild 1332 BLAKE2B 415836213cbbf291e3d129233c5b50e592460c8a6357a738a3e8e26703e8a6ad7cf3694afe463c21e3e06ed6351fdf85f1b2999115234b32c6eb8c81ad3ee97b SHA512 091b85f6302a1504e43ab5615e0de0245501dc1947529e7e5453527283f7c9858229e5706363e299723631734c5f6418572d64a08440e2253f69e61b6f89b032
+EBUILD pymacs-0.26.ebuild 1329 BLAKE2B 23b29f1fe217da9aa055a84040f0ab17c13a385abfe0d7aa5aeafaffdbc7a6209496affd80b702b0ef9dc12d35c204cd5f02154338f011159110a42765198d2b SHA512 dfafb9317794795ccb26f8c4a21cb59c290da71b76c19ef4f6e3657f35f0b0e5ea7fdc9a1a8e1f628e9ae209295988a1773bf32700657069bf8f1d261b77d7c8
 MISC metadata.xml 435 BLAKE2B 10ae4a8b61dfb10339404f38e37cafa1b66737a8f593bc4ba1c626b9d884ebb19dca555dbdf24b1418fec711f6b73865046cf50d58990980ab5115b1755ddd24 SHA512 bb1bdeb6695093fb0788f956059a6e081b98d8b769e2d336057954e85006dac277b756206f83565d52c2473dc45f3afb1087850e38843103f0ef7581a634eec0
diff --git a/app-emacs/pymacs/pymacs-0.26.ebuild b/app-emacs/pymacs/pymacs-0.26.ebuild
index ee22b01797bd..729dc0e0a76d 100644
--- a/app-emacs/pymacs/pymacs-0.26.ebuild
+++ b/app-emacs/pymacs/pymacs-0.26.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/dgentry/${PN^}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 #IUSE="doc"
 
 #BDEPEND="doc? (
diff --git a/app-emacs/python-mode/Manifest b/app-emacs/python-mode/Manifest
index 2583acf446d1..39969c46cfa4 100644
--- a/app-emacs/python-mode/Manifest
+++ b/app-emacs/python-mode/Manifest
@@ -1,4 +1,4 @@
 AUX 50python-mode-gentoo.el 541 BLAKE2B a1657fc49011246ba1cfed1cd8993a222c4932516c6a8e3be4fcc53200510ad8e9a3e1072c2bce641cded4be1581a9c950991d6864c2136668ddba4de8f2429d SHA512 8e1c2c68409c48f3e7c2ae36128380fd5358a12470db571ffa22b1c9cb11730a2f2a84ec66f23c064e32b504c8ae002033e77640d85e11577c50e31462cd5274
 DIST python-mode.el-6.2.3.tar.gz 314461 BLAKE2B 3bd71b47de1284d59db61f829e3419f2fb10e226900392d903256f31ad90f47317b7bde4cde1cf7d86518f9c706d9c844b208a9e2469a41037252a63f7bc1ba6 SHA512 4aeb33d4054d582cd2a3f4834472c7d0cb3fe5e12e10f5117dcbcd90ec2ca490964c774918c83697f283c68e57766c3c67d3853ddbaa3408777fdafc7f2674f2
-EBUILD python-mode-6.2.3.ebuild 699 BLAKE2B ac7c7c584dcd99f546428eb579279c7221b250efef2a21e2fc6568bb28615f093a3319b2f61452a50ff3924c2fb3795f44643b9a3dbff5584bb3c3c213953704 SHA512 d76dfd2058a56756a3a251d15195255eb8c6bfee156b18c30fd867f437ae31ef1a1d9ea2ade84e12f121942b329fd6e5db95b944143f6588c262518398f4fe25
+EBUILD python-mode-6.2.3.ebuild 697 BLAKE2B e9a5f4e2a1c80d04370b3cec41f9b9bb9a448244d50db75331ee145f77ff20e6b1fd158dca64d2eac1ee5de881198f82f04f4e065bdcf125d0fc3c292ab053e3 SHA512 b3b62186cfe5d2baf09cd5f6358fb694a3466d73f326c956b87419585038a1d7d13d77700c5d21300f56072bf999d07fab9254dcc38b43ea1700743fa3414e42
 MISC metadata.xml 359 BLAKE2B 6f98624b4484b28ec87e9d4de4ae43b729db5c5c76bf9e480f86eca25423e8cc8a201762b8f938b5b012765e9258d1752fe01a847e3cd69539aa25ba0cdf9394 SHA512 a61b3fe8afa6c99edce3978dac6b52f37be06c7fbd57166697d14e9d4d0b5e7212c3bb1988c47aeeff4356cd841ca20a4605da0b5bed487acca4e2375994b0bb
diff --git a/app-emacs/python-mode/python-mode-6.2.3.ebuild b/app-emacs/python-mode/python-mode-6.2.3.ebuild
index f5062acbe493..ad817c2acf98 100644
--- a/app-emacs/python-mode/python-mode-6.2.3.ebuild
+++ b/app-emacs/python-mode/python-mode-6.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${MY_P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 S="${WORKDIR}/${MY_P}"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/ruby-mode/Manifest b/app-emacs/ruby-mode/Manifest
index ebf2f63a4f02..74053249bc58 100644
--- a/app-emacs/ruby-mode/Manifest
+++ b/app-emacs/ruby-mode/Manifest
@@ -3,8 +3,8 @@ DIST ruby-2.4.1.tar.xz 9939188 BLAKE2B 5be893c8996d17ff333276a772747d3099cec0c41
 DIST ruby-2.5.5.tar.xz 11459832 BLAKE2B ced1105a87e7df8f82a65ca8d1d329d5a9d110d2f3f88b27a79262c4ac1484dda16d8646c0c03f18c1bb25f8b154075eb03a0614355ec62f677c2fa56ab3c956 SHA512 06b1d58536ebfacb7b56c1e6ed4b8ab816fadc4f48c845a452554cd262e7908199a30e5793f3cbaec2db56a8803aa5c6089abf7bf06c8fc47867e97870b7dfec
 DIST ruby-mode-2.6.3.tar.gz 28460 BLAKE2B 15ab0115cc669f31d656a6af03c061699cfd872130ed51240ecbf80fae413b1d2d8ed87ea1515584f276d15ee164a3c14f9138bf5054418419f6c09b2a72e8e4 SHA512 bbeaa3ae788ea3a536715dc8dc0b4c82803d0a21ce44ae048a5a1c1e331f8c571980feaf38f42455e2de099210bbd4d6f3e8dc2984d6318a70fe04aa6c0d9520
 DIST ruby-mode-2.7.0.tar.gz 28533 BLAKE2B a41bdd88ab6ee56b81d1fefd923967fe7b7219429a2727f62bbff5a76b294c18ec5fa941428dd6b8cd76687e1f362752e598cc8ad9fb8b8813143b0d1cfa25ce SHA512 17644db69d3ea5674d8bf48a87db5e2f396a7d032428e9e8b63dac2a45fafbe506440af7429c440e82d194df670d6dec5e3d6908b49654300493dba1be5450d8
-EBUILD ruby-mode-2.4.1.ebuild 506 BLAKE2B b576023dfc3ea4b5a087a69445af6f5b85061a1ab619591cc66e4b1410c5437deb4c4fa3becbb10b4399f129b6270fc5576c3dcd270a2666ba13d977119d7dc0 SHA512 8f79dc6132aa65493eb8bc8755fa7992fd272854b7422075541e976c4d51db812522acbc2027870d9603d9e637f4751a59d55e1f6750ee824ee5f94c4df1eab4
-EBUILD ruby-mode-2.5.5.ebuild 506 BLAKE2B fecd4c2ff0bae32d42b50b75ed487ecf74d3a12d58e5bde2a9b021fc70d1f061d25bf4411c0c9a72c19b59c5021971aa368335d0312e72699c6ceb0e643f2e27 SHA512 eda3ad2255c0cf19543ef3ff9ca6d0932842098d81ed22d628b6b071adb8bdd9374e84b5f0501e154c5a7e19ae892d2cfd8cfb1d381b13ddfc7ed49beae36428
-EBUILD ruby-mode-2.6.3.ebuild 578 BLAKE2B 20fe8c18865b478dd3d8074902a083797059075fbe7bba5804b332bfaaa018e256fabeaa9a2830310021716855fb5ac5928490f66297e018eff88d8581526e9b SHA512 0c0df43a0cb68bfa10c2d299ec9f2dfd064fbc722d5eb8cbef3bfefa97313f247d344d83b5663bba4991869d1db962441cc3ec27da0c779e693650c27cd03707
-EBUILD ruby-mode-2.7.0.ebuild 578 BLAKE2B a2362fcdaa7b64c3a4d032bbc91ed082977a33dc92485959ac13dc843f2b9d65f88b2ee46db220911592550fc7fd38f6f7f2a64d2333709af8c2741d7b783e07 SHA512 ad65f95377450810b9360d939440d960dd3a4ba78ecc3f945aa17feebbabd978dac6d08fe5fc1b345565532ffe6236fc8d25d273795302a2812010598774112e
+EBUILD ruby-mode-2.4.1.ebuild 504 BLAKE2B 45ad1409eba9aa7b112a2f0cb3976eac03a7fea913113d5a3e8292ce139bed703d308b15a1bfe55ddf0c97558fa36cd7725cb22625f29312bacd813d590e02f1 SHA512 74032abaeb0ac4f9e6b788780bbbd4c8acb8c6378fd61f3c47c9a7c207f59c9128404a2cb82af98cb439fcd23a9f55df6f065f0219d2fe476f7465800153dcd2
+EBUILD ruby-mode-2.5.5.ebuild 504 BLAKE2B 930374c3c2569dbc9e9a833b6d523f1356703f0664bd90f948d3e882613e870cdcdbc9005238cd67ceb4b96244104814e770f4d7985e0057e902996f989a3054 SHA512 3f63e24dae5a049fd3b7d03fd79ccb266fa2638f0ec6d9ea85fed649fe8a539028c984d63e2ce4f8fce09b36cf38d63fc87a260dc43cf6377475663e63f259f3
+EBUILD ruby-mode-2.6.3.ebuild 574 BLAKE2B 14676f49769d9d90cef6c487335e57a693fb800cac7a5c13c1db110cd9af87ebe3e8ce10dabf2aeb0b319687295633821ee8ab1022b844eaea6030ea764222f6 SHA512 c554f9fee43ee1379410b20bd8eca89ce30c2fb89904e48ebd0c19a5e2721d7c06b2eff1cf60b499b345e530adbd273af52e0178d53fe58b0a8d724572357529
+EBUILD ruby-mode-2.7.0.ebuild 574 BLAKE2B a46fa88d275e65065b84bb3f225fb06cf2cb0758bc2cc4bb5743930a6cd7dcbf4a3d384fdfd0d5ac461b62cd492b0a6bc27cb5f337f33fc0b5ee44729661b819 SHA512 302cc070777885b18f4bb24b346bd9f7a67f28279269ff1fb7d9b3861cf976f42936f2c82c5a33bb047034433ec09c36eba563a037af44c557c7e1fab9876a45
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/ruby-mode/ruby-mode-2.4.1.ebuild b/app-emacs/ruby-mode/ruby-mode-2.4.1.ebuild
index 9fb94f350905..fa90ee0aeb15 100644
--- a/app-emacs/ruby-mode/ruby-mode-2.4.1.ebuild
+++ b/app-emacs/ruby-mode/ruby-mode-2.4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://cache.ruby-lang.org/pub/ruby/ruby-${PV}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 S="${WORKDIR}/ruby-${PV}/misc"
 DOCS="README"
diff --git a/app-emacs/ruby-mode/ruby-mode-2.5.5.ebuild b/app-emacs/ruby-mode/ruby-mode-2.5.5.ebuild
index aab3289276d5..87757ced48c8 100644
--- a/app-emacs/ruby-mode/ruby-mode-2.5.5.ebuild
+++ b/app-emacs/ruby-mode/ruby-mode-2.5.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://cache.ruby-lang.org/pub/ruby/ruby-${PV}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 S="${WORKDIR}/ruby-${PV}/misc"
 DOCS="README"
diff --git a/app-emacs/ruby-mode/ruby-mode-2.6.3.ebuild b/app-emacs/ruby-mode/ruby-mode-2.6.3.ebuild
index 6959b4080a38..42b320f0749e 100644
--- a/app-emacs/ruby-mode/ruby-mode-2.6.3.ebuild
+++ b/app-emacs/ruby-mode/ruby-mode-2.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ruby/elisp/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 S="${WORKDIR}/elisp-${COMMIT}"
 DOCS="README"
diff --git a/app-emacs/ruby-mode/ruby-mode-2.7.0.ebuild b/app-emacs/ruby-mode/ruby-mode-2.7.0.ebuild
index 452302bb70e6..4f80894a8adc 100644
--- a/app-emacs/ruby-mode/ruby-mode-2.7.0.ebuild
+++ b/app-emacs/ruby-mode/ruby-mode-2.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ruby/elisp/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 S="${WORKDIR}/elisp-${COMMIT}"
 DOCS="README"