gentoo resync : 02.08.2019

39 files changed, 79 insertions, 167 deletions

diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 012775a995f3..161b54bfafe6 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/apache-mode/Manifest b/app-emacs/apache-mode/Manifest
index f696b615405d..86d8be815802 100644
--- a/app-emacs/apache-mode/Manifest
+++ b/app-emacs/apache-mode/Manifest
@@ -1,4 +1,6 @@
 AUX 50apache-mode-gentoo.el 499 BLAKE2B a49be09cf0a7ef07263899bcd1ba7485228cec4932bb7e756d2f31fecc63299389b68e9c3d6e08b2664b0e4d187f92550fe785bcd3d8b241b7a8a1bb3b707128 SHA512 4193ed796f1bd433ad33f61e2d23eafb6cde2114304f51c20464827d25185408749eccadb006663be25bb3a62b206deedf654bf0398b3e5ef94773a53ba28caf
 DIST apache-mode-1.1.el.gz 3468 BLAKE2B aa89b18877049fa8399ef75dd048e40eb84c20dec4365b08bcb1d1df2a14e4a2d63a2baff3bfeed1bb01fdd0489a757b3377ad21d311c03e958650e68a0f927b SHA512 4eb42a0b4db847026832f14473dfc6cfea6c436eaed5a52c2ca3ba27cc89b0b36b0e7be1472048e1c559f3b5d5a5e7e85b9e2cb9c5563bf781f241b540e141f1
+DIST apache-mode-2.2.0.tar.gz 16077 BLAKE2B 25b153dde0488febd361463b0f43207bd10680f7db2f28f32aa1955f9edc5a07c501646580afd124c7787da3283aa2ee4a2209bfd57f68bf73d5ad07fac41ca7 SHA512 3b309291813b309215250fc1ae1ff206df6474981302a145c305adebb6ffe6a20338b9d8fd5fef1ba491a6bd2427d372178f02d90af214dd24d389c574789aa5
 EBUILD apache-mode-1.1.ebuild 377 BLAKE2B 8818e51c9504cb143b83046ec9c33b085dfcb24e714e63138127c54f83de31b73c4161144a1b2304508832857fc97b038ed6226f0e23e1c9cde55c8c0e576501 SHA512 ae7e50866fff671b94acd287b8671ec77e5ffecc093c6f685afdb3be1e48f3178f2f4ac5d832e37897add19a2fa14e062a2899f01ec11e34f78fcbd3c7eed894
+EBUILD apache-mode-2.2.0.ebuild 441 BLAKE2B 111fb27fadd500d98507c881a7cc95168bbc98d202651c86365593571810f261efe6118e5bb2ef480e8d032d123f90de0e2c6685e20c9b71df7efbcf5992b182 SHA512 4c5f8a3cdd3015337c0886dd6be0256047a6942de455f4c12faddf23286fc647eb887523f01d509dee1f8ed1fad5301a9189a8b54ee7dec27e0b74d24b3ad66a
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/apache-mode/apache-mode-2.2.0.ebuild b/app-emacs/apache-mode/apache-mode-2.2.0.ebuild
new file mode 100644
index 000000000000..a3c41f739d3a
--- /dev/null
+++ b/app-emacs/apache-mode/apache-mode-2.2.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="Major mode for editing Apache configuration files"
+HOMEPAGE="https://github.com/emacs-php/apache-mode"
+SRC_URI="https://github.com/emacs-php/apache-mode/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.org"
diff --git a/app-emacs/apel/Manifest b/app-emacs/apel/Manifest
index eadfd05604bd..50fbb5d92f9b 100644
--- a/app-emacs/apel/Manifest
+++ b/app-emacs/apel/Manifest
@@ -7,5 +7,5 @@ DIST apel-10.8-030_Use-new-style-backquotes.patch.gz 7869 BLAKE2B 93b93a089693a2
 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 1494 BLAKE2B 330d33b3436b607e3de6d46ef5ff15fb4208230c166ff3eccc837a57cdbc7885b5ec0bfad83976b1d3c2ad54e71c5dd1433903daf18c4b00fb14400f6d5c2538 SHA512 5b4881c7a966d1ee0fd82d931964d377c91a4df4647190000e3fb53a46c3eca0df9c705a34a762f2846a5a9696049d240b9549551e6a2e7151f772a16acf5c15
-EBUILD apel-10.8_p20190407.ebuild 1204 BLAKE2B 085ba890197b63f8e8d246603ae08b27b96467867240a283097fdc9394405d4871ad322f42b22b61fce46a5ac1bc5b32d76611f069aeca35d22b12868dfb0705 SHA512 3648abf3f30419bdf733f6178a086654fcea5382370ea8bf7b356cd88286dd20ea4eb39a5cf90c12a4f1e0ea171e2509d8c6bed158f4ddb8052b49e7435083b6
+EBUILD apel-10.8_p20190407.ebuild 1196 BLAKE2B 6330a54f618c4346e32c9c07e7f5ad8b8400ef78735d512adbd4940e39ce61f75a7768721e77764a7a6df3408580c960371927f4db822a5645a46015cbc76972 SHA512 c41bc722cb809cd9e1a69f1665e8b7fee05060ec1ce0f3c4975b893c5562f51e740aecab3b6c255d3961754b6950369cabb3ebe6d5d1f1adf2fec805ca107800
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/apel/apel-10.8_p20190407.ebuild b/app-emacs/apel/apel-10.8_p20190407.ebuild
index 6dd02e5f803a..a218a947a7b3 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="${HOMEPAGE}/archive/${GITHUB_SHA1}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~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 d9f6b9558fda..a4b188b8bf98 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.ebuild 553 BLAKE2B 23eac6cc14d85b900c3aa3cd0dfada99e7b39d76d2d97a57bdd296c1026263b3820e26caf604899d90b095bae25ca6a08ee4280686743b98ae190989f81efe38 SHA512 82c68336825df0021f0452d9c071cefe932668c7c866761835dd876e4e6bb72e17f5ab0bdfb249681277cf18696addaf4d7eac4cf4fb5d0d37fa88128d639d4f
+EBUILD autoconf-mode-2.69.ebuild 549 BLAKE2B 888a6dcc0036d701a57978d2a38582fe06e3c245d81b6a0269a4cc994f625fb994dddc6a825c8dd7c0ab9596413d69991714bdf705c12007be4955f101f1735d SHA512 e23dd5c865c56bbf4d6f4cb6eac3e5426e72d0281bb21b75c6f162215227fa0d421519c5eb72d15ceb8dc36909a3e10e099f5a2794f97bc2b2dfff0464709e2f
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/autoconf-mode/autoconf-mode-2.69.ebuild b/app-emacs/autoconf-mode/autoconf-mode-2.69.ebuild
index 5ebadce64015..3ad20e46390a 100644
--- a/app-emacs/autoconf-mode/autoconf-mode-2.69.ebuild
+++ b/app-emacs/autoconf-mode/autoconf-mode-2.69.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 SITEFILE="50${PN}-gentoo.el"
 S="${WORKDIR}/autoconf-${PV}/lib/emacs"
