gentoo resync : 13.10.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-10-13 22:19:36 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-10-14 23:22:23 +0100
commit: 4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree: 76e74807bc479502e13866b581b6bf86734ec634 /app-emacs
parent: 30d6f67c98d149508509d5e86f176d558793acc0 (diff)
150 files changed, 226 insertions, 1007 deletions
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 34179d80d3e9..cb6474cc1710 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/apel/Manifest b/app-emacs/apel/Manifest
index ad040beb81c7..b0b27ad3e52b 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 1494 BLAKE2B 330d33b3436b607e3de6d46ef5ff15fb4208230c166ff3eccc837a57cdbc7885b5ec0bfad83976b1d3c2ad54e71c5dd1433903daf18c4b00fb14400f6d5c2538 SHA512 5b4881c7a966d1ee0fd82d931964d377c91a4df4647190000e3fb53a46c3eca0df9c705a34a762f2846a5a9696049d240b9549551e6a2e7151f772a16acf5c15
-EBUILD apel-10.8_p20190407.ebuild 1219 BLAKE2B 76c23074e899b3f5911d5c82d69168a7f2e0ff3e7475be5244af4fd4c7ad18c79cf7584ad8606de2b9e344a9a7d468a9f3eb69cb4b63e065738a0feaea35e3ed SHA512 a60a906313306d25d2854a5c42db8d7d345b9899462146c6d9634847d03569692841f0449b263c2d5762ca368f07d4fe6cee569b8e5132f1d7baff4d6f634758
+EBUILD apel-10.8-r1.ebuild 1484 BLAKE2B dc2e57cdb4cdf1422425d1420cbd5de3e1a0586b8f9f5f949d71bdd0d8a1e797fd56d04e52972f1a2d4a3c397a86d2fc7c01e1cbc5c81d0a60ec1ca55b6d595f SHA512 c5b2e98abbe8fee2a10f3d37ee59235f88cbaa13ec5b0a7490ea3d292f62c8d9f92af77d61ba31d86025576aae69475ef76ae373b3e6fc21800ca8d46ececc80
+EBUILD apel-10.8_p20190407.ebuild 1209 BLAKE2B 1fb17cb18b1d505253dd72863282938858acf1559243d50ff22e64d3d05eaf02e99032406aa7a06eca8ce1e04858d02fa5b985fb4bdc58cc17608cec16669490 SHA512 f12bfea5ac366f3734ef38820f496d1cb6d059c022fe51a6554d6a3d2f0d1226baf94ed0f441776d9e15ffb5ab093142b10d7c9ba756e6ab9c78dbf0fce4de63
 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 8fbddf334241..c32d8b3d2309 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 ~x86-fbsd ~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 a810dc04e8d8..329bedd5b40a 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 ~x86-fbsd ~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/auctex/Manifest b/app-emacs/auctex/Manifest
index 390b7c8834ef..8236c6a73f0c 100644
--- a/app-emacs/auctex/Manifest
+++ b/app-emacs/auctex/Manifest
@@ -4,6 +4,6 @@ AUX auctex-12.1-autoload.patch 1373 BLAKE2B 8ef031135245b0f54f3789a8070253f5a32f
 DIST auctex-11.92.tar.gz 1486606 BLAKE2B 6e34d1da3bacad8f2baee2f13eb44a5b617a342c294ef4d7ba28059b678510e1d161f3f02fbcf38128c09ab4996a035e5ec28898134b967d88ad621b8b477845 SHA512 758bf82903ba0499decf0ade77c7ac70865132a24195d7e8794538b7857c448811b7ef26149a915b60ed3ee34c2ebaddb3282a320bd459c9ee3f461d6ee9b84e
 DIST auctex-12.1.tar.gz 1476296 BLAKE2B 1dd5db94b5b7bb572919fdcb6c7dd2ea4d17f816204bedc69756610b80370ca748a06ab100ef8221107605a5e464b6a8c2587b728ba6a964776ea6dfeb7f7165 SHA512 4c27a3b16eaf98db164832497c497576fcabb274b24c6eb3060625b7711b1de91fce9a52f7c7caaec77a93768a6ce2ec173ab1ccb72f4c56c51cc4740d380d97
 EBUILD auctex-11.92.ebuild 1481 BLAKE2B bdc0e1ceac0c607c80405865897c909be1be015a968419e2ef7302abb104e465a54eac7dc42d1cdaca1d215dc8ccdd07452ef5db20d3b5cf9e40613da935560c SHA512 9048e1c9a7e11f5e6e8b70d50c507083f90f0a2b3d0bdcee52a320902bc4fd78a6f8069442dfef57fb6fe78d18b82bf0787d70c4a22effcd182babb9e0a9b226
-EBUILD auctex-12.1-r1.ebuild 1535 BLAKE2B 9fb6d5cb547dc7e988c6e66577f970dcbee52e1b47f61127bfac636c55264918344e8fe6cd877f8d1378cc24e211e5d121512d433707ca6f754f0843656bda17 SHA512 b873249e97163a1d0ba1fe3824fef57f374c116ab46c188c0071d16741fcb0f428fd80bd6ed447cee531f0d76cb65df76785569685d16509e134e5a8fc68146e
+EBUILD auctex-12.1-r1.ebuild 1531 BLAKE2B c7cf461594c94cc2736d9d558641d46140193876edd2357ed53f9c95cea672cb063c7df5f222292a5e135e154604f9dc756a56886f0d4aa8b6894cd13c79ccfb SHA512 8e5b921523ff9a99b92762cdc36c5699ff6415148c77a0ac65edb7cae00ae488ecd7fb0386ffe488d833efb819e835fe6c473e35be2988db953c60ec88101ca4
 EBUILD auctex-12.1.ebuild 1492 BLAKE2B 3903ffbf021f696664750fea082ea8ba60901fee19ceb8cc85e4e8eff97237c9af1452c20b49b860b335a7fb3947ecae45896384772cda1a203e589b44f11e37 SHA512 fb4cf29c28e2aab5a316d951033ddb2efc563434983f5e74a42c4d8a02068e70f2d2cf74801aba5fc7ef8696a2c1c3d1c5b23c5fc520c2cd3da9c8e0361591e9
 MISC metadata.xml 947 BLAKE2B 0b5e298fd9ca7112b8bd91bdc8cee455fff18d6ef21820c9e3da7058c860462fe96a7fe29792cc143d9e1876495fe3ee87e09e006b203ad448e511c12983c383 SHA512 61629e82f0004763e776db51ace13d583eac8d1199ebb61d17a101d48dd60258db4310fc938b82822c64b0ee9d39d9095fd86c316585e54ea9e7872a1247763a
diff --git a/app-emacs/auctex/auctex-12.1-r1.ebuild b/app-emacs/auctex/auctex-12.1-r1.ebuild
index dcd803eff7f9..cbb716d24678 100644
--- a/app-emacs/auctex/auctex-12.1-r1.ebuild
+++ b/app-emacs/auctex/auctex-12.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+ FDL-1.3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE="preview-latex"
 
 RDEPEND="virtual/latex-base
diff --git a/app-emacs/auto-complete/Manifest b/app-emacs/auto-complete/Manifest
index 88cc93078864..86090e88908f 100644
--- a/app-emacs/auto-complete/Manifest
+++ b/app-emacs/auto-complete/Manifest
@@ -1,4 +1,4 @@
 AUX 50auto-complete-gentoo.el 157 BLAKE2B abf93b1a7c9bb3d2ebabacf66c40e3177fc611330f902ef446ae31ed7f140c8fbbc68f35b40b84e83a002fe83e998d393ea4c38ed5e251f6edae08dc0adacb27 SHA512 40d03bf5dbd718aeab5d5f1ad0a15b24bebc86f641570611facf79f58f4a370da2ef1a5ca6edbbcec35d2530bdf5bf097c19c7f56c0c8f81eefa0df1a8dc01b0
 DIST auto-complete-1.5.1.tar.gz 196709 BLAKE2B 1593a6c0b60d9cb25a9597b7283d741042f79d0227c3865386a5d74e03d216a7e96ba7304e23148ac6bd18deb30f36777b88c4b3227b7482f28a224fd027b7b9 SHA512 e01a99d5e393d1d2309d6c616b4af34e8f3f2c585eaefad602ba5b6cf1890a18e851fd58804c4a6669c8131e9e7a5470c7aa650583a0bc1a2298875f7181614e
-EBUILD auto-complete-1.5.1-r1.ebuild 813 BLAKE2B 8dcaf20e92a0fca366129c4e00aa66bb40fb8a32767ab9c37718007d9495ccb61adcf7d03d0e4db0ac79a0654113db62ba8af73264f1e25c8316518757852566 SHA512 bdf3c57889f167b71674b09af43dd96721b8a656ac68a19b558540dc48f05bdd309cb3cc0fa327ddeb3077897141f3cef97223a7801f562c7cfd22b0e65698e8
+EBUILD auto-complete-1.5.1-r1.ebuild 829 BLAKE2B e9c2f1a4bf0c1ee92bf797ffdf9c04090b2b12708b96f55f27f5ab4327708ad94d56e615395a24c7439d31074f4dd7d48fc55d33b6f2d058dc63309839d8aa2e SHA512 69bf9399dc4a1bf2d49f7a6ee3f5fda2ccc330df57b7b8c88c4b7c27c599ed4b96fb316834a3d77d11a86b6b3ed6073b91360041c18d6a3cc6a4821be6688321
 MISC metadata.xml 620 BLAKE2B 7e888b365f8abe19d9218e8b3436b2867f601ab7296792212aaa4992b1ef123deb9c21ead67f8905424fc046b764c9b41423755af476cebaa4a1637e5d8641b6 SHA512 2e190f4c92b250fd0d675f38747b682b041212a5359a00d605df015dc02102a750d2284448668033182783826ebdd2722fcddc149ea0d9092e8c6a3438c71898
diff --git a/app-emacs/auto-complete/auto-complete-1.5.1-r1.ebuild b/app-emacs/auto-complete/auto-complete-1.5.1-r1.ebuild
index 284700ba65e3..506527eb2d96 100644
--- a/app-emacs/auto-complete/auto-complete-1.5.1-r1.ebuild
+++ b/app-emacs/auto-complete/auto-complete-1.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,6 +13,7 @@ LICENSE="GPL-3+ FDL-1.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"
+RESTRICT="test"
 
 RDEPEND="app-emacs/popup"
 BDEPEND="${RDEPEND}
diff --git a/app-emacs/autoconf-mode/Manifest b/app-emacs/autoconf-mode/Manifest
index 2a670128f042..3f6da32c9869 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 549 BLAKE2B 8439c9c21b32ab9e774078f56e54164d8dd9452f523f6f6ebabc93e284aa36544c0055391b8f115ef3d680c87c1c56930da360d68cbfe3cfd5028cc15039cae6 SHA512 f7051a3a65ccf461baa4716da4c2ceb8d384e06b3d6f582739c82429c35c43935ea0fb48728d0096980583fa6539ebb0397b27aee246b78f929454f12b4f1b70
+EBUILD autoconf-mode-2.69-r1.ebuild 527 BLAKE2B 5f69e7f7a30b370ff625339f229a1639aec0321e1237b1b80112a41d348aa35d849e9218d9f71e812a28a5de9abe4064fe3b77b42c0b9034a006f4e3c0bcad02 SHA512 f013cff7e278cfb310be8c2e7e5a8b5f1c2e4abc093b20cb074e0cdfeeeadb0b50c84efa1c19692be11bea583a5da0e8b2cc34853e7474d4df6c35654467b30c
 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 2e7a5cec2cc4..5f858d8c75c5 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh 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 135bc205b050..323432c16c24 100644
--- a/app-emacs/bbdb/Manifest
+++ b/app-emacs/bbdb/Manifest
@@ -1,5 +1,5 @@
 AUX 50bbdb-gentoo-3.1.2.el 63 BLAKE2B 4e066577f6bbc4ddcc7a5b102c1bc650fd957d82468ed9782a97520db6acb2fb600372c4fcff7c21dd020080a3d4a5f41aaea15e5751ed5f22e17b9d2e04996d SHA512 3cb67cba1e12630c40b7c78572e7af0418c56d821c327c7b963cb00401a13f47da622b3a8e7a67795158b1394e860bcdf5ac3e478f8df9c5e3a97963bbd65a2e
 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 1258 BLAKE2B b3c4286189a2753a9a2a139c7c7f7b2af204153c070efa1f385a3e70bc575f2b9f4a9e39c0fd925de5adbea5316c50130f728018caa9fbfa12ca618d5e00fbbe SHA512 fd151528c520ec621c0c4b57fd0f5392c53c02f40478fae682abf6c237ff48bfcbd5fff69994a5f85edb4d9fcc187f82b43eea4d52a4760e4fc40ae0b63cde02
+EBUILD bbdb-3.1.2-r1.ebuild 1265 BLAKE2B 1a40d52bfd54f724cf4811c1538c67fc6f51e34f1e2766a1f93a43941b06cfc13ef64ab62b3180160166adca4ce0785b6d182017ca27f8819a61e53e0f5d5f77 SHA512 2c1cb1cca86c94d29d4064adb8bbcd455ba58d5ed63f7c7256b1c84a7d3b50b774696dd367f81e3698c8dd77c987ed3ffbef36004f8642bdff563d9e11b8dc27
 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-r1.ebuild
index ecd4dc638b58..14b335632f91 100644
--- a/app-emacs/bbdb/bbdb-3.1.2-r1.ebuild
+++ b/app-emacs/bbdb/bbdb-3.1.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+ GPL-1+ FDL-1.3+"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="tex vm"
 RESTRICT="test" #631700
 
diff --git a/app-emacs/binclock/Manifest b/app-emacs/binclock/Manifest
index 0f12f47c551d..fdf3364df2e6 100644
--- a/app-emacs/binclock/Manifest
+++ b/app-emacs/binclock/Manifest
@@ -1,6 +1,4 @@
 AUX 50binclock-gentoo.el 100 BLAKE2B 99f128a3e3033ffabad1d18281dd70d091bfa1ad7ba213a87383bd0305829e5368a8d006a6a33bb2a6280726af11df28b6711bc8037fddf6b6b1ae254022abd6 SHA512 08997bbbba82da6b79ae2b8f60396b219bd837674d16a658c62306e13e3fe667d228c7e6e0949b9b44a2a346d3f5d2996cc853c2180ad1c1d877940da97a31f0
 DIST binclock-1.11.tar.gz 9594 BLAKE2B d5de646996cfeecde9000dcd20545005ff036eca24230cb847f4b21a3f458884f955dcb85cedfa21b8c01d60e030f95d426fa8ebbd8e66a61f2e02c0d64d9e62 SHA512 94ddc4a653a1ca119ff86b1c66cf74c3a1b3b15da32d56b4c0080d5226111b0ac31cf4262078ec40488172b14a6b37e66ba16c4bf7b7932293cb1e2a6199c0cd
-DIST binclock-1.7.tar.bz2 2734 BLAKE2B 57d872b2dc4259ca8cb033b8ff5359dd9f57fa2c7469b1ab6f2d0871cae74efef3f4874fac712b63ff783f50e0722e1959586a2e194426e0098c4e3bf16d8b5a SHA512 fe7d69605dc72777236930368e2900b71717a0a96655afa939c9cfcf76fb6cccc8c21cd81e933eed210a9e948b6d3681eb60f494f4aef276a1026a6dfe186354
-EBUILD binclock-1.11.ebuild 451 BLAKE2B e9a7d0fb9053c1b49aeb34fefa497158c5b6c6d6f8863339f661994747c73c53579f504fd92d974d20c9100daf3071f981063a22ca795bf9840081b3e1d450ee SHA512 7fa52a5dba3a5d1c9823fe6c748dbdd9a0362f9a9113dd6a560f51e3b3e7b01ee852ee26021ee90a9096eb48cdc56c0370509862f60f18fa1eaa86824cdbf201
-EBUILD binclock-1.7-r1.ebuild 378 BLAKE2B 3b47dabd1b888c86dbc7fb29e1fb5ec3c3dc2acdddb9c6694d5f9e8020fd65862c521436c4cb6098ffc295a736015beb5d543c8ab737942ff716d775d2ea77c3 SHA512 964e059e07410d2fb8b878b860cd57e53d4000c7ce3aa7f97297b6823999a3f024a71f7328e621277b110de05644247077625d06f6bb88dfa9e35c942ba6eb33
+EBUILD binclock-1.11.ebuild 449 BLAKE2B bf650379b786c997256bb14c12e6bdead55f840e42489a2db64d304ea23ca589332203f6fd9a8af034e9fa15b1ee33f9e00e898b3a209318b3b358208301e5e3 SHA512 1ac420b9297a37869174d60d796d6161c3f9ef156c53906e60106053256bb32d95e06b86e91830f7c13772632af0bee0d79c38e2741adbbb49324ee48c98e1b7
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/binclock/binclock-1.11.ebuild b/app-emacs/binclock/binclock-1.11.ebuild
index 7a699882893d..95d67fae9777 100644
--- a/app-emacs/binclock/binclock-1.11.ebuild
+++ b/app-emacs/binclock/binclock-1.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/davep/${PN}.el/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2" # v2 only
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86"
 
 S="${WORKDIR}/${PN}.el-${PV}"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/binclock/binclock-1.7-r1.ebuild b/app-emacs/binclock/binclock-1.7-r1.ebuild
deleted file mode 100644
index c64fd22f29f7..000000000000
--- a/app-emacs/binclock/binclock-1.7-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit elisp
-
-DESCRIPTION="Display the current time using a binary clock"
-HOMEPAGE="http://www.davep.org/emacs/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86"
-IUSE=""
-
-SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/boxquote/Manifest b/app-emacs/boxquote/Manifest
index 842644e43114..9cae827e7e4b 100644
--- a/app-emacs/boxquote/Manifest
+++ b/app-emacs/boxquote/Manifest
@@ -1,6 +1,4 @@
 AUX 50boxquote-gentoo.el 72 BLAKE2B e48064d060b7d040459abd279a36fd888d45300255c0da85f0d260972c2a682d17c07fb2697381e428b41ac3e469fa579323d7301c4b71bcca31e1469c1304d0 SHA512 d11e537a8e60f4dfc3eccae94709e382414d76cf470c5dae673d6b3b5ab34e88fa9716b58a5a2ca1d0a5673c926fc04c293484e9e53d0861520303f0a98d4b87
-DIST boxquote-1.23.el.bz2 4957 BLAKE2B d132f6f4bd6448bff498b6b8d7ad20b2295e0febff025b02d5d6bcec58d6a963749a3f0b429269fdf32e9565caf490f09b1ac6466dc251a3b7dec0b546c4333e SHA512 776835e6a21ede6e7ba82a57f381f0c9c3c740994b4d463b76d1f8a328fdf7b1b996cf6c593c3300a68fa773f1dd21b7c1a8ccc38536d5f1874973541181646d
 DIST boxquote-2.1.tar.gz 5339 BLAKE2B d599dabaf61119cb5796a478061e998e68c6f1ae76ef7e7eb2ff22e3840bdc923a8bb594478809745ac33da6795159ea6ae455606afd171320fe18e971408a36 SHA512 ca64b72528b1e5f8e57e7c003508ccc91b876be5d5a05b65fc38556cc3259993597bc6aef52633f4012002ee343d28fa287f6ffdbe3646f84b9d08520d4925d8
-EBUILD boxquote-1.23.ebuild 480 BLAKE2B 7d2487b67fa7e4a14f46bc0138655ab790d1a43f067251c6cffe6630f059bb9a3644079def4be9b33ca05cff8d8aa8a50a41a3e1fe68341dc42c08a08bc641c4 SHA512 861a1c21b61a5f429d0eaf49457928f4bb62a84c583e4589bb3e0e162c8c563d667e8f7a3786334881789d11d560e1aa776a3b4cc3f06de8a02b7f449915a672
-EBUILD boxquote-2.1.ebuild 491 BLAKE2B ff57a8493bb31394ead2e982b5fc5972283777e7d0292cfbb5f2d9f03711c54b69bbd98ddd8a05563f9fca2a5f9f33a473ef6dc746380adb652427520225db92 SHA512 1afa7636425608491d1fa62daab25ef8650250c433c12098bb5ac8a08926c331f664c5a58de45571bbdc2e9436d85d6971ac26444fc20b6ca347a8eaad66a3ca
+EBUILD boxquote-2.1.ebuild 489 BLAKE2B e33a45588645cc19a3dd5913d97e52d97b166ab158033fc1d449920ed7729d62807d4f91d2a67d0e1e92660cdd0e20888cb86d251f138cb66263b974fdb16f9e SHA512 1bdd384194d45d1568e411c5b92f35f0e7fd2fe238335c01fec8e06390a34add040b1c02c9550b5bee90f024ad7fece39aca7139040e33ff4e65ceb2d028a8f0
 MISC metadata.xml 854 BLAKE2B 9c00652e8f8d1fb2a28ffa47ff1c31c7f78f3e7f0ecc9a543319c65f1ef7f0b83d8bd14b6f2f494d2699a8f74ad71eb6364da50b89f2787d983cad571b7942bf SHA512 55e401b6bcb83fa4c2aef7e8204cb845a287e9f3d96405918ee96c04a4f4f6b3a78b6a3ed45467a9c55ee92ebec65e732d19f1067b1b9c1a8fdddde95cda92b6
diff --git a/app-emacs/boxquote/boxquote-1.23.ebuild b/app-emacs/boxquote/boxquote-1.23.ebuild
deleted file mode 100644
index c043cc42b678..000000000000
--- a/app-emacs/boxquote/boxquote-1.23.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit elisp
-
-DESCRIPTION="Quote text with a semi-box"
-HOMEPAGE="http://www.davep.org/emacs/"
-SRC_URI="mirror://gentoo/${P}.el.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	elisp-compile *.el || die "elisp-compile failed"
-	elisp-make-autoload-file || die "elisp-make-autoload-file failed"
-}
diff --git a/app-emacs/boxquote/boxquote-2.1.ebuild b/app-emacs/boxquote/boxquote-2.1.ebuild
index dc92b6a17327..304eb0cd2cda 100644
--- a/app-emacs/boxquote/boxquote-2.1.ebuild
+++ b/app-emacs/boxquote/boxquote-2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/davep/${PN}.el/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 S="${WORKDIR}/${PN}.el-${PV}"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/color-theme/Manifest b/app-emacs/color-theme/Manifest
index 567e893b25e1..a0f910084fa2 100644
--- a/app-emacs/color-theme/Manifest
+++ b/app-emacs/color-theme/Manifest
@@ -1,5 +1,5 @@
 AUX 50color-theme-gentoo.el 4375 BLAKE2B 0a17afad7fd9290dde1992e813711d9bed4b36ec9f2a3d41ab5775dc55e125f7f3cb9b74d1230f1202ee3083b68c29782c3cba955444c04a42b31f3f66b39b89 SHA512 318354c71e75b343eaf90b3be2f94c0b6b93c776afe3289a5c18a5b837478291ce6a8d554a6357c13f14cbe568bf10c5d7ed9690ee8c382ec3cc4aeeac70412a
 AUX color-theme-6.6.0-replace-in-string.patch 1173 BLAKE2B 4e27361d5212afd78e6b94b7b20c3e2512715a280a98fcecaef3b3202ca376b5749c37c3dfb3f1d27673a3421d12de6fc0d7b6c2ee07f1720a32d737558f1e2b SHA512 bdf1ebb03c1fc70bf78adf4886b005780d1c540ac59730e644111f5a3a925b6b05d2e910520b67ec768815f0fecca3a5e617472ca9e415900daf890ca77bc6d1
 DIST color-theme-6.6.0.tar.gz 124858 BLAKE2B b98e97b6c02fa9bac30c5eaefaa1724f751e1176b99fcf10e5d44507ada0c82e2cc2df8352c6d605d097a0c3697b071c2cf9bfe32b4a8cbf67cf00dd5c1545e4 SHA512 4faa22900f6ad4a1dd57452470e23b57827d3f02bf2b9e3c4eed6f5693432d6478aa5008e67f219a95412a63fe52dbcad15b0ac7a3b4d39f1d28ceda75e5e76c
-EBUILD color-theme-6.6.0-r1.ebuild 980 BLAKE2B 77f58c6866305b87ae21e2ddead5ecf7968ef2012d961ff80a56ce4ceae65c4fb6434a91594b40299d08e7fe82b5084866b9099aa5b8b96670ff94aabb9c63be SHA512 58fb0e52f726753ebf743a464ce12bbadf8a81c32bb50247b1797fd9d60b3e5a4b64b71b8c9be6b6ec87ba0540ac7edce161445229b59386a71ccd41c59b3d13
+EBUILD color-theme-6.6.0-r1.ebuild 970 BLAKE2B 859260f9944cd15b0d0cbfc7128ea9b96519498486252845deb877997729d73a5e487108a2c2ae0ca4d844f5cbc474ef7a76f82d48421fa7fc081c2695654146 SHA512 fcde2a903f4e0e733311f7dc019baf3049e0e2ada53ef027530ed07a29e99a72dfa9df9fe004c5b69b560233c82702d744d166114bbf544f0a9f485bb612e4bd
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/color-theme/color-theme-6.6.0-r1.ebuild b/app-emacs/color-theme/color-theme-6.6.0-r1.ebuild
index c3182eaae203..4f73df7cda67 100644
--- a/app-emacs/color-theme/color-theme-6.6.0-r1.ebuild
+++ b/app-emacs/color-theme/color-theme-6.6.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.savannah.gnu.org/releases-noredirect/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm ppc sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 ELISP_PATCHES="${P}-replace-in-string.patch"
 ELISP_REMOVE="color-theme-autoloads.*"
diff --git a/app-emacs/css-mode/Manifest b/app-emacs/css-mode/Manifest
index 1bb3fe3b19f4..7dbf29dc61a4 100644
--- a/app-emacs/css-mode/Manifest
+++ b/app-emacs/css-mode/Manifest
@@ -1,5 +1,5 @@
 AUX 50css-mode-gentoo.el 171 BLAKE2B 031ee725bb003a73a9aa98d35b4f8fd0fdc853e81c23f93ae69ba64ab24590e6ce22df442ac6ad4e1651f5a543b5885b0d661c47b7b11514df4fc2b8f355f7c6 SHA512 18713c42439aa4d076b7154035ba369060bfc8a0e98e845b7140e137b05ed0aacc2a25ec93612e950fe930c5605d6ea909d5d1ed79433d1472f357bc272ce96e
 AUX css-mode-0.11-no-compat-kbd.patch 875 BLAKE2B 587f49af1b892522d94ed10d41ad2555f078c41d02d4ad0fce0c1643b5449ce49a2dffed8181f8e60949e36a481a7fd5795fff7c9b63aec8330e5db6baa6bc8b SHA512 27f298f89cc15c2104fe27712f0a02676074fcdd8417ec8cc515ab461e27aec63d6325fdfe4c269c4212fa4c2e12975dcfe7d7eb345b2f31a4d12dc0189c523b
 DIST css-mode-0.11.tar.bz2 6848 BLAKE2B f5110cb5e1db9cddd47372dd8ba180892b9d9a5999643832227fb710089c08526eb077393350440ac30d2860a84dd821368323a528ce2056ca82a890399302ed SHA512 b93574fde8bb24ffc4dac6ddda20db3ec3c1834c1201f250f24805d31c7972edc2ffc157e7717327e7baac5c71a1d943a9d80bc7bec96be99c44cd2ab16e0e03
-EBUILD css-mode-0.11-r1.ebuild 653 BLAKE2B eab51857c0a3d22abdb30c0b8ff6c7689da3d3a5c8ce4d355e80d9c2c118c41dffb20785c537555c08267f14b71947ae0f5ec4ec4ae4db154c92fcf7c04a9cba SHA512 e9ac0302ff44318e44a3ea22df34d08371ca8920151ebec9681d4341a93bdbc1cb4327437bdfafa28b6eb4c97318cc934cdf189b60c592e2e8a0940154051519
+EBUILD css-mode-0.11-r1.ebuild 643 BLAKE2B 516f73e6fe0ea4b138dc3ef00e8462d370fd402c09b963a9a41aa51baf8e5f27e617e9fc036701fc9a0217d5e79e3bbbb88b46eeb3af3a711cfd8af236fda30c SHA512 a81fbe1df7c95af731ef617e3515b6ce34412a889eb65be773a6f9f48c3af5164aaf4b3f44132a35d16e56d0f41aebbf3b598608cce092477b28bbcd29085221
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/css-mode/css-mode-0.11-r1.ebuild b/app-emacs/css-mode/css-mode-0.11-r1.ebuild
index 25c3581915e4..c8c08fb64f18 100644
--- a/app-emacs/css-mode/css-mode-0.11-r1.ebuild
+++ b/app-emacs/css-mode/css-mode-0.11-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 ELISP_PATCHES="${P}-no-compat-kbd.patch"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/doctest-mode/Manifest b/app-emacs/doctest-mode/Manifest
index 01e8fceb523d..5c1a117214c5 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 634 BLAKE2B 9178085c1b5a8ecf1443bd75fbf726a036e7db2b5aadb11b3f7b40bbfd5cd16575df09cdd76f8664702464a8f5e32fecbc243b1b255f01a41922c5059424530b SHA512 d07d13675697d1df22765a9c2e9ca2ad1d50983d2ccf3f5e69375e893a0efe9157464be56fb8668dc138ec2502cfa9f0f77f63c18c294cc94a3d55cc17939dea
+EBUILD doctest-mode-0.4.ebuild 624 BLAKE2B 4337ffc9724d9ffdcec18eaaff7c12f7f2a5dbd362ac0f49d65a8e151d6ecd64b3ac62e6d907db9e91c9ee403f93a8cc12717ae6c1a901ee15daf5394c054b57 SHA512 c421b824245da84679dc48a69f2687c856d75184691d0ae199ab2d0abf5f29287bbb9ee245c3a23db33510b786acec6a4a4ed03a7a2548e546c0d950e1e40ed0
 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 c0b80debbc71..e5370dc7ea27 100644
