gentoo resync : 15.12.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
commit: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree: 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /app-emacs
parent: b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)
113 files changed, 223 insertions, 891 deletions
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 5e931b0f29ff..862f36e7bbaf 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/auctex/Manifest b/app-emacs/auctex/Manifest
index 06c9bc68cd04..b1792ab95550 100644
--- a/app-emacs/auctex/Manifest
+++ b/app-emacs/auctex/Manifest
@@ -3,6 +3,8 @@ AUX 60auctex-gentoo.el 97 BLAKE2B 18cad086f4211844f8a32d0f2499d2ecf29cd41f90c9de
 AUX auctex-12.1-autoload.patch 1373 BLAKE2B 8ef031135245b0f54f3789a8070253f5a32fbf12ed001d1256ec55fb6d349f2fef3fd880cff4c35464c79d2fe041c1744f1918626d671289a46f006973f9aca9 SHA512 935dbc8a145c44d655c85b6725bbe61bc165adf4561d4b6583a63a2c950b5221ed552fe53884ab026a086720d29486c7bb8b07897b8d64b0cf591f5a2db5bd8f
 DIST auctex-11.92.tar.gz 1486606 BLAKE2B 6e34d1da3bacad8f2baee2f13eb44a5b617a342c294ef4d7ba28059b678510e1d161f3f02fbcf38128c09ab4996a035e5ec28898134b967d88ad621b8b477845 SHA512 758bf82903ba0499decf0ade77c7ac70865132a24195d7e8794538b7857c448811b7ef26149a915b60ed3ee34c2ebaddb3282a320bd459c9ee3f461d6ee9b84e
 DIST auctex-12.1.tar.gz 1476296 BLAKE2B 1dd5db94b5b7bb572919fdcb6c7dd2ea4d17f816204bedc69756610b80370ca748a06ab100ef8221107605a5e464b6a8c2587b728ba6a964776ea6dfeb7f7165 SHA512 4c27a3b16eaf98db164832497c497576fcabb274b24c6eb3060625b7711b1de91fce9a52f7c7caaec77a93768a6ce2ec173ab1ccb72f4c56c51cc4740d380d97
+DIST auctex-12.2.tar.gz 1511396 BLAKE2B 02cad76c8846fc10dc1bd94d15fb1d6f56a9beead96deaa32a5e9a43241b232f021d9abe1965e10e53b941a223c500b301b1c467228bf8d9ed2646fa70bae647 SHA512 412e247ad9ba7feb768cade0a7098cc79991ccdf350248836813d572bfe2339f52c4e0e9ce631354e2c2d434217274aa9116e61d122a625a45a7f67aabd2316b
 EBUILD auctex-11.92.ebuild 1481 BLAKE2B bdc0e1ceac0c607c80405865897c909be1be015a968419e2ef7302abb104e465a54eac7dc42d1cdaca1d215dc8ccdd07452ef5db20d3b5cf9e40613da935560c SHA512 9048e1c9a7e11f5e6e8b70d50c507083f90f0a2b3d0bdcee52a320902bc4fd78a6f8069442dfef57fb6fe78d18b82bf0787d70c4a22effcd182babb9e0a9b226
 EBUILD auctex-12.1-r1.ebuild 1530 BLAKE2B b3d4cade5f22e2a4fb88deb34788fb786b4538bfc6d041ad5248af9388f38060e0fa482452777fa64b79ba9060926d0591b07c440cb451093aa52289cd92cf70 SHA512 b704364c24fbf27e9106ef6dcaaf672c0f0ddac4707b99565bf2b414cca03cb53be176a1b4233ec417eb95b5fb8903a2ca161bd8d6d1e1e3f5ba1ec97a861d48
+EBUILD auctex-12.2.ebuild 1499 BLAKE2B 5000202d47e12e3cf1c94de91a8421e6d67a16d56c04e47afeacb374cbb71da92f8cfe2d95aecf03ca0e0c3b21c670376b6337c045dda8738ec142307bfeafe2 SHA512 aa2dd8ed3764dda7070433cd5e30710b1f3e0d060e434983d10ac7338748a7d00b3076db27efc9bb7baa402d1d61b3556c84e5a97873c5050a0ea8d684a4ffa6
 MISC metadata.xml 947 BLAKE2B 0b5e298fd9ca7112b8bd91bdc8cee455fff18d6ef21820c9e3da7058c860462fe96a7fe29792cc143d9e1876495fe3ee87e09e006b203ad448e511c12983c383 SHA512 61629e82f0004763e776db51ace13d583eac8d1199ebb61d17a101d48dd60258db4310fc938b82822c64b0ee9d39d9095fd86c316585e54ea9e7872a1247763a
diff --git a/app-emacs/auctex/auctex-12.2.ebuild b/app-emacs/auctex/auctex-12.2.ebuild
new file mode 100644
index 000000000000..3fded696f7b8
--- /dev/null
+++ b/app-emacs/auctex/auctex-12.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="Extensible package for writing and formatting TeX files in Emacs"
+HOMEPAGE="https://www.gnu.org/software/auctex/"
+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"
+IUSE="preview-latex"
+
+RDEPEND="virtual/latex-base
+	preview-latex? (
+		app-text/dvipng
+		app-text/ghostscript-gpl
+	)"
+BDEPEND="${RDEPEND}"
+
+TEXMF="/usr/share/texmf-site"
+
+src_configure() {
+	econf --with-emacs \
+		--with-auto-dir="${EPREFIX}/var/lib/auctex" \
+		--with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
+		--with-packagelispdir="${EPREFIX}${SITELISP}/${PN}" \
+		--with-packagedatadir="${EPREFIX}${SITEETC}/${PN}" \
+		--with-texmf-dir="${EPREFIX}${TEXMF}" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--disable-build-dir-test \
+		$(use_enable preview-latex preview)
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}"/fonts
+	emake
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install
+	elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
+	if use preview-latex; then
+		elisp-site-file-install "${FILESDIR}/60${PN}-gentoo.el"
+	fi
+	dodoc ChangeLog* CHANGES FAQ INSTALL PROBLEMS.preview README RELEASE TODO
+}
+
+pkg_postinst() {
+	use preview-latex && texmf-update
+	elisp-site-regen
+}
+
+pkg_postrm(){
+	use preview-latex && texmf-update
+	elisp-site-regen
+}
diff --git a/app-emacs/company-mode/Manifest b/app-emacs/company-mode/Manifest
index 04281e5efcd0..afff2f3c9311 100644
--- a/app-emacs/company-mode/Manifest
+++ b/app-emacs/company-mode/Manifest
@@ -1,6 +1,4 @@
 AUX 50company-mode-gentoo.el 79 BLAKE2B c9b00690d98498b53fa329adf5279ee341c03c73cfd12b70e1474189cc9c9de07bca276ef9fad35f346825c4daab0212e8965069a2a0706cec690350df24fbf7 SHA512 8c3c1d4a50bfd4729f8a06f33bf9d754b5865814cf15eee1f3c84c6726734f8ff26c21547f1453f7417a0b9d008fe7804104ee6e30f13c54625d2b4b6faa7e99
-DIST company-mode-0.7.tar.gz 54670 BLAKE2B 4b56182d6d37e1c0dd827babf3e5c17c49a2e86959c99aa4dc6832f5003a9c1baf0019c610cf9bd46e6db5f1d68e72381ae22f71afb636873552440c48b218c0 SHA512 375c8541a0c5b34fba37ea136c8549e6ec916c238bee8115f036d88f273d6bcb0c0f436a6193d3b4be6528945d8f85c605de8d340e903a9764f5ace664f8cf61
 DIST company-mode-0.9.10.tar.gz 85982 BLAKE2B 393e8ff31f4a88d1c156418bd0c827572ec078b833e78bd1007779961e9fb852737f12a5c1aeba154ebba53d81058bdc2871f7d88880aaa7dd8cb9692461c8fb SHA512 b6571c55bcf68a5e83e7c92c8b53e0ac6b4e84bce1246331a7da4495f4ee5c3ab38035310fd2eb7a87748db1c034996d99c7ead8aa831d552800642b31cf9fe0
-EBUILD company-mode-0.7.ebuild 1000 BLAKE2B 51b71a2a2d7988421156b6b415b935bfe153fd076d83904f6762cd02aed3c7b1318b228b0c960160cf4c640f37d51c5334877f24e4d5ef0fe49f2d36dd355416 SHA512 62fced23f0b40ab4d4b93c2102202c00e7dc85d4541cdbbea9bd78d65d71b07d301700fa944d2729d0e59f2537e10fece36509daf0666179158acb0293c10804
 EBUILD company-mode-0.9.10.ebuild 510 BLAKE2B a4b4162357dc232a2614d4e942e07555b6281b8965e667ae39c721d2698b6ead847771a16b1faecee72dae707f7cf2d4fc571f10897f188f01672168e23d4461 SHA512 18aedf133e54a1a0fe9662aed54077e59546cf9bde74d8dd36846b37bf62ab9df217d9dad20d90cf3226098f9c25efbf16f477f82f46294dd902a5f7241e13c1
-MISC metadata.xml 469 BLAKE2B 08b950e54425d9c6fd0f2a58eea8aced42d9d7c0f657e34e950b3fd618af534900970356be21750adf7886e7fba34a041f5445e60f247dab4c763dc59d0c8f86 SHA512 e5da67fd1ae2089c6ba90c7bdc223c11e3e6e4eaf548dee77198a5ecadcd288aa2f91dccbda9bcfcbc347909d77f5a1acd77ce22b45efaab8f9c62729407713b
+MISC metadata.xml 370 BLAKE2B 1628845f0ee6e98db3af16a9c547f9b3273e19bf5d0a401c33eeeda05e245f4ffe723333b73f42e7112152e4c4045787dca44b22e41b6316dccbb5033190f84e SHA512 6eb79238a729a9b373738f398badfa7a41895f60536c577add191668523bedeafd8a34f774c14a188db175843e489a68fac6857bd7fef44e6596dcb5ffbdaf9f
diff --git a/app-emacs/company-mode/company-mode-0.7.ebuild b/app-emacs/company-mode/company-mode-0.7.ebuild
deleted file mode 100644
index 7b2e2231f50f..000000000000
--- a/app-emacs/company-mode/company-mode-0.7.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="In-buffer completion front-end"
-HOMEPAGE="https://company-mode.github.com/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ropemacs"
-RESTRICT="test"
-
-# Note: company-mode supports many backends, and we refrain from including
-# them all in RDEPEND. Only depend on things that are needed at build time.
-DEPEND="ropemacs? ( app-emacs/pymacs )"
-RDEPEND="${DEPEND}
-	ropemacs? ( dev-python/ropemacs )"
-
-SITEFILE="50${PN}-gentoo.el"
-DOCS="README.md NEWS.md"
-
-src_prepare() {
-	# Disable backends that require extra dependencies, unless they are
-	# selected by the respective USE flag
-
-	elog "Removing pysmell backend"
-	rm company-pysmell.el || die
-
-	if ! use ropemacs; then
-		elog "Removing ropemacs backend, as requested by USE=-ropemacs"
-		rm company-ropemacs.el || die
-	fi
-}
diff --git a/app-emacs/company-mode/metadata.xml b/app-emacs/company-mode/metadata.xml
index 166418c6cfac..3f2a9553630f 100644
--- a/app-emacs/company-mode/metadata.xml
+++ b/app-emacs/company-mode/metadata.xml
@@ -6,10 +6,6 @@
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
 <stabilize-allarches/>
-<use>
-  <flag name="ropemacs">Install backend for
-    <pkg>dev-python/ropemacs</pkg></flag>
-</use>
 <upstream>
   <remote-id type="github">company-mode/company-mode</remote-id>
 </upstream>
diff --git a/app-emacs/csharp-mode/Manifest b/app-emacs/csharp-mode/Manifest
index bafc132c2b0d..bab346a00234 100644
--- a/app-emacs/csharp-mode/Manifest
+++ b/app-emacs/csharp-mode/Manifest
@@ -1,6 +1,4 @@
 AUX 50csharp-mode-gentoo.el 171 BLAKE2B 6fa14f46d3ea4fba310ad4cb59a037ed5a4f123cc5b9243db715e08d3301bad7f24abb4cf1aa3ec178ad9c8e859d5225f49a3c8b87a302ac50c7a30eb56a34a1 SHA512 e0c9a5dc17c849ce9619a75ee46a0eb7415c0c04cb71cef326845ec9fdd79f57abf397590ba85bb0b901103ba0815cd6c873e9e12670cfb97d796b1f2cef087a
-DIST csharp-mode-0.9.0.tar.gz 50453 BLAKE2B ed4b6ba56a9283687db332749510dcb63cc4bfc35687979cabae48b76d9e36598c88ff43f2920ca5272b56833d5cadd6602b47be21d88a7cd25d6ecb0e748493 SHA512 81661d98acdf03e01caf3b9388da8571e78402b8914755b223a38a723457a988201adcaf7b5b825c4e0126ad5e7628063f85dd4e60ee272102a5f1509f9446ef
 DIST csharp-mode-0.9.2.tar.gz 52389 BLAKE2B 897d8bf3b9e0963647071628af874a77f7181592fe21f2094082c807cb33d26e43825f36cefcd100ad46dea67d217f99ec89e5f3e2c94a639553d7334ff39bc8 SHA512 da4e0aff63600c01d1571fea19d7892af1c3bd5366b97a1d9321853db7d52f04431f0c7c16371a0ef0f8296ccbf2baf0890ceb67e48a9159faf6fd6d10cb49ab
-EBUILD csharp-mode-0.9.0.ebuild 543 BLAKE2B c5ae548cd6b28a0e081a487f65f1e5942c9cb87e4a7bf13634c83d861009a80750907c0889ac7a8f90c8ad1f1ae7e9d307fd3a4e8220c8bba936e68572feb340 SHA512 21fd7b3183af0ec291b2406384050b7c07d07bcde4e2d0e2a6129357f1d5352000d2a0278a3b258ce75d8db4508498bf4991b99d56ae08b99872cdc202cd7ca4
-EBUILD csharp-mode-0.9.2.ebuild 542 BLAKE2B 0640f5e03cc11b420fecb52b6f04fb492bbce402c42a1bc2a7db5ff58010853a48eefafe741c4b9e96cc0b5bb4fbe3ef6465bc11d4201d0971fcf264fdba750c SHA512 d6a7fde9982213722c67d65766e9e555008dab2342625de96ee4da76d923a19e40abdec3b86427fa29bd673fc4b31c834ac543a8205421d2059ecedcdf744da7
+EBUILD csharp-mode-0.9.2.ebuild 540 BLAKE2B 1ce353c24d36286c139e7681a633e7bfc705cf992d8d393d29d053a130edbd78700e080515fda3a75c29ba9bcaaa44020e89d99df068af8d387c16e36a5e0a7b SHA512 b662d976dee79d73534c083fab34b9aa98a737c4c5390d051e9ed9d52225a6c6968475cacbd25e3c42a2268d5ecd282f5b304ad86bbab8a11b1f57bc97ab8007
 MISC metadata.xml 365 BLAKE2B 198ce5e41bcc5190c96f1513cf4bae60b691294d6343542d42edbe21d087deb81a3a4e102949638d714039959dd0ffa660db142b3b68184e60d6693679bbb0d4 SHA512 43148e8901940998cdcc1667aa7027cf7235273d9dd276eb884a319c99ec2154700ab7c56f25301f23a0238004209f4da887d08c2f3088f71c0c89aca6bcfb66
diff --git a/app-emacs/csharp-mode/csharp-mode-0.9.0.ebuild b/app-emacs/csharp-mode/csharp-mode-0.9.0.ebuild
deleted file mode 100644
index e73197cf3cc8..000000000000
--- a/app-emacs/csharp-mode/csharp-mode-0.9.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp
-
-DESCRIPTION="A derived Emacs mode implementing most of the C# rules"
-HOMEPAGE="https://github.com/josteink/csharp-mode"
-SRC_URI="https://github.com/josteink/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_install() {
-	elisp-install ${PN} csharp-mode.el{,c}
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	dodoc README.org
-}
diff --git a/app-emacs/csharp-mode/csharp-mode-0.9.2.ebuild b/app-emacs/csharp-mode/csharp-mode-0.9.2.ebuild
index d2dad1639c13..3429cd891bdf 100644
--- a/app-emacs/csharp-mode/csharp-mode-0.9.2.ebuild
+++ b/app-emacs/csharp-mode/csharp-mode-0.9.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/josteink/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 SITEFILE="50${PN}-gentoo.el"
 
diff --git a/app-emacs/d-mode/Manifest b/app-emacs/d-mode/Manifest
index 007f79134557..f6624efe2a7e 100644
--- a/app-emacs/d-mode/Manifest
+++ b/app-emacs/d-mode/Manifest
@@ -1,7 +1,5 @@
 AUX 50d-mode-gentoo.el 157 BLAKE2B d92e7cb8b7121e989f3e68634db63f175b5145bf7f562758bcb7c3fce318ce6c72eef12201c9b332ea1309e4f4a20a6ea3051b8eab997413af08b4fc52fe1339 SHA512 12a89496192f10a221bf3be386339dd2494304f5e0e8c8ebca1d9e622b5304609b01370d64b009120f333794a41815fd73124114035e02ce53241f58e9968546
 AUX d-mode-2.0.6-emacs-24.4.patch 323 BLAKE2B b24721dbd61cd5fe330e81bdb44258ce3e25e54ebc0215ed3edd28e5fdf282100c860e811a70868090288d780df925561c252c1582be7b26ae71ba905662c19f SHA512 254fb7b91ad4e355d70ab83b4b597293935d2375d895a78adc03155a69a2288a0bce2b9dc48244dfdbecc63d95724db50622e99ebb0562ad41cd6e828a4ea314
 DIST d-mode-2.0.10.tar.gz 22394 BLAKE2B 16993c1da1b4362df4ef4674f58645da13466d6bf9a6215667a70868be7f6d3f992f0e60d9a3b6c4bcac7c3f4014fa987bfec2f3ee4e1503740efe316f29d249 SHA512 510ee3b1c1288b4b6772cdc9c436d691cc4c09fd1337886abe9a8c86e64a6fede3d8e2aaf46e847417cb667d36f9c5db3c446e7f5ca88fe2bc8b8fb80bcd1297
-DIST d-mode-2.0.6.tar.gz 5465 BLAKE2B 4ccb9341ac25c4856c1dc3ce7a7acc68942fb7ce3dbb6818b2fab6de843b6f6757907e994d2e777d0590b8ae26fbf4483eaa7d1b5e0ab7d635047ced4a276c60 SHA512 8706459af61e49b3ca1ef6d4021abff752706b4dca9385c4fbe2b7c29ecb028dc3df558b1e9b3a358e5c38e3d2ab7121505583f95d3afdd9a06bc9449ed678f2
-EBUILD d-mode-2.0.10.ebuild 502 BLAKE2B c5af88b1f7fe35da321656764adf5d1fe59bb22f56223f55945a9d1b9e02232d230a386410d2c4c025794f9515eb4d4e7c3b8bd217fe2790861c9beaf57cf2e9 SHA512 306aacf4d9bc5fa4e2e3a4a1a9a276b4545d1c8c5511f5d96ffd8e775b1d55d7cf7c980f9fdbe8cc69c6a004f8d9c8c10eca50002cb37116bc429271e321a28a
-EBUILD d-mode-2.0.6.ebuild 543 BLAKE2B 37d9237b49b518888045033fa09548dfddaca372b0420c9d73942bc40b89f830e35da76a0040b53ea90737fbe04d51ef1ccabd6ce034b6dc4e4d315d94a9cd6f SHA512 d01e8cf839d377eb7195af98aaeecf00bca0b65b6bc1f3500bda3342f4c362f8c30745bba52f6c672040ab515cc512c75e1b379ab6c13b453085e83d1c5e485b
+EBUILD d-mode-2.0.10.ebuild 518 BLAKE2B 28995c68a007466c48cfd2d53e58d053633533cbf1b8e377762d7b3bfaccae7a03a80ae56f1ff150236dc8cab40091604934cde45fe03b2f9e78f012297d155b SHA512 00fb22f20f8d5ab16c7471f2c8f0f64a48af7c2b910accde3aeab00f59b24e79b92de8c19d3e0128d18ac8779083244cfe9a7b61e2fa72d435770617d67dc2fd
 MISC metadata.xml 382 BLAKE2B ca4199b6d9d35540d53a4bc673fa59babecd80579ede4c227954492ef2591d6d09e0d3938629f21606c7547ed3155d733582a1298067ffaeaae20bc0b5218e28 SHA512 8a55a3ae2146d4ebeef5075312482f0962e8e219f73cc9997c7ba19978830d42ac22c02b84be34a377841858d9fc19d85ce9243546759e8666230e9c311347b0
diff --git a/app-emacs/d-mode/d-mode-2.0.10.ebuild b/app-emacs/d-mode/d-mode-2.0.10.ebuild
index 24f2b7911109..c410ee103834 100644
--- a/app-emacs/d-mode/d-mode-2.0.10.ebuild
+++ b/app-emacs/d-mode/d-mode-2.0.10.ebuild
@@ -13,6 +13,7 @@ SRC_URI="https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode/archive/${PV}.
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
 
 S="${WORKDIR}/Emacs-D-Mode-${PV}"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/d-mode/d-mode-2.0.6.ebuild b/app-emacs/d-mode/d-mode-2.0.6.ebuild
deleted file mode 100644
index 04e0ae831af9..000000000000
--- a/app-emacs/d-mode/d-mode-2.0.6.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="Emacs major mode for editing D code"
-HOMEPAGE="https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode
-	https://www.emacswiki.org/emacs/DMode"
-SRC_URI="https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/Emacs-D-Mode-2.0.6"
-ELISP_PATCHES="${P}-emacs-24.4.patch"
-SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/dash/Manifest b/app-emacs/dash/Manifest
index 107f9cfa685d..c92c7832d739 100644
--- a/app-emacs/dash/Manifest
+++ b/app-emacs/dash/Manifest
@@ -2,5 +2,5 @@ AUX 50dash-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b5695
 DIST dash-2.14.1.tar.gz 141115 BLAKE2B 87fc7a02c66161d1c16debc54c6336f36cc47cf7c7c470d190424b9c463723058ef6f72cadf3f4d4215b36f369b9e5356101c4ea16fede10cefde90b5e0b384b SHA512 cfd4ed7a9eab881a0c3bd2744e78c5ef99a92db4d3afee8c632c0a766adcdbf1999f4e9770e2c4e941526d488dd6f9327937389490cc2310d79b38c5bf2ddd12
 DIST dash-2.16.0.tar.gz 148151 BLAKE2B 1c51d926a6dd4ecdbc2ad132347af7bbd27e604d6e2c61a6cfe548802b08a57678ca26aba69f8ae27ca7cdeca84cd469bd9a7849bf28c2abae44f7172ad2659d SHA512 a0196327c8e81d1b343bb56de00a3c2f59b1d3f86dc4e923cf350658590fa106aa0be933aa0f51ff3c02d9aff8450c5e055d169ae8fb876be068bf15a52af216
 EBUILD dash-2.14.1.ebuild 560 BLAKE2B ff1f6faf93907f3dc4ebf54fb77a6d6aef111dca5c61ad277b3f561e5035d0428225232a79536c61216e24e5992161f79dd83eb5e4ff1044d15aa6cb07044012 SHA512 2701b512cb5d8bcaea7b8d7298f04834f5e7099259414c894239470a5a3edda9574c85a5b02d224b26b797a9426fc7115c12de8eff96453bb675b85d99bd9970
-EBUILD dash-2.16.0.ebuild 555 BLAKE2B 1c2935c6bcf84d9535bd61f81ffc559ec6a4799175302823c30f26e058931427275918e2dd8f56ab9f31b1dc123d37ea1ee685b391e165c82564f3cd97d48682 SHA512 4baa732fa0e1c33f9f42eb9a792af44998c3d9081c93eac742fadec64cc20388e562be4b32de45fdcef831c85c5e45e6d4eb4946a7e7adf3de073ac464e63ee0
+EBUILD dash-2.16.0.ebuild 561 BLAKE2B 6b6f0318611b3b57e47b16225e2e0998c3f3020a6aa4195e65cd5954ff01518c2b026fb181f22cd5131ffc42d39eabf48fb54bee1188ae51a5556c1d1f396ea2 SHA512 34266ac3d94e0ba59061f8c7ef9946a55449621baeef3a72293486a9f9e7575b40fc78ffd3d2f37893f2c824c4caa4e987f18245fac6e04c47a7ea2351afc8bd
 MISC metadata.xml 360 BLAKE2B e70caec7e3633788a79217f8d41bd69056ed620396e4d22ecd0d80ad82f7dbe2e9ac3872c55cd94682cd16960e682b1f648863373cc941559b40045612188f8c SHA512 8de7334410a02599aff54733234d7b3333c4a61cd2ffc846f3f69df3b43a53c510b2235100fab79274e0727393ecec24e051b42aa36b878d6b45130b5b2e3ff3