diff --git a/app-emacs/dash/Manifest b/app-emacs/dash/Manifest
index 9b512620bb5f..589c585452da 100644
--- a/app-emacs/dash/Manifest
+++ b/app-emacs/dash/Manifest
@@ -3,6 +3,6 @@ DIST dash-2.13.0.tar.gz 146280 BLAKE2B e9552a19b1f84db0e16fba07fe5bcfc0eb8a6871a
 DIST dash-2.14.1.tar.gz 141115 BLAKE2B 87fc7a02c66161d1c16debc54c6336f36cc47cf7c7c470d190424b9c463723058ef6f72cadf3f4d4215b36f369b9e5356101c4ea16fede10cefde90b5e0b384b SHA512 cfd4ed7a9eab881a0c3bd2744e78c5ef99a92db4d3afee8c632c0a766adcdbf1999f4e9770e2c4e941526d488dd6f9327937389490cc2310d79b38c5bf2ddd12
 DIST dash-2.16.0.tar.gz 148151 BLAKE2B 1c51d926a6dd4ecdbc2ad132347af7bbd27e604d6e2c61a6cfe548802b08a57678ca26aba69f8ae27ca7cdeca84cd469bd9a7849bf28c2abae44f7172ad2659d SHA512 a0196327c8e81d1b343bb56de00a3c2f59b1d3f86dc4e923cf350658590fa106aa0be933aa0f51ff3c02d9aff8450c5e055d169ae8fb876be068bf15a52af216
 EBUILD dash-2.13.0.ebuild 545 BLAKE2B 083977c9bcd22b3c3e86c7f1e78f54b40ea3483b5873bdda957b9ea290a8ead2807178e1b2948001e32bad26b855f24215d87ea2a5cfcae847d2625a9144b307 SHA512 0179b3c93d4fdf86889bc649599cd27684c037e07efda724069ea5618e41c1f8c52a63d680266b703f743c0c9e322cfaf354634822523dfeff56a55519257d57
-EBUILD dash-2.14.1.ebuild 554 BLAKE2B 7bc30f8f7bb81b173b31c47eae226d3c305aa14d9d2b5b9702356a4648328d5e932a1141ccdc3b6950d890715d543ef3f7d2a6a08dec2fdd267253f8080b26d0 SHA512 e06197bc1786608355a17513cc84d0a0f369642f9b2a20451d516e720ad0279e62d824e723a179397d1b1898a27cea510c5b9372a1a7468f3b1579363f09aa14
+EBUILD dash-2.14.1.ebuild 560 BLAKE2B ff1f6faf93907f3dc4ebf54fb77a6d6aef111dca5c61ad277b3f561e5035d0428225232a79536c61216e24e5992161f79dd83eb5e4ff1044d15aa6cb07044012 SHA512 2701b512cb5d8bcaea7b8d7298f04834f5e7099259414c894239470a5a3edda9574c85a5b02d224b26b797a9426fc7115c12de8eff96453bb675b85d99bd9970
 EBUILD dash-2.16.0.ebuild 557 BLAKE2B e2f82decfc376e5760935341e691041262af38ddae16f394f30d25add656be8f4e9bd210950336a95c5953f575cdcb481eecd5cf6d71c13461b46915c375ed3d SHA512 91f81467c245d9d3c0e19edcf0589f2a0437d5f02e76818b5282f6f044c7c7236dbee38e67fbb7005a0227313ba261e50631bf2357633bbaf898ac419fffe885
 MISC metadata.xml 360 BLAKE2B e70caec7e3633788a79217f8d41bd69056ed620396e4d22ecd0d80ad82f7dbe2e9ac3872c55cd94682cd16960e682b1f648863373cc941559b40045612188f8c SHA512 8de7334410a02599aff54733234d7b3333c4a61cd2ffc846f3f69df3b43a53c510b2235100fab79274e0727393ecec24e051b42aa36b878d6b45130b5b2e3ff3
diff --git a/app-emacs/dash/dash-2.14.1.ebuild b/app-emacs/dash/dash-2.14.1.ebuild
index f8d73cdff535..6036d94f7018 100644
--- a/app-emacs/dash/dash-2.14.1.ebuild
+++ b/app-emacs/dash/dash-2.14.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/magnars/dash.el/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 DEPEND="sys-apps/texinfo"
 
diff --git a/app-emacs/ebuild-mode/Manifest b/app-emacs/ebuild-mode/Manifest
index 9191c037218b..d332a455623a 100644
--- a/app-emacs/ebuild-mode/Manifest
+++ b/app-emacs/ebuild-mode/Manifest
@@ -1,4 +1,6 @@
 AUX 50ebuild-mode-gentoo-1.39.el 805 BLAKE2B 3cdb41677c5ef11ef6fb44001cc36b58f923c2be4090fe8635fa85d338af3d170b1ad3d6b2f31704cf24e1528d3ce9b6fd3d305c2e3c1b1923e345e011642307 SHA512 8038b7bac0f3322b1149467152790dac7cd133234afe7c362c0e14686e378bc27eaf432a7194e1748dda80b41483943facb44e1a66466ebdcb4e7a0768e8f629
 DIST ebuild-mode-1.46.tar.xz 34928 BLAKE2B ee2686f3862fc7aa5f820311a6e45d62b153426134422c56a2a6222795163f454291da5510e86c52edee1b22b7bec641ceb132147b29243ee647774a8e91342b SHA512 e7a81c9a3692db1c6db41e138b382e3027094529d4ad3244ecde5a245340f911f8a63ce8ce8bbd7910116c704bcf8fcce90142b8863ecc1b543760ef1411833e
+DIST ebuild-mode-1.47.tar.xz 34812 BLAKE2B abbc3be110239f9e1765d4f1293856a7fc616d497ac5256a28b7d78fc57c8d725abccbf7b9e5908cb85f9a684dc1be26ab88152d836c2ec3a481802091729717 SHA512 13ee756ef914a314f6705df78735a3926a50d156f4abeff917bed68298aec81f072d53a60f7b985d9bb2caddcdbf65fd26f6c9189e6c5c1822674d9142b7db17
 EBUILD ebuild-mode-1.46.ebuild 736 BLAKE2B ac66313b89c59cd31df0f7c54f4b04e6c9d26244a8cd690c50f343d3711cfdc7a6c8d0568769e9da8597716ce00fa1691bb4b4115270e8c2df7401df2d9e2a83 SHA512 f5f6bce26ea783fd453c6187600805f306be5785cd7e5c0aa215226f0e7edc2b7eda9d3c6964dbe1f68e74958528d1f8b56707b984dbd2829e681f5b53020b22
+EBUILD ebuild-mode-1.47.ebuild 745 BLAKE2B 51d5c539f29f3803cf47abbb0ba72350b419b6eac6927bcdaae6d88f32f0f250ec4e0df8fa53a4f1ff5c3f7a72897301bb655fec612d6e2faaa3e72248ec4c5e SHA512 44318aae5313a4c597a4eafbae108f22c5dbbdf6a94f99921dd8fa07318be1219df02d00443d8fc8c8259e96b66781795400b1d247e64779fd2909aa62e60117
 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
new file mode 100644
index 000000000000..27c2bde79786
--- /dev/null
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.47.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+DEPEND="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/emacs-common-gentoo/Manifest b/app-emacs/emacs-common-gentoo/Manifest
index d5b54c787936..a0d8d319e3f9 100644
--- a/app-emacs/emacs-common-gentoo/Manifest
+++ b/app-emacs/emacs-common-gentoo/Manifest
@@ -1,4 +1,4 @@
 DIST emacs-common-gentoo-1.6.tar.xz 61224 BLAKE2B 70e4f30c26c9098fdb02a53cab5d60cb611143d8bac6947707f3c7596b5a81ceb513b5a0809ee90f351472824f1d4216720c02cadb51d25b3dfce5e436e02bdf SHA512 a7daed2241d778ab283482ecc016801e25084eed10fcbbc50e187d5f842df5a0d278a77f94ae950b086c8651e8ca1a18f89c11dffdde9cf9168755288aae926a