--- a/app-emacs/doctest-mode/doctest-mode-0.4.ebuild
+++ b/app-emacs/doctest-mode/doctest-mode-0.4.ebuild
@@ -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 ~x86-fbsd"
+KEYWORDS="amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh x86"
 
 DEPEND="!<app-emacs/python-mode-5.1.0"
 RDEPEND="${DEPEND}"
diff --git a/app-emacs/ebuild-mode/Manifest b/app-emacs/ebuild-mode/Manifest
index 55e58e10ac24..0a59fdb9b442 100644
--- a/app-emacs/ebuild-mode/Manifest
+++ b/app-emacs/ebuild-mode/Manifest
@@ -1,6 +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 737 BLAKE2B 18addf37cb9fb79decaccc0608f8e6d89ddd0fb50bddb902fd4bcf50d49803fd767ea7c1c2b3fa3f7d784b9497f243878d90439161f46e89d27db99c03caf660 SHA512 8babf31bdfc3c9efd68d333803d2d5d2edfa9a1d3e68dbdb114d5df917395186588a7b0cf02e523d2b87efd421bfdb3ab382655e2f74746777d131384a1c3780
-EBUILD ebuild-mode-1.47.ebuild 736 BLAKE2B 75dc00c3beb75c965d25a279b48589b34b9723e129e95adcfcf79368f49624a633f3ebd592e421ab8c9495d296939091151ff49d75dca9e5b19dbf120f617b6e SHA512 b6b9543141d5b0955a52227670a57a5ee13a93954515b099d64d586f01599cf5766792dade5c8c669bc92c318d80daf75b914f050c2aa5b4b51833758a4eeffb
+EBUILD ebuild-mode-1.46.ebuild 727 BLAKE2B 542625106996dbd3d0b6d6216f66af7bee85d2e23b9f759977a62a7c5ec117f2e436cea064fb36a6e88eba4ae1f306dc45376079e5cef513cf685b49038a186d SHA512 c64bf9cf2ff9fc7fa5407eb78117182ab176d88591a049edbed246f6e348a5fbd488f33d988ab80283afdb057c04f201353433d12b62312f25dd1d6231a9d0ea
+EBUILD ebuild-mode-1.47.ebuild 726 BLAKE2B 1bf333e77ea78f7db89ea5a73221ba5f842beda79f7ad960e06b6e857b846375e97b4a9c20dd05a10c3d5f0e56d78286cd87da2a0732ab5bb1d9fef550936e23 SHA512 b0b685403508fe963f5af805a77f5d38d0d82df9156363b0bfcb8cf3c6f0d8a931567e7096bc111f0dd610b3da3a70be3b580c35731fcbc7153831fd8b6b3b2a
 MISC metadata.xml 426 BLAKE2B d0b4dc2bd01fc6fb2f0c58b01676b80d09a4677876adc9681c3c436ebc437b6b034187b19fea30cf980927fec1f6a9feee9a0b7d1a4dd15818d02e4c8ec77af6 SHA512 058df2768030185953c7ac3622819c430681eae3ca60b0d02ad48ed22ab6a0ac7c169d93f8f54a3dddcade3f84c9bf58f662a58bfd78217ea8fc27a580ab9077
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.46.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.46.ebuild
index 9969f7365562..f3b7d240a8ee 100644
--- a/app-emacs/ebuild-mode/ebuild-mode-1.46.ebuild
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.46.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 ~x86-fbsd ~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.47.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.47.ebuild
index 62f2cf76c60d..40a8bf470249 100644
--- a/app-emacs/ebuild-mode/ebuild-mode-1.47.ebuild
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.47.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 ~x86-fbsd ~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/edb/Manifest b/app-emacs/edb/Manifest
index fbb72fd94d40..ceb0fdb3f7aa 100644
--- a/app-emacs/edb/Manifest
+++ b/app-emacs/edb/Manifest
@@ -1,7 +1,4 @@
 AUX 50edb-gentoo.el 212 BLAKE2B a56c87b00e29d06901284a20f2458d32608d54f27737b9c67d38c051de54c02fba21c4ba3aa968af7aec5807a2f10882fa871ec482722fc80910cb191e7f51fe SHA512 cf320088e7597de4b15fbd697048a5a5b39bfc75ecb6a22747c853f0a067f10dcad39b828207ec8fe81f58617a36b929bd92aadcbf7a5abfb54278f0d31489ec
-AUX edb-1.31-skram-path.patch 396 BLAKE2B 90969cc1acdff236a2494312fb536b1acb7e991e605dd698cb2e5f25405b3a8bf2866d868d7bdc49c09546660c1cefe09fea63bc09709ecd31d3c37194b56ec8 SHA512 f54d3b6c3483a4765dedf60f6cad6f3c1247845ff116f70be791e3ad2674e1352f204a5d865142d70d4bc9c82e25d42f7fccd2b1514aed46e6dbb391002eff8f
-DIST edb-1.31.tar.gz 585728 BLAKE2B ffe1ef3171724b1c608d347393955615a48737230f7493e22c48504134682d1c73397e1e559708f16ab2284a17b4b6baff7dbb15e255511b6ed5d07d6a22e249 SHA512 99af00f1e876b490205e9c3b1807d0af0efcd9a5bff018629f00e36d1572f7d05e979d6bfb50f9c15edfe3ad5382fa6f6171f13c638f3143ece53790bdaa31c3
 DIST edb-1.32.tar.gz 692581 BLAKE2B 3f77d6f9d6550ce1c064dc0820fdc9a24293964900d4f390ad1456e79f42444d7c9512585cf230d742e66360011e2e314446748e23395bee1e7f8086c38853b7 SHA512 ee8bd642c019d30401202f540b37f28c914c17083123ca61b741de72d168ecb855d0508f922af208bb717b02b4819cf6f3c5137d589f2e858410a3e9ab4034e0
-EBUILD edb-1.31.ebuild 783 BLAKE2B 788badf399ac23d39dd3a5494c24b74ccb663175220359cfffe44d336b601ecb34438423bde09cbe076e8d10399e30c317630c236198afcf2de743a7bff4d45a SHA512 030d7a4378f971e02de0fc4fd661c97c012b594ed164c37606c4f6e79bc4ec6c600cc4b0684c24e48f3509f9f5a05bab692077d4231f1f7f0e117a16363473d7
 EBUILD edb-1.32.ebuild 745 BLAKE2B 7414162ff1e3c34cbb3cb05db6e685c348e2700054b991056512135a06da06e0af0fca5b8f4603b41b6dae03ae462962e73ac95b2a981a4354027cba7599ebd6 SHA512 e2c8e63bef73b03eb1d4a8de56dd80c5f8799e559808a59acc8b90ca6297bb1884ffdad6ffd50eb6e4723ef8f4df2e76bdb24655b30615336682540bb4f8e9e4
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/edb/edb-1.31.ebuild b/app-emacs/edb/edb-1.31.ebuild
deleted file mode 100644
index f635e268cc2b..000000000000
--- a/app-emacs/edb/edb-1.31.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="EDB, The Emacs Database"
-HOMEPAGE="http://www.gnuvola.org/software/edb/
-	https://www.emacswiki.org/emacs/EmacsDataBase"
-SRC_URI="http://www.gnuvola.org/software/edb/${P}.tar.gz"
-
-LICENSE="GPL-3+ Texinfo-manual"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-ELISP_PATCHES="${P}-skram-path.patch"
-SITEFILE="50${PN}-gentoo.el"
-
-src_configure() {
-	default
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	emake -j1 \
-		sitelisp="${ED}${SITELISP}" \
-		infodir="${ED}/usr/share/info" \
-		install
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	dodoc AUTHORS BUGS ChangeLog HACKING NEWS README THANKS TODO doc/refcard.ps
-	dodoc -r examples
-}
diff --git a/app-emacs/edb/files/edb-1.31-skram-path.patch b/app-emacs/edb/files/edb-1.31-skram-path.patch
deleted file mode 100644
index 75921ca00160..000000000000
--- a/app-emacs/edb/files/edb-1.31-skram-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- edb-1.31-orig/skram/GNUmakefile.in
-+++ edb-1.31/skram/GNUmakefile.in
-@@ -48,7 +48,7 @@
- #
- # Until that change is distributed, here is a workaround:
- wily-emacs = $(ebatch) \
--  --eval '(add-to-list (quote load-path) (expand-file-name "$(topdir)"))' \
-+  --eval '(add-to-list (quote load-path) (expand-file-name "$(topdir)/lisp"))' \
-   --eval '(require (quote database))'
- 
- sk2: skram.data
diff --git a/app-emacs/elscreen/Manifest b/app-emacs/elscreen/Manifest
index ddd60baaabf7..c1927cd221b5 100644
--- a/app-emacs/elscreen/Manifest
+++ b/app-emacs/elscreen/Manifest
@@ -1,9 +1,4 @@
 AUX 50elscreen-gentoo-20180321.el 82 BLAKE2B 6f7d7f574bc931161a8baac7c4bd43165703c1b4102755950aaffabb2c09d42be3ce546c0c546ffc43a04f5c946f69e43f92d4d3137befb5a299c2542a331029 SHA512 cd303735ee0a8f293e0d0d5e3e7dafd01d398d6eb6cd8871d99e6727f4d3c06711572ef9a199055f639c2a44c1f8833fafde37f2c71ca92bffc4f7e2454ab2fd
-AUX 50elscreen-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
-AUX elscreen-1.4.6-emacs-24.patch 5925 BLAKE2B 1c1b7868093a56aadf4e8b2794d767b07de9123dc2be71f4af063d0ab100ca06a187186c3f685024b44b97a69cdab06732dbda3cf1201e5808e5f531d4b4aa07 SHA512 581f5c2c30fa4ae5a8a2266c40842076126a365f947ceaae32299ac680e74a7ca33b077130ff566c12008c79ba4da504160290da72d33ffab5a4d0b40e46557e
-AUX elscreen-1.4.6-void-variable-argi.patch 2789 BLAKE2B 173a2c94528d93660009e0b73e58cedf9343e415f789219350d41fb7b90fc12d7ee7774f6b5b9a97277d54a34e04b4ac4ff93a413018ca0dc872202ad376e6d2 SHA512 254c76e291848caf19983bc896b5a405b9d52dacb871ba5e9009d77968d5249c2445606fb2507f0d0f67859a955aabf4c717dae2acf94f52daa999237fd27333
-DIST elscreen-1.4.6.tar.gz 21680 BLAKE2B a23b7eb617e67205e816cb5c6588f65d8140788ab9c32b90b9c1f53dc4497e6f8250f3c51c38aa40780872f3d878a34aaf2fb455c61640d327df6e3166a59dc7 SHA512 2f19941c9c3e74bbe3912e99f53710f42d33a5b063af99c3907c478d2f571a50a75942519bfcad3bf178585f736bb6e2baf2cdffe8ac66b8e4dbd1b0d881fab2
 DIST elscreen-20180321.tar.gz 36840 BLAKE2B 7157a2040cb3d1bb60eb5c4f672dde35b5f1437a83a0af32138d252cfe44bf8a23013f5672182ece7f2dda5bfbe266247188d59408005d8963837d0958c100d3 SHA512 777835daf328aeddfd8999c37553bf5f57683292cea4f2fdca774e16d7a137ad26e791515000e8092c2ba5e4c2d0aeb03b260e4a2069c4f8a091b014d69ff201
-EBUILD elscreen-1.4.6-r1.ebuild 905 BLAKE2B 729e11a757c23a3a863c8fcc8c1be4971793326e03abd0c1f914518cadbf5ad041b1ddb9f3c1eb3e8fde4088f880e28779998498417a3ef65ef2152a8cae356e SHA512 9a5f82f0fac66c21e48ed258768bf9ab76c1c01dca4a19227d20e5785e262fbdf3256949fc215e8314d84cfe25f2e02d6c1610c5960d93fab97f315f8c516485
-EBUILD elscreen-20180321.ebuild 764 BLAKE2B eb56f28fdcb4aae02775c7630464a8500514bcd389b0b12dfc66bebb95246d704154f2bac45e22aeeb43df19fb7dfff5def80da365cfb675f652cf48fbd35b89 SHA512 7ce18561ab23a1b7bda8d0505f272b2e109006ed4548d485d6bc7ee7bc730ce828039d67b7c195b5b0c34d4d1525330ebe571cf81e6b90ab180669aef1f8d296
+EBUILD elscreen-20180321.ebuild 767 BLAKE2B b9d41678b1b376c0998c336f2896083c91fc49a42f09fa571108fb84ef5c574101c6d80094e8adb42223ee4801d938992f3a3a57ec5846df519038e688031da7 SHA512 a570847879a85e6eb8e3dc1d21505aa777e10aa46d00b01e5232c57d658680a12c799ebf64139f56066f401657e00f8e8eb0b618ac46d6c15a4775a87769ad8e
 MISC metadata.xml 1188 BLAKE2B bbd91c8e116ead86174542013b33e6e83d1a464d96191e76619ec31e6c325390bb8516e70c4f81d4e73a98149be619b466ec62aa61178692c1de57b110699017 SHA512 736c8159defd57e17f46623187edb72f03fad76723062a4de6714d45fb1568838109754e735fd691ee9cfcfcb70c1223d641e112f6fcda74e5b84133cb4bdc08