diff --git a/app-emacs/dash/dash-2.16.0.ebuild b/app-emacs/dash/dash-2.16.0.ebuild
index 6a7d7a15386b..7a300dc19a95 100644
--- a/app-emacs/dash/dash-2.16.0.ebuild
+++ b/app-emacs/dash/dash-2.16.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/magnars/dash.el/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="sys-apps/texinfo"
 
diff --git a/app-emacs/develock/Manifest b/app-emacs/develock/Manifest
index f64fd5135f92..d20d15940129 100644
--- a/app-emacs/develock/Manifest
+++ b/app-emacs/develock/Manifest
@@ -1,6 +1,4 @@
 AUX 50develock-gentoo.el 141 BLAKE2B 01c017ba62c65d76dec01e4af0462bfb4030ff70f1cb085077263a19d96ac464684c3fa667822bb2d908f233857c49bc7eb66cd4bd470114ac1fa6841880b98c SHA512 8d6c1e118e4489ac2dfabe344f77491707bf3b9fbbe5a96dcd0f91a363d67200cd764c560c2722e857fc116cb89b404da75015e2086870690305419fd07dc2f3
-DIST develock-0.45.el.gz 13627 BLAKE2B 8c67a46ae7eba961fd64b202128ca19da54251d1079bb4c9091c2b99a6dd6d3f42f1273c5d7ffd371911af3fb3b64e723f6a6d0bd432a1c243701d8ad793bf64 SHA512 e868efe9426ad6aed4c46bbbac3bc90c9207cd94367dedf7ac93710ae04d9f18348b10603c56d436dc1553be94f65b79615d5293578b9e7bb1a7b783d7a3f41e
 DIST develock-0.47.el.gz 14156 BLAKE2B a0749689fec9fc5b5fc480a1a27eea83f9ab57ac232c8aa1054a1ac23a25fa56cb9728db0bfccad141f562721852f7c4717c1f0432c0af53f44128a551ccea87 SHA512 8864416d67cb37b8535dbb2fecc336b13434b2284a27142d59ff6789ccf32515d12369082b0d481f2999e868db72de603f79998d408239c35f7c9aeed8ef82cb
-EBUILD develock-0.45.ebuild 503 BLAKE2B 2a858dbe5c9acb75ba808142b690cf530e42e9b95d1d1fc2e3aa53373b8c099757c5c99595701ffa25ff03c60babe06d9b4533e78feca004c6f6be55147d6ae8 SHA512 e01d26533631eab1c78f5f67118ed197c6d85430806cefcb61d87b8c69b4a885624255b141a42de694cd85d25742df8740c199d6f46e6a0bb2c6bfafe376f454
-EBUILD develock-0.47.ebuild 505 BLAKE2B 048fcc0ec5738566c0135f0770a1d7f5aa2f1fba3c3320f53604a7b6e6bd57b2684a6d6e0530c7dc50334d0f944a676adf10fe190f6a49825361e029510e3e29 SHA512 604350a8c50396fa4586427b9498689a0c72b50379f3d2961762ad1d1fb168904e5c89fb86b2fc16f3bf17d25def4beabdebf544394d29f5e9aa13a450fdbce9
+EBUILD develock-0.47.ebuild 501 BLAKE2B 18adb3a24cbf7576650513f1a735771f523bd8d77e99666de0c369716f812190a594e147ddc969a6df5b034aa276d7342f4d618c0bad54e9beb495261a0f9ea0 SHA512 4ca50fd64d66f7ddbf4683529dfcc5f550a77eb7a194cd8ef907e27dd456a31e10dc9062b3ce27f8f24cabf93c10b79d8f7ed71e411b36677016c65559fbbe36
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/develock/develock-0.45.ebuild b/app-emacs/develock/develock-0.45.ebuild
deleted file mode 100644
index ba0d360dd591..000000000000
--- a/app-emacs/develock/develock-0.45.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="An Emacs minor mode for highlighting broken formatting rules"
-HOMEPAGE="https://www.jpl.org/ftp/pub/elisp/
-	https://www.emacswiki.org/emacs/DevelockMode"
-# taken from http://www.jpl.org/ftp/pub/elisp/${PN}.el.gz
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-
-SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/develock/develock-0.47.ebuild b/app-emacs/develock/develock-0.47.ebuild
index c18c39943080..f2ac943d6c30 100644
--- a/app-emacs/develock/develock-0.47.ebuild
+++ b/app-emacs/develock/develock-0.47.ebuild
@@ -13,6 +13,6 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc sparc x86"
 
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/doctest-mode/Manifest b/app-emacs/doctest-mode/Manifest
index 5c1a117214c5..0f42a10e0f43 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 624 BLAKE2B 4337ffc9724d9ffdcec18eaaff7c12f7f2a5dbd362ac0f49d65a8e151d6ecd64b3ac62e6d907db9e91c9ee403f93a8cc12717ae6c1a901ee15daf5394c054b57 SHA512 c421b824245da84679dc48a69f2687c856d75184691d0ae199ab2d0abf5f29287bbb9ee245c3a23db33510b786acec6a4a4ed03a7a2548e546c0d950e1e40ed0
+EBUILD doctest-mode-0.4.ebuild 561 BLAKE2B 81607159b55c587befd60ff457f2cd718225560718a8bc5381f0b8b2448428004c5f61d9a482a24628ae8329de4082dfc941b4558ba55ca83851449b18f8faa4 SHA512 fe1f3a505fe25abedbf722817c2932ce41fc62ac49cdbecb7f255714d798f6c703bcc25f688fd6eb3d4cb017aeed4978015910e441e8a3e6bc48ad299a470652
 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 e5370dc7ea27..61bda5369fd0 100644
--- a/app-emacs/doctest-mode/doctest-mode-0.4.ebuild
+++ b/app-emacs/doctest-mode/doctest-mode-0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,9 +13,6 @@ LICENSE="HPND"
 SLOT="0"
 KEYWORDS="amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh x86"
 
-DEPEND="!<app-emacs/python-mode-5.1.0"
-RDEPEND="${DEPEND}"
-
 S="${WORKDIR}"
 SITEFILE="60${PN}-gentoo.el"
 
diff --git a/app-emacs/ebuild-mode/Manifest b/app-emacs/ebuild-mode/Manifest
index 0a59fdb9b442..a770a1196637 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 727 BLAKE2B 542625106996dbd3d0b6d6216f66af7bee85d2e23b9f759977a62a7c5ec117f2e436cea064fb36a6e88eba4ae1f306dc45376079e5cef513cf685b49038a186d SHA512 c64bf9cf2ff9fc7fa5407eb78117182ab176d88591a049edbed246f6e348a5fbd488f33d988ab80283afdb057c04f201353433d12b62312f25dd1d6231a9d0ea
+DIST ebuild-mode-1.48.tar.xz 34764 BLAKE2B cd54e8a1b65232538924aafd10f6dcadd457634313ccf08c97b841d0255f02496a0e3308a4d9cdcd5cbbc41f9f5c373e14641fa31202cfa369fd10f8562cf5da SHA512 d37d7951030877454416dca761c9775eadaa514f29bba8745f61c0f3a5ecb42675c230301286d5a8cce76d8ef7082f5db76151f69b35f6a999118c5e60a5f9c0
 EBUILD ebuild-mode-1.47.ebuild 726 BLAKE2B 1bf333e77ea78f7db89ea5a73221ba5f842beda79f7ad960e06b6e857b846375e97b4a9c20dd05a10c3d5f0e56d78286cd87da2a0732ab5bb1d9fef550936e23 SHA512 b0b685403508fe963f5af805a77f5d38d0d82df9156363b0bfcb8cf3c6f0d8a931567e7096bc111f0dd610b3da3a70be3b580c35731fcbc7153831fd8b6b3b2a
+EBUILD ebuild-mode-1.48.ebuild 736 BLAKE2B 1dd6bcc9f6ba1f972a0b2374863447e8e46a66c019e3fa654d38662564dd35633a19ade8333f77d6b9aa14da2b7915aeceecac9d1f93acbb28c7779f75ad5b65 SHA512 3c4ca27c2f9095c1dc9c3d9ee66b40995994e7f183376f0b9b6c59c6375bb4f8536da0d2f5eee8008b650c0eb3e4ba33c492c81fc0543c3e0d5bd8d83301ebfe
 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.48.ebuild
index f3b7d240a8ee..d3f4d4b8fc71 100644
--- a/app-emacs/ebuild-mode/ebuild-mode-1.46.ebuild
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.48.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 BDEPEND="sys-apps/texinfo"
 
diff --git a/app-emacs/emacs-common-gentoo/Manifest b/app-emacs/emacs-common-gentoo/Manifest
index 6ebc20749303..c2b5c2d618b7 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 2823 BLAKE2B d8236d8045be6055b712dd22e41f0fd5c7eab151deffdf9997145305cb2e66128fc32aeb30faa66d4ae7361314bb73fb5ff18affcf264f51f0e0749749b3cb21 SHA512 598640ca96fe2ed7b1957b5d7f7cb7166fc052f54c4d59ac49545db56088727797b0b5a202945913f508aa6e2330a3ff3a969009c7d51bade05c437ce2f1c9cd
+EBUILD emacs-common-gentoo-1.6-r3.ebuild 2816 BLAKE2B 9a778f0cc06fe0f49dd0835b0a5c8085fec20fa571964186414771d2909fad1cde839cd38a521ba41a578c83707808de0cbf0a6dbc7c9941459dc8c4b8497fc8 SHA512 ec30b282ac0594d1123242a04eb3714d860a04e693947c3ecc60bfc3e267992f51edd79b0f8947d3cc0c30a54afe4b4d8b2199cac73c34c709e2d63e76b71aa3
 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 de398952a5db..8cbf1b14e044 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