-EBUILD emacs-common-gentoo-1.6-r1.ebuild 2882 BLAKE2B ab454de8e5f8b8c555b60a2129865214337279c9082c3927c455c1bfbac8f4a1de3e2f56a9be3fd7f9a181cd7c9295ebe90a00a64d158991f3f6808a0e14c17c SHA512 f7e4f173fa3c84a7c91e38b6d94b8555483a5c91875a2d87277e4e11423fc162590d45376643ddea08806b4c76a849c09404da421fb693c72e0b6ffa13ee2d9d
+EBUILD emacs-common-gentoo-1.6-r1.ebuild 2878 BLAKE2B aafb8c7842b9075d08dd037ed2e3fd59699bf0110d380f10a2c8adf4dba2aea3008b5670b3bd9ee8f33dca4ca1f88a4e081df292e4eb9c0578b9a51cb9b0c84b SHA512 d9b0cb62a397af1ee382aff2c9344891f9632b9eafd54f56c7f34c29b4712b0ae4006420798e6022e4ffa9658aa2874c1f43a824a3eba5ddc0e1f056af730fce
 EBUILD emacs-common-gentoo-1.6-r2.ebuild 2898 BLAKE2B 8dc2b5d30b7b5795f89157f93aabf1c16230f7cd5d6c69c7fbe347166935c2e5af4b75c61a964f9f72195250e6000506d0b47b9be2047adeb67536adbb5ee238 SHA512 c40e04c8da1b350ee432883145333f97d11570327dda692647c08092bd479085548a8b88df7a776757bd1ca14b7975f82102c0b69729cc71465d1e80b290f8c3
 MISC metadata.xml 360 BLAKE2B e7e420afb7a8377bffcf2a23f3954bbf4cc80fcd19a8514733e2e0164f4235271e21dc860bf77cb9cfcd1a4026ef3dafe97a10dc397e2d8e6f001f02bf6e9bc7 SHA512 d57f8f097617229f774b06437aaa83595aab2a6d9321d51b97dac8bd56fa94db396c7bdca538570f0912390e25ae8643c5adc374908757f67f1422fa1f872605
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r1.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r1.ebuild
index ce220414a0cf..84eab96b484e 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r1.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="games X"
 
 PDEPEND="virtual/emacs"
diff --git a/app-emacs/eselect-mode/Manifest b/app-emacs/eselect-mode/Manifest
index 002879e65bc6..9575f4958cb4 100644
--- a/app-emacs/eselect-mode/Manifest
+++ b/app-emacs/eselect-mode/Manifest
@@ -1,5 +1,5 @@
 AUX 50eselect-mode-gentoo.el 178 BLAKE2B 50fea27e7add6d31f37801593430154636bb58ac6e3f7cc44c68a16d49c9156cf37285778a38bf97a1f4805a22d6d5cf9d597acdcdedfd77c62a5825a0d1d88f SHA512 200da398adf72241112bcda74b432a8a313cf29018c9f6fbdf6021674b23a201ada6ba884d4c9c3a4ee4c042d6c8fc7c3ba59702c8ddb6ea20b652f9ded9d32f
 DIST eselect-1.4.14.tar.xz 177492 BLAKE2B 236ddb09231283a153c20be779d012979a25d42a7043c75af866e777731761406d92896bfef399c3bc63e529af4e36cf538801302dc4bb719f065d6bab8ad9e4 SHA512 b17fb63039577f20515056fae1b0f7e86fa2d96f38a5eec22e637cee0b25f4d68087ef8a5bd4043893db5be66ea201bc8ae6437bb049d208b81e76a57612d658
-EBUILD eselect-mode-1.4.14.ebuild 570 BLAKE2B bd1603736b03e204dd4cfd699a04ffed73230c8f6a9b690d01ac2d511f882cbc7f85b11dd123e9af739c3e5dfc2dc1bf1ef1a95f09427d27d95e9d84eabdb2cc SHA512 84b9746a7bb7f3c3a34be08c164d088ab294f4ddcf56c5ec8c99b4a2bccc38a92af9bb39b30f84b4334487767e2c9e987392d42fd5fa8c905f6c3c4fb67dc97a
+EBUILD eselect-mode-1.4.14.ebuild 569 BLAKE2B d7e4dd474ca2ba2703d8a84939f79da3cfed9b942a8e44f4a26f742ce0b54cc6473ccff07172df91d528132e404ffc14adb5478402d6f4bc0ceff8919690926b SHA512 1a684d4e547c7da81bd62f723cd03053295119f664543f50ef8edcd69c8ad6717aaf616868d0ab56dc9a6b639822d17d56517b8279b7f1a2dd879ab94ce97b81
 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
index 6b5589e6a7fc..4e0c53a579e6 100644
--- a/app-emacs/eselect-mode/eselect-mode-1.4.14.ebuild
+++ b/app-emacs/eselect-mode/eselect-mode-1.4.14.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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~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/f/Manifest b/app-emacs/f/Manifest
index 798aa81ddd3a..d2730b4aebe7 100644
--- a/app-emacs/f/Manifest
+++ b/app-emacs/f/Manifest
@@ -4,5 +4,5 @@ DIST f-0.19.0.tar.gz 19477 BLAKE2B 47cfb8c876e11cae7eca61815085c4290f65f9d72a7c5
 DIST f-0.20.0.tar.gz 19907 BLAKE2B 20b82a19b227d2e0863e540e75bc5094c0cf267eae00d699ff5b00fa574213d303135c246c454c92785080feae63ba6c529b115aeb1368774dd548852d94fb48 SHA512 0c44e63cd527a37bd5582d5a2a4cb2269d179930d7f41b378b9100ad5bb4518291b02197b1d55e1bf603bb5b1c12181b982d9b9a3f8fbd48860f6e86ea36c03e
 EBUILD f-0.18.2.ebuild 516 BLAKE2B d79552b1a98a6abb0d0f0a3339c425aa6d1c6e763cd814c5764e5a3f47e3909f9303b3868cc072b1523b35cd73f838b1228f178f30c008e8b28ba9de03ef0022 SHA512 679ec5a1dc6a778582ab90b55a2f6e65cd10dfd846b44d2f2900acd9f1ce70f1029b06336e38e025a7417dfc4e61c70986b9a9fd7674a20f5999fe143dffdebb
 EBUILD f-0.19.0.ebuild 526 BLAKE2B c8f84f7ea67d86cccf39dccb13e887026da2c4a52b16c9cbf9272c62694af5dbf5666a0688d0e8c8bad8d5b3639040676df11cbcad4ef1eb7eb4e325ecfeb4ba SHA512 f56bdbcd85b0aae7c3c70d3b9edee58ef668f9f12939f4f87e705d64d68dccd28f97e2838c0dfcdd6f64be780a5628af349507c9601fc054b6f536a4ca24e356
-EBUILD f-0.20.0.ebuild 526 BLAKE2B 2f243ac49eb1a0aff3bf0c3708b2fdd23aef6743d4c8b21b2bc2d5fc0f83528a52dd186a8522ae4fc6d05fe648880b2ca2fdfae1504f2598194c745d6d236f0c SHA512 53051715224d1f5fb2e6e49a9a285b84469e7f3c47c4723c7dbc9aa649ea2407a6f801d049a90b62fe5caf91082b25b89dcf7a5e575cf78b9ac5be18aeb5a0fd
+EBUILD f-0.20.0.ebuild 529 BLAKE2B dc21af4fc8b92f3d6c73597cc0be79d7c63ba857ae49bfc37a66d2fa545da00df3525a7dbde68796ead7c7347d030374b4bf0ac9889cccf44acc1d5c4fedd31d SHA512 5f939c184075e9ae6ba5150fe066c5db5df2d5c9c8e81b9fbdc36a6ab8fce0b9bd6686b164fe27e69d75a60a72d84f43b47ad21b84ba5d4bdb126fb12a01a8d6
 MISC metadata.xml 372 BLAKE2B 5ed577f7fa8b397ecfd738274b02ed1204aac09546624852be6698d88f15264d6edfe2a31528e9cf9a8051fcd6a53831ee7b0f024deaff2f652ede945f837e54 SHA512 5c0147862c0d432fab74199058bb650eca428cef988fd1f4a7d654f1cb13393e02f1193be3434b397489c9554e13a719d128e0d9c6c31d4b0cb496bdaf176a31