diff --git a/app-emacs/elscreen/elscreen-1.4.6-r1.ebuild b/app-emacs/elscreen/elscreen-1.4.6-r1.ebuild
deleted file mode 100644
index c2673da73b4c..000000000000
--- a/app-emacs/elscreen/elscreen-1.4.6-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit elisp
-
-DESCRIPTION="Frame configuration management for GNU Emacs modelled after GNU Screen"
-HOMEPAGE="http://www.morishima.net/~naoto/j/software/elscreen/"
-SRC_URI="ftp://ftp.morishima.net/pub/morishima.net/naoto/ElScreen/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
-IUSE=""
-
-DEPEND=">=app-emacs/apel-10.8-r1"
-RDEPEND="${DEPEND}"
-
-ELISP_PATCHES="${PN}-1.4.6-void-variable-argi.patch ${PN}-1.4.6-emacs-24.patch"
-
-SITEFILE=50${PN}-gentoo.el
-DOCS="ChangeLog README"
-
-pkg_postinst() {
-	elisp-site-regen
-
-	echo
-	elog "ElScreen modifies standard Emacs keybindings and is therefore"
-	elog "no longer loaded from site-gentoo.el. Add the line"
-	elog "  (require 'elscreen)"
-	elog "to your ~/.emacs file to enable it on Emacs startup."
-}
diff --git a/app-emacs/elscreen/elscreen-20180321.ebuild b/app-emacs/elscreen/elscreen-20180321.ebuild
index fe4b22212f6f..53e0bdc32856 100644
--- a/app-emacs/elscreen/elscreen-20180321.ebuild
+++ b/app-emacs/elscreen/elscreen-20180321.ebuild
@@ -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="~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/elscreen/files/50elscreen-gentoo.el b/app-emacs/elscreen/files/50elscreen-gentoo.el
deleted file mode 100644
index 431f7e90ae73..000000000000
--- a/app-emacs/elscreen/files/50elscreen-gentoo.el
+++ /dev/null
@@ -1 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/elscreen/files/elscreen-1.4.6-emacs-24.patch b/app-emacs/elscreen/files/elscreen-1.4.6-emacs-24.patch
deleted file mode 100644
index dbcb77557f17..000000000000
--- a/app-emacs/elscreen/files/elscreen-1.4.6-emacs-24.patch
+++ /dev/null
@@ -1,154 +0,0 @@
---- elscreen-1.4.6-orig/elscreen.el	2013-05-23 21:31:14.011823000 +1000
-+++ elscreen-1.4.6/elscreen.el	2013-10-03 20:55:35.497650931 +1000
-@@ -29,9 +29,9 @@
- (eval-when-compile
-   (require 'static))
- 
--(static-defconst elscreen-on-xemacs (featurep 'xemacs))
--(static-defconst elscreen-on-emacs (and (not elscreen-on-xemacs)
--                                        (>= emacs-major-version 21)))
-+(static-defconst elscreen-on-xemacs (featurep 'xemacs)
-+  (static-defconst elscreen-on-emacs (and (not elscreen-on-xemacs)
-+                                          (>= emacs-major-version 21))))
- 
- 
- ;;; User Customizable Variables:
-@@ -148,7 +148,8 @@
- 
- (static-when elscreen-on-emacs ;; GNU Emacs 21
-   (make-obsolete-variable 'elscreen-tab-display-create-screen
--                          'elscreen-tab-display-control)
-+                          'elscreen-tab-display-control
-+			  "1.4.6")
-   (defcustom elscreen-tab-display-control t
-     "*Non-nil to display control tab at the most left side."
-     :tag "Show/Hide the Control Tab"
-@@ -201,13 +202,13 @@
-       (((class color))
-        (:background "blue" :foreground "black" :underline t)))
-     "Face for tabs other than current screen one."
--    :group 'elscreen))
-+    :group 'elscreen)
- 
- 
- ;;; Key & Menu bindings:
- 
--(defvar elscreen-map (make-sparse-keymap)
--  "Keymap for ElScreen.")
-+  (defvar elscreen-map (make-sparse-keymap)
-+    "Keymap for ElScreen."))
- (define-key elscreen-map "\C-c" 'elscreen-create)
- (define-key elscreen-map "c"    'elscreen-create)
- (define-key elscreen-map "C"    'elscreen-clone)
-@@ -899,13 +900,13 @@
-          screen-list-string)
-     (cond
-      ((not (elscreen-screen-live-p screen)) ;; XXX
--      (when (interactive-p)
-+      (when (called-interactively-p 'any)
-         (elscreen-message "There is no such screen")))
-      ((null screen-list)
--      (when (interactive-p)
-+      (when (called-interactively-p 'any)
-         (elscreen-message "There is only one screen, cannot kill")))
-      ((or
--       (not (interactive-p))
-+       (not (called-interactively-p 'any))
-        (yes-or-no-p (format "Really kill screens other than %d? " screen)))
-       (setq screen-list-string (mapconcat
-                                 (lambda (screen)
-@@ -914,7 +915,7 @@
-                                 screen-list ","))
-       (elscreen-goto-internal screen)
-       (elscreen-notify-screen-modification 'force-immediately)
--      (when (interactive-p)
-+      (when (called-interactively-p 'any)
-         (elscreen-message (format "screen %s killed" screen-list-string)))))
-     screen-list))
- 
-@@ -984,7 +985,7 @@
- (defun elscreen-jump ()
-   "Switch to specified screen."
-   (interactive)
--  (let ((next-screen (string-to-number (string last-command-char))))
-+  (let ((next-screen (string-to-number (string last-command-event))))
-     (if (and (<= 0 next-screen) (<= next-screen 9))
-         (elscreen-goto next-screen))))
- (defalias 'elscreen-jump-0 'elscreen-jump)
-@@ -1046,7 +1047,7 @@
-     (princ (substitute-command-keys
-             (mapconcat 'symbol-value
-                        elscreen-help-symbol-list "\n\n")))
--    (print-help-return-message)))
-+    (help-print-return-message)))
- 
- 
- ;;; Utility Functions
-@@ -1180,7 +1181,7 @@
- creating one if none already exists."
-   (interactive)
-   (let* ((prompt "Go to the screen with specified buffer: ")
--         (create (or create (interactive-p)))
-+         (create (or create (called-interactively-p 'any)))
-          (buffer-name (or (and (bufferp buffer) (buffer-name buffer))
-                           (and (stringp buffer) buffer)
-                           (and (featurep 'iswitchb)
-@@ -1207,7 +1208,7 @@
- Use \\[toggle-read-only] to permit editing."
-   (interactive "FFind file read-only in new screen: ")
-   (elscreen-find-file filename)
--  (toggle-read-only 1))
-+  (read-only-mode 1))
- 
- (defun elscreen-dired (dirname &optional switches)
-   (interactive (progn
-@@ -1373,27 +1374,28 @@
-   (defvar elscreen-e21-tab-format nil)
-   (make-variable-buffer-local 'elscreen-e21-tab-format)
- 
--  (defsubst elscreen-e21-tab-create-keymap (&rest definitions)
--    (let ((keymap (make-sparse-keymap))
--          (key-function-pairs
--           (eval-when-compile
--             (mapcar
--              (lambda (key)
--                (cons key 'ignore))
--              (list 'mouse-1 'mouse-2 'mouse-3
--                    'down-mouse-1 'down-mouse-2 'down-mouse-3
--                    'drag-mouse-1 'drag-mouse-2 'drag-mouse-3)))))
--      (while definitions
--        (set-alist 'key-function-pairs (car definitions) (cadr definitions))
--        (setq definitions (cddr definitions)))
--      (mapc
--       (lambda (key-function-pair)
--         (let ((key (car key-function-pair))
--               (function (cdr key-function-pair)))
--           (define-key keymap (vector 'header-line key) function)))
--       key-function-pairs)
--      keymap))
--
-+  (eval-when-compile
-+    (defsubst elscreen-e21-tab-create-keymap (&rest definitions)
-+      (let ((keymap (make-sparse-keymap))
-+            (key-function-pairs
-+             (eval-when-compile
-+               (mapcar
-+                (lambda (key)
-+                  (cons key 'ignore))
-+                (list 'mouse-1 'mouse-2 'mouse-3
-+                      'down-mouse-1 'down-mouse-2 'down-mouse-3
-+                      'drag-mouse-1 'drag-mouse-2 'drag-mouse-3)))))
-+        (while definitions
-+          (set-alist 'key-function-pairs (car definitions) (cadr definitions))
-+          (setq definitions (cddr definitions)))
-+        (mapc
-+         (lambda (key-function-pair)
-+           (let ((key (car key-function-pair))
-+                 (function (cdr key-function-pair)))
-+             (define-key keymap (vector 'header-line key) function)))
-+         key-function-pairs)
-+        keymap)))
-+        
-   (defsubst elscreen-e21-tab-width ()
-     (if (numberp elscreen-display-tab)
-         elscreen-display-tab
diff --git a/app-emacs/elscreen/files/elscreen-1.4.6-void-variable-argi.patch b/app-emacs/elscreen/files/elscreen-1.4.6-void-variable-argi.patch
deleted file mode 100644
index b8225070a675..000000000000
--- a/app-emacs/elscreen/files/elscreen-1.4.6-void-variable-argi.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- elscreen.el.orig	2007-12-29 15:12:05.000000000 +0000
-+++ elscreen.el
-@@ -1691,6 +1691,10 @@ Use \\[toggle-read-only] to permit editi
-                   ("-e"                . elscreen-command-line-funcall))))
- 
-   (static-when elscreen-on-emacs
-+    (cond
-+     ;  -----------------------
-+     ((< emacs-major-version 23)	; emacs22 or prior to
-+	(progn
-     (defun elscreen-e21-command-line ()
-       (when (string-match "\\`-" argi)
-         (error "Unknown option `%s'" argi))
-@@ -1703,11 +1707,55 @@ Use \\[toggle-read-only] to permit editi
-         (elscreen-command-line-find-file file file-count line column))
-       (setq line 0)
-       (setq column 0)
--      t)
-+      t) ; defun
- 
-     (add-hook 'after-init-hook (lambda ()
-                                  (add-to-list 'command-line-functions
--                                              'elscreen-e21-command-line t))))
-+                                              'elscreen-e21-command-line t)))) ; progn
-+    )  ; else
-+     ;  -----------------------
-+    ((= emacs-major-version 23)	; emacs23
-+      (progn
-+    (defun elscreen-e23-command-line ()
-+      (when (string-match "\\`-" argi)
-+        (error "Unknown option `%s'" argi))
-+      (setq file-count (1+ file-count))
-+      (setq inhibit-startup-buffer-menu t)
-+      (let* ((file
-+              (expand-file-name
-+               (command-line-normalize-file-name orig-argi)
-+               cl1-dir)))
-+        (elscreen-command-line-find-file file file-count cl1-line cl1-column))
-+      (setq cl1-line 0)
-+      (setq cl1-column 0)
-+      t) ; defun
-+    
-+    (add-hook 'after-init-hook (lambda ()
-+                                 (add-to-list 'command-line-functions
-+                                              'elscreen-e23-command-line t)))) ; progn
-+      ) ; else
-+     ;  -----------------------
-+    ((> emacs-major-version 23)	; emacs24 or later
-+      (progn
-+    (defun elscreen-e24-command-line ()
-+      (when (string-match "\\`-" cl1-argi)
-+        (error "Unknown option `%s'" cl1-argi))
-+      (setq file-count (1+ file-count))
-+      (setq inhibit-startup-buffer-menu t)
-+      (let* ((file
-+              (expand-file-name
-+               (command-line-normalize-file-name orig-argi)
-+               cl1-dir)))
-+        (elscreen-command-line-find-file file file-count cl1-line cl1-column))
-+      (setq cl1-line 0)
-+      (setq cl1-column 0)
-+      t) ; defun
-+    
-+    (add-hook 'after-init-hook (lambda ()
-+                                 (add-to-list 'command-line-functions
-+                                              'elscreen-e24-command-line t)))) ; progn
-+      )
-+      )) ; endif (emacs22 or prior to)
- 
-   (static-when elscreen-on-xemacs
-     (defadvice command-line-1 (around elscreen-xmas-command-line-1 activate)
diff --git a/app-emacs/emacs-common-gentoo/Manifest b/app-emacs/emacs-common-gentoo/Manifest
index 7d944d08e79c..6ebc20749303 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 2845 BLAKE2B 429f477d7b6e57196ebaf4536541ccfcf98760bfdb0912d1f4965d794eb84347a53faa27a150ebf0e30cdbeea9cfd43dddcb03d1b7fb09007fd2081dc2694119 SHA512 4ad139f88c6cda86333f4bd8719aee19a2e3047cf9f47fe643b9baa680316ed23b64d9d96a92d46c84784bfd50c0e7d6afd85f63c524fc7eeed3d4904711151c
+EBUILD emacs-common-gentoo-1.6-r3.ebuild 2823 BLAKE2B d8236d8045be6055b712dd22e41f0fd5c7eab151deffdf9997145305cb2e66128fc32aeb30faa66d4ae7361314bb73fb5ff18affcf264f51f0e0749749b3cb21 SHA512 598640ca96fe2ed7b1957b5d7f7cb7166fc052f54c4d59ac49545db56088727797b0b5a202945913f508aa6e2330a3ff3a969009c7d51bade05c437ce2f1c9cd
 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 ac15465304fc..de398952a5db 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-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 ~riscv ~s390 ~sh 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 3938405ab910..b5b74e888edd 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 1674 BLAKE2B 63e92d60d7c6fd8b146cc83b963f947b1cba0395db3751e66f436187f5592bb8753a4147d25a72522229fdda75bb38ff368e67c41df946da9856d191ef2eea07 SHA512 e7044d8206d47abf8abc2aa8c934b0739ca51250c00d46a3311ec6eb1f05321b5d02e4957d4adcc5f70035f706345529b1ba41ba0d6b177bee5156a5d771fa75
+EBUILD emacs-daemon-0.22.ebuild 1664 BLAKE2B 034ebc54deec60b3be8a5727e7b5cc536001197ccb27b009fbadd1d6be382b59f637719e04f4943a2e5ea96a86af0eab0d780397cccd2cad363d057f3663b520 SHA512 3140fa6b0c5f340beae5d2c001513085cc699350ca82b617d0cdf5a8b5ad9ea25a91085d51d131ff78635d10df69e3a2daefa42d57e6051a8105d3bd451e8922
 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 e219a750ce93..6e53e7f176aa 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 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 
 DEPEND=">=virtual/emacs-23"
 RDEPEND="${DEPEND}"
diff --git a/app-emacs/eselect-mode/Manifest b/app-emacs/eselect-mode/Manifest
index 8c6252a50fe3..b908871169ee 100644
--- a/app-emacs/eselect-mode/Manifest
+++ b/app-emacs/eselect-mode/Manifest
@@ -1,7 +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
-EBUILD eselect-mode-1.4.14.ebuild 569 BLAKE2B d7e4dd474ca2ba2703d8a84939f79da3cfed9b942a8e44f4a26f742ce0b54cc6473ccff07172df91d528132e404ffc14adb5478402d6f4bc0ceff8919690926b SHA512 1a684d4e547c7da81bd62f723cd03053295119f664543f50ef8edcd69c8ad6717aaf616868d0ab56dc9a6b639822d17d56517b8279b7f1a2dd879ab94ce97b81
-EBUILD eselect-mode-1.4.15.ebuild 582 BLAKE2B 721100792af38d09632673239f1956a15af5bc0b2aba872e024bf7c454b7882dde3d8eebf5ab2a1e3a11bc7be6611d1611efd8fac795c2bf015553875d0697d3 SHA512 957edb82115c3985d6a8cfa6eb6f5260f0ad84ac12075122d305372dd4b408f9046668ecf7107a72bd49f346320213b134a468b490026abe75b257df8cdfda0f
+EBUILD eselect-mode-1.4.14.ebuild 547 BLAKE2B 82ffa2d112f5d10f5f34ff70f3b3a2b566acc5c8ee7e2f022d4a080857835cb64bd0e72daa1fa3adc5f7cc45144dd4c24e5fc2cf197c728507f0b7f0e59083c9 SHA512 f8e887efac69063badc5ee6170c13d140deed17828bbcae32402ddd96bda3443af73f5abc2df8303e2e02faa6ee589f174db225b1d068326c25101906cc915f6
+EBUILD eselect-mode-1.4.15.ebuild 553 BLAKE2B 64e3a8789b9b97e88e65382adbb19c6f877048754934e4b4d16f133f4266c2b3921d296df2ff9749e6d47970222461390cd189b1ed44088ab08f359d8f96a126 SHA512 776d5d1f5aa698f480e908c5e69ad64e79884abfde6d223d5567d68ed9dcb0ddb8d264b525db1741a0b1528365bbb6c82d623761effd5089a4e41172590b4c87
 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 4e0c53a579e6..1c41dedeeed8 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-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 b342275247a8..b05452c2475f 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-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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 S="${WORKDIR}/${MY_P}/misc"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/evil/Manifest b/app-emacs/evil/Manifest
index 554f90d8ca23..cb7fafc6803f 100644
--- a/app-emacs/evil/Manifest
+++ b/app-emacs/evil/Manifest
@@ -1,8 +1,6 @@
 AUX 50evil-gentoo.el 99 BLAKE2B 9ebd3d4d3a09091e822cbb6bc8d50890c6b46d627ef83d9d6ad8b518f0dd11a766ede08898746b0cd7e2657aa584c58535927716dfacf656802e840e13b4b861 SHA512 fb934f37d51412b59b8d5a7d27a7791d2db547bf1d71fd0a5b85bd31d24e2a663e92272095b6b2fe0cf44cac6ae69ed1a422b6b4ef0c6533e004018cfa6011b3
-DIST evil-1.0.8.tar.xz 427884 BLAKE2B 9a2327d268c7d64c2b439788a3d6fc8104ad2554bce150431efeecd9c6db8dd41acb2e5886328ccfd21a3a94d56962cc9167ec53b3abb785565783beb213acdb SHA512 d827ff8856c0240c334088f4c61226c93994a4c5afdd775a7170233add884af134b22cdc8bfa6432d3f44d3e6cf3cea89501a4ebfdc37ed5c70b3c712ad2ea86
 DIST evil-1.2.13.tar.gz 540559 BLAKE2B 064d746415775653a6152557645324d6900edff39ecab409105bb2ea8f810a3ff8e706acc776e4749c6d9675c2e5e4798bc9744056130a24b3c6382a2eafdbb8 SHA512 30d6f65db234c8c23cd31d1fbd9347e71b7d47ed7a9b50161c3e5820243dca2d9ce661469a1f141be08f89aeaaa5d2d04fce5a6bc8f38285e6a5229c6a05dcf7
 DIST evil-1.2.14.tar.gz 544497 BLAKE2B 1230632dbcfc065a65aca673e87662c8c77c5ce93e2aeaefcd416e9c41971c08fa692c976a1635f504080de20d08357b7beb4efb65db8198dbdbb766459f7987 SHA512 300de4b4bc6924bef7ec4f58cb9c24b38e694e7c1c215bfc5e816523fc5887dee6ce333b322d7fe5c47497491d194ee7c7269fe36c692f8c4413a8e286b796b3
-EBUILD evil-1.0.8.ebuild 572 BLAKE2B afc89b49665303344521cd58d7bc0c290806675d0ae48b7c65f6b692029f129056e9bdedb822c2c28849960f9e113b851af997647b430e60027dad3dc51cfcf4 SHA512 342e34601d77161155ed3a60a5f3713a00c2edba07c101498063b3fb0f7ad6c40df86ac4a7b65ad7c6b07ff734013a55b0b4b4cfc7308cf78f389c7b85140c59
 EBUILD evil-1.2.13.ebuild 617 BLAKE2B 3bb26ff0dbc7d32d9629f4922aec3c083959676c3821baaf74d24aaf2d00cd4cbc40a9ab96673d29f891151a048ecd913f5898f6bf5226649292164c3458954d SHA512 d257787c519c205f1d50484e61aed3e936176d6e365f9e4a26d1abd0ebf7b83fabab020ba7c3aaacf285e837258c0164e8cbb99aee5fba71b4158fe6ca9252c9
-EBUILD evil-1.2.14.ebuild 620 BLAKE2B 74950503acf113e41145890cd48602dc1171011a5d02f641eb45c5554cf771da7419844316ba4c89b512acf27892177ecdb52f5404e56755899e9b4c695f21ab SHA512 b4898fc3fb89f9c083be5a01842e69287e2a1067ec0f0727bcd713d7a5ef5e33c5e8d412deda33ecdcbfee7735bf739d4648452b972d8794eb57b452153c8e9e
+EBUILD evil-1.2.14.ebuild 618 BLAKE2B 66ca6958b28c0b97bfeecbc52fa68d82c404125e589872bd51589d57b55664f602b7927903ef0e5f547952ba896c6f5537eb0674e22d609b0ec7862909dd88aa SHA512 4c968fa83af442aeadaab822f66b9122f3e6cec75bad339d1b4d3f508d49db14155b1c6e9e21734637372c2c6ab850037eba157804595aadbd85636f147db362
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/evil/evil-1.0.8.ebuild b/app-emacs/evil/evil-1.0.8.ebuild
deleted file mode 100644
index e9a11acabe1e..000000000000
--- a/app-emacs/evil/evil-1.0.8.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="Extensible vi layer for Emacs"
-HOMEPAGE="https://github.com/emacs-evil/evil"
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-3+ FDL-1.3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-RESTRICT="test"
-
-RDEPEND=">=app-emacs/undo-tree-0.6.3"
-DEPEND="${RDEPEND}
-	sys-apps/texinfo"
-
-S="${WORKDIR}/${PN}"
-ELISP_REMOVE="evil-pkg.el evil-tests.el"
-ELISP_TEXINFO="doc/evil.texi"
-SITEFILE="50${PN}-gentoo.el"
-DOCS="CHANGES.org"
diff --git a/app-emacs/evil/evil-1.2.14.ebuild b/app-emacs/evil/evil-1.2.14.ebuild
index 60cf9e3cd89b..01082bccd41f 100644
--- a/app-emacs/evil/evil-1.2.14.ebuild
+++ b/app-emacs/evil/evil-1.2.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/emacs-evil/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3+ FDL-1.3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 RESTRICT="test"
 
 RDEPEND=">=app-emacs/undo-tree-0.6.3"
diff --git a/app-emacs/flim/Manifest b/app-emacs/flim/Manifest
index 59ce6a8f6e03..cb775a8a703e 100644
--- a/app-emacs/flim/Manifest
+++ b/app-emacs/flim/Manifest
@@ -2,6 +2,6 @@ AUX 60flim-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b5695
 AUX flim-1.14.9-mel-q-ccl.patch 1362 BLAKE2B 4883dfdb3ede7b93ec41cd02fe1da397a820101611afa51164a521aedbb780f04d2a7dbdf87e70506b2387d3edd95aacdaf46bc2adabb901b5a365ffecbca3b4 SHA512 b2edee110d53e2b31fe13ccfffd792668febd20e27a8014d77e9ad0b0a4540ab38cde97742ed67c515e58594808713edf9079812604521f1f1d481cd717a0132
 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 1057 BLAKE2B 88a75859ee685869a15cb945cdef5cbbd52d895c03233a179a50335a6be886b71560f87d68916758c2be6dfd04cd0a50959717b56247ac170540c6e2cdb0982a SHA512 a253c7154898743509e79433386d755496811fd70805854a3059b75689fd16a79b8203a9900a1c8128a90f758a866d8367c7a36bc9f6cc8063f5a4acf454635c
+EBUILD flim-1.14.9-r2.ebuild 959 BLAKE2B 8bc2a038b63fc355890f3f44e66faf1e32d1aba4324600c7692bf98e80c0cb304fee0af0264dc357c587ed92a18aba0235217b048698a6bc1fb0cd5d18f6e9e0 SHA512 4c2bd2d84bbcf29332127dea7daaf81448c9e90be7d02bb754ba75ed9800e3fea017ebee393e27d30d6719d2916690a60d24b91a22ae504dc0f18042fff5d77a
+EBUILD flim-1.14.9_p20190526.ebuild 1047 BLAKE2B 66e106607105799ddb2dde831226367af4206abe85ad2aa5456371a95afe08bcf4191ecbe62c8aea2915bbc8056eeadef50a42b1a5358367b14a436bb6302802 SHA512 5936ad99fa93d138a75fbd9ba4b7d0404eccde5fa61fe299fbe61a7765c5daee4cdc019420aa3703396ac5cd2bc43ad2d3a7398b9973d418f86c68420581aaac
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/flim/flim-1.14.9-r2.ebuild b/app-emacs/flim/flim-1.14.9-r2.ebuild
index 2586b28c2ca6..adfe840da180 100644
--- a/app-emacs/flim/flim-1.14.9-r2.ebuild
+++ b/app-emacs/flim/flim-1.14.9-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://git.chise.org/elisp/dist/${PN}/${P%.*}/${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 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 
 DEPEND=">=app-emacs/apel-10.3"
 RDEPEND="${DEPEND}
diff --git a/app-emacs/flim/flim-1.14.9_p20190526.ebuild b/app-emacs/flim/flim-1.14.9_p20190526.ebuild
index d65d43ed2e35..3112f763bbab 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="https://github.com/wanderlust/flim/archive/${GITHUB_SHA1}.tar.gz -> ${P
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~ia64 ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 
 DEPEND=">=app-emacs/apel-10.8"
 RDEPEND="${DEPEND}
diff --git a/app-emacs/google-c-style/Manifest b/app-emacs/google-c-style/Manifest
index 415d0a318113..b7ddb04ab187 100644
--- a/app-emacs/google-c-style/Manifest
+++ b/app-emacs/google-c-style/Manifest
@@ -1,6 +1,4 @@
 AUX 50google-c-style-gentoo.el 258 BLAKE2B 7ec733ac75a1d1570d11f3b978e0f55c3641b6e1ded4792afe54c3757453424fa0f76724f13bd060d5a63be7f37442649669043a8b7ed326c6b46cd58db1572b SHA512 f39b91a6af6e16ac70a5baee459790efb00aa10c3a83c16429fa5d97201bec2bfb3f6645ab1327f7325eb3428a3c938914b4a63c6009109dda99a4f0fe7d89c2
-DIST google-c-style-20091009.tar.bz2 2178 BLAKE2B 72d7b430f9148589e8b4b1a57c9b4b96203c7ffddae3bbbc7aa9978e85c2c51510571f8617ac5d2bcaabe5688ed7799d5de597e96a2479d844a49e6661f93a05 SHA512 5d61d6e021643ffc1468c14cdbbde0b52dc9346330983c19bdb7f4d6fb8960c662ca6198658963ff6d2b4d7d2dc96853a8c58de48da77364a860f2f777855b5a
 DIST google-c-style-20140929.el.gz 2147 BLAKE2B c1e151e0aacac5fa39b4a293ab2663d9e784c15bb020ca4f46f09ea4736f84d7e33050632c6620d65cd45b5a631d2b08f5864096435bf9d58b321460e6a20518 SHA512 ad8682e06a2a607e4c7baa9177a03796afcbedc251281a53657fa44f718fee0416e6d60bdc9e0339ac95a0bac05389de0dd0616a6bb4577ff7b02e00c80d1df5
-EBUILD google-c-style-20091009-r1.ebuild 588 BLAKE2B 3d751da28f4dde2b94840cec08cf527f30a50c5a20d1fac805f6df2fb72018a0de7bb64460243d433bb944b98baf41424d9e5eb98c2560a902cf02e9cb9cef77 SHA512 e25c5a9e81b4a461cbf89c5de972024ba73fdd72ed4eb11740861f7f2281197e9905a886a8d748c82d0c8d0e54b2a85e90fa31a107471e3fa69f9cc02ee5dfa8
-EBUILD google-c-style-20140929.ebuild 577 BLAKE2B ac92eb6045770f507ca5c20aa0c5b7116d7a595efe812f10aebbb4231753ca7b817fb55459129aa2e22104e326f1831d950c3344d6cd8f9bef9abb97b048ddc0 SHA512 e708bf367966841f070dc3ba7f5478bfa88b5a484b23a2e12b4aa42cdf3db74c8b70ff4cc77f392938f35637121bcd6324816adde3cdbd58cbd03a11d7a6e0eb
+EBUILD google-c-style-20140929.ebuild 575 BLAKE2B f8ab5271c4fed6ba2a3299d3aea0b26a970e34d80df546a062e1e6a88f39366d3435dc268b9608aef91bff3dc931859e3761683c2e581b6456586d4b55c752ee SHA512 170b0c20745b52ba48d1b9ce951ac9f42d5c50b2af9a39e10cd0a9f8769bdaaebb9024299bf1e36fbf71b7ca823dd64b07c26121ea851e55baa383d92071b8ff
 MISC metadata.xml 483 BLAKE2B 5321c357a3c496a72254753a00ca9e11ad6fdc420b2ab01990348c3d232d744d433ed01e5fc3de3aa6017dd805b057d3b2004d500db6fe1e38d69053c0d73179 SHA512 0f0c374e0ced07f64bf529899a190e7c4d1dadac58ef44355021fe00eeda190e2f270951242e8b1cc0b405328f2c251272da4713557600391e0ee82a35f689cb
diff --git a/app-emacs/google-c-style/google-c-style-20091009-r1.ebuild b/app-emacs/google-c-style/google-c-style-20091009-r1.ebuild
deleted file mode 100644
index a99bcc7f98f6..000000000000
--- a/app-emacs/google-c-style/google-c-style-20091009-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit elisp
-
-DESCRIPTION="Provides the google C/C++ coding style"
-HOMEPAGE="https://github.com/google/styleguide"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="|| ( GPL-1+ Artistic )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-S="${WORKDIR}"
-SITEFILE="50${PN}-gentoo.el"
-
-pkg_postinst() {
-	elisp-site-regen
-
-	elog "Example usage (~/.emacs):"
-	elog "  (add-hook 'c-mode-common-hook 'google-set-c-style)"
-	elog "  (add-hook 'c-mode-common-hook 'google-make-newline-indent)"
-}
diff --git a/app-emacs/google-c-style/google-c-style-20140929.ebuild b/app-emacs/google-c-style/google-c-style-20140929.ebuild
index 74ea088e1ecf..9cbaf4129996 100644
--- a/app-emacs/google-c-style/google-c-style-20140929.ebuild
+++ b/app-emacs/google-c-style/google-c-style-20140929.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.gz"
 
 LICENSE="|| ( GPL-1+ Artistic )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 S="${WORKDIR}"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/graphviz-dot-mode/Manifest b/app-emacs/graphviz-dot-mode/Manifest
index b059c072541e..a4759ad6f65d 100644
--- a/app-emacs/graphviz-dot-mode/Manifest
+++ b/app-emacs/graphviz-dot-mode/Manifest
@@ -3,8 +3,8 @@ DIST graphviz-dot-mode-0.3.7.el.xz 10840 BLAKE2B 6d4d80705ba01723ce538dcf97a2181
 DIST graphviz-dot-mode-0.4.20171103.tar.gz 353912 BLAKE2B 526a14c7bfe4178f89268f6b3f381e69c1223e6576adfeca7864df8c6b62042fcd8e4f718f658ac210e2ce596eedd83a665a72c8d698e83fa28ae3ebf6eecc69 SHA512 73e7570ad1a954dc49b8151b336733af2141126555f27cfe9d6258361131c86325e8717e9740968926452f81fabb66e219534022c9de396bbcb50b9a124be9f5
 DIST graphviz-dot-mode-0.4.20181118.tar.gz 353971 BLAKE2B eab5279ec25a93bae311c6db430b41f5352a63f545573694f9760e5f5cbbbeae54904361c63c909cd8c77da68e757d0fad24271edb07d4267521535e2d9f7db7 SHA512 c02523d2a2a3be2d4be187b7bed34d3d5a897532d7ad2205683a69e3ae849a1e002f5f17637987b1774b4e65f0923e52b5bf048cc0fcd62ae4bf3693b90420db
 DIST graphviz-dot-mode-0.4.tar.gz 12288 BLAKE2B 2757734b1aae33322d3c093be4d650dd8c464292a50915463ea23e946a695986c6b36650c3f5baee69d402b2cd3747cc453cf18c56bd128dc6bdc9e15e2445ba SHA512 db50adc0550629adcee8ea7482e678b2fbfa8db514e9ea80381dec47fef75cd0a61b7cfbeef59aae102e50d824edfb06b8ee56c4e964cd3e90ec8540b1b250a6
-EBUILD graphviz-dot-mode-0.3.7.ebuild 541 BLAKE2B e665978e25cd49161c2e78544752f059a82078626da8392544df940c1f6b64faead2d97c74d819f15e702760717d35490b40654160757c05c9aa4253045eef17 SHA512 b6602909ad1431c5cf1543ffaa1c6512825e9d2c614096b8ae09808f8e32d7171ed0eb10950d1b144c042f9d8143f1ab7d9ab073db9f4c5422838e59641705f8
-EBUILD graphviz-dot-mode-0.4.20171103.ebuild 636 BLAKE2B 33589a5968db6aced4f92747bd58735c36ed0084a2589f7bf9afd0a1b0c88d2ffe82a04a5e5f32b4826b5b6d899b4cf00fa318b9e2bb073681b824f5bca3dfaf SHA512 2020223a0aed992ab8d755e18d9dd69ea5c99d0e725cc250bfe8dd35cf4b5c386693b612362d5370218fb6d1156b617a1475ed9236d76ccb5a9e917507f030f3
-EBUILD graphviz-dot-mode-0.4.20181118.ebuild 636 BLAKE2B ddf5f730a6d71d707f17d42daf8a065c1f09f8b7140f2c761fc3690a1937b12494031b825a95fc985b183f04a2815040650dc39ace48b3115636cee9571f807d SHA512 874249c0f530d626aeb3029732a0f674486057bdd37f6c73c6ad32e7ec3dc6bc8f26aca67b8c3dbf2afd2bda27f9995592a336700be0f6a052304ebff7031f67
-EBUILD graphviz-dot-mode-0.4.ebuild 551 BLAKE2B d69640d3b020d300f55d9e069d2458c3236a74360f9012a5992a2edd1286961c8ed4ba1648f7c68c82e19293491e2c6c51f62d5cae62bf14ee1dc31f26ee21d5 SHA512 80a5c9a030eef0b77889f061379aa623911fb9975a5a3dfad41fa2af08fc5b6db8b6ea9e0ce0048cc5f8fd4d69022b4750e16c29d116c8ae592391470aca419b
+EBUILD graphviz-dot-mode-0.3.7.ebuild 531 BLAKE2B 0ce88476e7c3335f96b3bf3c2829813a595b97e96ced0baac210728c29bee8224f456d662eb676d626fa73f1b5ae3114a5569ed2bae8ec2d6c2711b6f1ed71f4 SHA512 9a9d76ba0f96087f2d42c3ddb945b91befb0aeb8c47bfd90c062d4b115692dc4245dc2b54a3f534a3232330b4e3ea16777e9c2b78606d006242b39059d47089f
+EBUILD graphviz-dot-mode-0.4.20171103.ebuild 626 BLAKE2B cceed1fcf72030574e6954cb00594514f7c68012a25a823053ac03db449379a7ec6a8b4d7d8279a03fb5d698380f913a0044cb9f339d9a85f5f97eab58fd15bb SHA512 d6a365ee5e256650620a983dd126a998493f122b4ea6dfe612b468db649f118a9da692f5876677ae66e3f752c5d20d2fd63d635477085466e2f9cb3fd05809a7
+EBUILD graphviz-dot-mode-0.4.20181118.ebuild 626 BLAKE2B 013e4f161dbeb111c46957ccb06a2e34cc0f9465db4548ed2da1c34b3d83e2acfc1793ca5a16dc810c28987ed3512638ac5b04816b38149dfe819a0c68ff86c1 SHA512 bdbff2f5ecc372bd6650e5d64aa89a085894fc915378f1a02fefdd3ee4dd362f51cd0e759f9e9eb9c9f448c9e7f1bac8361816ea1321909b8be062f767154c62
+EBUILD graphviz-dot-mode-0.4.ebuild 541 BLAKE2B 1ce806e1a281f4ab08f24d2aed2be7e4ba655a7e932a17335842536040f8a94b0abba79e527be035973563ccbe0a0f16d83e08c60df75562859b7b158adb7c02 SHA512 ea577478780eefe7938e0bf07d958e1b12ab4d9284a03f9d6f6f76497ea6cb5c4edd43520b568de3a7b27fe27e0b2461ee3ea9a5c853e248c2051438ee18dc35
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/graphviz-dot-mode/graphviz-dot-mode-0.3.7.ebuild b/app-emacs/graphviz-dot-mode/graphviz-dot-mode-0.3.7.ebuild
index 16b3a2a373f5..8822caebe8a7 100644
--- a/app-emacs/graphviz-dot-mode/graphviz-dot-mode-0.3.7.ebuild
+++ b/app-emacs/graphviz-dot-mode/graphviz-dot-mode-0.3.7.ebuild
@@ -13,6 +13,6 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc x86"
 
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/graphviz-dot-mode/graphviz-dot-mode-0.4.20171103.ebuild b/app-emacs/graphviz-dot-mode/graphviz-dot-mode-0.4.20171103.ebuild
index cd57e2a891fe..31a7620dac70 100644
--- a/app-emacs/graphviz-dot-mode/graphviz-dot-mode-0.4.20171103.ebuild
+++ b/app-emacs/graphviz-dot-mode/graphviz-dot-mode-0.4.20171103.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ppareit/graphviz-dot-mode/archive/${COMMIT}.tar.gz -
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 SITEFILE="50${PN}-gentoo.el"
 
diff --git a/app-emacs/graphviz-dot-mode/graphviz-dot-mode-0.4.20181118.ebuild b/app-emacs/graphviz-dot-mode/graphviz-dot-mode-0.4.20181118.ebuild
index b5fa9eaaf373..6cb986791033 100644
--- a/app-emacs/graphviz-dot-mode/graphviz-dot-mode-0.4.20181118.ebuild
+++ b/app-emacs/graphviz-dot-mode/graphviz-dot-mode-0.4.20181118.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ppareit/graphviz-dot-mode/archive/${COMMIT}.tar.gz -
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 SITEFILE="50${PN}-gentoo.el"
 
diff --git a/app-emacs/graphviz-dot-mode/graphviz-dot-mode-0.4.ebuild b/app-emacs/graphviz-dot-mode/graphviz-dot-mode-0.4.ebuild
index fc16ab31ac73..2a8193ed4dde 100644
--- a/app-emacs/graphviz-dot-mode/graphviz-dot-mode-0.4.ebuild
+++ b/app-emacs/graphviz-dot-mode/graphviz-dot-mode-0.4.ebuild
@@ -13,6 +13,6 @@ SRC_URI="https://github.com/ppareit/graphviz-dot-mode/archive/v${PV}.tar.gz -> $
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/htmlize/Manifest b/app-emacs/htmlize/Manifest
index 6b18df440943..20dc46c67273 100644
--- a/app-emacs/htmlize/Manifest
+++ b/app-emacs/htmlize/Manifest
@@ -1,6 +1,4 @@
 AUX 50htmlize-gentoo.el 543 BLAKE2B 65ee2f1bd7aeb315827301a74582d9c04ceacf898a5cdd9a72f6783bcc2e4d1f97d681f67daeea24fa3489ae7a4db02875161c20a88330edaaa828a0c37b3bb5 SHA512 7bc9bc6cd113ec9090223b6bf3f373b25da1e4330039be37186904360a515ea102b51c2c6567e9e3fed7f78c4c29a0f80642e35878a2af61e83772b8a5bad99e
-DIST htmlize-1.47.el.xz 21544 BLAKE2B c00222fa39bbd530fae89b6a71cc515dd37cce4d787267eca9d23eddd9f3054b932df8908712971c46c28fc89921a42ac613e826d73094b333aa977335077f54 SHA512 2cca746f696d382336a800d3f15e6a5812afa7c6965d6695c501085ed6c8f447da8ee6ed31a27c240e9d70f7c30b91292ac60c0c903a7ca0d52f2a4bfedbf06f
 DIST htmlize-1.54.tar.gz 51401 BLAKE2B 8c00c1482fa1dff852d0e0c51d0c6a337878418dd84fdf1c2522d937a4e2181766e23302936bb1e9f774b883ad3df4295897a1aaabfaea802457aa096a0ab337 SHA512 ddd256162760fc1e6e08eaf4cd44ec987bf2c49ef61d23798923ba0bd241a16aab02cab77ca7524169796453d44951257acd9bda58c055be80d9612bbfff10f7
-EBUILD htmlize-1.47.ebuild 412 BLAKE2B e6ba52cf40a4941a1efa543d5d94bfc2fb521fbff3dfcf9086a89949c772634c44d566f8c4808badfa58c273a06107d6308f4bfd27ee6be7458186a0eed5d60f SHA512 0255f5a8d6b4d03f8ee3c502e59b719baf3842ceae9510254a2f533a8f08616d4a5e4d2ce747a3b567ad42864652e09f7f2504cf8d77d389e93caff3ad60019a
-EBUILD htmlize-1.54.ebuild 525 BLAKE2B 29dfe0b9fd07cb13b530e61c4d9520ab0daff2f652fa21cd384e7ab7898fcbc3331981d5e603f4c0828f72fd2c8471bc6e7c5ac1b6d4e3fb0982baff4136411f SHA512 360e6dd10f1d8a4cdf4d8a4412f8b60b2a782217e752d1ebcf13da01a7d0759fbd7b66b7fbce32ad1abf3d7eaecfcc9439b299a92df0a459ab770267e3151ef5
+EBUILD htmlize-1.54.ebuild 523 BLAKE2B d0c4dcc34ea46dbbed4339b05f8659b1e3d07832a8e76a3c53c926a2c8c2027656f57de6e48cbcde36053ab7a2e7f12bfdcd12a3bc3e5e3c19f2c1642ed6c969 SHA512 368443587c17deeab9494263d65c4567bac8723245ac54400a8343b6ece179ed636f3d90680a2585ab4f3633ccbd7ae8baacb04248f07284bdfa0480cf46d717
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/htmlize/htmlize-1.47.ebuild b/app-emacs/htmlize/htmlize-1.47.ebuild
deleted file mode 100644
index fa7ad085cc8a..000000000000
--- a/app-emacs/htmlize/htmlize-1.47.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="HTML-ize font-lock buffers in Emacs"
-HOMEPAGE="https://www.emacswiki.org/emacs/Htmlize
-	http://fly.srk.fer.hr/~hniksic/emacs/"
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/htmlize/htmlize-1.54.ebuild b/app-emacs/htmlize/htmlize-1.54.ebuild
index 03b1ad07973f..e98b61f51aa4 100644
--- a/app-emacs/htmlize/htmlize-1.54.ebuild
+++ b/app-emacs/htmlize/htmlize-1.54.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/hniksic/${MY_PN}/archive/release/${PV}.tar.gz -> ${P
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 S="${WORKDIR}/${MY_PN}-release-${PV}"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/lookup/Manifest b/app-emacs/lookup/Manifest
index 5c2152ad0656..5ff7cd747d7c 100644
--- a/app-emacs/lookup/Manifest
+++ b/app-emacs/lookup/Manifest
@@ -1,7 +1,4 @@
 AUX 50lookup-gentoo.el 155 BLAKE2B b6b3c5a64fc880aa261a632d8f14f8bc6cd1e94b9d0f03ede917fc4eb88a6203d71a0d71a92c4ce51080adf54f7740397038378f631ad1a7dc6dab126f1b8189 SHA512 021e3bd99a25974788966d840cf5ce9359447c1aa331b9ef517aef23c4dc79581539bfd61a5f35f92551a4c189a64867fbf173212d28172e379da3532c1a9694
-AUX lookup-1.4.1-garbage-char.patch 283 BLAKE2B f69000bc367024bb71d14e5d687b4159f810779a524712870e3f25ebbb1db8711b7d94495659e0faee46bf640a7d2707a921f07a181155d542d8d9fc1f67dc55 SHA512 7e338e2184454579f2e5675e9b969805bd8954fa51fa55a42b62a58094f1f9a1760f1430cb61916bdfd999428f06705f555b6325c993edad7b119e7083325e11
-DIST lookup-1.4.1.tar.gz 346391 BLAKE2B 4de52e0bf444e4822408db580f1aacbeb8a42ea1492eda2c7678f1838615da00a370b1d12efdf0ff1fef4e81302426245e0c2411f42bf17667966c90f8b39cbb SHA512 a28a770ba58f07db5a7b2452792fc0e83b74e3b45556e84a9729c73773df661dbb7d356c1f7be803feb66f23e154aa825dab610f841bbe655bc76bd7120370bf
 DIST lookup-1.99.96_pre20180209.tar.gz 220833 BLAKE2B 2555b28919991356fe2e655d8058b7a23257bab413ee542fb6a3c5f719e22c1dce1bd08f144f0c71c6590438deeae5b8798fbf9c29edbffe21ddafc499b420a8 SHA512 2292a2d4e61a5fc8d17ca8afb02e172691babd47f296c2b2ff5e284c27a805608fc4b5c63dec07a0387bb52ee4fbd736d7b2d4320d74efc4c210ed156873e8c0
-EBUILD lookup-1.4.1.ebuild 720 BLAKE2B 713e5e5ac686f549a819c1b596e750ea632e81f1b2bf0ae7bccbed89f5c3c02c933111ae6a08db4eba69ea52b75cf907bf37244e3c383004a72fd53bf09e0f1b SHA512 b03163a1cc77f9e926d04e9260748e64f17aa434d011aa13f1c88123064feba5cb922edc8b06e7a15c2411a5bbeaf0d530c41c56f106ad6237243c61f5e80173
-EBUILD lookup-1.99.96_pre20180209.ebuild 801 BLAKE2B 880fec441ccec3be6776650dd991438df5cb07432337c5850029bcfa9c40009cd044cad1504da46616ffcb8162dc5bc76c7263b2067aaf8caf0b81ea12a6002d SHA512 cf41d9846d81122fb5d3a58a41f1cca3a915b8794c3cfc9cc4d834587185726ed189ebd46c53c670b897b6bbfe4b3d5e15088c795efe70fadbaa50c697d14dd9
+EBUILD lookup-1.99.96_pre20180209.ebuild 799 BLAKE2B f336d9fa560346ccdc008e893bf6b056f8092bf48d2a0c8c43814631e343607071fc23c704341868d9e0e9e55fc010bd831da9915218fc4127c9088e7c083a8c SHA512 0bdb9f80c62271be423d70914ac2c5fdb0e8779b9aef6bfe068f857d7dbd88dba448729d19b7916d37c2dd4d5e2bcb4fee1caf99400601b5034d8b3ea3925439
 MISC metadata.xml 375 BLAKE2B 022df13d1d586579ed08af80b893ce2a1a9d1275720ec5d447efca002dd05a5544eaa6c1f01a5d6df2c0e7cf594eacf6a0c1fb840989674f8af537e1468ec6ee SHA512 24ea62246bc2d2c433dd071cf9906fe2f0c9dd834ba4d5bfadbbefcb9d47a063cd07da9c6756043c296c2ae56da39f18714416dab862d5f36fbd2f6100dc663b
diff --git a/app-emacs/lookup/files/lookup-1.4.1-garbage-char.patch b/app-emacs/lookup/files/lookup-1.4.1-garbage-char.patch
deleted file mode 100644
index 7c9a3bea9152..000000000000
--- a/app-emacs/lookup/files/lookup-1.4.1-garbage-char.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- lookup-1.4.1-orig/lisp/ndic.el
-+++ lookup-1.4.1/lisp/ndic.el
-@@ -1,4 +1,4 @@
--e;;; ndic.el --- Lookup by free dictionaries
-+;;; ndic.el --- Lookup by free dictionaries
- ;; Copyright (C) 1999 Lookup Development Team <lookup@ring.gr.jp>
- 
- ;; Author: Keisuke Nishida <kei@psn.net>
diff --git a/app-emacs/lookup/lookup-1.4.1.ebuild b/app-emacs/lookup/lookup-1.4.1.ebuild
deleted file mode 100644
index 77d227163e10..000000000000
--- a/app-emacs/lookup/lookup-1.4.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit elisp
-
-DESCRIPTION="An interface to search CD-ROM books and network dictionaries"
-HOMEPAGE="http://openlab.jp/edict/lookup/"
-SRC_URI="http://openlab.jp/edict/lookup/dist/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-ELISP_PATCHES="${P}-garbage-char.patch"
-SITEFILE="50${PN}-gentoo.el"
-
-src_configure() {
-	econf --with-lispdir="${EPREFIX}${SITELISP}/${PN}"
-}
-
-src_compile() {
-	# parallel make fails with Emacs deadlock
-	emake -j1
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/app-emacs/lookup/lookup-1.99.96_pre20180209.ebuild b/app-emacs/lookup/lookup-1.99.96_pre20180209.ebuild
index 83eb373c097b..b077dc840d13 100644
--- a/app-emacs/lookup/lookup-1.99.96_pre20180209.ebuild
+++ b/app-emacs/lookup/lookup-1.99.96_pre20180209.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/lookup2/lookup2/archive/${COMMIT}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="sys-apps/texinfo"
 
diff --git a/app-emacs/lua-mode/Manifest b/app-emacs/lua-mode/Manifest
index 03107d1d1de6..5491781246f2 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 568 BLAKE2B 95efdb42dec251b9775576770edfad5d2c71eb1699984d7e7ac2fc7c2c521924ea6eea0adaf2486faae87e500f8dcb005f36e4c3dbe2f60e2647151ecc9e123e SHA512 2d73df18f745e5ccd34bedca7d6a21f5d3451449396a3b13958011c8d1c233a77e31541b9806e4719273931c3cc6406dc9448dfbe855acf70c10637aeb4c6d7c
+EBUILD lua-mode-20130419.ebuild 546 BLAKE2B 60be5c0bcb561e06115cb310c56c5f735375395ed4b6bff2bb78bd419f0eebc648c9013e5e2511e22c664cdf15eb2b725d599ae30b49ef3df9547ce5407d780c SHA512 5e2a0b48c79788285233f38103599ff8df12473ffebcd003765f9269ba995ba46af231d7c05eb90590a75f0ba3996def952df9bfc3dbe3a9d2d88d6a71555d57
 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 5b0b0ca80f04..8ad6564b276c 100644
--- a/app-emacs/lua-mode/lua-mode-20130419.ebuild
+++ b/app-emacs/lua-mode/lua-mode-20130419.ebuild
@@ -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 arm64 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-linux ~x86-linux"
 
 S="${WORKDIR}/${PN}-rel-${PV}"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/mew/Manifest b/app-emacs/mew/Manifest
index 921ae006b90e..2e8d96121576 100644
--- a/app-emacs/mew/Manifest
+++ b/app-emacs/mew/Manifest
@@ -2,5 +2,5 @@ AUX 50mew-gentoo.el 195 BLAKE2B cca28ee1ad51b86b1fea56490f93365aead98f123df2f778
 DIST mew-6.6.tar.gz 989941 BLAKE2B 7ec4e502865e13108cc51dc74ffa246dd1084ae369979c05b9c1fc326c01f716766b7aa445ac489fe7c34cbc610e130738fa7578ab338d496970f6e59847c295 SHA512 55a91faaba09a28dfe7da33d34a8c3638540db71a3572ce01646976fbdd0ac3e327475ccc2908876ee6f516c6ee60082a27413b210c4591ef12cc4f878a07472
 DIST mew-6.8.tar.gz 991876 BLAKE2B 6055c30ac7f9286a2792fd3fb5fc53412ffed091594e64fa802cd4346fbd7ce542a930e3b38552dc39fa728898a68e1d71f0626f38ef8f815515af95fae0197d SHA512 e4713a4485fa31a95820100465728998b6d5b4822e2a522293754ab269fbfa625756417a55eccf400994a4cc6f6230b8142463ffe416917f321da5053abdb98c
 EBUILD mew-6.6.ebuild 983 BLAKE2B c0a7b1a2442cc25d8e23f26cd50de0eedad8fb879c5582cc2cc1ff68e74d8c4dd28817f86afaef2f67066f7e391ee5974a193d925bc7a0d14cfa6cddee5a6b67 SHA512 3b92dd4956bb82d8d59451b010b1e28b6e9c27e965c2a8ecdff5d9eedd77a215cc1c5d08159cb808bf14c1ba8c8d8b84a903c942256226d34066dee9e5c11073
-EBUILD mew-6.8.ebuild 1001 BLAKE2B 65f3e64190b8598ba355365531c28a16fb7bd822b7744b7527d728e7e5b9d872eb5887b663bd19716a46a181800f1af86e1bdbcc815f6bd880ea23ae4fb50c89 SHA512 6d388fe9de47f2563b73c162a53a05e5634fe2e51d08b3f1ab00b0d75bdd93bc4a1b1e93839e0a2be337e0a8145da9609b58b1915a9ee25ffb59c1a382196fb3
+EBUILD mew-6.8.ebuild 999 BLAKE2B 512c8eb6517c64b171daa1b895d0199b8f936261dcc3d17a95579e3672e0c7332fbbf4ef0c7d87907404d4eb2ca395812cb545a883ea489d8aa06314a7f4a056 SHA512 b2d0f45c418b26f76d6876eb73680910b18005e14288ea848d0e8a18c9cf9528cd192f22707ccac7e96bc1c792035d5f0903f1746a4fe742a514271c0ac276f1
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/mew/mew-6.8.ebuild b/app-emacs/mew/mew-6.8.ebuild
index dd86c62f088e..cf722cf27ad9 100644
--- a/app-emacs/mew/mew-6.8.ebuild
+++ b/app-emacs/mew/mew-6.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.mew.org/Release/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="ssl l10n_ja"
 RESTRICT="test"
 
diff --git a/app-emacs/mldonkey/Manifest b/app-emacs/mldonkey/Manifest
index 55734ccacecb..a86ba2613828 100644
--- a/app-emacs/mldonkey/Manifest
+++ b/app-emacs/mldonkey/Manifest
@@ -2,6 +2,5 @@ AUX 50mldonkey-gentoo.el 604 BLAKE2B 52632176ed6adc1cb0c871bfc94b2c01d5ec26b1950
 AUX mldonkey-0.0.4b-emacs-26.patch 387 BLAKE2B aa881c515f8c1d5125af2bd237e94ba20649087c95153f8ce92323dd977d7878475c8709057a3725ed78cbf3d777fb7b5ae00c6a911da75869232ae228edffc4 SHA512 f00edaf33d8d182e7c7e432cfcf4f0ac9b6a8f6f68d44266e9dbed53657c00bc5db5b1f6c5e190988c217711de5dcfdaef091de2581425be7bce2a44b8a0c9d6
 AUX mldonkey-0.0.4b-vd.patch 3511 BLAKE2B 00e05b1d18183fd8be439e7987b9dabdfb0c3e419b5497842c7598e534ae3e867943244a17991ce573dc0b3d86ab2844bba7cc09738d0ead137199a2bdfeb3fc SHA512 18ae6a4925b54b5d40ad9342fa65596df47e48a7223ca1a89c8622ab324f805d55c9bfaeea71c8465fd276997a34d979ff16532b8d8d86c4748fedf9ed02381b
 DIST mldonkey-el-0.0.4b.tar.gz 17442 BLAKE2B d9057a00c3b3532162564f59afb838a41b83b17adeb569d86c13cef8a6338083f12d078a19d0568936d9116e0c9adf0b53db3933116dc46925ac095c1a529d89 SHA512 3c6a16292968e0f40d319614bfd2a53c9612ec4121c5720f51498d8983f6b944c38fc1d664f1c7ebe1d68653ba62d828fa00092b1a1d278547c225b33f4e740b
-EBUILD mldonkey-0.0.4b-r1.ebuild 926 BLAKE2B 442018577f992d42349d97f58dffeb5749229011602e6117ef3001a211b076409705e9c503bf2cf485eda552e90110f41cf3a472673e20adb31e52b20fdb99e9 SHA512 9a85aadc2beeeceebc925cb14683331528d728758873d73aa04e180af93e4f469a0a74b55c230af13411d6e1a816e3effaac65e37e46b2487731f176cdebee83
-EBUILD mldonkey-0.0.4b-r2.ebuild 879 BLAKE2B 36f8e3cead9de9acccfc67a654b24015e3b428a98260bd02ce3dcc4f1118a84b7eccdf070560f6074f0df495152f63f88d4fc73c40634d883134801b455ffa56 SHA512 755765111da47d49951804248e8813d0220e76354281832587e6e9fe4405c646a0e4b6289b3cfc21e9418dd72c4a5f979ec6169b6370da6608125dbc885ea8e1
+EBUILD mldonkey-0.0.4b-r2.ebuild 876 BLAKE2B ca85c9e9b4bd45fba32d0599fbf9c1ed39ef10e7b8b6bdd8b8a87a519fafff5598ed13c68bb9a5a15d0fc917ba1e3bc1a6c8b2a7f5814f9a255d6f275d37d313 SHA512 a197db4602aea488f486991b52bf4004dcdfaf28911580be055dfbe75462cbdc8bc326a57f11f14e512b7db88b08b1c51b5cbf4f9a320ba0baeb2b0ec50a267d
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/mldonkey/mldonkey-0.0.4b-r1.ebuild b/app-emacs/mldonkey/mldonkey-0.0.4b-r1.ebuild
deleted file mode 100644
index 12ed071cfa32..000000000000
--- a/app-emacs/mldonkey/mldonkey-0.0.4b-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit elisp
-
-MY_P="${PN}-el-${PV}"
-DESCRIPTION="An Emacs Lisp interface to the MLDonkey core"
-HOMEPAGE="https://www.emacswiki.org/emacs/MlDonkey
-	http://web.archive.org/web/20070107165326/www.physik.fu-berlin.de/~dhansen/mldonkey/"
-SRC_URI="http://www.physik.fu-berlin.de/%7Edhansen/mldonkey/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-S="${WORKDIR}/${MY_P}"
-ELISP_PATCHES="${P}-vd.patch ${P}-emacs-26.patch"
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	elisp-compile ml*.el
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	ewarn
-	ewarn "If your network gets really slow when you use mldonkey,"
-	ewarn "consider reducing the max number of connections. See bug #50510."
-	ewarn
-	elog "Remember to install net-p2p/mldonkey separately if you want to work"
-	elog "with a local instance."
-}
diff --git a/app-emacs/mldonkey/mldonkey-0.0.4b-r2.ebuild b/app-emacs/mldonkey/mldonkey-0.0.4b-r2.ebuild
index b5714cc69480..95e8703a013d 100644
--- a/app-emacs/mldonkey/mldonkey-0.0.4b-r2.ebuild
+++ b/app-emacs/mldonkey/mldonkey-0.0.4b-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.physik.fu-berlin.de/%7Edhansen/mldonkey/files/${MY_P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 S="${WORKDIR}/${MY_P}"
 ELISP_PATCHES="${P}-vd.patch ${P}-emacs-26.patch"
diff --git a/app-emacs/mmm-mode/Manifest b/app-emacs/mmm-mode/Manifest
index 072ec612f986..c8e3927c8787 100644
--- a/app-emacs/mmm-mode/Manifest
+++ b/app-emacs/mmm-mode/Manifest
@@ -1,6 +1,5 @@
 AUX 50mmm-mode-gentoo.el 58 BLAKE2B 0114bc73a9125264dd76189479ec708455f88c2d50765154c64f7bd5ad386889b055b280a1dae5fe661962f27caabb06a8b6a0fc709fce83abfe9c21be6fd8da SHA512 4cbf0da7bcadcdb30947fdb789542daef059112c894be4ad418321cf526f7789e86f612c92bc5c11504ae2538f0e73650589663b3f87421543f0047932c6126f
-DIST mmm-mode-0.5.4.tar.gz 174680 BLAKE2B fbe69ffe291d7144ddaa22d161545350893285e2594f9343d6b4e3b6c929a83209c8dbdf5f270b179c98c7fd1ab88d2c5f68066e6aca0ef5e8533335c4c194e9 SHA512 71828769f40ca56d87c581481fc6531466de30155af3f22eb96ee176cd9dae354ed95a6c37d79e47a033bb79c67335e0f50dac2fb57f262bbe0ef43266af2b6e
+AUX mmm-mode-0.5.7-texinfo-encoding.patch 224 BLAKE2B c81ec6ca4cbaef71abe743d488a8605b94444f058d6207123f44bb9d1e87bfb2be5c84781c0ff5da1202775042e84cd63b4597e3020950cd412c98aa0ad4a62c SHA512 cbda4268f6e560056abf2618e2a90b1c330a9788e90b77d6353bb0b040d3330a6b4613cf221bdc3fa080d0b3fc362fd67323798ada757d06e8f72ada73f897f4
 DIST mmm-mode-0.5.7.tar.gz 176034 BLAKE2B 23fed0f260c9f46134d83d29e96b96ff331aa0fbe8d121663b74de944489d1a51948f6fba729129e47a34e1ef48cfb0f8bbc45f6ab8f548001bbe0e88a61aeca SHA512 3afb77b3351c8ea5844cd57bb873e6ebe91ce1e268d0d585581482f5039c64ea80fc7aa620e45330eca0eb7839223764164ccc09e932b54f23f3f37c9953cb39
-EBUILD mmm-mode-0.5.4.ebuild 590 BLAKE2B ad5eb39888db88049f25b124eac984cc989393db979ab9ea2f8623f8743151119ffb7b762c901d8bfba4b0dfe683c0058ffae64c1cb08b603b5b8fc893e50332 SHA512 181a5e26bf067446f5be999f4b42f8c2edbfd249e0cacd31f7586a2b401c27fc392f5c4d06ca4bff95c2594f5e998d9212ca3a44d1ac9e7835ce42eb6706d818
-EBUILD mmm-mode-0.5.7.ebuild 581 BLAKE2B 962a19ab381f8e8b0b6b147e7d89ddbadd8987f0a3bf65ee5cb5b498cc58ec480c0bc3dcf9ffd3b551572fe0f2a1b856485b6053c9c19b62a77def58076fdbba SHA512 be5b0830cbc6b85463a605171a0d3110c1563e7fb2c3709769664e5a7d6e92824629c0f6702708a16c8394fbb15e14e2d1175d8d2d9d094d69a24dfea623714e
+EBUILD mmm-mode-0.5.7.ebuild 630 BLAKE2B 0f141a88344af6583ec398deb7ac5e08cfd3546e2137f2f456e56c802c7483a4da07e9585694aa0851370d74fad2350a1496a10e90dd5047289747434b16b068 SHA512 c00f0dca6afbcab6f2a4011fccfe4024128f8ba20b2be79c54c994c56f7524f3575c93230b4e76506a3a3b031d2dee25dd6972fe42bf54db74cb5dfa9420cead
 MISC metadata.xml 414 BLAKE2B f62c75a172d2da325b4f7b0e41e0bc2d7f128e96493b46cd6bc5232915418a506c0d2e2dec88c2b2ac3eace003b4dfdafdeb3da147230c3675a5c3413ee4714f SHA512 ef3005e7c7016dae433d8612bbcf154c928f264ee3203784f2d3756c89c66545cbb3dd29349048b47fb07a1764677068d758d900b4f77fd825c11d5ae82dbd1b
diff --git a/app-emacs/mmm-mode/files/mmm-mode-0.5.7-texinfo-encoding.patch b/app-emacs/mmm-mode/files/mmm-mode-0.5.7-texinfo-encoding.patch
new file mode 100644
index 000000000000..f83d24dae131
--- /dev/null
+++ b/app-emacs/mmm-mode/files/mmm-mode-0.5.7-texinfo-encoding.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/695954
+
+--- a/mmm.texinfo
++++ b/mmm.texinfo
+@@ -1,5 +1,6 @@
+ \input texinfo
+ @c %**start of header
++@documentencoding ISO-8859-1
+ @setfilename mmm.info
+ @settitle MMM Mode Manual
+ @c %**end of header
diff --git a/app-emacs/mmm-mode/mmm-mode-0.5.4.ebuild b/app-emacs/mmm-mode/mmm-mode-0.5.4.ebuild
deleted file mode 100644
index a1e8968610bb..000000000000
--- a/app-emacs/mmm-mode/mmm-mode-0.5.4.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="Enables the user to edit different parts of a file in different major modes"
-HOMEPAGE="http://mmm-mode.sourceforge.net/"
-SRC_URI="https://github.com/purcell/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ Texinfo-manual"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-DEPEND="sys-apps/texinfo"
-
-SITEFILE="50${PN}-gentoo.el"
-ELISP_TEXINFO="mmm.texinfo"
-DOCS="AUTHORS ChangeLog FAQ NEWS README README.Mason TODO"
diff --git a/app-emacs/mmm-mode/mmm-mode-0.5.7.ebuild b/app-emacs/mmm-mode/mmm-mode-0.5.7.ebuild
index 74ec2b53ffae..b9a5768acc63 100644
--- a/app-emacs/mmm-mode/mmm-mode-0.5.7.ebuild
+++ b/app-emacs/mmm-mode/mmm-mode-0.5.7.ebuild
@@ -11,10 +11,11 @@ SRC_URI="https://github.com/purcell/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+ Texinfo-manual"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 BDEPEND="sys-apps/texinfo"
 
+PATCHES=("${FILESDIR}"/${P}-texinfo-encoding.patch)
 SITEFILE="50${PN}-gentoo.el"
 ELISP_TEXINFO="mmm.texinfo"
 DOCS="AUTHORS FAQ NEWS README README.Mason TODO"
diff --git a/app-emacs/muse/Manifest b/app-emacs/muse/Manifest
index 90f2edb2ce16..e882d2f004b7 100644
--- a/app-emacs/muse/Manifest
+++ b/app-emacs/muse/Manifest
@@ -1,4 +1,4 @@
 AUX 50muse-gentoo.el 64 BLAKE2B 1af4c3cb29edfe7f0263b2eefb1483c2f680a4199c1ec27ae7b4db26f7923d86418b3b3a87fdfae90edff728fa20cf628075a320985bde0a132d1bc864e2ad49 SHA512 c4b1049b70cd62c2490621d123227e5cc62d80c8a2fa3575d69443ec09e5fbb6294b1f3b3dda530139d9318610bc3c806f3984ae697e246778aab5aad0bbc632
 DIST muse-3.20.tar.gz 411316 BLAKE2B a67c72a470e7e2d75cf94ed262b0e9503166326666a119f41968a603b4e48f3527705691a1b4b819ae6ec69c382a09074eef74ddad598faa08be6c74793b1e97 SHA512 23cd0e864586f907418753bc3284afde51b4f8559c5d043c52baa70de70ec4a845d9e8362b93e701308dbbd662e3429035df8ad440916e61d5909498cd55f7be
-EBUILD muse-3.20.ebuild 772 BLAKE2B 33041b5eae18b5ae332c2371d741f1103d75c5663a517a2002e6eaec2d4916e3fa4ec9c945d722c50358eeec9f674e31b50c575dbff9dba712be3e764e10ab6d SHA512 e2eb889fc80ee956b1aa278d1c9060700f2dd91774804edaf406f4054df5f6fac351b82016e7c0e4ada486ef2717c2620bb2ff6f950a88dd258a05ecd6141379
+EBUILD muse-3.20.ebuild 762 BLAKE2B 73293b621c18287c7ff25a41fd3742e8706e8c3fc97388551a5ec741d33f3527abf31443d83610a446f7056c3c9ffc9c4cc1929307110b8b042d1775210e0f90 SHA512 6fafc3a55a11d574b8567e258f065fe475a094108cd88a814b776424f14bcdeb0a8ef644412597aab0c4d9962f387c93197f8e2e185cbcb9053d9f1276c38819
 MISC metadata.xml 1573 BLAKE2B df1f66340b61bf97f534274155310fabbfaa2ae8b4cf64f1bd1cba27b38ca4bc1d9f7a5ea4e6c9c74e02ba333a81638c97a8cd0cf540a3433182cfce02f26b5a SHA512 e61095db5b26acf2fdd0143cffe5146a4d1755ce3a2a5fb27041d94b0f76d09c1423af83b3d65caae3ac784f6155c8ee0bcde05e3c6f3a02e677aeeda5435aea
diff --git a/app-emacs/muse/muse-3.20.ebuild b/app-emacs/muse/muse-3.20.ebuild
index 24997d6aa576..6329cf3d05c5 100644
--- a/app-emacs/muse/muse-3.20.ebuild
+++ b/app-emacs/muse/muse-3.20.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.gna.org/muse-el/${P}.tar.gz"
 
 LICENSE="GPL-3+ FDL-1.2+ GPL-2 MIT"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86"
 #IUSE="test"
 RESTRICT="test"					#426546
 
diff --git a/app-emacs/nagios-mode/Manifest b/app-emacs/nagios-mode/Manifest
index 6eaa587b5cd1..a1a59e1cb2d7 100644
--- a/app-emacs/nagios-mode/Manifest
+++ b/app-emacs/nagios-mode/Manifest
@@ -1,4 +1,4 @@
 AUX 50nagios-mode-gentoo.el 195 BLAKE2B 9462de25d1de1f9c0d972841339dac53458b6534bfe76b744312b4f0af8063fcdf11fe3d404c49bdf4ede28550d0390b6e3ff1d7068c9bc8f30d4454f117bbc5 SHA512 07e3dfbf4b4142b6b6bbf4138c76b9252f94b9cc1c25f2eaeb9cfddf2294995ffd5fbf40b6bdc032320f94dc93e8463cb270ef841ee11424939dcf5889a54fe1
 DIST nagios-mode-0.3.tar.gz 7917 BLAKE2B 17f69dd9736b5a3f94a69ef2af7827503d2ee87f97346e5ead44563d1e056457bb425f0145b58246dafebbb0fd346857e5fe9aa11a616c8e6608722013a73500 SHA512 e9ff6e0684ee0f9f1919ec9dd4c8e0dfa7faab347f56724f7fe69bc366cf8d81f98c4c4245ddde95bbf9a2b9f72fec80a100c22b6b0b9e3c28c999515d0b6a50
-EBUILD nagios-mode-0.3-r1.ebuild 443 BLAKE2B 3455952b7b891118d1114699bec2e02a5924aecf87e9bd0a87d03f38303a2885b629098a9848b551d958759110155769123ac302a14380c97cb642d8afea6532 SHA512 2985915962259010645477aed1a46b3a6a85122eabd73eadee8b9d8d673ed822c95e1f9085a55eb8794c774b9d5e7c0ea51d95b8f2bd9d82e0ee61c3885dfa5d
+EBUILD nagios-mode-0.3-r1.ebuild 433 BLAKE2B b8888ec327f1c7612598d4e8658991620a52ff32c58027ff1b717e621231f8c276b46b9738d7dbb1553742060a89c6b7e2d36c5ada4e9b0383e83a3b75379f09 SHA512 06712284fe228b6ae6abb034a4e567b91e6bcd6f3384d341ec5cb719b2022e15b7c45053b2799c4f8b9d07e44916cf8a8f860419d5b716b1273358b68827f616
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/nagios-mode/nagios-mode-0.3-r1.ebuild b/app-emacs/nagios-mode/nagios-mode-0.3-r1.ebuild
index 4993e417bc3a..817d4d75bed4 100644
--- a/app-emacs/nagios-mode/nagios-mode-0.3-r1.ebuild
+++ b/app-emacs/nagios-mode/nagios-mode-0.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="amd64 x86"
 
 SITEFILE="50${PN}-gentoo.el"
 DOCS="ChangeLog README test_suite.cfg"
diff --git a/app-emacs/nxml-docbook5-schemas/Manifest b/app-emacs/nxml-docbook5-schemas/Manifest
index 6702754190d2..2216eab720ed 100644
--- a/app-emacs/nxml-docbook5-schemas/Manifest
+++ b/app-emacs/nxml-docbook5-schemas/Manifest
@@ -3,5 +3,5 @@ AUX schemas.xml 198 BLAKE2B 723ce69dc7b0e63267b0e7b93965ad238b9a919f088aa5dd7611
 DIST docbookxi-5.0.rnc 292523 BLAKE2B 13ae2f3756485845e2fc6dca87bce5eb12c419c84b6edaab5051b075700387c32904f54286756c5fed2480c17af00e385845105a94b13ced9fe13ba959e22224 SHA512 13309beb2dbf76168889a962782d3dd1849fb254ebf1941ffd4fcfc272353ba0ddece509a9b74250462b3e1eff12f31fc408aa790e0efea01d527482b3fa3a48
 DIST docbookxi-5.1.rnc 361312 BLAKE2B 374c622718b0c9969561a76874fe878570af4fd2a1288f79c8b51c1474ac75e7e98cddd2be7bedadf8271aefccd770cf70ac4499d45187b327c0a50e402b1a48 SHA512 28191653224a301a3ce7541ca1fcc5d526b76fcce00533adbdc16507ddaa768efedebe31b0fade6b8ea7b28d3d33e9656363dfc667eab227280bf6061673a31c
 EBUILD nxml-docbook5-schemas-5.0.ebuild 630 BLAKE2B a78cad9375dc90fd0b8d404a6f72831c65d73a2c528d97763a2ca7c769e48f940dc5dbfa263427f6a9049dc49f22a3e87389272942acd55b50a742b34166a413 SHA512 1abe4eda77aa0c594c32270ed609cdd5bd2f3f06f1d32050bdca393df4f34e4d7f943d37fc07a54721165fac85c187e078fd0d3a7da83103dcb2e9bb0844ab2d
-EBUILD nxml-docbook5-schemas-5.1.ebuild 632 BLAKE2B a542a05df2a47f1c9191bcabc5d027cfaec566f6f34076ee65dd98f74b2095054bdfc133211b9559af8298054613672f7058c4c1498d71be1e8ef998a39af8f1 SHA512 24c67ca4505c8cee94d2c265192cbef6dee9c764086e5e25f456b2a1d36878d3dd00263f744398d400858d8ba661dbee679776a91818f8091591feb447630bf4
+EBUILD nxml-docbook5-schemas-5.1.ebuild 630 BLAKE2B a78cad9375dc90fd0b8d404a6f72831c65d73a2c528d97763a2ca7c769e48f940dc5dbfa263427f6a9049dc49f22a3e87389272942acd55b50a742b34166a413 SHA512 1abe4eda77aa0c594c32270ed609cdd5bd2f3f06f1d32050bdca393df4f34e4d7f943d37fc07a54721165fac85c187e078fd0d3a7da83103dcb2e9bb0844ab2d
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/nxml-docbook5-schemas/nxml-docbook5-schemas-5.1.ebuild b/app-emacs/nxml-docbook5-schemas/nxml-docbook5-schemas-5.1.ebuild
index 3cede296fe4d..946c21d0a832 100644
--- a/app-emacs/nxml-docbook5-schemas/nxml-docbook5-schemas-5.1.ebuild
+++ b/app-emacs/nxml-docbook5-schemas/nxml-docbook5-schemas-5.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/rng/docbookxi.rnc -> docbookxi-${PV}.rnc"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 S="${WORKDIR}"
 SITEFILE="60${PN}-gentoo.el"
diff --git a/app-emacs/nxml-gentoo-schemas/Manifest b/app-emacs/nxml-gentoo-schemas/Manifest
index 899f66139a6e..7bcd0710fd73 100644
--- a/app-emacs/nxml-gentoo-schemas/Manifest
+++ b/app-emacs/nxml-gentoo-schemas/Manifest
@@ -1,6 +1,6 @@
 AUX 60nxml-gentoo-schemas-gentoo.el 206 BLAKE2B ae9d1fe1da9c86d14796c09597ca34b10dd0e28abb02fdeac4607b8d950bfdf636f5f3c1de49cd5b9cf1fa808513522ab43272f3c26361b871ad0d630a942ed6 SHA512 5592edb5663066fcccaf5b05c3df671b4069d4d259376a8a91ef3f7ae5990687b15dfdf40e6f7aa6cc7d62b7cdaa5090fd851de0ed2718d20ecfe3e3a78530ea
 DIST nxml-gentoo-schemas-20170302.tar.xz 11496 BLAKE2B 34e3517a6c57980f0a349e6c0a659ff8cbc38ade3a1cf2fd36ef7179e841de38eb73bbd85c65cf8e284f5b58583f850fd9e9622699c8dd5a909d2aa5a756164a SHA512 34f02d2b5e3decad51b4d5801826cf0f7a7e863a1f61a529d3d53dc38d0a687cf100da8007c9dd1ee2172dc22af3dc963dddf3c8fefcdc47db616261d8f2f259
 DIST nxml-gentoo-schemas-20180611.tar.xz 11572 BLAKE2B e8a573e79d9531d676b8c52ba9c2869f765e6bb0326f3f00c99dd3ecfd19af6eaedbb06ddf84ae541690962a5e67b87726d6cc90a3bf7dd6d805b5c2c96b6321 SHA512 8473233141a56935e41a9d0371501f3fe055b21600746db29e14ec91d12a43da595e500a876eea8cdddd885358df0825055143e901eb599a2fcbac7147a04fa8
-EBUILD nxml-gentoo-schemas-20170302.ebuild 579 BLAKE2B f57c3558ac46061dfe25a7a7b7f2c4a60bf580423299ca4f83ceb701350b1aeba7d73231fbcf22d96160367c2dcf5f4eef382d9ce054425727bc21736d8aece9 SHA512 84835c6ceda08c30d3572b92106b1d0eab5e296c10b5e9110b99b89542d737b0c4b8d9cb8a4f9c9cbabd99cf5d1f562d1f0a79631b740a411364ca49ef0abc26
-EBUILD nxml-gentoo-schemas-20180611.ebuild 579 BLAKE2B 8938baf746880318ca5bb64bd8ca510311dab35b8f103d6dd92c3b93153b2239a962b160eb9d944a9fa2b55072c49c18266488238a0950b8c9e9e568316ffd9d SHA512 cfb578c94d9d2ebc97ece8d009527988b6bab54f2e5662ca96c50652cbc618de2aa82821c496eb9c4938840543ba039c1544087b3ce4e57c4c936ada0344db02
+EBUILD nxml-gentoo-schemas-20170302.ebuild 569 BLAKE2B dafaa0d10d1cd729062b288bdd4ca84380a27fd8c666292602c90370c656aa494e4fd302775af1bca040b36f5dcae8abed4937104d06c7566b80cc9faf95964e SHA512 499bb14f4ede0ba42abc41ca65e76ab5483f7a9fbf8b9137e31f2db0a738e511de5cc9060f3c181bdae88a955f0937f414b94e8bca8184bfae86cae7f0c05451
+EBUILD nxml-gentoo-schemas-20180611.ebuild 569 BLAKE2B 789267b1c9eb33374439e3bf4b3b212588c465b2b6a02c5da65ca8762a9ef6371364bc0bb31532cf7cc17d60495c73a52bc09f2767227f59a0758f3b4f2c86eb SHA512 272b38d9d09a1089dee357a80c780e4cc2ba14d50301d5d9c57a30cbff41db26865ecac9c9ffb209843aec46c6b63cdae767757c09eabd97aeedf03bb507320e
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20170302.ebuild b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20170302.ebuild
index 77807012f4cc..e2e965e601ed 100644
--- a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20170302.ebuild
+++ b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20170302.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 SITEFILE="60${PN}-gentoo.el"
 
diff --git a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20180611.ebuild b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20180611.ebuild
index e7f0519c8d6c..22039e659d7a 100644
--- a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20180611.ebuild
+++ b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20180611.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 SITEFILE="60${PN}-gentoo.el"
 
diff --git a/app-emacs/nxml-svg-schemas/Manifest b/app-emacs/nxml-svg-schemas/Manifest
index c97188ba2ec9..41da2f5a2c01 100644
--- a/app-emacs/nxml-svg-schemas/Manifest
+++ b/app-emacs/nxml-svg-schemas/Manifest
@@ -2,6 +2,5 @@ AUX 60nxml-svg-schemas-gentoo.el 206 BLAKE2B ae9d1fe1da9c86d14796c09597ca34b10dd
 AUX Makefile-trang 108 BLAKE2B 4f80e5f4e0550bd4732668ae5298d890d2293d34379902cf204c43bbea5db01626847af7ab96854efcbcc34e7fe9b1c32873ad22ef13873a1a06790e9580371d SHA512 3544959cc57ce1b273e4b9de95f51e1e21d23cc35fb48e02f179a055a61ee9092efdc43405f72c3aacb3c74eada7fabf5952eb49e3ff0514fd69a3092268dc4f
 AUX schemas.xml 495 BLAKE2B ecb678b98a23e0631da09f9befa73b2b41c5204f78423f9957eaabd6963c5e8b63114c0f908039618744e4aa4643603b58a9ded5fdbf157e0cc60b1810afce84 SHA512 d6a9f0b9db51e05b4f3d0395c8d43a0577d23fdb6c0e9d0123682f00d4ccac5897dfdbd157560b3bb9f06a8a768298489e8b8a2843d7e7a65ffb4a5e20c1b316
 DIST w3c-svg-rng-1.1.20081123.zip 48420 BLAKE2B a89da9708ea79085ad5aef1f85769683af2a5c8ab84a5a4f53b9c2fdeebf422a96065309d69eb4ac9bd069bcd3685ee849c7cdb4b9b9e7829ff58fb0b7b8b754 SHA512 69e44a7c04a3af77d0fed8f19372cfcad7998e262a44b520145fe2c0ad03bf20daf57e1e97f71ff27f0e06bd3f07d1ec0b0976fdd893d77df2f82709f7c1ce1f
-EBUILD nxml-svg-schemas-1.1.20081123-r1.ebuild 1184 BLAKE2B 309e2700423b5796056a83e92caf0146edc437fafcd586995b233710af862ba7b98789bf4e0d1f872f5466503729bdfa8a0b55efb3c83c88abbe3c9c7693e28e SHA512 ec30f4253cd4161af7db052bc77f0b1ebe1803747cbe83ffc1b5d2eda9042092dce315273c862d5c016f0de2cd8fe9858b0aa75ecec012c5425c582749ae7264
-EBUILD nxml-svg-schemas-1.1.20081123.ebuild 1176 BLAKE2B ada7a527f213685649ad3507f4f2e6048e37e1a00e8acce8d8ada3658a11473049cdac1614670d4c0c29a7ea5ef52bad1af8cbb814fc7be15074dc20a94e350b SHA512 09781d45de2872b53ac1087dfbfef8eb4881c070caea3d301b8847a63bbc00eeb57569471684684c2d82baee9d95ada14e99c985dd86b606406cc4cd4d1a6098
+EBUILD nxml-svg-schemas-1.1.20081123-r1.ebuild 1182 BLAKE2B f72f14a71f345b083fd2e4f00e098b9d53c77659befd74eb25cfe932b9d1bf13be8a5a3df070a518973a6922e06b0bd76876db2cb7f184b18deaa042a1a0fe9e SHA512 7fe01a0435e1068bf072f65e3adb5b2253a78730edf791e046f60573e72f9b9362395fe85e6ffa3ab63574782409938f4ec4532ad939e3ff39fff0748b2975e6
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/nxml-svg-schemas/nxml-svg-schemas-1.1.20081123-r1.ebuild b/app-emacs/nxml-svg-schemas/nxml-svg-schemas-1.1.20081123-r1.ebuild
index 30fe6dd0034c..26e75ce7d906 100644
--- a/app-emacs/nxml-svg-schemas/nxml-svg-schemas-1.1.20081123-r1.ebuild
+++ b/app-emacs/nxml-svg-schemas/nxml-svg-schemas-1.1.20081123-r1.ebuild
@@ -16,7 +16,7 @@ LICENSE="HPND"
 # install this one anyway because the schemas.xml syntax is not
 # sophisticated enough.
 SLOT="1.1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # Yes this requires Java, but I'd rather not repackage this, if you
 # know something better in C, I'll be glad to use that.
diff --git a/app-emacs/nxml-svg-schemas/nxml-svg-schemas-1.1.20081123.ebuild b/app-emacs/nxml-svg-schemas/nxml-svg-schemas-1.1.20081123.ebuild
deleted file mode 100644
index 5180d7bed52f..000000000000
--- a/app-emacs/nxml-svg-schemas/nxml-svg-schemas-1.1.20081123.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit elisp
-
-DESCRIPTION="Extension for nxml-mode with SVG 1.1 schemas"
-HOMEPAGE="http://www.w3.org/TR/SVG11/"
-# original SRC_URI is http://www.w3.org/Graphics/SVG/1.1/rng/rng.zip
-# but since it's unversioned, I versioned it and got it locally.
-SRC_URI="http://www.flameeyes.eu/gentoo-distfiles/w3c-svg-rng-${PV}.zip"
-
-LICENSE="HPND"
-# In a future we might have 1.2 schemas too, but for now we can only
-# install this one anyway because the schemas.xml syntax is not
-# sophisticated enough.
-SLOT="1.1"
-KEYWORDS="amd64 ~x86"
-
-# Yes this requires Java, but I'd rather not repackage this, if you
-# know something better in C, I'll be glad to use that.
-DEPEND="
-	app-arch/unzip
-	app-text/trang"
-RDEPEND=""
-
-S="${WORKDIR}"
-SITEFILE="60${PN}-gentoo.el"
-
-src_prepare() {
-	# we don't need the doctype for our work
-	sed -i -e '/DOCTYPE grammar/d' *.rng || die "sed failed"
-}
-
-src_compile() {
-	emake -f "${FILESDIR}/Makefile-trang"
-}
-
-src_install() {
-	insinto "${SITEETC}/${PN}"
-	doins "${FILESDIR}/schemas.xml" *.rnc
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-}
diff --git a/app-emacs/ocaml-mode/Manifest b/app-emacs/ocaml-mode/Manifest
index 53966bba597e..c6ea35d94eb5 100644
--- a/app-emacs/ocaml-mode/Manifest
+++ b/app-emacs/ocaml-mode/Manifest
@@ -1,6 +1,6 @@
 AUX 50ocaml-mode-gentoo-3.12.1.el 499 BLAKE2B 30d49a4e43fbf4fac02f4a2dd8a9fe7c3aeea623836330e3ed0f8921cc96a02d087f35a32a93f6e404392a1f915539799d1a5c8168b06cb1d8ab76ea0ac6b8fa SHA512 0be69a30c07caeff818e4d6fb0147e18855e88a3bb6a6e876b170edddb32382c0bd19ca960836d8442eecd00e78be09cba7de08030420645c2ef1ba5d9198524
 DIST ocaml-3.12.1.tar.bz2 2949124 BLAKE2B 8814927411cb9b604c78f44d172fd1f8b3d5f6009a1e722d442b8e49709778824cd6d1341e8129454d49000ea4d1234c533ee72cf0fa8fa84ee3b4d664177c4a SHA512 cbb050aabcbe19a4aa070d6cb74f3774cb136692dfd9433ca977f0f9520ad2f583b6cfb1a9cedfedc92e7dc794ac4a869e20aa5a67a4739002feb290435dc7e7
 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-4.00.1.ebuild 512 BLAKE2B 8624b8a5cd72bdca4c4b684b9aa10bb2d1b74d4b39b97c29acea1c25b60a5efce98bd8be0654625d40eddf38bf565b4f44092685f9f6ba1978ac4fc9cedee9a7 SHA512 f4d728f9a8702a0f577cec7f7868c58323116b749306a4d5edf1f0795715aac9a0cabc2436789243a5b8be641df3efb900581109b15d412c6d9ec5a1fbda014b
+EBUILD ocaml-mode-3.12.1-r1.ebuild 456 BLAKE2B 362a03586e4a0018cfb94f758904f79dc8b5f3b898390160a0726e7b42d4d4914978741b10ce01a1cee10a51d1a98af4eca4bc042d0fa42d43bd5e88ee29e8b3 SHA512 b327092fd9f16382283b964e3ef31ea184e2fea42cd38d9421984a32fba54985e0496bdf62d0a1ba7fc41f1a3a4ce2ca42885b21fad3d88c84ec050b029d0c19
+EBUILD ocaml-mode-4.00.1.ebuild 490 BLAKE2B b2a0c837423ba5d494fd9eaee117e2bb29806ad5f0a337c9d0703809822cf4c428ab9963b152e56e95d06b559338cacd957aa82999dfa6a559c1711913047830 SHA512 76b528a6ab3a083d90fe5d5f0db6498c385da351b22a831a5f6458e7347bd2af08191cc0011e2eb522ffd365bae091a283ef0ff4477e2efbe30c0ec6ab16c651
 MISC metadata.xml 388 BLAKE2B 3b0d21b61541c15e807ececd8bfeb3a91ceefd5075836b4a22a990b1f0c9b4ad71ce68b9d65935382e5f84ae6fc49d022fc2b1c0704a5cf331857b33e09bd327 SHA512 d997ec7cfd421fa931b5ef0cc7713a75cffd1c1fb0204364253fa5243b67ae60389723f9ea473e7558bc87fcb6df54b85c987ca269c15ddc4613157ccee6b9db
diff --git a/app-emacs/ocaml-mode/ocaml-mode-3.12.1-r1.ebuild b/app-emacs/ocaml-mode/ocaml-mode-3.12.1-r1.ebuild
index 9b0b1a174d53..c29d106219ca 100644
--- a/app-emacs/ocaml-mode/ocaml-mode-3.12.1-r1.ebuild
+++ b/app-emacs/ocaml-mode/ocaml-mode-3.12.1-r1.ebuild
@@ -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 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
 
 S="${WORKDIR}/${MY_P}/emacs"
 SITEFILE="50${PN}-gentoo-${PV}.el"
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 a0e1dabda8c5..07f4752a09a3 100644
--- a/app-emacs/ocaml-mode/ocaml-mode-4.00.1.ebuild
+++ b/app-emacs/ocaml-mode/ocaml-mode-4.00.1.ebuild
@@ -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-linux ~x86-linux"
 
 S="${WORKDIR}/${MY_P}/emacs"
 SITEFILE="50${PN}-gentoo-3.12.1.el"
diff --git a/app-emacs/org-mode/Manifest b/app-emacs/org-mode/Manifest
index 25333f857c2c..88838dc09775 100644
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@@ -1,8 +1,6 @@
 AUX 50org-mode-gentoo.el 95 BLAKE2B 9c74869edce0915d9793a3b10f61e8002dec553a93fe9856c526d77e5e988a35203c35322a1ea7ce9e19b02ff9a5ce1b2b4d73b8ba19bada30b7fbf453e43b01 SHA512 aa2e47c060d441ef1f631f2a44f3b7adc7cf5306155b9cc3f3f808aa053b411980671a89933c77fe02aac79bb6f25f2fe98c676e13e097dd885f23bc9d8cb000
 DIST org-8.3.2.tar.gz 4442361 BLAKE2B f21f07578e870cd3edaa3721a53f679627c0115c320c666c2086e201e272c0ef03540bfdd90936a624cd4c4dcbac21b91346ba975b6006ada2d46184f73574f3 SHA512 3e1ff47c875a2db3239add8b060f555da357e465161ca62860c0ac2734c2e31c5387d2df4223ab7ea8ea60050f9a845d160b0bcb3afcf36f1d3cabcaa961e6a2
-DIST org-9.1.13.tar.gz 4625532 BLAKE2B c7044913b8fd0bde43fa1ff0f4bc9963ebce1cda17753fe7642aff914603a4278e7396acf2236c27334f2b9a009bd9e3310ec6144d851e121c3f6ec6516ad6c7 SHA512 a1cb1b2a8db082b7f7a03e90109352bad219808cb506af30082b87fc2c6d66733ce304df4379542e7a85e20c213e1cbc8bf4c9d6c9777fea393a88755129c4bf
 DIST org-9.2.6.tar.gz 5720665 BLAKE2B 19346696b41c2ab5b66ca58b0e28c4ddfa184a390d39b1edc80536901754ac81a479cfb1ead5aaca6d93c9060fc122bbdfe1307900fbf0fc8cdb8fb7a2b2153c SHA512 8aba98bcd2e8e8d40c90524c7b0fd85526fc64725823a6ba66ef80b8f5f2e7d2b1d3363db2553af6672ded085a0abbf00311e36f02cfc1c2dbb18184df8f34a5
-EBUILD org-mode-8.3.2-r1.ebuild 1777 BLAKE2B f05cf006f13a39b5cdc62da3e5ba742c88b2cbdc64787218e0f2862095637714e2319c406327ce69649ac163e2e9f8cf06031d8e9464337b051ebb71da56f67f SHA512 2e5c6790fc10a7df5859ff7893ad6b37417099152e8021b306f536fcd92f7c4b2b3ca2477f268ff166b7eea92cd0c1b76ff0c3db3da4003c6181e6480959e126
-EBUILD org-mode-9.1.13.ebuild 1750 BLAKE2B f2e0c7a8921ca7583cd9417294cc3c692097694777cb6f0024361748dc88ff95bee545a1746073df475451b082f6795aec84633b14235714a60e8fe3fd6db8e4 SHA512 350915aedb567f6752dfef8debb8ac5d3c34a6a582341925ce03f52d7909c07a6bd86ee53ad579b3479442448136ee85f45b5976ff8f32c5d36d7cc40f27a1b7
-EBUILD org-mode-9.2.6.ebuild 1751 BLAKE2B 199663bcfcf3e176bc883549d18c542a618a70c08b182060f91ec8fcf2e56c46b0bc9e39a16887db66adf5f66ef0e527b91e7a06db771f515ef5174503eb69b0 SHA512 79223a957005bc4042a51cc851152fe68748493530274852d429cbd7ae7779329c3372ab9cafd4194ee4dda23b0f4fc21c6546e9231fdc7d2d0e8ebecbc68049
+EBUILD org-mode-8.3.2-r1.ebuild 1767 BLAKE2B eae5475c45f909480554137054673d43a55faf2dd209069bdd3e9d869e9414ba85895a2ab5179e0b54665a5bb37026606da0e2aad225903d285ff52705495b87 SHA512 b3ea37e7f44b4330aadb59dcd5e39fd8a79cf0a30c3325ca292b20a1d17596069c84996a1aa3d858d5b66e314d29862206eddcaf50cf74352c77114530070241
+EBUILD org-mode-9.2.6.ebuild 1738 BLAKE2B 4c987d7c0a560a4b0fa7540c11784fedff260c9839ed664029ff395b305b3542b5afb14735ee1c4123efe168a93f96f38a87873fccbdec40b1d07015eec7f254 SHA512 f8a7fb0b34ded97107ce6ab3bb1013b3e1fe00173b2b457d0f1bd2c35d0b6b9621c79c5e08dd141f2726db48d4d98e6aa624b76393dc95e89aefbe1946600c3f
 MISC metadata.xml 1368 BLAKE2B 2680c11ca69b9acd8b96b6dc76586037bd1b7ce0e9cdc183781742f373ce8d0be5b8820b7fa4d18c4f59523e10d3b40df3edbba5178169fb993bacc8d10cdfe1 SHA512 6c557a3a3ecb9b1993bd8c976d0a81460cd1ecc6e53fbaeb0d086e8d78497485a1b34470b72a73e779878b4947a22d61ef36259037cf6ff0315a823e15e09c66
diff --git a/app-emacs/org-mode/org-mode-8.3.2-r1.ebuild b/app-emacs/org-mode/org-mode-8.3.2-r1.ebuild
index 54ca7f39f1a8..cb1d2160a769 100644
--- a/app-emacs/org-mode/org-mode-8.3.2-r1.ebuild
+++ b/app-emacs/org-mode/org-mode-8.3.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://orgmode.org/org-${PV}.tar.gz"
 
 LICENSE="GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~x86-macos"
 IUSE="contrib doc odt-schema"
 RESTRICT="test"
 
diff --git a/app-emacs/org-mode/org-mode-9.1.13.ebuild b/app-emacs/org-mode/org-mode-9.1.13.ebuild
deleted file mode 100644
index f4c866b2b0d5..000000000000
--- a/app-emacs/org-mode/org-mode-9.1.13.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-NEED_EMACS=24
-
-inherit elisp readme.gentoo-r1
-
-DESCRIPTION="An Emacs mode for notes and project planning"
-HOMEPAGE="https://www.orgmode.org/"
-SRC_URI="http://orgmode.org/org-${PV}.tar.gz"
-
-LICENSE="GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd ~x86-macos"
-IUSE="contrib doc odt-schema"
-RESTRICT="test"
-
-DEPEND="doc? ( virtual/texi2dvi )"
-
-S="${WORKDIR}/org-${PV}"
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	emake datadir="${EPREFIX}${SITEETC}/${PN}"
-	use doc && emake pdf card
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		ETCDIRS="styles $(use odt-schema && echo schema)" \
-		lispdir="${EPREFIX}${SITELISP}/${PN}" \
-		datadir="${EPREFIX}${SITEETC}/${PN}" \
-		infodir="${EPREFIX}/usr/share/info" \
-		install
-
-	cp "${FILESDIR}/${SITEFILE}" "${T}/${SITEFILE}" || die
-
-	if use contrib; then
-		elisp-install ${PN}/contrib contrib/lisp/{org,ob,ox}*.el
-		insinto /usr/share/doc/${PF}/contrib
-		doins -r contrib/README contrib/scripts
-		find "${ED}/usr/share/doc/${PF}/contrib" -type f -name '.*' \
-			-exec rm -f '{}' '+'
-		# add the contrib subdirectory to load-path
-		sed -i -e 's:\(.*@SITELISP@\)\(.*\):&\n\1/contrib\2:' \
-			"${T}/${SITEFILE}" || die
-	fi
-
-	elisp-site-file-install "${T}/${SITEFILE}"
-	dodoc README etc/ORG-NEWS
-	use doc && dodoc doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
-
-	DOC_CONTENTS="Org mode has a large variety of run-time dependencies,
-		so you may have to install one or more additional packages.
-		A non-exhaustive list of these dependencies may be found at
-		<http://orgmode.org/worg/org-dependencies.html>."
-	readme.gentoo_create_doc
-}
diff --git a/app-emacs/org-mode/org-mode-9.2.6.ebuild b/app-emacs/org-mode/org-mode-9.2.6.ebuild
index 9fb4aebaeff2..006ef0715c13 100644
--- a/app-emacs/org-mode/org-mode-9.2.6.ebuild
+++ b/app-emacs/org-mode/org-mode-9.2.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://orgmode.org/org-${PV}.tar.gz"
 
 LICENSE="GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~x86-macos"
 IUSE="contrib doc odt-schema"
 RESTRICT="test"
 
diff --git a/app-emacs/php-mode/Manifest b/app-emacs/php-mode/Manifest
index 4bdfdd18a299..92a647981454 100644
--- a/app-emacs/php-mode/Manifest
+++ b/app-emacs/php-mode/Manifest
@@ -1,4 +1,4 @@
 AUX 50php-mode-gentoo.el 286 BLAKE2B 1c823d8244e714811c5f1be402d1cd41e7b81951aafdedd01f36fe93f3cb6150792b5ed09ef5fd859211692f766fb8e931581c5e9cd60401d6eade364696edec SHA512 5f6205a7f3300d02b612a0aba58566dba1ad2a5f090c827c7d2d740af9c425cccb8384b37ac81e05eb81b4e31e649726433105b9862b92913e56752c554eec93
 DIST php-mode-1.19.1.tar.gz 94857 BLAKE2B 65ecb228fd4cd2c09cf38836b7d04ac270051976dc97dd7a3124f5a86d4e95bf9a097c6885f55c0ea40599fc2d3f813204e7f28a5f75223cae9eb51e74136017 SHA512 ca4fd798690d5b855a8d4b0cf5b631c32a561466b7697c9498bd89ad1059b774616acab10e30877b3053ba613b63db5da74a479c0a09c57b9b7b2350f42e68dd
-EBUILD php-mode-1.19.1.ebuild 517 BLAKE2B 4e11fd2aa68e87b1e2bc219bb2637dc857683945c8de4bab69bfcf6c3fae054bace833bad7e3c67046792d545b1c5256c650bef0483b96d9c33e3c34840e67f6 SHA512 a84b75b9f246d30ce879952ac2717ec9df8b5fc26c0014b0fd5cb55f2938455de09c9ee86d2e5a26d3249eb71f5e41e55e7b5ddc57f6cda0d7f0c80c61042148
+EBUILD php-mode-1.19.1.ebuild 507 BLAKE2B 479b22bfa2025f6c451eb7241533a5bff188495bbcc01e5c3c2817995ab0a4d3e909a0dcff752b95477bacb584087a58bbc6d5fecee4ef13fcb131fa4081f480 SHA512 79adda0a1cbcd74af2b1b26c701ac9e559e9325456d52f4deee568bc4341b67cd4a657351477d8eec3f406b20544644c838edc1212158f3d386d73b64277ef84
 MISC metadata.xml 358 BLAKE2B e43dc1a1d876d29121c6745f2e66c3b3585ea5ab0aed824c28bece59078fea9df0f6f438701dfc64fdbf90cb258091d5b96b4dc8fa320161ee241fc17be0a4b9 SHA512 eadc968656b4fe2150fd3d360c32d3fc66d42408c61ea60b3df5be2ba6cd3ed6abec1ba45e37269f5d06721eea30d3dbf95f3a747000e5b5d60e614c56ce3f85
diff --git a/app-emacs/php-mode/php-mode-1.19.1.ebuild b/app-emacs/php-mode/php-mode-1.19.1.ebuild
index e9cbd7424453..7fd367f22226 100644
--- a/app-emacs/php-mode/php-mode-1.19.1.ebuild
+++ b/app-emacs/php-mode/php-mode-1.19.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ejmr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 SITEFILE="50${PN}-gentoo.el"
 DOCS="README.md Changelog.md"
diff --git a/app-emacs/po-mode/Manifest b/app-emacs/po-mode/Manifest
index 8d5cc4108b3d..7c913f527a07 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 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
+EBUILD po-mode-0.19.3.ebuild 518 BLAKE2B 7fd00abaa49fdf402d9084b7449f6ba5f409dc8dd1113aa4dda96c7ae668a6b6ad9170dbe51b32e941b6d64fba9614347f9d67bfe5b1ff1d8f2328eac11ab4f1 SHA512 090475f391645e0ff024ee879ccaf00e9ed4dc4df7a3776b64963b046fc1ba3feb6e8c30a2b3c4cd3cecc6249a58e4e3cb44f0bdcb4211129556a47cc87d4cfc
+EBUILD po-mode-0.19.4.ebuild 525 BLAKE2B 98fabec6141e16d740fa6b51f3d638e283f4b7221dfb06a7a41c55e4eecefde7b3a20becb50e41ad487ae7867ca8af193319759a79d5f7d8084c93e81be6f6a8 SHA512 372688078ae134944da85164ea4db3301c9064f98957db95ff9446ac24584a52d36b5a0020dadd8a532f53dc3fb300d3f303851f65c87534e945e5a6a0fb22e0
+EBUILD po-mode-0.19.8.1.ebuild 531 BLAKE2B 10163db5b6e2c1c5c9f4d1dd2cc1176f283c5b751d3b2b8c12e347d0b07d310788cc7f694b6a6e569ba5eec50c2d0f1ec42ae7e6ffbb74468fa356e2b5e5eef0 SHA512 630eef338683173e443dc59665f75c6ca675fa492da35aa9b008ab199190cbe84d605c2bf04d186d4ea6a5719f1116d648b9f47d849d24f373895aca3525d979
 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 28612bd8cd85..d3c04481635a 100644
--- a/app-emacs/po-mode/po-mode-0.19.3.ebuild
+++ b/app-emacs/po-mode/po-mode-0.19.3.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 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-linux ~x86-linux ~x86-macos"
 
 S="${WORKDIR}/gettext-${PV}/gettext-tools/misc"
 ELISP_REMOVE="start-po.el"
diff --git a/app-emacs/po-mode/po-mode-0.19.4.ebuild b/app-emacs/po-mode/po-mode-0.19.4.ebuild
index f113b3415ff8..cc42a87c2afd 100644
--- a/app-emacs/po-mode/po-mode-0.19.4.ebuild
+++ b/app-emacs/po-mode/po-mode-0.19.4.ebuild
@@ -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 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 S="${WORKDIR}/gettext-${PV}/gettext-tools/misc"
 ELISP_REMOVE="start-po.el"
diff --git a/app-emacs/po-mode/po-mode-0.19.8.1.ebuild b/app-emacs/po-mode/po-mode-0.19.8.1.ebuild
index 85a2aacdb3c3..4a74f6455d7a 100644
--- a/app-emacs/po-mode/po-mode-0.19.8.1.ebuild
+++ b/app-emacs/po-mode/po-mode-0.19.8.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gettext/gettext-${PV}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 S="${WORKDIR}/gettext-${PV}/gettext-tools/misc"
 ELISP_REMOVE="start-po.el"
diff --git a/app-emacs/pov-mode/Manifest b/app-emacs/pov-mode/Manifest
index 5270cafc4a4f..ef1a28100040 100644
--- a/app-emacs/pov-mode/Manifest
+++ b/app-emacs/pov-mode/Manifest
@@ -1,4 +1,4 @@
 AUX 50pov-mode-gentoo.el 423 BLAKE2B e622ca33adb577987c9d68e1baa2e7415e12cb74866cf64f16f693f06fa886866d3154e68cdbffaf2d929f50ffc8db29ef2c6b356f98f873eced5ee8ff4da518 SHA512 d2d27e6770909ebd08a8c53dbfba3896aca814637c861623746e66097f0f21686507322c734c0a48e15ee281cca0e51a82fff716276f9aec65e5a1419c8dc028
 DIST pov-mode-3.3.tar.gz 65926 BLAKE2B a2d217a0876fba0a490a77ee026eb555819d2668c50e6b4a289491a8cfbecc62fc55ad8c97d6b7011420098ba7052ce80ac39bd6bc8cccc78c5bd49dcc5d41ea SHA512 bdac1b6b872b8de08660adc8eec706cce4b085b62e7c48bb6bd57e25d9e1f9b8c0086f30ee9c5befee7b0d933831d459eb0704dfe5e8cce8cae378d7404b9c9e
-EBUILD pov-mode-3.3-r1.ebuild 612 BLAKE2B 935282b7f5235686ecdb93ac988f3262d37e9c73679acdda09fb9de2dcd30bbf2c8d4a473347ee5489bdf56f157d650e3f63abba53f45f4d07c6c7f80f727d32 SHA512 21f2deaca40b2a8796bab81d17f63edbbd306d883ca69ce9d58c83333728f0f02c30a7f122743b4fdd9f038fb152a0e8212ffbea33f827b82891f2aae464116f
+EBUILD pov-mode-3.3-r1.ebuild 609 BLAKE2B f83cf66e0d685a3e14b7bf130eb77bb3cd485498eb4faa4c2123bbe4b908d2513feba437f4813971ebb9dd234e0a4470bfd45e5c3767cc89dccc39856ff9e594 SHA512 24680c616e5dd4f92f005bcbbff827f118f7a4262f3ec869c804b902b71ea42209ba17be6ab58c4128b08ffa2a2851e0234fadb715556d9f5d22bc9ee9b7c98f
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/pov-mode/pov-mode-3.3-r1.ebuild b/app-emacs/pov-mode/pov-mode-3.3-r1.ebuild
index 62ecc80c9bd1..4ca1582c2d56 100644
--- a/app-emacs/pov-mode/pov-mode-3.3-r1.ebuild
+++ b/app-emacs/pov-mode/pov-mode-3.3-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit elisp
 
 DESCRIPTION="Major mode for Povray scene files"
-HOMEPAGE="https://github.com/emacsmirror/pov-mode"
+HOMEPAGE="https://github.com/melmothx/pov-mode"
 SRC_URI="https://github.com/emacsmirror/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+ FDL-1.2+"
diff --git a/app-emacs/proofgeneral/Manifest b/app-emacs/proofgeneral/Manifest
index 1243783843b9..8a165ebe6f0a 100644
--- a/app-emacs/proofgeneral/Manifest
+++ b/app-emacs/proofgeneral/Manifest
@@ -1,9 +1,6 @@
 AUX 50proofgeneral-gentoo.el 68 BLAKE2B 14c41f176f78dee51fdb893f355c2b8cf00456e0b586c7c41c91f2eea6f8d0baaf8d6a04eda385031c96c138d47c0e7e99a75be7cd27ffd0d2087e0a69ded0b2 SHA512 32f3d33d85776f1695d542adadb8e35e372659fcce2805fc205732cd911be186cd5a1a63a8438287467dea744da9ef212f7338c0edb735a525ec30f892f1afca
-AUX proofgeneral-4.2-bytecomp-warn.patch 1150 BLAKE2B 0e4b577a1fcdbf27d2a75055ddbb970945d494ae4de2f01da4c4b1c8fc7c39bd8745a5e62abd3a7f401cb4d2ef5f30452dfae9c1899b85d7929fe4ed87bc3a66 SHA512 ad7f972148cec19c60d58e7ee7808735b92d6f642d178453d123988c68e873824a7bf8ceeded82dfd3b6109e5b50e24bd7fa8753822b5f36cbb2e73ff4e0d30f
 AUX proofgeneral-4.4-desktop.patch 425 BLAKE2B fdefa2835502ded79bc08ffff7906315913a0e740269ba5a1863bf4ef8c602ee56eda1c25fc2ff161cd0131b6c615bbcea3770bc39ef18ae654b892571c92deb SHA512 dc594dc08432fb5a4068b7aabcb85ff58b9e784903f912694da08ef97ec9bfca229dcc4d965ca5286993173083c89dc53805f09f7152eb183829985c3c4c5b22
 AUX proofgeneral-4.4-images-dir.patch 358 BLAKE2B 8c06cd031ff3dca8d9537acb86245ba01ac06e505f0baf6146dbbe89c81dee9dc471b0103f6e2dd0ec5e1c80e72d1a3682393528ea262af187e2548e29c464ef SHA512 06fed75bf855d8cbd8938ca96f9e1cb61cdf01b7f68e58188d4ef287bab847156454dea0c2bc44adfd8979e900b58e5cc7a64b742606e694b3b0717b9a735151
-DIST ProofGeneral-4.2.tgz 1613190 BLAKE2B e12913d67f95b20d99d5bdaa82a36f0dd2b664441a86dc86cb4f8afaac2379691c01e60cfe6af3bbf177f0dc2f82ce34ea4d706ee34c2d5986de3f807ce05045 SHA512 102c56a1bc113439b1fa8aa10efe571d47d68b344d3489fe18ca3bdbf8828bb31fd2302a68a4bd639c59c429d41e82e5d933abddd3444781cb0e8a603db432ab
 DIST proofgeneral-4.4.tar.gz 14105056 BLAKE2B 8d45218cde620411d14ab3c703fea37f0482c0e1f6fc8d104b4de7506140d4d0491b5e23ddbf458bfa3aeb683b71f6e4deea31c2a46b902342fc686c2945162a SHA512 8be7f78b61a225fa4770698bbbb251424a0afe093efc3229f74f3a764317dc8cc00a72cb29e751f755dc5fdab59983906c9185f7828a1644a87d160265f12061
-EBUILD proofgeneral-4.2.ebuild 1385 BLAKE2B 53d5c6afb8058ea87d4b78a23a8bf20d9e7dc2ce84b25eae8f57a16df35508ae9677698f781c8e5ffa5b7aaec306825ffbdd02dba69263ccbe0c7f5dc9faaf58 SHA512 e0e59f6ec4b73a47ee44be048a7139246502f642cda5f1a9a0a5ea3b20f37158c5109b9701ac1eeacb0f154a0b0dba34270f2d2ca418665c9e5e2c2a435b68fc
-EBUILD proofgeneral-4.4.ebuild 1633 BLAKE2B 2f5af9e77e52d28dadf546909633b91edb67dd31baed0a631bcc2255d4fe3d4b9fa9b738ab0c7d36994e5233d47decc182324607ac9dd387b0d4774c352f59bc SHA512 116240b7871c2929b56691e4ab620a08bdfc192a80749b2b72ac206da7292aa0ecefbe8cb2d0b88fd0389bbc4dff085af69192cc2ae8e5330f4f54c8e7d2241f
+EBUILD proofgeneral-4.4.ebuild 1630 BLAKE2B f78e6be268f2576d5ca1e01cd1dd20fded60131ada2bc0983ae98a4e416b1ae8eb8692aa6a0bfa2068d639db956a268af4687b05d37e2f8a3ef186628f08a987 SHA512 b81141f5efadb662a269fac178248dede7b5eaeca7394538265ced397a7d9eb89354c87c6cfd8aece39ecadd0ec552e7568183c7e844e8b4fef7eb7edfe2a064
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/proofgeneral/files/proofgeneral-4.2-bytecomp-warn.patch b/app-emacs/proofgeneral/files/proofgeneral-4.2-bytecomp-warn.patch
deleted file mode 100644
index b34321bf392b..000000000000
--- a/app-emacs/proofgeneral/files/proofgeneral-4.2-bytecomp-warn.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugs.gentoo.org/445242
-http://proofgeneral.inf.ed.ac.uk/trac/ticket/458
-
---- ProofGeneral-4.2-orig/Makefile
-+++ ProofGeneral-4.2/Makefile
-@@ -62,7 +62,7 @@
- # only during compilation.  Another idea: put a function in proof-site
- # to output the compile-time load path and ELISP_DIRS so these are set
- # just in that one place.
--BYTECOMP = $(BATCHEMACS) -eval '(setq load-path (append (mapcar (lambda (d) (concat "${PWD}/" (symbol-name d))) (quote (${ELISP_DIRS}))) load-path))' -eval '(progn (require (quote bytecomp)) (require (quote mouse)) (require (quote tool-bar)) (require (quote fontset)) (setq byte-compile-warnings (remove (quote cl-functions) (remove (quote noruntime) byte-compile-warning-types))) (setq byte-compile-error-on-warn t))' -f batch-byte-compile
-+BYTECOMP = $(BATCHEMACS) -eval '(setq load-path (append (mapcar (lambda (d) (concat "${PWD}/" (symbol-name d))) (quote (${ELISP_DIRS}))) load-path))' -eval '(progn (require (quote bytecomp)) (require (quote mouse)) (require (quote tool-bar)) (require (quote fontset)))' -f batch-byte-compile
- EL=$(shell for f in $(ELISP_DIRS); do ls $$f/*.el; done)
- ELC=$(EL:.el=.elc)
- 
diff --git a/app-emacs/proofgeneral/proofgeneral-4.2.ebuild b/app-emacs/proofgeneral/proofgeneral-4.2.ebuild
deleted file mode 100644
index f3b2ee9fff92..000000000000
--- a/app-emacs/proofgeneral/proofgeneral-4.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-MY_PN="ProofGeneral"
-DESCRIPTION="A generic interface for proof assistants"
-HOMEPAGE="http://proofgeneral.inf.ed.ac.uk/"
-SRC_URI="http://proofgeneral.inf.ed.ac.uk/releases/${MY_PN}-${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-DEPEND=">=app-emacs/mmm-mode-0.4.8-r2"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-ELISP_PATCHES="${P}-bytecomp-warn.patch"
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	elisp_src_prepare
-	sed -i -e '/^OTHER_ELISP/s:contrib/mmm::' Makefile || die
-}
-
-src_compile() {
-	# remove precompiled lisp files
-	emake clean
-	emake -j1 compile EMACS=emacs
-}
-
-src_install() {
-	emake -j1 install EMACS=emacs PREFIX="${D}"/usr
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${MY_PN}
-
-	doinfo doc/*.info*
-	doman doc/proofgeneral.1
-	dohtml doc/ProofGeneral/*.html doc/PG-adapting/*.html
-	dodoc AUTHORS BUGS CHANGES COMPATIBILITY FAQ INSTALL README REGISTER
-
-	# clean up
-	rm -rf "${D}/usr/share/emacs/site-lisp/site-start.d"
-	rm -rf "${D}/usr/share/application-registry"
-	rm -rf "${D}/usr/share/mime-info"
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	elog "Please register your use of Proof General on the web at:"
-	elog "  http://proofgeneral.inf.ed.ac.uk/register "
-	elog "(see the REGISTER file for more information)"
-}
diff --git a/app-emacs/proofgeneral/proofgeneral-4.4.ebuild b/app-emacs/proofgeneral/proofgeneral-4.4.ebuild
index 0b9df0133b68..4580a379c0a5 100644
--- a/app-emacs/proofgeneral/proofgeneral-4.4.ebuild
+++ b/app-emacs/proofgeneral/proofgeneral-4.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ProofGeneral/PG/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2+ GPL-2 GPL-3+ HPND CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND=">=app-emacs/mmm-mode-0.4.8-r2"
 BDEPEND="${RDEPEND}"
diff --git a/app-emacs/puppet-mode/Manifest b/app-emacs/puppet-mode/Manifest
index 06ddfd237027..5d3c1122f8df 100644
--- a/app-emacs/puppet-mode/Manifest
+++ b/app-emacs/puppet-mode/Manifest
@@ -1,9 +1,7 @@
 AUX 50puppet-mode-1-gentoo.el 217 BLAKE2B 632d02667437b04642b7d3510d5010a3a7952ccd6aaa301a463c629c5dd6320c847e9f05425bd5882681a471761d0fe501ccf6860faa33b9e5458a761dad40a1 SHA512 3fbe7045df9ac9d30520020d4df454a03f02989bbcaa4bae0c632f86f6e6d3fd2eeb3bed84d864077c2b85b65586406525fa621a262ec363f53d714a093f6d1a
 AUX puppet-mode-0.3-version.patch 547 BLAKE2B a3731babc0e9d207c5dde31f28f0a3e2481679bc2d95f9fdadc77e153689bf6e7c1498acb93e1783863bc66de1e65ecb332a4a605fb6c3856dc8964a42e4dd5e SHA512 623496493b6f920700e042c69099060b9e89cec3a04281af0d8fb7b32c57cfa9b70833935f1ec723c4e877545ac0962b9c70054891084b50c6eb2ad8bb1eb9f2
-DIST puppet-mode-0.3.20171221.tar.gz 36707 BLAKE2B 97b285e409a1e344c12773fd1fa64c87090c883662f87fbf01f5b535e5c9027a035b6c4656ac6ca138cf872b05ff8f05af2478f2bfa5b04a10168507b48c387c SHA512 12db350e4005d2b13d8e936f1a956c3bd603709a7a88489565fd4be3a8e74c7b33e6523a7371db85927c018c260762467d6e50153eea659f87711426df7774fc
 DIST puppet-mode-0.3.20180813.tar.gz 36999 BLAKE2B 1ba96a5bbe193c88e96e51973e0d742e611c2ffe0264bae998ce07d5e4f78d37e532dcedf578a801c8e6442ce35385b5c5915837da1073895ceeddeff99b65b3 SHA512 27aeb5a3029208180bd94d7f3f762d9a88863f963824636fdb688ccb79a3c41b9370c13a536e3438c94720e04d5a02c2f64f75d5c594fc7bca32d9738dd3b756
 DIST puppet-mode-0.3.tar.gz 25617 BLAKE2B a9afb8e2f6c0a2b40cef6bb39d0fa2effe2ddffaa3b646562f0fc5b84d1613e556df88206835d6aad5862d526161d69c49ecd188e299e4f4175b479fe1957eee SHA512 16ba5f71a1ec6c40b1eddf2acf5c1aa1968526b959279e1cac0cfac947f82f404fc35978ce12f5851309f293e2c92f054a718ade97d156528d505dcda58434e8
 EBUILD puppet-mode-0.3-r1.ebuild 613 BLAKE2B f98dab8fc53fcd00f2b3156ee8572d4c11181ff5d6660dda7b172e99f6ad7abf7f826c423e9500aacaa6d273c51b6acf3725deb76ab155ba5a5f4c34348382ca SHA512 12a42f2ecce4bce4b2963e22dd7c4b9f9545f1ccbb8713c0cf4344ee00da59b42e3eb5922b3b20e161d946aa7314a5c95df1a61797842e0ffcad4ae43e4f92e3
-EBUILD puppet-mode-0.3.20171221.ebuild 696 BLAKE2B 880055162bb6a62c1ce6ad5cf1843c8213aa24dbd56ef0664848320a349fac820c95e0dadbf17a3c3b5bb421230559b1f080c8bfb694ad19ca5e90f867380051 SHA512 4ce05b8aa028fdffca6b21c8309ddc4bf71bbf6e5ab183f4d3ed1028c97d556eb3914aaa7a7778cf75070d02998d6e31a90874618bb935e4d50468ef96adda47
-EBUILD puppet-mode-0.3.20180813.ebuild 693 BLAKE2B b83c5ef6c8f51f1a39f165ca84f9fc65ae67b3c74df6f4968ebd8c7cb008d3111719568aee531644e5320b25e00d055c9c9d90ef84df73ffc2719c3a97ca5195 SHA512 0ba3d4c9aad1fa9ba539247b26151bb0bb2a4b3a954507de5671c366492fbf0accabefa13ec5e1f8b5fc6ef80df45d8fe2a56536a544f1ad9c58c83ed7af72ba
+EBUILD puppet-mode-0.3.20180813.ebuild 691 BLAKE2B 8bbcc695c9bb5652f59d09c1e4ee692fb71d395922e0665a02ad01a81ce6abc8d1f2683381b52daf7386a3e6125a731560841a5e9cdb37cd88065ba48233a75f SHA512 0e4ec04298a0da2e3ba20387429f386a8355fe3a2141f9a7e3aa2df0aa8dca19f3c3fdae926cdbc01bc0d02ac22d7341e99fe08228f2fa6528e7af8bf63c047a
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/puppet-mode/puppet-mode-0.3.20171221.ebuild b/app-emacs/puppet-mode/puppet-mode-0.3.20171221.ebuild
deleted file mode 100644
index 2cf8f9430f72..000000000000
--- a/app-emacs/puppet-mode/puppet-mode-0.3.20171221.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp
-
-COMMIT=b3ed5057166a4f49dfa9be638523a348b55a2fd2
-
-DESCRIPTION="Emacs major mode for editing Puppet manifests"
-HOMEPAGE="https://github.com/voxpupuli/puppet-mode"
-SRC_URI="https://github.com/voxpupuli/puppet-mode/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-
-DOCS="CHANGES.md README.md"
-SITEFILE="50${PN}-1-gentoo.el"
-
-# Tests require unpackaged ert-runner
-RESTRICT="test"
-
-src_prepare() {
-	elisp_src_prepare
-
-	sed -i -e 's/@VERSION@/'${PV}'/' puppet-mode.el || die
-}
diff --git a/app-emacs/puppet-mode/puppet-mode-0.3.20180813.ebuild b/app-emacs/puppet-mode/puppet-mode-0.3.20180813.ebuild
index 3c55e2f588ed..5226b5ed4c8e 100644
--- a/app-emacs/puppet-mode/puppet-mode-0.3.20180813.ebuild
+++ b/app-emacs/puppet-mode/puppet-mode-0.3.20180813.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 
 DOCS="CHANGES.md README.md"
 SITEFILE="50${PN}-1-gentoo.el"
diff --git a/app-emacs/pymacs/Manifest b/app-emacs/pymacs/Manifest
index 4d1bc822fdac..828f22612724 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.25.tar.gz 120597 BLAKE2B 837c67d862c11d2a9d74cb55a055f60627834a50717d5386ec604db70a62270aa2ad3e56942602dc10a5f997ab3ce6d7f91e29a8c5b959144286182ad861b3bb SHA512 e17f7ee754413e21403d23894ee263fb0edae180a60c746b02cf101b2f0c782116e7bb61215bd0a8c689a991e211d780d220d4672b58f43108e7218a6f0c8dc0
-EBUILD pymacs-0.25-r2.ebuild 1272 BLAKE2B ac2b778576a31b9fbdcece0309eeb8e4efcaa7e87a8fc21872141a3c6f2dc1cb443a9a6ac257ba71d167eefc6d4f9099fa2259578d17d98b15aefad7db4846f8 SHA512 8dcaca147eb2491a433b3831dd5769c22f9fc0e3a4b38e136e4e76e9b5fb38d875530bf02c6c0ecda25cb81182c38070c4b91bde60965a7f84858973f5d2686e
+EBUILD pymacs-0.25-r2.ebuild 1262 BLAKE2B 6e4eeff552b27f35f431d4d6fef5f101b54c7bccd9d5611178ba8aeb923f7fd47010f5ac27ea6e3c99f5c19740a5fe0aca551211377ec66e26135a70b70b1afc SHA512 2645b4972956b8f8888b1fd4daec39016414e8969c6f7027dbb2755f897a0b47ae6268b8fdcd54ac6b7a53a415a3afc6748a1cbe5b45e9c489918bf6bb39f39a
 MISC metadata.xml 434 BLAKE2B 11fe7bc8c9fa32f4762237f30e93ae5281b73b10a99e389d6cad284f6ba649b7f732fd07aefec8f50d7175af301e021ad34cfac65adfbfb7dc6133184725cbb2 SHA512 899211703ed0824e0b2dd26018e46854ab970d76ee12f169b99bc3a49f9e3bfb1d42757c35ac1ac21268b90b8536737aab61cf9dd4f7297b4e5360f1fe73f821
diff --git a/app-emacs/pymacs/pymacs-0.25-r2.ebuild b/app-emacs/pymacs/pymacs-0.25-r2.ebuild
index e26d546f838f..e3a1c7e9908a 100644
--- a/app-emacs/pymacs/pymacs-0.25-r2.ebuild
+++ b/app-emacs/pymacs/pymacs-0.25-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pinard/Pymacs/tarball/v${PV} -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc"
 
 DEPEND="doc? (
diff --git a/app-emacs/python-mode/Manifest b/app-emacs/python-mode/Manifest
index 021c7f531900..ae821011a679 100644
--- a/app-emacs/python-mode/Manifest
+++ b/app-emacs/python-mode/Manifest
@@ -1,8 +1,6 @@
 AUX 50python-mode-gentoo.el 541 BLAKE2B a1657fc49011246ba1cfed1cd8993a222c4932516c6a8e3be4fcc53200510ad8e9a3e1072c2bce641cded4be1581a9c950991d6864c2136668ddba4de8f2429d SHA512 8e1c2c68409c48f3e7c2ae36128380fd5358a12470db571ffa22b1c9cb11730a2f2a84ec66f23c064e32b504c8ae002033e77640d85e11577c50e31462cd5274
 DIST python-mode.el-6.1.2.tar.gz 330107 BLAKE2B f04df366ee3e47921f5635472ac22412066d3d97e0f4d2627993b1b6173321687a575abc8700907a9c63829704792505681196e0786e7dc39b9ecbab7562ef9e SHA512 967ad7fdb3503c2dc37df79ba9f45ed7627a5b8e287cae9e8963a259a6568282c16d509e873c7d8b97e4acaafbd71dcec00e5ac71ed695b20ecddca5da20ba96
-DIST python-mode.el-6.2.0.tar.gz 393046 BLAKE2B bc1327324a0b4d2e35cdb4ee593ca6ae5ef203dcea3312e3f24690ce90780c50f4a60e17d9ff32730e5a0dcef9cb04af2150211fc23fe620a4e265d335115616 SHA512 0280649fa646e071a756a657be91dc3b4ab0a227105eeba7601b98fbac1916af0607add20c58c74434eb2fa139a996736e963783b1500ca6f3656a90deaa427e
 DIST python-mode.el-6.2.3.tar.gz 314461 BLAKE2B 3bd71b47de1284d59db61f829e3419f2fb10e226900392d903256f31ad90f47317b7bde4cde1cf7d86518f9c706d9c844b208a9e2469a41037252a63f7bc1ba6 SHA512 4aeb33d4054d582cd2a3f4834472c7d0cb3fe5e12e10f5117dcbcd90ec2ca490964c774918c83697f283c68e57766c3c67d3853ddbaa3408777fdafc7f2674f2
-EBUILD python-mode-6.1.2.ebuild 699 BLAKE2B 76795f546f74f975f8b86a634c70a2da4a1f09e474f3a71cf7b9159422a3b89a942dfd194d412157ba04996aae2b09ffc1a04621998c22ce5d5519c257d7d59f SHA512 dde848988b0803e4633d8173d53d05832d828e3416b87b1bbf564dabafaf45325ef55ca8d01ac7b388f490540af769f227c866956ad8a374bf8779422481ab77
-EBUILD python-mode-6.2.0.ebuild 706 BLAKE2B 05c0d372660816f6100a035935b9bb06e31f7dd47971a7531edad67e4a8dabacd186f0287c683a3308f02c97725897aff268ee399dea4a9c0f5b75053956a1b5 SHA512 c4543e850baf72e29c2883419426de594c8242e045648efc95634e5a5f4eb2f05ee60ffa967c80fbf01b2e22b9e9cf6f2697c72f923bea774d4445460c0b8f9a
-EBUILD python-mode-6.2.3.ebuild 719 BLAKE2B be6cd202cb097f5d230c9d99a330780606907433a3611c3a312c442906bc0f6d6e97c51bfd3c7f23e9a2c5bc992df173747115a5268e3b1416c60afa5f60d913 SHA512 47e540de2df830173e051a05baeb89ac44ea2b828e3719106f3cac14c3bcdc36ae5b9731d93e64470a249aadf18e431c984cc76c1202e691cc9a832eabcf17f4
+EBUILD python-mode-6.1.2.ebuild 689 BLAKE2B 43532cd13a8619adf8f22de41b266e6d446089ba98b00c92facc72938b3717587db6a7efb3d9c72f85c1930d8f13b4c288946ea34d6a01895cb2de5657b6a69f SHA512 1356dba65466b1225ee88198c0c33c2d731fe68953e85eabac527a46675af71a4c6334dd0eca612acccadccbc3b179f544ad44b459b58cf7ab9716f7af514f75
+EBUILD python-mode-6.2.3.ebuild 700 BLAKE2B b81d6c9793dfa06db1874e798068aeda2fb574ae59b4b8bae6ae3c36bbbb00fa3731d2c04ba44669833c47804be8ad1c0953365e3042dc7b3eefb32b0069e6ba SHA512 d4582861a2a219232e7bcb4c1925fadbc70ff0f35c7893d543a5f4315a6a6039016509c22c17859c241ab9e58c85ac9ea557388270f32f2b63d112143343330c
 MISC metadata.xml 359 BLAKE2B 6f98624b4484b28ec87e9d4de4ae43b729db5c5c76bf9e480f86eca25423e8cc8a201762b8f938b5b012765e9258d1752fe01a847e3cd69539aa25ba0cdf9394 SHA512 a61b3fe8afa6c99edce3978dac6b52f37be06c7fbd57166697d14e9d4d0b5e7212c3bb1988c47aeeff4356cd841ca20a4605da0b5bed487acca4e2375994b0bb
diff --git a/app-emacs/python-mode/python-mode-6.1.2.ebuild b/app-emacs/python-mode/python-mode-6.1.2.ebuild
index 8097ab2a511b..47f3492c621f 100644
--- a/app-emacs/python-mode/python-mode-6.1.2.ebuild
+++ b/app-emacs/python-mode/python-mode-6.1.2.ebuild
@@ -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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh 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/python-mode/python-mode-6.2.0.ebuild b/app-emacs/python-mode/python-mode-6.2.0.ebuild
deleted file mode 100644
index 089fa115e867..000000000000
--- a/app-emacs/python-mode/python-mode-6.2.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit readme.gentoo elisp
-
-MY_P="${PN}.el-${PV}"
-DESCRIPTION="An Emacs major mode for editing Python source"
-HOMEPAGE="https://launchpad.net/python-mode"
-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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-S="${WORKDIR}/${MY_P}"
-SITEFILE="50${PN}-gentoo.el"
-DOCS="NEWS README"
-DOC_CONTENTS="Note that doctest and pymacs are in their own packages,
-	app-emacs/doctest-mode and app-emacs/pymacs, respectively."
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 b9e0840ac956..7d0746d5d961 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-2017 Gentoo Foundation
+# Copyright 1999-2019 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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm hppa ia64 ppc ppc64 ~s390 ~sh 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/quilt-el/Manifest b/app-emacs/quilt-el/Manifest
index d3a352fb503a..9acd97a9d199 100644
--- a/app-emacs/quilt-el/Manifest
+++ b/app-emacs/quilt-el/Manifest
@@ -4,5 +4,5 @@ AUX quilt-el-0.48.0-tramp-recursion.patch 363 BLAKE2B ca26afa6738d51efd007d46ffb
 DIST quilt-0.66.tar.gz 413069 BLAKE2B 41201d54cb26d4761413365fe19b65bd6971ada1e69198d2edbc346df6a3060ff3af4d80551d68ab4ffe003183bc0a28515ce1d070db95f2b1a04a0680ac4fb2 SHA512 c2cb75c0937612e1e0da25b713acf629b6b5aacbd8254d8bd17220b63c7b8ca996cd9d0315a32d67d54a4a7dc01b212cdda33afaacf3db063da757f1973306f4
 DIST quilt-el-0.48.0.tar.gz 13147 BLAKE2B 595e7d12c24095df3c0d12de607b4e43e36345b53f9d89e6ea6ea781ed25f893d5100e3a023b4f5bc0aee11dcf93a7ef3862fabe28c8eda98a43dce634969444 SHA512 0a198ef0f8354c927c4527bb7a3e99fd6d12f17cbe65c736341c527de440d144581205337163912ce04f83749c31833221cc4153d5736ffec060ad4ade73c694
 EBUILD quilt-el-0.48.0.ebuild 524 BLAKE2B c09278c3efca977158d8a323911947439c3a7812b2b82d2f4418666c91cf3a56d3febf3e1587c72a602f7fe361233387991c7dfbfa51311b57400085dc190067 SHA512 f9a65f053573d5f561b82728701b09588aa87e42114da625abbacfa53a49d001113a04b122de67b7cc39a295bab9efcab3597d95329826ef1509fdd85e11a879
-EBUILD quilt-el-0.66.ebuild 564 BLAKE2B 4fda05d3ffa64a1f0f1e0c2d4b84b5399b29434d2b7c71eabaa865522e98d16597825f6497e6867d3ccdea285e53d86205cd9ef4e641aeda3389e17c62173118 SHA512 b8de253e365fad1530055a841f32c21179dec4b347f1c5bb5771dbba2db3c98013b9694f4116284b6e60d9140c44c5eda96cb3b2905ef4e0e5b8301f62592c8e
+EBUILD quilt-el-0.66.ebuild 560 BLAKE2B 6d98209efd1894a43f876a24f1066b56544a03071ceb4b172e77256f72664251e926eeb1f7fb9d54e7c346f1277627fa78186384e73da5f81a8f74eb8e872d71 SHA512 e54e6fc757f6d10aaf235b32cdb797fa370ddaaad3a1189e00f6abd3bdbdbcd62590a29c5755da9245270589282843a74d621874c86044e96180e02702e9520a
 MISC metadata.xml 657 BLAKE2B f42a9f750c0914dae5ebf3cf8798857d8bb2b8135597470991dfe3e3644716e47d3079d77754305be689a337609e719ba277e5e0a4119bed5e2ae2272147bebd SHA512 d7e9d85957ad96345d3394977312e5ffbb37c61f7529b7b179c2dfcb1e41208089a469fc5db8760f0f62a6cdb5ddf801e11673d126711569fc2a61bfd8a04e4b
diff --git a/app-emacs/quilt-el/quilt-el-0.66.ebuild b/app-emacs/quilt-el/quilt-el-0.66.ebuild
index 4a2ffef3d55c..e77ac516fb3d 100644
--- a/app-emacs/quilt-el/quilt-el-0.66.ebuild
+++ b/app-emacs/quilt-el/quilt-el-0.66.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://nongnu/quilt/${MY_P}.tar.gz"
 
 LICENSE="GPL-1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~mips ppc ppc64 ~sparc x86"
 
 RDEPEND="dev-util/quilt"
 
diff --git a/app-emacs/ruby-mode/Manifest b/app-emacs/ruby-mode/Manifest
index fe7ab45b0e1a..5f9894cfcdbb 100644
--- a/app-emacs/ruby-mode/Manifest
+++ b/app-emacs/ruby-mode/Manifest
@@ -4,9 +4,9 @@ DIST ruby-2.5.3.tar.xz 11453336 BLAKE2B 66c59448a23c22796b43f04a1f84359386b7bee7
 DIST ruby-2.5.5.tar.xz 11459832 BLAKE2B ced1105a87e7df8f82a65ca8d1d329d5a9d110d2f3f88b27a79262c4ac1484dda16d8646c0c03f18c1bb25f8b154075eb03a0614355ec62f677c2fa56ab3c956 SHA512 06b1d58536ebfacb7b56c1e6ed4b8ab816fadc4f48c845a452554cd262e7908199a30e5793f3cbaec2db56a8803aa5c6089abf7bf06c8fc47867e97870b7dfec
 DIST ruby-mode-2.6.0.tar.gz 28460 BLAKE2B 15ab0115cc669f31d656a6af03c061699cfd872130ed51240ecbf80fae413b1d2d8ed87ea1515584f276d15ee164a3c14f9138bf5054418419f6c09b2a72e8e4 SHA512 bbeaa3ae788ea3a536715dc8dc0b4c82803d0a21ce44ae048a5a1c1e331f8c571980feaf38f42455e2de099210bbd4d6f3e8dc2984d6318a70fe04aa6c0d9520
 DIST ruby-mode-2.6.3.tar.gz 28460 BLAKE2B 15ab0115cc669f31d656a6af03c061699cfd872130ed51240ecbf80fae413b1d2d8ed87ea1515584f276d15ee164a3c14f9138bf5054418419f6c09b2a72e8e4 SHA512 bbeaa3ae788ea3a536715dc8dc0b4c82803d0a21ce44ae048a5a1c1e331f8c571980feaf38f42455e2de099210bbd4d6f3e8dc2984d6318a70fe04aa6c0d9520
-EBUILD ruby-mode-2.4.1.ebuild 492 BLAKE2B f882affea47b8739d1f17f74480f58f57686e4838a1b6e169c8d2ad66925e25b53373da17ea920475feedeed46811e55ad03fce6b73c05ba9bfa8dd870ee8d8b SHA512 721c77a1e5d2f6bb0e2731e6603a1dd0dfd49dd4cd84dabafae998211a2081adfbe1860ea640e7361da438c5e2e6d459eb5f469cd9dcc079b282c494ec5aa4c2
-EBUILD ruby-mode-2.5.3.ebuild 501 BLAKE2B 4e4a9e17a0ae378519d6fd3ead5b7e37836f655fe5cb010642fca8d10a8a7e4f8c4b249b5f3828563754bf11a51a15c93516d25ca380741a8656adec535baf35 SHA512 c5dee21b206de6bbddefe2d32da92fd2bcd61518aa159c43939cf072c8a0ba2493ef5b633c51a712e284a78a464ef177aa3f17105254b7805ae624b55b596249
-EBUILD ruby-mode-2.5.5.ebuild 501 BLAKE2B 4e4a9e17a0ae378519d6fd3ead5b7e37836f655fe5cb010642fca8d10a8a7e4f8c4b249b5f3828563754bf11a51a15c93516d25ca380741a8656adec535baf35 SHA512 c5dee21b206de6bbddefe2d32da92fd2bcd61518aa159c43939cf072c8a0ba2493ef5b633c51a712e284a78a464ef177aa3f17105254b7805ae624b55b596249
-EBUILD ruby-mode-2.6.0.ebuild 588 BLAKE2B 506d4ec4569aa599398fd72fc47f98937aae0ae1a2f011c57cd2ba2834fa1d67babefb86dbaa983fe6df4f75553d0fbfbe2417675ce56894523fb56c5e5a2163 SHA512 f5bff7542b228fc193c73a6d3368df682e7803c4754c3498f89312abb652ba548535996c4135610c6248c9811d2c5c78b55cea6b2a928bceb49ef6c781707ea0
-EBUILD ruby-mode-2.6.3.ebuild 588 BLAKE2B 506d4ec4569aa599398fd72fc47f98937aae0ae1a2f011c57cd2ba2834fa1d67babefb86dbaa983fe6df4f75553d0fbfbe2417675ce56894523fb56c5e5a2163 SHA512 f5bff7542b228fc193c73a6d3368df682e7803c4754c3498f89312abb652ba548535996c4135610c6248c9811d2c5c78b55cea6b2a928bceb49ef6c781707ea0
+EBUILD ruby-mode-2.4.1.ebuild 505 BLAKE2B 59762ae1916eca477938b094557b0ee96c536e1fa0b20202d43b6b6f9f9f75066e9347d6f9ed83168ae169ac780c98ac7e6b43933e789ccf8f7ec5fe44d59483 SHA512 92636fdd139bdb68f96b063a6137bb7467f7cd0b608fe4951d5db59808d571377e93a8ab911acf93d020b4b206db90a5118eeb5a80ef12b035ee7fd62201ca26
+EBUILD ruby-mode-2.5.3.ebuild 514 BLAKE2B 2a70606409efcea5e671ced15054bf6221b7e5e74e0002bc8ac51a1d6ad6a5e1c2b94399c791f044c48e2c679a604c87c56a9e64635c07965b93a2ef0b67ba01 SHA512 796693a1b168dd6d99a89bc829c86f8626514f80628376c5ac2e079acf67e24bfda5f8925d962f8af54ff418a79a03da54f3aa6bf2105cf0cd15f52bbb951930
+EBUILD ruby-mode-2.5.5.ebuild 514 BLAKE2B 2a70606409efcea5e671ced15054bf6221b7e5e74e0002bc8ac51a1d6ad6a5e1c2b94399c791f044c48e2c679a604c87c56a9e64635c07965b93a2ef0b67ba01 SHA512 796693a1b168dd6d99a89bc829c86f8626514f80628376c5ac2e079acf67e24bfda5f8925d962f8af54ff418a79a03da54f3aa6bf2105cf0cd15f52bbb951930
+EBUILD ruby-mode-2.6.0.ebuild 578 BLAKE2B 20fe8c18865b478dd3d8074902a083797059075fbe7bba5804b332bfaaa018e256fabeaa9a2830310021716855fb5ac5928490f66297e018eff88d8581526e9b SHA512 0c0df43a0cb68bfa10c2d299ec9f2dfd064fbc722d5eb8cbef3bfefa97313f247d344d83b5663bba4991869d1db962441cc3ec27da0c779e693650c27cd03707
+EBUILD ruby-mode-2.6.3.ebuild 578 BLAKE2B 20fe8c18865b478dd3d8074902a083797059075fbe7bba5804b332bfaaa018e256fabeaa9a2830310021716855fb5ac5928490f66297e018eff88d8581526e9b SHA512 0c0df43a0cb68bfa10c2d299ec9f2dfd064fbc722d5eb8cbef3bfefa97313f247d344d83b5663bba4991869d1db962441cc3ec27da0c779e693650c27cd03707
 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 8bc96abcb7f1..7db6c4c3372c 100644
--- a/app-emacs/ruby-mode/ruby-mode-2.4.1.ebuild
+++ b/app-emacs/ruby-mode/ruby-mode-2.4.1.ebuild
@@ -7,11 +7,11 @@ inherit elisp
 
 DESCRIPTION="Emacs major mode for editing Ruby code"
 HOMEPAGE="https://www.ruby-lang.org/"
-SRC_URI="mirror://ruby/ruby-${PV}.tar.xz"
+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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh 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.3.ebuild b/app-emacs/ruby-mode/ruby-mode-2.5.3.ebuild
index 84718e43d4b4..17e27bf7d62b 100644
--- a/app-emacs/ruby-mode/ruby-mode-2.5.3.ebuild
+++ b/app-emacs/ruby-mode/ruby-mode-2.5.3.ebuild
@@ -7,11 +7,11 @@ inherit elisp
 
 DESCRIPTION="Emacs major mode for editing Ruby code"
 HOMEPAGE="https://www.ruby-lang.org/"
-SRC_URI="mirror://ruby/ruby-${PV}.tar.xz"
+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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~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 84718e43d4b4..17e27bf7d62b 100644
--- a/app-emacs/ruby-mode/ruby-mode-2.5.5.ebuild
+++ b/app-emacs/ruby-mode/ruby-mode-2.5.5.ebuild
@@ -7,11 +7,11 @@ inherit elisp
 
 DESCRIPTION="Emacs major mode for editing Ruby code"
 HOMEPAGE="https://www.ruby-lang.org/"
-SRC_URI="mirror://ruby/ruby-${PV}.tar.xz"
+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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~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.0.ebuild b/app-emacs/ruby-mode/ruby-mode-2.6.0.ebuild
index 856461074295..6959b4080a38 100644
--- a/app-emacs/ruby-mode/ruby-mode-2.6.0.ebuild
+++ b/app-emacs/ruby-mode/ruby-mode-2.6.0.ebuild
@@ -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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~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.6.3.ebuild b/app-emacs/ruby-mode/ruby-mode-2.6.3.ebuild
index 856461074295..6959b4080a38 100644
--- a/app-emacs/ruby-mode/ruby-mode-2.6.3.ebuild
+++ b/app-emacs/ruby-mode/ruby-mode-2.6.3.ebuild
@@ -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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 S="${WORKDIR}/elisp-${COMMIT}"
 DOCS="README"
diff --git a/app-emacs/scheme-complete/Manifest b/app-emacs/scheme-complete/Manifest
index 547c356921ae..57fbf548f9e1 100644
--- a/app-emacs/scheme-complete/Manifest
+++ b/app-emacs/scheme-complete/Manifest
@@ -2,5 +2,5 @@ AUX 60scheme-complete-gentoo.el 219 BLAKE2B bf71fafbd85fea667e895ca9dbb91761e4de
 DIST scheme-complete-0.8.11.el.gz 38847 BLAKE2B 649a4124b0b643211c2132dc0e03e8930ea7f311637b3afd375d75e3aa33abaae888b1aa34744bf22d13738179d4048faa173ec8e5e0868f5789623fb7b11c0c SHA512 90fe73dfee3377f19eca2107deb6c9d88260b2097358416dab5ad839dabc0a0678b7254ab6dbdc058cae2be5feeaa4cba2f66296e49060df5251c1888044fea8
 DIST scheme-complete-0.9.8.el.gz 39923 BLAKE2B a7f08917823145db0b79a0d0dd2987c98eb6711acc861fa840759c6377045f7ae3edb9973bc285e468c4a20fff02ade6f638a340ba8694007ab37000f3870cd4 SHA512 b162d7766184e8e58d25b93c8e4154848963fa1c29e59f90a4741c6cfb44c217d9ae655d1106d05eb53cefab0c91bf7800b9387143268490d5f8f0685a9a2483
 EBUILD scheme-complete-0.8.11.ebuild 414 BLAKE2B 3512807aa52f7df587153ccf86c49a51baab980a2374550b863907505a571cb03c1e1fc3f5a04c45e73b2dddec4525f93e4facf85965d2a9ff8bfd3b1daab491 SHA512 79ccffb1cb1b037041ead7230f6c72dd65e9f81f5232a5749a43f6ef8f52f9bcd1ae35280873409c507bc1cc8d3462387d5942bf84f572f66c86eeceb5d9e692
-EBUILD scheme-complete-0.9.8.ebuild 414 BLAKE2B 4c58ab708fca6462853e68d467f62b9b16f70bdce450686b19266a2c302aadcc7c2ac10bb6e6a5b0c2b46dfffa9aa8749e880c8937ae2a56c6c867571b0f9b30 SHA512 7e81dde3d804345d3f5d666007ad842a0e5bbbbac6522b136c427c4666b89e725b71acc5f79bf8d4abfe037e61b0ebbc8d0b61f23c663db4786d206cea73c083
+EBUILD scheme-complete-0.9.8.ebuild 411 BLAKE2B 9f6f7f6fee7c69bb7e6591a0d443ab4bc2a8aa21b5b89c0d3c9725af13367253ed2ba4f8e922dc858fa0d94ef88402681247857a5e34a5d68683837a42d305a8 SHA512 0cbd7161c9470423ec3908a2271dd35077ba259c2cf33d2a5093fdbdf049ec7242e959963ba15969553db57eb9f3d68c18548ca61f38c4e492353848b667a33e
 MISC metadata.xml 453 BLAKE2B eee674044e30666eb05beaa44a67781bbdf407fdddc1b175e30f7034a0dd6a3efa3c23361d23b47d7bd0076a17b01b8593deedb1524dfc1597b53f94b9ffa0fb SHA512 34268e756461ba2420bf3552b7f73caa9c95f5feef714b09615b295056598f4d7486771fda804320565cf99dd0ad36754d6b966b492f74347a53f4678e12c715
diff --git a/app-emacs/scheme-complete/scheme-complete-0.9.8.ebuild b/app-emacs/scheme-complete/scheme-complete-0.9.8.ebuild
index d34856a76bcf..33b0db272c35 100644
--- a/app-emacs/scheme-complete/scheme-complete-0.9.8.ebuild
+++ b/app-emacs/scheme-complete/scheme-complete-0.9.8.ebuild
@@ -11,6 +11,6 @@ SRC_URI="http://synthcode.com/emacs/${P}.el.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 SITEFILE="60${PN}-gentoo.el"
diff --git a/app-emacs/teco/Manifest b/app-emacs/teco/Manifest
index 49ba271d8936..d4f3c214ff59 100644
--- a/app-emacs/teco/Manifest
+++ b/app-emacs/teco/Manifest
@@ -1,6 +1,7 @@
 AUX 50teco-gentoo.el 257 BLAKE2B 4abde23767cfa240b27e735158997eee8f91ea71893d398eacebacea28529c10bb6a61f66e602c362858878a54ecdafa3e071d232ac76c3edb61ef3ed9f31e19 SHA512 ab17c9541474290b9ea85d6788b54e5615b4ca93cb8194986950d285f744f614f8e598e6d5bf6441069f8274c7f012f9266178a104789488f88934ce1e2b0759
-AUX teco-7-emacs-24.patch 1350 BLAKE2B b5dd024ce4bfa4db7f7108756772ac3d7faf074260749af2254bff429cd4ac82c18b840f70e41f28e4ba0a2f342831374372695d4ea6c0f0030663e6aa6546f0 SHA512 71afdf37ab38e76181e1a7ce90a73ad31a625039d784b9334f79a8642a45c7922022f74231e8cf70cb6bcad023012412262d6ef840ac611a182e3eb48ee0f4e5
-AUX teco-7-minibuffer-prompt.patch 2574 BLAKE2B 93f031a0d59b7887251b5642d031a83ecf7f94a481e55804530fec5c2f6b8a80c16fecb53a3b1560c38c1f2c8de583c11cac3a721d3d84d04a083f1a1fd859eb SHA512 df67994df08353757cf7be3d8ebf0c0d6c048d8e195360d9f7afaa29ca44cd3ccbe95885d9c790a29c1965c3d291136e195fa076bf9a0a42304c46267ebb1446
+AUX teco-7-backquotes.patch 909 BLAKE2B f68b2548e03263373a42fbc1158483bedece62ad7db2b3c7fdd0deb82c80e21d2ac7c06ef93517c50a047c74110e1e8b5c08af9a082beddb17a0019119a76c61 SHA512 dd58da5639487b7ce1ad8cb3b0fcb71eef3bd0c00646fc7acbcde22563cadfc4cc41cdf37adf82671bcdd8e50cc769bf85a35836ddf3e5d040ede5e10f40d3d0
+AUX teco-7-emacs-24.patch 1354 BLAKE2B fd1d077b9557a62af242e47557be0287ca179a3108c1d89799f28e488f8387440846d5a26b68a3cbcee7187537ed33eb0c7d99f54320f5f65798390473174df3 SHA512 599695cd16a0b244f4b8da5ce8787a57a7d821bbf19fe9374a8e78e16e29f022bb3e9a6979440fdbc3fbc1013769e24cad5a393f5e6b065d3da80a9e7e8fe53c
+AUX teco-7-minibuffer-prompt.patch 2578 BLAKE2B baa39f6434eca9ca3329f472b0bdae5568c4c7d188891e7d29daca0e1555417f48b251d88af8186ae630c0a9972df6a39f97eb8641765cc0308821bb886918f8 SHA512 e8f36df69268e63373f3f740cbefe3add0afb10c147d546ac06d5d6176822c0e281e6bd7cf91368d7a850c6f7bc06f836d5a79ac690711e0fdc4ebb16c322819
 DIST teco-7.el.bz2 16372 BLAKE2B c5608c1546262b9dcb52e0c5f1e41c87e94f142a96e8ce1262201b00672d810c925c20090c36edc596e0fb362265e72861f4bc214cb13ed94fa71b586bc4f45d SHA512 7fb050d2d12aadeccc18d852b4191493be301c90ac5426ee4f985a89eba62f9b57d263a2156d5252e88d06bbe68508aca2bebeca65402ff9e8f00937f5189feb
-EBUILD teco-7-r1.ebuild 701 BLAKE2B 4a5416ad5446deb45609d0a530cee937b3ad480dd4e06b7f9b2085b68c7acfdedcf0aab5ef8806947a43298a904da3830deb02df70d6e19856be6442f0af4804 SHA512 c19c94c05c2e10d145e7a43ae2a900849950ec6a001fb09f2d1bb46a6b097e9c3212869a63e2ce614747ab6ed9a2f4b12058cf8a2c92b0352f3c453b7bd587a2
+EBUILD teco-7-r2.ebuild 761 BLAKE2B 90a3a29380bf49fdf3c76457973266b7b9998fc4ef6334d7e539f8fdd202d549e04d5c30407babd72002a05239aafa9a6ba5583f67a7a8f0afee08cefeed31ba SHA512 7ee3103b54c37a8ad1c58b85624b48dc6e9c0d01506f7b2c89eccbfd822cfd794bbf7e4669001b23fbfc682fc7d1f1dc5c060b0ebfb36acc2883cb388a0de4b0
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/teco/files/teco-7-backquotes.patch b/app-emacs/teco/files/teco-7-backquotes.patch
new file mode 100644
index 000000000000..b586812cf038
--- /dev/null
+++ b/app-emacs/teco/files/teco-7-backquotes.patch
@@ -0,0 +1,34 @@
+https://bugs.gentoo.org/684180
+
+--- a/teco.el
++++ b/teco.el
+@@ -451,10 +451,10 @@
+ and does
+ 	(aset teco:exec-1 ?x 'teco:type-1-x)"
+   (let ((s (intern (concat "teco:type-1-" (char-to-string char)))))
+-    (` (progn
+-	 (defun (, s) ()
+-	   (,@ body))
+-	 (aset teco:exec-1 (, char) '(, s))))))
++    `(progn
++       (defun ,s ()
++	 ,@body)
++       (aset teco:exec-1 ,char ',s))))
+ 
+ (defmacro teco:define-type-2 (char &rest body)
+   "Define the code to process a type 2 character.
+@@ -467,10 +467,10 @@
+ and does
+ 	(aset teco:exec-2 ?x 'teco:type-2-x)"
+   (let ((s (intern (concat "teco:type-2-" (char-to-string char)))))
+-    (` (progn
+-	 (defun (, s) ()
+-	   (,@ body))
+-	 (aset teco:exec-2 (, char) '(, s))))))
++    `(progn
++       (defun ,s ()
++	 ,@body)
++       (aset teco:exec-2 ,char ',s))))
+ 
+ (defconst teco:char-types (make-vector 256 0)
+   "Define the characteristics of characters, as tested by \":
diff --git a/app-emacs/teco/files/teco-7-emacs-24.patch b/app-emacs/teco/files/teco-7-emacs-24.patch
index 0b3251919ddb..d0cda4d90fd4 100644
--- a/app-emacs/teco/files/teco-7-emacs-24.patch
+++ b/app-emacs/teco/files/teco-7-emacs-24.patch
@@ -1,5 +1,5 @@
---- teco.el
-+++ teco.el
+--- a/teco.el
++++ b/teco.el
 @@ -312,7 +312,7 @@
    "Return string describing the version of Teco.  When called interactively,
  displays the version."
diff --git a/app-emacs/teco/files/teco-7-minibuffer-prompt.patch b/app-emacs/teco/files/teco-7-minibuffer-prompt.patch
index f46fadc98a39..4d8328198fbb 100644
--- a/app-emacs/teco/files/teco-7-minibuffer-prompt.patch
+++ b/app-emacs/teco/files/teco-7-minibuffer-prompt.patch
@@ -1,5 +1,5 @@
---- teco.el
-+++ teco.el
+--- a/teco.el
++++ b/teco.el
 @@ -2213,9 +2213,11 @@
  (define-key teco:command-keymap "/" 'teco:command-slash)
  (define-key teco:command-keymap "*" 'teco:command-star)
diff --git a/app-emacs/teco/teco-7-r1.ebuild b/app-emacs/teco/teco-7-r2.ebuild
index ef2a0ac6508f..3fedca3d015a 100644
--- a/app-emacs/teco/teco-7-r1.ebuild
+++ b/app-emacs/teco/teco-7-r2.ebuild
@@ -1,21 +1,22 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit readme.gentoo elisp
+inherit elisp readme.gentoo-r1
 
 DESCRIPTION="TECO interpreter for GNU Emacs"
 HOMEPAGE="https://www.emacswiki.org/emacs/TECO"
-# taken from: http://www.emacswiki.org/emacs/teco.el
+# taken from: https://www.emacswiki.org/emacs/teco.el
 SRC_URI="mirror://gentoo/${P}.el.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-ELISP_PATCHES="${P}-minibuffer-prompt.patch
-	${P}-emacs-24.patch"
+PATCHES=("${FILESDIR}"/${P}-minibuffer-prompt.patch
+	"${FILESDIR}"/${P}-emacs-24.patch
+	"${FILESDIR}"/${P}-backquotes.patch)
 SITEFILE="50${PN}-gentoo.el"
 DOC_CONTENTS="To be able to invoke Teco directly, define a keybinding
 	for teco:command in your ~/.emacs file, e.g.:
diff --git a/app-emacs/tuareg-mode/Manifest b/app-emacs/tuareg-mode/Manifest
index f2f4db92dac4..409219849698 100644
--- a/app-emacs/tuareg-mode/Manifest
+++ b/app-emacs/tuareg-mode/Manifest
@@ -1,8 +1,6 @@
 AUX 50tuareg-mode-gentoo.el 343 BLAKE2B 15545f9aebe6b47e6fa445e32282c4dadf8a6d3fc11d3cb9f8dd2a78ef32dfa5227248644dee8ad12587d96e2c17bf16220a92f447edf8716cd7646347fc2c57 SHA512 41cdc5aa7c083afbe044c730b898e06817fb8c5d9799d0c88be9ad15501d4135e16597623b66ae65a40160d9a04358392a98e03646ba2207e0f981f33e28750d
-DIST tuareg-2.0.7.tar.gz 57999 BLAKE2B 12649da41c8bbc547d28fe391cec51ca552dd66bb1fbf052a9d44d693b9df45ac6dc10336e146109248b130ea7ba94f7097398b598f3a7eb113b0031eea83486 SHA512 6cf290879dd9b7993a046dbebb9944a245fa82d1e7849b46f477b7217b46026ce5195e40e4d9b990e047a03680197827334e6d54d82610da6fc2e62386357d42
 DIST tuareg-mode-2.0.10.tar.gz 102576 BLAKE2B fac81b5f43dc9143a62fe7ebf5d35bc44994db3a155b780329339b73b087cf53e63aa15b7e817388a92f1effcc08febc617747b242d57d5e900b20fe100a8f03 SHA512 53bdc3b2b78bcf7e6b075932b9319f9d08b02b4b3fd74fc9aa30b390b30e4069e19e09e0fbb03fb11877e6d89649b8e59c645cc8de196115c1bbdab308145743
 DIST tuareg-mode-2.2.0.tar.gz 83392 BLAKE2B eead49dff45bb039abef0ffa8f4b874dd6d3bb36e81791b84e411031b4d714324637f99a0cfc3d4029b47032c61ca45424831a2d837fe5b01fa93383237cb14d SHA512 5f0b470920abd44e5b99e84e817ba678aded3042751b8949884c06f3a928105acbe96a28af3a8a089f6b607f8dd70cba7a669e9a61b906b1dad840c7f88bce12
-EBUILD tuareg-mode-2.0.10.ebuild 461 BLAKE2B 5b5bb6cbb0d25fb99e0dd82d8fd09a6b80c4622a72effc589f054b5223ca0a77344b88f27d7ff17665cb69a42f4b939c40afae2ebc125624d271e1d11725b10c SHA512 d4c20260eba3b5151d2d550e0f75e910c9f40e1a47cf96a8e548bdab2074dbd3351709be1b1c3fe32b97c57eaf5cf58bc3ead1eb35c10c472aa7eff313f68337
-EBUILD tuareg-mode-2.0.7.ebuild 505 BLAKE2B 7dd6a1e0c7da751aff504724d03892385c73bfc4afbc52f4ff997040ea67e5c413b2e0b108bba8c19f062b8dac301f0be4aa21186538cf63bf2486900caff277 SHA512 5a982624d089ce91f1b31f20f65f295c9d8cda900888007f41b498ac70b8282edd61000206d8dcdcd000a7a95ac5de3e7d2ac58981e95391131aacce47dc29cd
-EBUILD tuareg-mode-2.2.0.ebuild 508 BLAKE2B f102eabd6554e8d52a68da2ad2596d54566aefac8a9c82430dcf59a736c5fb38e1872c3ee96d0f2c4c25078d5b2c8d60675c3cc88ebf6ae9678a2758cc0355ff SHA512 e3774236f306e07e839b1430c071008f28ef4929ed38cd2388713066c9c549139de1133937e4f6bfc4404b46ef7492b5a48cd40453f17215cff74e74126a8cc3
+EBUILD tuareg-mode-2.0.10.ebuild 451 BLAKE2B cfd163238d86f3d776816ee8aa6853bee92e5333c0d492435a4b926c38091cde1a4837b09f64dda87f55f32a54b9f877515f39e3560aff7a8557eb8bcc55bc98 SHA512 b649011add93ff46426407e1f37d8390863afe9fdb17b26ad44f3fbeb53c40b6f478b733c3f707d1400306aed737fedb94b837dbc567d0b42d8df41d1d74d030
+EBUILD tuareg-mode-2.2.0.ebuild 495 BLAKE2B ae1316fc64fa9dba1f3518db13f9b27d2f9fd6488f4f6a8c0449a2d9accec674a1d48d142d3d5a8b51c270deb5058d529f0b812d6a9ce1bdb7dd1efcc43b6a9c SHA512 8d5060ea94e5f1d1c97f874286fa9e98449201ef7fec650c37c96fb00177083f9753e7534cdfa2d0e63c601be2e25c38b100da885886e6fc943a6cb55892da0e
 MISC metadata.xml 780 BLAKE2B 9262902650dea63fa833d0b57f32054a6858e741f404d6f5393273518533e9008ec8a322ec013232b69e8475d9db7f407f3985477ce4449e08913e0eed84337c SHA512 480ad1fcd7b12c56081dac425686a17ad07d912c4ac0f5f259c126d4a07489d9660e1429a7f0570aac3957ec8712d406314d68c76cd45dd8ec99a7f62dba6c5d
diff --git a/app-emacs/tuareg-mode/tuareg-mode-2.0.10.ebuild b/app-emacs/tuareg-mode/tuareg-mode-2.0.10.ebuild
index 0f3e6123136f..5bb874a6968b 100644
--- a/app-emacs/tuareg-mode/tuareg-mode-2.0.10.ebuild
+++ b/app-emacs/tuareg-mode/tuareg-mode-2.0.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml/tuareg/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 S="${WORKDIR}/tuareg-${PV}"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/tuareg-mode/tuareg-mode-2.0.7.ebuild b/app-emacs/tuareg-mode/tuareg-mode-2.0.7.ebuild
deleted file mode 100644
index 5eddbb053a51..000000000000
--- a/app-emacs/tuareg-mode/tuareg-mode-2.0.7.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="An Objective Caml/Camllight mode for Emacs"
-HOMEPAGE="http://forge.ocamlcore.org/projects/tuareg/"
-SRC_URI="http://forge.ocamlcore.org/frs/download.php/1304/tuareg-${PV}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-
-S="${WORKDIR}/tuareg-${PV}"
-ELISP_REMOVE="tuareg-pkg.el tuareg-site-file.el"
-SITEFILE="50${PN}-gentoo.el"
-DOCS="README"
diff --git a/app-emacs/tuareg-mode/tuareg-mode-2.2.0.ebuild b/app-emacs/tuareg-mode/tuareg-mode-2.2.0.ebuild
index 3481178825af..c8e52e4eca39 100644
--- a/app-emacs/tuareg-mode/tuareg-mode-2.2.0.ebuild
+++ b/app-emacs/tuareg-mode/tuareg-mode-2.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml/tuareg/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+ GPL-3+ ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86"
 
 S="${WORKDIR}/tuareg-${PV}"
 ELISP_REMOVE="dot-emacs.el"
diff --git a/app-emacs/uptimes/Manifest b/app-emacs/uptimes/Manifest
index 21c6e87713a4..c31234829a68 100644
--- a/app-emacs/uptimes/Manifest
+++ b/app-emacs/uptimes/Manifest
@@ -2,5 +2,5 @@ AUX 50uptimes-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b5
 DIST uptimes-2.3.tar.bz2 3637 BLAKE2B 75517032993f8192c4985d6bb5793b90c828565495a4471845e3efb6fa939268c7b94751baa6b85f5462cfb2a944ea4f4904a75b950a071c0840bb21313bb751 SHA512 31a8e4da410c1c02e96b3aa910fb3afe99c924af0f8299465e1c1b4b22e925aeb427b1ad349df459f93d2efd8bbf66804186f26486957d9e8196eda1b50eb5ba
 DIST uptimes-3.7.tar.gz 3913 BLAKE2B 3148b17a8e61201027702891e0303870cddaace650770621bf7847cb86ba917c74aa5938f55fe2e6275180f9e66755f418dee47bc80b6fd7439276ff525ea9d8 SHA512 6e31cdacabc93a8f9d206d95eb4d16ad4a6b4a69f1032e93710693eebe8064446b19e4938eb342c8a66fac7e52e22da36b26bd3417216ab302c9c8e50dba27c3
 EBUILD uptimes-2.3-r2.ebuild 529 BLAKE2B 386946ca894ae58d415d36b198310e529f666fd78f93d5dfaf59ec171bd4c826c7858bbf0b1aa9481e15adf21535c79a46a3055122ead909aea69793a39c6094 SHA512 bf8e66286c792e86a7758c7b668ecd1d08ba6ec4725f2bba883cb037788af70414ccaa057fb3c0a5bda9e89a548f40f9b23e450e38c10130603e59567e5adbed
-EBUILD uptimes-3.7.ebuild 622 BLAKE2B 8fe4586a0a1aeb61022bff900f3b6506b6bc971ac1a4d17997f85775542be73f511f4cada0d5ddfd69e29ad43a3a0f03eeb00f84edfc24f4d5f60ae700276658 SHA512 00af7458a0a7d6b94a571145001cabf497edc6f58b7e93f8df4e0d1efa2f58c705a6659d83d200a004649567fa9d98c9ef509412d382e9e1583be8a8640e2ea3
+EBUILD uptimes-3.7.ebuild 620 BLAKE2B 18d364eedbe1c38d4c910e1656555db73be2ff6f1e53f7c559ee6ef44f54b8df093511c83f8ab89e617be10a5f329b3ccd4d5701824eeb2a30f9d35ea7a12604 SHA512 a136a817773ae3f2e0e615fe655b74bb027265db1d0269f044f452bf4e6ce67917971d341f84a794d73c422f271b121b1174f702a95ff94f7ec41d7635685bd7
 MISC metadata.xml 594 BLAKE2B e19412bb4bf3f290341ed58cfd0db991c57e91cff25862a8ff3ea942e8f68587a7f40c58a755867fdc0ea3688d6399cf87aa02b6edae41d5a5bde1c5a60c589b SHA512 94546e797fbcd61c03c4b8775e2204f3fac23fc50a9581722d46e92863f022a032c06ecb573e6785656a0950daa4b085f17104068f058917b32af4e2a5d8184e
diff --git a/app-emacs/uptimes/uptimes-3.7.ebuild b/app-emacs/uptimes/uptimes-3.7.ebuild
index 224e4265609f..30a33db9f97a 100644
--- a/app-emacs/uptimes/uptimes-3.7.ebuild
+++ b/app-emacs/uptimes/uptimes-3.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/davep/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ppc ppc64 ~x86"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/vm/Manifest b/app-emacs/vm/Manifest
index 6eb42d00cf1b..87721eb92a25 100644
--- a/app-emacs/vm/Manifest
+++ b/app-emacs/vm/Manifest
@@ -3,6 +3,7 @@ AUX vm-8.0-no-pcrisis.patch 620 BLAKE2B eb8615854424645a673a62da4c9546e8ac42679d
 AUX vm-8.2.0_beta-datadir.patch 1177 BLAKE2B bb0379126f4521ba8c75e1c7fe0d3c7e179333c10acb915ce8cc9e034202d17ebd89855d0ec7b682f174d27022ace06deb545df5a73130b380aa83797b4732ed SHA512 2097837ee4d7fe28356102452f4b110d358624b607c440aee654edcaf577b3e1319bac0eb0a44c2ecefb64334e28a08731c512116bcedd4c8930ba2cee1d48c3
 AUX vm-8.2.0_beta-optional-args.patch 556 BLAKE2B 9c07937f43b99484b5973aa63b386e6e127444b11d026192be868542d98dd83a3d6d6b0816dbba4c78a3d8b8c30f1759beac7d6406bc8280e2c50dde8db884f4 SHA512 4861df97f0f1fe05a85f019a2e74ca4588fa877f67bc0a9dabfe43e9fda7ff7a349cfe23693ec29ba04f75d1698d200b39afd88550c82f1dda1e2667f52fe8c8
 AUX vm-8.2.0_beta-texinfo-5.patch 8594 BLAKE2B 542c755aa7aee4f39c8977ec0a33eab53954bdecfc9e9b65a5fa069c3f3fa89311a00356a8dfdebc2159bfd5a047dbb3500b78e0f1f21398e41fe1ac55516aba SHA512 dbc8f9456735f4d1757a7094bf2cde86148444bf4c46136eb5170b94e9124bee48c08d8f7d82e3b3c03ebd3443f0ec3dc988178e335189904c3d2b4edb6d2cd3
+AUX vm-8.2.0_beta-texinfo-encoding.patch 197 BLAKE2B eeea93146d8dafab49b961c4a2b3ff981dc4269fab1fe6eb9124575341439a9fcdf8819eeea395ec623c07a2c31018770222265f1835361333d543239b63278f SHA512 ba227fa27e6b19f23b487e254703a4665dedf3cd4f6887db71cf76dad4ac66c52608a1e978c2eeef851e6f2241aeddd5249fd8824d5194105ed172c68b9fb6a4
 DIST vm-8.2.0b.tgz 839789 BLAKE2B fc032e0a6259d2397d80cc80fbb7cf5845e43a228124f867402738a9123c78c798822d8d9c8edbdb823bfe3bce946d53afb6cd24e02d28925a51d458cf21eedf SHA512 37b642975e8fe7e350c0a648f83608b28d8616417d376d9888c89b37c90d8bdb3c91cdc4c91a0f5072d29ac81bfea3d88f9b36699379bf8a5bdd15dd5a70858d
-EBUILD vm-8.2.0_beta-r1.ebuild 1552 BLAKE2B a0a00e3d3dc53b80948e7d8e4750564105379ba8070e7082f128298c141f69444318441938b83280dc6acab8ebf7b52446be018f02d15db01c61755a8777a5aa SHA512 1c046234551967574f174c83b8d34d3990684da935f1b304f2d723ef74c5ffea467a8db144f08f2acfb87bd386f68e97a2879b759f7ca2cb04c78b78a0b826ec
+EBUILD vm-8.2.0_beta-r1.ebuild 1598 BLAKE2B 34e16e27d7f1fcd6d147defb86199d05f9d6902f93bf729b65be8a0790ae7d1cdeebeb8c8fdab049c5aa8048bcdb807c217b5981fe8fbb9a30d1b72ce90a9b52 SHA512 f762281984af7feb73742e0006ea2a858175b0bb0bd399a72766df550194985f56ebfa9defbba0fdf546ea5a820d1bd28663734b6090d27a577537faf99ba52e
 MISC metadata.xml 785 BLAKE2B 1d8be69c7be90cb03815bad0324c55e4ed4be6443246922054dc6ebf4b66090bb9f7f30916cb5df07a664d151a77de6591a45d923847547898ebc32ac9505038 SHA512 62df38ecfe4b3de679d856cbca5b58d73c73a885f86998f00aa75e67efc2def4ce973bc1e2f40fa22f6f79cc9f4fc4185a916e6ba176a89d685b1092ea9eddfe
diff --git a/app-emacs/vm/files/vm-8.2.0_beta-texinfo-encoding.patch b/app-emacs/vm/files/vm-8.2.0_beta-texinfo-encoding.patch
new file mode 100644
index 000000000000..2e202ee9c779
--- /dev/null
+++ b/app-emacs/vm/files/vm-8.2.0_beta-texinfo-encoding.patch
@@ -0,0 +1,8 @@
+--- vm-8.2.0b-orig/info/vm.texinfo
++++ vm-8.2.0b/info/vm.texinfo
+@@ -1,4 +1,5 @@
+ \input texinfo
++@documentencoding ISO-8859-1
+ @setfilename vm.info
+ @settitle VM User's Manual
+ @dircategory Emacs
diff --git a/app-emacs/vm/vm-8.2.0_beta-r1.ebuild b/app-emacs/vm/vm-8.2.0_beta-r1.ebuild
index 284f8c20ce9e..df64a109d955 100644
--- a/app-emacs/vm/vm-8.2.0_beta-r1.ebuild
+++ b/app-emacs/vm/vm-8.2.0_beta-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/vm/${PV%.*}.x/${MY_PV}/+download/${MY_P}.tgz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 x86"
 IUSE="bbdb ssl"
 
 DEPEND="bbdb? ( app-emacs/bbdb )"
@@ -23,13 +23,15 @@ BDEPEND="sys-apps/texinfo"
 
 S="${WORKDIR}/${MY_P}"
 SITEFILE="50${PN}-gentoo.el"
+PATCHES=(
+	"${FILESDIR}"/${P}-datadir.patch
+	"${FILESDIR}"/${P}-texinfo-5.patch
+	"${FILESDIR}"/${P}-optional-args.patch
+	"${FILESDIR}"/${P}-texinfo-encoding.patch
+)
 
 src_prepare() {
-	eapply "${FILESDIR}/${P}-datadir.patch"
-	eapply "${FILESDIR}/${P}-texinfo-5.patch"
-	eapply "${FILESDIR}/${P}-optional-args.patch"
-	eapply_user
-
+	elisp_src_prepare
 	if ! use bbdb; then
 		elog "Excluding vm-pcrisis.el since the \"bbdb\" USE flag is not set."
 		eapply "${FILESDIR}/${PN}-8.0-no-pcrisis.patch"
diff --git a/app-emacs/wanderlust/Manifest b/app-emacs/wanderlust/Manifest
index 29306a0b1226..d1aab8ec465d 100644
--- a/app-emacs/wanderlust/Manifest
+++ b/app-emacs/wanderlust/Manifest
@@ -2,5 +2,5 @@ AUX 50wanderlust-gentoo.el 244 BLAKE2B 57be93cdfb9e1854ec5841996b586843ca6e51483
 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_p20180814.ebuild 1353 BLAKE2B 1c593e02a45e5dc45030e84c1f0e2a07b1a1e229588abed803bfad6d80947376087168f774c944dbe47719f946fcc5d217e5d3e602ff87d592973d3504313c78 SHA512 62947cf22c4b380e90e4a1a0d55f001928ed57f40720a944e9977a5feea7dae9542fd97169c2ed67d25ba0dc0d729dc767a2c5a7d184c3d072d48b175e7bfd53
-EBUILD wanderlust-2.15.9_p20190623.ebuild 1377 BLAKE2B 218a14355b0431324d3802c1537e4f0a5a0a179ca8a8e9e4e121d281e38f1e5d5e91d0b2f04d7c1a13bfbd6dba45eb129144d660faca8689251209a4695349cb SHA512 dcf36c7dc12b6b6da09df8afc2169449e6e4ac0ede68c1603bf5ff332ab3bf11405c5c2b4cbd6fbed9988917e167999436959d9f50fdd34c422266cc5347ab38
+EBUILD wanderlust-2.15.9_p20190623.ebuild 1384 BLAKE2B 2108f59a8ace0c023f8099cd4beaa6a29fe5859c32883de99be169917587d942d8d042e24c50ca6a679a19161409d97be23a488100e74a13e7d748aef3d3b795 SHA512 480e52b2e520bcc41e30519157c7ade7661b3bca63eabe219c1c45f9a0a36496f204f88c690832f74b739f0780e63d6233d03bbbf4dd9ed2817e66f10509f574
 MISC metadata.xml 452 BLAKE2B 79c5173a90f5687cadfb5fbf4bddfdaf4838d7b8b13d8df5f6221f2fc3a8ef777eebd7f13ec4bad09621082d688566cde30154b9c684deadd0e05c083e079857 SHA512 449539b7243e9d6646fa5cf7d56aa2cf227a6104c1dd2f1fbfdb843d7561b94315e649e2cfd5646093bed06f4f172e08adeb034a52b7b654fb3e49cabc45f8e6
diff --git a/app-emacs/wanderlust/wanderlust-2.15.9_p20190623.ebuild b/app-emacs/wanderlust/wanderlust-2.15.9_p20190623.ebuild
index 7df6b6b81818..d2614e684e37 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="https://github.com/wanderlust/wanderlust/archive/${GITHUB_SHA1}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 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/wikipedia-mode/Manifest b/app-emacs/wikipedia-mode/Manifest
index c129340606be..e14bfcee6eb8 100644
--- a/app-emacs/wikipedia-mode/Manifest
+++ b/app-emacs/wikipedia-mode/Manifest
@@ -1,5 +1,5 @@
 AUX 50wikipedia-mode-gentoo.el 287 BLAKE2B e47da9e98a8927dd34992b5e92fcd9a8d4c16bd74d80ce182fb9628b50dd5d8dd18895b519d208d93ba64201df51737608f614dceb0a36b27328d0251ae88cb3 SHA512 21fa3d8c7d1d33f61d1b8309a3b30dba79c8742bbfb41c31b75e959e15ebda8dc855d3c96f71c5ec078ccd5a96aace612490584d5a9b9f3fd32ced1781dfd305
-AUX wikipedia-mode-0.5-require-outline-magic.patch 116 BLAKE2B e04f3a458dcb2997575a2313f9cd9443c86b24fc66965151efdce53f381f03f944f732197e5182b0e452c459687ee4ddaf71c39b7086e154dedfb46a80b1eade SHA512 58b1e9474d90621f5fc1574c37b1e17be6081b6b96547e2a2e6c26571fa04a9ca015cc9dd25657edf23235c017e7d4258cd1963ebeffdbe3bf42c5cfd2fba863
+AUX wikipedia-mode-0.5-require-outline-magic.patch 119 BLAKE2B 6e6c463c33d6276edba6d0ff55ae6eeb9c14cc568427ca95c5029e27cf9f4f931767c7e24d130b3210a60ce9689fabf9a5c26f0d3e5c537bd770f86ac0d0d922 SHA512 1188327dbd24e8f38b49a071f2486784e94a8985b808794e056016a54ec3e13dfcc61061ee6833f620186d15a30abb6448f9073417f353989154e32b50309581
 DIST wikipedia-mode-0.5.el.bz2 14243 BLAKE2B 1824548c647141bce6bce4de02d42c933b512e132e80752a13c08851dd65d5750006a59880ff55ae663747f0d1ddbb158eae60ee9c610b23c2721ad2f9798c6e SHA512 d10ddfb13e45fae347fe286df919bd9840ea0c2b38e903b451a9c3b6b6ab768566021d12b898bdc7236d034a89ba582dc8d22827bd3b4d80a0363ab323bd045d
-EBUILD wikipedia-mode-0.5-r1.ebuild 559 BLAKE2B 8485da5cc7f5ae67f3f2d5ef1ecbdb834f3f111f90fbde2a62ce4f68a89bde3ea38e9e504558753c750cd007f667192ead1a681f408939926ab3ae429dbb500c SHA512 a3d48619fc185450f2357e5a95bf27ae98ef4fc5904e0df82472148c67553c52e18b8177ac52089accb1b28ebb16bd8f82dbb1cafe01c13d1ec30a5f54478342
+EBUILD wikipedia-mode-0.5-r2.ebuild 564 BLAKE2B 5d43e0ab33874015152e5e65bc764a9f19bd71de35b3f9b0a96c0729c89883348b1bbb2d1144b056d4ec595cf2478b553fb62e7b5a8dd9df398104363170f408 SHA512 4647b3ed5ace01df35d1cd0f1b8b1e1999aa3d3ac97160bf3c7bd49b33fca3234284b68311ebd5c5454f6d2a7c5c111628ef6f9486c637ffa177dd84797196fd
 MISC metadata.xml 741 BLAKE2B b4226f5fb806c976f39ad05b8ca536fa4f7c3db463aedbb08645409180daf83d808ea5721ab162c7df72757688a3e4f99d16774d72d43c7434f72c4c87b3b7ca SHA512 1953def9c360a467583c957d31872124f3d6fd985d65625eef7c71ba561ccde997bbe9c507edd1fad3d4bbd336d015028a6012f0c3d7a571329a83af6cbba96f
diff --git a/app-emacs/wikipedia-mode/files/wikipedia-mode-0.5-require-outline-magic.patch b/app-emacs/wikipedia-mode/files/wikipedia-mode-0.5-require-outline-magic.patch
index caefca757631..9ec17844508c 100644
--- a/app-emacs/wikipedia-mode/files/wikipedia-mode-0.5-require-outline-magic.patch
+++ b/app-emacs/wikipedia-mode/files/wikipedia-mode-0.5-require-outline-magic.patch
@@ -1,5 +1,5 @@
---- wikipedia-mode.el~
-+++ wikipedia-mode.el
+--- a/wikipedia-mode.el
++++ b/wikipedia-mode.el
 @@ -386,2 +386,3 @@
  (require 'font-lock)
 +(require 'outline-magic)
diff --git a/app-emacs/wikipedia-mode/wikipedia-mode-0.5-r1.ebuild b/app-emacs/wikipedia-mode/wikipedia-mode-0.5-r2.ebuild
index 89c4f20828bb..c70b2cb4fe43 100644
--- a/app-emacs/wikipedia-mode/wikipedia-mode-0.5-r1.ebuild
+++ b/app-emacs/wikipedia-mode/wikipedia-mode-0.5-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit elisp eutils
+inherit elisp
 
 DESCRIPTION="Mode for editing Wikipedia articles off-line"
 HOMEPAGE="https://www.emacswiki.org/emacs/WikipediaMode"
@@ -14,11 +14,12 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="outline-magic"
 
-DEPEND="outline-magic? ( app-emacs/outline-magic )"
-RDEPEND="${DEPEND}"
+RDEPEND="outline-magic? ( app-emacs/outline-magic )"
+BDEPEND="${RDEPEND}"
 
 SITEFILE="50${PN}-gentoo.el"
 
 src_prepare() {
-	use outline-magic && epatch "${FILESDIR}/${P}-require-outline-magic.patch"
+	use outline-magic && eapply "${FILESDIR}"/${P}-require-outline-magic.patch
+	eapply_user
 }
diff --git a/app-emacs/xslide/Manifest b/app-emacs/xslide/Manifest
index b5e26f6085a7..7fa5cd040775 100644
--- a/app-emacs/xslide/Manifest
+++ b/app-emacs/xslide/Manifest
@@ -1,6 +1,4 @@
 AUX 50xslide-gentoo.el 264 BLAKE2B 8a3cbd3159bcd3092e381e702576987e7f2389732063d7e0b0aaa84f98b1b975d4462ccdc1ac17603ede616eb052887c8da9df489c62ab2b9f0c9424072062bb SHA512 54dfb6e7d40591dcf7ee5625ded053056305eb72c64f3808758d20b9c9fdbc78f914765909c44ff9685b075f5d87e03a94afea156b179d6ae16275d1f9ad05e8
 DIST xslide-0.2.2.tar.gz 23469 BLAKE2B a7628267b45b1da9ba1cefef5b186ed0a01975546e0bd0f551dcac6810c59e7a75bd7d479c21e4199eb12725d8a0babb2e1ae1912ae53702ad72021b4775a7bf SHA512 e0cc7b42eddcaf9fe7860fad4eff14dd3c963578302884c9aa1caf09eaef08e73b7a3f60d15de7e31ce39d735751dbef33db2181531947ace9af25d0c5092697
-DIST xslide-0.2.2.zip 29051 BLAKE2B d29bfb9b932c1370d51695ccc00d16e6d0c3ea5025f42281df51bed016cead5bdaef95dbc2fc538ba493641ca799b7a048f48b659692e975feaf5ae8b545f1ec SHA512 df658464517704289d2695faed02d733adea9f5858310b497d66bf103be5c3e1c3635aa1aa3c93f63c64cd2927b4948e53e7b2593622564f5292c583d6e245a8
-EBUILD xslide-0.2.2-r1.ebuild 475 BLAKE2B 42c92ba197613f2f620998702ff39dfd78cdbf685907c03c58f86397aa6eb894146ead4d78f16f16c294ee9a12ac1595f34f615b758abb3656a8667a116806d9 SHA512 3432b251a222263b5b951d651e9bdd0368e8202a144bfdc5db2754a7611e0d0bd8f0c26afeaaa6ca97eb6b112e75fbf975e3f06df28a9bdf47cc5b2c7b1992fe
-EBUILD xslide-0.2.2.ebuild 520 BLAKE2B 0b5041a161c7c35187303f44729479153957d10effa5cac35f1418b0284e5b4c755c80f7b0cf07a5626c59d5d90920beeeb9ea941f0bc609c7da67de0aef88ce SHA512 4b3895a41210215deb5aba2172d31aacf64f3869e2a178c3d8c42c735aff544874cce557e6e09b0ffa7c20be6bc4a8a17cc0568ad49c6ebc928ede3db92e2dc1
+EBUILD xslide-0.2.2-r1.ebuild 472 BLAKE2B 18d7d798c3afded8e594e7cea4a382d275449b2153a08c397b5d866ba1aa904dde07ddb28605d684099ee6545231f93c4c80410f00332e518af0d5042099c968 SHA512 7a6e6ad7b3dde113a232f98c431e7c4bd4137294fc31b305ee00b101e2dfe9e7d7ede55d518f64877d97ffb204f38556894d3f7336465e3c22bf3b89650790dc
 MISC metadata.xml 356 BLAKE2B 6b8ff8b4ccbc7f2c5c85c154ec1eb694bb83306d9832227556873cea83a29684b63ec6e95fefcf3cec83e8f3585c00882f12186d37aed81f022aae04c1c8019e SHA512 ee8540b29674e44b7aa072c02ca5031df5c5283c1eaaab2ca6a549dce024c40e25a2316949d7997951f8db69322e592d5efcd59a4f9e4480ccda668d096459d8
diff --git a/app-emacs/xslide/xslide-0.2.2-r1.ebuild b/app-emacs/xslide/xslide-0.2.2-r1.ebuild
index f2568831089c..52b41b9c11aa 100644
--- a/app-emacs/xslide/xslide-0.2.2-r1.ebuild
+++ b/app-emacs/xslide/xslide-0.2.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/xslide/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ppc ~x86"
+KEYWORDS="alpha amd64 ppc x86"
 
 SITEFILE="50${PN}-gentoo.el"
 DOCS="ChangeLog NEWS README.TXT TODO"
diff --git a/app-emacs/xslide/xslide-0.2.2.ebuild b/app-emacs/xslide/xslide-0.2.2.ebuild
deleted file mode 100644
index b24dd16862b3..000000000000
--- a/app-emacs/xslide/xslide-0.2.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit elisp
-
-DESCRIPTION="An Emacs major mode for editing XSL stylesheets and running XSL processes"
-HOMEPAGE="http://www.menteith.com/wiki/xslide"
-SRC_URI="mirror://sourceforge/xslide/${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-SITEFILE="50${PN}-gentoo.el"
-DOCS="ChangeLog NEWS README.TXT TODO"
-
-src_compile() {
-	emake EMACS=emacs
-}
diff --git a/app-emacs/zenburn/Manifest b/app-emacs/zenburn/Manifest
index ebaeac50a010..e5a4e9fe23f0 100644
--- a/app-emacs/zenburn/Manifest
+++ b/app-emacs/zenburn/Manifest
@@ -1,6 +1,4 @@
 AUX 50zenburn-gentoo.el 180 BLAKE2B 9ddd4068d000d8aec01e864f90c4ab1f418d45b4bd04c65ebdd3159e93dc6a2cf63dd1a11c88aa65a571dc1b89fc5e474ce6515f4b8f25392a870ec3961ccff5 SHA512 712853121e485d5100b89c69de853e8c0437c7b4c8fc47068281f6bc7dc3934a8417bb7e50f06b814991a016e6bb0be4859f01f63d4159523fb0ebc0acfbab23
-DIST zenburn-20110907.el.bz2 6979 BLAKE2B 3f38e857c9e09d73d5aafc7e5a98292c122b5ab903c902fe43be1d91ab20a9703a974707354b9f07eab190324ee4ac8a392efae06f2c05a07dd9914a78ebde4c SHA512 552f4a751ffadaf2f4174c7f722abc1fb7a8f84934df01f61c2d7cf653328ce8fd18473f0748eaa570ab9221544e5e9c81243e731a2fff5f2c9028b992163062
 DIST zenburn-20110907.tar.gz 7952 BLAKE2B c1d63eacd5e77f1d453ddd9323a7f573e487625e1f210c0a93f8992fe741d097f7662fca23900cbca320c9b0aa1484ada885b0b9c077f9a9370863172683b255 SHA512 be19da75b1f776128a8c8701655a0c7cae0d1228ed9d92cf5b57047f99385cf996c27aec9514118612a1728c126feb8892f1375c156a1b345e1018154edf6e79
-EBUILD zenburn-20110907-r1.ebuild 728 BLAKE2B d0c98e1372c7b948f72c9d71205a6e337eb233a70d6e44d6e8898bca7770ccbf4d7a852cba3013472498d6f1ce511ea4d191163439b049db485547d926a7fbd9 SHA512 f2a02a743424bf6b65825667a7017fd2845dc7bc838e46d69c7307145407851a3902502e7ecc3b4c8e46950288986b17330deb05646723e8adbeaf1af590fd8f
-EBUILD zenburn-20110907.ebuild 614 BLAKE2B 60a98f4d9c3301f50ef849bc4cb7b8f54b37bfd1e552c34a1e3b0ef783a5797a1f24039539ba46d122a03b83966285de99592c74a196adb8b94c36a387cbb929 SHA512 5fa53e44441c3f8ebd2ce3d6288b1f9191c6b2fc69caf81b816cf7f15dcfc8c0e215717939119a2273b2c4d670da6099a4f98d900e5c9ce5e06916992f5b76cf
+EBUILD zenburn-20110907-r1.ebuild 726 BLAKE2B 4368ce1c20fb503b8b6cd7a60811153e9613eb4b16fc8d76fb74a613867e8a66ad2a044c54880a465bb8f4681fd9df37cd1093cedbef97871f21a0644e2be4f5 SHA512 2c4ab6b81f60c4f1e9d1915f8ae64d7ef5bd5450f373a9eae067f987a8b29ad28710a0cca681269360671a892ec5fdeddba8fe4590b8bc0af49ed0d5faa5b55e
 MISC metadata.xml 534 BLAKE2B d7a3d1d169842f90c9ce6ccc7b835c154f171098a8994f4769c041877c8d746915f461b2f97f651a62e4c750fb80290ce0549de9ccc6724c3e6fde9a5daf8947 SHA512 b1f6d9b271628e63c77f095228095581c7174207d6f1b24bac7c3b5de5ae7429b53621056a671e481dacaeba003f37e5911db3c47633ef3d80f64526214e4342
diff --git a/app-emacs/zenburn/zenburn-20110907-r1.ebuild b/app-emacs/zenburn/zenburn-20110907-r1.ebuild
index a444bae490e2..4f1f09a16046 100644
--- a/app-emacs/zenburn/zenburn-20110907-r1.ebuild
+++ b/app-emacs/zenburn/zenburn-20110907-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/dbrock/${PN}-el/archive/${COMMIT}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="app-emacs/color-theme"
 BDEPEND="${RDEPEND}"
diff --git a/app-emacs/zenburn/zenburn-20110907.ebuild b/app-emacs/zenburn/zenburn-20110907.ebuild
deleted file mode 100644
index 71a6086ef93b..000000000000
--- a/app-emacs/zenburn/zenburn-20110907.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit elisp
-
-DESCRIPTION="Zenburn color theme for Emacs"
-HOMEPAGE="http://slinky.imukuppi.org/zenburnpage/
-	https://github.com/dbrock/zenburn-el"
-# snapshot from upstream git repo
-SRC_URI="mirror://gentoo/${P}.el.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="app-emacs/color-theme"
-RDEPEND="${DEPEND}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-pkg_postinst() {
-	elisp-site-regen
-	elog "To enable zenburn by default, initialise it in your ~/.emacs:"
-	elog "   (color-theme-zenburn)"
-}
author	V3n3RiX <venerix@redcorelinux.org>	2019-10-13 22:19:36 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-10-14 23:22:23 +0100
commit	4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree	76e74807bc479502e13866b581b6bf86734ec634 /app-emacs
parent	30d6f67c98d149508509d5e86f176d558793acc0 (diff)