@@ -35,7 +35,7 @@ src_install() {
 
 	if use X; then
 		local i
-		domenu emacs.desktop emacsclient.desktop || die
+		domenu emacs.desktop emacsclient.desktop
 
 		pushd icons || die
 		newicon sink.png emacs-sink.png
diff --git a/app-emacs/emacs-w3m/Manifest b/app-emacs/emacs-w3m/Manifest
index b158e11a4309..d7589fe7d046 100644
--- a/app-emacs/emacs-w3m/Manifest
+++ b/app-emacs/emacs-w3m/Manifest
@@ -1,6 +1,6 @@
 AUX 70emacs-w3m-gentoo.el 96 BLAKE2B 90d452df120d37b1d19be08ed6e7b56edb588c95de6d124bdb8d25daa5c65fd8a19500e29e94a0936aa8efa2b51bae258e1431c6d1459d0d700e8d1dae0cbaca SHA512 7fd090a575e5b8f2df50bd751f301f5f4409dfd78eb45bb911c54a3cbfe76941a146630ea0e4089138c400caf45bb040f72e3ac335457061776e01e0aa3f5577
 DIST emacs-w3m-1.4.625_pre20180518.tar.xz 788404 BLAKE2B f621071c8657cab848789d359d492e5bee0fe401af48871fa54298571d87192de7186b1ea92fd3d64e6f1713fd12e5750b49b7e54c94e8d3b455d614ef0d0683 SHA512 f60317024f6dca23699510c21f185c162a5b3f0be551c681ce69b3b46e6fc7860e875fa6fc46a0bfafd8e5e6aaa9f1b29af0e0731685fbca2ce2b636eca7ad93
 DIST emacs-w3m-1.4.632_pre20181112.tar.xz 792664 BLAKE2B f60249a064cf9b63a46e0d9ae0d845d3877dd9ddfc1f7770609c68c9d9b60c67b9e461c399b83c5b01fbe94609914937fbf8177475274faa262d8fab0b4e6a19 SHA512 01ecb8a282484d164f5d630adac39784aec9f2e37975865f132be4b8b82d4be1e5667d903775c4adf0470109053b1b229f09472410a0ac7d1588e64c86c7b8f9
-EBUILD emacs-w3m-1.4.625_pre20180518.ebuild 1215 BLAKE2B 98cc7be2a22dab4a69444df06d37ece302e3b8211e80060c27a9ba0c425af7af5b53f9ce224bb3d3cd13be8995ec4f16ccf3717b50efac71199bbc8e55f7e8bf SHA512 9ec23005c602a2879d7ca26c7f44d67efa9663ee8d9d7c346aefd2b374166608bb6cef7d1d23d43c2ee295fc5420681ff63f74a6b8d0b007a83d9cc2c26cb3de
+EBUILD emacs-w3m-1.4.625_pre20180518.ebuild 1205 BLAKE2B 595cfb5798ce80846faf0a5031e23ec5a1b9a81f8fd140118cf7da624a86138e0e9a0962fadb837746eede075831da0d6f61c8c5afbcf522e613ddaa1bd494cb SHA512 d1aaacb3f5274249774407adc1718c4dae43c074d11dd8ac2c608c9d64d7773c370afdee253985885c16e822ce02bfb80b1389f0b33aee93379b1a6f91ca74ac
 EBUILD emacs-w3m-1.4.632_pre20181112.ebuild 1307 BLAKE2B 1f3fd16f58e2621e39dec449b35e7587730a3f23cdc7e59d676c4a94b961d07f7c064946098dc85dd7bf5451a7721e8ee70fac93452f8d08490f521be5afb4f6 SHA512 a18bee4ffe4dc6bb7afa26f27cb146aa484f32cc47ab473d0ca6469dedef3d5a3d7b191a4e847b924eeb33ab2c95a68b423a20e0ebbb209fe52249a0416e965f
 MISC metadata.xml 360 BLAKE2B 35118ae1bf39fcfa2171f3637f0bac4b96f9727800a5ecd6057fc94185bfde69b496f2eed3ecbfb177b2a797ca23868f455889bfe86e978775ee09ce89534dcd SHA512 bce2ca2010fac3a4afadee07e58978abeba393e2e21642059c2d9baabd51ae9301915f41a9cc028a43d47f0dca878fdfd365585662b1dd1db0278e8473e9cd5c
diff --git a/app-emacs/emacs-w3m/emacs-w3m-1.4.625_pre20180518.ebuild b/app-emacs/emacs-w3m/emacs-w3m-1.4.625_pre20180518.ebuild
index cfd2bfcc7f22..5541f1eb3266 100644
--- a/app-emacs/emacs-w3m/emacs-w3m-1.4.625_pre20180518.ebuild
+++ b/app-emacs/emacs-w3m/emacs-w3m-1.4.625_pre20180518.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
@@ -41,7 +41,7 @@ src_install() {
 		ICONDIR="${ED}${SITEETC}/${PN}" \
 		install-en $(use l10n_ja && echo install-ja) install-icons
 
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	dodoc ChangeLog* NEWS README
 	use l10n_ja && dodoc BUGS.ja NEWS.ja README.ja
 
diff --git a/app-emacs/eselect-mode/Manifest b/app-emacs/eselect-mode/Manifest
index 926fd3c4484f..701eeae53513 100644
--- a/app-emacs/eselect-mode/Manifest
+++ b/app-emacs/eselect-mode/Manifest
@@ -1,7 +1,9 @@
 AUX 50eselect-mode-gentoo.el 178 BLAKE2B 50fea27e7add6d31f37801593430154636bb58ac6e3f7cc44c68a16d49c9156cf37285778a38bf97a1f4805a22d6d5cf9d597acdcdedfd77c62a5825a0d1d88f SHA512 200da398adf72241112bcda74b432a8a313cf29018c9f6fbdf6021674b23a201ada6ba884d4c9c3a4ee4c042d6c8fc7c3ba59702c8ddb6ea20b652f9ded9d32f
 DIST eselect-1.4.14.tar.xz 177492 BLAKE2B 236ddb09231283a153c20be779d012979a25d42a7043c75af866e777731761406d92896bfef399c3bc63e529af4e36cf538801302dc4bb719f065d6bab8ad9e4 SHA512 b17fb63039577f20515056fae1b0f7e86fa2d96f38a5eec22e637cee0b25f4d68087ef8a5bd4043893db5be66ea201bc8ae6437bb049d208b81e76a57612d658
 DIST eselect-1.4.15.tar.xz 178996 BLAKE2B 4354d975c8af2e1de0f0c6efe2badc92584e947f9b73c05aac144caf8f9d74c850d366c7c225112322a504262b5f285f6e2e8d32223f1b2d4bac87db740a148c SHA512 ceb55fecc2bf70e816679af9b20653b29aa9ce24ca2d4cd0c6e02ab214689459bc2ccd5b3968ac49249b8fb6613c6055e7e76598b86c6a114a9abf847c4a2b58
+DIST eselect-1.4.16.tar.xz 178660 BLAKE2B dae97ee324cb67983c5395b5dc54c4b84d2da43f6a0c5c8ab81ff402ab211e9d1f1d3fe5c174b130ac1e11d3dd19e3812056274145415ee029e649cda880cd95 SHA512 264fb6122f5f7c9e73bb2250a94c3c0377e5263e2e5ae653ed58e08ebf6ed1b4aa165ae5c1d70b0156081c4db5672d1ec9d379782919d5b40a2f3e862378ce62
 EBUILD eselect-mode-1.4.14.ebuild 547 BLAKE2B 82ffa2d112f5d10f5f34ff70f3b3a2b566acc5c8ee7e2f022d4a080857835cb64bd0e72daa1fa3adc5f7cc45144dd4c24e5fc2cf197c728507f0b7f0e59083c9 SHA512 f8e887efac69063badc5ee6170c13d140deed17828bbcae32402ddd96bda3443af73f5abc2df8303e2e02faa6ee589f174db225b1d068326c25101906cc915f6
 EBUILD eselect-mode-1.4.15.ebuild 550 BLAKE2B 793da8b63c95e91bcd1490f74f1ed0945a510970b9e69dcdcb89604927e8e2e9ca9fa9c4c4618acf5066872f176c3cc34163e582443b0048eb553fb0cde7cc98 SHA512 ba90b604867e5a4ff49cc60a1016f76528af2068fb167191df29f1cdcec66bd544a12a2ca28330f826c1afcd3fc8bbd33439b47c42340683cb65eed94cfb4389
+EBUILD eselect-mode-1.4.16.ebuild 560 BLAKE2B cd1dcda2f1af6632d9347ef5092ad1e1885290904255155c96122a5937bacc44e6742a05dc59481ba08dacceeb9ae44795a20d1e389b8690c4d5e96ef0bdfe79 SHA512 ea79e99c72b48aaa1d7387b7d18dd9665becd3839bfefd0a123a5b737c14c4e7e1b43766dedff992ef278ddd7c9df09762db7ea7f165c596667982e94efcb318
 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.16.ebuild b/app-emacs/eselect-mode/eselect-mode-1.4.16.ebuild
new file mode 100644
index 000000000000..aff09f42da95
--- /dev/null
+++ b/app-emacs/eselect-mode/eselect-mode-1.4.16.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+MY_P="eselect-${PV}"
+DESCRIPTION="Emacs major mode for editing eselect files"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Eselect"
+SRC_URI="https://dev.gentoo.org/~ulm/eselect/${MY_P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+S="${WORKDIR}/${MY_P}/misc"
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/ghc-mod/Manifest b/app-emacs/ghc-mod/Manifest
index 88bc15842fa2..b56c5c85d82b 100644
--- a/app-emacs/ghc-mod/Manifest
+++ b/app-emacs/ghc-mod/Manifest
@@ -3,7 +3,7 @@ AUX ghc-mod-5.6.0.0-gentoo.patch 134 BLAKE2B 51f5561d87628191bc070c3f4ce57d19bc0
 DIST ghc-mod-5.4.0.0.tar.gz 132546 BLAKE2B 6670df6b271527ee2a69c74b0522b94e78e799b62d260ca744a382312c815e904d516345c6258be0d9aa82f91866126b95cc4682bc1925616078ffef1a559905 SHA512 fabcc5ce2fb9e8790043faae2d42b3714fab96da1409d7f1c4736f332c6b74c76724dce253456fd787526d125cfaa1fe48c4725a0da16aabb35d5edf560f2415
 DIST ghc-mod-5.5.0.0.tar.gz 150774 BLAKE2B 87d2be174200f05da0f38a2947c4404c0b25ce77a03d3b456f8cde769e978bbe6fad6e2c04d1af61e05d61fb941c139c297baaeb4835c02390516a88bebbf539 SHA512 006f292394fc24766a2ae2c778635697a63e1b48ef96052af66dc35d1ef30eb600760cd2a517011a7a2b027a0c725ceb3b5e37cfe157741ba97f19068f1264e8
 DIST ghc-mod-5.7.0.0.tar.gz 146797 BLAKE2B b5d684dbb505001bfc061473cd62d00491bfe8ca5710cb69c72cb2544838a9a3b7d88d414be8123f9edf82cf96773f49439912a98efec843c167334d31caeaf8 SHA512 843cd0546c0a0cdf30dd9cde5e9148dabf391648bae6d7f2852c83a4cd5b8329f30d0cc578ba6afda02e8885b2ed63c7def4885e0dbaac199d311e476a0cc6e3
-EBUILD ghc-mod-5.4.0.0.ebuild 2597 BLAKE2B 5dc33e03d477ece69a132c8db97b50df8c15d66823688333b6e1eb96424b816379366450487e0d4429fb75121eacb5a6ea3d568972eca2195f36028fb98a7ac1 SHA512 b790435cc9a7ff108ece4477f9aeaffb6278770f4b899b37dfdb7ae151793890eb41c8a35ce4fbd9dd04b3f2f7df35bbea3ad12c60501e06542b7dac44ae5d13
-EBUILD ghc-mod-5.5.0.0-r1.ebuild 3055 BLAKE2B 74545d2b874c0507764c7279f58a4f28dd4b3746c47b1046dd946c09be3fb8d1331d6cc887d170a5f7e17507c18510cb67ec1babdadc9857d704125dbef8f2c3 SHA512 7789a516984fe3ea1cfee73c2641d80a308adf18fb03e646c5abca012bb232894f90d4b07106aef7a175f2c17653d7001d44e5d2dfb496700b56fff37a140db7
-EBUILD ghc-mod-5.7.0.0.ebuild 3364 BLAKE2B c22266e2899332e21c79f5a5193dcc2d9780ebeedea3daaaba6ced3d392016490eee99b4491a47bc7a3ea0d795edd9393b971d244a932b63f2827eb99cc7c18d SHA512 8ce1d801df0bd47cbaced0591de8654c75d0817868505a086964ed847bb12b87e6b430cf740badd6b51a1937130dc3c4fa8f9596f3687faf5f6f343633ba6734
+EBUILD ghc-mod-5.4.0.0.ebuild 2590 BLAKE2B 7d6219dda7c1c916731d2e463a0fd99b76cf2926c1749f4ce7b5582a82e42eb55e20183643c1293a0a5818a0518b8e4a9c630765db6ed7e3b828620908f61da5 SHA512 5aff2be5fe64e966e03eadf56bb686ebace9c34d9ba970fb537bcef7d2c1515062687c360afb4759fb4de5162fca75b9d3e9a97553ae4cff49fa4a8d64f4e711
+EBUILD ghc-mod-5.5.0.0-r1.ebuild 3048 BLAKE2B 2cd4296b4876b139658d93d6aa1b3bc04bd8202b7ab5c1094ce96139bfe020e0b99c87f5eb15da1cfc99cb4f4d7ce95f42e4cd938b919bcfc34154a901a9ab3a SHA512 690d346427c5d726d729b43fefc71aa78627c58831b2fe95211cf1c37ac57dd0a33b72e311c7b7068250c3721534ba4c7ad59dcef2a6c3ecad2f8b686743ee28
+EBUILD ghc-mod-5.7.0.0.ebuild 3357 BLAKE2B be88976eaf6f72539545580a6875e0389a83c33cd8ae64e17b2ec19d938aa88e669f873d9e12eb9c641abc188d015d36ac2af74ec356746dfe62fe19afe56c31 SHA512 cf5638b72cccdf19a3ac391bd658b37c2f4e0b09eab9904c6363fd4826a2f32cd1027137158946d1d92ffa5573d0b0132c531d8e43125c7c0f109f3cb42c8a17
 MISC metadata.xml 726 BLAKE2B b31275f576fce5947f0ead75fa4433f170ebab7e8d12ab8365f544d4be4f923829940fdfad6095a2c02da7865a442baba76c5a169b4593eb65b3f76033329015 SHA512 7249be2424dad8767b67a275fcbd81c3435e4c7b274cef3c0ee0c64cc379877506420d2fad335d2f59f3c25c8c5e2ee9719a12581826b141a0df97556d33bc9e
diff --git a/app-emacs/ghc-mod/ghc-mod-5.4.0.0.ebuild b/app-emacs/ghc-mod/ghc-mod-5.4.0.0.ebuild
index 9803686ef359..a54c351b2c4e 100644
--- a/app-emacs/ghc-mod/ghc-mod-5.4.0.0.ebuild
+++ b/app-emacs/ghc-mod/ghc-mod-5.4.0.0.ebuild
@@ -60,7 +60,7 @@ src_compile() {
 	haskell-cabal_src_compile
 	if use emacs ; then
 		pushd elisp
-		elisp-compile *.el || die
+		elisp-compile *.el
 		popd
 	fi
 }
diff --git a/app-emacs/ghc-mod/ghc-mod-5.5.0.0-r1.ebuild b/app-emacs/ghc-mod/ghc-mod-5.5.0.0-r1.ebuild
index b67184547ee0..122d5f8ea2cd 100644
--- a/app-emacs/ghc-mod/ghc-mod-5.5.0.0-r1.ebuild
+++ b/app-emacs/ghc-mod/ghc-mod-5.5.0.0-r1.ebuild
@@ -60,7 +60,7 @@ src_compile() {
 	haskell-cabal_src_compile
 	if use emacs ; then
 		pushd elisp
-		elisp-compile *.el || die
+		elisp-compile *.el
 		popd
 	fi
 }
diff --git a/app-emacs/ghc-mod/ghc-mod-5.7.0.0.ebuild b/app-emacs/ghc-mod/ghc-mod-5.7.0.0.ebuild
index fb6256d2db11..f054faba6519 100644
--- a/app-emacs/ghc-mod/ghc-mod-5.7.0.0.ebuild
+++ b/app-emacs/ghc-mod/ghc-mod-5.7.0.0.ebuild
@@ -55,7 +55,7 @@ src_compile() {
 	haskell-cabal_src_compile
 	if use emacs ; then
 		pushd elisp
-		elisp-compile *.el || die
+		elisp-compile *.el
 		popd
 	fi
 }
diff --git a/app-emacs/ghub/Manifest b/app-emacs/ghub/Manifest
index 9cdcd39fef03..adf89b808acc 100644
--- a/app-emacs/ghub/Manifest
+++ b/app-emacs/ghub/Manifest
@@ -1,8 +1,6 @@
 AUX 50ghub-gentoo.el 124 BLAKE2B 84170098bd01bb9f165eaf06f7cb21c56d2caaf964d2658520311757845d053072a7704fcb90cce2a2dfbd2385f357d2e7569061ebe0ca41b575efd752d29fd8 SHA512 596c7e75560f3734b57525bdfb42f3985fb49ab4d86637231361f6673d2431c0a6e73f91f58f003f9027f1143b9be3f4330ef2e1ff6c627ca6057256f4afbfca
 DIST ghub-2.0.1.tar.gz 50014 BLAKE2B 449c12b4a75b8de75249fa8f3fd624551d36ae745325fe62b20d8a68a6bad565a308e8c9be6d742c24fff5238fe2cd56fda9d8353465dec28e0f42b2ee10dc77 SHA512 d27b3f150b1b871dd31746ee7396b7bea544a6209f73039fa0ac6b670e3fcdbddc2f888cfa3dfe89b64325d208f5fe18ad90869e012758dea54878d0dcc82528
-DIST ghub-3.0.0.tar.gz 62897 BLAKE2B 78962809f7bfd1236379f4e5520717378353f5c88d81a06b2526b6e11ccdd70d2411b38c81dc40a660aef20c116d277d4a72a31943a2aabca71ce3bd7672b844 SHA512 32051672c8a0fb907655c137b61efa63c9947e8216b3ee7c520ba606211ce361446d57996ea3949dac16456ea9431de1cdd1339f6b7a4d092bfcecb7acc0b893
 DIST ghub-3.2.0.tar.gz 65346 BLAKE2B c3aa5195a574de870fcd757bf4efb4aaca6fd83fc06ede375e76915972686fe50fc8a7fa2ebf6f0e2b8f98b60857d36a7f99997c255dee30db49505ca3e90a30 SHA512 dc5a2807d17c2bf65e55f33ad2d00b459acb0e0033caacd5ac8ab9b15deae607c2c25d83c61626a62f50a09d45dbeb91c66299d725b8c3663a1767fd30c7c1c6
 EBUILD ghub-2.0.1.ebuild 486 BLAKE2B 697286b9f7ae81e6f466208b636c339b718ca7e907350a0c76f9c87110632c20081f1dae994ccd31883d83c91bec1467a7d90130efb7fe09a2b71627e6304145 SHA512 fc9168ee1891f953bd5cd90c32e12f7a1146b53aec7f5c2e7ba32b21d44616aabfc8f075e7089575c7f60a4a88d84d04b112db470a3ad3d030cb6a41c7dbc66d
-EBUILD ghub-3.0.0.ebuild 582 BLAKE2B 86941a0fc4af26d2160e53adb1d51e3b5482c7ca89e3e7c2e80788640a5001d11069341a6503e176f69bc39513af2cc117955fd683856de07fa92c9d26c3d966 SHA512 a78393de917aa63fffda95841d23e276a4fe7a241a1e56b210948546bdb35c0ac7f723ae08abfb7edcf49f81f8768cae43c4a61b400d432c662924f9483fc52d
-EBUILD ghub-3.2.0.ebuild 596 BLAKE2B 903d6b457130f8b0794b94ec0ec4c2ed68dd1912aab0ae74092a39ff00b56440ba0d37a18443048c764296524e548830338300ef46a866400ffc3382043b2891 SHA512 4d340ba635ec97aabd9264eb2ebf9b9b7f1959f34c79504a796ddd38e5ae695d04d896bdcaeeaec9013a44e0a3277f7dc0def84a6d6ddcc50b40660144b8e7e5
+EBUILD ghub-3.2.0.ebuild 594 BLAKE2B 525b954b0ed721868b8c103904d51af3cc58dd79be779369e51e583902325b6941d76624c51818f3f1eaee72665e8a00aad2c190276c4efeae5fa328cefedf94 SHA512 89ab29b8e2b87ca07d4012ed4be91a6e73ac6a01ee42d4a66bddeb86b8a5568e43f273febac5c585e9259ce7060da72ad3569ee3a38094ce6d7f92b290208310
 MISC metadata.xml 1296 BLAKE2B b58f88e8262157cef344eb119a5f3c265105c1f90ccfd40192a197b19ab911e086f00e259e2de5f14d8f02918e5e5516568cd95c4a0a2719dd3c7a235c52d38a SHA512 8e9fc9e9112bbc0d069978583e625909c12e3ea03d747fa3189c34ec35113d1d688fee50d0c0983c0eaef5eb884947132b5317d11b89c8f994efec4fef5abe33
diff --git a/app-emacs/ghub/ghub-3.0.0.ebuild b/app-emacs/ghub/ghub-3.0.0.ebuild
deleted file mode 100644
index 8b1abfbebebd..000000000000
--- a/app-emacs/ghub/ghub-3.0.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-NEED_EMACS=25
-
-inherit elisp
-
-DESCRIPTION="Minuscule client library for the Git forge APIs"
-HOMEPAGE="https://magit.vc/manual/ghub"
-SRC_URI="https://github.com/magit/ghub/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-SITEFILE="50${PN}-gentoo.el"
-ELISP_TEXINFO="*.texi"
-DOCS="README.md"
-
-RDEPEND="
-	>=app-emacs/dash-2.14.1
-	>=app-emacs/graphql-0.1.1
-	>=app-emacs/treepy-0.0.1
-"
-DEPEND="sys-apps/texinfo"
diff --git a/app-emacs/ghub/ghub-3.2.0.ebuild b/app-emacs/ghub/ghub-3.2.0.ebuild
index 274ca19590d2..8099d9991c48 100644
--- a/app-emacs/ghub/ghub-3.2.0.ebuild
+++ b/app-emacs/ghub/ghub-3.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/magit/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 SITEFILE="50${PN}-gentoo.el"
 ELISP_TEXINFO="*.texi"
diff --git a/app-emacs/gnuserv/Manifest b/app-emacs/gnuserv/Manifest
index 6e3b0f6d6815..b311e80277c5 100644
--- a/app-emacs/gnuserv/Manifest
+++ b/app-emacs/gnuserv/Manifest
@@ -3,5 +3,5 @@ AUX gnuclient.desktop 608 BLAKE2B b50695688d76ec34dae2fb68b4865769ab531a2a5add76
 AUX gnuserv-3.12.8-backquotes.patch 509 BLAKE2B 4770c01e4650301d1922b2c87e5cd723feb016fb5d5224aec715761a81b4f66614c7a535101764432a80c26f8e9c13d2fc3cbd1ab8122b5e608d3aeea3de73b3 SHA512 9ccdf8b4fe0ce45528ecec67782785b5d1ec82e5fd14d444b3f091d9c76add8052de3384e0b54fff479f4bc5729966ce520e62343159a7e251fce1e3841b5229
 AUX gnuserv-3.12.8-process-query.patch 554 BLAKE2B 94f09a1e86ea787a05e51ed5e2742174067b7cca0fbe2fe83619b6f829048172a9e46f70f8e2c22f2787f43390730f07520553e7d659ccfd451869b1a074d707 SHA512 bc01b928003cf5050934972eeb7830b14957693c1484b061dbcf1809176388b75297b6884b7f5c963e59d8ec4a7cc4d9bf9ec265b414574a7de6bb5875f6b607
 DIST gnuserv-3.12.8.tar.gz 124070 BLAKE2B 7531d85f6cd1873f75499c37230907f96ac484e1d58a4a3459f44d3bfaa6a6124d44f99a7c27d1fa3deb16b1cc29d08313b911cdc1782a1c5b24bd702ef4c9ba SHA512 e8f387a554c22fb2eb166d388085b9d68a0d865ae56ab71f3ffe09ff46bef04a4ba5b05ca51a1110e1dff67ae2cd6acc8b18a0fb9df9299dbbf4a001f0924f31
-EBUILD gnuserv-3.12.8-r5.ebuild 1636 BLAKE2B 3d14e840ef368d2b842eec808804c962ae223f8402bf8d12a4dce01207233d5a26186276fe3800201c702f489d73792f05faa238e8b66436bc75fde45559910f SHA512 ec530a1a46d741788e2c5f87120285fa7612aaac03e96e0fa3983c3ea2d6b5ef1d7e49ce99fbef4886e9ef65b7c0ee50c6acd8fd88a291c931a675b6ebaab64c
+EBUILD gnuserv-3.12.8-r5.ebuild 1617 BLAKE2B d6f7e8d3a4d5c55e2a59e91c085dc5dfb4f1d497ada226f19ba7ead1da7f72101cab4391d8be609171398de5610ce3d6b60328defaadfd3638d8b2ef874cdef1 SHA512 99530df3f8f9936b5e3494e5db3a4ccd83c41d6fd3afa7767934964d94ab899f1d5af429c4942a8c37ab9f6a941b8d19d3c99da920e80daeafcc8a43f7608b76
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/gnuserv/gnuserv-3.12.8-r5.ebuild b/app-emacs/gnuserv/gnuserv-3.12.8-r5.ebuild
index 94972c40cfd3..142d9eeeeaf7 100644
--- a/app-emacs/gnuserv/gnuserv-3.12.8-r5.ebuild
+++ b/app-emacs/gnuserv/gnuserv-3.12.8-r5.ebuild
@@ -53,9 +53,7 @@ src_install() {
 	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	dodoc ChangeLog README README.orig
 
-	if use X; then
-		domenu "${FILESDIR}"/gnuclient.desktop || die
-	fi
+	use X && domenu "${FILESDIR}"/gnuclient.desktop
 }
 
 pkg_postinst() {
diff --git a/app-emacs/graphql/Manifest b/app-emacs/graphql/Manifest
index 44b780d4af95..ea389cbddf8d 100644
--- a/app-emacs/graphql/Manifest
+++ b/app-emacs/graphql/Manifest
@@ -1,4 +1,4 @@
 AUX 50graphql-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
 DIST graphql-0.1.1.tar.gz 6021 BLAKE2B 62755fda880042e00942acc6dbf98219521c92d052eeb0c584e8bb83ae8fdcea46185270f5dff8c89762d11b409e31b42d4ae62ab6831b04437ac0de517f442e SHA512 53f4c8b70be07f38b3554c4488a98ccdb956a68585955c7afd9df52d9d39cfaf7cc0efcadae1f42099495b8729851d089cd03d4570ed2a91a3354dd19f12d5bb
-EBUILD graphql-0.1.1.ebuild 614 BLAKE2B 22128ed5fda8b6ca310fb408815234d9ba7bb9d7b60bc26bc3b049b4d85d1400bfb4862a31675d91af4148abf90280f5a7304d6fbde5584634e7aa339dab2bf4 SHA512 e32267bfce41965e8cb3c43a147980a55547330b5e9ffe70388f03598e9d56d392160383a5077a2550487356dedc0d09088a5407b5c4af82517b1208dbce5bae
+EBUILD graphql-0.1.1.ebuild 612 BLAKE2B 1800f3570462602ea3f4d6092b0b7d6f2f68ed3df9c9c008cdb6e585e3006e01489702fb171d770514f7fc223a00b860d8f46a8ac8ce8ea34515b80a02f942c9 SHA512 186dc499b4c7aa6bb0cf147fbd86818eea049c04ca3baace42ea02ca9c35c6acc7fd8fc3ba3585bf17eea8ce59117cff09502f91e637363467a5f189669c9bc9
 MISC metadata.xml 550 BLAKE2B 267d363cc3676b0f8d1dca5703f6c7a8cfaebb1c6b714a2bebd1806e9b28b3a28f37fac15a1907d64fa9c6bc9813c5995f7591e965f3514963266de1a8c34f7e SHA512 534f483eead85b46f513cab779d6f2e0f4fef965de9e81f82735af4ab5d7c7c7db9d08411dd4ac2590031332b47742bd8d959d2ca3a561bc0131b23ba770ab39
diff --git a/app-emacs/graphql/graphql-0.1.1.ebuild b/app-emacs/graphql/graphql-0.1.1.ebuild
index 9ced070552ac..f559dbc5cc9d 100644
--- a/app-emacs/graphql/graphql-0.1.1.ebuild
+++ b/app-emacs/graphql/graphql-0.1.1.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,7 +13,7 @@ S="${WORKDIR}/${PN}.el-${PV}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 SITEFILE="50${PN}-gentoo.el"
 DOCS="README.md"
diff --git a/app-emacs/howm/Manifest b/app-emacs/howm/Manifest
index deb46187c986..b1be3646940f 100644
--- a/app-emacs/howm/Manifest
+++ b/app-emacs/howm/Manifest
@@ -1,6 +1,4 @@
 AUX 50howm-gentoo.el 73 BLAKE2B fe99991f69e8aa4c515aa458980b82fcba96f2dcc29d213b662c5d81231aa85dc288b3135dc375a099a57344646a3a9a0c0ad0eb57fec4f78f8ec0d1ddc1ce60 SHA512 575a4638fa232ced8b377e30bd405dd78a8d10194cb38f40041ff30187482cec2cecf94c8f9da95031848e6c0379a2d845ed7b9eb159b63ed0a0737afa627a82
-DIST howm-1.4.3.tar.gz 552747 BLAKE2B 26ddf709fcbcefb962a3cf447c1ccaef61b2407cb875be49a7a207159db5c2425fff953859c2c77ec36250e73d9da17647667d2e0a4448ed0dc40bb25ded0635 SHA512 da6eec498545dced3bad3c6968bb31a24b01b85220dd80c6e1ee312a0cf1a0b883dc77744f5052261e4bf0d536da057fbe05040fbb429b61a8580330750ce189
 DIST howm-1.4.5.tar.gz 565221 BLAKE2B a28e98e9b955c6172c7b9e51d8f157e22e87846cb2a2955d956f434c2a36fad7e0692c951ef3d37f57363d500d118c2eeaad55276656a8e543b72b8276317fa4 SHA512 b448bf8caeaf21bf1980862ed12541bd793369494a3e321bc5b77bb99ef63cc5ed2f70c54eaa60b427489e9b3fa9b0037d5cbe06449f87af924f245b7f8f2615
-EBUILD howm-1.4.3.ebuild 588 BLAKE2B fd5660cbfce9cbb9e2b3dc6f02caa61b8cc5d2547667f9894792380b021bbcc223fe5544a61d88e3411a85cb6893c6c60f74b183239123b04fe0fb27f1840a6c SHA512 19e8d992766b8a6b821d0787bc3a6f9f939d3d63a9d401e30b7507f3c32123a1c9165ccaeab471a35b5b258d349ab4d59516da8b1d7293e03901f596580b3728
-EBUILD howm-1.4.5.ebuild 589 BLAKE2B e8b7e0aa7f637daecac1eb2f47886aec8ca821e035d29d7b9018107da4bcb7838203638bddc4a43abc1a966be20ff5b0e624e9302ae1469fa0a2b513d9da686d SHA512 ee8f12b8fe05198a36f13f88f75f20b45c6927c9964d18654a28c8026467b43d4f58354bfdb55b692b8c7a65a82b2172452a64b0e1b744241801b27c426276e0
+EBUILD howm-1.4.5.ebuild 586 BLAKE2B 6f328010f39e208a8463f1a0e72ccbc8505b4bd6e1bda58607b3198bddfa0d643f85a5c46971ecdb0891aaaa36c65dba2ed146112796b989070aceed623fda51 SHA512 40f755ba685936fa2cc210bd5e5b8fbc1aad7c6677f585f847a3125fe36bc2a74f70d13d5c423553bf40840dc2b318f09fcb3f95742a20a7aedb6ecdac36c9fd
 MISC metadata.xml 357 BLAKE2B cdcdb822544ef99c142c343a3a7b68b825bf32fa45ec34016b2cbc6736a83ad925cabcae1a73e7a87ed5ab2c8704db7a0446d8b97bea533083d5f0f88482cb65 SHA512 1fff5ee37f3d2bf46732a5f23c06db0267f7f38357602f5268c29fb840b9450b380057993cdb5e0c540cef9d4c0e3e6e8a5c0b618f02d2493d92b0f44aebba93
diff --git a/app-emacs/howm/howm-1.4.3.ebuild b/app-emacs/howm/howm-1.4.3.ebuild
deleted file mode 100644
index 345562c1563a..000000000000
--- a/app-emacs/howm/howm-1.4.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp
-
-DESCRIPTION="Note-taking tool on Emacs"
-HOMEPAGE="http://howm.sourceforge.jp/"
-SRC_URI="http://howm.sourceforge.jp/a/${P}.tar.gz"
-
-LICENSE="GPL-1+ GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_configure() {
-	default
-}
-
-src_compile() {
-	emake -j1 </dev/null
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install </dev/null
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	dodoc ChangeLog
-}
diff --git a/app-emacs/howm/howm-1.4.5.ebuild b/app-emacs/howm/howm-1.4.5.ebuild
index 389c61d210e3..ee09504fcabd 100644
--- a/app-emacs/howm/howm-1.4.5.ebuild
+++ b/app-emacs/howm/howm-1.4.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://howm.sourceforge.jp/a/${P}.tar.gz"
 
 LICENSE="GPL-1+ GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 SITEFILE="50${PN}-gentoo.el"
 
diff --git a/app-emacs/initsplit/Manifest b/app-emacs/initsplit/Manifest
index 2c02b07ec7ea..7d81d0c7c0f1 100644
--- a/app-emacs/initsplit/Manifest
+++ b/app-emacs/initsplit/Manifest
@@ -1,6 +1,4 @@
 AUX 50initsplit-gentoo.el 91 BLAKE2B 7948d846c2baf3d9b7ef84ebce76ff2088545a1a7452bee7f80316a72fda6551a99108b07e650332e504bd457dbe144212f9e138f32322ebde24e86d9794d093 SHA512 531d0f480c3787453b182be3b9fe145fffd9752155b2c26df3fdf0b497cd058f5978687df53e43046c1f44f4908679783756377998f49dc407a6e18956bc34b1
-DIST initsplit-1.7_pre20140203.el.xz 4792 BLAKE2B eb853870e9d159129e22e48dd5704b83fe8877933ab68f75127e4c82000b7a2a3b87ccd779f16f2ed2b0407ed6574694e42310fd6195152adb099bfd5c592187 SHA512 f2c894bb9d0359b5e95760541feb83f465950de732266059b9498b7ee7361ebb843e0d900fec92fa5e9c37547ea160836b9fc24f64c56083e3ea4416b4b52e50
 DIST initsplit-1.8_pre20160919.tar.gz 5630 BLAKE2B 6260108c244c1e817da5d3c0414939cb5b1699832d00f606a0c983997b4e6adb7daf4a9e1cc9d66254fe9a324523ceb70c43f0919ac2dd216bac7daa4b80cb43 SHA512 56f9d281ba227834f3e527b9ca48d57ffb06f3664ca2f7e1bd1d60a0bd996229ffe7cfd2a05b0530ad67328b4ba25822f39162f0ff9582bd54c8afd2981f750d
-EBUILD initsplit-1.7_pre20140203.ebuild 752 BLAKE2B 66ad22ef605d5be57f68ee0a88cc84c238391b2290fda63d4260646708b5f349fd50d72e1d3ace914764c1c8419d5ac993444db775e792e1a9b7728abf286048 SHA512 36b7489e6f7e71eff22dfcd55776d1fda82bae3acbcd2cf2d7a3b01d51c4c6b81da5bad31ee3dc52485543569eccb075a9a93d321197b3d588d67666892cfd5c
-EBUILD initsplit-1.8_pre20160919.ebuild 813 BLAKE2B eed61b559d03b6c08f987e49679df8c1c8a2726e81091bc10232bb2ac608bd41e2a6968218d8bc9175f54cb22f28b8941130c302f3ee35fedb85cac6b30ce1c8 SHA512 d6427a03aff01257ae8b03e65d4aa5e8fa3cd391df46abd70a5658a352c9a757a38fec90ef5ce9c810faa1ca0f9109e320e67956b61d807504c2ca2f4bccee61
+EBUILD initsplit-1.8_pre20160919.ebuild 811 BLAKE2B 429c29828ed5aacd78f3c06d6c73a2536827c132ea97f7d035f7d85bd2a7ea25d6fe9f0c7d53a1c0774c298f553593bd0bcb57d661ae13103227080a513689f9 SHA512 9ebff0758d99c628f286df2d6fe54196cadb31618c7a2e4790c36f58c6fbcdc00a540b6295fb412aa84ecc02ffb194e68227b9c020cd425d11d6e7936e437028
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/initsplit/initsplit-1.7_pre20140203.ebuild b/app-emacs/initsplit/initsplit-1.7_pre20140203.ebuild
deleted file mode 100644
index 9638e25e032e..000000000000
--- a/app-emacs/initsplit/initsplit-1.7_pre20140203.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit readme.gentoo elisp
-
-DESCRIPTION="Split customizations into different files"
-HOMEPAGE="https://www.emacswiki.org/emacs/InitSplit"
-# taken from https://github.com/dabrahams/${PN}
-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"
-DOC_CONTENTS="Initsplit is not enabled as a site default. Add the following
-	line to your ~/.emacs file to enable configuration file splitting:
-	\n\t(load \"initsplit\")
-	\n\nIf you want configuration files byte-compiled, also add this line:
-	\n\t(add-hook 'after-save-hook 'initsplit-byte-compile-files t)"
diff --git a/app-emacs/initsplit/initsplit-1.8_pre20160919.ebuild b/app-emacs/initsplit/initsplit-1.8_pre20160919.ebuild
index 419b7d5446ff..0c67e6cb11dc 100644
--- a/app-emacs/initsplit/initsplit-1.8_pre20160919.ebuild
+++ b/app-emacs/initsplit/initsplit-1.8_pre20160919.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/dabrahams/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 S="${WORKDIR}/${PN}-${COMMIT}"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/jde/Manifest b/app-emacs/jde/Manifest
index 0e58d625bcbb..cea345ffe130 100644
--- a/app-emacs/jde/Manifest
+++ b/app-emacs/jde/Manifest
@@ -3,5 +3,5 @@ AUX jde-2.4.0.1-classpath-gentoo.patch 2291 BLAKE2B 6eed82127107933d274218e72f05
 AUX jde-2.4.0.1-fix-paths-gentoo.patch 7175 BLAKE2B ee0e51e50afb1bcd86432f6546a0b2105a987b3b8a616dd88a21817667f362eb554bf6f6af41f3b0efe409654e4a3a6ea85f4f753e7c668081fad79228ce73f7 SHA512 179e6bd8cc0165ee1f0d3383aec76bdb97f6164562663fe577a9ef04ac236afeccf1137594d7d4d8962ce4577befeb81e393d03c08bf68473657de7e18debb7e
 AUX jde-2.4.1-doc-directory.patch 1806 BLAKE2B 6e13265c71beb4247aba97ddb05f7b500822f7a8f619c40dca229533497c101b93ee6d891a3c85e51f9d56f39b2fec229c44f922f1bc2d79b3b5942bed6913a5 SHA512 3818474077c2f387bdef6fb297a40b94529622e1da3fb31c3d7b3734111fb4e607062f9cdca9f1f5b020dec8d8e9e6601d5bf7831a20415f393f2f029e97c101
 DIST jdee-2.4.1.tar.xz 2742232 BLAKE2B f022cb55583acc7846bc04b59e843050947819c6bb2494bbe08ac3895c15d914df28d3c3a50cfd945efa7ed507cda9906a42866c85463907544095377cc1bf07 SHA512 5ce5f0f84b2502e9af808f33210511e8b7682902b1f342d678fe42dd8f9f3690b90ef7bb22583550eb769818782c50f545d6baf47b52bc7f4502fab411ab5359
-EBUILD jde-2.4.1.ebuild 1927 BLAKE2B aa4f4fb0fbc30ede2114af07bfcd0741ba564dd7b2ec0ef469e35b69aa205975806972470eade33a762bfb69b7a64d097cf8c4aa13c6e21ac019125b2e128b66 SHA512 f4f872602931287fcad579c2b1a15267c07419b3a4822988ec888d861292b86d5ede7dc5882d398b4b3aaa1c363ada64becbc812efcd4b19182f88a37a04a3d4
+EBUILD jde-2.4.1-r1.ebuild 1931 BLAKE2B 22a6f2256472b1324428614c0aa7c761527c0782dc9e4cb78131b89f4be49935d7aee7e8091b2903cffd2a894ded8b32c4c2bfa8d1a14c2e2d1e4de47a954fc4 SHA512 085d18454db922136ada7acdf2380a317bf7554404bd812a905d63a5ca8f1e75ec4e888ad14d6891cf2400e7114e13698a0905e59a29f68f2aa54a478c4036af
 MISC metadata.xml 990 BLAKE2B eb71dd15e27fb4154809b13e3df660a6cf678de66ba2943194e00121c6076835cafd9b7d6f05a11a11338fc1938f5222ee1edf4cc1d38e3c8db9a2de2361bba4 SHA512 52b53b824f57a5bed2920e3f2f48c6706a26e7e0f4f2e4bfe36ca62a244fe02c1f24daff67e01b4615f84b96911a404e7cd578e7670516914069c65f7508471e
diff --git a/app-emacs/jde/jde-2.4.1.ebuild b/app-emacs/jde/jde-2.4.1-r1.ebuild
index fd50b7af19da..bddc407a7439 100644
--- a/app-emacs/jde/jde-2.4.1.ebuild
+++ b/app-emacs/jde/jde-2.4.1-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 JAVA_PKG_IUSE="doc source"
 
-inherit java-pkg-2 java-ant-2 elisp eutils
+inherit java-pkg-2 java-ant-2 elisp
 
 DESCRIPTION="Java Development Environment for Emacs"
 HOMEPAGE="http://jdee.sourceforge.net/"
@@ -16,8 +16,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
-RDEPEND=">=virtual/jdk-1.3
-	app-emacs/elib
+RDEPEND=">=virtual/jdk-1.3:=
 	dev-java/bsh:0
 	dev-java/junit:0
 	dev-util/checkstyle:0"
@@ -33,9 +32,10 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.4.0.1-fix-paths-gentoo.patch"
-	epatch "${FILESDIR}/${PN}-2.4.0.1-classpath-gentoo.patch"
-	epatch "${FILESDIR}/${PN}-2.4.1-doc-directory.patch"
+	eapply "${FILESDIR}/${PN}-2.4.0.1-fix-paths-gentoo.patch"
+	eapply "${FILESDIR}/${PN}-2.4.0.1-classpath-gentoo.patch"
+	eapply "${FILESDIR}/${PN}-2.4.1-doc-directory.patch"
+	eapply_user
 
 	local bshjar csjar
 	bshjar=$(java-pkg_getjar --build-only bsh bsh.jar) || die
@@ -51,8 +51,7 @@ src_prepare() {
 
 src_compile() {
 	ANT_TASKS="ant-contrib" \
-		eant -Delib.dir="${EPREFIX}${SITELISP}/elib" \
-		bindist $(usex doc source-doc "")
+		eant bindist $(usex doc source-doc "")
 }
 
 src_install() {
@@ -70,5 +69,6 @@ src_install() {
 
 	dobin ${dist}/lisp/jtags
 
-	dohtml -r doc/html/*
+	dodoc -r doc/html
+	find "${ED}"/usr/share/doc -iname "*makefile" -delete || die
 }
diff --git a/app-emacs/magit-popup/Manifest b/app-emacs/magit-popup/Manifest
index b19370f2827f..d2f1d9291949 100644
--- a/app-emacs/magit-popup/Manifest
+++ b/app-emacs/magit-popup/Manifest
@@ -4,5 +4,5 @@ DIST magit-popup-2.12.4.tar.gz 40233 BLAKE2B 959ed85a1a4fec06ea30cd8d3482616fcaf
 DIST magit-popup-2.13.0.tar.gz 40226 BLAKE2B 9b5a115de98440873eae51e23c51b19a426518d66d9c9bf9f4d3b2476aa1ad7829311bde7845d861fc8f63c38c87d2236274019456fd773a90880acf73bb1cfb SHA512 27d8c9268a9ccc682105c67ec5f6dbfdf62e527ca982f4f71781f571af5374a364d290abe60c84286563b1d73e000550796c7b1c8f2474f5df62e552afe2cefb
 EBUILD magit-popup-2.12.3.ebuild 594 BLAKE2B 4e1f7e95d6581b55aac702d4d4aed048f0ab0f9815b1d9a8dfb3688c541eadd13e39e9f9f40cb7ab931e6841f9cc9c86205d40dfff0560b8417a9764c7d12e15 SHA512 750cd4a10d07188fc9113e2e71604c3742f6d9ed02179f7cceef982fa1d4c037ef88eb4faf9ead8cc46d798cba9044c5f83cb183ceda69c110dccbd9a1d66e4a
 EBUILD magit-popup-2.12.4.ebuild 596 BLAKE2B 39e54e5f14d5648c2e8d1c30f2da09cfb7345d1cf80650a4fd226dc7dbbdb0560ca24761ed46a4910a47bc46bd6a5a403edab90afc051b7ea60c5af813106191 SHA512 60cf12225cf6a27a5ecbe0afe7ff6d3e6c20b351aae312518a150bd8bfbb485e7310b2a17ab4743f413f3cb7da35aef5ccc00d3a99fa23ee675eeb11e181a204
-EBUILD magit-popup-2.13.0.ebuild 593 BLAKE2B 81f187d21e58948428b64ce385f9e639790279f0762368ff6a3882335c4ea4216205f46601f1602bc78336c1de5d4ae143ea34b43ba1cc4d902a7c2506069baf SHA512 ffe8a449c68138255d2f3f139217b664925492693911d9b272ced959877ddd0bc5165dea210bb7c0e4d84385afb37474fc6937ac4675827013c70598eb21cdcc
+EBUILD magit-popup-2.13.0.ebuild 591 BLAKE2B ec89fd14e36a646d09666602ec86ae84dd670c0b6d3de4706d19b36d9b75a40112d01e89ff83ca1935b03339643bcc640275e8274605c8028e8caccb56d4e2e5 SHA512 31c5003adf2dcf26c83b98df44854df881a5dc0998506ad0db51d4caab988d2e12e004559aca9b4e406b36e53a0547496ee420433ffb7d304af6e1539a6da587
 MISC metadata.xml 1170 BLAKE2B ab77cb475c6f77b7829a4fa62de4ab29423ed5e7531e64b60523ccf619b3e4edf4c69037d528bf3705f0de1311833445d02932d0a8b633860319ce200cadb454 SHA512 70806e5c38f43fcfe23b2eb64f818ad6d62fdacc61cb6d1be0b8aad236f766fd558592db617aeb0b41cc9330d1789339b8a3b9eefcf65f1bced7b18633cf884f
diff --git a/app-emacs/magit-popup/magit-popup-2.13.0.ebuild b/app-emacs/magit-popup/magit-popup-2.13.0.ebuild
index ca68dfa895cf..e2fd732e5f14 100644
--- a/app-emacs/magit-popup/magit-popup-2.13.0.ebuild
+++ b/app-emacs/magit-popup/magit-popup-2.13.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/magit/magit-popup/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 SITEFILE="50${PN}-gentoo.el"
 ELISP_TEXINFO="*.texi"
diff --git a/app-emacs/magit/Manifest b/app-emacs/magit/Manifest
index c2bb8157d432..60d409614f87 100644
--- a/app-emacs/magit/Manifest
+++ b/app-emacs/magit/Manifest
@@ -1,10 +1,6 @@
 AUX 50magit-gentoo.el 77 BLAKE2B 85c942a0eeb84d6d45931a318108dff2006fc38e9e9eac37e906e03619c41fce8c151417a5e3b4fd9cf8db8fd084363a5ab6ca0765ea74e9a052d409528b6c39 SHA512 ab812cd1f5451868dd62a4bd3e87b2d5061ef4e3010a2a4c63396c9b797fbfb45c02d045dfde55de1b7e91c98375ba7a56b98f65beaa697d35228b9c870daae6
-DIST magit-2.11.0.tar.gz 451030 BLAKE2B e5a5301d720e927c6c81aca4c5572a9a7fda938c695738246a87c46adc00a13e94438bb18d5f33e796c798cfec7dc438632cac6e4a452cff7d6e899a67f33575 SHA512 d32abdc9e89e77f65f05cc3dbec720320bc93d9ae827604c4f90acd115e76f8d05e445a96a141fbfbe88cdacca8383615fb73bddf01e776eeb3f63a459e973b6
-DIST magit-2.12.1.tar.gz 505873 BLAKE2B 076d9c08d3cb80274f5a6259ea5593ed419a0e140cda26bc65dc0c843373dcac1627d6bf098c5bdd9f0efb6b40ff3d7b823ed328b713390ea8916303b77ffd27 SHA512 7755aea8e7d9f0b82099143a76334be4c468536bdc0becad71acc097d9cef123394144b321f30093e079fef89e30ed1e5037fc92052ba9742112a30c6d3d586e
 DIST magit-2.13.1.tar.gz 520271 BLAKE2B fdffa561dccaafc2be56bf285e286859145e00f5037c99b5ab1ee50c9895eee56dbe8a5470e3a148e0150367bf92ed1c7cee4a35662f5c0bed0e4e7a2d49638c SHA512 f9f796fd6840788cebff62b316a0a1d708736e7a6962cd34d8ea86e94fb5a55c9e25f9aace17bceec199b2b931a0d5e586c4ab7d189c64ec6e5a9e42d041b269
 DIST magit-2.90.1.tar.gz 544968 BLAKE2B d3a38cf8c4d8c15529463028c4f6718d65bff044f91f58f2027c62d584202835d17229ec1db93d2990b5bb59403eabf7f12e7e91e2de519149ad40c274da5f25 SHA512 57a81fc72276907009fd3d05abbaed930d089d3e4621d539abb6ce2b24fd594950533f47d60682e25f0bd1c9f1ab3a16ba6b2698d79c6980f250ffd335be7789
-EBUILD magit-2.11.0.ebuild 778 BLAKE2B 97d42aab39c4f55fa9bdf9a10d385c9fb3ac29aad78972d340200aa077176287a532310ef14f7716c2f42b6cab13cee760bb83ea13edfc4743f8d7b4ff31de62 SHA512 2c3944d01b6b0689b935aaef0ff0551e8a9e304fd8d236d65747c6167e98b97eea37970be402c3880019ac72ad4895e9195955384313d07cdefe14855b8f65fa
-EBUILD magit-2.12.1.ebuild 838 BLAKE2B 6f331d506d79e6eaf72af0e7356ebef236fab9e53951f3c7bfb3ede44891d0717f622262b6e4096208d5dd45ebd3d44b2881d18de5d7cacc6100e0a8f863733a SHA512 10a3f964ad9c9c689eebc2cede09e092db9037879aa904714f0a18ea94983c76de52d8a7085110ac4a20859c5eeaf80ae30e37cd94eb9d8d9dd9cea284d412b3
 EBUILD magit-2.13.1.ebuild 835 BLAKE2B 786b7e8ac034d16b1baef4620c1eca7b436dc3c13b75d97e246970d80a96575c5111d12edd3c34e792126706b1cc87ac295e8292361a917948f9988949730869 SHA512 78e0c514ebe0eeaaeb69c66980794886e8584e52dc1a695ff8a333eb91be08ca8ee6b8cfae902633aa7572d123b609a82d4e3ed96ff59e27c4f4f410a3004df8
-EBUILD magit-2.90.1.ebuild 830 BLAKE2B 26c0aa099b50e77983048ad43c545c0a4a7c847ae58fcb7531c6949635ab06ee1244e280b2ae052fdd45426133d7f6f93978df160a9a8612341766c999264c9d SHA512 b54f8edec1cd14356f79c434d4afaf2e2f29adff7a80eda291e6ebec2c0199908c01a23eb7327906874bbc24c1441f4e0f5d6ec270e422a53767ec9340dd4f82
+EBUILD magit-2.90.1.ebuild 828 BLAKE2B f2ddb437ef786073f6a9f7f5561cbc9452bfa274c3b1e31a49ae9f5984f5ca63d54468e51023e1990da073bc162808b38f12c9b1ee9a51509ea5d2fbf3de525c SHA512 a85ae33cef7625b40c7d8dd1794075adb4dbe0eae2b99a08395ab91bdd0ff590cec877298d5e20c1868322e6eba2dc1ee08ec9306b60be8c65a13cd15de0091d
 MISC metadata.xml 811 BLAKE2B aa2a5aaf1024e2a75c24cad4d01622884ffde259c3a2d9869df9629741d4a19da87c5933efd2aa58a9fc0256150e8bf5e68bef99595993154cf06027f2de4b83 SHA512 ec3ade59fbba30a15b3b728f293884c9f5cf532a8ca92c984c7978b73061cbd5a7b4b1fc68af15d28990d13f50cad688d7cc8229e9e38988bdbdbcf2fbe2a900
diff --git a/app-emacs/magit/magit-2.11.0.ebuild b/app-emacs/magit/magit-2.11.0.ebuild
deleted file mode 100644
index 06a49379de7b..000000000000
--- a/app-emacs/magit/magit-2.11.0.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
-NEED_EMACS=24
-
-inherit elisp
-
-DESCRIPTION="A Git porcelain inside Emacs"
-HOMEPAGE="https://magit.vc/"
-SRC_URI="https://github.com/magit/magit/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-S="${WORKDIR}/${P}/lisp"
-SITEFILE="50${PN}-gentoo.el"
-ELISP_TEXINFO="../Documentation/*.texi"
-DOCS="../README.md ../Documentation/AUTHORS.md ../Documentation/RelNotes/${PV}.txt"
-
-DEPEND=">=app-emacs/dash-2.13.0 >=app-emacs/with-editor-2.6.0"
-RDEPEND="${DEPEND} >=dev-vcs/git-1.9.4"
-DEPEND="${DEPEND} sys-apps/texinfo"
-
-src_prepare() {
-	default
-	echo "(setq magit-version \"${PV}\")" > magit-version.el || die
-}
diff --git a/app-emacs/magit/magit-2.12.1.ebuild b/app-emacs/magit/magit-2.12.1.ebuild
deleted file mode 100644
index 8008ee12420b..000000000000
--- a/app-emacs/magit/magit-2.12.1.ebuild
+++ /dev/null
@@ -1,34 +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
-
-DESCRIPTION="A Git porcelain inside Emacs"
-HOMEPAGE="https://magit.vc/"
-SRC_URI="https://github.com/magit/magit/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-S="${WORKDIR}/${P}/lisp"
-SITEFILE="50${PN}-gentoo.el"
-ELISP_TEXINFO="../Documentation/*.texi"
-DOCS="../README.md ../Documentation/AUTHORS.md ../Documentation/RelNotes/${PV}.txt"
-
-DEPEND="
-	>=app-emacs/dash-2.13.0
-	>=app-emacs/ghub-2.0.0
-	>=app-emacs/magit-popup-2.12.3
-	>=app-emacs/with-editor-2.7.2
-"
-RDEPEND="${DEPEND} >=dev-vcs/git-1.9.4"
-DEPEND="${DEPEND} sys-apps/texinfo"
-
-src_prepare() {
-	default
-	echo "(setq magit-version \"${PV}\")" > magit-version.el || die
-}
diff --git a/app-emacs/magit/magit-2.90.1.ebuild b/app-emacs/magit/magit-2.90.1.ebuild
index b7659c893040..ded24c2c6690 100644
--- a/app-emacs/magit/magit-2.90.1.ebuild
+++ b/app-emacs/magit/magit-2.90.1.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=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/magit/magit/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 S="${WORKDIR}/${P}/lisp"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/mailcrypt/Manifest b/app-emacs/mailcrypt/Manifest
index 1a0f1842a932..0aeb15ef3463 100644
--- a/app-emacs/mailcrypt/Manifest
+++ b/app-emacs/mailcrypt/Manifest
@@ -1,6 +1,5 @@
 AUX 50mailcrypt-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
 AUX mailcrypt-3.5.9-backquotes.patch 418 BLAKE2B f907471a56450c25c7cf1d322c44d15b9aabeaff4430f38b888a3cf5526743712d4d85246979c7bfe70cc6a7ff4fd3ae11c4a2b0cb38bb31348cc45abdef08bd SHA512 752d1bb5bec8f46a0b4b429c8078f86f447ede299ef711a159479ef0f0f0647eafe8fee0ef4ecb321750d6fd92ab503137ea2853f511e153ea30643756eeb752
 DIST mailcrypt-3.5.9.tar.gz 172073 BLAKE2B 02a911c0676464a670754cf8ddfccefa1ab9c69c680911ce63faa0affe6d3f72ad7d409f716a1edf326225f3378878caedfd4194201894baf05110d26acba533 SHA512 df6524ecc42d4c7bdddb34439186690192bc4091a1965e405223106fc71047c33e4bbbd571b030c326efec46961ba0aefd018ff1205d230dc74c34daf93ba079
-EBUILD mailcrypt-3.5.9-r2.ebuild 997 BLAKE2B 11e03c3de9a7491dc287b30a297a0783e0f6de17a9dda7a5aabe6883a3562763cb7c7240cca74682d6189d3073860416d0255fc69f00fa5b9934207d42b723ac SHA512 0d0f778b87a6f8cf5b5f0a913aef003d464f0d2e2159482fef11c9e53dc25af9a1e0faf8742d4b2293dcf67312e2f43af5515c3877c0da1a34b0ce29d934a3b5
-EBUILD mailcrypt-3.5.9-r3.ebuild 740 BLAKE2B 4e85b91866f8fe7ede8757ed418a8c647538261f0d0a7a5c821e8f37309e8c467928fa22509fe76d4f0f6590b5be3069e8d744ead00a9de52c65f5145f2265e5 SHA512 a2ff51d9c9d97a49774d82cc6f26e8859d91dbee16a1be5a1a5843adb5efb76a1811920820e0e5f78ac5bee89c94b9f7d1249e2b482a81f770506d411674d11f
+EBUILD mailcrypt-3.5.9-r3.ebuild 736 BLAKE2B 41c6da1847f0e795f5bdd3d7c75b54ac6cd08eb9ccfcb4a511ad51bc3b910763327ff017172a343f805b0eca44d0d2b54a8fc621057bf68e616d02942a48aad4 SHA512 61850769f184c08cfd4c2aadfadf7b772fee1ed2ebd7076a79a3d9146086c4827bbcf6b85bb132641e79461cb14e076ed4f34ccbb83c0e3d9d594801ee1fca14
 MISC metadata.xml 359 BLAKE2B 115dd3e46859edda7ac4b23892ba3fd9f76e2a0aeb0f667a37c0a410959048a3a99ddbf052155fdc55bb18cc5fbd8a72af18f7c4b312ddd9f27a25c454662c9b SHA512 0a6b9ca1957a37fcdcf322663a6ae5dcfa9f00810ca7f68548acb9386edcc78f0b7d01f1cd6b2bcf2d9f05a6d34b7add17e9418329072d184c7840aed0f50eb1
diff --git a/app-emacs/mailcrypt/mailcrypt-3.5.9-r2.ebuild b/app-emacs/mailcrypt/mailcrypt-3.5.9-r2.ebuild
deleted file mode 100644
index 60f6a2ed7f21..000000000000
--- a/app-emacs/mailcrypt/mailcrypt-3.5.9-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit readme.gentoo-r1 elisp autotools
-
-DESCRIPTION="Provides a simple interface to public key cryptography with OpenPGP"
-HOMEPAGE="http://mailcrypt.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mailcrypt/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-RESTRICT="test"
-
-RDEPEND="app-crypt/gnupg"
-
-ELISP_PATCHES="${P}-backquotes.patch"
-ELISP_REMOVE="FSF-timer.el"		# remove bundled timer.el
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	elisp_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	export EMACS
-	econf
-}
-
-src_install() {
-	emake \
-		lispdir="${D}${SITELISP}/${PN}" \
-		infodir="${D}/usr/share/info" \
-		install
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	dodoc ANNOUNCE ChangeLog* INSTALL LCD-entry NEWS ONEWS README*
-
-	DOC_CONTENTS="See the INSTALL file in /usr/share/doc/${PF} for how
-		to customize mailcrypt."
-	readme.gentoo_create_doc
-}
diff --git a/app-emacs/mailcrypt/mailcrypt-3.5.9-r3.ebuild b/app-emacs/mailcrypt/mailcrypt-3.5.9-r3.ebuild
index d7231e393d29..3906d3b559fd 100644
--- a/app-emacs/mailcrypt/mailcrypt-3.5.9-r3.ebuild
+++ b/app-emacs/mailcrypt/mailcrypt-3.5.9-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mailcrypt/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc sparc x86"
 RESTRICT="test"
 
 RDEPEND="app-crypt/gnupg"
diff --git a/app-emacs/matlab/Manifest b/app-emacs/matlab/Manifest
index 2eb5c41c001b..9443439d2faa 100644
--- a/app-emacs/matlab/Manifest
+++ b/app-emacs/matlab/Manifest
@@ -1,7 +1,4 @@
 AUX 50matlab-gentoo-3.3.6.el 65 BLAKE2B a446c9099d378fe8b28650d64121e95869d008afd85a09869676c36d6bdb463f6cdb406be977464b0e4630a230d67b4d9f48b101e1ae8c843175551506a5981e SHA512 4f5af81cc3ee14572995ad0ccf6f30345d5fe57e375583dfa081f20155699d2655bf82a4296c920403bef0554a8514508ccbf1bfdb374ae841858c99c51487d7
-AUX 50matlab-gentoo.el 61 BLAKE2B a826b081eb0aff32febe07f31946cc427ece09616a982f9442465c1608816adb4e2dc565220e0a3e90dce8deacdd8443323dfcecaa4bb4b0a773ee2e254c0c4d SHA512 673f71817e587dd3c33073829a946b2ebcd90ef0444eb40d514cd4513f5942f7bd8e4f03eeededb171f6d53cff3fc818e8ddfccefdaee6c80f035b0bcf0254eb
-DIST matlab-3.3.2_pre20130829.tar.xz 92784 BLAKE2B 327c1a5126cd3f686b053f404122975578edb92bef53e6c6fadd6ff27873646ab2e15ed5dc3aa34604c052675b9e0f47b82c4c89a72e1de017544a45e826e935 SHA512 b549314f71dd876453c395268a0ec1fca8d68ba8ae074ef45d0fb430afbbd6a45bc30a45bdd64be83dd44a0114d7f4ec8ca2f9acb250337fbdc407691d0a2c00
 DIST matlab-3.3.6_pre20191010.tar.xz 111800 BLAKE2B e7960f09c51664ca92ee818ab9bbd946123f4527f5a24d31a4236e8cfe534e4cbcdd1cf49539794de79f00c369d3e440465080ab44a20e184b507e860bcf8e0d SHA512 e1997e23693e09cfcc1461c328d70494f9e83c4d034bce983f6065eff4ce3c7c406e4d046c01dc5b31b0dca6c7ade32860504d4d596e04bcf72618dba5c07792
-EBUILD matlab-3.3.2_pre20130829.ebuild 473 BLAKE2B ab46d4cd9e60ecad9850aad877914c29d517e04b4a69fd354ab0ccab4e69fd5712743ecffa4906e585bf5d8aa743b2f4a76db8e0507da949150209ccff7dca4d SHA512 6e5f15ad7e081ad1c2b3b921954b854a4339a3257cbeda4a440066a0533389b656aa485dbcb123e31502aeeca49ed1e2ed6b1f7a8a3970ac757071fa330a5b27
-EBUILD matlab-3.3.6_pre20191010-r1.ebuild 566 BLAKE2B 0747b7b1e995506d8e1210a419488e680ecf29f9926d309aff0dc9955689b36e8b0b6eaeacd64f01731974ffc0bb9bf9ba516f763404e13380f786d0b76a50ae SHA512 45e6dbc6dec5f4be4611f5a444fbf1e38da39e7c3ae461a4825bb284c31c70653dbfef9b8e5e1fc6540be5f36000be96c1646b25a293fe1c80e2e9d005a24bf4
+EBUILD matlab-3.3.6_pre20191010-r1.ebuild 564 BLAKE2B 4db4afb9cdbcf01e88483c444aae8acce391b748606466a49e1ed075e853d98ff81671346eec8800a84b74cdb8f1c23696853182cf9f6085399748581082f677 SHA512 134c7647b099d63928947554dcd0fb843c788ae51940ead53d179fda379b8ee0c50cb9bf63e92335dbdd9e7f8c05acde722dd49b83c749ea79c197b37a1781eb
 MISC metadata.xml 362 BLAKE2B 9f602fd377b19317a6d92083b224f007d5a2f997bbb17396cbd84e742e7cc6b9b0da1a28f7123984594d226f0978dabbe26ae6e0adad50630b90461315e9910d SHA512 bc473891af67b75c5ccd5943193e40bbfcee6d0aa21ab0a2a5f64d8a6833f3a6542e45282deffeb46a496d16d6f6e7ae21c353cb884904f682559b50233f259e
diff --git a/app-emacs/matlab/files/50matlab-gentoo.el b/app-emacs/matlab/files/50matlab-gentoo.el
deleted file mode 100644
index f15e838a2985..000000000000
--- a/app-emacs/matlab/files/50matlab-gentoo.el
+++ /dev/null
@@ -1,2 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
-(require 'matlab-load)
diff --git a/app-emacs/matlab/matlab-3.3.2_pre20130829.ebuild b/app-emacs/matlab/matlab-3.3.2_pre20130829.ebuild
deleted file mode 100644
index b0363bf6bfcf..000000000000
--- a/app-emacs/matlab/matlab-3.3.2_pre20130829.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="Major modes for MATLAB .m and .tlc files"
-HOMEPAGE="http://matlab-emacs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
-
-S="${WORKDIR}/matlab-emacs"
-SITEFILE="50${PN}-gentoo.el"
-DOCS="README INSTALL ChangeLog*"
diff --git a/app-emacs/matlab/matlab-3.3.6_pre20191010-r1.ebuild b/app-emacs/matlab/matlab-3.3.6_pre20191010-r1.ebuild
index 33487fa8e1bb..aab9a5fa7873 100644
--- a/app-emacs/matlab/matlab-3.3.6_pre20191010-r1.ebuild
+++ b/app-emacs/matlab/matlab-3.3.6_pre20191010-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 S="${WORKDIR}/matlab-emacs-src"
 SITEFILE="50${PN}-gentoo-3.3.6.el"
diff --git a/app-emacs/mpg123-el/Manifest b/app-emacs/mpg123-el/Manifest
index df66753f1337..8834496b6641 100644
--- a/app-emacs/mpg123-el/Manifest
+++ b/app-emacs/mpg123-el/Manifest
@@ -2,5 +2,5 @@ AUX 50mpg123-el-gentoo.el 121 BLAKE2B db0ee430cca004ac595670289feffb469d121b6056
 DIST mpg123-el-1.60.tar.xz 34104 BLAKE2B f48a0ce460ee382b261accaf2188bb1dde7b17b1b09766cda7ef69f92d3e022a4390a7c9e9a97085f1c1e87377d114bcbdb29de512438ee3652baa0be0b413a7 SHA512 5f4d7aefeaec6c5e94dcd5d15af7d0b89dc79274dce117309a70170cd0ec8cafac7c275518ea21d797d9251c31033b93c0581f26f83792c7b697094f4b194611
 DIST mpg123-el-1.61.tar.xz 34216 BLAKE2B 3f0f85bbf0f5854b899aefb443f9b2b011dd5dd85c815fc8be723bade93be805b121e952cab3c56a3897bed41fa65988331c004537e565abcb660b6dd402a0c5 SHA512 96b50a8fc945c6811bce7b8cfa28fe235f2d2ddf9cbd1904c94f272f6df13a991761dbb4f186c1bda04720fb50115515361dbff4838e7623261719f2ecc6698e
 EBUILD mpg123-el-1.60.ebuild 788 BLAKE2B 8b1b48881cb33ec77ce0f5a48e607d79be41f97a41674be54031a40ff4c57e39818858d353819ccf3629d09b9131eff586f9261325846799c17c0a1b3aaba3fd SHA512 84c5a6f0d2a75a039b75977b8e8acf39c710b509ed6b8e4cb531fccc16dbe9c48efce93b557a170e42203b524107315ac65c626aa7a5b7a851606dca732d1687
-EBUILD mpg123-el-1.61.ebuild 791 BLAKE2B 62c7aba32f82af283097315547a145b84d5645f04d6b208379b80ad6a37274007733211eff567c9cf477f42c650c68b58fda5c75fc2765b00fd69025ac2ac464 SHA512 98177d25e75fcd2b5425cf6e65ee9b8daec629bfb04aea1057be5fb39f9a780ba068f0a5a8eb4d28da1c2186e27a61897f43c9c0c281df56a7690dcd83ab93e3
+EBUILD mpg123-el-1.61.ebuild 788 BLAKE2B cce6e1ee3b948ab4b854ef324d0d6752c27781606ea456ef14c042c9b340c0c0b10d33ab227a667f92d92a9d8712563edabe2fbd017857ccb4e68312edf626ac SHA512 be831915471752efa4be84ea68995f5949a4940acc836a38ed83d7f9786503234a71bea8710fcf22f7ac68e56b905f141561ac150ae9f2a5929bb4019318e8c4
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/mpg123-el/mpg123-el-1.61.ebuild b/app-emacs/mpg123-el/mpg123-el-1.61.ebuild
index eeba80891947..5be713b4ad46 100644
--- a/app-emacs/mpg123-el/mpg123-el-1.61.ebuild
+++ b/app-emacs/mpg123-el/mpg123-el-1.61.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 
 LICENSE="mpg123-el"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="media-sound/mpg123
 	media-sound/alsa-utils"
diff --git a/app-emacs/nxml-gentoo-schemas/Manifest b/app-emacs/nxml-gentoo-schemas/Manifest
index 7bcd0710fd73..7e0545aef50e 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 569 BLAKE2B dafaa0d10d1cd729062b288bdd4ca84380a27fd8c666292602c90370c656aa494e4fd302775af1bca040b36f5dcae8abed4937104d06c7566b80cc9faf95964e SHA512 499bb14f4ede0ba42abc41ca65e76ab5483f7a9fbf8b9137e31f2db0a738e511de5cc9060f3c181bdae88a955f0937f414b94e8bca8184bfae86cae7f0c05451
+DIST nxml-gentoo-schemas-20191214.tar.xz 9908 BLAKE2B 7cf16c68ed13026c9b5d980ac982afd6daa757db8c2b8860f881014c36821da9e47eb127be6900cad0b2c96fe73bec451757c2ac263653a709b178529413c8da SHA512 22aa519ba674d4abfb1b07d29a8a71a8919ca7f75acb7810087a79c3b1a3eb0db4d8f02f6c1a424c4941f9823cf7417cb3d6854a354b8af8479096f09ffc6a8d
 EBUILD nxml-gentoo-schemas-20180611.ebuild 569 BLAKE2B 789267b1c9eb33374439e3bf4b3b212588c465b2b6a02c5da65ca8762a9ef6371364bc0bb31532cf7cc17d60495c73a52bc09f2767227f59a0758f3b4f2c86eb SHA512 272b38d9d09a1089dee357a80c780e4cc2ba14d50301d5d9c57a30cbff41db26865ecac9c9ffb209843aec46c6b63cdae767757c09eabd97aeedf03bb507320e
+EBUILD nxml-gentoo-schemas-20191214.ebuild 550 BLAKE2B 0f2386aecb8a4ecc1acf6edf2a2482b1a241a39b2539b3492c6fbed3dad441829250359c901687b00435b99a0218f0ab1963e4c34e7b29db2ae3582dad5e0397 SHA512 e0c399da8ba084f412e561ad4f18cdfad847be0bead1c0b5be9094b22e62f09e33580de8d359948e01e825cc9e2dc18f76ea9fbfb275bcea220dc0c347eea01e
 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-20191214.ebuild
index e2e965e601ed..440f9475ffb5 100644
--- a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20170302.ebuild
+++ b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20191214.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit elisp
 
@@ -21,5 +21,4 @@ src_install() {
 	insinto "${SITEETC}/${PN}"
 	doins schemas.xml *.rnc
 	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	dodoc DONATING
 }
diff --git a/app-emacs/nxml-libvirt-schemas/Manifest b/app-emacs/nxml-libvirt-schemas/Manifest
index 2d8a74d9bdd8..64e0bd6bb266 100644
--- a/app-emacs/nxml-libvirt-schemas/Manifest
+++ b/app-emacs/nxml-libvirt-schemas/Manifest
@@ -1,8 +1,6 @@
 AUX 60nxml-libvirt-schemas-gentoo.el 206 BLAKE2B ae9d1fe1da9c86d14796c09597ca34b10dd0e28abb02fdeac4607b8d950bfdf636f5f3c1de49cd5b9cf1fa808513522ab43272f3c26361b871ad0d630a942ed6 SHA512 5592edb5663066fcccaf5b05c3df671b4069d4d259376a8a91ef3f7ae5990687b15dfdf40e6f7aa6cc7d62b7cdaa5090fd851de0ed2718d20ecfe3e3a78530ea
 AUX Makefile-trang 108 BLAKE2B 4f80e5f4e0550bd4732668ae5298d890d2293d34379902cf204c43bbea5db01626847af7ab96854efcbcc34e7fe9b1c32873ad22ef13873a1a06790e9580371d SHA512 3544959cc57ce1b273e4b9de95f51e1e21d23cc35fb48e02f179a055a61ee9092efdc43405f72c3aacb3c74eada7fabf5952eb49e3ff0514fd69a3092268dc4f
 AUX schemas.xml 560 BLAKE2B 32f01d2dd047aa7109112b47155a21825686385845fae2af0f6d052dbd36f3e1ca5027ec39d654735e390ef9aa8a31f7ae5c86b15b0cd9c4ef84128326e87ee9 SHA512 82ef6189610fc4e1a0d5546ae15f2f315e7c0d460fa141201c43a93e59d147613c7186302fdc3e6b2f0ec5c343e5566966892d4e9f55dc4957e4ad58793fc3ff
-DIST libvirt-1.2.1.tar.gz 27228694 BLAKE2B 5552508f87bddbd8d2dd65a37298f7f7e7238a7ac5aeef878bd8b3c6d5ecab8f2cf6fb94c8d520312b6c6399f1e663f8d68febf2badd544020635df841f5488f SHA512 6184840623156ca01ee7f59078ebf031bc84c25b37bb110372c7bcf230a79b74e267475f989fb73db5e3c096dcc74f03cb30adfc5de022f756ed2cd6ab05bfd0
 DIST libvirt-5.8.0.tar.xz 13129328 BLAKE2B ff49b0b6dca86f35c68edfb880677c88e0aed8021ed01ebd145922821914edd70c355ca777fe470e2b0e4baf36f2813c1100be9377344f81c9df374068307da1 SHA512 73d18fdf307b8029921a9f1a0c84ca31c50c662a3c0339e3850d6d2f31574168807a6f34943b286ed86a44031decbbc1339f27366da7269e29d38c7094503113
-EBUILD nxml-libvirt-schemas-1.2.1.ebuild 1293 BLAKE2B 6dda0f1cfff26b8f85c21178ff5df4b6259ae982b6c4a2b5423d4bbc54410c2c118461aa56d4f9bdcdd34ff66ff5a772d2cf93bcca66f39ebe56bf65c21071b2 SHA512 265f6a389fc41b15d31fb257a77c7b7fe5e7796988b3aea592c5f2cf09fdcd321e151cd09ec2cbeb2403ddd86cf1029b0598264ff4fa0e764d58a73e813701a6
 EBUILD nxml-libvirt-schemas-5.8.0.ebuild 903 BLAKE2B e25b2af04d2bebc9a2aaaf9da8e0d738e33421100812ab1b57caa6324e0951e45029b5a69d0eb9027b3ea85052ed21b14ea085466577254fc3c4f33357425664 SHA512 01dde717faa3ec8f74b5d825aabe207cf2a77afecc2735c689871e6f0281e4bc4a1da7db58ac581998f3521e47785ba5bf46a8c06942373eacb38109bd478525
 MISC metadata.xml 389 BLAKE2B 5874fa7fb23c84408f3e1c975b11cfe88067da63a91d93447f26c682d868ad822e092a186a14cb17d3ca48f8543b64c86ea0086cc26d434e3b5d03e1bd0a5e26 SHA512 5def622fb849779446a7026e11f2f9216c70da203712c4611ac21b0c487adb050159a7775906da34184bed12e4d12033e730722d152670524b4c29bd422f9307
diff --git a/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-1.2.1.ebuild b/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-1.2.1.ebuild
deleted file mode 100644
index 7c423e6fa2ed..000000000000
--- a/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-1.2.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-#BACKPORTS=
-
-inherit elisp eutils
-
-MY_P="libvirt-${PV/_rc/-rc}"
-
-DESCRIPTION="Extension for nxml-mode with libvirt schemas"
-HOMEPAGE="http://www.libvirt.org/"
-SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz
-	${BACKPORTS:+mirror://gentoo/${MY_P}-backports-${BACKPORTS}.tar.bz2}"
-
-# This is the license of the package, but the schema files are
-# provided without license, maybe it's bad.
-LICENSE="LGPL-2.1+"
-SLOT="0"
-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-text/trang"
-RDEPEND=""
-
-SITEFILE="60${PN}-gentoo.el"
-S="${WORKDIR}/${MY_P%-rc*}"
-
-src_prepare() {
-	if [[ -d "${WORKDIR}/patches" ]]; then
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		EPATCH_SOURCE="${WORKDIR}/patches" \
-		epatch
-	fi
-}
-
-src_compile() {
-	emake -C docs/schemas -f "${FILESDIR}/Makefile-trang"
-}
-
-src_test() {
-	# No we don't need tests here... trang will take care of checking
-	# the well-formedness of the schema files for us
-	:
-}
-
-src_install() {
-	insinto ${SITEETC}/${PN}
-	doins "${FILESDIR}/schemas.xml" docs/schemas/*.rnc
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-}
diff --git a/app-emacs/ocaml-mode/Manifest b/app-emacs/ocaml-mode/Manifest
index b328b496daa1..09924695ef67 100644
--- a/app-emacs/ocaml-mode/Manifest
+++ b/app-emacs/ocaml-mode/Manifest
@@ -1,6 +1,4 @@
 AUX 50ocaml-mode-gentoo-3.12.1.el 499 BLAKE2B 30d49a4e43fbf4fac02f4a2dd8a9fe7c3aeea623836330e3ed0f8921cc96a02d087f35a32a93f6e404392a1f915539799d1a5c8168b06cb1d8ab76ea0ac6b8fa SHA512 0be69a30c07caeff818e4d6fb0147e18855e88a3bb6a6e876b170edddb32382c0bd19ca960836d8442eecd00e78be09cba7de08030420645c2ef1ba5d9198524
-DIST ocaml-4.00.1.tar.bz2 2762205 BLAKE2B f9a788eef67158b036ee551360410921beab87f1b01684ca17d5cb87a30cc0cd475ca640fcb284ad88d9054927ae0fd397921574cc9098956d60e80915d4cbb4 SHA512 77899430706394af558666361b152d47df3a3e21831059875f8b317d0ff9d1a010177bf1e5851e522e086c20768e92c71344aa53eda0ce003f278752870ab5da
 DIST ocaml-4.05.0.tar.gz 4431750 BLAKE2B c2ab003a13e0a581ebd0e1c96eeb8a9baea9bfe6bee08823b0e4541819201ec109f1846e13fc1aefa51a001eefbb8f73320ba854d41975fc68cef41bc75b1ecc SHA512 9a060ae4b741e1687277403e5bdb8f6eda2e2ebf6c45f7c0149b66ea1213cb26d13febfbb3f11c12543e244cfdd053b786b09c4145e2348e5d89a7206f7de225
-EBUILD ocaml-mode-4.00.1.ebuild 490 BLAKE2B b2a0c837423ba5d494fd9eaee117e2bb29806ad5f0a337c9d0703809822cf4c428ab9963b152e56e95d06b559338cacd957aa82999dfa6a559c1711913047830 SHA512 76b528a6ab3a083d90fe5d5f0db6498c385da351b22a831a5f6458e7347bd2af08191cc0011e2eb522ffd365bae091a283ef0ff4477e2efbe30c0ec6ab16c651
-EBUILD ocaml-mode-4.05.0.ebuild 511 BLAKE2B 950256900b69e19ce86e2464600d15d9c68492b5f9514aed74903e3a983629583053b1758bfd1e95654c5114407e08f0396118801c0058b92111629de0a4596c SHA512 1c77f99fbfe57a7ff390f4421c17a623b7102edc2a0fe38560e173e4f2fcee20c83d7db9f6d708d55d00e4c725214e3f00e6eeafb2ab6a78f3e84b24182b4e8b
-MISC metadata.xml 388 BLAKE2B 3b0d21b61541c15e807ececd8bfeb3a91ceefd5075836b4a22a990b1f0c9b4ad71ce68b9d65935382e5f84ae6fc49d022fc2b1c0704a5cf331857b33e09bd327 SHA512 d997ec7cfd421fa931b5ef0cc7713a75cffd1c1fb0204364253fa5243b67ae60389723f9ea473e7558bc87fcb6df54b85c987ca269c15ddc4613157ccee6b9db
+EBUILD ocaml-mode-4.05.0.ebuild 501 BLAKE2B 52183567e04f4c0656719b69d20e0bcc820eb2a2f1c28061804675b1c14c69f39f9bd4e4c6b4ad616921bd8d8f48ed2e43cb23d40a0a5f98d3546973f415f17e SHA512 924e0350bed26c5e3f889733f751fbe544fa38fe6af033fe22bac769f9e5a1d0eddce488bee6fcf3fdfee314c700e5fdd19e67c5edfd53cf6132552d66038430
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/ocaml-mode/metadata.xml b/app-emacs/ocaml-mode/metadata.xml
index 81601b351288..c918cdef9591 100644
--- a/app-emacs/ocaml-mode/metadata.xml
+++ b/app-emacs/ocaml-mode/metadata.xml
@@ -5,9 +5,5 @@
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
-<maintainer type="project">
-  <email>ml@gentoo.org</email>
-  <name>Gentoo ML Project</name>
-</maintainer>
 <stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-emacs/ocaml-mode/ocaml-mode-4.00.1.ebuild b/app-emacs/ocaml-mode/ocaml-mode-4.00.1.ebuild
deleted file mode 100644
index 07f4752a09a3..000000000000
--- a/app-emacs/ocaml-mode/ocaml-mode-4.00.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-MY_P=${P/-mode/}
-DESCRIPTION="Emacs mode for OCaml"
-HOMEPAGE="http://www.ocaml.org/"
-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-linux ~x86-linux"
-
-S="${WORKDIR}/${MY_P}/emacs"
-SITEFILE="50${PN}-gentoo-3.12.1.el"
-DOCS="README README.itz"
diff --git a/app-emacs/ocaml-mode/ocaml-mode-4.05.0.ebuild b/app-emacs/ocaml-mode/ocaml-mode-4.05.0.ebuild
index b3a90a28f87f..3d1d870deb2a 100644
--- a/app-emacs/ocaml-mode/ocaml-mode-4.05.0.ebuild
+++ b/app-emacs/ocaml-mode/ocaml-mode-4.05.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 S="${WORKDIR}/${MY_P}/emacs"
 SITEFILE="50${PN}-gentoo-3.12.1.el"
diff --git a/app-emacs/po-mode/Manifest b/app-emacs/po-mode/Manifest
index 4bc32842ce8f..6228ad98c97d 100644
--- a/app-emacs/po-mode/Manifest
+++ b/app-emacs/po-mode/Manifest
@@ -1,6 +1,4 @@
 AUX 50po-mode-gentoo.el 373 BLAKE2B dedf37969c42ac3dbeb4b4cb01af0f9ee79e40aad8586831503bebc1192a110fbecdc0bba339ebe6d7f89a8509e4f6df52f98f7563a90f31d73af279aad81e66 SHA512 48c371afe3f1a1f033ea20cb0a60bc700414108f7dc1f235e62423bda9b94373e49da9bdd3ab76e119b7b6c1b5f0a7601d36ce2710dd23b3de46557cf7d9cd8d
-DIST gettext-0.19.8.1.tar.gz 19704011 BLAKE2B 17dc7aad338a26d71b818fea51e46a47dccf14744ee575ce86b591becaea402e36d64dc018e1a84113c356122ffef367cf2fa424e51ebc9720350040b4960091 SHA512 073042fa2dc48804c58e76f036130a669e19612c25427b0ab14d0b366b549a63751bf3af03bfd0745d7c4f72497a4b2aab26a3cc6de83189ce111679073878e1
 DIST gettext-0.20.1.tar.gz 23267473 BLAKE2B 34e776b985c7db105f8029e0f3400aa645ff6843cd35f778d48450368a31218ddcf590fbc7fd2d10f716b63094d6a15bf40b358e8a6f498d450d2420e7e7a5f2 SHA512 af6d74986da285df0bdd59524bdf01bb12db448e5ea659dda3b60b660c4a9063c80e8c74cc8751334e065e98348ee0db0079e43c67d485a15e86ae236115fe06
-EBUILD po-mode-0.19.8.1.ebuild 524 BLAKE2B 495da3c3796cb2df64fa79047ffe1fae6a2c21728e190065a4f0cc709eba8660fe56302b062e0ffc33e1f37a1697a5fc026e63df70c457b567794830f05e2940 SHA512 03365d122b167f0b4ce281a4d82f4c046e4a04328f5380dd5fa1049427a1cd9416c28b750190c08745b4c74d902fff879ebef2895f7c84440b36e48f33568c3b
-EBUILD po-mode-0.20.1.ebuild 529 BLAKE2B 57fda5ef7e064ad00837f0cac2f26e1af3a43365b68a050b2a9ee534b7913bbdf40cf2f22a482846ec9b7dbf757d74c4140f291e62f1d9bcda818e8eeb8ba0fb SHA512 2dd12994c3b6c7518575f1b83302948f44f139264291ca2347385d2a0b98e5b4be1ec6a30cb746fdbb760a1972f3f98f4ed435abbe898f13adea7443c193fc1f
+EBUILD po-mode-0.20.1.ebuild 525 BLAKE2B ffd65facd173abd17ef07b648914b0bd4d72edc83b438accaf562732e8a53463ad9ed58009c557e6b145389028669a72bb71976c88b6b3c07bfb0a8101b6a069 SHA512 d6545ce6076fca9d090ca66d8739878af200901c46df5389ed1514ee943055fd0ba07f76128a466c32c39390deefec7335e6e5d820e3ad1ac738199930566c41
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
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
deleted file mode 100644
index 9959a044d2be..000000000000
--- a/app-emacs/po-mode/po-mode-0.19.8.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp
-
-DESCRIPTION="Major mode for GNU gettext PO files"
-HOMEPAGE="https://www.gnu.org/software/gettext/"
-SRC_URI="mirror://gnu/gettext/gettext-${PV}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-
-S="${WORKDIR}/gettext-${PV}/gettext-tools/misc"
-ELISP_REMOVE="start-po.el"
-SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/po-mode/po-mode-0.20.1.ebuild b/app-emacs/po-mode/po-mode-0.20.1.ebuild
index b74cb880bcb0..be2fb3af33e2 100644
--- a/app-emacs/po-mode/po-mode-0.20.1.ebuild
+++ b/app-emacs/po-mode/po-mode-0.20.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gettext/gettext-${PV}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 S="${WORKDIR}/gettext-${PV}/gettext-tools/emacs"
 ELISP_REMOVE="start-po.el"
diff --git a/app-emacs/psgml/Manifest b/app-emacs/psgml/Manifest
index 61ebb5ba2623..71f90a1b9972 100644
--- a/app-emacs/psgml/Manifest
+++ b/app-emacs/psgml/Manifest
@@ -1,6 +1,4 @@
 AUX 50psgml-gentoo.el 295 BLAKE2B d2276bb66871f2dfeec692358fd49fa226c7141ff3b9e0020c05b7d873cf65fa1d4f117724ff3baf2ea3520bf85cdccd90129bf54da815bb44de19c279e0cddf SHA512 ecb9a8c544e0b5e287771d6538d36ab67076d0fc68b55bbc5428aa99b9c5f773f01499dad6f2d624d99648ddbb30518522da3f39d244fe30b4d884567114daa1
-DIST psgml-1.4.0.tar.gz 262246 BLAKE2B e888e7e13b39108efd19bbce41f3630015556ca9e5250665456866173302b5388add506694f28a6fa7e4e4572ce4596eec66762650f7203a14d84fcfbcd8ac7f SHA512 99bab6440a0f437009edff6371412c16f47d48c6b1eaa5b894523130e3a8d604ea79dc81f1895ceecd4283d0c7fd908d4e5bdeace63e54b9ac048a80fc0f6f44
 DIST psgml-1.4.1.tar.xz 200512 BLAKE2B d2bad3e5e1d9e45f6327c064806a5c9eddc49d513bf04a0017ea3de865c3acbaec8b0b188860b4a6b435097f69e445ac92250b00b339212530cf0a7c8762b907 SHA512 bd73668341fc27dc1cecb67e4114bdb728512a35b6c834c5ad57efe4e6f3c5e0f83f9d87c55bb959cd0d9e2ec74d15d0e0ea786095bc834246e0cee646761681
-EBUILD psgml-1.4.0.ebuild 827 BLAKE2B e8425bab4b9f39686ba920f5c771a1a25565105cd1370ec6d7f2e5ea0587b5a3c0e3b614610d31e0bac5a82dae7b1142268fbfdb1fd0126d183358b5d02561ae SHA512 2e1778fa2efb8596b991314cfa0a3f43df0a9471aa3a4b44c8d8631d92479f3c14f3ab10b3dc911d27b46ee076c91c448e68ce621608b5c7463b3b7d664ef4a3
-EBUILD psgml-1.4.1.ebuild 825 BLAKE2B 618fcafa898fdbb6a91c1ff37045c740c6670cc32813b59c16e1fd808eac4704f1b49d7b4279b1cc895acb0956a45cf07b83a7de8d54992a73b955900704e321 SHA512 5335db6119f22a29eefd9b21eabd5de4b21c5c145f39e8bad057fe9c6f103d36d1ffe0ad7aeec53081c1bf5526b5a69e038ad5b3075e53a2f6361cda27c19daf
+EBUILD psgml-1.4.1.ebuild 822 BLAKE2B c4200db92ba23194a6257d2d5f8b12c91db86a54bec988a0f0cc7cadfc4f686f086ef625d29b87154d894149008daabf8dcd811d7c7445c674f1aaf96a4daff9 SHA512 e3223ef0091c1a037666bbb5578cb0429d56a2cf62a259e6dcaacbbb9323c7238a544140881de7930d8cb033733df55c54d7f4baeb6a795916adcd4565e76199
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/psgml/psgml-1.4.0.ebuild b/app-emacs/psgml/psgml-1.4.0.ebuild
deleted file mode 100644
index 4d38464f5803..000000000000
--- a/app-emacs/psgml/psgml-1.4.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="A GNU Emacs Major Mode for editing SGML and XML coded documents"
-HOMEPAGE="https://sourceforge.net/projects/psgml/
-	https://www.emacswiki.org/emacs/PsgmlMode"
-SRC_URI="http://www.fsavigny.de/gpled-software/${P}.tar.gz"
-
-LICENSE="GPL-2+ Texinfo-manual"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-DEPEND="app-text/openjade"
-RDEPEND="${DEPEND}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	${EMACS} ${EMACSFLAGS} --load psgml-maint.el -f psgml-compile-files || die
-}
-
-src_install() {
-	elisp-install ${PN} *.el *.elc
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	insinto "${SITEETC}/${PN}"
-	doins *.map
-	doinfo psgml.info psgml-api.info
-	dodoc ChangeLog INSTALL README.psgml psgml.ps
-}
diff --git a/app-emacs/psgml/psgml-1.4.1.ebuild b/app-emacs/psgml/psgml-1.4.1.ebuild
index 465c0edee1d9..86642ee85300 100644
--- a/app-emacs/psgml/psgml-1.4.1.ebuild
+++ b/app-emacs/psgml/psgml-1.4.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2+ Texinfo-manual"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="app-text/openjade"
 
diff --git a/app-emacs/pymacs/Manifest b/app-emacs/pymacs/Manifest
index 14e536315ff7..7e31dada6007 100644
--- a/app-emacs/pymacs/Manifest
+++ b/app-emacs/pymacs/Manifest
@@ -1,6 +1,4 @@
 AUX 50pymacs-gentoo.el 183 BLAKE2B f1a4b874bb339b653c4fb6fb186bd7e531151c34d1df58be6963288d4443438fcae0f82c92a1667b4e7cb739bc2f7c6fd8d8d5f6d4e91413ee5bec47a609cc2e SHA512 f59fed86f859b796c901088b38fb570a5e5527d774a15456105ce75598c31fd20d0afaa62ad9cbf12063810fa592dbbd7c33aaece5871b36b488e5af6de0fac2
-DIST pymacs-0.25.tar.gz 120597 BLAKE2B 837c67d862c11d2a9d74cb55a055f60627834a50717d5386ec604db70a62270aa2ad3e56942602dc10a5f997ab3ce6d7f91e29a8c5b959144286182ad861b3bb SHA512 e17f7ee754413e21403d23894ee263fb0edae180a60c746b02cf101b2f0c782116e7bb61215bd0a8c689a991e211d780d220d4672b58f43108e7218a6f0c8dc0
 DIST pymacs-0.26.tar.gz 123373 BLAKE2B 0c467435d18ebcbe7b263e90096363e201dd84ba770fa702beefac4318a713954c316f335ee005ea88370be29c3710a7df04fb05b6efd3816beedbb88e38126d SHA512 ae245de130f435d947788c5ac11d8ce6534df80f70a4e35fff903f22d2b79b0f66925059ebaf53bde45cd6660ac0a8a224490f4f9e256a84e3a08f6468c14dd2
-EBUILD pymacs-0.25-r2.ebuild 1262 BLAKE2B 6e4eeff552b27f35f431d4d6fef5f101b54c7bccd9d5611178ba8aeb923f7fd47010f5ac27ea6e3c99f5c19740a5fe0aca551211377ec66e26135a70b70b1afc SHA512 2645b4972956b8f8888b1fd4daec39016414e8969c6f7027dbb2755f897a0b47ae6268b8fdcd54ac6b7a53a415a3afc6748a1cbe5b45e9c489918bf6bb39f39a
-EBUILD pymacs-0.26.ebuild 1348 BLAKE2B fb0d319688d2ffe7128cc527613b9b3c87c7b092af5e5170cf5fd5a193da136d45b9edfb13540fd92ee653ee0ba8286e0faea182c0a3d2b4fc5a416fd16a2ba0 SHA512 1f7c2b9a85eb7135ca64eef1b26d2d22a41268b6ca254c2e216c5c72e5369ae9bc68d0eff4bb4844a1036022f79c902316887e47d1fa4493f0dc9916ddcb08df
+EBUILD pymacs-0.26.ebuild 1342 BLAKE2B be9ef85e84c8aa3b2f47edde1f011fdcc16b9de330fa89350a9fce28acb40f9f20b3ef7b9c18df27e1424ee006876e66f8dd9fb98af3feef53db27529c43c122 SHA512 dd14bc1be14585a365307b6b45309f68e6441884b013bc32b6770697681df38b75ebf6446b72fb73526957b62366c9fc9ab2c4a3b03c863c4c9f2223b897aec0
 MISC metadata.xml 435 BLAKE2B 10ae4a8b61dfb10339404f38e37cafa1b66737a8f593bc4ba1c626b9d884ebb19dca555dbdf24b1418fec711f6b73865046cf50d58990980ab5115b1755ddd24 SHA512 bb1bdeb6695093fb0788f956059a6e081b98d8b769e2d336057954e85006dac277b756206f83565d52c2473dc45f3afb1087850e38843103f0ef7581a634eec0
diff --git a/app-emacs/pymacs/pymacs-0.25-r2.ebuild b/app-emacs/pymacs/pymacs-0.25-r2.ebuild
deleted file mode 100644
index e3a1c7e9908a..000000000000
--- a/app-emacs/pymacs/pymacs-0.25-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit elisp distutils-r1 vcs-snapshot
-
-DESCRIPTION="A tool that allows both-side communication beetween Python and Emacs Lisp"
-HOMEPAGE="https://www.emacswiki.org/emacs/PyMacs"
-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 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="doc"
-
-DEPEND="doc? (
-		>=dev-python/docutils-0.7
-		virtual/latex-base )
-"
-RDEPEND=""
-
-DISTUTILS_IN_SOURCE_BUILD=1
-SITEFILE="50${PN}-gentoo.el"
-
-python_prepare_all() {
-	sed \
-		-e '/pymacs-python-command/s/@PYTHON@/python/' \
-		-i pymacs.el.in || die
-	distutils-r1_python_prepare_all
-}
-
-# called by distutils-r1 for every python implementation
-python_configure() {
-	# pre-process the files but don't run distutils
-	emake PYSETUP=: PYTHON=${EPYTHON}
-}
-
-# called once
-python_compile_all() {
-	elisp_src_compile
-	if use doc; then
-		VARTEXFONTS="${T}"/fonts emake RST2LATEX=rst2latex.py pymacs.pdf
-	fi
-}
-
-python_install_all() {
-	elisp_src_install
-
-	distutils-r1_python_install_all
-	dodoc pymacs.rst
-	use doc && dodoc pymacs.pdf
-}
diff --git a/app-emacs/pymacs/pymacs-0.26.ebuild b/app-emacs/pymacs/pymacs-0.26.ebuild
index 77c813340aeb..74a77c24337f 100644
--- a/app-emacs/pymacs/pymacs-0.26.ebuild
+++ b/app-emacs/pymacs/pymacs-0.26.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/dgentry/${PN^}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 #IUSE="doc"
 
 #BDEPEND="doc? (
diff --git a/app-emacs/quack/Manifest b/app-emacs/quack/Manifest
index 61e319ea376a..3933cdf579bd 100644
--- a/app-emacs/quack/Manifest
+++ b/app-emacs/quack/Manifest
@@ -1,6 +1,4 @@
 AUX 50quack-gentoo.el 443 BLAKE2B 54f22bb597de98c092a0f520f0da43ecb1c0b3775aa49058c6210116f0cb9a4820a4b29703e1b64cb6975984b3c5be596b5d94efbd0639c67208e864ec37e49f SHA512 724a1903e7c801e59af487059373225ab5c9da02bb912364566dcd468f06067aa722061bb5e1c9284cfae200538550d3e5fbee24de997720f47af4cae10f90d7
-DIST quack-0.47.el.xz 44508 BLAKE2B 36b05926e019d191a21bac6e8e0d8f2c0228a4decee807f3ed61b145db56af5bdede43708c5e04d1f65f261b7de645a40a02a95f0300b8673b454293011903e9 SHA512 41775f5850518a8738aae9d7185c733ad4d5a778859a9d9a7235c84184fb7b84dd49d37a607291f39fac4ddc1cd507806a01dd19ab3351646ecf35e747feb8ce
 DIST quack-0.48.el.xz 44552 BLAKE2B c66cb3053b0ec9b2df6fefb3e383628e5c95a90a489fccd5a759c088e695f50e6ee1f12be213114aee99e91716e5f5549248a4188d85bbbe5546d958677a44d8 SHA512 ab6db23645c6c0582cfb9322139dcb2f45662473b1b32cc0eabda3243392e47b19cbba7a2ac3324519e877168e5694bb2d6ea76229a318d9c6c0cba4cc446dc7
-EBUILD quack-0.47.ebuild 368 BLAKE2B 5e126718546977ff957d913e5bd7956955cf6fab08ca976074350ce176a044c462c796c39ac06e855a032ca680fa0d94e8fdc61f9fcd477cd2a81f3489bbd0c0 SHA512 8d41f0d20afb492fcf9dc8814e5ec5970ac199422728a4d27da3918a226f424ef0f2845fdd89c62113f63a3d68a1096eb8da5828a8746c5606a2575cc667f176
 EBUILD quack-0.48.ebuild 365 BLAKE2B 1794a881103b76d7f3e6a4d044f259e44f5fcf39660704a038766acd2489f75bb7f193839d076b581b60a57c1e3a5225f50bc7d83efe827a83c4b8f1785b70f0 SHA512 2eb35f6ac0ae198883f3368ac983828426f934d1a768f248f21099ae2d35116d59f42a15280d58d8ca4acc74ad7643bc87a1d0f842293b0a031450907aa8dc3f
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/quack/quack-0.47.ebuild b/app-emacs/quack/quack-0.47.ebuild
deleted file mode 100644
index 2cae951f4432..000000000000
--- a/app-emacs/quack/quack-0.47.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="Enhances Emacs support for Scheme"
-HOMEPAGE="http://www.neilvandyke.org/quack/"
-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/ruby-mode/Manifest b/app-emacs/ruby-mode/Manifest
index 5f9894cfcdbb..10834da0b60b 100644
--- a/app-emacs/ruby-mode/Manifest
+++ b/app-emacs/ruby-mode/Manifest
@@ -1,12 +1,8 @@
 AUX 50ruby-mode-gentoo-2.5.0.el 493 BLAKE2B d6a26c800c7fe4b3ff7e795be725861bde5115bf0d83845ab55fb686ff445cbc00e24989d69424d30d16a1460dad7e66e56dc18ff2c7714ad6c03f2b5c8fa8fd SHA512 fe876332aca925ae085ab78f77abc5f32aac6eadc9e34decbd337d9f08c1e5f3d27bb72a577717565610e7606a2fc9061ff06d8ed7b5c6293eafe498b904f3f9
 DIST ruby-2.4.1.tar.xz 9939188 BLAKE2B 5be893c8996d17ff333276a772747d3099cec0c41331e1a1916679afc43a8ad5ed99a827bc76b32652ec950eaec933dbe28e1dde313987c2891f258ba7097af7 SHA512 e6fd290b6edd166348b70f0f1c56f7ed9d956c4c1eb91d97d0548041ca4196b9b75ec1ad35c745bdbfd4de195899093e7205d7f02b014ecf1c48e6f31cf25903
-DIST ruby-2.5.3.tar.xz 11453336 BLAKE2B 66c59448a23c22796b43f04a1f84359386b7bee7163da4255426ea75b1c7af0a7a7142991b870a75a72ded56ac49f47c51bc162ebf2be2af0d1b1608b60c02df SHA512 6dcae0e8d0bacdb2cbde636e2030596308b5af53f2eb85d3adccb67b02e6f8f9751e8117d12f8484829fdd9d995f6e327f701d9b433bcf94f1f59d13a1fd7518
 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 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.5.5.ebuild 505 BLAKE2B 149545702966852e6c5087563463176348044677834bb578fc63ccaad53f76b1da0cc286b586b33dea6ee49b40b1b5fb6b288e11289a06d5bf29030da2f3106d SHA512 c5f74c6646b31f09db24eb1632d082665f379a0039b9ccdec281e27b308799bb435b68d9bee4059d302a8f5b02baea1847c085726e26ddad9de7895c41da1861
 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.5.3.ebuild b/app-emacs/ruby-mode/ruby-mode-2.5.3.ebuild
deleted file mode 100644
index 17e27bf7d62b..000000000000
--- a/app-emacs/ruby-mode/ruby-mode-2.5.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp
-
-DESCRIPTION="Emacs major mode for editing Ruby code"
-HOMEPAGE="https://www.ruby-lang.org/"
-SRC_URI="https://cache.ruby-lang.org/pub/ruby/ruby-${PV}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-S="${WORKDIR}/ruby-${PV}/misc"
-DOCS="README"
-SITEFILE="50${PN}-gentoo-2.5.0.el"
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 17e27bf7d62b..a4975e61bc42 100644
--- a/app-emacs/ruby-mode/ruby-mode-2.5.5.ebuild
+++ b/app-emacs/ruby-mode/ruby-mode-2.5.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://cache.ruby-lang.org/pub/ruby/ruby-${PV}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~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
deleted file mode 100644
index 6959b4080a38..000000000000
--- a/app-emacs/ruby-mode/ruby-mode-2.6.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit elisp
-
-COMMIT=75bccbb384e6907df47ab69acdccb4536806c890
-
-DESCRIPTION="Emacs major mode for editing Ruby code"
-HOMEPAGE="https://www.ruby-lang.org/"
-SRC_URI="https://github.com/ruby/elisp/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-S="${WORKDIR}/elisp-${COMMIT}"
-DOCS="README"
-SITEFILE="50${PN}-gentoo-2.5.0.el"
diff --git a/app-emacs/scim-bridge-el/Manifest b/app-emacs/scim-bridge-el/Manifest
index d05dceca61de..dbd516362a04 100644
--- a/app-emacs/scim-bridge-el/Manifest
+++ b/app-emacs/scim-bridge-el/Manifest
@@ -1,4 +1,4 @@
 AUX scim-bridge-el-0.8.2-im-agent.patch 1052 BLAKE2B 4b84943a73ddfc0b30218d27cff86e89294412c9c4a4b2a108283902ac5ab5ec6c300f077482aea79be39c30be39708b9c2d5500dd442118ec22db5c740f6779 SHA512 bded77c74c13d0c0a3a3ba13cb5865d9ecd6abf00ed5d4a0d01e6e482a52211ca3a665a3a8ed5a098e6840b13327a80f9ebc2258023fe5d1b7c1f50693fd527b
 DIST scim-bridge-el-0.8.2.tar.gz 67369 BLAKE2B 453c6d458e9ade8971de1adcceeb10e0d9c6ee7a090a0986cdcf419ec8b2b4422eb8b6ebe1e2a8f3d22330759b2af5e9cc3aac5db37a4d837de9d3d677a9ceff SHA512 2d173acb2d0182cd4c1fb6301cb34de0a5a08f4776e9dcec16bf2d1342bea98765c55d61cb7d666c42c2bb8c63d3083f4d4e59dbbec13a6ec72c7c48350c5c0c
-EBUILD scim-bridge-el-0.8.2.ebuild 541 BLAKE2B 83e0da79950edb018258400ec68ee6e8f94f2f124b6d652bbe8a0732e5f23fda0c0cb9d06df05caef0aa1472c56d91c1d232caba668c3bbe2b4ac3c45bf11b65 SHA512 bc584a655959ef40938431874c3528f0ccae5db5c43936478da0d00188a5785ac1f0d9bc37ac9b843ff3b1be6d5bdbca805cb0a79b4aeb6c61fa38e0c9bba604
+EBUILD scim-bridge-el-0.8.2-r1.ebuild 472 BLAKE2B 7921cb52f10f73d1122e1145a2aa521a06585e838465243ba602a91c6517e6999e9a1c50241f22f091de574d427f8ca381aa468a032eba7657cbace68178ac94 SHA512 ea8b17e406724aa7484cb026785add8a8b0b1ed25baa0269a5862849c03a048f8542e00cff076d2e186efe833d0eb15c5c37c00261a7ad1164a1a7a477abefb0
 MISC metadata.xml 510 BLAKE2B 55249e3ffff3f3b164cf313e805bf248d11903bb812ddfe12d075eba914321a1e66511417f32b1d420134b3645582129a6c3039a9b8f07d556ac71201a687d40 SHA512 b9f40804261cc6282cf473b77ad7bd938abe6dd19b44d09654ac549544349bfca039f12aa8b3c5cef09298a326dc4fe4f9cdd79582137ea9fdf0856e89e53b1d
diff --git a/app-emacs/scim-bridge-el/scim-bridge-el-0.8.2.ebuild b/app-emacs/scim-bridge-el/scim-bridge-el-0.8.2-r1.ebuild
index d65a356fb331..a7f1267c7974 100644
--- a/app-emacs/scim-bridge-el/scim-bridge-el-0.8.2.ebuild
+++ b/app-emacs/scim-bridge-el/scim-bridge-el-0.8.2-r1.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit elisp versionator
+EAPI=7
+
+inherit elisp
 
 MY_PN=${PN/-el/.el}
-MY_BR=$(get_version_component_range 1-2)
+MY_BR=$(ver_cut 1-2)
 DESCRIPTION="a SCIM-Bridge client for Emacs"
 HOMEPAGE="https://launchpad.net/scim-bridge.el"
 SRC_URI="https://launchpad.net/${MY_PN}/${MY_BR}/${PV}/+download/${P}.tar.gz"
@@ -13,11 +14,7 @@ SRC_URI="https://launchpad.net/${MY_PN}/${MY_BR}/${PV}/+download/${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
 
-DEPEND=""
 RDEPEND="app-i18n/scim"
 
-src_prepare () {
-	epatch "${FILESDIR}"/${PN}-0.8.2-im-agent.patch
-}
+PATCHES=("${FILESDIR}"/${PN}-0.8.2-im-agent.patch)
diff --git a/app-emacs/session/Manifest b/app-emacs/session/Manifest
index 99884e87adde..cc70eb9089c6 100644
--- a/app-emacs/session/Manifest
+++ b/app-emacs/session/Manifest
@@ -1,6 +1,4 @@
 AUX 50session-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
-DIST session-2.3a.tar.gz 26648 BLAKE2B 6380e9c31c37afc99229bbe63ce86f0e80340e093c9ec859adbc688e10e8e6f9b40153344fe02336e9336dcbc7c40e0a2337d82a90d0a40f161b5e4b062988a7 SHA512 eb0721c780256ca5dfcdf5071d73a89e3e7e477bbe2ddc380adaf7a7cbf870bbc0e334192f59362df93571ff91063d53df918761322e31d7c6ffa8059d4bc15a
 DIST session-2.4b.tar.gz 21227 BLAKE2B 7caa73e2783bb871531e0a445fa0a93a6e422b81b5912fba9415eb94baccf8db0732f6cd05e9e3796ba7e9dc6b85e831169862215b14686580b86a613f04d006 SHA512 2474c063b07463c09d621d095c46f87256799046a0b5a4e8dba49382e9d7da74579dce725d376b8c32fd0935a519088ec5a401d6ea8062c3fead4e53efa7c5ed
-EBUILD session-2.3a.ebuild 634 BLAKE2B bce709f072f9a3b988707117914f21e737a7f72e2136b41d2b555e09092b4eb3e6f5a790af309a1a1aeef05bfde8f82a0bcb05e1ba8b4ea71f50b8de4465bcc7 SHA512 9e93e4950902c675a456cd18418c6c48546eab2e696f47817f16116aee0295e33ab5904f05a12ba597067c28cba75ecfe8fc5c89197aba577cb3884832036016
-EBUILD session-2.4b.ebuild 588 BLAKE2B 0c3be5287d97af4c54443faea883a92b4a37740a18d4dd5729f17cf5d331b200423c49eb6584b891ac09b6dbdfded6bdd0e381f13490f266616d4e7384cd6719 SHA512 6a773324a35bb9292186e554d737b915b7d8ee32d6dd8f325b3139d4a4fd0594e4dc14df4cea8849002bf2155dabaf6083536f4e3b0fe8552fa18b25958d1a6a
+EBUILD session-2.4b.ebuild 585 BLAKE2B b14d43339e5df6ab33f0608a818d74da1499715f2acb799224c6656c99822925882bbe27818d69980b4281c9d2d7a1d02afae88910df72eb857320ee1b9927f2 SHA512 16ffd833c3d5af7102d000c0e1dafd0cc7dd649c6fba5431ffc8a20d9bc9c759bd2371b5fd7bfa9ccaece9d39c9d49889fdfe5f18998f99ddbec517052c2e61e
 MISC metadata.xml 363 BLAKE2B 4957fd40e9e3161aad4fb8784651fb49b64a8befdb8734944a75a5b4d3987cec07fcb951582b871eb382cc4270dda606ea8df2b72cfd0856468813091efb0f41 SHA512 cb7cd548a5fb5f36b2b3bab8eee175bb21903d2baefa4230806812a6281a5860b31afe0bde4345cb4e1f3918601a795ee0906ef22e2fbd2f5f7a03618c7210d5
diff --git a/app-emacs/session/session-2.3a.ebuild b/app-emacs/session/session-2.3a.ebuild
deleted file mode 100644
index 1652c1126531..000000000000
--- a/app-emacs/session/session-2.3a.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit readme.gentoo elisp
-
-DESCRIPTION="When you start Emacs, Session restores various variables from your last session"
-HOMEPAGE="http://emacs-session.sourceforge.net/"
-SRC_URI="mirror://sourceforge/emacs-session/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-S="${WORKDIR}/${PN}/lisp"
-SITEFILE="50${PN}-gentoo.el"
-DOCS="../INSTALL ../README ChangeLog"
-DOC_CONTENTS="Add the following to your ~/.emacs to use session:
-	\n\t(require 'session)
-	\n\t(add-hook 'after-init-hook 'session-initialize)"
diff --git a/app-emacs/session/session-2.4b.ebuild b/app-emacs/session/session-2.4b.ebuild
index 9e6d4b7720cb..47b871c16f90 100644
--- a/app-emacs/session/session-2.4b.ebuild
+++ b/app-emacs/session/session-2.4b.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/emacs-session/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 S="${WORKDIR}"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/slime/Manifest b/app-emacs/slime/Manifest
index 912e6615e228..c7bff3bb1b27 100644
--- a/app-emacs/slime/Manifest
+++ b/app-emacs/slime/Manifest
@@ -11,8 +11,8 @@ AUX swank-loader.lisp 68 BLAKE2B 6cc412c9e0d5357835741486c7c26dd58edaef9d8a4544b
 DIST slime-2.15.tar.gz 1072190 BLAKE2B 7623d2d109486e35cb94a3bd8a6b72008c28fbc0bac5bdbcde5fcde19b2ebc74d488a6ff67f026922ea716e67ac732cc72f7b984cc4c2574f57323db93de300c SHA512 15f943981e35995b225b168a3d1c2099f7205c2ff359fa209f164464caf05f9fab4d24906442d94ddeb4222f7116d09a832c7377baf95fbe02d6a98a721fd611
 DIST slime-2.20.tar.gz 803127 BLAKE2B 9a6e50d50da4c9f8f2226ec919cf7f2068ae93a0bac0301233c2d75f12e94e3345998093880d7836fab07d8541da86de928308cfe571ee5811da6de9bfa11b31 SHA512 994dbffb54ee1ab4ca529771451724c83ff83992a6d495e06cdca5cd94f0c098e48d7914489278e3015f18ea094d58c469e57301492087a33087562f69506b46
 DIST slime-2.21.tar.gz 810610 BLAKE2B d5126e60fb04af2c712426dc9b701cfcabb04a16ab4df6ee138c9f77280fa892e608a04f1af1154b42f7063cc85464146e9a9b10f2a223b5d8015ed49eb1ee1c SHA512 6cc0d865bda2b1a4d806564e4e7d0c9cff739aba16d21ffd47c6a7353e45d332506014ba54f6a0fcfbc97d4c2d3d864f02c2d144cd4d8d06b9b19dafa8f8be3c
-EBUILD slime-2.15.ebuild 3809 BLAKE2B 17727a8c2ed4f026ac4578d6bc3f7631c02108bb7c982da9b06d93033caf352153cd227637f52fbaba9e8093b55ae45b84dd60e0af1efc67cbafb3570f187fd9 SHA512 fc7afdef43a6815f4af457064e8fea8b8b2dc50791efd9956d5b5b2b281bbb8c6554bac454785dc5762f631cc427c0d23add2085c661803f9e8ef655bb6eee79
-EBUILD slime-2.20-r1.ebuild 1832 BLAKE2B 616eda3d92ec1710f26de61e05bbea0b88fd2c3b3e1587a1511ed9fba75b16b544728d018c789219d1ef8223f57aa4b1664b25a4a3502d2c3dae0640139e20d2 SHA512 26fdca6c0d661219ec94e112e21ca4688915da1a3f33d7ec2f8e8cb7fbc99766518b16021c6a0f1d5c305823ff94472c44b24a53dd8758b43aae3f4afce00245
-EBUILD slime-2.20.ebuild 1740 BLAKE2B d762c6475376871762197c2f2c3aa8a4800991cebc67467c6696b96f6bc6e370f9a5f65d1479dae0e522a97f62e3533a4a72228dd724c9e58f50278ed5906dcc SHA512 793859aa3874accd77810f27ec116a9e52c82d88d77c9b86212422b4084cc6a28cb7a99744a9fd0244519a8e2f60621afea059cbb2e1425ab5126a61cf9dcbf2
-EBUILD slime-2.21.ebuild 1728 BLAKE2B 932901636fe16f54486ba3b3e14b18eafcc8cdfd5b527acd2a3306a4e6e1dd6e9f83244348af3efa5b8d8b27aaa6a842503d64aa8c4666e902f9ef056ced2d90 SHA512 874e8b94c213d23446410b0c2e10f6d96a08a62baaf75dba01e30083c26f38b0cb54e6ca8221ac1e004830f10362072fe318f4ca44dba5e5d2e38cd42961e881
+EBUILD slime-2.15.ebuild 3618 BLAKE2B 37ffcb7020e8b5f8cb59824569acae9f719727d912504a519a107d2d95b6bfa7670e837d2f84b330d6292f6b2e5e65abb2fcc25ec92790db37670da42962f5f6 SHA512 1c239ba7b0e40a364404f6969a1c087eefd86eb69a8b96bc8b99d1f102ae4ebdc28a9d06c987270cc611e51a220f122c2da66a3fa1788261322db2c649f7b9de
+EBUILD slime-2.20-r1.ebuild 1643 BLAKE2B 056293286e46dbe6ac2a4431c2cd4e4de9332442c61c643d269e23f2cd03d4eb8275578921157ab7c9d40167c582b3cca6fff207ce3fdab97e169d4680df4cd6 SHA512 79d2df52696e9064fce5cd6e4f8aa1b04dd6104ee765ec32d41a79792629807519a3ac35ffef228c06e23cf072fe31d11b1be332c86e62537f9ddd740181f85b
+EBUILD slime-2.20.ebuild 1578 BLAKE2B eb0f4c64acf32e16aca61fb924c2341d6c40fb7eef5255bcdfd5a3f49ed7f80b9fafb512965cfcac1a7afb1ff5e360a4a0611fa38f36d2f2c4725c4ab80db681 SHA512 59d1215a0e2b2643a4cef230e826fd5c7d313edea7bb26b1d1ffafffa564c9827cb367509d903b4477d72e0262ceb416cfe99801ed322886320b5a35d4c040e3
+EBUILD slime-2.21.ebuild 1539 BLAKE2B e6ad197011b7b3d0cd04868be4cd8e661536d6ff402db60fe72416f23e3b61c9cd8987f46ccdfdf46722bee157cfdafbaf2d54022b06630e26665e7128ab7aba SHA512 a9ab6dd51ae48d4af5bc9d713f7cf6ab330caef793dac22160a1e67113070f06e1a6e478e3a5c95d976f0e3a0e7dddae5f06719cdad9333aed5be400cd82ef9b
 MISC metadata.xml 1681 BLAKE2B b064702addc588a618896d83ab0e20a5b867972621473b97dc131a9b3f4c9305576323084130fc181c5f260cd46ae042f719e9956f414a3ba7c1c9d677f0f6b0 SHA512 0387efe8e517d3dab2a609bd63a914b264dfd922e1e985aabe958f4dbe45d7effdafd15b9ca1d2a63cd269f25d36b01524af542e9203b28e64044a47a9d7d5da
diff --git a/app-emacs/slime/slime-2.15.ebuild b/app-emacs/slime/slime-2.15.ebuild
index 26d86bd44bde..985b5d35c782 100644
--- a/app-emacs/slime/slime-2.15.ebuild
+++ b/app-emacs/slime/slime-2.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -81,24 +81,23 @@ src_prepare() {
 }
 
 src_compile() {
-	elisp-compile *.el || die
+	elisp-compile *.el
 	BYTECOMPFLAGS="${BYTECOMPFLAGS} -L contrib -l slime" \
-		elisp-compile contrib/*.el lib/*.el || die
-	emake -j1 -C doc slime.info || die "Cannot build info docs"
+		elisp-compile contrib/*.el lib/*.el
+	emake -j1 -C doc slime.info
 
 	if use doc; then
 		VARTEXFONTS="${T}"/fonts \
-			emake -j1 -C doc slime.pdf || die "emake doc failed"
+			emake -j1 -C doc slime.pdf
 	fi
 }
 
 src_install() {
 	## install core
-	elisp-install ${PN} *.{el,elc} "${FILESDIR}"/swank-loader.lisp \
-		|| die "Cannot install SLIME core"
+	elisp-install ${PN} *.{el,elc} "${FILESDIR}"/swank-loader.lisp
 	sed "s:/usr/:${EPREFIX}&:g" "${FILESDIR}"/2.0_p20110617/${SITEFILE} \
 		>"${T}"/${SITEFILE} || die "sed failed"
-	elisp-site-file-install "${T}"/${SITEFILE} || die
+	elisp-site-file-install "${T}"/${SITEFILE}
 	cp "${FILESDIR}"/2.0_p20110617/swank.asd "${S}"
 	# remove upstream swank-loader, since it won't be used
 	rm "${S}"/swank-loader.lisp
@@ -106,13 +105,11 @@ src_install() {
 	common-lisp-install-asdf swank.asd
 
 	## install contribs
-	elisp-install ${PN}/contrib/ contrib/*.{el,elc,scm,goo} \
-		|| die "Cannot install contribs"
+	elisp-install ${PN}/contrib/ contrib/*.{el,elc,scm,goo}
 	common-lisp-install-sources contrib/*.lisp
 
 	## install lib
-	elisp-install ${PN}/lib/ lib/*.{el,elc} \
-		|| die "Cannot install libs"
+	elisp-install ${PN}/lib/ lib/*.{el,elc}
 
 	## install docs
 	dodoc README.md ChangeLog CONTRIBUTING.md NEWS PROBLEMS
diff --git a/app-emacs/slime/slime-2.20-r1.ebuild b/app-emacs/slime/slime-2.20-r1.ebuild
index 8c79ae0d45c3..90d933d93e25 100644
--- a/app-emacs/slime/slime-2.20-r1.ebuild
+++ b/app-emacs/slime/slime-2.20-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -37,11 +37,11 @@ src_prepare() {
 }
 
 src_compile() {
-	elisp-compile *.el || die
+	elisp-compile *.el
 	BYTECOMPFLAGS="${BYTECOMPFLAGS} -L contrib -l slime" \
-		elisp-compile contrib/*.el lib/*.el || die
+		elisp-compile contrib/*.el lib/*.el
 
-	emake -C doc slime.info || die
+	emake -C doc slime.info
 	if use doc ; then
 		VARTEXFONTS="${T}"/fonts \
 			emake -C doc all
@@ -50,19 +50,18 @@ src_compile() {
 
 src_install() {
 	# Install core
-	elisp-install ${PN} *.{el,elc,lisp} || die "Cannot install SLIME core"
+	elisp-install ${PN} *.{el,elc,lisp}
 
 	# Install contribs
-	elisp-install ${PN}/contrib/ contrib/*.{el,elc,lisp,scm,goo} \
-		|| die "Cannot install contribs"
+	elisp-install ${PN}/contrib/ contrib/*.{el,elc,lisp,scm,goo}
 
 	# Install lib
-	elisp-install ${PN}/lib/ lib/*.{el,elc} || die "Cannot install libs"
+	elisp-install ${PN}/lib/ lib/*.{el,elc}
 
 	# Install swank
-	elisp-install ${PN}/swank/ swank/*.lisp || die "Cannot install swank"
+	elisp-install ${PN}/swank/ swank/*.lisp
 
-	elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die "Cannon install site file"
+	elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 	# Install docs
 	dodoc README.md CONTRIBUTING.md NEWS PROBLEMS
 	newdoc contrib/README.md README-contrib.md
diff --git a/app-emacs/slime/slime-2.20.ebuild b/app-emacs/slime/slime-2.20.ebuild
index d03c14d9dbf8..26655e54934d 100644
--- a/app-emacs/slime/slime-2.20.ebuild
+++ b/app-emacs/slime/slime-2.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -37,11 +37,11 @@ src_prepare() {
 }
 
 src_compile() {
-	elisp-compile *.el || die
+	elisp-compile *.el
 	BYTECOMPFLAGS="${BYTECOMPFLAGS} -L contrib -l slime" \
-		elisp-compile contrib/*.el lib/*.el || die
+		elisp-compile contrib/*.el lib/*.el
 
-	emake -C doc slime.info || die
+	emake -C doc slime.info
 	if use doc ; then
 		VARTEXFONTS="${T}"/fonts \
 			emake -C doc all
@@ -50,19 +50,18 @@ src_compile() {
 
 src_install() {
 	## install core
-	elisp-install ${PN} *.{el,elc,lisp} || die "Cannot install SLIME core"
+	elisp-install ${PN} *.{el,elc,lisp}
 
 	## install contribs
-	elisp-install ${PN}/contrib/ contrib/*.{el,elc,lisp,scm,goo} \
-		|| die "Cannot install contribs"
+	elisp-install ${PN}/contrib/ contrib/*.{el,elc,lisp,scm,goo}
 
 	## install lib
-	elisp-install ${PN}/lib/ lib/*.{el,elc} || die "Cannot install libs"
+	elisp-install ${PN}/lib/ lib/*.{el,elc}
 
 	## install swank
-	elisp-install ${PN}/swank/ swank/*.lisp || die "Cannot install swank"
+	elisp-install ${PN}/swank/ swank/*.lisp
 
-	elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
+	elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 	## install docs
 	dodoc README.md CONTRIBUTING.md NEWS PROBLEMS
 	newdoc contrib/README.md README-contrib.md
diff --git a/app-emacs/slime/slime-2.21.ebuild b/app-emacs/slime/slime-2.21.ebuild
index aa82b5505f38..a8d36329a5a5 100644
--- a/app-emacs/slime/slime-2.21.ebuild
+++ b/app-emacs/slime/slime-2.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,11 +32,11 @@ src_prepare() {
 }
 
 src_compile() {
-	elisp-compile *.el || die
+	elisp-compile *.el
 	BYTECOMPFLAGS="${BYTECOMPFLAGS} -L contrib -l slime" \
-		elisp-compile contrib/*.el lib/*.el || die
+		elisp-compile contrib/*.el lib/*.el
 
-	emake -C doc slime.info || die
+	emake -C doc slime.info
 	if use doc ; then
 		VARTEXFONTS="${T}"/fonts \
 			emake -C doc all
@@ -45,19 +45,18 @@ src_compile() {
 
 src_install() {
 	# Install core
-	elisp-install ${PN} *.{el,elc,lisp} || die "Cannot install SLIME core"
+	elisp-install ${PN} *.{el,elc,lisp}
 
 	# Install contribs
-	elisp-install ${PN}/contrib/ contrib/*.{el,elc,lisp,scm,goo} \
-		|| die "Cannot install contribs"
+	elisp-install ${PN}/contrib/ contrib/*.{el,elc,lisp,scm,goo}
 
 	# Install lib
-	elisp-install ${PN}/lib/ lib/*.{el,elc} || die "Cannot install libs"
+	elisp-install ${PN}/lib/ lib/*.{el,elc}
 
 	# Install swank
-	elisp-install ${PN}/swank/ swank/*.lisp || die "Cannot install swank"
+	elisp-install ${PN}/swank/ swank/*.lisp
 
-	elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die "Cannon install site file"
+	elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 	# Install docs
 	dodoc README.md CONTRIBUTING.md NEWS PROBLEMS
 	newdoc contrib/README.md README-contrib.md
diff --git a/app-emacs/sml-mode/Manifest b/app-emacs/sml-mode/Manifest
index 2c06f23fcb09..b383cae31a9a 100644
--- a/app-emacs/sml-mode/Manifest
+++ b/app-emacs/sml-mode/Manifest
@@ -1,6 +1,4 @@
 AUX 50sml-mode-gentoo-6.1.el 72 BLAKE2B e4b7e4fa2f440410e323da54183257aff3bf555ebaa5e1d3d579375b9bbc5e77bfa1af68e4d305013ca07d9a16df2618d3b5eca6035a42810f87f3abf8bfbab0 SHA512 f8b15038063e9419a5dbcb9b98696df8d431d86806e06d24645671d3c3b5b79c3c31e32330efbbbc0b72a38c841273a14f998bb62ca0cacaf3483507ec8d7444
-DIST sml-mode-6.4.el.xz 20512 BLAKE2B ec82b44e7e1ff9d4c89ffdec6d29afddb2bb5a62474dfef417409496fd374373aca53f3a850990972e888ec2dc006606a06c63e327316e28552273d7995cd38e SHA512 238c69cf34bdd9b825fdc00e65741a458e64bf4bf38ed96ba0518154dd92f25877d56d09f4c13271577ea8641ca828023db950db07a42fe1a02659527b65cb5b
 DIST sml-mode-6.9.el.xz 20368 BLAKE2B 5b97c6620d97a60f29e21e8d69179e33f56b7410bf975238e23ef10d4c9e8d7dc250cb60d1799224ac6c81285f539cbb7f69b616763b347ed7140b9652b9add7 SHA512 e04143e1017317d6c6fb3ad7a26cd812bb45dd406a5fb679be21ae936ab57739bcf692585d5710a8e08c469a07728a20cb71ff1b53661c4040eb16df55c8be0b
-EBUILD sml-mode-6.4.ebuild 500 BLAKE2B b55d6c334be8bd80667740d582d2e3f18dab432fa5a559f900f2b2528f4c3e256972842d45bf92e1a73fbb9178aa0388e9d6bdda87f107345dfa9a2dd07fb671 SHA512 a1d7a446d46b78b50efd2d907efab0aa2363fc2742602e7c183cb8770d994c931597b6ae15c194da1b9d0909de26b1561c12a7e289e600f969772cdeca8f8590
-EBUILD sml-mode-6.9.ebuild 568 BLAKE2B d6d8ee1c09d45465fbbd0086fee2034170879e9b895c71b1705d6aca5a51f2d0f2ec8b4eca378b93d52922f6ea4e64d3c10bf9587ad99563ce120105542af866 SHA512 2e62badab973f399fd4f0757c5fe3a20da607fa0031e0200df200ea39bfc0363aa8cfd2d088bf601b49b59b0648bca462d9519963fc6d36014a8342f102d6f17
+EBUILD sml-mode-6.9.ebuild 564 BLAKE2B fa35ab165cf03d50ec4b591c7111f34d546aad0797458c7321282905065b8d4034d0fc7075b90e0168820b0175248d1ba9e866b719bae38eca19880953cefe2b SHA512 c34f1dea6470706f24a8f2cf2fb1a8434e893d815b0352ae633d0ee3024b5a5bf0c0e12bcd9996d249d0a3ba229174ae7d4b2767b97a3aada4b329878e93952d
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/sml-mode/sml-mode-6.4.ebuild b/app-emacs/sml-mode/sml-mode-6.4.ebuild
deleted file mode 100644
index 7eb5bbb42718..000000000000
--- a/app-emacs/sml-mode/sml-mode-6.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-NEED_EMACS=24
-
-inherit elisp
-
-DESCRIPTION="Emacs major mode for editing Standard ML"
-HOMEPAGE="http://www.iro.umontreal.ca/~monnier/elisp/"
-# taken from https://elpa.gnu.org/packages/${P}.el
-SRC_URI="mirror://gentoo/${P}.el.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc x86"
-
-SITEFILE="50${PN}-gentoo-6.1.el"
-
-src_compile() {
-	elisp-compile *.el
-	elisp-make-autoload-file
-}
diff --git a/app-emacs/sml-mode/sml-mode-6.9.ebuild b/app-emacs/sml-mode/sml-mode-6.9.ebuild
index dd9b5fb272ab..15655d5fb8ea 100644
--- a/app-emacs/sml-mode/sml-mode-6.9.ebuild
+++ b/app-emacs/sml-mode/sml-mode-6.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+KEYWORDS="alpha amd64 ppc x86"
 
 SITEFILE="50${PN}-gentoo-6.1.el"
 
diff --git a/app-emacs/template/Manifest b/app-emacs/template/Manifest
index 54739fb7dd4e..2d15d7ab60f8 100644
--- a/app-emacs/template/Manifest
+++ b/app-emacs/template/Manifest
@@ -1,6 +1,4 @@
 AUX 50template-gentoo.el 968 BLAKE2B ed1a12d4f1df94576e0ac7b03bc5a237ae0252ef247780c0fba30f2c4f4d5d72949a9dd9a32c7e91dc08db8e5175ab1138f4b3667397230171fc4d3c9fee79bf SHA512 a6c4fd122ae1daa7e0a07b259dba0581cdd7868d220c107c6979ef5f842659dc51c0573948979d9907241918686b48da4a89baff33abdcb12bfb30941a068396
-DIST template-3.1c.tar.gz 37903 BLAKE2B c6bcd602727d6a6bd60c1b26694b98b28f4f7c752c8c31cd2ad9359297265579b1317effadad956e5aba455b22714985367e84f3295528a1dcc09ff50bf9882d SHA512 d9fee39b67ff986d7c2dccbd09af3ce208f0e1a616a406fefefe4a6399f69a3527fa5609e87d41f7ceec5bf95818a62cb8da62994b28945998f8a9074821914c
 DIST template-3.3b.tar.gz 60370 BLAKE2B 7263faa93dee81f1a5214cebf20bef95dc13a69a8437438849c8377eec784881f952680b4ed52ebf6bbe7dc943a4e77aeb86722772698466aa76506e85ffd146 SHA512 7ca098e1be70ed75b78a7d5e0b216c1cf83d6b2873414cbd09af8aca09f275732ab811204094aed25bd03631590df2b9ddf614fc9df9b4e944ca8c62d6364c1c
-EBUILD template-3.1c-r1.ebuild 637 BLAKE2B c7650230d15b08ba5df4a15c027264bb6350fef406625a8d6c74fbf063c51a483f4566f7c6ae059ae1ad42a839148b6c4f379d1a9fed8c4b47a088cf740970de SHA512 601ef1ba2db841a2be31f8f0cb9049b5c4e596073284fedd82c79af20fb6ad42c145e64c8e61caa6bf14df0064e5414fbbf597e5a28497e9c1ca4461de6c01bc
 EBUILD template-3.3b.ebuild 587 BLAKE2B e324fa957f984135d55097925aedee732d0d527f56007e60880ce7d7a111398a99f975f05a72e41226699b2b1dc63732ff55b54112e31b8965db4c4f561b11c1 SHA512 e855ce0bfe6b45ad1884356a2434a1cb1282495ccb75d0ec95a574cfaae0e45f514b2eddc80a5a8f273ba2af211f52d89a880d7144d56a449117c6371d123a05
 MISC metadata.xml 364 BLAKE2B 51a9622045ca4a82d2ba9387fbba67f0c0e42de533bf282b0484c0fdc1e2f9abce019cf26ab9319ab6f22d9064698299ef2a253517153e6f19f68594659b1730 SHA512 ad25ac4e50e673d017b8c85ac0d69c0794995a17a915fab741e97d966d0478d4523f833f890afeb2d4e0aa31907fb25fc505b282f95fd7a223c2902a0e0b2086
diff --git a/app-emacs/template/template-3.1c-r1.ebuild b/app-emacs/template/template-3.1c-r1.ebuild
deleted file mode 100644
index 4de14534d3c4..000000000000
--- a/app-emacs/template/template-3.1c-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="Use templates, decorate comments, auto-update buffers"
-HOMEPAGE="http://emacs-template.sourceforge.net/"
-SRC_URI="mirror://sourceforge/emacs-template/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/${PN}"
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	elisp-compile lisp/*.el
-}
-
-src_install() {
-	elisp-install ${PN} lisp/*.{el,elc}
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-
-	insinto "${SITEETC}/${PN}"
-	doins -r templates
-	dodoc README lisp/ChangeLog
-}
diff --git a/app-emacs/treepy/Manifest b/app-emacs/treepy/Manifest
index 27bcfff45249..30f05437a062 100644
--- a/app-emacs/treepy/Manifest
+++ b/app-emacs/treepy/Manifest
@@ -1,4 +1,4 @@
 AUX 50treepy-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
 DIST treepy-0.1.1.tar.gz 125004 BLAKE2B 2aab285f0a0ce0d14cde0d6567efd062d4e2bf944421e8c4e5c3ef62965a43c7abc77d88c5baeadbe2cbe4e98dce9d563fc5b02abae8e83194dbb058d78db725 SHA512 70790f83e7f33846ca4c568c79c45bfea9a29cc92b717053eb2fa89a22a77578d80f31f19002c61d254d4b2c4c36f345324c0d631412477f09713b51124dfb83
-EBUILD treepy-0.1.1.ebuild 458 BLAKE2B b19bbfd27326fccfe2adbf1de4facd8936bc953e5255441eda908f4dd3edb45f2999d0fac07f21bcef3dc3dfec0702829da034de8106575b2238121e93361c62 SHA512 e9bbc5d8655f584c723993e5deb50991209848a52cf716ae19ec73b4f25c9d373f7010a7f290a5b2a00554bb0f75ff852091f1d1dc562aefddeb8fa9188467dc
+EBUILD treepy-0.1.1.ebuild 456 BLAKE2B 6646ce95b766db53c6bb74413666d46c93bd05f1a25e289bfa07d01cde6c20642dd965bcf5400b0dafaf1b2946a1810ac03841b700a77d25a908224df04b709c SHA512 762dd1bbd6fac5889e49d0cf8110e0fcf7067c2bf11f423dff4ed1831bd9cd671918a4e8bca56ee01ff9b9368824c6b650c4bb758290a06469b71f08662e645c
 MISC metadata.xml 618 BLAKE2B 949af96bccf3ac8eae49864c76bac1d675d470e1b9ea9f4cd4a3fa674a97450a6591a08b1bb569a6c1ec477f20bd38b9d0a0808005c95bb6e0c919986d78692a SHA512 1289a6357bcda76f8bf2f7fc35638e2f6e26e3cdf895ba31acf66253bc827fbb7122c215ad795c68a9309574b97af0487bc3c7d81404e92be91adde9f4d6504b
diff --git a/app-emacs/treepy/treepy-0.1.1.ebuild b/app-emacs/treepy/treepy-0.1.1.ebuild
index af73e96d9363..60192956e0d2 100644
--- a/app-emacs/treepy/treepy-0.1.1.ebuild
+++ b/app-emacs/treepy/treepy-0.1.1.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,7 +13,7 @@ S="${WORKDIR}/${PN}.el-${PV}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 SITEFILE="50${PN}-gentoo.el"
 DOCS="README.md"
diff --git a/app-emacs/tuareg-mode/Manifest b/app-emacs/tuareg-mode/Manifest
index 5089be20f801..125766eb892e 100644
--- a/app-emacs/tuareg-mode/Manifest
+++ b/app-emacs/tuareg-mode/Manifest
@@ -1,4 +1,4 @@
 AUX 50tuareg-mode-gentoo.el 343 BLAKE2B 15545f9aebe6b47e6fa445e32282c4dadf8a6d3fc11d3cb9f8dd2a78ef32dfa5227248644dee8ad12587d96e2c17bf16220a92f447edf8716cd7646347fc2c57 SHA512 41cdc5aa7c083afbe044c730b898e06817fb8c5d9799d0c88be9ad15501d4135e16597623b66ae65a40160d9a04358392a98e03646ba2207e0f981f33e28750d
 DIST tuareg-mode-2.2.0.tar.gz 83392 BLAKE2B eead49dff45bb039abef0ffa8f4b874dd6d3bb36e81791b84e411031b4d714324637f99a0cfc3d4029b47032c61ca45424831a2d837fe5b01fa93383237cb14d SHA512 5f0b470920abd44e5b99e84e817ba678aded3042751b8949884c06f3a928105acbe96a28af3a8a089f6b607f8dd70cba7a669e9a61b906b1dad840c7f88bce12
 EBUILD tuareg-mode-2.2.0.ebuild 495 BLAKE2B ae1316fc64fa9dba1f3518db13f9b27d2f9fd6488f4f6a8c0449a2d9accec674a1d48d142d3d5a8b51c270deb5058d529f0b812d6a9ce1bdb7dd1efcc43b6a9c SHA512 8d5060ea94e5f1d1c97f874286fa9e98449201ef7fec650c37c96fb00177083f9753e7534cdfa2d0e63c601be2e25c38b100da885886e6fc943a6cb55892da0e
-MISC metadata.xml 780 BLAKE2B 9262902650dea63fa833d0b57f32054a6858e741f404d6f5393273518533e9008ec8a322ec013232b69e8475d9db7f407f3985477ce4449e08913e0eed84337c SHA512 480ad1fcd7b12c56081dac425686a17ad07d912c4ac0f5f259c126d4a07489d9660e1429a7f0570aac3957ec8712d406314d68c76cd45dd8ec99a7f62dba6c5d
+MISC metadata.xml 674 BLAKE2B b0c4bb45ef91047cbdc5f64fdf8a00baf9b31c37b055d657688b6a75670dc34d39319f691f9741cb62601bdc76b1ee26aee5681df2a7f711baece2aa6072ec01 SHA512 1481d12c8621edfdcac914c64aba2820c76486e547333680255f39ffbf0beb943674f4e32067daf6fdf5627757fc893f27ff807714a4f284ce38c6abe69f2841
diff --git a/app-emacs/tuareg-mode/metadata.xml b/app-emacs/tuareg-mode/metadata.xml
index de72ddb18e30..8fc75d8f94f1 100644
--- a/app-emacs/tuareg-mode/metadata.xml
+++ b/app-emacs/tuareg-mode/metadata.xml
@@ -5,10 +5,6 @@
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
-<maintainer type="project">
-  <email>ml@gentoo.org</email>
-  <name>Gentoo ML Project</name>
-</maintainer>
 <longdescription>
   Tuareg is an Object Caml/Camllight mode for Emacs. It handles automatic
   indentation and syntax highlighting of code. It also supports an interactive
diff --git a/app-emacs/twittering-mode/Manifest b/app-emacs/twittering-mode/Manifest
index 6e10564dab51..d98a0693b65f 100644
--- a/app-emacs/twittering-mode/Manifest
+++ b/app-emacs/twittering-mode/Manifest
@@ -1,6 +1,6 @@
 DIST twittering-mode-2.0.0.tar.gz 615223 BLAKE2B 1fc5ceb440ac9a00dde4d49cd48580d3e8f78ed2e9bccb8b2dcf41c6be1c7e0394c8db958e6ab4ac632b91bbdfc9a0930ad3867584d642b3f90b15a7bc0132d5 SHA512 318768c54c99c03c7641bfeb8396fdcaf65752121da6a64e6af9c071b6c429f73e44d1698df600915c4c7042233ef96cf86c037eece21b00d8e52a01ae569601
 DIST twittering-mode-3.0.0.tar.gz 1363235 BLAKE2B 31801fcb339cab42c7b9a9bfb186ef6a21570be16dd90d36baaabe97ec9fc93bdc35ead707e366e7262347158da145c04a6f51340abd3386b8c2a9fd8b5d417b SHA512 c696a8f31abcf6944c127575719d3e9b24a2bfb6271e0193e2a6faa8137c6468c7686b88d1e4ec0c3cc3b833e26853b435726d1acb422e9f37d3c0334e278494
-EBUILD twittering-mode-2.0.0.ebuild 818 BLAKE2B 03d95414a95c832a58e6e1e17716bf196c5a12de168f1dd193d189b1eb25ea7dce36523e8002f09983f0bba71127608bfb833dd0995dd1d1a0997c09281c21ba SHA512 ccafc998df1c6b5a0696b7a4ed05fbb85e65fc7fdd82b51a9a18fa5f0eb26e310f6449afb6b813b20dc556636ee82da69153d919e9ccab557454bd95caa52f13
-EBUILD twittering-mode-3.0.0.ebuild 818 BLAKE2B 03d95414a95c832a58e6e1e17716bf196c5a12de168f1dd193d189b1eb25ea7dce36523e8002f09983f0bba71127608bfb833dd0995dd1d1a0997c09281c21ba SHA512 ccafc998df1c6b5a0696b7a4ed05fbb85e65fc7fdd82b51a9a18fa5f0eb26e310f6449afb6b813b20dc556636ee82da69153d919e9ccab557454bd95caa52f13
-EBUILD twittering-mode-9999.ebuild 818 BLAKE2B 03d95414a95c832a58e6e1e17716bf196c5a12de168f1dd193d189b1eb25ea7dce36523e8002f09983f0bba71127608bfb833dd0995dd1d1a0997c09281c21ba SHA512 ccafc998df1c6b5a0696b7a4ed05fbb85e65fc7fdd82b51a9a18fa5f0eb26e310f6449afb6b813b20dc556636ee82da69153d919e9ccab557454bd95caa52f13
+EBUILD twittering-mode-2.0.0.ebuild 804 BLAKE2B 63cf8258e34d6670c1342a5636a46c6cc87b3b3992edab189d802f6e7bcac44bc62eb943a649e0106375d38ab1297ab27c0e8d4f8d7f7a2d2cdc87dd9209378a SHA512 042e8068a2ff7d558c907260621d5e92883fdc462f5cd830a8796ebc89665720b706072837944731f748fb9fba70cc80fd56dcfb2cacf6bef3f82380baeeec1f
+EBUILD twittering-mode-3.0.0.ebuild 804 BLAKE2B 63cf8258e34d6670c1342a5636a46c6cc87b3b3992edab189d802f6e7bcac44bc62eb943a649e0106375d38ab1297ab27c0e8d4f8d7f7a2d2cdc87dd9209378a SHA512 042e8068a2ff7d558c907260621d5e92883fdc462f5cd830a8796ebc89665720b706072837944731f748fb9fba70cc80fd56dcfb2cacf6bef3f82380baeeec1f
+EBUILD twittering-mode-9999.ebuild 804 BLAKE2B 63cf8258e34d6670c1342a5636a46c6cc87b3b3992edab189d802f6e7bcac44bc62eb943a649e0106375d38ab1297ab27c0e8d4f8d7f7a2d2cdc87dd9209378a SHA512 042e8068a2ff7d558c907260621d5e92883fdc462f5cd830a8796ebc89665720b706072837944731f748fb9fba70cc80fd56dcfb2cacf6bef3f82380baeeec1f
 MISC metadata.xml 431 BLAKE2B 99dcd39c66412decdb967fc8670d117b209fe90eee8d5c17dbbf3f3653fecdb328ce459c72488b8d62f618570f194d9afa831669838976ea08ec9784fd99fd43 SHA512 699cfac367110e5031fe8cf1aabc64369185f435e6ca78d89b97f184c6e77b1d91a0e2012b03709c548afa9489e1b41e5bf0a40d83074c5517bb79b0d302005f
diff --git a/app-emacs/twittering-mode/twittering-mode-2.0.0.ebuild b/app-emacs/twittering-mode/twittering-mode-2.0.0.ebuild
index d8d3529415ea..6cbe27f5ad97 100644
--- a/app-emacs/twittering-mode/twittering-mode-2.0.0.ebuild
+++ b/app-emacs/twittering-mode/twittering-mode-2.0.0.ebuild
@@ -26,7 +26,7 @@ DEPEND=""
 RDEPEND="app-crypt/gnupg"
 
 src_compile() {
-	elisp-compile twittering-mode.el || die
+	elisp-compile twittering-mode.el
 	[[ ${PV} == *9999 ]] && use doc && emake -C doc/manual
 }
 
@@ -36,5 +36,5 @@ src_test() {
 
 src_install() {
 	[[ ${PV} == *9999 ]] && use doc && dodoc doc/manual/twmode/twmode.html
-	elisp-install ${PN} twittering-mode.el *.elc || die
+	elisp-install ${PN} twittering-mode.el *.elc
 }
diff --git a/app-emacs/twittering-mode/twittering-mode-3.0.0.ebuild b/app-emacs/twittering-mode/twittering-mode-3.0.0.ebuild
index d8d3529415ea..6cbe27f5ad97 100644
--- a/app-emacs/twittering-mode/twittering-mode-3.0.0.ebuild
+++ b/app-emacs/twittering-mode/twittering-mode-3.0.0.ebuild
@@ -26,7 +26,7 @@ DEPEND=""
 RDEPEND="app-crypt/gnupg"
 
 src_compile() {
-	elisp-compile twittering-mode.el || die
+	elisp-compile twittering-mode.el
 	[[ ${PV} == *9999 ]] && use doc && emake -C doc/manual
 }
 
@@ -36,5 +36,5 @@ src_test() {
 
 src_install() {
 	[[ ${PV} == *9999 ]] && use doc && dodoc doc/manual/twmode/twmode.html
-	elisp-install ${PN} twittering-mode.el *.elc || die
+	elisp-install ${PN} twittering-mode.el *.elc
 }
diff --git a/app-emacs/twittering-mode/twittering-mode-9999.ebuild b/app-emacs/twittering-mode/twittering-mode-9999.ebuild
index d8d3529415ea..6cbe27f5ad97 100644
--- a/app-emacs/twittering-mode/twittering-mode-9999.ebuild
+++ b/app-emacs/twittering-mode/twittering-mode-9999.ebuild
@@ -26,7 +26,7 @@ DEPEND=""
 RDEPEND="app-crypt/gnupg"
 
 src_compile() {
-	elisp-compile twittering-mode.el || die
+	elisp-compile twittering-mode.el
 	[[ ${PV} == *9999 ]] && use doc && emake -C doc/manual
 }
 
@@ -36,5 +36,5 @@ src_test() {
 
 src_install() {
 	[[ ${PV} == *9999 ]] && use doc && dodoc doc/manual/twmode/twmode.html
-	elisp-install ${PN} twittering-mode.el *.elc || die
+	elisp-install ${PN} twittering-mode.el *.elc
 }
diff --git a/app-emacs/wgrep/Manifest b/app-emacs/wgrep/Manifest
index 014af28747c5..3501ea801964 100644
--- a/app-emacs/wgrep/Manifest
+++ b/app-emacs/wgrep/Manifest
@@ -1,6 +1,4 @@
 AUX 50wgrep-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
-DIST wgrep-2.1.10.el.xz 8708 BLAKE2B f3881a5b774dd9bad6169f5621d4da4662127892786e708d31815cba2ff2f5a75170863ca5882cef67efb8e27964cab4176eda7c7ca561888edeb590943ae573 SHA512 39761964406d3eedca9253f2f29f81dd9ee71c4e049a985c236ada4dd9b70dc553bf1e9e94cb6d3c8749f065146e2759a46a6ac52ed8e5e5f046e196798bc681
 DIST wgrep-2.3.0.tar.gz 16241 BLAKE2B 83802934b36dfcad17e3486a7405cdd170b20bd6574d92032c92aa2a8ae84a2b6ce47313c8ca70327982bebc4fb78363181c66d1c745d2179ba84fc655c617be SHA512 2f817ef482d8ce98531494a5f19f477d7544bcc8b2747ebe184194a058c6cb26d571ba7de22f7e4307aa110806fa45f683b2363b1520b8fe5edaa05ce5ba8d61
-EBUILD wgrep-2.1.10.ebuild 576 BLAKE2B dc5197bbdf21aa1a8ca259360fec8e41317b2fd646c7da96466de3f3db36bde8224556c837a7441c6617a82875bb3616a33abc9f9b2f26bfb366541e1297c1a8 SHA512 c39b7177e3bfe8e71fb079dbf41560214971d83f7526fff5760be3c080f4014b21a8b5b0abe7f09dea64b4130e0a617817923079b66ffea1b2f50ef1bab198fc
 EBUILD wgrep-2.3.0.ebuild 633 BLAKE2B 6d2f46e64aef16640e29b582f4336c4a8128f8330c8cd0ebcaa02ab0a10b8c44a4c00d29d8a4c7ce923adf569174afbe828564ce0eef8e33b526b9df0c712ed7 SHA512 034ad467b3136f32dc2a62f89886a42d932c72ef21de742c220eb768f722066bbb365e0917ddba6b132a55ccd41ed021e7b35006a81eba4c1260c56a66d2eed9
 MISC metadata.xml 493 BLAKE2B c8676488f610b89dab42bd037c33e1fe6af7861ad188c28e4703c7b18665102a4b2270a5c746929cad1ba11522be8e523b80712a929bc38d1ecef71b3a8b6ba3 SHA512 8af6e19dda9919614f6bb5e1dbde585fc0128d679c1ad0685eed2cd43d93e38686f1c88f1c86f0b6dfc5cc12cb7ce25c97fb4d2766d6e2cb33b1915dc9356763
diff --git a/app-emacs/wgrep/wgrep-2.1.10.ebuild b/app-emacs/wgrep/wgrep-2.1.10.ebuild
deleted file mode 100644
index 69e3dc867b1a..000000000000
--- a/app-emacs/wgrep/wgrep-2.1.10.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit readme.gentoo elisp
-
-DESCRIPTION="Writable grep buffer and apply the changes to files"
-HOMEPAGE="https://github.com/mhayashi1120/Emacs-wgrep"
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-SITEFILE="50${PN}-gentoo.el"
-DOC_CONTENTS="See commentary in ${SITELISP}/${PN}/wgrep.el for documentation.
-	\n\nTo activate wgrep, add the following line to your ~/.emacs file:
-	\n\t(require 'wgrep)"
diff --git a/app-emacs/with-editor/Manifest b/app-emacs/with-editor/Manifest
index d68d3d5ec4bb..92f4c9e32919 100644
--- a/app-emacs/with-editor/Manifest
+++ b/app-emacs/with-editor/Manifest
@@ -1,10 +1,6 @@
 AUX 50with-editor-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
-DIST with-editor-2.7.2.tar.gz 30121 BLAKE2B a610348a3a2b26059bf58b4b26fdb4e2edddcf70604db7c9d69d2050f4ed1ac745cf94638656339a915ac11a2abe0e8eee5fcb73c768747a8d14078931106332 SHA512 9d412928ce5234d3541d717b5b800312c82495f937088cb8308ff64ab92d2639ce078cdc8eb86d34b775a0e6567409249d58d94eb61183b82b5c19e2465905a7
 DIST with-editor-2.7.4.tar.gz 30159 BLAKE2B 2e1e84dd1e4bd0c4f5c0e0bb8730e8c4327e58ae38ee445c4f7f365279f7b8293639be675e735e82fea15c0fa93ff7b02c18d0fdb81889d6b44459d40f7322ae SHA512 d35409bc761e5ee797ca758878365a11695e0e8558275e8dd8eb2b22c92b7ea92024a56c1adbab47d4b5e0cc49a2e6adf5e8d1f7fd3e784774dab39bdbf1d93c
-DIST with-editor-2.8.0.tar.gz 30519 BLAKE2B 80502d3839818e5d0277b0189b7c7b814eddae72007c4018500cf64136beaea3eccf23c147f02eaf734558c2f24e0dd7cb2a2a80c09e700df3e5ba1e911ba798 SHA512 15df8706754d61ab8d57f866cde54833ea3126915352ed7ebd5020224141a069a62a3872694f95fcff66be165310f8111e4d4c9a1717189686460e8264636b4c
 DIST with-editor-2.8.3.tar.gz 30648 BLAKE2B 8989f8506fb58c1f54efa4fcb72fa8ddd477c0c73d82672028bdb027f74093b62c44ab5a545cd9db2e0e3222bf461e605aebc805112c5ae8486c224b22806c26 SHA512 389aa084f7dfb7f7b59a37802441718e20ee70d88b9af9631b1fc547e4c3238d053bb2b3ef50a4e6332fc3befae183a49d55b3c7bd7719a149cf83001d23810c
-EBUILD with-editor-2.7.2.ebuild 648 BLAKE2B 04711d6eb908747d7f6d6043f4460b20e4d9f0aabe88c416cb1dc384f68c6109ea8f623c49780c31e5da572b79905ee206d3152158239f7fb02393fa058733a8 SHA512 39ead2bcf75c013d858a46192058c928bc20bd35de52cd8b572138df7506145091220d4c637867418b1a3c211acc1dfbd655fec0f0001b459e2689b4f8de9e1f
 EBUILD with-editor-2.7.4.ebuild 663 BLAKE2B cb8e2bf8fcb28e09c2005574f69f22bd4dd737e91d7c7ce0a1d09dcea854f4f554ec0d5e365ecfc9523ba0bb802b4d3b780579c7d2995ec03c927f2ef939933e SHA512 8067dacbbe51620bd305cdeb6fdd959194142a877eb4595784b772965816fa433fed76eb637a50ffb2f491ffd97f50896d668b0987bacbb44689baf533249699
-EBUILD with-editor-2.8.0.ebuild 659 BLAKE2B d0ae1c4101e73725f922573b11996e1e4c5edf7b28f09106872dfbefc3688e21a05cc8885af648da2576e7356001f40e07aa3307c520fd080fcc1780cc8c1a8f SHA512 b69e940bee0264a1763fe11bc042b8aa6b2d93f6b32e0b8a5894cf4be93558765c94eb8cbaf88c27b2d9537a57c2e5185c5856d6e37b867f2449e6ebf6615638
-EBUILD with-editor-2.8.3.ebuild 659 BLAKE2B a373ff680eee3ae047e3d93100b27ad0287afaab6c3fe43e378f5d7da0807ec26668021c19c4c34e5bb2caa90f65726fe68561937a0a88a639c61f64a8b25433 SHA512 0e3ccacb84a2d7b4b0b03a4b27b277b68bfc2da88443a4bc32d0f11f06edc9fa95b708e8ee9c8717b37dbea0df03541189b23b30d297a7016e22f74477edc5e2
+EBUILD with-editor-2.8.3.ebuild 663 BLAKE2B 7a9aff1fdd488ae765ba8c1b6c75bbf8c74399bc89aab41ea9e5ea8edfb952826990ed655d1f688593eed4b2be9bee937cad652744ebaec51c1d0408f7690653 SHA512 1b7d4072998bf5a66d27c53345781f9dc3df4619c188dbea0e3a1a03da28a99aa58917434d53da11b370c3ab001c77a11d0e3671154d3e4380d1604fe5cc2e32
 MISC metadata.xml 707 BLAKE2B 7f4c983cfd2f8b87a3708301ccc570a0d88b3d9b21b3e089e44dc5b22f8313826d2469efabe7ff4dc2b27262f93dc4b5e8fe0e68b2b3b7a6f79fa6f34283eeab SHA512 bce73ef41113175585cc46d00fc1306537c71f860b1f2d699c086f2b1042d26fb02e9770122c586594ab9012eeea0fa73438a2fb9a9cf3b2c077481eef13a5b6
diff --git a/app-emacs/with-editor/with-editor-2.7.2.ebuild b/app-emacs/with-editor/with-editor-2.7.2.ebuild
deleted file mode 100644
index 075601caf822..000000000000
--- a/app-emacs/with-editor/with-editor-2.7.2.ebuild
+++ /dev/null
@@ -1,24 +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
-
-DESCRIPTION="Use the Emacsclient as the \$EDITOR of child processes"
-HOMEPAGE="https://magit.vc/manual/with-editor"
-SRC_URI="https://github.com/magit/with-editor/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-SITEFILE="50${PN}-gentoo.el"
-ELISP_TEXINFO="*.texi"
-DOCS="README.md with-editor.org"
-
-DEPEND=""
-# Versions of magit before 2.5.0 bundled with-editor
-RDEPEND="!!<app-emacs/magit-2.5.0 ${DEPEND}"
-DEPEND="${DEPEND} sys-apps/texinfo"
diff --git a/app-emacs/with-editor/with-editor-2.8.0.ebuild b/app-emacs/with-editor/with-editor-2.8.0.ebuild
deleted file mode 100644
index ee9c6f1d011f..000000000000
--- a/app-emacs/with-editor/with-editor-2.8.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-NEED_EMACS=24
-
-inherit elisp
-
-DESCRIPTION="Use the Emacsclient as the \$EDITOR of child processes"
-HOMEPAGE="https://magit.vc/manual/with-editor"
-SRC_URI="https://github.com/magit/with-editor/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-SITEFILE="50${PN}-gentoo.el"
-ELISP_TEXINFO="*.texi"
-DOCS="README.md with-editor.org"
-
-DEPEND=""
-# Versions of magit before 2.5.0 bundled with-editor
-RDEPEND="!!<app-emacs/magit-2.5.0 ${DEPEND}"
-DEPEND="${DEPEND} sys-apps/texinfo"
diff --git a/app-emacs/with-editor/with-editor-2.8.3.ebuild b/app-emacs/with-editor/with-editor-2.8.3.ebuild
index f7155f29d718..1316d5c5248d 100644
--- a/app-emacs/with-editor/with-editor-2.8.3.ebuild
+++ b/app-emacs/with-editor/with-editor-2.8.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/magit/with-editor/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 SITEFILE="50${PN}-gentoo.el"
 ELISP_TEXINFO="*.texi"
author	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
commit	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree	4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /app-emacs
parent	b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)