diff --git a/app-emacs/f/f-0.20.0.ebuild b/app-emacs/f/f-0.20.0.ebuild
index e5e5882dd09b..055645e2075b 100644
--- a/app-emacs/f/f-0.20.0.ebuild
+++ b/app-emacs/f/f-0.20.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rejeep/f.el/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 RESTRICT="test"
 
 RDEPEND="app-emacs/dash app-emacs/s"
diff --git a/app-emacs/flim/Manifest b/app-emacs/flim/Manifest
index 8844e71bad82..3b857c685d4b 100644
--- a/app-emacs/flim/Manifest
+++ b/app-emacs/flim/Manifest
@@ -3,5 +3,5 @@ AUX flim-1.14.9-mel-q-ccl.patch 1362 BLAKE2B 4883dfdb3ede7b93ec41cd02fe1da397a82
 DIST flim-1.14.9.tar.gz 182065 BLAKE2B e15779e93a422bc2c2b82ab5969f2b3d30a31d47b96769abf89bfe7e9aebf74e5f0f0e87270bcc187bdaf3e1af4bdd663c7d6661f1adc9575af0e4ba1dd316f1 SHA512 a272a30f27cea24f537b9bf3a6dbb25113deff0ab8e1c03bd802e4d32d673d567d282297ed9e4d35217f069699a1fc25bfdde09778171a188dfa46f49e9bb7dd
 DIST flim-1.14.9_p20190526.tar.gz 173261 BLAKE2B f28b0d1474d894fd93d9899fe66bc88d6669cc6bdbb2511dcd0b2f13c05abbe42ad4cc06e2de34664204f3ddbb3cb4f09e232394419892b3fd8e71c1ab3aab75 SHA512 8991c460bf9eb411e89edb8fb05088cc09dc354e4c14d7accba26d922b2d1041742e96d8a64407ee8dd2574984c5b3a8fbd66e828c8f8fadc55f8da6428d634e
 EBUILD flim-1.14.9-r2.ebuild 969 BLAKE2B 97aa74a6ad442c1d762001782ac19a5438dc06a4cdf06718a598aefe2e134851f97fe0cc844c84904bcb336edf2016e04d9691051f4832b0eb2b97b621ac1dce SHA512 fb65778615d632680803699f358cc8c66f422638e87308ec9a387f280a6594eec500d7ef77eb3679bdfc68511eb427e7273707ebbd714965927f82a05d07c1a7
-EBUILD flim-1.14.9_p20190526.ebuild 1026 BLAKE2B e32c8fd9bffc82f1aecd825b9be9ec8c4cc0413517240d36f15fb711f3908b3924b85373431af082732ad52ec0ecb2dd8b7213add619cf8502aa4e6e5c0156d1 SHA512 7240a5a5a6b603853d2c2ce793ce0b2664c3eeb3bb863495320cad04e28eb756177d2304263c6bd966bcac166e2fc5f2a65b26b0a1c1d511ee64bafff3e51b2d
+EBUILD flim-1.14.9_p20190526.ebuild 1021 BLAKE2B dc6713790abe82a20e31bef7a9a63d165dce2b8fac87cec0e7f2d50e1af0eba08299a26b9094f3eeb256b728e0192a60bd340a59096f95fa56c51ce9da81f6a7 SHA512 ddca7988aa99f6a7db4f84ac0f05a0218625c8aa08810b788e4c27bd5f9ae329b7aba1ba7948bf0976849889b8507f72a4ec172ef8bc064e00601a50e75512b8
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/flim/flim-1.14.9_p20190526.ebuild b/app-emacs/flim/flim-1.14.9_p20190526.ebuild
index 6bdc1e10d71f..d37cb72db079 100644
--- a/app-emacs/flim/flim-1.14.9_p20190526.ebuild
+++ b/app-emacs/flim/flim-1.14.9_p20190526.ebuild
@@ -12,7 +12,7 @@ SRC_URI="${HOMEPAGE}/archive/${GITHUB_SHA1}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 
 DEPEND=">=app-emacs/apel-10.8"
 RDEPEND="${DEPEND}
diff --git a/app-emacs/limit/Manifest b/app-emacs/limit/Manifest
deleted file mode 100644
index f8995c67d3ec..000000000000
--- a/app-emacs/limit/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 60flim-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
-DIST limit-1_14-200811252332.tar.gz 186477 BLAKE2B ccc9ac2f95e2cc27dd82fad215ab15f8cab8bbd92aa009f7d47a11f727bbf2c50a67797e76d9830fee0d84b1ee0bd1a5dd01ded877dc77695a49058b541680e6 SHA512 59cce771747cc1e144cf5b3e043c87b09f81935334327a1ea46197951f2c572c3f3e28efc71076fd3da54f9f667852574088ab009d2e966ea3eb363ee53ce0a0
-EBUILD limit-1.14.10_pre200811252332.ebuild 906 BLAKE2B a87283818a11456acdabbe4bd0b75265d9abd1a379f9b7799e3f65d837b514d9c6b54caf98194889ecd221b789b2d46dff0ebca18f9b113b502d78bdf2261d2a SHA512 1c3fc5aad95091be0eb428f6166e7f60262388e2465da7fb5f6937949d9512939554d7e499505233a3393ddb232379755fbbf70bcb6773b7cab40ca7badfa81e
-MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/limit/files/60flim-gentoo.el b/app-emacs/limit/files/60flim-gentoo.el
deleted file mode 100644
index 431f7e90ae73..000000000000
--- a/app-emacs/limit/files/60flim-gentoo.el
+++ /dev/null
@@ -1 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/limit/limit-1.14.10_pre200811252332.ebuild b/app-emacs/limit/limit-1.14.10_pre200811252332.ebuild
deleted file mode 100644
index 310cf269edde..000000000000
--- a/app-emacs/limit/limit-1.14.10_pre200811252332.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-MY_PV="${PV/./_}"; MY_PV="${MY_PV/.*_pre/-}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Library about Internet Message, for IT generation"
-HOMEPAGE="http://git.chise.org/elisp/flim/"
-SRC_URI="http://www.jpl.org/ftp/pub/m17n/${MY_P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc sparc x86"
-
-DEPEND=">=app-emacs/apel-10.3"
-RDEPEND="${DEPEND}
-	!app-emacs/flim"
-
-S="${WORKDIR}/${MY_P}"
-SITEFILE="60flim-gentoo.el"
-
-src_compile() {
-	emake PREFIX="${D}/usr" \
-		LISPDIR="${D}/${SITELISP}" \
-		VERSION_SPECIFIC_LISPDIR="${D}/${SITELISP}"
-}
-
-src_install() {
-	emake PREFIX="${D}/usr" \
-		LISPDIR="${D}/${SITELISP}" \
-		VERSION_SPECIFIC_LISPDIR="${D}/${SITELISP}" install
-
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-
-	dodoc FLIM-API.en NEWS VERSION README* ChangeLog
-}
diff --git a/app-emacs/limit/metadata.xml b/app-emacs/limit/metadata.xml
deleted file mode 100644
index c918cdef9591..000000000000
--- a/app-emacs/limit/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>gnu-emacs@gentoo.org</email>
-  <name>Gentoo GNU Emacs project</name>
-</maintainer>
-<stabilize-allarches/>
-</pkgmetadata>
diff --git a/app-emacs/lua-mode/Manifest b/app-emacs/lua-mode/Manifest
index 3acf13512066..03107d1d1de6 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-20130419.tar.gz 26242 BLAKE2B 25f75c70982ba2fb0077fb249501367f9dde3eee5ff7bb45c0d8d97857b6268c481652e06e5a92bd04d9b9fcac0fa3368dfbdc3efcbaefc34268aeb490ac6ad9 SHA512 e66ebe6c953e81b07a8f9d86264b1baa5e0b730a6d26b1acf7fb48ceb8cc0f008cdea0046d89e380fefefe0e0b189ef360280236befc79ade69e0622a2e7eb92
-EBUILD lua-mode-20130419.ebuild 565 BLAKE2B 9faa92c7ffb730378c151855a9e539351555d60d4cf5c15373a6edeffd20d15baa77291d89c6c8539a67ebd4613c22a3f7ccde70858f887224f60b8e30e1dad4 SHA512 2657979d911f672874d24633694e690455f365cee764d33a7c70db2730134c9f108acf9acaa5fa494b2bc36bf248e415ab9f675d10d0bcbf0c21bbc8667fbd0d
+EBUILD lua-mode-20130419.ebuild 568 BLAKE2B 95efdb42dec251b9775576770edfad5d2c71eb1699984d7e7ac2fc7c2c521924ea6eea0adaf2486faae87e500f8dcb005f36e4c3dbe2f60e2647151ecc9e123e SHA512 2d73df18f745e5ccd34bedca7d6a21f5d3451449396a3b13958011c8d1c233a77e31541b9806e4719273931c3cc6406dc9448dfbe855acf70c10637aeb4c6d7c
 MISC metadata.xml 361 BLAKE2B 4953692a3d3c19f162a539ae4167f16289c569f8c379e09f46423556bb8bf5335e95c5a125a29fcabdbf762405920a4d97c4920c304560688d617be0badcb69a SHA512 e7d96df1fb7a061ecba903b1e2ee997a93801e8d367f7b7b6c1394a8366f05e4fe001d96a08496559f16187ad93d21055b93a52ab4afce9631a179635e4e78d1
diff --git a/app-emacs/lua-mode/lua-mode-20130419.ebuild b/app-emacs/lua-mode/lua-mode-20130419.ebuild
index aa0543fbc7ac..5b0b0ca80f04 100644
--- a/app-emacs/lua-mode/lua-mode-20130419.ebuild
+++ b/app-emacs/lua-mode/lua-mode-20130419.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,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 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 
 S="${WORKDIR}/${PN}-rel-${PV}"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/ocaml-mode/Manifest b/app-emacs/ocaml-mode/Manifest
index 7fcfc4742ba2..6ffbbef189cd 100644
--- a/app-emacs/ocaml-mode/Manifest
+++ b/app-emacs/ocaml-mode/Manifest
@@ -4,5 +4,5 @@ DIST ocaml-3.12.1.tar.bz2 2949124 BLAKE2B 8814927411cb9b604c78f44d172fd1f8b3d5f6
 DIST ocaml-4.00.1.tar.bz2 2762205 BLAKE2B f9a788eef67158b036ee551360410921beab87f1b01684ca17d5cb87a30cc0cd475ca640fcb284ad88d9054927ae0fd397921574cc9098956d60e80915d4cbb4 SHA512 77899430706394af558666361b152d47df3a3e21831059875f8b317d0ff9d1a010177bf1e5851e522e086c20768e92c71344aa53eda0ce003f278752870ab5da
 EBUILD ocaml-mode-3.12.1-r1.ebuild 478 BLAKE2B 57435b46af18eb982cb38ed4fb156635c19edcd9f48c26498704c9a4b2fea05e0c61ebd4d84d94ce9e8b1977ea0753df56baa675a660ddc367d0008f241a6975 SHA512 7f455663560d3ed3b52564192e353f1dda06afbd4ffc99f99332c179ed62f602fa66ff0b07daf4ebdc248e44dba35867e7b10f78630efcdd4d02f1854934107a
 EBUILD ocaml-mode-3.12.1.ebuild 481 BLAKE2B b55dd0c58c9f1f6615032c95066fb7bdbf425067f9a71b1dcb6e353eed96d60a332820725041a1c5a0ac2b96335938c590c8e7f828ea990150d6c2e33ad1f0d2 SHA512 d31b7980be6f5240927a313ae43729a06a0b5a31470a41192c00dbeeb43e3190c33097832dc580fa62fe33c3aeef0603c07afe184945a069dc145a5137d0149b
-EBUILD ocaml-mode-4.00.1.ebuild 516 BLAKE2B 2596a6e9ec52b4b5a524b3a7a1bea907ffea82ed24ab9faa00523782b3408ff372fc18d975fadbd2f8f221cdd2ead5d14970ddec8084a52ab7292db853bb14e7 SHA512 2097d70cbb13f553a4afa9dc354b669b5fc65eb7ba09ea8f91fff2f3eb7068c5b35cba5108f76cd0878387f909a18ffeb2be993409d6aec7f4a41fa50f2d2ec8
+EBUILD ocaml-mode-4.00.1.ebuild 512 BLAKE2B 8624b8a5cd72bdca4c4b684b9aa10bb2d1b74d4b39b97c29acea1c25b60a5efce98bd8be0654625d40eddf38bf565b4f44092685f9f6ba1978ac4fc9cedee9a7 SHA512 f4d728f9a8702a0f577cec7f7868c58323116b749306a4d5edf1f0795715aac9a0cabc2436789243a5b8be641df3efb900581109b15d412c6d9ec5a1fbda014b
 MISC metadata.xml 388 BLAKE2B 3b0d21b61541c15e807ececd8bfeb3a91ceefd5075836b4a22a990b1f0c9b4ad71ce68b9d65935382e5f84ae6fc49d022fc2b1c0704a5cf331857b33e09bd327 SHA512 d997ec7cfd421fa931b5ef0cc7713a75cffd1c1fb0204364253fa5243b67ae60389723f9ea473e7558bc87fcb6df54b85c987ca269c15ddc4613157ccee6b9db
diff --git a/app-emacs/ocaml-mode/ocaml-mode-4.00.1.ebuild b/app-emacs/ocaml-mode/ocaml-mode-4.00.1.ebuild
index a0976cb97e74..a0e1dabda8c5 100644
--- a/app-emacs/ocaml-mode/ocaml-mode-4.00.1.ebuild
+++ b/app-emacs/ocaml-mode/ocaml-mode-4.00.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="http://caml.inria.fr/distrib/${MY_P%.*}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~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 0b9407323653..8d5cc4108b3d 100644
--- a/app-emacs/po-mode/Manifest
+++ b/app-emacs/po-mode/Manifest
@@ -2,7 +2,7 @@ AUX 50po-mode-gentoo.el 373 BLAKE2B dedf37969c42ac3dbeb4b4cb01af0f9ee79e40aad858
 DIST gettext-0.19.3.tar.gz 17414357 BLAKE2B b2b2085e8ee7339c6b6509807a9601163498edd9265f2ec899337943bd2c1394a905b01e8a9f44e7a57985cb11f4fdfe302ff9320dacf1da78fdc4fdb5e30fd9 SHA512 2ec02065b376cf9ec2b9d32328a7181d292ac940356a710f785450f37e03a8513e07d4b981824374671cfa2f60024e4649fc89ad79ee0adda87a8b9b63ad28e8
 DIST gettext-0.19.4.tar.gz 17717034 BLAKE2B 2022ed7963ff01c842c345f13c33ea7cc7221629c6beaa73cee7af68f709c6b8824d1e93ef919318b5d0a63286821efe2fdffbbdd709edf25a1f25be8909222d SHA512 274e00fe0149468e3073562f8f3b292597e9dbd82dfe8d068e4a1983914d25b603bb26f3fa4aa10e9fcd65826e3552c1871218342270927481e95eb64288ad97
 DIST gettext-0.19.8.1.tar.gz 19704011 BLAKE2B 17dc7aad338a26d71b818fea51e46a47dccf14744ee575ce86b591becaea402e36d64dc018e1a84113c356122ffef367cf2fa424e51ebc9720350040b4960091 SHA512 073042fa2dc48804c58e76f036130a669e19612c25427b0ab14d0b366b549a63751bf3af03bfd0745d7c4f72497a4b2aab26a3cc6de83189ce111679073878e1
-EBUILD po-mode-0.19.3.ebuild 537 BLAKE2B 3d25b14bf751bd076c8564b023f95f5359029c59c1886664f2701eec59cd88d713743521881a02a6810940aa104416f0aa77675dbdef7e569d6fb325a5f4e452 SHA512 8c68235c48f5732bead7688739cc00588a9d49c57f800f935cdd3b3a0ef51ee135ce541f7a57cc22d2e0c1f9ffccf7957e04f9dd56da933340c3e21b2eccf48c
+EBUILD po-mode-0.19.3.ebuild 540 BLAKE2B 32b7c6d5ea6b39bcc668757f4ee3414090d799ffd1cc973d514cb289c15bd844ade5b99d2f5f946a261066064686771634493c03c88b56aa5f5b8959574057fc SHA512 239d267800a7638f54bc5b33810c4507fed829d85aab6ea0b9b90b982819cadf6aaa2d219b83af20519218df0e953a228fd2f1211bce3b1019e8e2d63f60f667
 EBUILD po-mode-0.19.4.ebuild 547 BLAKE2B 4ee75a670d6036faaf684669926db9a8b33cc939d7ae93bc24068ea1a7d0b9098978407d204cd56dcd43e9ea06c961ffd8b390a712a5bfccce18f729eb4b8f3f SHA512 45220bc03bab40288510bb6e33d29f75ea6da1263176d64381651f3c1aef24c584b0eda00a3bd248e756157efddaa05c7de5ebec164e2093303bce2546628bf2
 EBUILD po-mode-0.19.8.1.ebuild 553 BLAKE2B 5799809a62002f314e805c63c47d7b1ee608de724534ed2b06b1866d6f7df4207dd9fd00259cc3e6fd6b7b60529aab11a2232a4f3d1f16d93eeb2d939ae36aed SHA512 1dc5864fb2dc0df0c008d90a9362fed05ce1b8c6ca84da32350e8eb6e1b83e8ce7c125d52927fd5331fdb0d68641585ad927df848c5533322b14da071b8b385a
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/po-mode/po-mode-0.19.3.ebuild b/app-emacs/po-mode/po-mode-0.19.3.ebuild
index c8911054c996..28612bd8cd85 100644
--- a/app-emacs/po-mode/po-mode-0.19.3.ebuild
+++ b/app-emacs/po-mode/po-mode-0.19.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gettext/gettext-${PV}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 S="${WORKDIR}/gettext-${PV}/gettext-tools/misc"
 ELISP_REMOVE="start-po.el"
diff --git a/app-emacs/s/Manifest b/app-emacs/s/Manifest
index bf8914a79ce5..c24731ba766f 100644
--- a/app-emacs/s/Manifest
+++ b/app-emacs/s/Manifest
@@ -2,5 +2,5 @@ AUX 50s-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b5695179
 DIST s-1.11.0.tar.gz 46771 BLAKE2B 5cc93e4f52ea4fbb4d4b9b418a632e8bbc789f0f36b9486a4a1b36725e255f4a78d1924a420fd04af5c2bc50a652adfc83db3285569367749fe3712f2f0b560b SHA512 364fa7ea875e9be6db464a826c1259889b67d87817b41cff40ab7da80e0bfc3e27dcadadfd005a64a895ee92644c2dea82789bdf1b1fe538501c40f748455608
 DIST s-1.12.0.tar.gz 59193 BLAKE2B 89e4c453b6590116a4cc08fc1be73519e6c95586c1e80b37f37d7273232aa707cd030cf74106fdd7eb7f05fe8ebd04253592076573472c3927cc1428b4c029f8 SHA512 036369011295dfde7567ae8bd479be9635de479e8821c3fe117a6c3827bc83492bb91e6ac64d4b20b061da95690f5585ed58f116a2b8c877dceee22153c8c990
 EBUILD s-1.11.0.ebuild 432 BLAKE2B 293d3bbd4140bfe798b5329a111ff9f61feda85ca3e913947206e71fdf0d989f60ab7019ff4bb17b0e6d1a0d311a8ab8ce1d1b91c0c280c1df1e9e4e9a6b6131 SHA512 311ded1caa4563d85c897a05343239330131c70f8ebf8e2aa41161315813503f683365e1216280759d9c5928537054525a9220cfad321535edffcf53786dab03
-EBUILD s-1.12.0.ebuild 447 BLAKE2B 2593ee9ebbbc380dab74ad7083c46720ce9d828587388884051019118df26282981477bf58c1475f28e4d0731b28d2f8ccbbe613315db1051dcdf54f4708e2d2 SHA512 28adae233803174685f50aec7b60a4a18607707307cac2c0320c52159002768cb43faac30c72a559c0ea83c66c3aaeccfd41aba1a5851277820713c23e418827
+EBUILD s-1.12.0.ebuild 450 BLAKE2B 18ab861ac73c276bd269358e2a251ec37dd106c6462b6f7d9d585f8d0224ce57a59e45cb10d7b01fd578584990d31b63cbf1e98b2d4aa677eb9477f255778a0e SHA512 623e623c52cfdf4873030297b55fbbcc695253c2ea49e94d30a24a37c9487548ed760f863e3008bfbdcd80f73a35acc581e01cab3ae978c073a280dfd0d1f8f4
 MISC metadata.xml 373 BLAKE2B 7553de03e6dabdf1b74352b5876211bc8f0c5a6ba9e6e84334c3ca069e4521ae56dd28df2ab3574000cd54765486f23ebe13db350821605e77190344514aeef1 SHA512 05637c489e2e7b23f585775b41853c60a7bbf1607679545a129aefd3b125ead6740b26b9c8045fd5721ea67df88773da6deced9973ee346647aa570057d46338
diff --git a/app-emacs/s/s-1.12.0.ebuild b/app-emacs/s/s-1.12.0.ebuild
index e89337b22cd5..8376aeeb30b3 100644
--- a/app-emacs/s/s-1.12.0.ebuild
+++ b/app-emacs/s/s-1.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/magnars/s.el/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 
 S="${WORKDIR}/s.el-${PV}"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/semi/Manifest b/app-emacs/semi/Manifest
index 4fa6511c0a68..20c50449256d 100644
--- a/app-emacs/semi/Manifest
+++ b/app-emacs/semi/Manifest
@@ -3,5 +3,5 @@ AUX semi-info.patch 1009 BLAKE2B 936ce69c254eca176f7bdbaae92dcda7fe921214b1d089c
 DIST semi-1.14.6.tar.gz 142549 BLAKE2B e417b305ad814b2a23fad4fd37057395efb47bdb61778aa167149eda4277cda47dc81148821d9e4ad3225a858c77f781a6565c3e49747d78882b9401fd5fbac1 SHA512 1011271c58414f4ca23da079f16f273b408643e0d9f4961db321b65c1ed9a7d4ca66a7d7cb5b0c9fa2b4904fa992c9188858de6131180ee30132d3cadaeef33f
 DIST semi-1.14.7_p20190517.tar.gz 152636 BLAKE2B a22b1f9a5de0a695de2d8e342ca313af05c12a1c0b597890d926496e9ce240e3329365700f91e6268cf399976ec067163ac8197c7a643e499d70851501f63798 SHA512 d25c940fdd0a048d21079d905ae91521a1f1247b8f78145baeba24c994c0d5b30985a76c909a793f82f6253b323fb4699bbf059ea48037bb49ae92505b0c6d18
 EBUILD semi-1.14.6-r2.ebuild 1297 BLAKE2B 9ac36cba82f5bada681bf11756509bc32d112b4c16b4063b8c09b17ba45e8d7dc266b405bce5c38f1686880c75aa6951823fb998c3c33c5e40d72787033a5da0 SHA512 bf13d405220097a73409b90076da8615ed3b773b6b69c7e95d2c1e159fc01aba0d9ee38f3be68fd239134e36d0f398c4dc7dc21728d21bcbc0da6e249b375062
-EBUILD semi-1.14.7_p20190517.ebuild 1335 BLAKE2B 913cd38bcccb9ecae2cafe12f4bd736dfff64e530a4bacd8223fd1dfc896df73aa5f19a7a6fe86538d3d2bc5b48b8dc79062b453c99f0f79dded95696c492b2f SHA512 cddab6a546842c474db2c5a663139401a1a2b3b225d120c1fc5781b0fef289af39cbf138fe9977ce7652b4a56f50342b738363df6413ad5e52b3a4ff7f66ecb5
+EBUILD semi-1.14.7_p20190517.ebuild 1330 BLAKE2B 3b2f0b304110c8574c6b0543249a4fd590b4f2d015086db1e3419d77b7ffd7e60a8e1a2c5848143284060144e5f57e60ccd26985e85c0b02c54f7a36e6a40b54 SHA512 45646f4be5fc4787b4dc900d6cadf1a823c04da17fca24c5ae06abad5a35a2d5fb502187fe79106537701bac26529db777ef5323ab38bcee8ff6364e8427e124
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/semi/semi-1.14.7_p20190517.ebuild b/app-emacs/semi/semi-1.14.7_p20190517.ebuild
index 0641b8318049..b235b850d5ef 100644
--- a/app-emacs/semi/semi-1.14.7_p20190517.ebuild
+++ b/app-emacs/semi/semi-1.14.7_p20190517.ebuild
@@ -12,7 +12,7 @@ SRC_URI="${HOMEPAGE}/archive/${GITHUB_SHA1}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="l10n_ja"
 
 DEPEND=">=app-emacs/apel-10.8
diff --git a/app-emacs/wanderlust/Manifest b/app-emacs/wanderlust/Manifest
index 022241bd5045..e56fdc359e6a 100644
--- a/app-emacs/wanderlust/Manifest
+++ b/app-emacs/wanderlust/Manifest
@@ -1,9 +1,6 @@
 AUX 50wanderlust-gentoo.el 244 BLAKE2B 57be93cdfb9e1854ec5841996b586843ca6e514830d2c979ba9aa400200a6514220e632985a5fd6191969ef5b8a2ff32c4d2d7edfb83017c4230028107b4ab87 SHA512 2057a8d18d5c7c91c968921799d502e02a61718d437ce9a69de68ebe4f409414a799ca7b5737a8994afd52793cf03eebce03b85311db02c441efba92f0d30233
-AUX wanderlust-2.15.9_p20130619-default-truncate-lines.patch 538 BLAKE2B db1e43daadd1a90eb25f1da6049956af1a242da0579b7e6f5bed31663c380d0626deaf33061eccd35c6def09f3f31243736eed44bf831f1e60fb5a1f06ae6baa SHA512 80cfa3aa2353cab77032111da3527660c9458d3bab74f73dde7030744f0ea3318f53c614e325bf4b971e1307f7dbecd9f645f4f4ba6e902820df5e56f02740f6
-DIST wanderlust-2.15.9_p20130619.tar.xz 818124 BLAKE2B b6bbd6f63d862f81a5a0c194f0fe1b276303f75f8ffde29c844f1f7d2d8ef55f1c211ac1d0b6c3357c2507b2abe73ba1c4c8f5fc65e067d93eb6bf23fd8490a6 SHA512 91bdcc1b29370b7be7a2072f4d8c638b3c0604ba31b5419952b848af268e73a3f199f07a88caabec56f66b38013e0f9cd7c1de26b46d1062ddff782e8080d4e0
 DIST wanderlust-2.15.9_p20180814-git.tar.gz 1207081 BLAKE2B f52259b15040287f0afcf0768b3ae3237415b44960e205e48d4b658f3e522db993b87bac59ee3d9ba94ad26c830beaf26d9cf5f03830fcb1f01e4f5567ee4804 SHA512 67616cc1d35b25af1b56fa800943ad0c7e7d9b35f99c48fac96b77a68a3eb8db02b36525021ff8bba4d181530505face2a58725b7dff33b1bfe4f48a4314949f
 DIST wanderlust-2.15.9_p20190623.tar.gz 1210223 BLAKE2B 50416e27062a9837c18660ea9a1a7a3ff596639763965b09925ca16c89617d159b9aa5d08d93d8b5c6a504da2b048df8b4c489d4fc11ff6abc530f741a5d8fb9 SHA512 369f8d93af4d0d98f66c4c8500aa3535e3f772d8a1920c1bdc434f0d9078555f40d0d4278937d97bccf0f417cf1b1fdeb6c8a891d42b2675fb7737382425c91d
-EBUILD wanderlust-2.15.9_p20130619.ebuild 1334 BLAKE2B 005b9b627032bf3722a988e788df39040090d81161cf8629ae26cde5a94eee3e46af3f55cbc7c28e58942c70fa589faa9bd2ba1271ef286a83326430dac75b48 SHA512 4460fde276caa8ae63a9af5ece918f35913f4749916e2abd38268f2aff146bac528f0514fd8d09504dd7dad7fbd6d115e08fc5a459f662afdd23556be97b2053
 EBUILD wanderlust-2.15.9_p20180814.ebuild 1324 BLAKE2B fb7abd2e4252ac534463e89502d674e4481be355bdb3c7c79ac73d09d03d31930a86af306cca4198b5020fd75c390b3864019daed60f22ff9461443bc0af6127 SHA512 a0619df4f09bae8da12e472a86e460f9791f4f95285253fde06a035a5ff469d2ad22e357697202815b9adc40b66942d92779649a3029f744d64de262e7a1aa10
-EBUILD wanderlust-2.15.9_p20190623.ebuild 1338 BLAKE2B 49acbff36a8513f7b9b5a11f9947507ef498b01110118e3434a1c21a6929f2796ac485c87cb7b0fc04bd2826ece6b1257f81a72d042833cdbdbb39d59f4b7f57 SHA512 fdd3dfdb8c0783365f59345651b48378304fa530ac0969cf947b5aa4507d7d1342479c713242668888e5ab57a7192d3d0e666c01570e0b767dde7108d58c4065
+EBUILD wanderlust-2.15.9_p20190623.ebuild 1335 BLAKE2B 2fe37f003e660137388d46587c743ba3581509b10795dfcb46cdc22b014a62db95acd16c430ebf3f4e83864b6be835956fcf68c08c11f426ac56f9b8b973cdc5 SHA512 615a1fe8b68b3f2c0684fa150fd0b548992e8322b00e36e42db5db663836042401e5e268cde98c19692c76aebf27c1b63d2aa140e5eb1ff5589be368a4177472
 MISC metadata.xml 452 BLAKE2B 79c5173a90f5687cadfb5fbf4bddfdaf4838d7b8b13d8df5f6221f2fc3a8ef777eebd7f13ec4bad09621082d688566cde30154b9c684deadd0e05c083e079857 SHA512 449539b7243e9d6646fa5cf7d56aa2cf227a6104c1dd2f1fbfdb843d7561b94315e649e2cfd5646093bed06f4f172e08adeb034a52b7b654fb3e49cabc45f8e6
diff --git a/app-emacs/wanderlust/files/wanderlust-2.15.9_p20130619-default-truncate-lines.patch b/app-emacs/wanderlust/files/wanderlust-2.15.9_p20130619-default-truncate-lines.patch
deleted file mode 100644
index d6da446cc84a..000000000000
--- a/app-emacs/wanderlust/files/wanderlust-2.15.9_p20130619-default-truncate-lines.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/wl/wl-vars.el.orig	2018-07-27 21:05:15.768467090 -0500
-+++ b/wl/wl-vars.el	2018-07-27 21:05:45.590468576 -0500
-@@ -1742,12 +1742,12 @@
-   :group 'wl-pref
-   :type 'string)
- 
--(defcustom wl-message-truncate-lines default-truncate-lines
-+(defcustom wl-message-truncate-lines nil
-   "*Truncate lines in Message Buffer."
-   :type 'boolean
-   :group 'wl-pref)
- 
--(defcustom wl-draft-truncate-lines default-truncate-lines
-+(defcustom wl-draft-truncate-lines nil
-   "*Truncate lines in Draft Buffer."
-   :type 'boolean
-   :group 'wl-draft
diff --git a/app-emacs/wanderlust/wanderlust-2.15.9_p20130619.ebuild b/app-emacs/wanderlust/wanderlust-2.15.9_p20130619.ebuild
deleted file mode 100644
index d655a9b90794..000000000000
--- a/app-emacs/wanderlust/wanderlust-2.15.9_p20130619.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp
-
-DESCRIPTION="Yet Another Message Interface on Emacsen"
-HOMEPAGE="https://github.com/wanderlust/wanderlust
-	https://www.emacswiki.org/emacs/WanderLust"
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="bbdb ssl l10n_ja"
-
-DEPEND=">=app-emacs/apel-10.6
-	app-emacs/flim
-	app-emacs/semi
-	bbdb? ( app-emacs/bbdb )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-ELISP_PATCHES="${P}-default-truncate-lines.patch"
-SITEFILE="50${PN}-gentoo.el"
-
-src_configure() {
-	local lang="\"en\""
-	use l10n_ja && lang="${lang} \"ja\""
-	echo "(setq wl-info-lang '(${lang}) wl-news-lang '(${lang}))" >>WL-CFG
-	use ssl && echo "(setq wl-install-utils t)" >>WL-CFG
-}
-
-src_compile() {
-	emake
-	emake info
-}
-
-src_install() {
-	emake \
-		LISPDIR="${ED}${SITELISP}" \
-		PIXMAPDIR="${ED}${SITEETC}/wl/icons" \
-		install
-
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" wl
-
-	insinto "${SITEETC}/wl/samples/en"
-	doins samples/en/*
-	doinfo doc/wl*.info
-	dodoc BUGS ChangeLog INSTALL NEWS README.md
-
-	if use l10n_ja; then
-		insinto "${SITEETC}/wl/samples/ja"
-		doins samples/ja/*
-		dodoc BUGS.ja INSTALL.ja NEWS.ja README.ja
-	fi
-}
diff --git a/app-emacs/wanderlust/wanderlust-2.15.9_p20190623.ebuild b/app-emacs/wanderlust/wanderlust-2.15.9_p20190623.ebuild
index 232c0e9e7dee..bfb9cae0e084 100644
--- a/app-emacs/wanderlust/wanderlust-2.15.9_p20190623.ebuild
+++ b/app-emacs/wanderlust/wanderlust-2.15.9_p20190623.ebuild
@@ -12,7 +12,7 @@ SRC_URI="${HOMEPAGE}/archive/${GITHUB_SHA1}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="bbdb ssl l10n_ja"
 
 DEPEND=">=app-emacs/apel-10.8
diff --git a/app-emacs/with-editor/Manifest b/app-emacs/with-editor/Manifest
index ffc731ae8480..d68d3d5ec4bb 100644
--- a/app-emacs/with-editor/Manifest
+++ b/app-emacs/with-editor/Manifest
@@ -4,7 +4,7 @@ DIST with-editor-2.7.4.tar.gz 30159 BLAKE2B 2e1e84dd1e4bd0c4f5c0e0bb8730e8c4327e
 DIST with-editor-2.8.0.tar.gz 30519 BLAKE2B 80502d3839818e5d0277b0189b7c7b814eddae72007c4018500cf64136beaea3eccf23c147f02eaf734558c2f24e0dd7cb2a2a80c09e700df3e5ba1e911ba798 SHA512 15df8706754d61ab8d57f866cde54833ea3126915352ed7ebd5020224141a069a62a3872694f95fcff66be165310f8111e4d4c9a1717189686460e8264636b4c
 DIST with-editor-2.8.3.tar.gz 30648 BLAKE2B 8989f8506fb58c1f54efa4fcb72fa8ddd477c0c73d82672028bdb027f74093b62c44ab5a545cd9db2e0e3222bf461e605aebc805112c5ae8486c224b22806c26 SHA512 389aa084f7dfb7f7b59a37802441718e20ee70d88b9af9631b1fc547e4c3238d053bb2b3ef50a4e6332fc3befae183a49d55b3c7bd7719a149cf83001d23810c
 EBUILD with-editor-2.7.2.ebuild 648 BLAKE2B 04711d6eb908747d7f6d6043f4460b20e4d9f0aabe88c416cb1dc384f68c6109ea8f623c49780c31e5da572b79905ee206d3152158239f7fb02393fa058733a8 SHA512 39ead2bcf75c013d858a46192058c928bc20bd35de52cd8b572138df7506145091220d4c637867418b1a3c211acc1dfbd655fec0f0001b459e2689b4f8de9e1f
-EBUILD with-editor-2.7.4.ebuild 657 BLAKE2B df8b950d0098ee43e157b40c92fb525a06485afb5f653cd7a0958904763aad2c2e8f9b6ab691c3710a9ee2fbae295213857234d4595df95c289f36703a8cc849 SHA512 d85d8c903296986b112df6fb2c1d84e6e6e8bc77c4dcdfd620696f697d45cd6b3c494ff96fe0581d5c56baae6791ab3776da12e6b7b695b15657ac9d0ae64747
+EBUILD with-editor-2.7.4.ebuild 663 BLAKE2B cb8e2bf8fcb28e09c2005574f69f22bd4dd737e91d7c7ce0a1d09dcea854f4f554ec0d5e365ecfc9523ba0bb802b4d3b780579c7d2995ec03c927f2ef939933e SHA512 8067dacbbe51620bd305cdeb6fdd959194142a877eb4595784b772965816fa433fed76eb637a50ffb2f491ffd97f50896d668b0987bacbb44689baf533249699
 EBUILD with-editor-2.8.0.ebuild 659 BLAKE2B d0ae1c4101e73725f922573b11996e1e4c5edf7b28f09106872dfbefc3688e21a05cc8885af648da2576e7356001f40e07aa3307c520fd080fcc1780cc8c1a8f SHA512 b69e940bee0264a1763fe11bc042b8aa6b2d93f6b32e0b8a5894cf4be93558765c94eb8cbaf88c27b2d9537a57c2e5185c5856d6e37b867f2449e6ebf6615638
 EBUILD with-editor-2.8.3.ebuild 659 BLAKE2B a373ff680eee3ae047e3d93100b27ad0287afaab6c3fe43e378f5d7da0807ec26668021c19c4c34e5bb2caa90f65726fe68561937a0a88a639c61f64a8b25433 SHA512 0e3ccacb84a2d7b4b0b03a4b27b277b68bfc2da88443a4bc32d0f11f06edc9fa95b708e8ee9c8717b37dbea0df03541189b23b30d297a7016e22f74477edc5e2
 MISC metadata.xml 707 BLAKE2B 7f4c983cfd2f8b87a3708301ccc570a0d88b3d9b21b3e089e44dc5b22f8313826d2469efabe7ff4dc2b27262f93dc4b5e8fe0e68b2b3b7a6f79fa6f34283eeab SHA512 bce73ef41113175585cc46d00fc1306537c71f860b1f2d699c086f2b1042d26fb02e9770122c586594ab9012eeea0fa73438a2fb9a9cf3b2c077481eef13a5b6
diff --git a/app-emacs/with-editor/with-editor-2.7.4.ebuild b/app-emacs/with-editor/with-editor-2.7.4.ebuild
index b5eb32a5c285..710b1bca64cc 100644
--- a/app-emacs/with-editor/with-editor-2.7.4.ebuild
+++ b/app-emacs/with-editor/with-editor-2.7.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/magit/with-editor/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 SITEFILE="50${PN}-gentoo.el"
 ELISP_TEXINFO="*.texi"