gentoo resync : 03.11.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-11-03 16:06:58 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-11-03 16:06:58 +0000
commit: bd4aeefe33e63f613512604e47bfca7b2187697d (patch)
tree: adb35b5a9a00ee7ea591ab0c987f70167c23b597 /app-emacs
parent: 48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff)
202 files changed, 1109 insertions, 1551 deletions
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index cb6474cc1710..966e123c891a 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/adaptive-wrap/Manifest b/app-emacs/adaptive-wrap/Manifest
index 25a5b9113143..14284690ea46 100644
--- a/app-emacs/adaptive-wrap/Manifest
+++ b/app-emacs/adaptive-wrap/Manifest
@@ -1,4 +1,4 @@
 AUX 50adaptive-wrap-gentoo.el 147 BLAKE2B 44b986f51ec3254d0fb79554296427343cc5c0e462d2baf54c99cacc1b9a45a7c6f52b96ec7957c90b8f021bfcb2fd5d7e3810f7b9c9df8124d78b0202f9d8d1 SHA512 869d6dc360d57348aeea5de6e096a2c44363f35b84119546a8d63d6d776cf0a344156b93a4c8d14d05fa6ea3c430a2ab7f0640370ee3d04fe26d0ee845ce3ff7
-DIST adaptive-wrap-0.5.el 6111 BLAKE2B 72813abcbe674a9e15dc72d189a1b2a0cf6ca490ad5f96daaba94feac832b10ca0c6fde364e8ea34ddcd8f1b170e331cb31f3be2844d72e1c039dbefa3069451 SHA512 0ffc52ad4343b57376dfb1ef09c7cc31d5933568ed614afc7d6d104fcb2ddf1eb69a69d4b04f5f97b726cc66ddacfc8d56ff10e447cf24f45227ee568adbcb95
-EBUILD adaptive-wrap-0.5.ebuild 439 BLAKE2B a949c25bcf1b8bc5324b0d6645173d798485766d00bdc9b71a74388d01ac4c5c59ef97003c62150746a50196f94603c0446bcccf455a77bcd40f929c02d2b746 SHA512 49fbac464ebdbf93e4883ac3252d5b96216b7e163c485edccb715218605e5e8b4fe3d662657b94ca52bbf816b33b8615762aee8c8dd57f91273fbc0bcb939fd9
+DIST adaptive-wrap-0.7.el.xz 3304 BLAKE2B 6026512cc81218b270d8a1070e3c62893b8cc1b48c8cbb33c8ee125d7bff0a3f701c57f653ae127daf066770f289fd8bc3860edc47c58ac7d6dd3c1a83f8ebf2 SHA512 a052eeaa727526c81f83419bee632121b6724bfb410cefac9c3a1cf40e11f272bffb1bf6f3b0a3ea7c4646a9473488e084c5622a2ed335c656835e4613a859db
+EBUILD adaptive-wrap-0.7.ebuild 429 BLAKE2B 598adb31d59b29968d7e8ea13bcd47c5f50332e662dfc76f03e53d3428abb207d2406948a3e8ef20551a88ff829c8f1a435a04044c9daa3b997ad4bd130f16d3 SHA512 13f3fc037e60c928b2bb641182a82a3ecc30b38c0ea46c7d7c11326c0b004c6b3626c49e520f509e1803475b82d42e87de197f9b7491108fe053229b6fdfdc79
 MISC metadata.xml 292 BLAKE2B 046265ce3ff94f04bba9b4b344d852203657df8dd300f30620df260bad1c56b3c23a8c48d073f70f571f733af9a7c034922e0465878028ee8f748060a6816ec6 SHA512 f0115ae686d3003f4264968d3aeb0b054830f87f35378e15e205a729d591c8697507d3c76ead9e1f0bab1f1f66a3fda108322dbcec7b857a37000511d1dd17df
diff --git a/app-emacs/adaptive-wrap/adaptive-wrap-0.5.ebuild b/app-emacs/adaptive-wrap/adaptive-wrap-0.7.ebuild
index b009cb85e616..ff5293e3528a 100644
--- a/app-emacs/adaptive-wrap/adaptive-wrap-0.5.ebuild
+++ b/app-emacs/adaptive-wrap/adaptive-wrap-0.7.ebuild
@@ -1,21 +1,17 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit elisp
 
 DESCRIPTION="Smart line-wrapping with wrap-prefix"
 HOMEPAGE="https://elpa.gnu.org/packages/adaptive-wrap.html"
-SRC_URI="https://elpa.gnu.org/packages/${P}.el"
+# taken from https://elpa.gnu.org/packages/${P}.el
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
-S="${WORKDIR}"
 SITEFILE="50${PN}-gentoo.el"
-
-src_unpack() {
-	cp "${DISTDIR}"/${P}.el ${PN}.el || die
-}
diff --git a/app-emacs/auctex/Manifest b/app-emacs/auctex/Manifest
index 8236c6a73f0c..06c9bc68cd04 100644
--- a/app-emacs/auctex/Manifest
+++ b/app-emacs/auctex/Manifest
@@ -4,6 +4,5 @@ AUX auctex-12.1-autoload.patch 1373 BLAKE2B 8ef031135245b0f54f3789a8070253f5a32f
 DIST auctex-11.92.tar.gz 1486606 BLAKE2B 6e34d1da3bacad8f2baee2f13eb44a5b617a342c294ef4d7ba28059b678510e1d161f3f02fbcf38128c09ab4996a035e5ec28898134b967d88ad621b8b477845 SHA512 758bf82903ba0499decf0ade77c7ac70865132a24195d7e8794538b7857c448811b7ef26149a915b60ed3ee34c2ebaddb3282a320bd459c9ee3f461d6ee9b84e
 DIST auctex-12.1.tar.gz 1476296 BLAKE2B 1dd5db94b5b7bb572919fdcb6c7dd2ea4d17f816204bedc69756610b80370ca748a06ab100ef8221107605a5e464b6a8c2587b728ba6a964776ea6dfeb7f7165 SHA512 4c27a3b16eaf98db164832497c497576fcabb274b24c6eb3060625b7711b1de91fce9a52f7c7caaec77a93768a6ce2ec173ab1ccb72f4c56c51cc4740d380d97
 EBUILD auctex-11.92.ebuild 1481 BLAKE2B bdc0e1ceac0c607c80405865897c909be1be015a968419e2ef7302abb104e465a54eac7dc42d1cdaca1d215dc8ccdd07452ef5db20d3b5cf9e40613da935560c SHA512 9048e1c9a7e11f5e6e8b70d50c507083f90f0a2b3d0bdcee52a320902bc4fd78a6f8069442dfef57fb6fe78d18b82bf0787d70c4a22effcd182babb9e0a9b226
-EBUILD auctex-12.1-r1.ebuild 1531 BLAKE2B c7cf461594c94cc2736d9d558641d46140193876edd2357ed53f9c95cea672cb063c7df5f222292a5e135e154604f9dc756a56886f0d4aa8b6894cd13c79ccfb SHA512 8e5b921523ff9a99b92762cdc36c5699ff6415148c77a0ac65edb7cae00ae488ecd7fb0386ffe488d833efb819e835fe6c473e35be2988db953c60ec88101ca4
-EBUILD auctex-12.1.ebuild 1492 BLAKE2B 3903ffbf021f696664750fea082ea8ba60901fee19ceb8cc85e4e8eff97237c9af1452c20b49b860b335a7fb3947ecae45896384772cda1a203e589b44f11e37 SHA512 fb4cf29c28e2aab5a316d951033ddb2efc563434983f5e74a42c4d8a02068e70f2d2cf74801aba5fc7ef8696a2c1c3d1c5b23c5fc520c2cd3da9c8e0361591e9
+EBUILD auctex-12.1-r1.ebuild 1530 BLAKE2B b3d4cade5f22e2a4fb88deb34788fb786b4538bfc6d041ad5248af9388f38060e0fa482452777fa64b79ba9060926d0591b07c440cb451093aa52289cd92cf70 SHA512 b704364c24fbf27e9106ef6dcaaf672c0f0ddac4707b99565bf2b414cca03cb53be176a1b4233ec417eb95b5fb8903a2ca161bd8d6d1e1e3f5ba1ec97a861d48
 MISC metadata.xml 947 BLAKE2B 0b5e298fd9ca7112b8bd91bdc8cee455fff18d6ef21820c9e3da7058c860462fe96a7fe29792cc143d9e1876495fe3ee87e09e006b203ad448e511c12983c383 SHA512 61629e82f0004763e776db51ace13d583eac8d1199ebb61d17a101d48dd60258db4310fc938b82822c64b0ee9d39d9095fd86c316585e54ea9e7872a1247763a
diff --git a/app-emacs/auctex/auctex-12.1-r1.ebuild b/app-emacs/auctex/auctex-12.1-r1.ebuild
index cbb716d24678..346fcb489299 100644
--- a/app-emacs/auctex/auctex-12.1-r1.ebuild
+++ b/app-emacs/auctex/auctex-12.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+ FDL-1.3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE="preview-latex"
 
 RDEPEND="virtual/latex-base
diff --git a/app-emacs/auctex/auctex-12.1.ebuild b/app-emacs/auctex/auctex-12.1.ebuild
deleted file mode 100644
index ad2a784723d2..000000000000
--- a/app-emacs/auctex/auctex-12.1.ebuild
+++ /dev/null
@@ -1,61 +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="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"
-
-DEPEND="virtual/latex-base
-	preview-latex? (
-		app-text/dvipng
-		app-text/ghostscript-gpl
-	)"
-RDEPEND="${DEPEND}"
-
-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/basic-toolkit/Manifest b/app-emacs/basic-toolkit/Manifest
index 66adb7de9e27..9c4267f9c536 100644
--- a/app-emacs/basic-toolkit/Manifest
+++ b/app-emacs/basic-toolkit/Manifest
@@ -1,4 +1,4 @@
-AUX 50basic-toolkit-gentoo.el 77 BLAKE2B 62b1e6c3a3b5a134a482c24d6bd7e620109e95117d12e9e348b5628e62139edc8a237b1569e2751bb7f7284d84f1877a18baa9c933e57c174f695f218876d323 SHA512 e6e622dbb2df0d55e5f5b18e29afa95a52065783a84f3e982799c614c95f305081ec6f9214f8bb31a50eef77c7c18987259d326c5ad56d01f4130266fc29a6ef
-DIST basic-toolkit-0.3.el.xz 6524 BLAKE2B e0cebca137c786faebe5b76b1fd0e9b7181a4970aee69c1486deabd8e7712e6b54a3491768212516f9b7c8cc5a073d41dd1a22b49a3a9140ae21e1756997ea6d SHA512 3ba22833e8e899c5276e9c36779b1cffdcf3a76adaa0379a346331190f4529c8706b7e3b850768ce270016d8bc184abb4a48dc5ed11bb4766062bae966e9806d
-EBUILD basic-toolkit-0.3.ebuild 573 BLAKE2B 2a3792cdce57d01e40353f9a594222c7ee7e1462eae372971ee3cbbbe54a829e8b9edd7d4b81c2208de071f9d07888d954b53b45d53089ffcb07fff9d9933491 SHA512 614df71ae1578fbdc0c428e275dd2fa3ba63ed4fc7c3250c7b2c27922f6fa6f34c481e030c8aa81aa3ae9fde4d698b817d5564a59623415bdd6acd9ddfff3f17
-MISC metadata.xml 292 BLAKE2B 046265ce3ff94f04bba9b4b344d852203657df8dd300f30620df260bad1c56b3c23a8c48d073f70f571f733af9a7c034922e0465878028ee8f748060a6816ec6 SHA512 f0115ae686d3003f4264968d3aeb0b054830f87f35378e15e205a729d591c8697507d3c76ead9e1f0bab1f1f66a3fda108322dbcec7b857a37000511d1dd17df
+AUX 50basic-toolkit-gentoo-0.7.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST basic-toolkit-0.7.el.xz 6740 BLAKE2B da369f851de8af0ac06ff49f07dc8d07b4ced5cd445a0726c4fe456112663cb22895f4732cc72f173325dac67cd6ccf943b7e322406761388d6730edfb9b2a44 SHA512 0ced99491e1263e8016bffc7d8f7464750fce6387d8eac08436b5cb589570f03e157f26ec50436dd4b5b24c2fe87a6a9803d244c97fd4dd178e76064fb50f806
+EBUILD basic-toolkit-0.7.ebuild 542 BLAKE2B 2c636b74779abc11842b560b5406e6f486ea3fddceb4881553afd38be8b1fe33f26456701e7614955f96aa379501d65ad43d9abaafc35dd3881c1c6a4aa0abbe SHA512 181deb458906db8924cca4ed0d629eb7ec7c58ee12a5cc61c794075b91806b6090910f2ca88d108b758ba541bc1dcb5e7b9582d3b5d2a3f051f384b331bb8523
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/basic-toolkit/basic-toolkit-0.3.ebuild b/app-emacs/basic-toolkit/basic-toolkit-0.3.ebuild
deleted file mode 100644
index bf652da1d2f0..000000000000
--- a/app-emacs/basic-toolkit/basic-toolkit-0.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp
-
-DESCRIPTION="Basic edit toolkit"
-HOMEPAGE="https://www.emacswiki.org/emacs/basic-toolkit.el"
-# taken from https://www.emacswiki.org/emacs/download/basic-toolkit.el
-SRC_URI="https://github.com/gavv/distfiles/raw/master/${P}.el.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="app-emacs/windows app-emacs/cycle-buffer"
-DEPEND="${RDEPEND}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	elisp-compile *.el
-	elisp-make-autoload-file
-}
diff --git a/app-emacs/basic-toolkit/basic-toolkit-0.7.ebuild b/app-emacs/basic-toolkit/basic-toolkit-0.7.ebuild
new file mode 100644
index 000000000000..018c65b498ec
--- /dev/null
+++ b/app-emacs/basic-toolkit/basic-toolkit-0.7.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+NEED_EMACS=26
+
+inherit elisp
+
+DESCRIPTION="Basic edit toolkit"
+HOMEPAGE="https://www.emacswiki.org/emacs/basic-toolkit.el"
+# taken from https://www.emacswiki.org/emacs/download/${PN}.el
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-emacs/windows
+	app-emacs/cycle-buffer
+	app-emacs/css-sort-buffer"
+BDEPEND="${RDEPEND}"
+
+SITEFILE="50${PN}-gentoo-0.7.el"
diff --git a/app-emacs/revive/files/50revive-gentoo.el b/app-emacs/basic-toolkit/files/50basic-toolkit-gentoo-0.7.el
index f51bc40b6fa4..431f7e90ae73 100644
--- a/app-emacs/revive/files/50revive-gentoo.el
+++ b/app-emacs/basic-toolkit/files/50basic-toolkit-gentoo-0.7.el
@@ -1,2 +1 @@
 (add-to-list 'load-path "@SITELISP@")
-(load "revive-autoloads" nil t)
diff --git a/app-emacs/basic-toolkit/files/50basic-toolkit-gentoo.el b/app-emacs/basic-toolkit/files/50basic-toolkit-gentoo.el
deleted file mode 100644
index ebb24ef6ca16..000000000000
--- a/app-emacs/basic-toolkit/files/50basic-toolkit-gentoo.el
+++ /dev/null
@@ -1,2 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
-(load "basic-toolkit-autoloads" nil t)
diff --git a/app-emacs/basic-toolkit/metadata.xml b/app-emacs/basic-toolkit/metadata.xml
index c6a53b949e75..c918cdef9591 100644
--- a/app-emacs/basic-toolkit/metadata.xml
+++ b/app-emacs/basic-toolkit/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>gnu-emacs@gentoo.org</email>
-    <name>Gentoo GNU Emacs project</name>
-  </maintainer>
-  <stabilize-allarches/>
+<maintainer type="project">
+  <email>gnu-emacs@gentoo.org</email>
+  <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-emacs/blogmax/Manifest b/app-emacs/blogmax/Manifest
index a07410f08330..07c5094051c5 100644
--- a/app-emacs/blogmax/Manifest
+++ b/app-emacs/blogmax/Manifest
@@ -1,7 +1,4 @@
 AUX 50blogmax-gentoo.el 203 BLAKE2B 13d5f7436a13426fc3b33f9d84f45c011386d3b062acf4297c81f48d2cfc02fcd24c80292fb66152b9b0e4c968423648a99ddd6ef0bf9a4d5164e3ee5bfb330f SHA512 33bfaa0a6861bf4dcd402e3f24e999f5206235d69a9e7674c43d408e85438fd450810522a2e3bc42f5457ded290d67700e71a512603f62d64ecab82d4d2fd78c
-AUX README.Gentoo 246 BLAKE2B 51cb9a5d3b6043baa30655e90b2bec57620a0d5dfdea2f718b9f519a2d89619a3bfc3702915948c6bfb6d145c798f13f089582af7db8ea1754f5e50ebb95d4b8 SHA512 38559a4b05509061ed5026f1e7b4936da8d90d965fa8db3e5e087d7eeedc8a33a96eee4c6e6a8b76f6fc224062ee78f252dc17bb918248c2df313a258d1b2dc0
-DIST blogmax-20110305.zip 194956 BLAKE2B b5f90254a218fc45b65faa8d5cdc53ec55f092716286a5757f483eed621d2142aeda398449b1c1b9c3acad67575025ce6bf9b9dce42f1d97d35227d13a0aa65e SHA512 dc0529c5d61ea9beaecf9dfdfe0631ae31fb9737845aa81f2ac7c19df7aa30eb7392f73ea96a00b678cd441f0815129bb04d521e697ce2cb3938d8699483d19b
 DIST blogmax-20170321.tar.xz 81704 BLAKE2B f7f45cb0d5981a0af09ad75b8b004aca950dad59efb0182f81596d6777caf31df6089c2cabb856168d5c031c5e60282e9a88f822219f5ec728f5dddc1c6adcb6 SHA512 bca3fd0bb10d98604426b4091831e709b2a731aa2e4cfc0737f14714bc6648a279c1909e1939f4504cf49aa470737458a00da598139d7797128563212997a4c1
-EBUILD blogmax-20110305.ebuild 987 BLAKE2B 8be3b8ad56bafc12bf4ab2dd72c67f8d400cd3ebf6ed607c70d47bf8fe027f6235f8ede6a90f19574dd90acda381e5cfdf45a546055a35ace8be76f27fc8716b SHA512 c80b0c0bd9e3d84e1f53d579c9f6a6f027ae6c7a967c628cc591d27c1c479c207dbc11c548fede045764c866d7c06f6d14809415bf10816fc2e2a4a8432ddda7
 EBUILD blogmax-20170321.ebuild 996 BLAKE2B 548a4b315331d5c4f87925dab2095940b30b778af677ff48b9c4102be89d37879e07bd3b80317995cee3558e83ec8f5c50a3f87882aeb6d02474c9f523806004 SHA512 08b4313f0be8e2533daf091a62e4c4405c3be77641b18a492f4756e77a6ad7cf6bf1594958fe1319c9986a64efeff76b8fe64cf2cdbf5431e9c2b428e7ee02e7
 MISC metadata.xml 388 BLAKE2B 14e7039960527342a1837a45bc3d4a5da96f924573067aab0066b053dc24b26197d6bd4c113c87526c3c2f50bdf152df43bbbc25885e7d76c9cd5f846094e899 SHA512 b794dbcab7f297bb941a561495b2d4b7863476f7204c7d240bbb99391c99441ff8e482b88f9664ad75a96f1cb4bf77a2e709301d4897d836297adf551aa519c2
diff --git a/app-emacs/blogmax/blogmax-20110305.ebuild b/app-emacs/blogmax/blogmax-20110305.ebuild
deleted file mode 100644
index 07505c200b1f..000000000000
--- a/app-emacs/blogmax/blogmax-20110305.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils readme.gentoo elisp
-
-DESCRIPTION="Blogging in Emacs"
-HOMEPAGE="http://billstclair.com/blogmax/index.html"
-# taken from http://billstclair.com/blogmax.zip
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.zip"
-
-LICENSE="GPL-1+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}/${PN}"
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	rm *.elc gpl.txt || die
-	edos2unix *.{el,html,inc,ini,tmpl,txt,xml} docs/*.{html,txt}
-}
-
-src_compile() {
-	elisp-compile blogmax.el
-}
-
-src_install() {
-	elisp-install ${PN} blogmax.{el,elc}
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-
-	DOC_CONTENTS="To get started with BlogMax, use the example site file
-		from /usr/share/doc/${PF}/example as a template for your own blog."
-	readme.gentoo_create_doc
-
-	dodoc README
-	dodoc -r docs
-	docinto example
-	dodoc *.{html,inc,ini,png,tmpl,txt,xml}
-}
diff --git a/app-emacs/blogmax/files/README.Gentoo b/app-emacs/blogmax/files/README.Gentoo
deleted file mode 100644
index a737d0f9c9ac..000000000000
--- a/app-emacs/blogmax/files/README.Gentoo
+++ /dev/null
@@ -1,8 +0,0 @@
-                                                            -*-outline-*-
-* Getting Started With BlogMax
-
-Use the example site file from /usr/share/doc/blogmax-*/example as a
-template for your own blog.
-
--- 
-Matthew Kennedy <mkennedy@gentoo.org>
diff --git a/app-emacs/bm/Manifest b/app-emacs/bm/Manifest
index 41f6daa5a18a..7605cda7b7b2 100644
--- a/app-emacs/bm/Manifest
+++ b/app-emacs/bm/Manifest
@@ -1,4 +1,6 @@
 AUX 50bm-gentoo.el 205 BLAKE2B 4c4921b1b7939a0d3cc831297c6c1bef596392c31c7eac3ad2826d55b9a0edee67c4d9cf4a6e2b46ba754850cfd2b8aaecb352ac83ff4f6d45c6fe51405b3552 SHA512 b5c80ab592a9b78a3441494f6211801d3e001f77985ea2e78b982541f534780b12ff26fb6dd7cf7cb371cb8d3fa2fdf01b55227e40980b94a7e07a45dd583a8a
 DIST bm-1.32_p20140214.tar.xz 11800 BLAKE2B 0c27f35a64dac09e5fff4391d6958ce5b2a2a6a8194a29500322137979e5fc0618fe1d47ca844bccba78d388d8a2569c5742f1a531c43c42a02845a31fb1f6c2 SHA512 0a40c5dc3d21c0b8af7e885f7e2f48c92413dff48a6a3a10366f9a63274886cd22a247b61ef25e4ad1f283446b05093658f233c6501c6d0bf5312d9a67b83ff4
+DIST bm-201905.tar.gz 23618 BLAKE2B 0770d571cae220215431d546892b9cebd03675565b24afad0dbfa9a74d50aaa73a6962b6bec81196700147f3fde835264c0727e7a4c02287fa3e4018ac133831 SHA512 81efd32572d0bcae2b0b91c277b4d634524f3c14c914015ebf06e5e9db2937c6d989ae65c745e214b2bc1a94d169433dede37a47519984e7211d9b8c4202a954
 EBUILD bm-1.32_p20140214.ebuild 520 BLAKE2B 57289c46c09cd99cf152d5c86ac9eec42898245435b771e811d88e79d9bebf17859930ab545d4c6f13cdf2e1fac2f57bedeb117bd885b6f0e5e1d9b080c5f8d8 SHA512 62ee21b034a43ac8640a19806276d931179ac17b43f56648dcd6059af9c3b2bc76cb6d0b8fff7b6be39c60f0825d9890df651871e68f20301d67817b6826dc90
+EBUILD bm-201905.ebuild 472 BLAKE2B 5775dd4e1e2616db85921e2a0256d1f120ac1d41bf59b6daacbc92ef0151dcc2d16ef0e941001fe48f7a936cf07ef7f9a8a466805b53027e34594f572aef384c SHA512 f7cedb4bf963637ad297b8a457dee96c7d09b1689d1176255c9593e2c2e6beadb82fc37a6016c28c3537092fce293bd90837a656b5fd3318d372a6921ce977f0
 MISC metadata.xml 445 BLAKE2B ce243d62639ee652b310e175715d81fb020cb41e4076970b03f895e728eb190fa1c2fa573ed2a995e406296cba21aa08fe4e92930a57062d56e7e0a68aef3a10 SHA512 d1a2573b8c516169b9d0a90dc89b650a4497080658d5af6fce70204c68b3c1b591dc724e9733957632727da0c014186d341a264c21665d6dbe0b021b87a2d201
diff --git a/app-emacs/bm/bm-201905.ebuild b/app-emacs/bm/bm-201905.ebuild
new file mode 100644
index 000000000000..87402c182ff7
--- /dev/null
+++ b/app-emacs/bm/bm-201905.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="Visible bookmarks in buffer"
+HOMEPAGE="http://joodland.github.io/bm/
+	https://www.emacswiki.org/emacs/VisibleBookmarks"
+SRC_URI="https://github.com/joodland/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+
+ELISP_REMOVE="bm-tests.el"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md"
diff --git a/app-emacs/browse-kill-ring/Manifest b/app-emacs/browse-kill-ring/Manifest
index 10309a2e58ff..99aee8720633 100644
--- a/app-emacs/browse-kill-ring/Manifest
+++ b/app-emacs/browse-kill-ring/Manifest
@@ -1,6 +1,4 @@
 AUX 50browse-kill-ring-gentoo.el 284 BLAKE2B 7f9d01bd6c573eb831dc9a8e4d022eacb3bb26b27b26a7654f7ed51ee1e45680be97520211d748a3501a6e93cd3a8b1fb29a0d5238b8bffb444cc504253f4b37 SHA512 64c5c2f97e97cf01874c5dd310ab9e2b913aa48b91a8d9b2d08f87c0c467658c49a3cc5a9e11e06d17820c36e425f09f0b94cc7cd850eb6c382ff25c0b2861d1
-DIST browse-kill-ring-1.3c.el.bz2 9757 BLAKE2B 3287de095f1909a7da702a12575c6ac0254c5dd4ea485007a96bcda0ac75fb9c9017a1f594b688387b7c005bb2dba2c689464730bb8ea9ff3f005a9cc02f4caa SHA512 a7244db55b08b7247047cb71aa024dd2ba8579bd1588a31d65120145228729a329dac87c268b4be14b79beded6ec4f3473542c26bfb3c5624557023369737644
 DIST browse-kill-ring-2.0.0.tar.gz 16559 BLAKE2B 865be7da04bb25ab5bb68dfe7171bf790333a04643146c4cfbbf78dd4685c2264d94629d560277bab12f1dde156511a79e3818936498489b914e5d266d176d4c SHA512 724614ede752e633f0f219732be03af443c19cad146244a1815c131581499d5b856973bee25f053d8ad5296bd6283b2bf6024bbd8b5fcfd03aecf150763ce8ac
-EBUILD browse-kill-ring-1.3c.ebuild 438 BLAKE2B 3c78eef776e4a9ecd5f7f30471b551014bcafe36b1d915608a2ecd07a68e16d5e1a2350610b71d040b751a765a7aa256156656c7949f248675c4ea2324f303e5 SHA512 7d01db614985b7764bb41b18bde5b0f616fdb0071da5bc32f3c77bd8283bf1dbf9daa36e6422fb3e726c781acf40ebafcea15f1ad343c93cd8d799abf520a41b
 EBUILD browse-kill-ring-2.0.0.ebuild 446 BLAKE2B 18f25b1709a5a2f520395e2e8809e7574bcf3b25a9cc385f57fa02785bdbdbf2fd5c1fb8dd1644c76b43d156ce23d41d32334c9ba89fe5bc2324a91b2ab8b047 SHA512 74f4df14f102c25da8e09327a4a53a7dd9c526ec4e6912d5111c297d1088dd8a303335c5663382c29d82db1b765d8c5d72e8fdf170dbc5799949185a7e4cef08
 MISC metadata.xml 787 BLAKE2B 6b958094927d6211737da88062c0116ae3b4794216361329ee7a6ae016a156c51ee67622c9e3019e31b93049d25086c5744839a1350f175f514b35baa89a41a7 SHA512 6ac913a862bcbea80b75c45a275907237dc5fbfab8cdd7ef945c70c9486cfbcb1cc49ab1ada3a03724c169acf56b757eeb28d0955d04dc61896d43f82822dd08
diff --git a/app-emacs/browse-kill-ring/browse-kill-ring-1.3c.ebuild b/app-emacs/browse-kill-ring/browse-kill-ring-1.3c.ebuild
deleted file mode 100644
index bdf7fea25781..000000000000
--- a/app-emacs/browse-kill-ring/browse-kill-ring-1.3c.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit elisp
-
-DESCRIPTION="An improved interface to kill-ring"
-HOMEPAGE="https://www.emacswiki.org/emacs/BrowseKillRing
-	https://github.com/T-J-Teru/browse-kill-ring"
-# taken from upstream git repo
-SRC_URI="mirror://gentoo/${P}.el.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/buffer-extension/Manifest b/app-emacs/buffer-extension/Manifest
index e586ca1d0e97..d55273fefef0 100644
--- a/app-emacs/buffer-extension/Manifest
+++ b/app-emacs/buffer-extension/Manifest
@@ -1,4 +1,4 @@
 AUX 50buffer-extension-gentoo.el 80 BLAKE2B 8329957627093470a42d5839e03cceafbd1e9639af9c6f2b3f08cb0c53705a23926cb9e7d0c22aee7a7e7f0280fd76e80162f4037d74f30442e991f2fbd82d70 SHA512 e3f1534344a9c1cca133f93fd03024a5dd9867823358bf83beb81cadece5488054bac378fbe947c9a1f71b085381254dacc6b7e7c3a18e8ad72cebdfd41fc2d9
 DIST buffer-extension-0.1.el.xz 2472 BLAKE2B 10e6cbbe3075871c79a90dd17cd20fad15c9a12f5778758f94e6c509fdf5bb96a17ca0069c1420f53a320041ec5634034ea199e7515c8aef2c0f4808c376b259 SHA512 fef6380a7455fab534563da44868cbab2a54a793e7c86142171940b6133c4e8a9d7008c7f1297568135071eb4f1936f67ec6eea4d2f0a450be5337d97cd0139c
-EBUILD buffer-extension-0.1.ebuild 589 BLAKE2B cf13c0b54bcebf874ca7fe058a56f3b3da5e19aa571731ff813c569e51adcfc6b7581e48bf3dce5a18df774b19cbbb5de5315fb2c7209e23dc5b5f16f9c23891 SHA512 ccb5c1256284b2def4b2cfd3f0e538c75e4b2249f1c1c4f4d693eb6cdea361564103bca1989a8e6ca77a1edd36b4a68d829367dc1430e39e9065f9825c3a157a
-MISC metadata.xml 292 BLAKE2B 046265ce3ff94f04bba9b4b344d852203657df8dd300f30620df260bad1c56b3c23a8c48d073f70f571f733af9a7c034922e0465878028ee8f748060a6816ec6 SHA512 f0115ae686d3003f4264968d3aeb0b054830f87f35378e15e205a729d591c8697507d3c76ead9e1f0bab1f1f66a3fda108322dbcec7b857a37000511d1dd17df
+EBUILD buffer-extension-0.1.ebuild 591 BLAKE2B 15a769194a415b359a1952be4d1527d4c602b897b046376563d55edf37473345bcf5e350fb0ac8311d8751589d797ed075025414510c9a8c9d52ccc5fac413d3 SHA512 03d7f95407af09cbae633a2575fe3b191c41bdbdd0f830a4e3b871d56b037436a4e6bdb8f9a062a0f85c368c46ecd8d9b430df91d00fb182218c79736b78a4f9
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/buffer-extension/buffer-extension-0.1.ebuild b/app-emacs/buffer-extension/buffer-extension-0.1.ebuild
index 639ac1fdc1ba..2098e7420ee6 100644
--- a/app-emacs/buffer-extension/buffer-extension-0.1.ebuild
+++ b/app-emacs/buffer-extension/buffer-extension-0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/gavv/distfiles/raw/master/${P}.el.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="app-emacs/basic-toolkit"
 DEPEND="${RDEPEND}"
diff --git a/app-emacs/buffer-extension/metadata.xml b/app-emacs/buffer-extension/metadata.xml
index c6a53b949e75..c918cdef9591 100644
--- a/app-emacs/buffer-extension/metadata.xml
+++ b/app-emacs/buffer-extension/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>gnu-emacs@gentoo.org</email>
-    <name>Gentoo GNU Emacs project</name>
-  </maintainer>
-  <stabilize-allarches/>
+<maintainer type="project">
+  <email>gnu-emacs@gentoo.org</email>
+  <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-emacs/calfw/Manifest b/app-emacs/calfw/Manifest
index 5b52fa42a798..82998101a855 100644
--- a/app-emacs/calfw/Manifest
+++ b/app-emacs/calfw/Manifest
@@ -1,6 +1,4 @@
 AUX 50calfw-gentoo.el 118 BLAKE2B e5cd4b96817cc88b25d8da38f4d45f7c730feec236a4c636c5816d312a78f5689a7d076f4f53d0e1b947c536826057acb09a89cf8773ddb2752d148094adbb02 SHA512 55cf26db6805dc42f34c090214fc0d87594aacbab5d2113e26472453959a3d4f8d5bfacbf81954c14ac90aaaebc4e4fe8a6914aa31729459993de43a4347aa23
-DIST calfw-1.3.tar.gz 67187 BLAKE2B 7a8f34c5d6ad2ac245837b89c6854ca0c3c8f94733752a8c0d86e460eb2424e4017bd01b877d2b4d6b8fe05f6ffac8dae2d838d6cdf68fad489264fe861317df SHA512 76fc957dac22b2e4e41fa3d5ef3eb9e603369044d5aa90fa2e32ca0abbaa897d4537358f7849d0491c366b6a76c1b463e57e7a9483fca7c67555a8f6157f46bc
 DIST calfw-1.6.tar.gz 74776 BLAKE2B 26aee13fa7533c17eac9c32e8355c6e2fd760e8f87166d7a28ae90040a156ad8e8d8205387b37e5069705fa42095f318a40032ba5ce161f3d84f4823ee6619be SHA512 0c51c1747cfdda003a3b2244224e1bc2afe7b3dbdbb47804734504013ad94f7c5aaa30a2370ae9383f3836f266d47f695ca3d90419d899c8a639d474fab14180
-EBUILD calfw-1.3.ebuild 583 BLAKE2B e5c48d66073091a44d799726bbc27175f86f2286f3b03724c4b4d23ab881581ac6948d5a935799617ca2a37662ee75858b556d1fefc6fe2bfe73a35a5ce60bec SHA512 13d43e409039185471fc0805bc5eac1b38731b075bc607690e93b7d74feed0aa0c3e77c5b63ff008160ad283ad0b016a0e7deabe3831d0fb0ca385a017662b7c
 EBUILD calfw-1.6.ebuild 585 BLAKE2B 5daa74d926134c9b86cb8f55264ec262aa7d1b04cf50aedceae05f1af56b9d206a1ff8fa58dc04914e81d21124027262b1d3e171c8e1d13c4e977f5d611b5078 SHA512 78b6eacfcd55f208902908cc7dec9932c258e2a79953ba02f0f9260becfa22ae666b5ea8a7de9c5fec45e349436ebf703c28d4f72f48cf76bbd6b1bf99f7b7bf
 MISC metadata.xml 547 BLAKE2B edaea440d5e461f1e24d022c1a2aa124b32864f759d1cca28e85d5a2ea439e6f957077a857f5887d35793eec195d60e3df5d6db3d51e9d9f99002d0f151652b9 SHA512 5738530e6d52f52b2ada1839d9bb2e4987169dd82b64e60d068de84eb2ebc4f7da80e3a32abae808dca9d631777b5411618491fe061dfcbee7c04fe7b3e1e6e5
diff --git a/app-emacs/calfw/calfw-1.3.ebuild b/app-emacs/calfw/calfw-1.3.ebuild
deleted file mode 100644
index eb7df8d8ef0e..000000000000
--- a/app-emacs/calfw/calfw-1.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp eutils
-
-DESCRIPTION="A calendar framework for Emacs"
-HOMEPAGE="https://github.com/kiwanami/emacs-calfw"
-SRC_URI="https://github.com/kiwanami/emacs-calfw/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="howm"
-
-DEPEND="howm? ( app-emacs/howm )"
-RDEPEND="${DEPEND}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_unpack() {
-	unpack ${A}
-	mv kiwanami-emacs-calfw-* ${P} || die
-}
-
-src_prepare() {
-	use howm || rm -f calfw-howm.el
-}
diff --git a/app-emacs/circe/Manifest b/app-emacs/circe/Manifest
index 97eebeba76f5..bd691981a95e 100644
--- a/app-emacs/circe/Manifest
+++ b/app-emacs/circe/Manifest
@@ -1,8 +1,4 @@
 AUX 50circe-gentoo.el 84 BLAKE2B 256e2b96a42e5662222eeadfb0fe7277a09eec8119903ea6e3e9a1dfac3157e238d383051b0738b1a8d555250181db67546da50743221314a0ba1353474ad81a SHA512 3f3c92f02e0a6ee760e83b83c4685a6b7f3268d0cb99abc9be56bdee8dd794d177f865582e45e90f895d1a2d9bbdc2ce39a3a60c7fc4eb973021eab66d8dbe47
-DIST circe-1.3.tar.gz 118776 BLAKE2B 61ffc7df022be50beaba29a4025fde6d7cbde5cab28d0661e2e3388f712281f8d9370b92e8c56b4eb49984573d5a2f7edff308a7d1fe74ff630620f0867b1441 SHA512 60bbd752c73e875f2306877591ad8de324db0a7446bbfebf460e44ef19c0c28d40d08c8ed9e0caa4062859b07545d310d86380377a479eb6bc38c72decfaa213
 DIST circe-2.11.tar.gz 237797 BLAKE2B f5a6e72ac51a8e8638d1e05e4781688d83e7cd4fcf3e3e21e517793588c3a32b1686d390ab286d26fce3cbb7dd3ba7a30bb09ec677deacead16057ae8037e1c8 SHA512 aee0b5c7dfa03a190ba697941664e4afc76ec30b8602b2e95ad771fb6172ef2b76f4d05ad8af68f6b274f7f89373e05308b63e9c9cc494b7df0bf2c58fdca4e3
-DIST circe-2.7.tar.gz 237375 BLAKE2B d9978cc3e0c6431dace919efbd323f90e36ce40debb6e03c955b8cdfbed60ac0bbe27c68dcebfe2df9aabd2e7198d2d6da993c2ad41b5ede0b5d1b142217ec8f SHA512 6f4e0925381ad051e4680b5413eed000a6796d2e9bef35a052464a07968f67edb19d99f74be93620359e061c044a910e35afd1f88608453d264bf37826e10af3
-EBUILD circe-1.3.ebuild 474 BLAKE2B 466b3f47e0e6124ee5d2484dbfdfa189b895cab597253066521075278fc93f29738fda684b2b2ae7dc801598845e80a731f7abff3a0bf16ab7e9d64c293cd70e SHA512 5310ba832a4652166b39247d3f7f581fb2deb99832d55e52c746dc7ff2ea183ada09b03ccfa6c0c55c81d816a412dc5681efc70e3601b975c14ebdfe6c322e07
-EBUILD circe-2.11.ebuild 534 BLAKE2B 330b71e9e9393400b460e668df6bf7c6b320becf5ca2e665452e4a923cf7f183f5d77e20ab7dc06b750ff2a6435c786f0eccd7bb2fd86670c8b1a5100aa185c9 SHA512 c9a782a7f40cc817949504795cd3be5bb1a84f268ee3ff2972e3428ef417c9e9f55ec75a553390dbf2394132d11fd0bea29612655dc7dcd3aafb763fa439a8f2
-EBUILD circe-2.7.ebuild 537 BLAKE2B 9ea555c3500da4eda553396eed1a2b019f7e345214573c343bdb725a6427809aa2460a3fa3de3360274cf7d6ea3cec89f136a6226ae6b0285e412f87cb8193fe SHA512 3f8f4ff558f50958c3dc475fed1aa621e4d24912d325c07fde80562a332f928af64e3c9d2119c1297010b9162c2a25e6f92ee229982d71555162599e9c6db973
+EBUILD circe-2.11.ebuild 531 BLAKE2B 02ee8169f4f6ce70ce222ff9ae8b3a8309c0a797a59cd349be0d323e9d06579a75d6066ca2880a6f80500f386e940549b0d4d9714dd74ac5148e37ba635e11cf SHA512 3bac9db4371569764a35700f5335eff5ccdeb18f344564e4cf9fe5f165ae813b29ac7bee676b52b4a8019b32ca82a5c5b021ef41b4e82fc81b528748b10428fb
 MISC metadata.xml 365 BLAKE2B b725f9635d4c4b98167ccb4145c0e7c9fa32b39cf18e79e7f86e583897bb2a79bdb0aa6fc070c53ee0fd03b41685ffdb9f7636c10ff6bfc1c7244f81e4b417a1 SHA512 9e3191129263a25e6ecbf4f7252b326a1addcb110a324d9a4c277ce7a152c086f361796454174e01696be6ad3f9404628b4c9264e3bb7ac2644eb2f72c8e3657
diff --git a/app-emacs/circe/circe-1.3.ebuild b/app-emacs/circe/circe-1.3.ebuild
deleted file mode 100644
index cc6e6d9515dc..000000000000
--- a/app-emacs/circe/circe-1.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="A great IRC client for Emacs"
-HOMEPAGE="https://github.com/jorgenschaefer/circe
-	https://www.emacswiki.org/emacs/Circe"
-SRC_URI="https://github.com/jorgenschaefer/${PN}/archive/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
-
-S="${WORKDIR}/${PN}-${P}/lisp"
-SITEFILE="50${PN}-gentoo.el"
-DOCS="../README.md"
diff --git a/app-emacs/circe/circe-2.11.ebuild b/app-emacs/circe/circe-2.11.ebuild
index eecc09dc8adf..f913b088a243 100644
--- a/app-emacs/circe/circe-2.11.ebuild
+++ b/app-emacs/circe/circe-2.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jorgenschaefer/${PN}/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc sparc x86"
 
 ELISP_REMOVE="circe-pkg.el"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/circe/circe-2.7.ebuild b/app-emacs/circe/circe-2.7.ebuild
deleted file mode 100644
index 8367f297cab8..000000000000
--- a/app-emacs/circe/circe-2.7.ebuild
+++ /dev/null
@@ -1,20 +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 great IRC client for Emacs"
-HOMEPAGE="https://github.com/jorgenschaefer/circe
-	https://www.emacswiki.org/emacs/Circe"
-SRC_URI="https://github.com/jorgenschaefer/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-ELISP_REMOVE="circe-pkg.el"
-SITEFILE="50${PN}-gentoo.el"
-DOCS="AUTHORS.md CONTRIBUTING.md NEWS.md README.md"
diff --git a/app-emacs/color-theme/Manifest b/app-emacs/color-theme/Manifest
index a0f910084fa2..782a2776ec76 100644
--- a/app-emacs/color-theme/Manifest
+++ b/app-emacs/color-theme/Manifest
@@ -1,5 +1,7 @@
 AUX 50color-theme-gentoo.el 4375 BLAKE2B 0a17afad7fd9290dde1992e813711d9bed4b36ec9f2a3d41ab5775dc55e125f7f3cb9b74d1230f1202ee3083b68c29782c3cba955444c04a42b31f3f66b39b89 SHA512 318354c71e75b343eaf90b3be2f94c0b6b93c776afe3289a5c18a5b837478291ce6a8d554a6357c13f14cbe568bf10c5d7ed9690ee8c382ec3cc4aeeac70412a
+AUX color-theme-6.6.0-emacs-26.patch 1956 BLAKE2B dc7f32c9b0485771f057fb0cd4ddc20f8f154917b3fca5294f535f0420429840ba172000e3ee89e79e3004310ffe36e105028250bb893b35d4866ac52c7a6d67 SHA512 2c20a9565019c0271c9ad8c56fdabd731be9bfce2b9841a1b4e140d44ed13337d14bcb1b7a793ed5bf866335e4212f3d7880bf8c561593a76a2c0990d8b81b0f
 AUX color-theme-6.6.0-replace-in-string.patch 1173 BLAKE2B 4e27361d5212afd78e6b94b7b20c3e2512715a280a98fcecaef3b3202ca376b5749c37c3dfb3f1d27673a3421d12de6fc0d7b6c2ee07f1720a32d737558f1e2b SHA512 bdf1ebb03c1fc70bf78adf4886b005780d1c540ac59730e644111f5a3a925b6b05d2e910520b67ec768815f0fecca3a5e617472ca9e415900daf890ca77bc6d1
 DIST color-theme-6.6.0.tar.gz 124858 BLAKE2B b98e97b6c02fa9bac30c5eaefaa1724f751e1176b99fcf10e5d44507ada0c82e2cc2df8352c6d605d097a0c3697b071c2cf9bfe32b4a8cbf67cf00dd5c1545e4 SHA512 4faa22900f6ad4a1dd57452470e23b57827d3f02bf2b9e3c4eed6f5693432d6478aa5008e67f219a95412a63fe52dbcad15b0ac7a3b4d39f1d28ceda75e5e76c
 EBUILD color-theme-6.6.0-r1.ebuild 970 BLAKE2B 859260f9944cd15b0d0cbfc7128ea9b96519498486252845deb877997729d73a5e487108a2c2ae0ca4d844f5cbc474ef7a76f82d48421fa7fc081c2695654146 SHA512 fcde2a903f4e0e733311f7dc019baf3049e0e2ada53ef027530ed07a29e99a72dfa9df9fe004c5b69b560233c82702d744d166114bbf544f0a9f485bb612e4bd
+EBUILD color-theme-6.6.0-r2.ebuild 1020 BLAKE2B ba900834737e7610f9008fb194d1bf7fccb632e868f0e1126656f0f7fa27b4a7e56904dc94fe9978440d9c72a661ef6037fa9dc1974ee1287b79b6fa1403cd4f SHA512 40655880a381099f28c763e47b83d5b7d363f17bbefcdcfc0b9e2e4955253a4fbb120ddfb7585dd04889206a4adf02052f479c04a86e01c070fcf983ae39423f
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/color-theme/color-theme-6.6.0-r2.ebuild b/app-emacs/color-theme/color-theme-6.6.0-r2.ebuild
new file mode 100644
index 000000000000..7ddb8a2caf50
--- /dev/null
+++ b/app-emacs/color-theme/color-theme-6.6.0-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="Install color themes (includes many themes)"
+HOMEPAGE="http://www.nongnu.org/color-theme/"
+SRC_URI="http://download.savannah.gnu.org/releases-noredirect/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-replace-in-string.patch
+	"${FILESDIR}"/${P}-emacs-26.patch
+)
+ELISP_REMOVE="color-theme-autoloads.*"
+SITEFILE="50${PN}-gentoo.el"
+
+src_install() {
+	elisp-install ${PN} *.el *.elc
+	elisp-install ${PN}/themes themes/*.el
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	dodoc AUTHORS BUGS ChangeLog README
+
+	DOC_CONTENTS="To use color-theme non-interactively, initialise it
+		in your ~/.emacs file as in the following example (which is
+		for the \"Blue Sea\" theme):
+		\n
+		\n(color-theme-initialize)
+		\n(color-theme-blue-sea)"
+	readme.gentoo_create_doc
+}
diff --git a/app-emacs/color-theme/files/color-theme-6.6.0-emacs-26.patch b/app-emacs/color-theme/files/color-theme-6.6.0-emacs-26.patch
new file mode 100644
index 000000000000..4310733dbf24
--- /dev/null
+++ b/app-emacs/color-theme/files/color-theme-6.6.0-emacs-26.patch
@@ -0,0 +1,48 @@
+Some updates taken from https://www.emacswiki.org/emacs/color-theme.el
+in order to make this work with Emacs 26. EmacsWiki calls this
+version 6.6.1, but doesn't package any other files from the upstream
+tarball.
+
+--- color-theme-6.6.0-orig/color-theme.el
++++ color-theme-6.6.0/color-theme.el
+@@ -1077,13 +1077,11 @@
+   (let ((rules '((font-lock-builtin-face font-lock-reference-face)
+ 		 (font-lock-doc-face font-lock-doc-string-face)
+ 		 (font-lock-constant-face font-lock-preprocessor-face)
+-		 ;; In Emacs 21 `modeline' is just an alias for
+-		 ;; `mode-line'.  I recommend the use of
+-		 ;; `modeline' until further notice.
+-		 (modeline mode-line)
+-		 (modeline modeline-buffer-id)
+-		 (modeline modeline-mousable)
+-		 (modeline modeline-mousable-minor-mode)
++		 ;; D.ADAMS - Emacs 24.3 made `modeline' obsolete, so I've just commented-out these four lines.
++		 ;; (modeline mode-line)
++		 ;; (modeline modeline-buffer-id)
++		 ;; (modeline modeline-mousable)
++		 ;; (modeline modeline-mousable-minor-mode)
+ 		 (region primary-selection)
+ 		 (region zmacs-region)
+ 		 (font-lock-string-face dired-face-boring "^dired")
+@@ -1254,7 +1252,9 @@
+ 	   (val (cdr (assq param params)))
+ 	   (frame (if color-theme-is-global nil (selected-frame))))
+       (when val
+-	(set-face-property face prop val frame)))))
++	(if (fboundp 'set-face-property)
++	    (set-face-property face prop val frame)
++	  (set-face-attribute face frame prop val))))))
+ 
+ (defun color-theme-alist-reduce (old-list)
+   "Reduce OLD-LIST.
+@@ -1332,7 +1332,9 @@
+     (dolist (var vars)
+       (if (or color-theme-is-global color-theme-xemacs-p)
+ 	  (set (car var) (cdr var))
+-	(make-variable-frame-local (car var))
++	;; DADAMS
++	;; `make-variable-frame-local' was removed from Emacs C code in Emacs 26.
++	(when (fboundp 'make-variable-frame-local) (make-variable-frame-local (car var)))
+ 	(modify-frame-parameters (selected-frame) (list var))))))
+ 
+ (defun color-theme-install-faces (faces)
diff --git a/app-emacs/company-mode/Manifest b/app-emacs/company-mode/Manifest
index d947103e5326..04281e5efcd0 100644
--- a/app-emacs/company-mode/Manifest
+++ b/app-emacs/company-mode/Manifest
@@ -1,6 +1,6 @@
 AUX 50company-mode-gentoo.el 79 BLAKE2B c9b00690d98498b53fa329adf5279ee341c03c73cfd12b70e1474189cc9c9de07bca276ef9fad35f346825c4daab0212e8965069a2a0706cec690350df24fbf7 SHA512 8c3c1d4a50bfd4729f8a06f33bf9d754b5865814cf15eee1f3c84c6726734f8ff26c21547f1453f7417a0b9d008fe7804104ee6e30f13c54625d2b4b6faa7e99
-DIST company-mode-0.6.14.tar.gz 51776 BLAKE2B 2e5a651b13d959d964847a307814106b5db95092d764e1d6889c94412d0aa1995d2a34182786493afc426b6c6ae4f229498f58b7556d1dc264c71ec57dcb8b6f SHA512 7b8c0b70dc9c010214e8671fd7393faa9d1dd0839f41d532eb93eda91c77b4c93f2145ad2d688011976bfbb45282f35b937f195499f29cda79147ec2815e94d9
 DIST company-mode-0.7.tar.gz 54670 BLAKE2B 4b56182d6d37e1c0dd827babf3e5c17c49a2e86959c99aa4dc6832f5003a9c1baf0019c610cf9bd46e6db5f1d68e72381ae22f71afb636873552440c48b218c0 SHA512 375c8541a0c5b34fba37ea136c8549e6ec916c238bee8115f036d88f273d6bcb0c0f436a6193d3b4be6528945d8f85c605de8d340e903a9764f5ace664f8cf61
-EBUILD company-mode-0.6.14.ebuild 1000 BLAKE2B 51b71a2a2d7988421156b6b415b935bfe153fd076d83904f6762cd02aed3c7b1318b228b0c960160cf4c640f37d51c5334877f24e4d5ef0fe49f2d36dd355416 SHA512 62fced23f0b40ab4d4b93c2102202c00e7dc85d4541cdbbea9bd78d65d71b07d301700fa944d2729d0e59f2537e10fece36509daf0666179158acb0293c10804
+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
diff --git a/app-emacs/company-mode/company-mode-0.6.14.ebuild b/app-emacs/company-mode/company-mode-0.6.14.ebuild
deleted file mode 100644
index 7b2e2231f50f..000000000000
--- a/app-emacs/company-mode/company-mode-0.6.14.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/company-mode-0.9.10.ebuild b/app-emacs/company-mode/company-mode-0.9.10.ebuild
new file mode 100644
index 000000000000..a0b76f2616a8
--- /dev/null
+++ b/app-emacs/company-mode/company-mode-0.9.10.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+RESTRICT="test"
+
+# Note: company-mode supports many backends, and we refrain
+# from including them in RDEPEND.
+
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md NEWS.md"
diff --git a/app-emacs/csharp-mode/Manifest b/app-emacs/csharp-mode/Manifest
index 96d6c3f5ecb1..bafc132c2b0d 100644
--- a/app-emacs/csharp-mode/Manifest
+++ b/app-emacs/csharp-mode/Manifest
@@ -1,7 +1,6 @@
 AUX 50csharp-mode-gentoo.el 171 BLAKE2B 6fa14f46d3ea4fba310ad4cb59a037ed5a4f123cc5b9243db715e08d3301bad7f24abb4cf1aa3ec178ad9c8e859d5225f49a3c8b87a302ac50c7a30eb56a34a1 SHA512 e0c9a5dc17c849ce9619a75ee46a0eb7415c0c04cb71cef326845ec9fdd79f57abf397590ba85bb0b901103ba0815cd6c873e9e12670cfb97d796b1f2cef087a
-AUX csharp-mode-0.7.0-emacs-24.4.patch 393 BLAKE2B 7eb176fa02441f9b5d42fd6ff68c3079d1fc047b6d84419725693b545402963a2fb14447be9843bc705026a06f65e104d582ed4bacec0d64b52ef06bef03f8b8 SHA512 b7b0a337a1b0d615f92b86ad27c09274ec63e87795629778b9091307fa6fa7bdaea2efe01cacadff2b47ccafd43ee0445f883f2f8a0b8f225fb727488c5752e3
-DIST csharp-mode-0.7.0.tar.bz2 6254 BLAKE2B 259d3ab7a6005428043398d44068dd8accc222c50581b7a760c740af96275a5877efc186d2582dccdc73442b9549bc8f5e1ff7f95e69effa7c90bbffc46fe461 SHA512 b6cbf2899853c29f44d19f37a01984a03c61f7bde144880f6f32e2a890d3b90a546ff69ad328d157e5494191aed37836373f49ddbafac49d8b9bd1cea3e22de9
 DIST csharp-mode-0.9.0.tar.gz 50453 BLAKE2B ed4b6ba56a9283687db332749510dcb63cc4bfc35687979cabae48b76d9e36598c88ff43f2920ca5272b56833d5cadd6602b47be21d88a7cd25d6ecb0e748493 SHA512 81661d98acdf03e01caf3b9388da8571e78402b8914755b223a38a723457a988201adcaf7b5b825c4e0126ad5e7628063f85dd4e60ee272102a5f1509f9446ef
-EBUILD csharp-mode-0.7.0-r1.ebuild 426 BLAKE2B 726cd422b98165f0eb2f4da36391a9360676919c152194521ca7f7df8e21eeaac6313bdee28c01a2faab3fde504ddf6e61653e475f1c1bac49630cb91c8130f2 SHA512 5d4eb1347e3f6d6c4d4c25a54c2c1f08bea882296cdb8af907a315cae6dbe03d76536ba3fb6d563218ba26ded56850bae1465506aeedd9b8b79bb41552d2f63d
+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
-MISC metadata.xml 381 BLAKE2B 24f06d9590b0aefd84fe951957813fdcbd1821fa8ee7878a6f34e0aacd51c603a93ca0e91da14bbe58ab6239c8c38e59c0a17d8162ca478ea5ad832536b22ffa SHA512 4c03424612532509c84b60d2058272ca830b6532dfcc6a179324236b30f9edd2e7924cebdf1803f4fb7d7adbe94ff59c065d605534c375c2bf4c0919356303e0
+EBUILD csharp-mode-0.9.2.ebuild 542 BLAKE2B 0640f5e03cc11b420fecb52b6f04fb492bbce402c42a1bc2a7db5ff58010853a48eefafe741c4b9e96cc0b5bb4fbe3ef6465bc11d4201d0971fcf264fdba750c SHA512 d6a7fde9982213722c67d65766e9e555008dab2342625de96ee4da76d923a19e40abdec3b86427fa29bd673fc4b31c834ac543a8205421d2059ecedcdf744da7
+MISC metadata.xml 365 BLAKE2B 198ce5e41bcc5190c96f1513cf4bae60b691294d6343542d42edbe21d087deb81a3a4e102949638d714039959dd0ffa660db142b3b68184e60d6693679bbb0d4 SHA512 43148e8901940998cdcc1667aa7027cf7235273d9dd276eb884a319c99ec2154700ab7c56f25301f23a0238004209f4da887d08c2f3088f71c0c89aca6bcfb66
diff --git a/app-emacs/csharp-mode/csharp-mode-0.7.0-r1.ebuild b/app-emacs/csharp-mode/csharp-mode-0.7.0-r1.ebuild
deleted file mode 100644
index 6346e99d8da1..000000000000
--- a/app-emacs/csharp-mode/csharp-mode-0.7.0-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="A derived Emacs mode implementing most of the C# rules"
-HOMEPAGE="http://mfgames.com/csharp-mode/start"
-SRC_URI="http://mfgames.com/releases/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-ELISP_PATCHES="${P}-emacs-24.4.patch"
-SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/csharp-mode/csharp-mode-0.9.2.ebuild b/app-emacs/csharp-mode/csharp-mode-0.9.2.ebuild
new file mode 100644
index 000000000000..d2dad1639c13
--- /dev/null
+++ b/app-emacs/csharp-mode/csharp-mode-0.9.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+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/files/csharp-mode-0.7.0-emacs-24.4.patch b/app-emacs/csharp-mode/files/csharp-mode-0.7.0-emacs-24.4.patch
deleted file mode 100644
index c3f73201cbae..000000000000
--- a/app-emacs/csharp-mode/files/csharp-mode-0.7.0-emacs-24.4.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugs.gentoo.org/528374
-
---- a/csharp-mode.el
-+++ b/csharp-mode.el
-@@ -125,6 +125,9 @@
- 		  (stringp byte-compile-dest-file))
- 	     (cons (file-name-directory byte-compile-dest-file) load-path)
- 	   load-path)))
-+    (and (= emacs-major-version 24)
-+	 (>= emacs-minor-version 4)
-+	 (require 'cl))
-     (load "cc-mode" nil t)
-     (load "cc-fonts" nil t)
-     (load "cc-langs" nil t)))
diff --git a/app-emacs/csharp-mode/metadata.xml b/app-emacs/csharp-mode/metadata.xml
index a4bcf30f6751..7629548fb1c3 100644
--- a/app-emacs/csharp-mode/metadata.xml
+++ b/app-emacs/csharp-mode/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>gnu-emacs@gentoo.org</email>
-    <name>Gentoo GNU Emacs project</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="github">josteink/csharp-mode</remote-id>
-  </upstream>
+<maintainer type="project">
+  <email>gnu-emacs@gentoo.org</email>
+  <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+  <remote-id type="github">josteink/csharp-mode</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-emacs/css-sort-buffer/Manifest b/app-emacs/css-sort-buffer/Manifest
new file mode 100644
index 000000000000..faa363ef789c
--- /dev/null
+++ b/app-emacs/css-sort-buffer/Manifest
@@ -0,0 +1,4 @@
+AUX 50css-sort-buffer-gentoo.el 195 BLAKE2B 9c26fb7a714b2b2961b4016cda3157a44c2a97a573823fc49318cde6ac35cffa6ed82c6f09c522055faac7ae13d1d6c5f0a945f2179a98b20ab72e2321d05181 SHA512 e69922dbe1ad7ce978332e27b6d8f4aa366a073b0ba50e3cc82b403da97d05399ed7772408e6688e69b0c3ee69342a4cde46b0401ceb7d4600e40e12eca188db
+DIST css-sort-buffer-0.2.el.xz 2436 BLAKE2B f1286cd1f689e652ad5bd1f28baefa16be56223b9ed38d1dd5e6cd0f640606b4e291735a3edbecf6c1eb5ec4801506d4cbbe9aeb64d0cf81a2660713d97d7919 SHA512 7421265208a95e9d56ec3e0833bfcad9d26dd283fdf8ead3d6338037d51ab1bf9812d0b51345f1b416c0d9adcba9b78d01b80c74ca156b46ea9c7660bc835f7e
+EBUILD css-sort-buffer-0.2.ebuild 422 BLAKE2B 7c5795284b40855a772c1a6ef916c988c783c1415ca0bd93669fb8f1f0b350595312d00454762783348b64ee7ac1c7941692ca11510a4092bef34dc8a04ef8c5 SHA512 02cd548530d8423e56a3fb855116eb40d816fc3f14e02c6c8fe3fd07fdf870e05cd2f5e19babc55bc55acd3f29f846addf60e0d86b19e78ffd95998317f3f5b3
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/mediawiki/mediawiki-2.2.4.1.ebuild b/app-emacs/css-sort-buffer/css-sort-buffer-0.2.ebuild
index f68cd85b1dc0..52a33d68b31f 100644
--- a/app-emacs/mediawiki/mediawiki-2.2.4.1.ebuild
+++ b/app-emacs/css-sort-buffer/css-sort-buffer-0.2.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit elisp
 
-DESCRIPTION="MediaWiki client for Emacs"
-HOMEPAGE="https://launchpad.net/mediawiki-el"
+DESCRIPTION="Sort CSS buffer"
+HOMEPAGE="https://www.emacswiki.org/emacs/css-sort-buffer.el"
+# taken from https://www.emacswiki.org/emacs/download/${PN}.el
 SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/css-sort-buffer/files/50css-sort-buffer-gentoo.el b/app-emacs/css-sort-buffer/files/50css-sort-buffer-gentoo.el
new file mode 100644
index 000000000000..12ee6c9e0f55
--- /dev/null
+++ b/app-emacs/css-sort-buffer/files/50css-sort-buffer-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'css-sort-buffer "css-sort-buffer"
+  "css-sort is cool, this function sort whole css file,
+don't need user sort css attributable line by line." t)
diff --git a/app-emacs/css-sort-buffer/metadata.xml b/app-emacs/css-sort-buffer/metadata.xml
new file mode 100644
index 000000000000..c918cdef9591
--- /dev/null
+++ b/app-emacs/css-sort-buffer/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>gnu-emacs@gentoo.org</email>
+  <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/csv-mode/Manifest b/app-emacs/csv-mode/Manifest
index 15f11281918e..35f0ad679925 100644
--- a/app-emacs/csv-mode/Manifest
+++ b/app-emacs/csv-mode/Manifest
@@ -1,4 +1,6 @@
 AUX 50csv-mode-gentoo.el 194 BLAKE2B 6232d9d6d6989647532b496f8c3304b256cd04ec12530a93518621094cc3c652a855dc822059df08ba5d4f6478017888978c5c5c11a495d2afb869dc9a0383dd SHA512 8aa137123c8eccc7551c946e7925ff3a54364acba46d29f401f96330ce97fff289f61e0544db4ed45ce677691d0fca5ed8302587ff4280ba8ff9906f58fec890
 DIST csv-mode-1.50.tar.gz 14379 BLAKE2B 8b3b60414aa8d6c54f18a0452c1f0d7ea4cb85311392f928e3ec99555b91cd9e7a47e4315b07df3970acf4c05b05b85e1a4e2e7b87b3bb8527904003f89ade75 SHA512 f62e9561f3ec9c14d0fc44de92f83b733ab86e45ba4b8919e5dbbee05d25a346cf7f1412aa0c5be7e88079d219dd4c22d6e198f4e53f801ae1b137e014a7943c
-EBUILD csv-mode-1.50.ebuild 374 BLAKE2B 1a278b402bc06959878351946ae8b3c718645a8d02d9940d7d6bd3921d682224e64b15874cc54ea003d15c546681bb4bc3b26fa397f28f97178a93df5876bb25 SHA512 f6a712268917b10640e52925e5bd9d6cf5f4415054830208fae3cd8a23ceaf744259d7a9225a30bc536e9f7aaf452a61baed96b27129bc07de5cf68e282cf19f
+DIST csv-mode-1.9.el.xz 17392 BLAKE2B f49ca9612857f8723d6bec35309fa8c357cfb62589404718141e1fa1cf9a7188c759441e7993dc8e2af5424055d2f68f99d7cff8bba80cf0a1ead9785213f0a8 SHA512 fcf008ba30589a57c362f8501a20bcb494ce9e971ff9e2d3833436658295c94af3bc55be8a32e83deed407c19143ca421a33b3a93d7457a272de34f1d758969b
+EBUILD csv-mode-0_pre20040823.ebuild 415 BLAKE2B 816263183d4bf4367d650d0973ba1ef82205a7c76df32dbf40c2015cc74bd6e14c206c93824ba2969d67cef063f75bd709097b711c1435ce528dd265194bfaab SHA512 c61ce99eeaad609a28433fb393a08bced2fcd20e1dd2545f7d0041d21954b06e1c3924d0d2c731fd7eb56c879a05844b8fb24632331a1d560fb799082111498c
+EBUILD csv-mode-1.9.ebuild 493 BLAKE2B 3af358dab70025170a9501d88fb448aa80efad751ed8d19ca56906db21552f255ef81dab961f9818a4ad47c1523fcf9d60a076c3d7252c4df72562c2fff4ab16 SHA512 899903817ca62ab896658c0c1e9cf3aeb52116a71b55c3f0f5ad117a31934d16b88733674b3bc5822f3fae2fc168b6c2202bcd5a10a1bdf65b8610c160c2211a
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/csv-mode/csv-mode-1.50.ebuild b/app-emacs/csv-mode/csv-mode-0_pre20040823.ebuild
index a55d48063024..6feb8e47a5e9 100644
--- a/app-emacs/csv-mode/csv-mode-1.50.ebuild
+++ b/app-emacs/csv-mode/csv-mode-0_pre20040823.ebuild
@@ -1,16 +1,18 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 inherit elisp
 
+MY_P="${PN}-1.50"
 DESCRIPTION="A major mode for editing comma-separated value files"
 HOMEPAGE="http://centaur.maths.qmw.ac.uk/Emacs/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~ppc sparc x86"
 
+S="${WORKDIR}/${MY_P}"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/csv-mode/csv-mode-1.9.ebuild b/app-emacs/csv-mode/csv-mode-1.9.ebuild
new file mode 100644
index 000000000000..e5de26a88e1a
--- /dev/null
+++ b/app-emacs/csv-mode/csv-mode-1.9.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="A major mode for editing comma-separated value files"
+HOMEPAGE="https://elpa.gnu.org/packages/csv-mode.html
+	https://www.emacswiki.org/emacs/CsvMode"
+# Taken from https://elpa.gnu.org/packages/${P}.el
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/cycle-buffer/Manifest b/app-emacs/cycle-buffer/Manifest
index 48f61c19e01d..804ba45fdf68 100644
--- a/app-emacs/cycle-buffer/Manifest
+++ b/app-emacs/cycle-buffer/Manifest
@@ -1,4 +1,4 @@
 AUX 50cycle-buffer-gentoo.el 76 BLAKE2B 72fac6d037804f88aee631205aa0ee192c48cfe64a8efe5a90496b24b03429503d0010b9ee082181540d374c2ff9066425e35a3ef5fd6af9759264873a129527 SHA512 e19c819b054a961e3265c6bfc96f20bfc90ee9cfbdf78f30d86e211b168e4e4ccf94ed6ef8d52c08a37dee3202773eb1164f7d758572c943e3bb2de52fea3fbd
 DIST cycle-buffer-2.16.el.xz 5392 BLAKE2B 7d4b765da320109274605731bfc6910bf75ab4a0610f75d4dd4a4b45e03c7103a76bf0dedffbdb67831d0c8cb04f147f8c77757cb40b714c80a7bc69c9105b79 SHA512 344c07af9e2c9ff06dfa81ff44d02c1e8a9434381486c227a7af06c989e7c623b0f9bf547500b320e2ede7d181f0212725c03a84f53a43683ab3b8229b99a6c6
-EBUILD cycle-buffer-2.16.ebuild 520 BLAKE2B cb7e1cdcb7de409fadf3bb0e056207e6dd3c4c7373473c17d892ffb8ab264a9cbbcc63bc877114b37d32ffe7fbc1bfab6608772f9030b3b66c45c511e6b65537 SHA512 29003c5ff1d0ee68df8ca4b14aa406302eaf1764854f8694075e8a255fda26e9302bb9642560469ccd36c1427a8935815800513dee03d86dbbe3373b55524719
+EBUILD cycle-buffer-2.16.ebuild 522 BLAKE2B e4b25216a87a770dbca5919d3f875c08ff5084676d971ee18789f3a5d7e0591e12af740a38a4c899d7e4f1455382c43f79f350882899d30118aa08cb1446e6f9 SHA512 276359ef16628f506cbb20b8f71629a42bce70afaee10ed86bc0dd8e8c364ecf2675292e57959ec0df6c7864dd81e7bf4a919607c726cf9a8031aabcd44e8221
 MISC metadata.xml 292 BLAKE2B 046265ce3ff94f04bba9b4b344d852203657df8dd300f30620df260bad1c56b3c23a8c48d073f70f571f733af9a7c034922e0465878028ee8f748060a6816ec6 SHA512 f0115ae686d3003f4264968d3aeb0b054830f87f35378e15e205a729d591c8697507d3c76ead9e1f0bab1f1f66a3fda108322dbcec7b857a37000511d1dd17df
diff --git a/app-emacs/cycle-buffer/cycle-buffer-2.16.ebuild b/app-emacs/cycle-buffer/cycle-buffer-2.16.ebuild
index 9928f250bece..b6dabed75176 100644
--- a/app-emacs/cycle-buffer/cycle-buffer-2.16.ebuild
+++ b/app-emacs/cycle-buffer/cycle-buffer-2.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/gavv/distfiles/raw/master/${P}.el.xz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 SITEFILE="50${PN}-gentoo.el"
 
diff --git a/app-emacs/d-mode/Manifest b/app-emacs/d-mode/Manifest
index 334b72428a09..007f79134557 100644
--- a/app-emacs/d-mode/Manifest
+++ b/app-emacs/d-mode/Manifest
@@ -1,5 +1,7 @@
 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
 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
new file mode 100644
index 000000000000..24f2b7911109
--- /dev/null
+++ b/app-emacs/d-mode/d-mode-2.0.10.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="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-${PV}"
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/dash/Manifest b/app-emacs/dash/Manifest
index 589c585452da..107f9cfa685d 100644
--- a/app-emacs/dash/Manifest
+++ b/app-emacs/dash/Manifest
@@ -1,8 +1,6 @@
 AUX 50dash-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
-DIST dash-2.13.0.tar.gz 146280 BLAKE2B e9552a19b1f84db0e16fba07fe5bcfc0eb8a6871aabf395fa7ca527b77ba23616fdaa29e67d73e6cf11260bd23807be17de1e52f4abd23b0f9562cb26e6a5feb SHA512 59969e3df1b258a1bae76904e5abaf64c5143de9b8994a04799dad3a317c6ccc1dcd19b99a337a23bce0e46cfb6bc90bf8c6b0e6a532946b4f0ec188d331b559
 DIST dash-2.14.1.tar.gz 141115 BLAKE2B 87fc7a02c66161d1c16debc54c6336f36cc47cf7c7c470d190424b9c463723058ef6f72cadf3f4d4215b36f369b9e5356101c4ea16fede10cefde90b5e0b384b SHA512 cfd4ed7a9eab881a0c3bd2744e78c5ef99a92db4d3afee8c632c0a766adcdbf1999f4e9770e2c4e941526d488dd6f9327937389490cc2310d79b38c5bf2ddd12
 DIST dash-2.16.0.tar.gz 148151 BLAKE2B 1c51d926a6dd4ecdbc2ad132347af7bbd27e604d6e2c61a6cfe548802b08a57678ca26aba69f8ae27ca7cdeca84cd469bd9a7849bf28c2abae44f7172ad2659d SHA512 a0196327c8e81d1b343bb56de00a3c2f59b1d3f86dc4e923cf350658590fa106aa0be933aa0f51ff3c02d9aff8450c5e055d169ae8fb876be068bf15a52af216
-EBUILD dash-2.13.0.ebuild 545 BLAKE2B 083977c9bcd22b3c3e86c7f1e78f54b40ea3483b5873bdda957b9ea290a8ead2807178e1b2948001e32bad26b855f24215d87ea2a5cfcae847d2625a9144b307 SHA512 0179b3c93d4fdf86889bc649599cd27684c037e07efda724069ea5618e41c1f8c52a63d680266b703f743c0c9e322cfaf354634822523dfeff56a55519257d57
 EBUILD dash-2.14.1.ebuild 560 BLAKE2B ff1f6faf93907f3dc4ebf54fb77a6d6aef111dca5c61ad277b3f561e5035d0428225232a79536c61216e24e5992161f79dd83eb5e4ff1044d15aa6cb07044012 SHA512 2701b512cb5d8bcaea7b8d7298f04834f5e7099259414c894239470a5a3edda9574c85a5b02d224b26b797a9426fc7115c12de8eff96453bb675b85d99bd9970
-EBUILD dash-2.16.0.ebuild 557 BLAKE2B e2f82decfc376e5760935341e691041262af38ddae16f394f30d25add656be8f4e9bd210950336a95c5953f575cdcb481eecd5cf6d71c13461b46915c375ed3d SHA512 91f81467c245d9d3c0e19edcf0589f2a0437d5f02e76818b5282f6f044c7c7236dbee38e67fbb7005a0227313ba261e50631bf2357633bbaf898ac419fffe885
+EBUILD dash-2.16.0.ebuild 555 BLAKE2B 1c2935c6bcf84d9535bd61f81ffc559ec6a4799175302823c30f26e058931427275918e2dd8f56ab9f31b1dc123d37ea1ee685b391e165c82564f3cd97d48682 SHA512 4baa732fa0e1c33f9f42eb9a792af44998c3d9081c93eac742fadec64cc20388e562be4b32de45fdcef831c85c5e45e6d4eb4946a7e7adf3de073ac464e63ee0
 MISC metadata.xml 360 BLAKE2B e70caec7e3633788a79217f8d41bd69056ed620396e4d22ecd0d80ad82f7dbe2e9ac3872c55cd94682cd16960e682b1f648863373cc941559b40045612188f8c SHA512 8de7334410a02599aff54733234d7b3333c4a61cd2ffc846f3f69df3b43a53c510b2235100fab79274e0727393ecec24e051b42aa36b878d6b45130b5b2e3ff3
diff --git a/app-emacs/dash/dash-2.13.0.ebuild b/app-emacs/dash/dash-2.13.0.ebuild
deleted file mode 100644
index 6d41d2588b8b..000000000000
--- a/app-emacs/dash/dash-2.13.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="A modern list library for Emacs"
-HOMEPAGE="https://github.com/magnars/dash.el"
-SRC_URI="https://github.com/magnars/dash.el/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-DEPEND="sys-apps/texinfo"
-
-S="${WORKDIR}/${PN}.el-${PV}"
-SITEFILE="50${PN}-gentoo.el"
-ELISP_TEXINFO="dash.texi"
-DOCS="README.md"
-
-src_test() {
-	./run-tests.sh || die
-}
diff --git a/app-emacs/dash/dash-2.16.0.ebuild b/app-emacs/dash/dash-2.16.0.ebuild
index 16a75dcd7c96..6a7d7a15386b 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 ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="sys-apps/texinfo"
 
diff --git a/app-emacs/desktop+/Manifest b/app-emacs/desktop+/Manifest
index 13624d900105..89bede5f2791 100644
--- a/app-emacs/desktop+/Manifest
+++ b/app-emacs/desktop+/Manifest
@@ -1,4 +1,4 @@
-AUX 50desktop+-gentoo.el 72 BLAKE2B 76ac2f6e8e087bf06704946b008f2b9366a3e4eefd0d71d3d5b8d37295ff0dc5dc364c826b3ddf37c3d7cd1ecf47318534f9405683dfe13ad542e055df5361b0 SHA512 a97bf9092cd7e397f2b76d3e0459f9639180a84e481aae7c5b64c08713704173760df8aba7fc05d4aaa4cba7f4ae3b5d578c7db93f9cfcd120b688de4ca53cb4
+AUX 50desktop+-gentoo.el 458 BLAKE2B dc9343836e0850a4789fab5cb13d7725b8e1242e7330ce96a10839a48901fc7a7bd1197abcb43098290b96f72faedaccba6eddd6f1a3581c9f5da38a93681dd7 SHA512 2f058d7ebd9364b76beaa7e8ed56aba1ac45864b95206d6ef477c9e3cb841d28b28a0c2079be89bf026abb2220d92a0a04848431a6048443f911c501dbdb232d
 DIST desktop+-0.2.tar.gz 19596 BLAKE2B 601591977f981ebf66b9b01d397b08e3e0a72c73515760cf8b3333a0d25a9b8747a2f207ffeb13ed1c0292888049b4263ed6ecc875dd70273661a826be28a89b SHA512 3fe0647e506832e37378862d59f5d748f8db20d4ad776d7486ba3393f67047a69f0e5704042eec2e2327ead89b6b2e55196f5773efbe975f5913a6ec6f01269c
-EBUILD desktop+-0.2.ebuild 591 BLAKE2B 89b4f16e30aca0d226d2ad7fcc0df87ad2bffcaa7d4b27ac9d99ec7a86f3d7f7cbcf9aec25b83389d309a24e3c487e4a21fc7b508b5621f433de1bf09bb0221a SHA512 4047e82313c254fe9ffc2f06c804cc5f0d6ea3bf60461b80e5cbeefdb2a88c3aaff22e96efda374b20f0e63634391b96199792258dddc550d6a47a3051d44962
+EBUILD desktop+-0.2-r2.ebuild 530 BLAKE2B 14149bbf24d80816365ec88ff8f0ca5fd9fd9cd57cce33693872c64e23724d520d7aa3d31fe09e9470def11d9de55798bbd8f4d2e461dfd7f621b7109d317a69 SHA512 b7171f83213021da4239a76b87c82ebe0f80d506c46ed1886448094173cd50769130c801c3c2a03412e6faff9421b449059e37b6fedf2a2bc59e3a15ee0d7f24
 MISC metadata.xml 382 BLAKE2B e58ddca456331873929c0d7c527913d08879053ab26681b86071c3d0f7c9e8aa54765bbc482a2ef0b4ed8641626d375180ecfe98b309b1f6ad7ab6841040749a SHA512 0fcba01ddc8ebf9c735b2c095fe3563beb920e1e28022a20f224337c9e122b1e847fa10da179a7412e79b9208a643b7ca2d947434087942f58cd2317f66aebf5
diff --git a/app-emacs/desktop+/desktop+-0.2.ebuild b/app-emacs/desktop+/desktop+-0.2-r2.ebuild
index adf858b1a86d..b4016a3364f9 100644
--- a/app-emacs/desktop+/desktop+-0.2.ebuild
+++ b/app-emacs/desktop+/desktop+-0.2-r2.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
 
@@ -11,17 +11,13 @@ SRC_URI="https://github.com/ffevotte/desktop-plus/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 RESTRICT="test"
 
-RDEPEND="app-emacs/dash app-emacs/f"
-DEPEND="${RDEPEND}"
+RDEPEND="app-emacs/dash
+	app-emacs/f"
+BDEPEND="${RDEPEND}"
 
 S="${WORKDIR}/desktop-plus-${PV}"
 SITEFILE="50${PN}-gentoo.el"
 DOCS="README.md"
-
-src_compile() {
-	elisp-compile *.el
-	elisp-make-autoload-file
-}
diff --git a/app-emacs/desktop+/files/50desktop+-gentoo.el b/app-emacs/desktop+/files/50desktop+-gentoo.el
index ca3b3828a3ed..49a731f077e1 100644
--- a/app-emacs/desktop+/files/50desktop+-gentoo.el
+++ b/app-emacs/desktop+/files/50desktop+-gentoo.el
@@ -1,2 +1,9 @@
 (add-to-list 'load-path "@SITELISP@")
-(load "desktop+-autoloads" nil t)
+(autoload 'desktop+-create "desktop+"
+  "Create a new session, identified by a name." t)
+(autoload 'desktop+-load "desktop+"
+  "Load a session previously created using `desktop+-create'." t)
+(autoload 'desktop+-create-auto "desktop+"
+  "Create a new session, identified by the current working directory." t)
+(autoload 'desktop+-load-auto "desktop+"
+  "Load a session previously created using `desktop+-create-auto'." t)
diff --git a/app-emacs/develock/Manifest b/app-emacs/develock/Manifest
index f7de5d4facdc..f64fd5135f92 100644
--- a/app-emacs/develock/Manifest
+++ b/app-emacs/develock/Manifest
@@ -1,4 +1,6 @@
 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
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/develock/develock-0.47.ebuild b/app-emacs/develock/develock-0.47.ebuild
new file mode 100644
index 000000000000..c18c39943080
--- /dev/null
+++ b/app-emacs/develock/develock-0.47.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="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 https://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/distel/Manifest b/app-emacs/distel/Manifest
index 4b371dbec85d..5bd328ca1777 100644
--- a/app-emacs/distel/Manifest
+++ b/app-emacs/distel/Manifest
@@ -1,6 +1,4 @@
 AUX 50distel-gentoo.el 197 BLAKE2B 4c58633362840f228ff45786c2ded8811504def269f978d79f853bf556c2c673b8235203ed72b2119cf27f252fb603643562e26cb3ca7c75a4550461b9b95267 SHA512 1ed45f84dde596713c8f14b0eed011d9e2f073196f55cf355f3ad8c4b540aac94d7d4a1780a0020719b74f4eb3a610094ab5ed4e1ad142604937fbdaf50d2b6b
-DIST distel-4.0.6.tar.gz 210257 BLAKE2B 615682bfc2b773a78ad85d4817135144dda787d1db57b2743ea2fca8ed672fc1e37f6bc23803c9cc2b6096e7376d318cd7c25c3133f7b9c1326dbd451273841b SHA512 510f82b6794379d89020d234462e09251e0db285ebc111eaf096e32a4e3619384650cb2b47ed68d38762a496504b58981c73ca5b930bd0eb1407aee9599c149f
 DIST distel-4.1.1.tar.gz 214189 BLAKE2B 0a24039c11d603814ca352ccc09e776b2431ab1172c195a528aba6ecd85eeb15d9739bb37fcc850fd33e2af928eb9d2c7bc8a1721b46f79792ec658f58d41a4e SHA512 3ef73a650775f25f8e77c78cfaec3d2277a4e097128819d118ba566ac477455a1764383959f1d8eca33f8dedfa937eab605dfff899d344b9b03262c2abc7ac44
-EBUILD distel-4.0.6.ebuild 922 BLAKE2B 3c604aae95aa29fd62f69d57750217fae6dd8a41636bf0d8affca05c79abc9fa0e670be9f30336c2291a0db4259995b19652efd456c083fab08e95f560fa5b45 SHA512 013f6fcbaa8baae4e291fa1649d238351e166ad727a4545f06be15fea7603b670356cdacc72df4e3448f132fa99035a6981f1518833077317f59825cadc42fef
 EBUILD distel-4.1.1.ebuild 999 BLAKE2B 2fee3823eb1b9bf499ccc206408c0249575d58ec7c9ceb1ee61504b8ff4eb2791997141de6bf5b4e25b061ee295da9cf9a928c2562cc82bba6b01d2382aafa8e SHA512 20552ce41a15c393d7291373ac45a8643093f569ec39d7abb0ac76baccc8a9509a9a92c02a33a832c5f579043d498775b1e6c9ace7fd91697073635e6b33de58
 MISC metadata.xml 390 BLAKE2B 995ade09d45f16251665ffd7198d296959276bcc01ae085ecaba280022e47dbb3b9f6ebbbfcdd6d5038ef7dfe7779894a25fbc32feb5953c297e20f4321f6d7b SHA512 3652b1dc7101e291fbe1a9f4a1a54fb5692ce0e345fbd1164b6c32ae57e32af90dea1b22a648e7083d7b18f4730c6338da34e9cf3688a2e9ccee134f2dcda26c
diff --git a/app-emacs/distel/distel-4.0.6.ebuild b/app-emacs/distel/distel-4.0.6.ebuild
deleted file mode 100644
index b0cdc9f49d4a..000000000000
--- a/app-emacs/distel/distel-4.0.6.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="Distributed Emacs Lisp for Erlang"
-HOMEPAGE="https://code.google.com/p/distel/
-	https://www.emacswiki.org/emacs/DistributedEmacsLisp"
-SRC_URI="https://github.com/massemanet/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-# "New BSD License" according to https://code.google.com/p/distel/
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND=">=dev-lang/erlang-11.2.5[emacs]"
-RDEPEND="${DEPEND}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	emake base info
-	cd elisp || die
-	elisp-compile *.el
-}
-
-src_install() {
-	emake prefix="${ED}"/usr \
-		ELISP_DIR="${ED}${SITELISP}/${PN}" install
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	doinfo doc/distel.info
-	dohtml doc/distel/*.html
-	dodoc AUTHORS ChangeLog NEWS README*
-	use doc && dodoc doc/gorrie02distel.pdf
-}
diff --git a/app-emacs/dts-mode/Manifest b/app-emacs/dts-mode/Manifest
index 19a87876ce15..90bc3af7da0f 100644
--- a/app-emacs/dts-mode/Manifest
+++ b/app-emacs/dts-mode/Manifest
@@ -1,4 +1,4 @@
 AUX 50dts-mode-gentoo.el 304 BLAKE2B 1ec26155386af1029c583b7624df22b8d68bc6150a9293860b9249b5a9212c0bec49610d7b5cc78b730361d55cd19cdb1176925bb496da649d30587511eeab6e SHA512 141a7719e5f348bee8ea96de99428b538d81217b274246c9ee2cc992c5f85637684757c0cc5653072c7182aad2c020eb6d639e0821ef97c830a071107c60c1bf
-DIST dts-mode-0.1.0_pre20141014.tar.xz 1944 BLAKE2B 352a8a3e3430a5684e440b5b930990094bba6db6cc653be792725bdfdc7cec6ffcbd0a7b1fc138ab2edde274ea77e46dfddb5f3479faa7ac8137d82acbfcc978 SHA512 81679f83dfe8e9d2f5b9314cd16615ca79c16e36468c41f5d499584f08ddda73f6cd3c6b6bef3251129e292884e18b8615a0a5cec2c2ea0146718e784f0c210c
-EBUILD dts-mode-0.1.0_pre20141014.ebuild 411 BLAKE2B 10272df88984326b8c655786409f44fe501e93f65d27055a2e49573fd9e1b03e68927274e735d7bf00be7a5533036d4db536d73bd5de08565a600ea698e7295b SHA512 9c6f24d138b9e8271573321fc12daa4e7472ad401204b0bb5a6d2d20e23a7a7a1ed2c5ce21c82185d3c03b17518bb2324c1c2d80ebbf813600d5122aa2f2ac65
+DIST dts-mode-0.1.0_pre20161103.tar.gz 2002 BLAKE2B 2dfe222c99d6d1876b6c5ae624f28b2d3fea0a4f8fd98bdebbdb697a03101f3ed1a4e260bb2013b1d40934fce29bc0461df12a0788b7dce189604473e4469819 SHA512 ac7ba1abd64c63f30d5cfd7fc61ca5f0f9ef368d1b8a213acbe897babf8409c551f58b828e4bfc8c862cbaac20634ce90727224f75c3846bde2d64a86c90485a
+EBUILD dts-mode-0.1.0_pre20161103.ebuild 491 BLAKE2B 147137a7f68e04354d20ff9c890ea44e944d14218e0b4c5484ea277303dc510d310f79b14cc0253078b3e15bc94a2cf3e3b8e711863c43a9239be76d4499e6da SHA512 9983968864d1f450091e2200c8dcb1c71d1e2ba6804d1cde79b7659fa6681b24c173123f1c4118069d06acda1fa7612c8afd36c7e7bb5aac59adcc80fe344237
 MISC metadata.xml 361 BLAKE2B 3bd75a162b82898dcfee713aaa9e505e0cbad0324e763aa565fb74c59101dfcc5a3cfa99ed22cde2192eb7e14cb8be44942aa1ff0ec83031643aabb7cee5cbec SHA512 856dceb88b29acc604ecf934b1fb02733b6737d6afdce6e76a24cd31ff6756a9e33e84cb2df4aef1ab969c4c3a404618ee7ad26e6ed9f2651b7ba14ce32b5153
diff --git a/app-emacs/dts-mode/dts-mode-0.1.0_pre20141014.ebuild b/app-emacs/dts-mode/dts-mode-0.1.0_pre20161103.ebuild
index aae773f78026..a3cd4bdb1f09 100644
--- a/app-emacs/dts-mode/dts-mode-0.1.0_pre20141014.ebuild
+++ b/app-emacs/dts-mode/dts-mode-0.1.0_pre20161103.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit elisp
 
+COMMIT="9ee0854446dcc6c53d2b8d2941051768dba50344"
 DESCRIPTION="Emacs major mode for devicetree sources"
 HOMEPAGE="https://github.com/bgamari/dts-mode"
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+SRC_URI="https://github.com/bgamari/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-S="${WORKDIR}/${PN}"
+S="${WORKDIR}/${PN}-${COMMIT}"
 SITEFILE="50${PN}-gentoo.el"
 DOCS="README.mkd"
diff --git a/app-emacs/ecb/Manifest b/app-emacs/ecb/Manifest
index 5a008080a9db..ede25c8918bd 100644
--- a/app-emacs/ecb/Manifest
+++ b/app-emacs/ecb/Manifest
@@ -1,7 +1,5 @@
 AUX 70ecb-gentoo.el 63 BLAKE2B aafdd070c44a1f7f4aad23ee1d0ff39f1816bb46fa1e667ef12eb276d1877ca18a81c43ae66c285574b85a089255e6613c92dbe751d382280b42613976829cae SHA512 984cfbfa398bd60008dee83721a55f5c6cad0a71caf0d7cc194a84f0d7c061a9a99398e40e90f0a9cf79d2ff689e374c860612bea16e9fa0049d7a82edc56283
 AUX ecb-2.32-gentoo.patch 3430 BLAKE2B 8d373b5ebc1064d5b2fb713f6d3bc31ec34eddfeb9b9519e655bdaab0ced4e4c4aaca03b3013d0daeceaca20f9210625b84d76264be24d9ea99a5745336c0f06 SHA512 1902cec83e62c9b65a62a1fd4a7c8e2ae309b3bd2217b6f821a5a047cf3bdda24b9b5c68e672c1555196a7d28ce06c22398ef15c3c0e6b87bcce1e15d3c333fb
-DIST ecb-2.41_pre20140215.tar.xz 565404 BLAKE2B 135aa4a71bb41e78933604c5e549d8a163715061c7946e90a115cf802499f9a78884e554cbf4fd4edc9b5856b1f32b3189eb3e1e2537b16e5dd57cfe3ccd1ee3 SHA512 bf87bdd38e7ddaeec044fc56d56f7c456ef0a1922f50b962f932bf739895f046387bab7a934439e749fd7e838d9f742938408f4f9cb47079440abd8c1ba181b6
 DIST ecb-2.50_pre20170728.tar.xz 562144 BLAKE2B 922a1f101d01717c5d078fbb055903c43e91360061b792e96e9aa9421d19df2cd47f7e69aae6dba4f188e26682d2a758ff8aa57ff500e5b6fdeaea6920b21a25 SHA512 074738cc323b595caf3d34d6eaa08d6a1a8d3a53762c9bf48b751ab25a16a26a8c71984996b7e7616f4999a0876c6d03751e1e45b68aad712020778da387a59d
-EBUILD ecb-2.41_pre20140215-r1.ebuild 1226 BLAKE2B 1cdc2a77228d611fd8ffea0f7f7136d0fbe7a519a0ede55eb06e83a6fb1098ebf8314bc1aed6086bc129c9787bfa4f28654c1082fbe953b4e90a428da0f554d5 SHA512 9cf484eb1e4cd0a895eacd2730e0d991b62d6bb3187ba096583e2c6a091496efcfddd86db61368c8bc2e83acf7fe0716791dd6620ddfe3ea064fc93ca093bbaa
 EBUILD ecb-2.50_pre20170728.ebuild 1188 BLAKE2B a95389be81a77807f50441abd494082d9c0deec50e8e26b10f1e800466e93de3a4312f109e25fa1ccbaec3c29aea17d903a97bc7509950dc65b86b7ef777482e SHA512 8ebf9de92d861d87d4534b8398803bdfad30ac81b00aba09710dfd2d715b94b85551bfa6f93618ee1a7e9a859b6656f3af98681467ea1db7e9ba4c88e09b3aae
 MISC metadata.xml 1593 BLAKE2B 611c6e5a6f1bf4bcc78dcc3fd35e6e01067162d7fd4f6f0186f94011e9d4e154eb343189302713ec911fc70e00f603b08f2add5da2acf9272d5d3f90db1387e4 SHA512 613a3f9a08c5f467de2190b4de2a794c5f8cf8ff1fc3bca4328581be199799d01a312391176a6469643e4cfdf8aab757dce922115910f282931783993d81e392
diff --git a/app-emacs/ecb/ecb-2.41_pre20140215-r1.ebuild b/app-emacs/ecb/ecb-2.41_pre20140215-r1.ebuild
deleted file mode 100644
index 1a427bfba276..000000000000
--- a/app-emacs/ecb/ecb-2.41_pre20140215-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit readme.gentoo elisp eutils
-
-DESCRIPTION="Source code browser for Emacs"
-HOMEPAGE="http://ecb.sourceforge.net/"
-# snapshot of https://github.com/alexott/ecb.git, created with "make distrib"
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="java"
-
-DEPEND="!!<app-emacs/cedet-2.0
-	java? ( app-emacs/jde )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${PV%_*}"
-SITEFILE="70${PN}-gentoo.el"
-DOC_CONTENTS="ECB is autoloaded in site-gentoo.el. Add the line
-	\n\t(require 'ecb)
-	\nto your ~/.emacs file to enable all features on Emacs startup."
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.32-gentoo.patch"
-	sed -i -e "s:@PF@:${PF}:" ecb-help.el || die "sed failed"
-}
-
-src_compile() {
-	local loadpath="" sl=${EPREFIX}${SITELISP}
-	if use java; then
-		loadpath="${sl}/elib ${sl}/jde ${sl}/jde/lisp"
-	fi
-
-	emake LOADPATH="${loadpath}"
-}
-
-src_install() {
-	elisp_src_install
-
-	insinto "${SITEETC}/${PN}"
-	doins -r ecb-images
-
-	doinfo info-help/ecb.info*
-	dohtml html-help/*.html
-	dodoc NEWS README RELEASE_NOTES
-}
diff --git a/app-emacs/emms/Manifest b/app-emacs/emms/Manifest
index fd5fdf855770..6027eea44be3 100644
--- a/app-emacs/emms/Manifest
+++ b/app-emacs/emms/Manifest
@@ -1,12 +1,6 @@
 AUX 50emms-gentoo.el 59 BLAKE2B 30539342b0dff0c6508585863470f73fcb2ea8da86819ba144422a775982425965e75617b6e2a83b582c4f00d1d9737b1b6d024d6ec654a014af9748e940a4d3 SHA512 e1dcdf700ec405915ecc67dbca29b89468ab16b413cfa9ae5910481036db4627609939a7142d1d58f4f66464f12af02722750e24b25513a265be66c0943f7c66
-AUX emms-3.0-Makefile.patch 411 BLAKE2B 3dfed92dd7ea4b5ffeb63821006913c429b9ce96ba39aa4eb2bcf372e677cbfff75025e20d27556bbcf850bb5027c7494118f4179086ccbb6dc23fdf40193ca8 SHA512 6e659103419d6d9ed5129cc48b670d0bb54389dc339258addb39b7590043a95c80af401a4eed55e96a2872145cc16e7654f6b263112db97be3f158c13c9bbd81
-AUX emms-3.0-texinfo-5.patch 509 BLAKE2B 500aaf52d1ee8b4f1dcca021f5c4ab5d097effa6be68318b7adf6e69a3efcf4bb3919a9bc1333dfac5d54daf2c91f9926542211d104314688f5e09d4dc0c30a4 SHA512 bce004eff25f371507b38b7176873c0d54fe28e873431a4ff4a714523912dcc07a7284a2527c9751f77ab0260ee4ca76e63557df4dc02fe8eb06537d5b750178
-DIST emms-3.0.tar.gz 200838 BLAKE2B bca2f720abfa79d8ba460115169660ef1c52be895d9f49638cb771e2824456f59a4bbb8e92c4dafe3eb11203099ec564e4033e4fcaf305d26f39047423efde93 SHA512 a6637d6d9bcf7fdc81815e698b51579d2dcb51b70b39d65117a81d180541f4774c82a1da23f5e67a5ffd37d5f1a4ce4fe5f653f8e443f899910320eaf5420119
-DIST emms-4.1.tar.gz 283625 BLAKE2B 4ec32ca724f414024ef26db1f93f573f36605b32530ace833d2f3b1a7230f2da374c0cd3307082d44372c201ac6fd8b8eec9da0938db1699437b93236bda5cbe SHA512 b92773bb102e8d082a70644743665d5a1bfa470f579b8aaa1df60a29d0156aa6c4d516ea92a842db50d3418d63be7eb0cd36f18e9e3574b840056ed4ea210107
-DIST emms-4.3.tar.gz 287153 BLAKE2B 2b8dab4f18ea7a6eb4e0b982d795d5f16dcdbe39dc091e6f6fe056cf1143b11620ef8ee4fc83612224c6674978747b8c96575e797f0779b6fab71f46f921f918 SHA512 fd674e8637700d0a08cbdf0253ffd285623ba8181fac389eb94a701091ce25b071f995baa4fd68d60528dbbb90bbf034705bf52b41d9d5edd7af12c2c99418ed
 DIST emms-4.4.tar.gz 288922 BLAKE2B d86cd9124f1d92d9d91aa96c45f7fd5e86776ff5f15cfa5e139eb40bc72e673f394b3d5209e64da62d3ab02ef18d6ac690e1d4e4273f3aad9c53b7e5ac4e7839 SHA512 d0aaac80728b542366885916e43c2c50302a5a5d6c9e35ff53a5b46a7185fda19459ea28f0d77929920873d7d9732fa531a4ef50f5052ed4df42cc474d14d0ba
-EBUILD emms-3.0-r1.ebuild 1016 BLAKE2B 07a8af942d47ab48e633979f35a7c6375d0db9a06a5c497bcaf7a1a9b9603ab678f8c92b39455e7f8c175ce7044910d12d7d2ca2fce5cd93a9b71392c6cf0a8b SHA512 8e8e8705b576c990ed90e71ad16f458b74876ce6796b337b326fb0e2d99af681b02fd795df4a49b8282b91ddd64359b195b669977169b4ba57f8bf2c1a1bb4f8
-EBUILD emms-4.1.ebuild 950 BLAKE2B 487f4e0dc9e6691f03e5253cf73eba3b0b450e0b03f6eb229a71959033cd2706de53318613d3bfda38721ea808f038b27f08d8841eeec4c99d269a44d6cee862 SHA512 1fce44cd0519199ea6f70ee847906aedf527a23f537a0a4f8a55ba2a2db198c955b6fa226cfa35d312f548a1fff4c1fb20cd51aa3e02a51ffec98d45bc8c845e
-EBUILD emms-4.3.ebuild 969 BLAKE2B dac5a1c76e731a2f59f0f2ebe60f9b4fb3d3ee0ec758833493beaa3f3e93708e60c8cb5ea5662c97fa3c323ae22d3f74762a82c9df3abd9c7d5bc978f216cbd8 SHA512 615ada145b969798344b3d620d5a6248535664230256f524f2be3e7eecb9585974c033d83ba4963b4c8b57bf0e0c180a8713582a6588f27b99d57622d912b83a
+DIST emms-5.2.tar.gz 314013 BLAKE2B 171166ee85ed34c9c2015f92ba395dda4bcf635c4db01b6aea3c09afe0f6db73eb79f38ee8c110ea45c3cbbc5167ecec18eb8d039b8925dc0447da8746ad5354 SHA512 5ff70d129d4ec44d79e574eb4eddb4605fd75e98fa190770a841efd3d430e0cf4d55787d567eaff0b5746af68fb7b19a4d2dfd37de678b97e1b3c8db3690c768
 EBUILD emms-4.4.ebuild 969 BLAKE2B dac5a1c76e731a2f59f0f2ebe60f9b4fb3d3ee0ec758833493beaa3f3e93708e60c8cb5ea5662c97fa3c323ae22d3f74762a82c9df3abd9c7d5bc978f216cbd8 SHA512 615ada145b969798344b3d620d5a6248535664230256f524f2be3e7eecb9585974c033d83ba4963b4c8b57bf0e0c180a8713582a6588f27b99d57622d912b83a
+EBUILD emms-5.2.ebuild 967 BLAKE2B e0e800ffc51a2f3ba6d162c8845b671ed5878f181e0ccfdd305f03ecf5ccf930a72f79a0a57b03172c2e99a673b1160a8da7b3bb96978841dd324c289ee09f33 SHA512 107410a9bb52216496ae8b0063742026a8cb663c70f64cd698d0e722d54ec402ae0b7292863150f68a6faf9ceb489b579d017aa3736c8593630b01f8113f038b
 MISC metadata.xml 781 BLAKE2B 739489caf65d955e61f99ab70f53c236146dc6b06d36f60896fdcfa448165c1e39bc7bdf4cd7c4566b6f471852aa1b215a2f346b4b8783204501610cce031180 SHA512 5208cf25762a76d125453737c53d318ffa79e132eb0aff994161e8e0fe7594360789a21128d854b675f46766a97b6e1a9db99fe9ff98ffbadd137d481e14692a
diff --git a/app-emacs/emms/emms-3.0-r1.ebuild b/app-emacs/emms/emms-3.0-r1.ebuild
deleted file mode 100644
index 0b9f95372740..000000000000
--- a/app-emacs/emms/emms-3.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp toolchain-funcs
-
-DESCRIPTION="The Emacs Multimedia System"
-HOMEPAGE="https://www.gnu.org/software/emms/
-	https://www.emacswiki.org/emacs/EMMS"
-SRC_URI="https://www.gnu.org/software/emms/download/${P}.tar.gz"
-
-LICENSE="GPL-3+ FDL-1.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-DEPEND="media-libs/taglib"
-RDEPEND="${DEPEND}"
-
-# EMMS can use almost anything for playing media files therefore the dependency
-# possibilities are so broad that we refrain from setting anything explicitly
-# in DEPEND/RDEPEND.
-
-ELISP_PATCHES="${P}-Makefile.patch
-	${P}-texinfo-5.patch"
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	emake CC="$(tc-getCC)" \
-		EMACS=emacs \
-		all emms-print-metadata
-}
-
-src_install() {
-	elisp-install ${PN} *.{el,elc}
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	doinfo *.info*
-	dobin *-wrapper emms-print-metadata
-	dodoc AUTHORS ChangeLog FAQ NEWS README RELEASE
-}
diff --git a/app-emacs/emms/emms-4.1.ebuild b/app-emacs/emms/emms-4.1.ebuild
deleted file mode 100644
index 44a65e00eee5..000000000000
--- a/app-emacs/emms/emms-4.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp toolchain-funcs
-
-DESCRIPTION="The Emacs Multimedia System"
-HOMEPAGE="https://www.gnu.org/software/emms/
-	https://www.emacswiki.org/emacs/EMMS"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+ FDL-1.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-DEPEND="media-libs/taglib"
-RDEPEND="${DEPEND}"
-
-# EMMS can use almost anything for playing media files therefore the dependency
-# possibilities are so broad that we refrain from setting anything explicitly
-# in DEPEND/RDEPEND.
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	emake CC="$(tc-getCC)" \
-		all emms-print-metadata
-}
-
-src_install() {
-	elisp-install ${PN} lisp/*.{el,elc}
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	doinfo doc/emms.info*
-	dobin src/emms-print-metadata
-	doman emms-print-metadata.1
-	dodoc AUTHORS ChangeLog NEWS README THANKGNU
-}
diff --git a/app-emacs/emms/emms-4.3.ebuild b/app-emacs/emms/emms-5.2.ebuild
index 1aacf114f268..332e0d00a88d 100644
--- a/app-emacs/emms/emms-4.3.ebuild
+++ b/app-emacs/emms/emms-5.2.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 toolchain-funcs
 
@@ -14,8 +14,8 @@ LICENSE="GPL-3+ FDL-1.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
-DEPEND="media-libs/taglib"
-RDEPEND="${DEPEND}"
+RDEPEND="media-libs/taglib"
+DEPEND="${RDEPEND}"
 
 # EMMS can use almost anything for playing media files therefore the dependency
 # possibilities are so broad that we refrain from setting anything explicitly
diff --git a/app-emacs/emms/files/emms-3.0-Makefile.patch b/app-emacs/emms/files/emms-3.0-Makefile.patch
deleted file mode 100644
index 4f5760c162b3..000000000000
--- a/app-emacs/emms/files/emms-3.0-Makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- emms-3.0-orig/Makefile	2007-06-29 18:16:24.000000000 +0200
-+++ emms-3.0/Makefile	2010-08-09 22:14:39.000000000 +0200
-@@ -41,7 +41,7 @@
- 	makeinfo --html --no-split $<
- 
- emms-print-metadata: emms-print-metadata.c
--	$(CC) -o $@ $< -I/usr/include/taglib -L/usr/lib -ltag_c
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< `taglib-config --libs --cflags` -ltag_c
- 
- install:
- 	test -d $(SITELISP) || mkdir -p $(SITELISP)
diff --git a/app-emacs/emms/files/emms-3.0-texinfo-5.patch b/app-emacs/emms/files/emms-3.0-texinfo-5.patch
deleted file mode 100644
index 10ee2ad57524..000000000000
--- a/app-emacs/emms/files/emms-3.0-texinfo-5.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- emms-3.0-orig/gpl.texi
-+++ emms-3.0/gpl.texi
-@@ -659,6 +659,8 @@
- Program, unless a warranty or assumption of liability accompanies a
- copy of the Program in return for a fee.
- 
-+@end enumerate
-+
- @iftex
- @heading END OF TERMS AND CONDITIONS
- @end iftex
-@@ -721,5 +723,3 @@
- applications with the library.  If this is what you want to do, use
- the GNU Lesser General Public License instead of this License.  But
- first, please read @url{http://www.gnu.org/philosophy/why-not-lgpl.html}.
--
--@end enumerate
diff --git a/app-emacs/eselect-mode/Manifest b/app-emacs/eselect-mode/Manifest
index b908871169ee..67602cfe1183 100644
--- a/app-emacs/eselect-mode/Manifest
+++ b/app-emacs/eselect-mode/Manifest
@@ -2,6 +2,6 @@ AUX 50eselect-mode-gentoo.el 178 BLAKE2B 50fea27e7add6d31f37801593430154636bb58a
 DIST eselect-1.4.14.tar.xz 177492 BLAKE2B 236ddb09231283a153c20be779d012979a25d42a7043c75af866e777731761406d92896bfef399c3bc63e529af4e36cf538801302dc4bb719f065d6bab8ad9e4 SHA512 b17fb63039577f20515056fae1b0f7e86fa2d96f38a5eec22e637cee0b25f4d68087ef8a5bd4043893db5be66ea201bc8ae6437bb049d208b81e76a57612d658
 DIST eselect-1.4.15.tar.xz 178996 BLAKE2B 4354d975c8af2e1de0f0c6efe2badc92584e947f9b73c05aac144caf8f9d74c850d366c7c225112322a504262b5f285f6e2e8d32223f1b2d4bac87db740a148c SHA512 ceb55fecc2bf70e816679af9b20653b29aa9ce24ca2d4cd0c6e02ab214689459bc2ccd5b3968ac49249b8fb6613c6055e7e76598b86c6a114a9abf847c4a2b58
 EBUILD eselect-mode-1.4.14.ebuild 547 BLAKE2B 82ffa2d112f5d10f5f34ff70f3b3a2b566acc5c8ee7e2f022d4a080857835cb64bd0e72daa1fa3adc5f7cc45144dd4c24e5fc2cf197c728507f0b7f0e59083c9 SHA512 f8e887efac69063badc5ee6170c13d140deed17828bbcae32402ddd96bda3443af73f5abc2df8303e2e02faa6ee589f174db225b1d068326c25101906cc915f6
-EBUILD eselect-mode-1.4.15.ebuild 553 BLAKE2B 64e3a8789b9b97e88e65382adbb19c6f877048754934e4b4d16f133f4266c2b3921d296df2ff9749e6d47970222461390cd189b1ed44088ab08f359d8f96a126 SHA512 776d5d1f5aa698f480e908c5e69ad64e79884abfde6d223d5567d68ed9dcb0ddb8d264b525db1741a0b1528365bbb6c82d623761effd5089a4e41172590b4c87
+EBUILD eselect-mode-1.4.15.ebuild 551 BLAKE2B d3167ef1e0ad200f5d725f0d0072aee0f46b2d737633d5a264036d321352a0a92828392b72096b6b3e33fc4050a06d15d73f6dbbc281b5e9b2be17e1763a3fdc SHA512 aa1df8557cd1e2e74552def6817c6c257509d823a54b26e39067ad75261f1e3a520b46006ac18b9cc96f08891c95f4b30f049e52f76a06fed6a30d01ec1ed206
 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.15.ebuild b/app-emacs/eselect-mode/eselect-mode-1.4.15.ebuild
index b05452c2475f..48aaede59d8e 100644
--- a/app-emacs/eselect-mode/eselect-mode-1.4.15.ebuild
+++ b/app-emacs/eselect-mode/eselect-mode-1.4.15.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${MY_P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~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/expand-region/Manifest b/app-emacs/expand-region/Manifest
index 6a4e98f4b8ab..72ee5573a5ee 100644
--- a/app-emacs/expand-region/Manifest
+++ b/app-emacs/expand-region/Manifest
@@ -1,4 +1,4 @@
-AUX 50expand-region-gentoo.el 77 BLAKE2B 7603fc780a91f92a2f3e33daf87cf77f4d2f7ff23340b40d382edf304d3b912ac2728b66521718cad0f88f36749547ee27f40b2db14b3fd0a54da81db29f4dc4 SHA512 a2ac0c38a2693979ead82dbde2f88161315fa62e1632a3be242ae158caa0e4ce91585d11eb61265955910294e9e483834d282917ed6ebdd7da8d82fd496f72ee
+AUX 50expand-region-gentoo.el 133 BLAKE2B 218241c67dee123dd3760775ca2925dd672fcdb578a6e60aa96dc2bf72c1ab27275dbcc2aac66a2907b6b40c9617f7167f52ed50d3da6e72fd13cf4635d513f1 SHA512 d0786eda9f9d3eba8e42d7fbf8d5a33385913b013f870f5b1fe78765b810d898e1b41394da3f00c7fb97c6bf0517ae35dab63d28f25a5b1b1a3578959f9973d8
 DIST expand-region-0.11.0.tar.gz 31562 BLAKE2B 84058b1aea880de0f4a1894bbf818ae622ec7740d15564e74adbe8f3769f72b514d71de9c6b83a8f0fd60c590e281739ae15110f5f886315cc10b661b21ecc56 SHA512 3469ab0420d85fbaaa1ae9f3d0101c28b6e1786d761ecd186d744537795226917314b8b748d3499b02ea269a46a62350c37fecb34dd4183a73eafc67ce1344a8
-EBUILD expand-region-0.11.0.ebuild 547 BLAKE2B 52228ed4880da2b2f7bd26e7c0266e08e9f28d6c88cb432818db7f6f98b194f42ef8f23b5c9f2818fb9461042e4b5a4579fee80a50cc11575918e1fc79d06c88 SHA512 860286841c831c01a36b9b311e480b5111bbacd6fcf012831a5e91b855fcd367612e7be597ae87145d1eb63adb83a6da37d349f980319bf11909fec7e805fad9
-MISC metadata.xml 385 BLAKE2B 8ee4d6d5a7902e2af24e945e0b2e4c1ad420d3f4e17929cdece4887fdb699631f03c67b43de4e4f9f3e4e19d28d930cda896abe4b757fba9279b65f86af30f79 SHA512 b3105d6005b9923703dddd1b27b5769f002a419aa926c66f841cc5cbf975f0a3634abc6dc417e0da69243922264a3c7885e2118780c7b911f69bea23153c2f7a
+EBUILD expand-region-0.11.0-r1.ebuild 468 BLAKE2B a5f0fd57d37d1c187154be86a6add8e7f3843f24f648f4b74eb7ab0ddab73ad5414f6ce03e163fb8c12fa2ad86629edb67c15230e223e6186e010e6ddb4c0753 SHA512 834b65fc81fb686041a9be252774183389adbc4dd579bd1a8fc8d89cc31c52fa814aade0012ee7eeb8140d183367d9db505e091a6930fedbcd8ed0a51a69d476
+MISC metadata.xml 369 BLAKE2B 0d7ce992a43855f0418e9759538c05b68c46f16e928186ca86cbed5b02621ccb9cf655bdc919f7b53d0cb365914839948cf94fea12f994b32daee6bf15e9e97e SHA512 03098d1866b447ed841bebca339513a5b9c461d795d0155a92451dac6afe132015be53e43b14cc78c18e20923f370cfda304bd05d6352389179b86b009b9febc
diff --git a/app-emacs/multiple-cursors/multiple-cursors-1.3.0.ebuild b/app-emacs/expand-region/expand-region-0.11.0-r1.ebuild
index 860848f016ef..520e27025faf 100644
--- a/app-emacs/multiple-cursors/multiple-cursors-1.3.0.ebuild
+++ b/app-emacs/expand-region/expand-region-0.11.0-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit elisp
 
-DESCRIPTION="Multiple cursors for Emacs"
-HOMEPAGE="https://github.com/magnars/multiple-cursors.el"
+DESCRIPTION="Emacs extension to increase selected region by semantic units"
+HOMEPAGE="https://github.com/magnars/expand-region.el"
 SRC_URI="https://github.com/magnars/${PN}.el/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
@@ -16,8 +16,3 @@ KEYWORDS="~amd64 ~x86"
 S="${WORKDIR}/${PN}.el-${PV}"
 SITEFILE="50${PN}-gentoo.el"
 DOCS="README.md"
-
-src_compile() {
-	elisp-compile *.el
-	elisp-make-autoload-file
-}
diff --git a/app-emacs/expand-region/expand-region-0.11.0.ebuild b/app-emacs/expand-region/expand-region-0.11.0.ebuild
deleted file mode 100644
index b151534d2ef7..000000000000
--- a/app-emacs/expand-region/expand-region-0.11.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp
-
-DESCRIPTION="Emacs extension to increase selected region by semantic units"
-HOMEPAGE="https://github.com/magnars/expand-region.el"
-SRC_URI="https://github.com/magnars/expand-region.el/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-
-S="${WORKDIR}/expand-region.el-${PV}"
-SITEFILE="50${PN}-gentoo.el"
-DOCS="README.md"
-
-src_compile() {
-	elisp-compile *.el
-	elisp-make-autoload-file
-}
diff --git a/app-emacs/expand-region/files/50expand-region-gentoo.el b/app-emacs/expand-region/files/50expand-region-gentoo.el
index bd5b40540780..4b065061de9e 100644
--- a/app-emacs/expand-region/files/50expand-region-gentoo.el
+++ b/app-emacs/expand-region/files/50expand-region-gentoo.el
@@ -1,2 +1,3 @@
 (add-to-list 'load-path "@SITELISP@")
-(load "expand-region-autoloads" nil t)
+(autoload 'er/expand-region "expand-region"
+  "Increase selected region by semantic units." t)
diff --git a/app-emacs/expand-region/metadata.xml b/app-emacs/expand-region/metadata.xml
index b42030db7aee..647dba4e8eac 100644
--- a/app-emacs/expand-region/metadata.xml
+++ b/app-emacs/expand-region/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>gnu-emacs@gentoo.org</email>
-    <name>Gentoo GNU Emacs project</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="github">magnars/expand-region.el</remote-id>
-  </upstream>
+<maintainer type="project">
+  <email>gnu-emacs@gentoo.org</email>
+  <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+  <remote-id type="github">magnars/expand-region.el</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-emacs/f/Manifest b/app-emacs/f/Manifest
index d2730b4aebe7..b6056782f3fc 100644
--- a/app-emacs/f/Manifest
+++ b/app-emacs/f/Manifest
@@ -1,8 +1,6 @@
 AUX 50f-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
-DIST f-0.18.2.tar.gz 18485 BLAKE2B 5b450b82eb31b23243a14308121380f53310de6b312c0b6c821b478d81019f20e0ca1765e267ed53a715aae626dabf743e978acfc9202559e14166fb5fda332f SHA512 5b11084dcc6afcc85ed0e187f6dd252c391fa43325be5b88b776171b3bc7076ea2bbd32b7c424deb70e035f6acd46acd86053547663502530832db2c50eba346
 DIST f-0.19.0.tar.gz 19477 BLAKE2B 47cfb8c876e11cae7eca61815085c4290f65f9d72a7c5d397d8b53f6d57421f46997786556074027de5405acbf38ddb42ecbb767c809763e84d880286e6942dc SHA512 694eca1872cb0a0da7f75f610e4101993a79a5e7601c3f72fd2c642b1a44f5eada24777313b5166d901d9d983c18b4d412b4c6f01c382ace7530bacaa3b67c56
 DIST f-0.20.0.tar.gz 19907 BLAKE2B 20b82a19b227d2e0863e540e75bc5094c0cf267eae00d699ff5b00fa574213d303135c246c454c92785080feae63ba6c529b115aeb1368774dd548852d94fb48 SHA512 0c44e63cd527a37bd5582d5a2a4cb2269d179930d7f41b378b9100ad5bb4518291b02197b1d55e1bf603bb5b1c12181b982d9b9a3f8fbd48860f6e86ea36c03e
-EBUILD f-0.18.2.ebuild 516 BLAKE2B d79552b1a98a6abb0d0f0a3339c425aa6d1c6e763cd814c5764e5a3f47e3909f9303b3868cc072b1523b35cd73f838b1228f178f30c008e8b28ba9de03ef0022 SHA512 679ec5a1dc6a778582ab90b55a2f6e65cd10dfd846b44d2f2900acd9f1ce70f1029b06336e38e025a7417dfc4e61c70986b9a9fd7674a20f5999fe143dffdebb
 EBUILD f-0.19.0.ebuild 526 BLAKE2B c8f84f7ea67d86cccf39dccb13e887026da2c4a52b16c9cbf9272c62694af5dbf5666a0688d0e8c8bad8d5b3639040676df11cbcad4ef1eb7eb4e325ecfeb4ba SHA512 f56bdbcd85b0aae7c3c70d3b9edee58ef668f9f12939f4f87e705d64d68dccd28f97e2838c0dfcdd6f64be780a5628af349507c9601fc054b6f536a4ca24e356
 EBUILD f-0.20.0.ebuild 529 BLAKE2B dc21af4fc8b92f3d6c73597cc0be79d7c63ba857ae49bfc37a66d2fa545da00df3525a7dbde68796ead7c7347d030374b4bf0ac9889cccf44acc1d5c4fedd31d SHA512 5f939c184075e9ae6ba5150fe066c5db5df2d5c9c8e81b9fbdc36a6ab8fce0b9bd6686b164fe27e69d75a60a72d84f43b47ad21b84ba5d4bdb126fb12a01a8d6
-MISC metadata.xml 372 BLAKE2B 5ed577f7fa8b397ecfd738274b02ed1204aac09546624852be6698d88f15264d6edfe2a31528e9cf9a8051fcd6a53831ee7b0f024deaff2f652ede945f837e54 SHA512 5c0147862c0d432fab74199058bb650eca428cef988fd1f4a7d654f1cb13393e02f1193be3434b397489c9554e13a719d128e0d9c6c31d4b0cb496bdaf176a31
+MISC metadata.xml 356 BLAKE2B c95850b912bf95be47550ba3e6233ae480bbabb41509ce48a7a67c28af51b18d8f20b4f2f475d57df822567125a4e05ce67f46e5b78320bb661d790661e55186 SHA512 e524bfcbc0d8027ac2f8e6ae5a6003e2e087786e9ec231afc3178a40445f63866edbdfa77b34d6a1140757cfe86e00617e2c9da4caa817cb4250454210d1bb88
diff --git a/app-emacs/f/f-0.18.2.ebuild b/app-emacs/f/f-0.18.2.ebuild
deleted file mode 100644
index c29120179b0b..000000000000
--- a/app-emacs/f/f-0.18.2.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="Modern API for working with files and directories in Emacs"
-HOMEPAGE="https://github.com/rejeep/f.el"
-SRC_URI="https://github.com/rejeep/f.el/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="test"
-
-RDEPEND="app-emacs/dash app-emacs/s"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/f.el-${PV}"
-SITEFILE="50${PN}-gentoo.el"
-DOCS="README.md"
diff --git a/app-emacs/f/metadata.xml b/app-emacs/f/metadata.xml
index b6f003569883..682d780760f1 100644
--- a/app-emacs/f/metadata.xml
+++ b/app-emacs/f/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>gnu-emacs@gentoo.org</email>
-    <name>Gentoo GNU Emacs project</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="github">rejeep/f.el</remote-id>
-  </upstream>
+<maintainer type="project">
+  <email>gnu-emacs@gentoo.org</email>
+  <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+  <remote-id type="github">rejeep/f.el</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-emacs/folding/Manifest b/app-emacs/folding/Manifest
index e149febbf90f..d2777a852916 100644
--- a/app-emacs/folding/Manifest
+++ b/app-emacs/folding/Manifest
@@ -1,6 +1,7 @@
 AUX 50folding-gentoo.el 221 BLAKE2B f0f0b88f59d0f493a468e9128028c525315b4d2f32bf000ac39838774c34c81bda4089e000d8b05ac151e42f6e2001f636b0e98bc02c3125e3ac46459c1cf777 SHA512 e5b9f16218988429da9fdf304967deba2fd76774b5c4eca9d372504cac225ab24de4c976dbca4203d335f06d2fe16043bb817c5a232e517c4c7416e1e9f52076
-DIST folding-2012.0226.1623.el.bz2 49503 BLAKE2B 6e364c9c93c92d4e9c322b5cc75b2525d95d63fe5a5b5916e054063fb2452f8ade4cce7e805243cb95a078157f33feff1bc9890b3a7d0de66813c63c74be0dbf SHA512 efb645e46e55174f2b538b6812f36d08f576f765ffffdf25af756c852e7bfd6455cb3bc3a540089a60600251b2c144384b7f58b412840a95ce614efd9d5b50c9
+AUX folding-2019.0524.1621-info-filename.patch 219 BLAKE2B 9f54246d389fa2fd6d7e5a0bccbf806f6cc0d5bfad4173fa4361dba62f46bf51795c490976360c661167539e3075115e23052c2b5626a2ce1f05a59400bc4a88 SHA512 ebaad512e09c3755b0e628ea015ba718dd1354e8c3dbe6845d46c371b3f33bac9f0da7adf325642fe9cf131bdb892153b409e611548a750770322e0ee0e945c8
 DIST folding-2013.0613.1821.el.xz 52164 BLAKE2B cb9dc74ab409ddeff8434191f53dadac5c53a15fdf4b8edb041daa156221e7271bd30bf66e60049ebd4ed761f16b1adfa113e05967cc70729f6b5c3f1dc71306 SHA512 9eb7cf4e1b01d7f37969bab0a66ad564da3742981ec0623b3100b0aef1bb997a80c91b88286ac673775edd197110496e1849210cc40fe310d8a478471cc1ec53
-EBUILD folding-2012.0226.1623.ebuild 428 BLAKE2B 2ff2269947afd5aa7154d6649ab7f0841e4cc8d9cbe7fca2b02ce503391e06ff64b4c771e65c8ee779dd15cb06aba44bfbeb6d8e98d855ee097ede5a0cf08d50 SHA512 024bab6af9cd050d0d2de7c073cdd4bdab352ea2334c4f4cd1d0ad71f593ede8c18d4a0dde6fee234624eb92d127bf0bb756c055a8d72f115a9f561f3a08fb28
+DIST folding-2019.0524.1621.tar.gz 70386 BLAKE2B 3025b0487b8f72459393348abf811b953cacedb292667f3bf30955bdc7d6f1055125d8e481fb0bb1be0e04e7c819dde3df091bfb8e50d4972685bb2adc18755e SHA512 807e544760f09eccf6322610d6e00d525caebec9542588948cbd84435ace09edeaec1a68cec781415dcb2528780a35887705eb80b5c2b61138284e6a250d220e
 EBUILD folding-2013.0613.1821.ebuild 449 BLAKE2B a04b276e46658f15f653f34b1b2e410e306780427bb907e4dfdc1be1019bd34e5a5c224c993651f446738cd0bf19874b7e197553ff22cfbffa951f7fce55b69e SHA512 99fda30529093f20ae92f92f72c5c45e18b2e68315bf51a8c5b1eb78657c1e9d3131cb75a65cfa67cbba79faea24f789a598ce6e2ae00f910eeee5a2fee34817
+EBUILD folding-2019.0524.1621.ebuild 605 BLAKE2B 28d007aca298abb468f0fa73f99cd4817fea7d02535af886872ba795e05d00fe85090bbe47372c6fceb9fcc4be046a0dbbebdf472b038c059f5768776d33ae34 SHA512 39cb12f0e0c93b27a8f0589832c9c348c160befbd019b9d50e8bc51ac488be4378177a0750f623630d0c8ef608ff9b31b0c275cc91e33905bfe5531259387180
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/folding/files/folding-2019.0524.1621-info-filename.patch b/app-emacs/folding/files/folding-2019.0524.1621-info-filename.patch
new file mode 100644
index 000000000000..3b89bcea1cad
--- /dev/null
+++ b/app-emacs/folding/files/folding-2019.0524.1621-info-filename.patch
@@ -0,0 +1,11 @@
+--- a/folding.texi
++++ b/folding.texi
+@@ -2,7 +2,7 @@
+ \input texinfo
+ 
+ @c %**start of header
+-@setfilename info/folding
++@setfilename folding.info
+ @settitle folding
+ @documentencoding ISO-8859-1
+ @c %**end of header
diff --git a/app-emacs/folding/folding-2012.0226.1623.ebuild b/app-emacs/folding/folding-2012.0226.1623.ebuild
deleted file mode 100644
index 207beefa597c..000000000000
--- a/app-emacs/folding/folding-2012.0226.1623.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="A folding-editor-like Emacs minor mode"
-HOMEPAGE="https://www.emacswiki.org/emacs/FoldingMode"
-# taken from http://git.savannah.gnu.org/cgit/emacs-tiny-tools.git
-SRC_URI="mirror://gentoo/${P}.el.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 x86"
-
-SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/folding/folding-2019.0524.1621.ebuild b/app-emacs/folding/folding-2019.0524.1621.ebuild
new file mode 100644
index 000000000000..6a61c1ef18be
--- /dev/null
+++ b/app-emacs/folding/folding-2019.0524.1621.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+MY_PN="project-emacs--${PN}-mode"
+COMMIT="a1361aa154b27bd4db2e1cfe6c3b81b4fc1fdc9a"
+
+DESCRIPTION="A folding-editor-like Emacs minor mode"
+HOMEPAGE="https://www.emacswiki.org/emacs/FoldingMode"
+SRC_URI="https://github.com/jaalto/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~x86"
+
+S="${WORKDIR}/${MY_PN}-${COMMIT}"
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="folding.texi"
+PATCHES=("${FILESDIR}"/${P}-info-filename.patch)
diff --git a/app-emacs/ghub/Manifest b/app-emacs/ghub/Manifest
index 4aa21b9178ad..9cdcd39fef03 100644
--- a/app-emacs/ghub/Manifest
+++ b/app-emacs/ghub/Manifest
@@ -1,8 +1,8 @@
 AUX 50ghub-gentoo.el 124 BLAKE2B 84170098bd01bb9f165eaf06f7cb21c56d2caaf964d2658520311757845d053072a7704fcb90cce2a2dfbd2385f357d2e7569061ebe0ca41b575efd752d29fd8 SHA512 596c7e75560f3734b57525bdfb42f3985fb49ab4d86637231361f6673d2431c0a6e73f91f58f003f9027f1143b9be3f4330ef2e1ff6c627ca6057256f4afbfca
-DIST ghub-2.0.0.tar.gz 48150 BLAKE2B b9142f33f92dc08a1d5f3f3467361866b41d0d2c943465e803987a41a7bbba1bc4c7e30c058e6e3899110a57d3e1d49545df01efbceb67711186e6411ebc9a58 SHA512 39e1ac1760e1a8532ee5d6fd29386ccc24d7f0278f6c900d565a709f86ac6acf01ae49a3462b54054d5b0040102db82ea048157a12663c46b0c45fe11f2e86d6
 DIST ghub-2.0.1.tar.gz 50014 BLAKE2B 449c12b4a75b8de75249fa8f3fd624551d36ae745325fe62b20d8a68a6bad565a308e8c9be6d742c24fff5238fe2cd56fda9d8353465dec28e0f42b2ee10dc77 SHA512 d27b3f150b1b871dd31746ee7396b7bea544a6209f73039fa0ac6b670e3fcdbddc2f888cfa3dfe89b64325d208f5fe18ad90869e012758dea54878d0dcc82528
 DIST ghub-3.0.0.tar.gz 62897 BLAKE2B 78962809f7bfd1236379f4e5520717378353f5c88d81a06b2526b6e11ccdd70d2411b38c81dc40a660aef20c116d277d4a72a31943a2aabca71ce3bd7672b844 SHA512 32051672c8a0fb907655c137b61efa63c9947e8216b3ee7c520ba606211ce361446d57996ea3949dac16456ea9431de1cdd1339f6b7a4d092bfcecb7acc0b893
-EBUILD ghub-2.0.0.ebuild 489 BLAKE2B e3889ff149dc2f09ba8af3e685fa91d32afb9b3522e4efab84cd8bca82258818a2fb2c322c796c719fcd5020d47f0df327917fe7c10bc887c0ccb55eee999f4b SHA512 a97f25b7c8eb7be16b10494ad540db5f4337cb5cb86527eb90993fe4daf41e12ea4013591b159415d1d117b1652bcaf0e11e8dc00d54ec16ea678a8c01b79146
+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
 MISC metadata.xml 1296 BLAKE2B b58f88e8262157cef344eb119a5f3c265105c1f90ccfd40192a197b19ab911e086f00e259e2de5f14d8f02918e5e5516568cd95c4a0a2719dd3c7a235c52d38a SHA512 8e9fc9e9112bbc0d069978583e625909c12e3ea03d747fa3189c34ec35113d1d688fee50d0c0983c0eaef5eb884947132b5317d11b89c8f994efec4fef5abe33
diff --git a/app-emacs/ghub/ghub-2.0.0.ebuild b/app-emacs/ghub/ghub-2.0.0.ebuild
deleted file mode 100644
index b81e58b6400b..000000000000
--- a/app-emacs/ghub/ghub-2.0.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-NEED_EMACS=25
-
-inherit elisp
-
-DESCRIPTION="minuscule client library for the Github API"
-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"
-
-DEPEND="sys-apps/texinfo"
diff --git a/app-emacs/ghub/ghub-3.2.0.ebuild b/app-emacs/ghub/ghub-3.2.0.ebuild
new file mode 100644
index 000000000000..274ca19590d2
--- /dev/null
+++ b/app-emacs/ghub/ghub-3.2.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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/${PN}/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
+"
+BDEPEND="${RDEPEND}
+	sys-apps/texinfo"
diff --git a/app-emacs/gnuserv/Manifest b/app-emacs/gnuserv/Manifest
index 9a7999d061f5..6e3b0f6d6815 100644
--- a/app-emacs/gnuserv/Manifest
+++ b/app-emacs/gnuserv/Manifest
@@ -1,7 +1,7 @@
 AUX 50gnuserv-gentoo.el 237 BLAKE2B 53e2fb102e832b852ebd23d3a7cda10a1cde7e1733818dd357edaa0ba67e66d925ea589195dd5b797ba37e62f44e26706669594f875409fb6afb294bba05d549 SHA512 24edf596178da29d68add510382241bf257ccb6ed0f9bd1aa65a2bda268b2fa506be616f70c75628d82cc8fda06617f5a4b58e602a9dc082476ac4ad4f0e047d
 AUX gnuclient.desktop 608 BLAKE2B b50695688d76ec34dae2fb68b4865769ab531a2a5add76a48c71eac6542ea3736f6e2239f1b05775e88bee3bc2ccfc6e50bc0c49a6eacbb277d822bb2cfb3003 SHA512 35616b5fe182f4127635454f4af89b307c0c52653878ef163efee4741c4b5fe5ab88d78f89ebfe499cc02516d2a7093c49dc2232a2768e952acd61651ff16468
-AUX gnuserv-3.12.8-backquotes.patch 521 BLAKE2B dd2d150bc56e5f7cdc699fb0876bdcff014cb456f1362c7f050224c359567d4235c056a7dce63b00301abcf70f44723c20e511b76b011f84cf4e329861cd031f SHA512 ae68d03e5cd7be4e178a7eecb581487e39b1fb1ea06ea1990054eb14e1b30be4123d6e2cc309ca96a47f71ad4c9351aec7dd6e4f7e6ace801da3b02d96cf0bbe
+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-r4.ebuild 1639 BLAKE2B b95b6710ad4a709a816c1d68086056c9ec5fcfdbf592f9aef30e65fe47a3c92013027973cba41c6c5c4ee7d455b8b051c333e994915bf5de8141b20dad1b10a5 SHA512 8cd4410d9081f3677d44395030b10f720f61b1d0f13c59777861e18913e398af6bb71270f0867b7f1dca614d16dc20aed8fdfaf27c6300e8834469427d2233c5
+EBUILD gnuserv-3.12.8-r5.ebuild 1636 BLAKE2B 3d14e840ef368d2b842eec808804c962ae223f8402bf8d12a4dce01207233d5a26186276fe3800201c702f489d73792f05faa238e8b66436bc75fde45559910f SHA512 ec530a1a46d741788e2c5f87120285fa7612aaac03e96e0fa3983c3ea2d6b5ef1d7e49ce99fbef4886e9ef65b7c0ee50c6acd8fd88a291c931a675b6ebaab64c
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/gnuserv/files/gnuserv-3.12.8-backquotes.patch b/app-emacs/gnuserv/files/gnuserv-3.12.8-backquotes.patch
index a16124821ddb..fa31ac2e4017 100644
--- a/app-emacs/gnuserv/files/gnuserv-3.12.8-backquotes.patch
+++ b/app-emacs/gnuserv/files/gnuserv-3.12.8-backquotes.patch
@@ -7,10 +7,10 @@ Use new-style backquotes, to make it compile with Emacs 27.
        nil)
      (defmacro defcustom (var value doc &rest args)
 -      (` (defvar (, var) (, value) (, doc))))
-+      `(defvar (, var) (, value) (, doc)))
++      `(defvar ,var ,value ,doc))
      (defmacro defface (var value doc &rest args)
 -      (` (make-face (, var))))
-+      `(make-face (, var)))
++      `(make-face ,var))
      (defmacro define-widget (&rest args)
        nil)))
  
diff --git a/app-emacs/gnuserv/gnuserv-3.12.8-r4.ebuild b/app-emacs/gnuserv/gnuserv-3.12.8-r5.ebuild
index b7852e0d2632..94972c40cfd3 100644
--- a/app-emacs/gnuserv/gnuserv-3.12.8-r4.ebuild
+++ b/app-emacs/gnuserv/gnuserv-3.12.8-r5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit elisp multilib desktop xdg-utils
 
diff --git a/app-emacs/go-mode/Manifest b/app-emacs/go-mode/Manifest
index bbbc0bcee5f8..8c91e20708c0 100644
--- a/app-emacs/go-mode/Manifest
+++ b/app-emacs/go-mode/Manifest
@@ -1,6 +1,4 @@
 AUX 50go-mode-gentoo.el 71 BLAKE2B 1752654c85077e3a889127ab77e9e53a9703f79b08ea7f6f4898a86ac7c6db71d04bce7a08af4305b20d479067f779b0ed3ae30acb55bc3d1538b8eb6e0b9bf2 SHA512 f390651b52da9f5fb2a07b51a7fbbe52a4cb3391d6857b06a2c092148fc56378adb96477cf31eec23b554d9f4815e4ae7dc510f650a464c59f6b70fcb7311064
-DIST go-mode-1.4.0.tar.gz 30705 BLAKE2B c5b4f53697d18d1a727353c203ea5734a6a63f3e179ca8034d24cd6a414f1d7acecfecff5fc027fd465d7228f876beec558c0e0bca1865866bcef52e0183415a SHA512 00e3aa832b81d6039e38e12f1346ef838f0cd9ccbebac947d394d453690862025ce30fc253d52d485c3161a1c2307ef00272f014c8f3fa86304216525ae47bdd
 DIST go-mode-1.5.0.tar.gz 36876 BLAKE2B dca184f1cb79c919067ffecd1111f2404685459dca374a1ff14512067d0235bc862a04cb5fb014620856d0d03c15668149d0c62c238098b8561ea2512b26ec36 SHA512 fee67461467feb272dbb90abbad3df786f984925747ad8588c271784f8d27db888dd1da9d4589fb63ccfded1a833b01bb860d3254b00ca5e3f3aa89f199880c3
-EBUILD go-mode-1.4.0.ebuild 440 BLAKE2B 78de2c044fa0c9c2ad6849d4b716c8a9f54bef8febc5471c474fa15dcefe6b1afead63f5842a8c4c89976d76167f730f40b61726945d08613a226d9a400510d1 SHA512 1413b7fcf9dfbf51b54b8de54b3bfcf4dc4e662b3497bbb83e136294a28ea57bbcc59ca11d6eecebdaef45601d96ce69f42f834c3614d5718143ca92d34d32d1
 EBUILD go-mode-1.5.0.ebuild 440 BLAKE2B 75e0252733f6311d59cb3da310f1043aae12be1b92cf9e356c8ae4dc24b2d48ffc69f6e6bf40e2949eb845428c24e84b84bf606913d27704b73741ef882a699a SHA512 2fbcd8e7aef7b0d017603bfb7e6404a80537eb6d2cf8e93ed34937fee510730c244260f90ca3d52fedbfe822f8078145b41a8eee1af1289ce7d8fbb49ce1562e
-MISC metadata.xml 380 BLAKE2B 4d9b4f6b93adf63d6fe5cabd0e393cd1b0e6f7a8f440150b034c0099f24f8cae2ed8372b7f034679181dee6ea81a299eab3ad52a24bf0a57e5c3874d05f095e0 SHA512 7284d960c79d89a74d73b1f864d33f728ea84cb3e3245dc7ec3dc54715e1e0d911e993fa9e30ca560cbbd72aa9710165361c17f8d131e3a46dab90eb7abaf3b8
+MISC metadata.xml 364 BLAKE2B 7c5fba3694f715c9fd7f309a245945ab9f5a46deafe936ab779c69453676bf7770408291614ae5691318f23265ee41db2d4915a32dc98ab9dd9bc47cd846218f SHA512 ab9d70c89aa85d86ae39a681479327cd74966c9121419b728f0536b52752e1803f9f3e95c969b73b506925948625242dcd6d3bdc0e643faabe0d08c7a86b6f2e
diff --git a/app-emacs/go-mode/go-mode-1.4.0.ebuild b/app-emacs/go-mode/go-mode-1.4.0.ebuild
deleted file mode 100644
index 6b4cb336e821..000000000000
--- a/app-emacs/go-mode/go-mode-1.4.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp
-
-DESCRIPTION="An improved Go mode for emacs"
-HOMEPAGE="https://github.com/dominikh/go-mode.el"
-SRC_URI="https://github.com/dominikh/go-mode.el/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-S="${WORKDIR}/go-mode.el-${PV}"
-SITEFILE="50${PN}-gentoo.el"
-DOCS="AUTHORS README.md"
diff --git a/app-emacs/go-mode/metadata.xml b/app-emacs/go-mode/metadata.xml
index 686f91dccb5a..54586fb48b47 100644
--- a/app-emacs/go-mode/metadata.xml
+++ b/app-emacs/go-mode/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>gnu-emacs@gentoo.org</email>
-    <name>Gentoo GNU Emacs project</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="github">dominikh/go-mode.el</remote-id>
-  </upstream>
+<maintainer type="project">
+  <email>gnu-emacs@gentoo.org</email>
+  <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+  <remote-id type="github">dominikh/go-mode.el</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-emacs/graphviz-dot-mode/Manifest b/app-emacs/graphviz-dot-mode/Manifest
index a4759ad6f65d..a89bbffceaa9 100644
--- a/app-emacs/graphviz-dot-mode/Manifest
+++ b/app-emacs/graphviz-dot-mode/Manifest
@@ -1,10 +1,6 @@
 AUX 50graphviz-dot-mode-gentoo.el 258 BLAKE2B 8a0d626992f4c748f93084d9f666fec3ba562afe9003890dd5e640e57bd52f16a62e6abe70a4892c652007c195a83a095f801a9dfda43caa5c46bce59c6c0a0a SHA512 d233a05a4167f43c87419747a10e21050c1caf32d80fba6507bc07954154b589e9397ca4d82539bab2b706888457d2b9c821e5236f3d235ba9f9516b41f9a247
-DIST graphviz-dot-mode-0.3.7.el.xz 10840 BLAKE2B 6d4d80705ba01723ce538dcf97a218197c4d5295196d94c72dc5debdd59bf3e755227088a89b55c0ef019c9c4dbdaf5a7c01c441440ae8be32d5d472711160b2 SHA512 1b142cd4ea257a1b18f557d9b166db9c69538238c100d3eb682219df3488803566bbb366be6b57d129753c745b21a585eb815dbef870ad2e71560d4acc33edf3
-DIST graphviz-dot-mode-0.4.20171103.tar.gz 353912 BLAKE2B 526a14c7bfe4178f89268f6b3f381e69c1223e6576adfeca7864df8c6b62042fcd8e4f718f658ac210e2ce596eedd83a665a72c8d698e83fa28ae3ebf6eecc69 SHA512 73e7570ad1a954dc49b8151b336733af2141126555f27cfe9d6258361131c86325e8717e9740968926452f81fabb66e219534022c9de396bbcb50b9a124be9f5
 DIST graphviz-dot-mode-0.4.20181118.tar.gz 353971 BLAKE2B eab5279ec25a93bae311c6db430b41f5352a63f545573694f9760e5f5cbbbeae54904361c63c909cd8c77da68e757d0fad24271edb07d4267521535e2d9f7db7 SHA512 c02523d2a2a3be2d4be187b7bed34d3d5a897532d7ad2205683a69e3ae849a1e002f5f17637987b1774b4e65f0923e52b5bf048cc0fcd62ae4bf3693b90420db
 DIST graphviz-dot-mode-0.4.tar.gz 12288 BLAKE2B 2757734b1aae33322d3c093be4d650dd8c464292a50915463ea23e946a695986c6b36650c3f5baee69d402b2cd3747cc453cf18c56bd128dc6bdc9e15e2445ba SHA512 db50adc0550629adcee8ea7482e678b2fbfa8db514e9ea80381dec47fef75cd0a61b7cfbeef59aae102e50d824edfb06b8ee56c4e964cd3e90ec8540b1b250a6
-EBUILD graphviz-dot-mode-0.3.7.ebuild 531 BLAKE2B 0ce88476e7c3335f96b3bf3c2829813a595b97e96ced0baac210728c29bee8224f456d662eb676d626fa73f1b5ae3114a5569ed2bae8ec2d6c2711b6f1ed71f4 SHA512 9a9d76ba0f96087f2d42c3ddb945b91befb0aeb8c47bfd90c062d4b115692dc4245dc2b54a3f534a3232330b4e3ea16777e9c2b78606d006242b39059d47089f
-EBUILD graphviz-dot-mode-0.4.20171103.ebuild 626 BLAKE2B cceed1fcf72030574e6954cb00594514f7c68012a25a823053ac03db449379a7ec6a8b4d7d8279a03fb5d698380f913a0044cb9f339d9a85f5f97eab58fd15bb SHA512 d6a365ee5e256650620a983dd126a998493f122b4ea6dfe612b468db649f118a9da692f5876677ae66e3f752c5d20d2fd63d635477085466e2f9cb3fd05809a7
 EBUILD graphviz-dot-mode-0.4.20181118.ebuild 626 BLAKE2B 013e4f161dbeb111c46957ccb06a2e34cc0f9465db4548ed2da1c34b3d83e2acfc1793ca5a16dc810c28987ed3512638ac5b04816b38149dfe819a0c68ff86c1 SHA512 bdbff2f5ecc372bd6650e5d64aa89a085894fc915378f1a02fefdd3ee4dd362f51cd0e759f9e9eb9c9f448c9e7f1bac8361816ea1321909b8be062f767154c62
 EBUILD graphviz-dot-mode-0.4.ebuild 541 BLAKE2B 1ce806e1a281f4ab08f24d2aed2be7e4ba655a7e932a17335842536040f8a94b0abba79e527be035973563ccbe0a0f16d83e08c60df75562859b7b158adb7c02 SHA512 ea577478780eefe7938e0bf07d958e1b12ab4d9284a03f9d6f6f76497ea6cb5c4edd43520b568de3a7b27fe27e0b2461ee3ea9a5c853e248c2051438ee18dc35
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/graphviz-dot-mode/graphviz-dot-mode-0.3.7.ebuild b/app-emacs/graphviz-dot-mode/graphviz-dot-mode-0.3.7.ebuild
deleted file mode 100644
index 8822caebe8a7..000000000000
--- a/app-emacs/graphviz-dot-mode/graphviz-dot-mode-0.3.7.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="Emacs mode for editing and previewing Graphviz dot graphs"
-HOMEPAGE="http://users.skynet.be/ppareit/projects/graphviz-dot-mode/graphviz-dot-mode.html
-	http://www.graphviz.org/"
-# taken from http://users.skynet.be/ppareit/projects/${PN}/${PN}.el
-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/graphviz-dot-mode/graphviz-dot-mode-0.4.20171103.ebuild b/app-emacs/graphviz-dot-mode/graphviz-dot-mode-0.4.20171103.ebuild
deleted file mode 100644
index 31a7620dac70..000000000000
--- a/app-emacs/graphviz-dot-mode/graphviz-dot-mode-0.4.20171103.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit elisp
-
-COMMIT=c456a2b65c734089e6c44e87209a5a432a741b1a
-
-DESCRIPTION="Emacs mode for editing and previewing Graphviz dot graphs"
-HOMEPAGE="http://users.skynet.be/ppareit/projects/graphviz-dot-mode/graphviz-dot-mode.html
-	https://github.com/ppareit/graphviz-dot-mode
-	https://www.graphviz.org/"
-SRC_URI="https://github.com/ppareit/graphviz-dot-mode/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-SITEFILE="50${PN}-gentoo.el"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
diff --git a/app-emacs/haskell-mode/Manifest b/app-emacs/haskell-mode/Manifest
index 94f50c8025ba..06fc16bc3663 100644
--- a/app-emacs/haskell-mode/Manifest
+++ b/app-emacs/haskell-mode/Manifest
@@ -1,8 +1,4 @@
 AUX 50haskell-mode-gentoo.el 44 BLAKE2B 1587be01b819c8d788bc8b9c3e9481885b2be3ceda43336f8d8728f245c961cb49aa6b1245558ce4d25ed28fcfc310c4fa95f992335ca75b6cdff90e33f18af0 SHA512 3a4dc946f9f5b5e7dfed41d19b8e576f3d164d81049b7bcad08791803116104f0450634569ee60a65f78e42b2153b925062b05f31cf8b5477160a73eadbfcf2a
-DIST haskell-mode-13.07.tar.gz 131102 BLAKE2B 402a4f21eb400c0f20a17b37c556b2f3eb949ef7fe38ffc2a0f7384ef252da9f69a6ab405ab782ab9739d2b2e57bab5c471c840cc8c3e4db7b42082f8e5bb428 SHA512 e19d55a99f4d9a571c1ed0b095254e4d1b8080d9ba671461aa228cbf8aa7c7a213e19e588c0f69450a1bd4ac25793b523415a6f11bfb5dda7706dc35f7beee68
 DIST haskell-mode-16.1.tar.gz 1192866 BLAKE2B 5a53075be5ea1246f2aa61d1004fb282d6c5e182497f7660336cf89634bde3b6455997286a4e7e599bf044a9d5c47384f44addb1ab6f53a257c749a93849992e SHA512 28654499ee521032be1ae6edfd338cab6022d7fdd4ff34e720ffe249801d4b442484cce4f5fc3461aa5145918f66f4b69df774b60cceb408220fc0533386cc56
-DIST haskell-mode-2.9.1.tar.gz 123579 BLAKE2B f6aa2d989961868d2de5815ccfe79fbc75902ca33572a799e4967047685fe8d598aa3057d655ed0006c5d814e706ee94e6460c702d4bf88ba253acd0187e0970 SHA512 7c4cbdfd0f9e43ab3efd39c8ca7fcd941538865fe41522703175b7ca8a67276945ef7feef4207fa66aee156a028cb52bb96593867db0c777baba9f59415ee979
-EBUILD haskell-mode-13.07.ebuild 1163 BLAKE2B cf11607be57dc65c16bd9519ffd7f97aa359eec9d657c5325fc09c522f33f7448fffa50da56bbbc1fe17836e43e55157e4da9101062ae6f9ba714fb82f84bec9 SHA512 a3bf4975f672f62835ae80f600b1dea83e1480d05d0a56e0261ab97c9b6d0417ceef923a142fd23087038e547b4ed8f2d21cf59151a26ec74d6b94f1051fbc71
-EBUILD haskell-mode-16.1.ebuild 1050 BLAKE2B b0667cb95a16e9ee94d527002e32ad3877612d95bd3b3ac2f73f6e3693e7ec6bdd29458745d63722e6d9c529ab1ada959b9d733234fb996deae3de778d8cabb1 SHA512 08eae466b741962a41ae17d23f04dbfe1aa327659e901b757741ce721bedd486d76a33d12a45c56d95af749ca1c9d43dc11bba474be4b95ff4aba7566fce9680
-EBUILD haskell-mode-2.9.1.ebuild 1025 BLAKE2B de3b65e493a238f45a2872fa721f288d0639b67f36fa8ea85906fcdd2c787a7e4bca5d3b2fccdb36cf80dfeb8e1cb181ef8f8db378d7407a0749e78dc5aaf462 SHA512 3ba4e5d481325c864c1add293cb9a1c8d9e7e42360760f857666aae90fcc9b6aa4afc03b76ada8dcd32652b517ed0d2736e68e8b4c2f3545fa1ff556c1acae3f
+EBUILD haskell-mode-16.1.ebuild 1044 BLAKE2B 89f1495645025522b77f7122e21277d4cfa825bca386a9839179874e4c0cc50bc3f621608e6b4cf46acac0101ff19dcdb11d182e3166051eb74143f3a5f886ae SHA512 60bf9041d3df6ed44b9006283b2516dc3a023bc795c3791065699686b39d77a7f68b5937ae817cb6f6be653b088f53e362aedb60b065b07e52a391521ac2413a
 MISC metadata.xml 365 BLAKE2B 83d22f60eb396ae5edeb56a673d3eade22441caf345af215e9c288663b0c5fc9838e714924fcee0ab939e8308663bad7e1eddc3490f2dfc24b98f518ad4fd337 SHA512 60afa0ec1eeb97ab4636b806aa544a277838ad64703a213eb30a8d3981abd1a0fcdd6c6d7de94afbd1dee29c92d8c7fe4112e827ee2e8016b537307634aab025
diff --git a/app-emacs/haskell-mode/haskell-mode-13.07.ebuild b/app-emacs/haskell-mode/haskell-mode-13.07.ebuild
deleted file mode 100644
index ffc84c434453..000000000000
--- a/app-emacs/haskell-mode/haskell-mode-13.07.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="Mode for editing (and running) Haskell programs in Emacs"
-HOMEPAGE="http://projects.haskell.org/haskellmode-emacs/
-	http://www.haskell.org/haskellwiki/Emacs#Haskell-mode"
-SRC_URI="https://github.com/haskell/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+ FDL-1.2+"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-
-DEPEND="sys-apps/texinfo"
-
-SITEFILE="50${PN}-gentoo.el"
-ELISP_TEXINFO="haskell-mode.texi"
-DOCS="NEWS README.md examples/*.hs examples/init.el"
-
-src_prepare() {
-	# We install the logo in SITEETC, not in SITELISP
-	# https://github.com/haskell/haskell-mode/issues/102
-	sed -i -e "/defconst haskell-process-logo/{n;" \
-		-e "s:(.*\"\\(.*\\)\".*):\"${SITEETC}/${PN}/\\1\":}" \
-		haskell-process.el || die
-}
-
-src_compile() {
-	elisp_src_compile
-	elisp-make-autoload-file haskell-site-file.el
-}
-
-src_test() {
-	# perform tests in a separate directory #504660
-	mkdir test && cp *.el Makefile test || die
-	emake -C test check
-}
-
-src_install() {
-	elisp_src_install
-	insinto "${SITEETC}/${PN}"
-	doins logo.svg
-}
diff --git a/app-emacs/haskell-mode/haskell-mode-16.1.ebuild b/app-emacs/haskell-mode/haskell-mode-16.1.ebuild
index a8d61e5c904d..199e7d7cbc69 100644
--- a/app-emacs/haskell-mode/haskell-mode-16.1.ebuild
+++ b/app-emacs/haskell-mode/haskell-mode-16.1.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
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/haskell/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+ FDL-1.2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc ~sparc x86"
 
 DEPEND="sys-apps/texinfo"
 
diff --git a/app-emacs/haskell-mode/haskell-mode-2.9.1.ebuild b/app-emacs/haskell-mode/haskell-mode-2.9.1.ebuild
deleted file mode 100644
index c64e1eed6fa7..000000000000
--- a/app-emacs/haskell-mode/haskell-mode-2.9.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-MY_PV=${PV//./_}
-DESCRIPTION="Mode for editing (and running) Haskell programs in Emacs"
-HOMEPAGE="http://projects.haskell.org/haskellmode-emacs/
-	http://www.haskell.org/haskellwiki/Emacs#Haskell-mode"
-SRC_URI="https://github.com/haskell/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE=""
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-DOCS="NEWS README.md *.hs examples/init.el"
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	# We install the logo in SITEETC, not in SITELISP
-	# https://github.com/haskell/haskell-mode/issues/102
-	sed -i -e "/defconst haskell-process-logo/{n;" \
-		-e "s:(.*\"\\(.*\\)\".*):\"${SITEETC}/${PN}/\\1\":}" \
-		haskell-process.el || die
-}
-
-src_compile() {
-	elisp-make-autoload-file haskell-site-file.el || die
-	elisp-compile *.el || die
-}
-
-src_install() {
-	elisp_src_install
-	insinto "${SITEETC}/${PN}"
-	doins logo.svg
-}
diff --git a/app-emacs/hexrgb/Manifest b/app-emacs/hexrgb/Manifest
index e7a2af16cea3..75d745108622 100644
--- a/app-emacs/hexrgb/Manifest
+++ b/app-emacs/hexrgb/Manifest
@@ -1,4 +1,6 @@
 AUX 50hexrgb-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST hexrgb-0_p1019.el.xz 10156 BLAKE2B 0f6681460b5a2d631763324015004800d58ffa93852bbb1fb4f5e07eee89d8a5db8c2f416af7fc7b885a37c520b544e959814f693adb7b41b27e0a76d38dc6c3 SHA512 4c05115e6889035e699ba9f920b1bf4f638e3c9980477dbaddeca6ec45f5c2e8574d26745e1d570d002a5ed83e7dc3f389144d1fff5efbbf7247508278ae567e
 DIST hexrgb-0_p957.el.xz 9620 BLAKE2B 6bcb432cce9a0981f19acd4beba785941148fa9ca8ebd2575b2ef4a39fe28c641160b5c27d6515220f122e66154d89807ba0075e41c2506d5c8aa1a6b291404c SHA512 5948dac5a771a7d3e9632a9783478181a39c4cb0e6d399ec8793730883182e44eb1aeef1dc9ebaadb4004f1b766e85033f79fa6db4b68ed5b11d38eec5b934d1
+EBUILD hexrgb-0_p1019.ebuild 404 BLAKE2B 373ee89a1635741dc2a3fe8fea16071cc66012f6c2017c7d9bdc5ebf9c00c718597efa887f38e1a58b6b770ec990464e522d2efe06ee511db9f1b4f153210781 SHA512 1b4d5621c8e013bf21d69246ea4dadb1e365a8d2c104166d0e5027473037da04a4f5a90f5c6c67a9d82117bb9fab6fdedeeeb77de3c2fc65bb5838bdd9be7fde
 EBUILD hexrgb-0_p957.ebuild 403 BLAKE2B 393babe59dfa2937f17184141283dfeacabe5b99bd4a5bc5f6b546ed301573641ac9e0c02908af03b0704afc01f8bfac2f0123a9bc725529b3b1ed1f37ed84e9 SHA512 4b60ecd175075104257653b916d5c99724f5ca7b7000f4cded86641f745f4612115b7820dc888a626e40f453bed621e41902092f6e9663998abe5bd6720782be
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/hexrgb/hexrgb-0_p1019.ebuild b/app-emacs/hexrgb/hexrgb-0_p1019.ebuild
new file mode 100644
index 000000000000..edfcdc886c2c
--- /dev/null
+++ b/app-emacs/hexrgb/hexrgb-0_p1019.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="Functions to manipulate colors, including RGB hex strings"
+HOMEPAGE="https://www.emacswiki.org/emacs/hexrgb.el"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/howm/Manifest b/app-emacs/howm/Manifest
index c788a46138cb..deb46187c986 100644
--- a/app-emacs/howm/Manifest
+++ b/app-emacs/howm/Manifest
@@ -1,4 +1,6 @@
 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
 MISC metadata.xml 357 BLAKE2B cdcdb822544ef99c142c343a3a7b68b825bf32fa45ec34016b2cbc6736a83ad925cabcae1a73e7a87ed5ab2c8704db7a0446d8b97bea533083d5f0f88482cb65 SHA512 1fff5ee37f3d2bf46732a5f23c06db0267f7f38357602f5268c29fb840b9450b380057993cdb5e0c540cef9d4c0e3e6e8a5c0b618f02d2493d92b0f44aebba93
diff --git a/app-emacs/howm/howm-1.4.5.ebuild b/app-emacs/howm/howm-1.4.5.ebuild
new file mode 100644
index 000000000000..389c61d210e3
--- /dev/null
+++ b/app-emacs/howm/howm-1.4.5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="Note-taking tool on Emacs"
+HOMEPAGE="https://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/icicles/Manifest b/app-emacs/icicles/Manifest
index 0555c4febe95..37d331471321 100644
--- a/app-emacs/icicles/Manifest
+++ b/app-emacs/icicles/Manifest
@@ -1,6 +1,4 @@
 AUX 50icicles-gentoo.el 112 BLAKE2B c4d0e44325f27cb725bce0aff0ac8186807295c9b20642f42fabfa956703836c65a23b3a71221e736d95aefa1e4e188834df53c9a275ddc0ec7389a810bd405f SHA512 dee9b1945ea378792e71efa674bdeae5ec82eaa8f8ea07fd7859ff3e48d812fc50c8a4809a2a66c99ffe08c4b2b71a107245970ec2cddbe0505b63999b62320e
-DIST icicles-2013.04.23.23400.tar.gz 886525 BLAKE2B 92325f9486f3008b45d336828025e828b83bdeb91ea7fef3a72f8093b9800ca1303cebcc3cc6c7c4bfadb9b66a26371f55a98498a34d23dc3511d1e2f6de4b36 SHA512 548c20fe83f72d03820d620d0d5f9feb6d249ca96c8f951ddbf650691ad30649d28d736b7c01677e260fed0490382a5771c0e88adef6c9c0089ecbd225f9acd5
 DIST icicles-2018.02.13.23733.tar.xz 697112 BLAKE2B 63b60a74cfcc5b855e9ffbf7a91d0cb561c46ef1a93fb1baca00a0a5462326da983c734bef1943c0f17583aeb065d8fd5d88769eec2dc35f36a59ea4ff86609b SHA512 6c5d2270c735fafa8e2180134fbe7175e1c99cb6ae904a70dbdf1144293bd1ffa84d9e81b1c1b03296348a6b31ebab62ea7981a4b7f5be8bb5238bd143ccb3c0
-EBUILD icicles-2013.04.23.23400.ebuild 401 BLAKE2B deae89002a1509b6087b034c18b9f4ec560e5cc39308948d5f92123410ca287cc9d1effc7e479e6194009affed126a1fc6d98581c6e1d20b169f568e7b970409 SHA512 3d697cbed9b5e35db6bc370eea722a8d5c5ada439bcfddc14498740a02ff81bc4065628dd11e5002b3c2e796877e1fd079638f2468551083ac893ba16091cfd8
 EBUILD icicles-2018.02.13.23733.ebuild 488 BLAKE2B 0aba0b0c414bd4eae4ff6387374fe4db7cf7c5f74338ce512d1b7ccd64ec3b7492d6f3418116e07ef75d39f61ebfb0adca0424bf21d3066272524fc0e89eb18a SHA512 de723e4123003f1fba99840c9dcdc7c99e329294b96a5650c518bf9cb559abecc2231ec373d76ba121b289e37a8961a3baa4968da25b1e653c4b4e805351488f
 MISC metadata.xml 364 BLAKE2B 89531668a33bd3ba547d5b7398504ee761731e04224e76a3d155be7048f9686aa111727c9a295f5520e8d7a72d85b4aa2461acd1e7f420faac2e907bfc5424ec SHA512 d889cc1477d8d0cac50bbf0a9866cd5f58194bb62634672f9071f6305b16add9e19462474bdb6e160c57b1efd0f89915faac10b874775a74cf6cbe19ad4e5fec
diff --git a/app-emacs/icicles/icicles-2013.04.23.23400.ebuild b/app-emacs/icicles/icicles-2013.04.23.23400.ebuild
deleted file mode 100644
index 341a08fa8d7b..000000000000
--- a/app-emacs/icicles/icicles-2013.04.23.23400.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="Minibuffer input completion and cycling"
-HOMEPAGE="https://www.emacswiki.org/emacs/Icicles"
-SRC_URI="https://github.com/emacsmirror/icicles/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/inform-mode/Manifest b/app-emacs/inform-mode/Manifest
index 7dfca250d7e5..f12c0ba7d1bc 100644
--- a/app-emacs/inform-mode/Manifest
+++ b/app-emacs/inform-mode/Manifest
@@ -1,6 +1,4 @@
 AUX 50inform-mode-gentoo.el 303 BLAKE2B f6146e84023b468b4ed32ede21673a1e1c1cce4057c00811f8aced3440e0fb3e91cac9dc62ae7a3eed654d7781ddc8d9ac028b53dc6bc5e0c43750224c3238f2 SHA512 e3a9b79ce99c8d0a6d9e67430610b12fd90d081f99c4066f46044359f06bf429cea6899ef99f9ef10d04799adc0338a983fdc344caf1f208d5c505f1ed163606
-DIST inform-mode-1.5.8.tar.bz2 14734 BLAKE2B 9ffae6571786109ae324e6d1336c453b279f5ef7d8b8be7561fd062cbe71f106c0d2b3e1065fadb7a153942fd5ad9db9d763652912a021cfc66ff2a0a16da3ed SHA512 edf073d1c4f60ec9eb186a68cafff22ad67a32f40f21bd89584f3a02eada6d073935892e761a6a2f2726e90f59cf0c1a77c2cd59b8b4e85a17374f47997265d8
 DIST inform-mode-1.6.2.tar.gz 33359 BLAKE2B 5ea2a31443db436e3230b61d4f8cf6a724f0103857ce98b41becf2271956e1aba2dbacc73b47be20ca347314c1be186d99a1884d11ce14a7cbce6944096ad588 SHA512 41ab2353942a5d605ec848aed87aa731282a43305cd739fe76d9e6ddd333c84594455f0fb72d95ed02fbcfa9f78f11b16ea8bb579504d1ed29244cbe50e444ee
-EBUILD inform-mode-1.5.8.ebuild 430 BLAKE2B 6a939a2f2e5a02408c9762e82aae3dc4ab4b9ec0ada4d586a50c926b71ca9b806683edfbea6ff0eaf8f91cc9b5ee0e1974f8b20dcb287aa8d08eab8416e74a28 SHA512 902e367bdae123204b63e42c1cbaccf9527a5d46f400967accf0d9771fbefe462b1154982e318ad19f13a71c997e53a93d60cfff30f493d4c7142729cac11308
-EBUILD inform-mode-1.6.2.ebuild 461 BLAKE2B a0527399bd3efa43169dfb557d55211c436b79a51c688c4fb867505004d6eb3430fb19fb34caaa2a74509805c4d031eb22573f0d406f486caf9929cffae40f5a SHA512 efe9e22e0aa93561b3a4285f7b734526ebe1f602c265e63d74c98ca88d6e64a91e805173c42527828cdc0f2e43511681dc4d259ad3ab3704ce98dc16ccb8e309
+EBUILD inform-mode-1.6.2.ebuild 454 BLAKE2B a79676a7c4e31bfb1aef0396200b7a2a0d0545691badde57064ecb05c452dc9b59204e3bd245c80da888ac2bb290aaf2edda975b3817cd7712e30e822133b5f1 SHA512 4d2b0afe2e45a33192052ba2787bd3cb5027060783f3608b008a4c29a8a98d9eaf7ed575c4ca4a23f676fb57a8989f4e37ee26b81e0238f943e3257b8651a238
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/inform-mode/inform-mode-1.5.8.ebuild b/app-emacs/inform-mode/inform-mode-1.5.8.ebuild
deleted file mode 100644
index d4a55833934d..000000000000
--- a/app-emacs/inform-mode/inform-mode-1.5.8.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="A major mode for editing Inform programs"
-HOMEPAGE="https://www.rupert-lane.org/inform-mode/
-	https://www.emacswiki.org/emacs/InformMode"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-
-S="${WORKDIR}/${PN}"
-SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/inform-mode/inform-mode-1.6.2.ebuild b/app-emacs/inform-mode/inform-mode-1.6.2.ebuild
index 748c923a19a3..094472a2aeb5 100644
--- a/app-emacs/inform-mode/inform-mode-1.6.2.ebuild
+++ b/app-emacs/inform-mode/inform-mode-1.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="http://rupert-lane.org/${PN}/releases/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc sparc x86"
 
 SITEFILE="50${PN}-gentoo.el"
 DOCS="AUTHORS NEWS README"
diff --git a/app-emacs/initsplit/Manifest b/app-emacs/initsplit/Manifest
index caf46266d2fb..2c02b07ec7ea 100644
--- a/app-emacs/initsplit/Manifest
+++ b/app-emacs/initsplit/Manifest
@@ -1,4 +1,6 @@
 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
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/initsplit/initsplit-1.8_pre20160919.ebuild b/app-emacs/initsplit/initsplit-1.8_pre20160919.ebuild
new file mode 100644
index 000000000000..419b7d5446ff
--- /dev/null
+++ b/app-emacs/initsplit/initsplit-1.8_pre20160919.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp readme.gentoo-r1
+
+COMMIT="c941d436eb2b10b01c76a582c5a2b23fb30751aa"
+DESCRIPTION="Split customizations into different files"
+HOMEPAGE="https://www.emacswiki.org/emacs/InitSplit"
+SRC_URI="https://github.com/dabrahams/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+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/lua-mode/Manifest b/app-emacs/lua-mode/Manifest
index 5491781246f2..e6f859957199 100644
--- a/app-emacs/lua-mode/Manifest
+++ b/app-emacs/lua-mode/Manifest
@@ -1,4 +1,6 @@
 AUX 50lua-mode-gentoo.el 206 BLAKE2B 07efd36ded1a442c754102c22bea97ee4bffc2c89e40fbef2d8e644051766da13da6b0d2034f3a4e27fa1522949ff351a1105651d79d9005bf38dddd4bea6577 SHA512 b062343ab77dcaa50355498a63681c8e5bc6f209b1aa5ef82d65be8c19aa52d58c2efcd481f091804726b095a02b97de5b6cbce232ee5d9f328c5e3d888b496b
 DIST lua-mode-20130419.tar.gz 26242 BLAKE2B 25f75c70982ba2fb0077fb249501367f9dde3eee5ff7bb45c0d8d97857b6268c481652e06e5a92bd04d9b9fcac0fa3368dfbdc3efcbaefc34268aeb490ac6ad9 SHA512 e66ebe6c953e81b07a8f9d86264b1baa5e0b730a6d26b1acf7fb48ceb8cc0f008cdea0046d89e380fefefe0e0b189ef360280236befc79ade69e0622a2e7eb92
+DIST lua-mode-20151025.tar.gz 35319 BLAKE2B d84c79622793c51caf7262749d4648baa106f7a2d639706b495097d89fbe8f3ce09482ca12a0473e4a4eaf04cab83ee8b65d62e505b32b12302571efdd1881d4 SHA512 1b2877ba9ba24694b2a820a4e1408d0f475f04bdee424d346fc2248980863aaaf230f757365095304cda763addb32de7e6a2585218770f66d519455d1a32762d
 EBUILD lua-mode-20130419.ebuild 546 BLAKE2B 60be5c0bcb561e06115cb310c56c5f735375395ed4b6bff2bb78bd419f0eebc648c9013e5e2511e22c664cdf15eb2b725d599ae30b49ef3df9547ce5407d780c SHA512 5e2a0b48c79788285233f38103599ff8df12473ffebcd003765f9269ba995ba46af231d7c05eb90590a75f0ba3996def952df9bfc3dbe3a9d2d88d6a71555d57
+EBUILD lua-mode-20151025.ebuild 594 BLAKE2B 633f5ad3ce5db14476df1403f68e2ee3dc625fc5738a59409bc23190f83a7cd3990fd8f83509a5927d4a4eab4908d7b4a8e6bfa2de2cbb55a20aade2942ce405 SHA512 27996796858c792c56d48428699e27096535e58344f50aad1685170fab6f727bd79064f7acfeed2b04a913fec796dc16421e7c684dbe12ebdaab280937e83ba3
 MISC metadata.xml 361 BLAKE2B 4953692a3d3c19f162a539ae4167f16289c569f8c379e09f46423556bb8bf5335e95c5a125a29fcabdbf762405920a4d97c4920c304560688d617be0badcb69a SHA512 e7d96df1fb7a061ecba903b1e2ee997a93801e8d367f7b7b6c1394a8366f05e4fe001d96a08496559f16187ad93d21055b93a52ab4afce9631a179635e4e78d1
diff --git a/app-emacs/lua-mode/lua-mode-20151025.ebuild b/app-emacs/lua-mode/lua-mode-20151025.ebuild
new file mode 100644
index 000000000000..21ebdd4465f6
--- /dev/null
+++ b/app-emacs/lua-mode/lua-mode-20151025.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="An Emacs major mode for editing Lua scripts"
+HOMEPAGE="http://lua-users.org/wiki/LuaEditorSupport
+	http://immerrr.github.io/lua-mode/"
+SRC_URI="https://github.com/immerrr/${PN}/archive/rel-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+S="${WORKDIR}/${PN}-rel-${PV}"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="NEWS README README.md TODO"
diff --git a/app-emacs/mailcrypt/Manifest b/app-emacs/mailcrypt/Manifest
index 185dc3162083..1a0f1842a932 100644
--- a/app-emacs/mailcrypt/Manifest
+++ b/app-emacs/mailcrypt/Manifest
@@ -1,5 +1,6 @@
 AUX 50mailcrypt-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
-AUX mailcrypt-3.5.9-backquotes.patch 424 BLAKE2B 841096ec6593ba9296340356082ff2569bb8d3f08d565c9ac0d750994bf2bf27b3215b1d916298b6fca790c8ab0653a427cb4722011e88a459b8b2447e042c62 SHA512 e0fbecbeb6e10d183747e8c86dd2ca6c9c01340a0109c1eacec17dc1ed7139197074a8985938ebfb79d7ddecb6c2f9da405110ac5fe6f67be7ade3df75898a81
+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-r1.ebuild 1000 BLAKE2B c4be66354b79204559c445e8ae58b4e5d324e52e0bd76ac052cca0c37431699b39c0678126c28a402b6648331b2e3c6c2b29e30208cb02df817874fdf0ceed6b SHA512 dda3334ba97b6922a7f1fa17c2823a9775126a36494246970b31ceba1edadfc6fbe33f49888fb2c9cf520ebbbba0fdfd91a8557511d556af75eaebf169f53c60
+EBUILD mailcrypt-3.5.9-r2.ebuild 997 BLAKE2B 11e03c3de9a7491dc287b30a297a0783e0f6de17a9dda7a5aabe6883a3562763cb7c7240cca74682d6189d3073860416d0255fc69f00fa5b9934207d42b723ac SHA512 0d0f778b87a6f8cf5b5f0a913aef003d464f0d2e2159482fef11c9e53dc25af9a1e0faf8742d4b2293dcf67312e2f43af5515c3877c0da1a34b0ce29d934a3b5
+EBUILD mailcrypt-3.5.9-r3.ebuild 740 BLAKE2B 4e85b91866f8fe7ede8757ed418a8c647538261f0d0a7a5c821e8f37309e8c467928fa22509fe76d4f0f6590b5be3069e8d744ead00a9de52c65f5145f2265e5 SHA512 a2ff51d9c9d97a49774d82cc6f26e8859d91dbee16a1be5a1a5843adb5efb76a1811920820e0e5f78ac5bee89c94b9f7d1249e2b482a81f770506d411674d11f
 MISC metadata.xml 359 BLAKE2B 115dd3e46859edda7ac4b23892ba3fd9f76e2a0aeb0f667a37c0a410959048a3a99ddbf052155fdc55bb18cc5fbd8a72af18f7c4b312ddd9f27a25c454662c9b SHA512 0a6b9ca1957a37fcdcf322663a6ae5dcfa9f00810ca7f68548acb9386edcc78f0b7d01f1cd6b2bcf2d9f05a6d34b7add17e9418329072d184c7840aed0f50eb1
diff --git a/app-emacs/mailcrypt/files/mailcrypt-3.5.9-backquotes.patch b/app-emacs/mailcrypt/files/mailcrypt-3.5.9-backquotes.patch
index 7cacdbb9e482..26b0e4301adc 100644
--- a/app-emacs/mailcrypt/files/mailcrypt-3.5.9-backquotes.patch
+++ b/app-emacs/mailcrypt/files/mailcrypt-3.5.9-backquotes.patch
@@ -5,7 +5,7 @@
  	"Execute the forms in BODY with BUFFER as the current buffer.
  The value returned is the value of the last form in BODY."
 -	(` (save-excursion (set-buffer (, buffer)) (,@ body)))))
-+	`(save-excursion (set-buffer (, buffer)) (,@ body))))
++	`(save-excursion (set-buffer ,buffer) ,@body)))
    )
  
  (defun mc-gpg-debug-print (string)
diff --git a/app-emacs/mailcrypt/mailcrypt-3.5.9-r1.ebuild b/app-emacs/mailcrypt/mailcrypt-3.5.9-r2.ebuild
index 88f148624b2b..60f6a2ed7f21 100644
--- a/app-emacs/mailcrypt/mailcrypt-3.5.9-r1.ebuild
+++ b/app-emacs/mailcrypt/mailcrypt-3.5.9-r2.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=7
diff --git a/app-emacs/mailcrypt/mailcrypt-3.5.9-r3.ebuild b/app-emacs/mailcrypt/mailcrypt-3.5.9-r3.ebuild
new file mode 100644
index 000000000000..d7231e393d29
--- /dev/null
+++ b/app-emacs/mailcrypt/mailcrypt-3.5.9-r3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp readme.gentoo-r1
+
+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"
+ELISP_TEXINFO="mailcrypt.texi"
+DOCS="ANNOUNCE ChangeLog* INSTALL NEWS ONEWS README* WARNINGS"
+DOC_CONTENTS="See the INSTALL file in /usr/share/doc/${PF} for how to
+	customize mailcrypt."
diff --git a/app-emacs/markdown-mode/Manifest b/app-emacs/markdown-mode/Manifest
index f7589f5fae92..c82bfce0db71 100644
--- a/app-emacs/markdown-mode/Manifest
+++ b/app-emacs/markdown-mode/Manifest
@@ -1,7 +1,4 @@
 AUX 50markdown-mode-gentoo.el 252 BLAKE2B 1b718b5fb40ac043f74647d1bbf344bf07a63e530bd4ab3a52231c148b3bf824815a5e15482481ef4a9a183acc8894b9edcf3726af270dcbcfd9b42d502105b2 SHA512 403f80133fddcd2647d1e0c077628bb984e33b89dd68fdee05f87a13aa6b89e344c76944d3885789789884e7298dc9c1ced716fe721b1b2ed6dcf9bbb0f24f91
-AUX markdown-mode-2.1-text-auto-mode.patch 833 BLAKE2B fb0eade55f75123e1166fdc4b59199daf5fd58771a8aadaf890220d84d844657d9f2b3b87c2f5f1db31dfd45042f404d7b4dd248e4d6ce9fc5937579cc21a126 SHA512 72d1206398d3f72a35c20e14f267bbe1419102f479feff55d80054309ff7e7bce291dc50b6e010a34f435f9fbdfe249261f8ab073c986994160f91ed5bf8a8ee
-DIST markdown-mode-2.1.el.xz 50484 BLAKE2B 12ae664f0680a420727148c2ed78275ab7dcdc8ae742a0152f82dc25150cea9bd5d880b9244351792354ac1d64789267163512e55c2b83f64855bbc0ab0ac33e SHA512 3f0d68b03408281e49c9dbf4d26b8c1f766aa675efea6789b13722c7b1d831af35d3ea30ac071be00242279bca31d04fe92a28b901698fe2072d4504d9901253
 DIST markdown-mode-2.3.el 387130 BLAKE2B acb583126a6f952835537f9e386df5f9a8fda5e49a14520e153c0cc99fc58cca596607b282f9f7070b001fe8165d50adb9abb81de1b03ae102cf2061de587810 SHA512 0820c5ae585e0f5ee8fef9eca40f2de2ad632a2559ea7f447cd19ded592de38bf2f3df8491796c15eb06723fe2af904335535af145356c7a7f9f855612263aaf
-EBUILD markdown-mode-2.1.ebuild 656 BLAKE2B b9f8506be2cf90606894ac35871114b1da8b4efd9d21a187f6812d33a0f7a6161440d6781a30cdfba8b15c8d3532296c2276f702c82b342f0c2a348fe2b76647 SHA512 5da9fda79af6213b5afa30ac58dfc0664f438ac027b840d0481a5637e5b72750b461e57f8f3ecddbe68391f279b1745982b6981003238090a8422c3a088e88ae
 EBUILD markdown-mode-2.3.ebuild 544 BLAKE2B 71db933d1f2befe6058416fa91aa09135df4e1e24f195a5ef717717aecb078a91fa12c977dde87585435f9e8f36b73fb989d3c4b1da20a21963214ed6f277583 SHA512 a74d3433cbf3cee27233b2f9d55e0d238c667840f3feafe2e2a2fa1a0ac7e7521e710ed12acd12e9a5ff05cb113fee2d3c682967b380bc1a8d31288a89591914
 MISC metadata.xml 357 BLAKE2B e316ea7b6be23cb10196d2ce47b4eb745e69fb92ceabceac4e3f33d295ff5dbd0b9db66f316895849ee54b53880b41d5708e6233f48bfc8f073128c543f6c427 SHA512 0bb062f8a6e739e53898467f8314b799b1997a9161c71cd39287da713e18f748080674ec34d56ca3e478dafbcb8462962d5c8949fb1e8bbc3cf866a2b95301ea
diff --git a/app-emacs/markdown-mode/files/markdown-mode-2.1-text-auto-mode.patch b/app-emacs/markdown-mode/files/markdown-mode-2.1-text-auto-mode.patch
deleted file mode 100644
index 91449c6daa54..000000000000
--- a/app-emacs/markdown-mode/files/markdown-mode-2.1-text-auto-mode.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From a70e74e0eedb436c4126ac69b0beaa4ab848b78e Mon Sep 17 00:00:00 2001
-From: Steve Purcell <steve@sanityinc.com>
-Date: Mon, 14 Mar 2016 09:18:16 +1300
-Subject: Remove autoload for .text
-
-While .md and .markdown are clearly markdown files, the handling of .text is not a choice that markdown-mode should be making on the user's behalf without any opportunity to prevent it.
-
-diff --git a/markdown-mode.el b/markdown-mode.el
-index b7a32cc..978e040 100644
---- a/markdown-mode.el
-+++ b/markdown-mode.el
-@@ -6634,8 +6634,6 @@ BEG and END are the limits of scanned region."
- ;;;###autoload
- (add-to-list 'auto-mode-alist '("\\.markdown\\'" . markdown-mode))
- ;;;###autoload
--(add-to-list 'auto-mode-alist '("\\.text\\'" . markdown-mode))
--;;;###autoload
- (add-to-list 'auto-mode-alist '("\\.md\\'" . markdown-mode))
- 
- 
--- 
-cgit v0.10.2
-
diff --git a/app-emacs/markdown-mode/markdown-mode-2.1.ebuild b/app-emacs/markdown-mode/markdown-mode-2.1.ebuild
deleted file mode 100644
index 571a3cbe3b7c..000000000000
--- a/app-emacs/markdown-mode/markdown-mode-2.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="Major mode for editing Markdown-formatted text files"
-HOMEPAGE="https://jblevins.org/projects/markdown-mode/"
-# Cannot use this url because its hash differ about every five minutes
-# SRC_URI="http://jblevins.org/git/${PN}.git/snapshot/${P}.tar.gz"
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="|| ( dev-python/markdown2 dev-python/markdown )"
-
-SITEFILE="50${PN}-gentoo.el"
-ELISP_PATCHES="${P}-text-auto-mode.patch"
diff --git a/app-emacs/matlab/Manifest b/app-emacs/matlab/Manifest
index aa078a440e92..2eb5c41c001b 100644
--- a/app-emacs/matlab/Manifest
+++ b/app-emacs/matlab/Manifest
@@ -1,4 +1,7 @@
+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
 MISC metadata.xml 362 BLAKE2B 9f602fd377b19317a6d92083b224f007d5a2f997bbb17396cbd84e742e7cc6b9b0da1a28f7123984594d226f0978dabbe26ae6e0adad50630b90461315e9910d SHA512 bc473891af67b75c5ccd5943193e40bbfcee6d0aa21ab0a2a5f64d8a6833f3a6542e45282deffeb46a496d16d6f6e7ae21c353cb884904f682559b50233f259e
diff --git a/app-emacs/matlab/files/50matlab-gentoo-3.3.6.el b/app-emacs/matlab/files/50matlab-gentoo-3.3.6.el
new file mode 100644
index 000000000000..499ac3d66b2a
--- /dev/null
+++ b/app-emacs/matlab/files/50matlab-gentoo-3.3.6.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(load "matlab-load" nil t)
diff --git a/app-emacs/matlab/matlab-3.3.6_pre20191010-r1.ebuild b/app-emacs/matlab/matlab-3.3.6_pre20191010-r1.ebuild
new file mode 100644
index 000000000000..33487fa8e1bb
--- /dev/null
+++ b/app-emacs/matlab/matlab-3.3.6_pre20191010-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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-src"
+SITEFILE="50${PN}-gentoo-3.3.6.el"
+DOCS="README.org INSTALL ChangeLog*"
+
+src_compile() {
+	elisp-compile *.el
+	elisp-make-autoload-file matlab-load.el
+}
diff --git a/app-emacs/mediawiki/Manifest b/app-emacs/mediawiki/Manifest
index ed26c60a2cde..d0e4ec7fd6f3 100644
--- a/app-emacs/mediawiki/Manifest
+++ b/app-emacs/mediawiki/Manifest
@@ -1,8 +1,6 @@
 AUX 50mediawiki-gentoo-2.2.9.el 410 BLAKE2B 805a4fb5639dd443d2a2da196ec95d1c22644ffcba68687d82dd0822c79070f19ce83c2a2979cfa64559d868d847967f8bb6c19e5909c182cc53f9ab47c26ded SHA512 8915b44c0f01f6cdc0c9c2badb84b59ef4ad10e8ec30f3fdf7331ce37386ae3152f7e851cdc6dd4540eecdfdd672232eeae295a208994e177a3485e535dc00db
 AUX 50mediawiki-gentoo.el 395 BLAKE2B be76f989906bd8c6eae72257ebddeeaf1dc9eb6ae45488e7afcaa73a1a173800a83510bbd683a172afd2597b7173f8e4ceb7cfab910c0ece77c76833bd85a055 SHA512 579680b31ffb86b68e1ccc8c7f4969860437a34bd2cc308cb9400ea861d313c2b2d538412eadbdff9d56ddfdab8f7312dc8cb97137a6c8c2707ebce4437c7b79
 AUX mediawiki-2.2.9-user-agent.patch 1138 BLAKE2B 283c88605aecb7fcfaf9883f4c3926036281a528fee133db1e4a43769ed7e98d0f996b6ec9313a6d62df720bca10586af18b7a9c2bc7a3bfeae301d90050d441 SHA512 0f30bd86e4fac425b98822f1e18bd98b71fa69bafa34d235a8aa380f2588f26958bcace8c09490a9fdf8dd28d289263cb98b3d7f2e67fdafa5e8822d2c76cead
-DIST mediawiki-2.2.4.1.el.xz 19108 BLAKE2B e8603a622c80943153f96f6f9997053fd0913ef23e0a672576726fbac3d2a5de850afbcdb3748a05769b9c880bc641aa8aa5e48bf6dca800b1fbadd6c8b8a2ce SHA512 4526c04c560679196900310c90d6321ab10a447ff4f904b0bc40bfc56296c3a773cc8fe7d4001cdfc108e9e11ce3ca4dd6677e51b220eb3b453a1b975118f52c
 DIST mediawiki-2.2.9.tar.gz 36595 BLAKE2B a044008115e545d043045e943762072981b5bcc7776e5f38480a2170168929989b990d90b225f3416a8ce9052d3a310bb77ac6ac1d273f112180ff2bddeb850c SHA512 7586558b953c3e2a41b792db55ba9b3520b07377a555c2dd38829c0be24f3388313dfaa049520c632d6fd3a471cb777ba662f723c56cd59c307b68faf9d8adb0
-EBUILD mediawiki-2.2.4.1.ebuild 357 BLAKE2B 5bbf3c1758797c4258d1eb842a9a37e4b3c9444db03de4f0c3476d9928de28b221716ad21564b775aba21a735488616e059a45c6a6639374fd1e550308f4a834 SHA512 726db4d0cad4bd04b56028bd37dc3ce5db8ffe89048292aa81691ea89cd8d24b4a4e4baf997f25489e490a902b7a2b66a1abbcfba47127f89886eee569da02c0
 EBUILD mediawiki-2.2.9-r1.ebuild 497 BLAKE2B edb3202fc0e08c1b0b100adc92bfe5d73bff0944aad242621608c0c97a241a5844227bb2562e9b97d4d1e6ce8b499884420d93e4091e5af203829a70d53c0a57 SHA512 e4c0626db03acc3af971e64865fa6d78bfc6a53e253c3816b947dff1e03ad231985cd631f41b14c12f99b68fd23d53d56559d461f51c3b78cf409e1c19b19838
 MISC metadata.xml 365 BLAKE2B 3c775b4bae44a5de7e5604d331bb1a01d926b2adea8ee9e83f37a5d5eebaa415dcdd5182aece1c41f0f69a15f931673bb48bdb90d83b431213f2cec8fa29306e SHA512 7d449d74ac37095df97f257e323c5362e0e2fa15fb573de53988d73b4941ffe0a876c59548b2f1cb244554904097d71a7bc293914fa8e7c66f4f844d7ab7ad87
diff --git a/app-emacs/mew/Manifest b/app-emacs/mew/Manifest
index 2e8d96121576..692089e7003e 100644
--- a/app-emacs/mew/Manifest
+++ b/app-emacs/mew/Manifest
@@ -1,6 +1,4 @@
 AUX 50mew-gentoo.el 195 BLAKE2B cca28ee1ad51b86b1fea56490f93365aead98f123df2f778a1f2ef2207745c551a5ac9eb10386208a8ffafbd5f3498a9ef27aa5eb0bb5d4ffcc6e4bd3c854ca6 SHA512 2bd1f98dbedcbd4529f63bad9ac6093e4e783afb95270f672b30e9a50f8d0f3fbc7527ae975d35b9650ac6fa8b3ea32352985e8757adb5d9f064449623459eeb
-DIST mew-6.6.tar.gz 989941 BLAKE2B 7ec4e502865e13108cc51dc74ffa246dd1084ae369979c05b9c1fc326c01f716766b7aa445ac489fe7c34cbc610e130738fa7578ab338d496970f6e59847c295 SHA512 55a91faaba09a28dfe7da33d34a8c3638540db71a3572ce01646976fbdd0ac3e327475ccc2908876ee6f516c6ee60082a27413b210c4591ef12cc4f878a07472
 DIST mew-6.8.tar.gz 991876 BLAKE2B 6055c30ac7f9286a2792fd3fb5fc53412ffed091594e64fa802cd4346fbd7ce542a930e3b38552dc39fa728898a68e1d71f0626f38ef8f815515af95fae0197d SHA512 e4713a4485fa31a95820100465728998b6d5b4822e2a522293754ab269fbfa625756417a55eccf400994a4cc6f6230b8142463ffe416917f321da5053abdb98c
-EBUILD mew-6.6.ebuild 983 BLAKE2B c0a7b1a2442cc25d8e23f26cd50de0eedad8fb879c5582cc2cc1ff68e74d8c4dd28817f86afaef2f67066f7e391ee5974a193d925bc7a0d14cfa6cddee5a6b67 SHA512 3b92dd4956bb82d8d59451b010b1e28b6e9c27e965c2a8ecdff5d9eedd77a215cc1c5d08159cb808bf14c1ba8c8d8b84a903c942256226d34066dee9e5c11073
 EBUILD mew-6.8.ebuild 999 BLAKE2B 512c8eb6517c64b171daa1b895d0199b8f936261dcc3d17a95579e3672e0c7332fbbf4ef0c7d87907404d4eb2ca395812cb545a883ea489d8aa06314a7f4a056 SHA512 b2d0f45c418b26f76d6876eb73680910b18005e14288ea848d0e8a18c9cf9528cd192f22707ccac7e96bc1c792035d5f0903f1746a4fe742a514271c0ac276f1
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/mew/mew-6.6.ebuild b/app-emacs/mew/mew-6.6.ebuild
deleted file mode 100644
index fc5d683d3253..000000000000
--- a/app-emacs/mew/mew-6.6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit readme.gentoo elisp
-
-DESCRIPTION="Great MIME mail reader for Emacs/XEmacs"
-HOMEPAGE="http://www.mew.org/"
-SRC_URI="http://www.mew.org/Release/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="ssl l10n_ja"
-RESTRICT="test"
-
-DEPEND="sys-libs/zlib"
-RDEPEND="${DEPEND}
-	ssl? ( net-misc/stunnel )"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_configure() {
-	econf \
-		--with-elispdir="${SITELISP}/${PN}" \
-		--with-etcdir="${SITEETC}/${PN}"
-}
-
-src_compile() {
-	emake
-	use l10n_ja && emake jinfo
-	rm -f info/*~				# remove spurious backup files
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	use l10n_ja && emake DESTDIR="${D}" install-jinfo
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	dodoc 00api 00changes* 00diff 00readme dot.*
-
-	DOC_CONTENTS="Please refer to /usr/share/doc/${PF} for sample
-		configuration files."
-	readme.gentoo_create_doc
-}
diff --git a/app-emacs/mpg123-el/Manifest b/app-emacs/mpg123-el/Manifest
index 20941b0061b8..df66753f1337 100644
--- a/app-emacs/mpg123-el/Manifest
+++ b/app-emacs/mpg123-el/Manifest
@@ -1,6 +1,6 @@
 AUX 50mpg123-el-gentoo.el 121 BLAKE2B db0ee430cca004ac595670289feffb469d121b605696fbacb01dec2422715e557047e29246ebee59b09d5db3b83a8411f70566ce22ee174a4f23296d2958165e SHA512 65b1d2039ce0773a65cf26fc88699ccb6fa26d7db2312ac6a9d0712512c214ba7b5758bd1556365836fdf840bcfc9eedef12f18bcdd1866fde6937777979a032
-DIST mpg123-el-1.59.tar.xz 34076 BLAKE2B ddfd5940665fb11e692958332d1e53cb5adf3e36bd1d178b764ceb2b1a34928fc37ec843e8e1d10d22c9efe4b5de863797be3b3a527d28fad5081ee682ff1d4b SHA512 48fae024529be7b88553fc43fb626253f3d3a10d6709378a565a0d407374569e5573e52c0b26abc4d6f2f51ad7f680d655a1ac15ff696f4534c39a9a3536bc0e
 DIST mpg123-el-1.60.tar.xz 34104 BLAKE2B f48a0ce460ee382b261accaf2188bb1dde7b17b1b09766cda7ef69f92d3e022a4390a7c9e9a97085f1c1e87377d114bcbdb29de512438ee3652baa0be0b413a7 SHA512 5f4d7aefeaec6c5e94dcd5d15af7d0b89dc79274dce117309a70170cd0ec8cafac7c275518ea21d797d9251c31033b93c0581f26f83792c7b697094f4b194611
-EBUILD mpg123-el-1.59.ebuild 837 BLAKE2B 7a76105d7b7b8f36130ebaa72dc79961b145c2cdae25dad4ee10dbc797d27517606ac6b1f9bef2605ca61f69f7d6fdcf27e0e404cb9ab8a224bafe044aca0438 SHA512 952292f953a6a470fc9ea0400cffdbdd4128ef5b3412154695840f559d1e7aae2ac169d54a77ba4e718ad007e24067cf4a0934100da88b7db2d0fbecc586be69
-EBUILD mpg123-el-1.60.ebuild 794 BLAKE2B 80ee206ce8d47c5b6d9db501cef6c050b1c44b9ca5f4d4a71eb116fc4eed5f88bd64cec64b144837b2e17431a6d0f3717b420f76ea72c38bc0c7537bc0c7d8f0 SHA512 e9cbb50ebd06e8c6c4dfa79ba8a175459555f9f907444b6b27ddcb3bae59177295ae04e72ded30136c3d5640f4281840de6eb82b7e71a7c07d9f156b9250538c
+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
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/mpg123-el/mpg123-el-1.60.ebuild b/app-emacs/mpg123-el/mpg123-el-1.60.ebuild
index f2120eb5c4c2..5b1431e2288d 100644
--- a/app-emacs/mpg123-el/mpg123-el-1.60.ebuild
+++ b/app-emacs/mpg123-el/mpg123-el-1.60.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
@@ -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/mpg123-el/mpg123-el-1.59.ebuild b/app-emacs/mpg123-el/mpg123-el-1.61.ebuild
index 2cffa4ba6c99..eeba80891947 100644
--- a/app-emacs/mpg123-el/mpg123-el-1.59.ebuild
+++ b/app-emacs/mpg123-el/mpg123-el-1.61.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=5
+EAPI=7
 
 inherit elisp toolchain-funcs
 
@@ -11,20 +11,16 @@ 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"
 
 SITEFILE="50${PN}-gentoo.el"
 
-src_prepare() {
-	sed -i -e "s/\(mainloop:\)/\1 ;/" tagput.c || die
-}
-
 src_compile() {
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o tagput tagput.c || die
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o id3put id3put.c || die
+	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o tagput tagput.c || die
+	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o id3put id3put.c || die
 	elisp-compile *.el
 }
 
diff --git a/app-emacs/mu-cite/Manifest b/app-emacs/mu-cite/Manifest
index e74401628278..752391281a6a 100644
--- a/app-emacs/mu-cite/Manifest
+++ b/app-emacs/mu-cite/Manifest
@@ -1,6 +1,4 @@
 AUX 50mu-cite-gentoo.el 142 BLAKE2B f6631cf5bb32bf66af28c56cf21e0dd51ffc545a47ac82edb0db125b78bbf6a183553b6d0afedcde766df0ae349085253f3edb91718b949341a899f01e6f1733 SHA512 737b4c0c5ae0790e7cc8dbf0d253aadf7cd2680c54940967d93f95dbf6fe80fdbf5290560ef4eacfa16c1a26ab9567726228af7b3b649f859c01b021c10563ef
-DIST mu-cite-201202272330.tar.gz 19212 BLAKE2B d52378258b3804e2867d6f8f6f471a73eebb3ff955df70a2ddc5dfd91d6ada2ea2349d44e86c81e1c314b88787b08b39f40238b22760a74b77f8393361aecdcc SHA512 78013bed020c46baeecf56bcd155eb6058d11b1d61a0af55b075454601e3cd1a992bdad887e125ffd569782a38e4509d60efdc431ded501c35da096133b475b8
 DIST mu-cite-201808232348.tar.gz 20443 BLAKE2B 814ebbd3ab45af4af65fee54884a1960a0cecccd07e1e0e084e860fcab4884ca0d97f4042f14f530b8ead4ee4347d13dbde9ecc96f5e82121bad44e0b93855ac SHA512 5a30124041ea5a807f5d8ea8a1ef18afcc7020d3f2d2bee4dd163fa1098d37d27b43db81c1b538bf1d1b06720840fb5c3f95d999fddd624437dd251fa061f699
-EBUILD mu-cite-8.1_p201202272330.ebuild 543 BLAKE2B 76d89b5bc1b895fa73a8979e23b2b76280f6a39821a0c2b06175643111eec9abbf2430f0f7042e06cf2c75405c64ac7009ea8748a3351a053bdc130d76716067 SHA512 097432f31951a446abf5fe1f60d5925189737fcfbeb11464b6524836986620675ac97552a565810d4a7a572d17b6ae41cf5fb14f2b08174cf2f8914ffa277a72
 EBUILD mu-cite-8.1_p201808232348.ebuild 616 BLAKE2B 79e1b6002f78a7cff3efe8eae072563b91fb37c625e378280a9a513913db86bda87e8e50fdc93a00115a166b218f1da5a52da657a7d37667b0ba1392788d68cc SHA512 a04ea2f2776bbd7bd3bbbe05df93baec2f19bbe4476eea309f65991dffd945be6996f82cb8eea513000a977ec7ee5481cb27f6d9beaeb9e5afbc8f16dd350ed2
 MISC metadata.xml 461 BLAKE2B e3af9dfa48edf30c53472e5fa450b7d9d22668845dca046060a5bc3ad14dc6e8d5d3c03b4b4102d65b6cd8d302f783d6e7a62c7d2a359beb7cd6a07ea6d19720 SHA512 0128a20ae81bc9256b1aba5f432a55b2004dec6bdebfac5c2e169c6d23962886fe3da889abdcac1e5dfd84020cf3d95e36c25710fe1323f2692c1e924ad5b241
diff --git a/app-emacs/mu-cite/mu-cite-8.1_p201202272330.ebuild b/app-emacs/mu-cite/mu-cite-8.1_p201202272330.ebuild
deleted file mode 100644
index 0bf16aaea004..000000000000
--- a/app-emacs/mu-cite/mu-cite-8.1_p201202272330.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-MY_P="${PN}-${PV#*_p}"
-DESCRIPTION="Message citation utilities for emacsen"
-HOMEPAGE="http://www.jpl.org/elips/mu/"
-SRC_URI="http://www.jpl.org/elips/mu/snapshots/${MY_P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="app-emacs/apel
-	app-emacs/flim"
-DEPEND="${RDEPEND}"
-
-SITEFILE="50${PN}-gentoo.el"
-DOCS="ChangeLog NEWS README.en"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	emake EMACS=emacs
-}
diff --git a/app-emacs/multiple-cursors/Manifest b/app-emacs/multiple-cursors/Manifest
index 9ab775103cc7..42a59343e667 100644
--- a/app-emacs/multiple-cursors/Manifest
+++ b/app-emacs/multiple-cursors/Manifest
@@ -1,6 +1,4 @@
 AUX 50multiple-cursors-gentoo.el 80 BLAKE2B 90614e49e4e09b48bc2e34a9f7f2a33fdf3090ede9af2f48d297a88c9531031b4aa73213659780f3b1de49d18da7c35f5c78a9ec4393d85cd92c607f781d89ac SHA512 3c5a03d2cd864fdaa43bdbce47884b189abac77ba99cf57cfe2a6bc2c65cf3f32d45739832ec30613d884a01a08547cb80a028eb6b9a93329ea690ef57230fa7
-DIST multiple-cursors-1.3.0.tar.gz 25880 BLAKE2B b0578299fc1e700ec627f1cdcf153e47d0c32df3374db2bad0d88a76933b0253de61f4670ff155fe6cb7d92d43204d47ffd44d8b90f093fee64a18ee3085049b SHA512 2d321f9016b78aeb37507071756781c84b576a0fbefa385474c8c6287c989412b72b83dfdbe79bc0da1485893ea01952b6e0d392573386338db9e8728f722259
 DIST multiple-cursors-1.4.0.tar.gz 30152 BLAKE2B a63c09afb464cd208296e359f59babbc9c9fdace1d5261386bac4ab44f7896bfe2eae869e49c2c094b80af453bd50936c7feeb42e530536d148154c879ece90c SHA512 070121365380db3dc77749ab6f0da2f034a979cacc07a11e805f1da81ae70fccff1abb4a0353fa30670b3a8d686ebd25e501d13fcc42d765f5c015a83c62146f
-EBUILD multiple-cursors-1.3.0.ebuild 504 BLAKE2B 1f1f6ac2d7cce30dca0e271a0d757e4b81a88348dc7cd6e78d7fa7bf6c74645a6c9b43ec22f574aa625dec56032561b28784ed2faac7300b35bdcac1e303271b SHA512 251e358812df5ae3a05d9a3081ebad1d02ae7386693b39ed37e417268cb7181d067b767c763b6cf8ec9ed8e4702171bd42260b03fa96147550d5afc26bc1da77
 EBUILD multiple-cursors-1.4.0.ebuild 501 BLAKE2B 40a320a6a07121c5c066217ea8df04ba25a09ad82b0aee14d4011401395f3c2fd64d57479d28ed9d57851f1bdab0e2883ec5a872aeb478103e828a83e512d717 SHA512 f81a1935720abe40297b0c5513139eff830e4c4b5fc4763b23aafe7c2289444f8c319737678eaa2d97b4b1c6f45cd7158588d7ce9486e87121de933456e80fdb
 MISC metadata.xml 372 BLAKE2B 9e5668003abdd4f8688521568299c96a139226432f1d35248056ca624bc558feb833c20a2ade9a946eb7436eabafc1b4c289995c192d543d3f48e4066c6245c0 SHA512 392d223ae60d3b40f0bd46ec369e53753f72872352885201b2b7a83262d0ec73c584746dd110f69b86c72e81415d47af9e72fd277157135565c953b11915fb27
diff --git a/app-emacs/nxml-libvirt-schemas/Manifest b/app-emacs/nxml-libvirt-schemas/Manifest
index 8bf73fb8a699..2d8a74d9bdd8 100644
--- a/app-emacs/nxml-libvirt-schemas/Manifest
+++ b/app-emacs/nxml-libvirt-schemas/Manifest
@@ -2,5 +2,7 @@ AUX 60nxml-libvirt-schemas-gentoo.el 206 BLAKE2B ae9d1fe1da9c86d14796c09597ca34b
 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-5.8.0.ebuild b/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-5.8.0.ebuild
new file mode 100644
index 000000000000..ef9c1c674a74
--- /dev/null
+++ b/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-5.8.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+MY_P="libvirt-${PV}"
+DESCRIPTION="Extension for nxml-mode with libvirt schemas"
+HOMEPAGE="http://www.libvirt.org/"
+SRC_URI="http://libvirt.org/sources/${MY_P}.tar.xz"
+
+# 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"
+RESTRICT="test"
+
+# 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.
+BDEPEND="app-text/trang"
+
+SITEFILE="60${PN}-gentoo.el"
+S="${WORKDIR}/${MY_P%-rc*}"
+
+src_compile() {
+	emake -C docs/schemas -f "${FILESDIR}"/Makefile-trang
+}
+
+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 c6ea35d94eb5..b328b496daa1 100644
--- a/app-emacs/ocaml-mode/Manifest
+++ b/app-emacs/ocaml-mode/Manifest
@@ -1,6 +1,6 @@
 AUX 50ocaml-mode-gentoo-3.12.1.el 499 BLAKE2B 30d49a4e43fbf4fac02f4a2dd8a9fe7c3aeea623836330e3ed0f8921cc96a02d087f35a32a93f6e404392a1f915539799d1a5c8168b06cb1d8ab76ea0ac6b8fa SHA512 0be69a30c07caeff818e4d6fb0147e18855e88a3bb6a6e876b170edddb32382c0bd19ca960836d8442eecd00e78be09cba7de08030420645c2ef1ba5d9198524
-DIST ocaml-3.12.1.tar.bz2 2949124 BLAKE2B 8814927411cb9b604c78f44d172fd1f8b3d5f6009a1e722d442b8e49709778824cd6d1341e8129454d49000ea4d1234c533ee72cf0fa8fa84ee3b4d664177c4a SHA512 cbb050aabcbe19a4aa070d6cb74f3774cb136692dfd9433ca977f0f9520ad2f583b6cfb1a9cedfedc92e7dc794ac4a869e20aa5a67a4739002feb290435dc7e7
 DIST ocaml-4.00.1.tar.bz2 2762205 BLAKE2B f9a788eef67158b036ee551360410921beab87f1b01684ca17d5cb87a30cc0cd475ca640fcb284ad88d9054927ae0fd397921574cc9098956d60e80915d4cbb4 SHA512 77899430706394af558666361b152d47df3a3e21831059875f8b317d0ff9d1a010177bf1e5851e522e086c20768e92c71344aa53eda0ce003f278752870ab5da
-EBUILD ocaml-mode-3.12.1-r1.ebuild 456 BLAKE2B 362a03586e4a0018cfb94f758904f79dc8b5f3b898390160a0726e7b42d4d4914978741b10ce01a1cee10a51d1a98af4eca4bc042d0fa42d43bd5e88ee29e8b3 SHA512 b327092fd9f16382283b964e3ef31ea184e2fea42cd38d9421984a32fba54985e0496bdf62d0a1ba7fc41f1a3a4ce2ca42885b21fad3d88c84ec050b029d0c19
+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
diff --git a/app-emacs/ocaml-mode/ocaml-mode-3.12.1-r1.ebuild b/app-emacs/ocaml-mode/ocaml-mode-3.12.1-r1.ebuild
deleted file mode 100644
index c29d106219ca..000000000000
--- a/app-emacs/ocaml-mode/ocaml-mode-3.12.1-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# 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 hppa ia64 ppc ppc64 sparc x86"
-
-S="${WORKDIR}/${MY_P}/emacs"
-SITEFILE="50${PN}-gentoo-${PV}.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
new file mode 100644
index 000000000000..b3a90a28f87f
--- /dev/null
+++ b/app-emacs/ocaml-mode/ocaml-mode-4.05.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+MY_P=${P/-mode/}
+DESCRIPTION="Emacs mode for OCaml"
+HOMEPAGE="https://ocaml.org/"
+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"
+
+S="${WORKDIR}/${MY_P}/emacs"
+SITEFILE="50${PN}-gentoo-3.12.1.el"
+DOCS="README README.itz"
diff --git a/app-emacs/po-mode/Manifest b/app-emacs/po-mode/Manifest
index 7c913f527a07..fb73bd375eb2 100644
--- a/app-emacs/po-mode/Manifest
+++ b/app-emacs/po-mode/Manifest
@@ -1,8 +1,8 @@
 AUX 50po-mode-gentoo.el 373 BLAKE2B dedf37969c42ac3dbeb4b4cb01af0f9ee79e40aad8586831503bebc1192a110fbecdc0bba339ebe6d7f89a8509e4f6df52f98f7563a90f31d73af279aad81e66 SHA512 48c371afe3f1a1f033ea20cb0a60bc700414108f7dc1f235e62423bda9b94373e49da9bdd3ab76e119b7b6c1b5f0a7601d36ce2710dd23b3de46557cf7d9cd8d
 DIST gettext-0.19.3.tar.gz 17414357 BLAKE2B b2b2085e8ee7339c6b6509807a9601163498edd9265f2ec899337943bd2c1394a905b01e8a9f44e7a57985cb11f4fdfe302ff9320dacf1da78fdc4fdb5e30fd9 SHA512 2ec02065b376cf9ec2b9d32328a7181d292ac940356a710f785450f37e03a8513e07d4b981824374671cfa2f60024e4649fc89ad79ee0adda87a8b9b63ad28e8
-DIST gettext-0.19.4.tar.gz 17717034 BLAKE2B 2022ed7963ff01c842c345f13c33ea7cc7221629c6beaa73cee7af68f709c6b8824d1e93ef919318b5d0a63286821efe2fdffbbdd709edf25a1f25be8909222d SHA512 274e00fe0149468e3073562f8f3b292597e9dbd82dfe8d068e4a1983914d25b603bb26f3fa4aa10e9fcd65826e3552c1871218342270927481e95eb64288ad97
 DIST gettext-0.19.8.1.tar.gz 19704011 BLAKE2B 17dc7aad338a26d71b818fea51e46a47dccf14744ee575ce86b591becaea402e36d64dc018e1a84113c356122ffef367cf2fa424e51ebc9720350040b4960091 SHA512 073042fa2dc48804c58e76f036130a669e19612c25427b0ab14d0b366b549a63751bf3af03bfd0745d7c4f72497a4b2aab26a3cc6de83189ce111679073878e1
+DIST gettext-0.20.1.tar.gz 23267473 BLAKE2B 34e776b985c7db105f8029e0f3400aa645ff6843cd35f778d48450368a31218ddcf590fbc7fd2d10f716b63094d6a15bf40b358e8a6f498d450d2420e7e7a5f2 SHA512 af6d74986da285df0bdd59524bdf01bb12db448e5ea659dda3b60b660c4a9063c80e8c74cc8751334e065e98348ee0db0079e43c67d485a15e86ae236115fe06
 EBUILD po-mode-0.19.3.ebuild 518 BLAKE2B 7fd00abaa49fdf402d9084b7449f6ba5f409dc8dd1113aa4dda96c7ae668a6b6ad9170dbe51b32e941b6d64fba9614347f9d67bfe5b1ff1d8f2328eac11ab4f1 SHA512 090475f391645e0ff024ee879ccaf00e9ed4dc4df7a3776b64963b046fc1ba3feb6e8c30a2b3c4cd3cecc6249a58e4e3cb44f0bdcb4211129556a47cc87d4cfc
-EBUILD po-mode-0.19.4.ebuild 525 BLAKE2B 98fabec6141e16d740fa6b51f3d638e283f4b7221dfb06a7a41c55e4eecefde7b3a20becb50e41ad487ae7867ca8af193319759a79d5f7d8084c93e81be6f6a8 SHA512 372688078ae134944da85164ea4db3301c9064f98957db95ff9446ac24584a52d36b5a0020dadd8a532f53dc3fb300d3f303851f65c87534e945e5a6a0fb22e0
-EBUILD po-mode-0.19.8.1.ebuild 531 BLAKE2B 10163db5b6e2c1c5c9f4d1dd2cc1176f283c5b751d3b2b8c12e347d0b07d310788cc7f694b6a6e569ba5eec50c2d0f1ec42ae7e6ffbb74468fa356e2b5e5eef0 SHA512 630eef338683173e443dc59665f75c6ca675fa492da35aa9b008ab199190cbe84d605c2bf04d186d4ea6a5719f1116d648b9f47d849d24f373895aca3525d979
+EBUILD po-mode-0.19.8.1.ebuild 522 BLAKE2B a49869fee1872f2233c1d0b5617d05c19f2a39a83d6079305a8122565787da2812085917210c974530bc9a3150856fe1d9d3eb143d9e6648b875d9ca2975da50 SHA512 28eacb702c9ae8f395e3bba5dce7351464a834ea398615201f17919cf0e306b48d37b84674696400f36614a33e376f703e9347e4583498b2255efd25613f8742
+EBUILD po-mode-0.20.1.ebuild 529 BLAKE2B 57fda5ef7e064ad00837f0cac2f26e1af3a43365b68a050b2a9ee534b7913bbdf40cf2f22a482846ec9b7dbf757d74c4140f291e62f1d9bcda818e8eeb8ba0fb SHA512 2dd12994c3b6c7518575f1b83302948f44f139264291ca2347385d2a0b98e5b4be1ec6a30cb746fdbb760a1972f3f98f4ed435abbe898f13adea7443c193fc1f
 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
index 4a74f6455d7a..bfaa6d2429f6 100644
--- a/app-emacs/po-mode/po-mode-0.19.8.1.ebuild
+++ b/app-emacs/po-mode/po-mode-0.19.8.1.ebuild
@@ -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
@@ -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 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 S="${WORKDIR}/gettext-${PV}/gettext-tools/misc"
 ELISP_REMOVE="start-po.el"
diff --git a/app-emacs/po-mode/po-mode-0.19.4.ebuild b/app-emacs/po-mode/po-mode-0.20.1.ebuild
index cc42a87c2afd..b74cb880bcb0 100644
--- a/app-emacs/po-mode/po-mode-0.19.4.ebuild
+++ b/app-emacs/po-mode/po-mode-0.20.1.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=5
+EAPI=7
 
 inherit elisp
 
@@ -11,8 +11,8 @@ SRC_URI="mirror://gnu/gettext/gettext-${PV}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 
-S="${WORKDIR}/gettext-${PV}/gettext-tools/misc"
+S="${WORKDIR}/gettext-${PV}/gettext-tools/emacs"
 ELISP_REMOVE="start-po.el"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/psgml/Manifest b/app-emacs/psgml/Manifest
index 44ac89587781..61ebb5ba2623 100644
--- a/app-emacs/psgml/Manifest
+++ b/app-emacs/psgml/Manifest
@@ -1,4 +1,6 @@
 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
-MISC metadata.xml 355 BLAKE2B 8bf344b65a3b56830144a7413adbe5424f6cf1e043997982a961bd68c33538a6db10e42fb244150b7d77012ce3965cfbebe3b2dca3ccf39347c3391752cddc45 SHA512 8bffed60efe4fdef36e4abe3d9a7bce5617ce7da934a072cb52a26d8a935d0a78ddf8bc562033d59724bf0845f6ca60794ab54aa7ea76a755d4578d08f967ef4
+EBUILD psgml-1.4.1.ebuild 825 BLAKE2B 618fcafa898fdbb6a91c1ff37045c740c6670cc32813b59c16e1fd808eac4704f1b49d7b4279b1cc895acb0956a45cf07b83a7de8d54992a73b955900704e321 SHA512 5335db6119f22a29eefd9b21eabd5de4b21c5c145f39e8bad057fe9c6f103d36d1ffe0ad7aeec53081c1bf5526b5a69e038ad5b3075e53a2f6361cda27c19daf
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/psgml/metadata.xml b/app-emacs/psgml/metadata.xml
index e3cf9243cef1..c918cdef9591 100644
--- a/app-emacs/psgml/metadata.xml
+++ b/app-emacs/psgml/metadata.xml
@@ -6,7 +6,4 @@
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
 <stabilize-allarches/>
-<upstream>
-  <remote-id type="sourceforge">psgml</remote-id>
-</upstream>
 </pkgmetadata>
diff --git a/app-emacs/psgml/psgml-1.4.1.ebuild b/app-emacs/psgml/psgml-1.4.1.ebuild
new file mode 100644
index 000000000000..465c0edee1d9
--- /dev/null
+++ b/app-emacs/psgml/psgml-1.4.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="A GNU Emacs Major Mode for editing SGML and XML coded documents"
+HOMEPAGE="https://www.emacswiki.org/emacs/PsgmlMode"
+# taken from https://marmalade-repo.org/packages/${P}.tar
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2+ Texinfo-manual"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="app-text/openjade"
+
+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/pymacs/Manifest b/app-emacs/pymacs/Manifest
index 828f22612724..14e536315ff7 100644
--- a/app-emacs/pymacs/Manifest
+++ b/app-emacs/pymacs/Manifest
@@ -1,4 +1,6 @@
 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
-MISC metadata.xml 434 BLAKE2B 11fe7bc8c9fa32f4762237f30e93ae5281b73b10a99e389d6cad284f6ba649b7f732fd07aefec8f50d7175af301e021ad34cfac65adfbfb7dc6133184725cbb2 SHA512 899211703ed0824e0b2dd26018e46854ab970d76ee12f169b99bc3a49f9e3bfb1d42757c35ac1ac21268b90b8536737aab61cf9dd4f7297b4e5360f1fe73f821
+EBUILD pymacs-0.26.ebuild 1348 BLAKE2B fb0d319688d2ffe7128cc527613b9b3c87c7b092af5e5170cf5fd5a193da136d45b9edfb13540fd92ee653ee0ba8286e0faea182c0a3d2b4fc5a416fd16a2ba0 SHA512 1f7c2b9a85eb7135ca64eef1b26d2d22a41268b6ca254c2e216c5c72e5369ae9bc68d0eff4bb4844a1036022f79c902316887e47d1fa4493f0dc9916ddcb08df
+MISC metadata.xml 435 BLAKE2B 10ae4a8b61dfb10339404f38e37cafa1b66737a8f593bc4ba1c626b9d884ebb19dca555dbdf24b1418fec711f6b73865046cf50d58990980ab5115b1755ddd24 SHA512 bb1bdeb6695093fb0788f956059a6e081b98d8b769e2d336057954e85006dac277b756206f83565d52c2473dc45f3afb1087850e38843103f0ef7581a634eec0
diff --git a/app-emacs/pymacs/metadata.xml b/app-emacs/pymacs/metadata.xml
index f928f5ea6cdb..a5988115fbe7 100644
--- a/app-emacs/pymacs/metadata.xml
+++ b/app-emacs/pymacs/metadata.xml
@@ -10,6 +10,6 @@
   <name>Python</name>
 </maintainer>
 <upstream>
-  <remote-id type="github">pinard/Pymacs</remote-id>
+  <remote-id type="github">dgentry/Pymacs</remote-id>
 </upstream>
 </pkgmetadata>
diff --git a/app-emacs/pymacs/pymacs-0.26.ebuild b/app-emacs/pymacs/pymacs-0.26.ebuild
new file mode 100644
index 000000000000..77c813340aeb
--- /dev/null
+++ b/app-emacs/pymacs/pymacs-0.26.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+inherit elisp distutils-r1
+
+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/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"
+#IUSE="doc"
+
+#BDEPEND="doc? (
+#		>=dev-python/docutils-0.7
+#		virtual/latex-base
+#	)"
+
+S="${WORKDIR}/${P^}"
+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
+	# "pdflatex pymacs.tex" fails with "undefined control sequence"
+	#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/python-mode/Manifest b/app-emacs/python-mode/Manifest
index ae821011a679..2583acf446d1 100644
--- a/app-emacs/python-mode/Manifest
+++ b/app-emacs/python-mode/Manifest
@@ -1,6 +1,4 @@
 AUX 50python-mode-gentoo.el 541 BLAKE2B a1657fc49011246ba1cfed1cd8993a222c4932516c6a8e3be4fcc53200510ad8e9a3e1072c2bce641cded4be1581a9c950991d6864c2136668ddba4de8f2429d SHA512 8e1c2c68409c48f3e7c2ae36128380fd5358a12470db571ffa22b1c9cb11730a2f2a84ec66f23c064e32b504c8ae002033e77640d85e11577c50e31462cd5274
-DIST python-mode.el-6.1.2.tar.gz 330107 BLAKE2B f04df366ee3e47921f5635472ac22412066d3d97e0f4d2627993b1b6173321687a575abc8700907a9c63829704792505681196e0786e7dc39b9ecbab7562ef9e SHA512 967ad7fdb3503c2dc37df79ba9f45ed7627a5b8e287cae9e8963a259a6568282c16d509e873c7d8b97e4acaafbd71dcec00e5ac71ed695b20ecddca5da20ba96
 DIST python-mode.el-6.2.3.tar.gz 314461 BLAKE2B 3bd71b47de1284d59db61f829e3419f2fb10e226900392d903256f31ad90f47317b7bde4cde1cf7d86518f9c706d9c844b208a9e2469a41037252a63f7bc1ba6 SHA512 4aeb33d4054d582cd2a3f4834472c7d0cb3fe5e12e10f5117dcbcd90ec2ca490964c774918c83697f283c68e57766c3c67d3853ddbaa3408777fdafc7f2674f2
-EBUILD python-mode-6.1.2.ebuild 689 BLAKE2B 43532cd13a8619adf8f22de41b266e6d446089ba98b00c92facc72938b3717587db6a7efb3d9c72f85c1930d8f13b4c288946ea34d6a01895cb2de5657b6a69f SHA512 1356dba65466b1225ee88198c0c33c2d731fe68953e85eabac527a46675af71a4c6334dd0eca612acccadccbc3b179f544ad44b459b58cf7ab9716f7af514f75
-EBUILD python-mode-6.2.3.ebuild 700 BLAKE2B b81d6c9793dfa06db1874e798068aeda2fb574ae59b4b8bae6ae3c36bbbb00fa3731d2c04ba44669833c47804be8ad1c0953365e3042dc7b3eefb32b0069e6ba SHA512 d4582861a2a219232e7bcb4c1925fadbc70ff0f35c7893d543a5f4315a6a6039016509c22c17859c241ab9e58c85ac9ea557388270f32f2b63d112143343330c
+EBUILD python-mode-6.2.3.ebuild 699 BLAKE2B ac7c7c584dcd99f546428eb579279c7221b250efef2a21e2fc6568bb28615f093a3319b2f61452a50ff3924c2fb3795f44643b9a3dbff5584bb3c3c213953704 SHA512 d76dfd2058a56756a3a251d15195255eb8c6bfee156b18c30fd867f437ae31ef1a1d9ea2ade84e12f121942b329fd6e5db95b944143f6588c262518398f4fe25
 MISC metadata.xml 359 BLAKE2B 6f98624b4484b28ec87e9d4de4ae43b729db5c5c76bf9e480f86eca25423e8cc8a201762b8f938b5b012765e9258d1752fe01a847e3cd69539aa25ba0cdf9394 SHA512 a61b3fe8afa6c99edce3978dac6b52f37be06c7fbd57166697d14e9d4d0b5e7212c3bb1988c47aeeff4356cd841ca20a4605da0b5bed487acca4e2375994b0bb
diff --git a/app-emacs/python-mode/python-mode-6.1.2.ebuild b/app-emacs/python-mode/python-mode-6.1.2.ebuild
deleted file mode 100644
index 47f3492c621f..000000000000
--- a/app-emacs/python-mode/python-mode-6.1.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit readme.gentoo elisp
-
-MY_P="${PN}.el-${PV}"
-DESCRIPTION="An Emacs major mode for editing Python source"
-HOMEPAGE="https://launchpad.net/python-mode"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${MY_P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-S="${WORKDIR}/${MY_P}"
-SITEFILE="50${PN}-gentoo.el"
-DOCS="NEWS README"
-DOC_CONTENTS="Note that doctest and pymacs are in their own packages,
-	app-emacs/doctest-mode and app-emacs/pymacs, respectively."
diff --git a/app-emacs/python-mode/python-mode-6.2.3.ebuild b/app-emacs/python-mode/python-mode-6.2.3.ebuild
index 7d0746d5d961..f5062acbe493 100644
--- a/app-emacs/python-mode/python-mode-6.2.3.ebuild
+++ b/app-emacs/python-mode/python-mode-6.2.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${MY_P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ia64 ppc ppc64 ~s390 ~sh x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 S="${WORKDIR}/${MY_P}"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/quack/Manifest b/app-emacs/quack/Manifest
index 98354b0d2188..61e319ea376a 100644
--- a/app-emacs/quack/Manifest
+++ b/app-emacs/quack/Manifest
@@ -1,4 +1,6 @@
 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.48.ebuild b/app-emacs/quack/quack-0.48.ebuild
new file mode 100644
index 000000000000..d8fc89076bfa
--- /dev/null
+++ b/app-emacs/quack/quack-0.48.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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/quilt-el/Manifest b/app-emacs/quilt-el/Manifest
index 9acd97a9d199..27800ee9ea98 100644
--- a/app-emacs/quilt-el/Manifest
+++ b/app-emacs/quilt-el/Manifest
@@ -1,8 +1,5 @@
 AUX 50quilt-el-gentoo.el 295 BLAKE2B 2179c4c7635fc79dcfc5444f37c2c38d35468a9c11742f3a162f78dc49c33abe605cb68642b858b0ff6221180f74555f0f5a5833740e757aadd0ad903325de49 SHA512 b14f5b3db3ec93cdb0b95b64295dd5d7d6561db4b71ee691001cab5678922dd2977716f023c8b046e63e2ff6dcc25d5f5dd1dce9571016ac16c86b44529d9417
 AUX quilt-el-0.45.4-header-window.patch 297 BLAKE2B 87d5157dcf03d8975afd0b72d223c2a2133039aecafd9f283ec2729e440fee56719d1ca02be7565c22bc3e1c887ac57677dd771ed4b4d11681e1d21315036bc3 SHA512 fe12a4a4326bf586441b838dbc52bf8bd32fe639208ce5078627f24f13a5e49547ac1361117f8fc9578689d1b953ba2724981b9e563ab14192cdc1d78c59fff5
-AUX quilt-el-0.48.0-tramp-recursion.patch 363 BLAKE2B ca26afa6738d51efd007d46ffb78414d4ae296626905db1ca6b65b09d8946f1e09536a04f4153650763478f4054f07a8dc58e171ed4e613d1a259afcf4214fb1 SHA512 b4369142d70543bbb8139b4f6d8b8c8c13bf2bbd93d1bc87de690c93de485d9000918c6fe7278a32472b2a9afb495f3a9c639434a3edd3489c6cf2bd5f99a5fe
 DIST quilt-0.66.tar.gz 413069 BLAKE2B 41201d54cb26d4761413365fe19b65bd6971ada1e69198d2edbc346df6a3060ff3af4d80551d68ab4ffe003183bc0a28515ce1d070db95f2b1a04a0680ac4fb2 SHA512 c2cb75c0937612e1e0da25b713acf629b6b5aacbd8254d8bd17220b63c7b8ca996cd9d0315a32d67d54a4a7dc01b212cdda33afaacf3db063da757f1973306f4
-DIST quilt-el-0.48.0.tar.gz 13147 BLAKE2B 595e7d12c24095df3c0d12de607b4e43e36345b53f9d89e6ea6ea781ed25f893d5100e3a023b4f5bc0aee11dcf93a7ef3862fabe28c8eda98a43dce634969444 SHA512 0a198ef0f8354c927c4527bb7a3e99fd6d12f17cbe65c736341c527de440d144581205337163912ce04f83749c31833221cc4153d5736ffec060ad4ade73c694
-EBUILD quilt-el-0.48.0.ebuild 524 BLAKE2B c09278c3efca977158d8a323911947439c3a7812b2b82d2f4418666c91cf3a56d3febf3e1587c72a602f7fe361233387991c7dfbfa51311b57400085dc190067 SHA512 f9a65f053573d5f561b82728701b09588aa87e42114da625abbacfa53a49d001113a04b122de67b7cc39a295bab9efcab3597d95329826ef1509fdd85e11a879
-EBUILD quilt-el-0.66.ebuild 560 BLAKE2B 6d98209efd1894a43f876a24f1066b56544a03071ceb4b172e77256f72664251e926eeb1f7fb9d54e7c346f1277627fa78186384e73da5f81a8f74eb8e872d71 SHA512 e54e6fc757f6d10aaf235b32cdb797fa370ddaaad3a1189e00f6abd3bdbdbcd62590a29c5755da9245270589282843a74d621874c86044e96180e02702e9520a
+EBUILD quilt-el-0.66.ebuild 558 BLAKE2B e479ad695442c6633cc5bf64ccedf5f4ffb9514a662d47df5841243b04bb294c09bc3f41b48c2ddc2fb8a52092c8fc03dc2e7642346d6fc817de91eb5ca8d05d SHA512 f979e9ff5a813734739bf76e73101df1b7bdcbae7c5d861c8ea4f8cafe434914b2ffca4fb8dc5401ef5bfed9d82746cf82584eeca6bc14aab2da5443a44bd7b9
 MISC metadata.xml 657 BLAKE2B f42a9f750c0914dae5ebf3cf8798857d8bb2b8135597470991dfe3e3644716e47d3079d77754305be689a337609e719ba277e5e0a4119bed5e2ae2272147bebd SHA512 d7e9d85957ad96345d3394977312e5ffbb37c61f7529b7b179c2dfcb1e41208089a469fc5db8760f0f62a6cdb5ddf801e11673d126711569fc2a61bfd8a04e4b
diff --git a/app-emacs/quilt-el/files/quilt-el-0.48.0-tramp-recursion.patch b/app-emacs/quilt-el/files/quilt-el-0.48.0-tramp-recursion.patch
deleted file mode 100644
index aa1bf5c97e8d..000000000000
--- a/app-emacs/quilt-el/files/quilt-el-0.48.0-tramp-recursion.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- quilt-el-0.48.0-orig/quilt.el
-+++ quilt-el-0.48.0/quilt.el
-@@ -49,7 +49,7 @@
- 
- (defun quilt-find-dir (fn)
-   "Return the top level dir of quilt from FN."
--  (if (or (not fn) (equal fn "/"))
-+  (if (or (not fn) (equal fn (file-name-directory fn)))
-       nil
-     (let ((d (file-name-directory fn)))
-       (if (file-accessible-directory-p (concat d "/.pc"))
diff --git a/app-emacs/quilt-el/quilt-el-0.48.0.ebuild b/app-emacs/quilt-el/quilt-el-0.48.0.ebuild
deleted file mode 100644
index 3cbadd1d144d..000000000000
--- a/app-emacs/quilt-el/quilt-el-0.48.0.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 elisp eutils
-
-DESCRIPTION="Quilt mode for Emacs"
-HOMEPAGE="http://satoru-takeuchi.org/dev/quilt-el/"
-SRC_URI="http://satoru-takeuchi.org/dev/${PN}/download/${P}.tar.gz"
-
-LICENSE="GPL-1+"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86"
-
-RDEPEND="dev-util/quilt"
-
-ELISP_PATCHES="${P}-tramp-recursion.patch
-	${PN}-0.45.4-header-window.patch"
-SITEFILE="50${PN}-gentoo.el"
-DOCS="README changelog"
diff --git a/app-emacs/quilt-el/quilt-el-0.66.ebuild b/app-emacs/quilt-el/quilt-el-0.66.ebuild
index e77ac516fb3d..cc5b4eed807b 100644
--- a/app-emacs/quilt-el/quilt-el-0.66.ebuild
+++ b/app-emacs/quilt-el/quilt-el-0.66.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://nongnu/quilt/${MY_P}.tar.gz"
 
 LICENSE="GPL-1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86"
 
 RDEPEND="dev-util/quilt"
 
diff --git a/app-emacs/revive/Manifest b/app-emacs/revive/Manifest
index b97cf6d9174b..d214e0a521eb 100644
--- a/app-emacs/revive/Manifest
+++ b/app-emacs/revive/Manifest
@@ -1,4 +1,4 @@
-AUX 50revive-gentoo.el 70 BLAKE2B 9f95d0e1817cdded2bb5c4033ab5e0d85dac569150691534a0c0f7ce9ae484a51523a97f27870106d6867e8ff0e6f6ce7e1454b62956478b170cdd8de704c11c SHA512 500ca2eb2c81fdf53a3f169885631b835d46bb6aabc640c337a99d6f5cd33b512e76940a9e80c7ba8cb06591ba395db9c2195532a2e9d4b2767a163727d6584e
-DIST revive-2.23.el.xz 9960 BLAKE2B c5955137e7f152691b5dde888536a61dcf2b1ceb3045da9ba861f2b10d467942d3581ca706a9041f7c9bf7092a88f7fe4b6fd8f1dc19ed303350f1bf581439cb SHA512 6eccd93e217bdb6d6f78b95c5b620f069c70e87deb5d9ddfdb30c01edafd1ea123eb9d2943e0143062e8db4423cf30bf9028e51cbb1519e67e9210b2dc282128
-EBUILD revive-2.23.ebuild 478 BLAKE2B d4a540a8bab90904d91bab0c00c64ca31efc678de28a6425f0d55d8254cedd4b5ec12f9eb4174787da25b1228d6ac3de4c3329eb8d0459f9a4e3fec814a57c05 SHA512 11f7581b2b7ed57e551198478b5a2bc7074a8ace16847de6e1614322452e4bac4403ffba4bf8ee0050051b9a50223664a18e95a6191d16a950821bacead77620
-MISC metadata.xml 292 BLAKE2B 046265ce3ff94f04bba9b4b344d852203657df8dd300f30620df260bad1c56b3c23a8c48d073f70f571f733af9a7c034922e0465878028ee8f748060a6816ec6 SHA512 f0115ae686d3003f4264968d3aeb0b054830f87f35378e15e205a729d591c8697507d3c76ead9e1f0bab1f1f66a3fda108322dbcec7b857a37000511d1dd17df
+AUX 50revive-gentoo-2.24.el 188 BLAKE2B 599d33f239a40bb0c9f3f812b35e2a75c1d1aa92e92427cdbb97de2b93f886cb53b2fe3da11f2a85a773ae3e33a46f0ffbb4ba095e4b9d3bffc53efcdf26ada7 SHA512 810579816bb08a6bfe3c33197883584a926ac0f30d69dfc8b3e9dc6f09903c60f59e0ca8ca38d31c3297fe5bf97a01ee27e028de5afdd6256ac2bfab5bb0b803
+DIST revive-2.24.el.xz 10028 BLAKE2B 4def70bce879e5efc42e6e7ce77353b86bd74c6c17b40c29add3af16af114b8c6f414b1a74758a4b5d856a6cf37590ec6fd4181ba5c95b176a36716bee9a810d SHA512 ce8b0860594420ae1270a5ec8b3d21b58f630206707d08e56aa3c22d1ad41b8b25cb96b1e5cff93cb44b250e687a6d8f96cf1cbf3d75bf5cfc2c2892d0ab8562
+EBUILD revive-2.24.ebuild 416 BLAKE2B 2932c9061431ee5c60a0ea61b38b94621292cb0498e7c14200edc99ddd0b067d80614f35a0168e5e8f07a075a24c0b86cfbf12368378751e7099e9daa4f503f2 SHA512 aac553819741c6e094bbe61de8f10fd445366b07123b2098885b28d01f1e937be3c8a006177e0ec105de7b0f42ee79c673991dec2a9c61335d2a966727ee88d5
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/revive/files/50revive-gentoo-2.24.el b/app-emacs/revive/files/50revive-gentoo-2.24.el
new file mode 100644
index 000000000000..2162c0550814
--- /dev/null
+++ b/app-emacs/revive/files/50revive-gentoo-2.24.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'save-current-configuration "revive" "Save status" t)
+(autoload 'resume "revive" "Resume Emacs" t)
+(autoload 'wipe "revive" "Wipe Emacs" t)
diff --git a/app-emacs/revive/metadata.xml b/app-emacs/revive/metadata.xml
index c6a53b949e75..c918cdef9591 100644
--- a/app-emacs/revive/metadata.xml
+++ b/app-emacs/revive/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>gnu-emacs@gentoo.org</email>
-    <name>Gentoo GNU Emacs project</name>
-  </maintainer>
-  <stabilize-allarches/>
+<maintainer type="project">
+  <email>gnu-emacs@gentoo.org</email>
+  <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-emacs/revive/revive-2.23.ebuild b/app-emacs/revive/revive-2.23.ebuild
deleted file mode 100644
index 056dfc59711b..000000000000
--- a/app-emacs/revive/revive-2.23.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="Resume Emacs"
-HOMEPAGE="http://www.gentei.org/~yuuji/software/"
-# taken from http://www.gentei.org/~yuuji/software/euc/revive.el
-SRC_URI="https://github.com/gavv/distfiles/raw/master/${P}.el.xz"
-
-LICENSE="yuuji"
-SLOT="0"
-KEYWORDS="~amd64"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	elisp-compile *.el
-	elisp-make-autoload-file
-}
diff --git a/app-emacs/revive/revive-2.24.ebuild b/app-emacs/revive/revive-2.24.ebuild
new file mode 100644
index 000000000000..304e89edf214
--- /dev/null
+++ b/app-emacs/revive/revive-2.24.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="Resume Emacs"
+HOMEPAGE="https://www.gentei.org/~yuuji/software/"
+# taken from https://www.gentei.org/~yuuji/software/euc/revive.el
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo-${PV}.el"
diff --git a/app-emacs/s/Manifest b/app-emacs/s/Manifest
index c24731ba766f..160858d93c52 100644
--- a/app-emacs/s/Manifest
+++ b/app-emacs/s/Manifest
@@ -1,6 +1,4 @@
 AUX 50s-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
-DIST s-1.11.0.tar.gz 46771 BLAKE2B 5cc93e4f52ea4fbb4d4b9b418a632e8bbc789f0f36b9486a4a1b36725e255f4a78d1924a420fd04af5c2bc50a652adfc83db3285569367749fe3712f2f0b560b SHA512 364fa7ea875e9be6db464a826c1259889b67d87817b41cff40ab7da80e0bfc3e27dcadadfd005a64a895ee92644c2dea82789bdf1b1fe538501c40f748455608
 DIST s-1.12.0.tar.gz 59193 BLAKE2B 89e4c453b6590116a4cc08fc1be73519e6c95586c1e80b37f37d7273232aa707cd030cf74106fdd7eb7f05fe8ebd04253592076573472c3927cc1428b4c029f8 SHA512 036369011295dfde7567ae8bd479be9635de479e8821c3fe117a6c3827bc83492bb91e6ac64d4b20b061da95690f5585ed58f116a2b8c877dceee22153c8c990
-EBUILD s-1.11.0.ebuild 432 BLAKE2B 293d3bbd4140bfe798b5329a111ff9f61feda85ca3e913947206e71fdf0d989f60ab7019ff4bb17b0e6d1a0d311a8ab8ce1d1b91c0c280c1df1e9e4e9a6b6131 SHA512 311ded1caa4563d85c897a05343239330131c70f8ebf8e2aa41161315813503f683365e1216280759d9c5928537054525a9220cfad321535edffcf53786dab03
 EBUILD s-1.12.0.ebuild 450 BLAKE2B 18ab861ac73c276bd269358e2a251ec37dd106c6462b6f7d9d585f8d0224ce57a59e45cb10d7b01fd578584990d31b63cbf1e98b2d4aa677eb9477f255778a0e SHA512 623e623c52cfdf4873030297b55fbbcc695253c2ea49e94d30a24a37c9487548ed760f863e3008bfbdcd80f73a35acc581e01cab3ae978c073a280dfd0d1f8f4
-MISC metadata.xml 373 BLAKE2B 7553de03e6dabdf1b74352b5876211bc8f0c5a6ba9e6e84334c3ca069e4521ae56dd28df2ab3574000cd54765486f23ebe13db350821605e77190344514aeef1 SHA512 05637c489e2e7b23f585775b41853c60a7bbf1607679545a129aefd3b125ead6740b26b9c8045fd5721ea67df88773da6deced9973ee346647aa570057d46338
+MISC metadata.xml 357 BLAKE2B 4f6c10ea601a32fa259207bea6bce0b1e4ca3f3146c38d3f62dece94166f89fdd3086dd392a3aa4715cc69bed310351e037126ffa1804bd230926a6f4b0e9f3f SHA512 6a0f752615b748f9d6eab740b541293dbcb5e1cb78435ce81ea2cf5809648d5b013b8b09e841fe6b5b504c565d631bc4c982a72730bcc16941517ff645a78c54
diff --git a/app-emacs/s/metadata.xml b/app-emacs/s/metadata.xml
index 7970411b7887..1686c08a71ec 100644
--- a/app-emacs/s/metadata.xml
+++ b/app-emacs/s/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>gnu-emacs@gentoo.org</email>
-    <name>Gentoo GNU Emacs project</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="github">magnars/s.el</remote-id>
-  </upstream>
+<maintainer type="project">
+  <email>gnu-emacs@gentoo.org</email>
+  <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
+<upstream>
+  <remote-id type="github">magnars/s.el</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-emacs/s/s-1.11.0.ebuild b/app-emacs/s/s-1.11.0.ebuild
deleted file mode 100644
index 4cc1a26c6e43..000000000000
--- a/app-emacs/s/s-1.11.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp
-
-DESCRIPTION="The long lost Emacs string manipulation library"
-HOMEPAGE="https://github.com/magnars/s.el"
-SRC_URI="https://github.com/magnars/s.el/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-
-S="${WORKDIR}/s.el-${PV}"
-SITEFILE="50${PN}-gentoo.el"
-DOCS="README.md"
diff --git a/app-emacs/scheme-complete/Manifest b/app-emacs/scheme-complete/Manifest
index 57fbf548f9e1..a059e36832d9 100644
--- a/app-emacs/scheme-complete/Manifest
+++ b/app-emacs/scheme-complete/Manifest
@@ -1,6 +1,4 @@
 AUX 60scheme-complete-gentoo.el 219 BLAKE2B bf71fafbd85fea667e895ca9dbb91761e4de7f3856d109f3fb1990788ff0f04b66c6edaa835ab681cbfb303d71ec60af8d04d0a1d7e3119c59799c7526903c52 SHA512 52314ed8b643c11fb7058ec5aa8e38e6b9b78800d6daa04b9bdbb9567b4b78c0c804277966c58d69199cab0e5e74d07d9728faab0ff95ba1af65eee7b04eccd2
-DIST scheme-complete-0.8.11.el.gz 38847 BLAKE2B 649a4124b0b643211c2132dc0e03e8930ea7f311637b3afd375d75e3aa33abaae888b1aa34744bf22d13738179d4048faa173ec8e5e0868f5789623fb7b11c0c SHA512 90fe73dfee3377f19eca2107deb6c9d88260b2097358416dab5ad839dabc0a0678b7254ab6dbdc058cae2be5feeaa4cba2f66296e49060df5251c1888044fea8
 DIST scheme-complete-0.9.8.el.gz 39923 BLAKE2B a7f08917823145db0b79a0d0dd2987c98eb6711acc861fa840759c6377045f7ae3edb9973bc285e468c4a20fff02ade6f638a340ba8694007ab37000f3870cd4 SHA512 b162d7766184e8e58d25b93c8e4154848963fa1c29e59f90a4741c6cfb44c217d9ae655d1106d05eb53cefab0c91bf7800b9387143268490d5f8f0685a9a2483
-EBUILD scheme-complete-0.8.11.ebuild 414 BLAKE2B 3512807aa52f7df587153ccf86c49a51baab980a2374550b863907505a571cb03c1e1fc3f5a04c45e73b2dddec4525f93e4facf85965d2a9ff8bfd3b1daab491 SHA512 79ccffb1cb1b037041ead7230f6c72dd65e9f81f5232a5749a43f6ef8f52f9bcd1ae35280873409c507bc1cc8d3462387d5942bf84f572f66c86eeceb5d9e692
 EBUILD scheme-complete-0.9.8.ebuild 411 BLAKE2B 9f6f7f6fee7c69bb7e6591a0d443ab4bc2a8aa21b5b89c0d3c9725af13367253ed2ba4f8e922dc858fa0d94ef88402681247857a5e34a5d68683837a42d305a8 SHA512 0cbd7161c9470423ec3908a2271dd35077ba259c2cf33d2a5093fdbdf049ec7242e959963ba15969553db57eb9f3d68c18548ca61f38c4e492353848b667a33e
 MISC metadata.xml 453 BLAKE2B eee674044e30666eb05beaa44a67781bbdf407fdddc1b175e30f7034a0dd6a3efa3c23361d23b47d7bd0076a17b01b8593deedb1524dfc1597b53f94b9ffa0fb SHA512 34268e756461ba2420bf3552b7f73caa9c95f5feef714b09615b295056598f4d7486771fda804320565cf99dd0ad36754d6b966b492f74347a53f4678e12c715
diff --git a/app-emacs/scheme-complete/scheme-complete-0.8.11.ebuild b/app-emacs/scheme-complete/scheme-complete-0.8.11.ebuild
deleted file mode 100644
index 91767fc5e96e..000000000000
--- a/app-emacs/scheme-complete/scheme-complete-0.8.11.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="Scheme tab-completion and word-completion for Emacs"
-HOMEPAGE="http://synthcode.com/"
-SRC_URI="http://synthcode.com/emacs/${P}.el.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
-
-SITEFILE="60${PN}-gentoo.el"
diff --git a/app-emacs/session/Manifest b/app-emacs/session/Manifest
index 3976713b03d8..99884e87adde 100644
--- a/app-emacs/session/Manifest
+++ b/app-emacs/session/Manifest
@@ -1,4 +1,6 @@
 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
 MISC metadata.xml 363 BLAKE2B 4957fd40e9e3161aad4fb8784651fb49b64a8befdb8734944a75a5b4d3987cec07fcb951582b871eb382cc4270dda606ea8df2b72cfd0856468813091efb0f41 SHA512 cb7cd548a5fb5f36b2b3bab8eee175bb21903d2baefa4230806812a6281a5860b31afe0bde4345cb4e1f3918601a795ee0906ef22e2fbd2f5f7a03618c7210d5
diff --git a/app-emacs/session/session-2.4b.ebuild b/app-emacs/session/session-2.4b.ebuild
new file mode 100644
index 000000000000..9e6d4b7720cb
--- /dev/null
+++ b/app-emacs/session/session-2.4b.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp readme.gentoo-r1
+
+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}"
+SITEFILE="50${PN}-gentoo.el"
+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/sml-mode/Manifest b/app-emacs/sml-mode/Manifest
index c52b6136accd..2c06f23fcb09 100644
--- a/app-emacs/sml-mode/Manifest
+++ b/app-emacs/sml-mode/Manifest
@@ -1,4 +1,6 @@
 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
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/sml-mode/sml-mode-6.9.ebuild b/app-emacs/sml-mode/sml-mode-6.9.ebuild
new file mode 100644
index 000000000000..dd9b5fb272ab
--- /dev/null
+++ b/app-emacs/sml-mode/sml-mode-6.9.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="Emacs major mode for editing Standard ML"
+HOMEPAGE="https://elpa.gnu.org/packages/sml-mode.html
+	http://www.iro.umontreal.ca/~monnier/elisp/"
+# taken from https://elpa.gnu.org/packages/${P}.el
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${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/sokoban/Manifest b/app-emacs/sokoban/Manifest
index a43b73556c3a..f12087ca7f7a 100644
--- a/app-emacs/sokoban/Manifest
+++ b/app-emacs/sokoban/Manifest
@@ -1,4 +1,6 @@
 AUX 50sokoban-gentoo.el 127 BLAKE2B d0acfad9dcbc8f0a30c37ce1ac9dfac23c804e3830c1b6fd91188421dc785a5499d3b50c12df1e64145e8d45bc2fe7c8ce92d3e7a73c04de91ec6da6e0c44c0f SHA512 361a572d75a32639e37db650184a75dba80f8f63399d919bcf40252b04631e217e78663f03aa9e506f20bb2502816201d49cc6630be3c67177a6ff9895c7a24c
+DIST sokoban-1.4.8.tar 71680 BLAKE2B faf7218dc4d1a629008b1d7fa79a9f747eeda056a89cf9e677f0b20a3dae1dad468a4f968da89be6a1daee0188ea36eb64e02c8a54f6948a89f5dcd039038c39 SHA512 bca8ba4c6357768bd3ec84d8093697acb0fcc84a565290f9517e844bc39301e9ebe7a0e8d3a2c9ef2304387ff539366048a2d2334990f1b7e3895ea1b113e613
 DIST sokoban-1.4.tar 61440 BLAKE2B b0348084517e4fddfe5adffc6fac3020bc7147983733354fe18bbe90bdd49e620dfb392385c0dbb7ffed47bfd05d6b9b28cdf1bd81cc182fde83b243d33b6415 SHA512 8c04f509013e1d8f6e8cc1e182ec253fc84870e5733623038ea03f2447952dcbc77236c64b158ea4e4613dafce192f2c4b50aac3e1e219a049a6a951a44a7ac1
+EBUILD sokoban-1.4.8.ebuild 496 BLAKE2B dee56bbcaa1de921d71b07d68e36a08510cf5f286611d993fc015e95bbc1c3bd35068895f2ed1e2d2c7c3333c0b8e99c1bf191591683b4ae9518f167f8e56f32 SHA512 21a45e4552d266e152b671281ebc070206da4ac1b5e6b53b8199dc436bf62ddcf54a4fbc399a248cdc61668dab8ec40ccf2adbe24b1b9866e823970beed2ef08
 EBUILD sokoban-1.4.ebuild 497 BLAKE2B 60456af8f4c0b95589e0630fe43fcbf71ba82c385779b17e7ce00f32041ccec6d693c97da5dcc4f27f1c442520f10918442676b0cf4c7b4c1688ace0c9567514 SHA512 0a91ad19e78815c6ec523b5aa40379f3cdcfa2ee01ebeb1cebb2a825a34d57ff58c395446ad5cb86bcb923a4e4cea44f0af1126f29c87ec4260e4c81ed84f189
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/sokoban/sokoban-1.4.8.ebuild b/app-emacs/sokoban/sokoban-1.4.8.ebuild
new file mode 100644
index 000000000000..b1a92acefeaf
--- /dev/null
+++ b/app-emacs/sokoban/sokoban-1.4.8.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="Implementation of Sokoban for Emacs"
+HOMEPAGE="https://elpa.gnu.org/packages/sokoban.html"
+SRC_URI="https://elpa.gnu.org/packages/${P}.tar"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+ELISP_REMOVE="sokoban-pkg.el"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="ChangeLog"
+
+src_install() {
+	elisp_src_install
+	insinto "${SITEETC}/${PN}"
+	doins sokoban.levels
+}
diff --git a/app-emacs/template/Manifest b/app-emacs/template/Manifest
index bde74f79bc64..54739fb7dd4e 100644
--- a/app-emacs/template/Manifest
+++ b/app-emacs/template/Manifest
@@ -1,4 +1,6 @@
 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.3b.ebuild b/app-emacs/template/template-3.3b.ebuild
new file mode 100644
index 000000000000..cd0bf317f078
--- /dev/null
+++ b/app-emacs/template/template-3.3b.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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+ Texinfo-manual"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}"
+SITEFILE="50${PN}-gentoo.el"
+
+src_install() {
+	elisp-install ${PN} *.{el,elc}
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+	insinto "${SITEETC}/${PN}"
+	doins -r templates
+	doinfo template.info
+}
diff --git a/app-emacs/thinks/Manifest b/app-emacs/thinks/Manifest
index 28d310a8bfdb..46d76e212379 100644
--- a/app-emacs/thinks/Manifest
+++ b/app-emacs/thinks/Manifest
@@ -1,4 +1,6 @@
 AUX 50thinks-gentoo.el 852 BLAKE2B a7418e25b5dac4daed3c9e1e70b689dfa0a9f4087a605ff50ea5fffd25906df22400fcf77066f30c19057a83d8d78c3efd8ac110ef1b0f8d19db95ab2c8f080f SHA512 c82105986cd349a7716ac1ee1b54f16101719aa6f14a3485ec7942b8704c6fd748e5eba708064607c15a50158df64d7591af90a7bdb38ba7e0ed6c0811ca9897
+DIST thinks-1.12.tar.gz 3058 BLAKE2B 2a46e6a9896c62fbebdc62e81c68f14e589e0bebb5a4143578f01824be75cb3f94e6772f22bd1d9302305b87721515a6245b2a3f80d3c40a3936c15cfa8edd0c SHA512 31208821c25824cca53744afbce5ec3b94d799652811edac0a140d37c7bbdb7fbe1809be1c2b88a324aef1908493885fd7dcd9eb908440fe56bedc5c6c82ffed
 DIST thinks-1.9.el.bz2 2989 BLAKE2B 91fd4fe2b004625f758f0a3941228c0db6de37c637fcbf0456060e2a2f6e9c3618f6a815d9c649a87da286745f4831df21ebf225947d926f89ae20c49e3e8403 SHA512 ba85485df0decb2825a832b60b01a4ae8ef2e32dc356d16b770a4b59a795e138f3c26e14d8eb27e97038d10d2633945c7b2bd14933fdf7815f6c0abc07de5802
+EBUILD thinks-1.12.ebuild 409 BLAKE2B d3e5898b423cf0cd5b0882a0ccecf659a6a5448aa3f688b4090ffb143f026249a43400444cda749c82b40c6f8fac2c8956c3937dacfd053f2515fea6f0313a30 SHA512 e0a1be1dfb7ff3ac21a591dcb989ce01bf45de5fa9ceb0e859137000a14229ec72a1b39ff67ac6acacbcd5dd0d19be60e277d4d1ed563eac96fefd0e993867d2
 EBUILD thinks-1.9.ebuild 407 BLAKE2B 6fbeafd2f21aa339197e2054b2379a16552d79ce88d6741323ff234a5839cb7af5f08528a8e3517e5032f15172c6f8ba171d9f2cc2a1f2925147ec9815fc4087 SHA512 1d6dc2def9daeb1fcc27568c46f93ed47f2270b7473788d05788446b63009022d5ec93e9ae99e5fbf7ee670644f385848a683f4da288966f0ce7941c7b374c24
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/thinks/thinks-1.12.ebuild b/app-emacs/thinks/thinks-1.12.ebuild
new file mode 100644
index 000000000000..1786b9f42839
--- /dev/null
+++ b/app-emacs/thinks/thinks-1.12.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="Insert text in a think bubble"
+HOMEPAGE="http://www.davep.org/emacs/"
+SRC_URI="https://github.com/davep/${PN}.el/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~x86"
+
+S="${WORKDIR}/${PN}.el-${PV}"
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/tuareg-mode/Manifest b/app-emacs/tuareg-mode/Manifest
index 409219849698..5089be20f801 100644
--- a/app-emacs/tuareg-mode/Manifest
+++ b/app-emacs/tuareg-mode/Manifest
@@ -1,6 +1,4 @@
 AUX 50tuareg-mode-gentoo.el 343 BLAKE2B 15545f9aebe6b47e6fa445e32282c4dadf8a6d3fc11d3cb9f8dd2a78ef32dfa5227248644dee8ad12587d96e2c17bf16220a92f447edf8716cd7646347fc2c57 SHA512 41cdc5aa7c083afbe044c730b898e06817fb8c5d9799d0c88be9ad15501d4135e16597623b66ae65a40160d9a04358392a98e03646ba2207e0f981f33e28750d
-DIST tuareg-mode-2.0.10.tar.gz 102576 BLAKE2B fac81b5f43dc9143a62fe7ebf5d35bc44994db3a155b780329339b73b087cf53e63aa15b7e817388a92f1effcc08febc617747b242d57d5e900b20fe100a8f03 SHA512 53bdc3b2b78bcf7e6b075932b9319f9d08b02b4b3fd74fc9aa30b390b30e4069e19e09e0fbb03fb11877e6d89649b8e59c645cc8de196115c1bbdab308145743
 DIST tuareg-mode-2.2.0.tar.gz 83392 BLAKE2B eead49dff45bb039abef0ffa8f4b874dd6d3bb36e81791b84e411031b4d714324637f99a0cfc3d4029b47032c61ca45424831a2d837fe5b01fa93383237cb14d SHA512 5f0b470920abd44e5b99e84e817ba678aded3042751b8949884c06f3a928105acbe96a28af3a8a089f6b607f8dd70cba7a669e9a61b906b1dad840c7f88bce12
-EBUILD tuareg-mode-2.0.10.ebuild 451 BLAKE2B cfd163238d86f3d776816ee8aa6853bee92e5333c0d492435a4b926c38091cde1a4837b09f64dda87f55f32a54b9f877515f39e3560aff7a8557eb8bcc55bc98 SHA512 b649011add93ff46426407e1f37d8390863afe9fdb17b26ad44f3fbeb53c40b6f478b733c3f707d1400306aed737fedb94b837dbc567d0b42d8df41d1d74d030
 EBUILD tuareg-mode-2.2.0.ebuild 495 BLAKE2B ae1316fc64fa9dba1f3518db13f9b27d2f9fd6488f4f6a8c0449a2d9accec674a1d48d142d3d5a8b51c270deb5058d529f0b812d6a9ce1bdb7dd1efcc43b6a9c SHA512 8d5060ea94e5f1d1c97f874286fa9e98449201ef7fec650c37c96fb00177083f9753e7534cdfa2d0e63c601be2e25c38b100da885886e6fc943a6cb55892da0e
 MISC metadata.xml 780 BLAKE2B 9262902650dea63fa833d0b57f32054a6858e741f404d6f5393273518533e9008ec8a322ec013232b69e8475d9db7f407f3985477ce4449e08913e0eed84337c SHA512 480ad1fcd7b12c56081dac425686a17ad07d912c4ac0f5f259c126d4a07489d9660e1429a7f0570aac3957ec8712d406314d68c76cd45dd8ec99a7f62dba6c5d
diff --git a/app-emacs/tuareg-mode/tuareg-mode-2.0.10.ebuild b/app-emacs/tuareg-mode/tuareg-mode-2.0.10.ebuild
deleted file mode 100644
index 5bb874a6968b..000000000000
--- a/app-emacs/tuareg-mode/tuareg-mode-2.0.10.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="An Objective Caml/Camllight mode for Emacs"
-HOMEPAGE="http://forge.ocamlcore.org/projects/tuareg/"
-SRC_URI="https://github.com/ocaml/tuareg/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-S="${WORKDIR}/tuareg-${PV}"
-SITEFILE="50${PN}-gentoo.el"
-DOCS="README.md"
diff --git a/app-emacs/twittering-mode/Manifest b/app-emacs/twittering-mode/Manifest
index 84627c583bc5..6e10564dab51 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 820 BLAKE2B e6ce259b52aed7bcc00f550cf4f92d9bf0a5fb826e4fc785f62f1fab62a93e3cbc8228fcc5e5a001bbece49907e65981a9d531192185399720269fd05f2ee64e SHA512 71dacc1eb3d71a1245b68499ebd092befb8c9b6dda1472b6cbef068860840b9b66b4aec03abe5d5bf778089555ceba14c690301041c98df885c294752a03a464
-EBUILD twittering-mode-3.0.0.ebuild 820 BLAKE2B e6ce259b52aed7bcc00f550cf4f92d9bf0a5fb826e4fc785f62f1fab62a93e3cbc8228fcc5e5a001bbece49907e65981a9d531192185399720269fd05f2ee64e SHA512 71dacc1eb3d71a1245b68499ebd092befb8c9b6dda1472b6cbef068860840b9b66b4aec03abe5d5bf778089555ceba14c690301041c98df885c294752a03a464
-EBUILD twittering-mode-9999.ebuild 820 BLAKE2B e6ce259b52aed7bcc00f550cf4f92d9bf0a5fb826e4fc785f62f1fab62a93e3cbc8228fcc5e5a001bbece49907e65981a9d531192185399720269fd05f2ee64e SHA512 71dacc1eb3d71a1245b68499ebd092befb8c9b6dda1472b6cbef068860840b9b66b4aec03abe5d5bf778089555ceba14c690301041c98df885c294752a03a464
+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
 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 1e802fc217fc..d8d3529415ea 100644
--- a/app-emacs/twittering-mode/twittering-mode-2.0.0.ebuild
+++ b/app-emacs/twittering-mode/twittering-mode-2.0.0.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
@@ -19,7 +19,7 @@ fi
 DESCRIPTION="Emacs major mode for Twitter"
 HOMEPAGE="http://twmode.sourceforge.net/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 
 DEPEND=""
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 1e802fc217fc..d8d3529415ea 100644
--- a/app-emacs/twittering-mode/twittering-mode-3.0.0.ebuild
+++ b/app-emacs/twittering-mode/twittering-mode-3.0.0.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
@@ -19,7 +19,7 @@ fi
 DESCRIPTION="Emacs major mode for Twitter"
 HOMEPAGE="http://twmode.sourceforge.net/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 
 DEPEND=""
diff --git a/app-emacs/twittering-mode/twittering-mode-9999.ebuild b/app-emacs/twittering-mode/twittering-mode-9999.ebuild
index 1e802fc217fc..d8d3529415ea 100644
--- a/app-emacs/twittering-mode/twittering-mode-9999.ebuild
+++ b/app-emacs/twittering-mode/twittering-mode-9999.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
@@ -19,7 +19,7 @@ fi
 DESCRIPTION="Emacs major mode for Twitter"
 HOMEPAGE="http://twmode.sourceforge.net/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 
 DEPEND=""
diff --git a/app-emacs/uptimes/Manifest b/app-emacs/uptimes/Manifest
index c31234829a68..c2d1f452c8e5 100644
--- a/app-emacs/uptimes/Manifest
+++ b/app-emacs/uptimes/Manifest
@@ -1,6 +1,4 @@
 AUX 50uptimes-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
-DIST uptimes-2.3.tar.bz2 3637 BLAKE2B 75517032993f8192c4985d6bb5793b90c828565495a4471845e3efb6fa939268c7b94751baa6b85f5462cfb2a944ea4f4904a75b950a071c0840bb21313bb751 SHA512 31a8e4da410c1c02e96b3aa910fb3afe99c924af0f8299465e1c1b4b22e925aeb427b1ad349df459f93d2efd8bbf66804186f26486957d9e8196eda1b50eb5ba
 DIST uptimes-3.7.tar.gz 3913 BLAKE2B 3148b17a8e61201027702891e0303870cddaace650770621bf7847cb86ba917c74aa5938f55fe2e6275180f9e66755f418dee47bc80b6fd7439276ff525ea9d8 SHA512 6e31cdacabc93a8f9d206d95eb4d16ad4a6b4a69f1032e93710693eebe8064446b19e4938eb342c8a66fac7e52e22da36b26bd3417216ab302c9c8e50dba27c3
-EBUILD uptimes-2.3-r2.ebuild 529 BLAKE2B 386946ca894ae58d415d36b198310e529f666fd78f93d5dfaf59ec171bd4c826c7858bbf0b1aa9481e15adf21535c79a46a3055122ead909aea69793a39c6094 SHA512 bf8e66286c792e86a7758c7b668ecd1d08ba6ec4725f2bba883cb037788af70414ccaa057fb3c0a5bda9e89a548f40f9b23e450e38c10130603e59567e5adbed
-EBUILD uptimes-3.7.ebuild 620 BLAKE2B 18d364eedbe1c38d4c910e1656555db73be2ff6f1e53f7c559ee6ef44f54b8df093511c83f8ab89e617be10a5f329b3ccd4d5701824eeb2a30f9d35ea7a12604 SHA512 a136a817773ae3f2e0e615fe655b74bb027265db1d0269f044f452bf4e6ce67917971d341f84a794d73c422f271b121b1174f702a95ff94f7ec41d7635685bd7
+EBUILD uptimes-3.7.ebuild 618 BLAKE2B 03739bb641793ab5a272cf2ce4993685e59bb7cbf8025745a2c678ab723a32b3038d63cd7952e5fc17c34b8a2b5920cebaf90254bd8f88d4568147ef02093042 SHA512 026e82f6d0ec9a3aa9bf2c5abc083f3f35ae5b5ddf06c81d61e332577338d3e8cf9933656788ce2ef9f3eb1e9bc4e595bc3c06894bcc87367076c43acc47c920
 MISC metadata.xml 594 BLAKE2B e19412bb4bf3f290341ed58cfd0db991c57e91cff25862a8ff3ea942e8f68587a7f40c58a755867fdc0ea3688d6399cf87aa02b6edae41d5a5bde1c5a60c589b SHA512 94546e797fbcd61c03c4b8775e2204f3fac23fc50a9581722d46e92863f022a032c06ecb573e6785656a0950daa4b085f17104068f058917b32af4e2a5d8184e
diff --git a/app-emacs/uptimes/uptimes-2.3-r2.ebuild b/app-emacs/uptimes/uptimes-2.3-r2.ebuild
deleted file mode 100644
index 334cda759b40..000000000000
--- a/app-emacs/uptimes/uptimes-2.3-r2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit readme.gentoo elisp
-
-DESCRIPTION="Track and display emacs session uptimes"
-HOMEPAGE="http://www.davep.org/emacs/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-SITEFILE="50${PN}-gentoo.el"
-DOC_CONTENTS="Uptimes is not enabled as a site default. Add the following
-	line to your ~/.emacs file to enable tracking of session uptimes:
-	\n(require 'uptimes)"
diff --git a/app-emacs/uptimes/uptimes-3.7.ebuild b/app-emacs/uptimes/uptimes-3.7.ebuild
index 30a33db9f97a..869df6026ab0 100644
--- a/app-emacs/uptimes/uptimes-3.7.ebuild
+++ b/app-emacs/uptimes/uptimes-3.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/davep/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/visual-basic-mode/Manifest b/app-emacs/visual-basic-mode/Manifest
index 910c8e21b84a..0a91aceddac2 100644
--- a/app-emacs/visual-basic-mode/Manifest
+++ b/app-emacs/visual-basic-mode/Manifest
@@ -1,4 +1,6 @@
 AUX 50visual-basic-mode-gentoo.el 228 BLAKE2B 2f92aeab71b89c7d0c00e925dc8775e102a482f354988a7d2b3a99cc76fcc0ad9b9284fb198d81f0c31eabe50cc6ad5d2009177351465263a32e3522681a3335 SHA512 61a40524cfdd2045fb5fd4022fb5a9c85859741f0eb310c12066f7574243779633f2a436bc9cea4a32883f78e01f256d4da1d649d8910c06ea26b7ae9e2bcd81
 DIST visual-basic-mode-1.4.12.el.xz 16872 BLAKE2B 849a639dc54bf595541256424e26b6a157f2b75ab3c9fab8c6d7000d9abda6b9b979b51d06e81ff6a276353709aec5f4608e9806233560fcd4cdbdeff2e359f6 SHA512 ef8fdb883dbaa957d1d7526e0548611f755a7d3700a62d32790aafc0e25d97b3f6784969b584dcdda39da681b4e59253daff217bde5a783b923257e77e9549ca
+DIST visual-basic-mode-1.5.el.xz 17460 BLAKE2B d87cfe6c9952d728fe5807ac98284b6af518e47ae0da12a463227c4a15a12896998385e5c57adb0a2eee6b5642dc4853506a4d24fa9cb4c4d3eb8cb9562dd6c9 SHA512 f10480993b96fa29602cac51042ddc708d85c940d3ad405b2548037eab8af8d4c9b548cc3c4b770bb65681f150491d2b14255c65207050139d79f78a9a4bf888
 EBUILD visual-basic-mode-1.4.12.ebuild 435 BLAKE2B 3f5a036a44bf019d60213aba79f1e0d69f8360369ce3d3a2f1f58f74f37f11405a50215c040427507f868140d1cedede666eb267b9e98bb71e5d7a173d8f3a5c SHA512 74b142d4f789d30dc0111e01e27dc7221eaf082c9079d1c83be90ac3267e6fde8d194b4da9e54140751a6e32d117feee4a34cc38c839493f95fd912a96c71d94
+EBUILD visual-basic-mode-1.5.ebuild 435 BLAKE2B 0eeed24746b49017010ade083887d10bb5c48339283d5e0c52b9a2c601ca2abc65dfb066eea6e5ceb768e0968349aa2b20ee2fcd89333a27ff082e2519882a31 SHA512 df9516589fc81edfa0c085dc0eb0bfd17618f3b8a23355910ea306e562baaf5ae5f020d303e40558b42f97c836c06264167b3bdcbdc2c62ac0171afa56044077
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/visual-basic-mode/visual-basic-mode-1.5.ebuild b/app-emacs/visual-basic-mode/visual-basic-mode-1.5.ebuild
new file mode 100644
index 000000000000..20c97abd078a
--- /dev/null
+++ b/app-emacs/visual-basic-mode/visual-basic-mode-1.5.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="A mode for editing Visual Basic programs"
+HOMEPAGE="https://www.emacswiki.org/emacs/VisualBasicMode"
+# taken from https://www.emacswiki.org/emacs/${PN}.el
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/vm/Manifest b/app-emacs/vm/Manifest
index 87721eb92a25..78d78e7206c5 100644
--- a/app-emacs/vm/Manifest
+++ b/app-emacs/vm/Manifest
@@ -5,5 +5,6 @@ AUX vm-8.2.0_beta-optional-args.patch 556 BLAKE2B 9c07937f43b99484b5973aa63b386e
 AUX vm-8.2.0_beta-texinfo-5.patch 8594 BLAKE2B 542c755aa7aee4f39c8977ec0a33eab53954bdecfc9e9b65a5fa069c3f3fa89311a00356a8dfdebc2159bfd5a047dbb3500b78e0f1f21398e41fe1ac55516aba SHA512 dbc8f9456735f4d1757a7094bf2cde86148444bf4c46136eb5170b94e9124bee48c08d8f7d82e3b3c03ebd3443f0ec3dc988178e335189904c3d2b4edb6d2cd3
 AUX vm-8.2.0_beta-texinfo-encoding.patch 197 BLAKE2B eeea93146d8dafab49b961c4a2b3ff981dc4269fab1fe6eb9124575341439a9fcdf8819eeea395ec623c07a2c31018770222265f1835361333d543239b63278f SHA512 ba227fa27e6b19f23b487e254703a4665dedf3cd4f6887db71cf76dad4ac66c52608a1e978c2eeef851e6f2241aeddd5249fd8824d5194105ed172c68b9fb6a4
 DIST vm-8.2.0b.tgz 839789 BLAKE2B fc032e0a6259d2397d80cc80fbb7cf5845e43a228124f867402738a9123c78c798822d8d9c8edbdb823bfe3bce946d53afb6cd24e02d28925a51d458cf21eedf SHA512 37b642975e8fe7e350c0a648f83608b28d8616417d376d9888c89b37c90d8bdb3c91cdc4c91a0f5072d29ac81bfea3d88f9b36699379bf8a5bdd15dd5a70858d
-EBUILD vm-8.2.0_beta-r1.ebuild 1598 BLAKE2B 34e16e27d7f1fcd6d147defb86199d05f9d6902f93bf729b65be8a0790ae7d1cdeebeb8c8fdab049c5aa8048bcdb807c217b5981fe8fbb9a30d1b72ce90a9b52 SHA512 f762281984af7feb73742e0006ea2a858175b0bb0bd399a72766df550194985f56ebfa9defbba0fdf546ea5a820d1bd28663734b6090d27a577537faf99ba52e
+EBUILD vm-8.2.0_beta-r1.ebuild 1612 BLAKE2B c2b341748409ecf9042e7d25af8592a5ad2de97d75785f2797a5f6557c2f46f3c808c1c36d760c399d40cc07d8fdda471da73764a7d11e8c1f3ae57c5584e7cb SHA512 6e8eb2f2bfdf01fdc73caa0ed248b3b356f18297a868fbc5c367d1e6111568f0abfe623d857371f0982c1e28582b3273ba0ca393ccdaf2345fd61cb5ff5434df
+EBUILD vm-9999.ebuild 1314 BLAKE2B a3c1a93c06320825e007f49cce5d31d87b5cdd89329c70b99ae5f457a5324fe78e0f2d6fea319dc4d1bf1d287c4de5605b45b23e04328b82521b5ffed2cecf14 SHA512 c266cd618df313d6e11e365a1253744dd29d35f62d428b039db8ae3057219fa42351bbd9caffd767808345945571ab736622791baafebff7c604c7f8729d6515
 MISC metadata.xml 785 BLAKE2B 1d8be69c7be90cb03815bad0324c55e4ed4be6443246922054dc6ebf4b66090bb9f7f30916cb5df07a664d151a77de6591a45d923847547898ebc32ac9505038 SHA512 62df38ecfe4b3de679d856cbca5b58d73c73a885f86998f00aa75e67efc2def4ce973bc1e2f40fa22f6f79cc9f4fc4185a916e6ba176a89d685b1092ea9eddfe
diff --git a/app-emacs/vm/vm-8.2.0_beta-r1.ebuild b/app-emacs/vm/vm-8.2.0_beta-r1.ebuild
index df64a109d955..519d10d2b622 100644
--- a/app-emacs/vm/vm-8.2.0_beta-r1.ebuild
+++ b/app-emacs/vm/vm-8.2.0_beta-r1.ebuild
@@ -16,10 +16,11 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 x86"
 IUSE="bbdb ssl"
 
-DEPEND="bbdb? ( app-emacs/bbdb )"
-RDEPEND="${DEPEND}
+BDEPEND="bbdb? ( app-emacs/bbdb )"
+RDEPEND="${BDEPEND}
 	ssl? ( net-misc/stunnel )"
-BDEPEND="sys-apps/texinfo"
+BDEPEND="${BDEPEND}
+	sys-apps/texinfo"
 
 S="${WORKDIR}/${MY_P}"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/vm/vm-9999.ebuild b/app-emacs/vm/vm-9999.ebuild
new file mode 100644
index 000000000000..7834ef8f589d
--- /dev/null
+++ b/app-emacs/vm/vm-9999.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp bzr autotools
+
+DESCRIPTION="The VM mail reader for Emacs"
+HOMEPAGE="http://www.nongnu.org/viewmail/"
+EBZR_REPO_URI="lp:vm"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="bbdb ssl"
+
+BDEPEND="bbdb? ( app-emacs/bbdb )"
+RDEPEND="${BDEPEND}
+	ssl? ( net-misc/stunnel )"
+BDEPEND="${BDEPEND}
+	sys-apps/texinfo"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	eapply "${FILESDIR}"/vm-8.2.0_beta-texinfo-encoding.patch
+	if ! use bbdb; then
+		elog "Excluding vm-pcrisis.el since the \"bbdb\" USE flag is not set."
+		eapply "${FILESDIR}/${PN}-8.0-no-pcrisis.patch"
+	fi
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-emacs="emacs" \
+		--with-lispdir="${SITELISP}/${PN}" \
+		--with-etcdir="${SITEETC}/${PN}" \
+		--with-docdir="/usr/share/doc/${PF}" \
+		$(use bbdb && echo "--with-other-dirs=${SITELISP}/bbdb")
+}
+
+src_compile() {
+	emake -j1
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+	# delete duplicate documentation
+	find "${D}/${SITEETC}/${PN}" -type d -name pixmaps -prune \
+		-o -type f -exec rm '{}' '+' || die
+
+	dodoc example.vm
+	# NEWS is accessed from lisp and must not be compressed
+	docompress -x /usr/share/doc/${PF}/NEWS
+}
diff --git a/app-emacs/wgrep/Manifest b/app-emacs/wgrep/Manifest
index 5a8260bdbe0a..014af28747c5 100644
--- a/app-emacs/wgrep/Manifest
+++ b/app-emacs/wgrep/Manifest
@@ -1,4 +1,6 @@
 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.3.0.ebuild b/app-emacs/wgrep/wgrep-2.3.0.ebuild
new file mode 100644
index 000000000000..49a49ce55175
--- /dev/null
+++ b/app-emacs/wgrep/wgrep-2.3.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="Writable grep buffer and apply the changes to files"
+HOMEPAGE="https://github.com/mhayashi1120/Emacs-wgrep"
+SRC_URI="https://github.com/mhayashi1120/Emacs-${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/Emacs-${P}"
+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/windows/Manifest b/app-emacs/windows/Manifest
index 20ea42477652..ce8b5087942a 100644
--- a/app-emacs/windows/Manifest
+++ b/app-emacs/windows/Manifest
@@ -1,4 +1,4 @@
 AUX 50windows-gentoo.el 71 BLAKE2B b0bdccf744fea902944facc65fc45d69a1b67c0a7517514731cad427be77d09c7a3263634e91a887dc4cd7344e15cefb794f7da2403b9fd8778d4f8594dae760 SHA512 9ee731d8d54d7808903fea39ca70fee4d9216f6980f02b8511b6d643040335acfdad2a9336d9c8baa9babf0805f9eef5ace760cd0e965c6c964a2bd7599e5d6d
-DIST windows-2.49.el.xz 26240 BLAKE2B 161003a6b995b84df79eb0459ddfce41049ffcd053cacb2d5ceefda89afae0eb82f382b7f60b267846bd8690f406a5fcea166c6e602378729140f8e951977265 SHA512 de75f2c07cd544de7e7c616b5b928c0dd538b341396819a49525304ed3d9c01c4814e0f8a8da97bdf1a449844605127da690db3ccd95980240156d3c3600b704
-EBUILD windows-2.49.ebuild 543 BLAKE2B 8598f19c18b66fedded09b7dad20b9f7b747fa9f65e5ae396ee0663d3596e779626235e1190a47355fd72288b1799bb6e06d9a166fd0d53ea89b07025c3beb37 SHA512 01e8aa63f4f4cf212737c906a11ed1cb7291c70f54cc8c432d1eef6bac694f7b81724645274ff35932592a264910d829719f8a11b904bffb4505773e56d86dbf
-MISC metadata.xml 292 BLAKE2B 046265ce3ff94f04bba9b4b344d852203657df8dd300f30620df260bad1c56b3c23a8c48d073f70f571f733af9a7c034922e0465878028ee8f748060a6816ec6 SHA512 f0115ae686d3003f4264968d3aeb0b054830f87f35378e15e205a729d591c8697507d3c76ead9e1f0bab1f1f66a3fda108322dbcec7b857a37000511d1dd17df
+DIST windows-2.53.el.xz 26464 BLAKE2B 79edd45952869dba4ec04a2ad2d446730cdaf563622bb7cf79dbf846980fe406870ae75fc1d28d0f161b045bafb28d1f372fd67c21427e46a591893dfed0bff2 SHA512 ee92998a15d7de68657556eddc824275b2baeb503bfc540e7ae8d0e743a65b3bc97bd8c3a6e4ef558df947245d69d0f33fb8017d4ce411435cb4a29e0b9d950e
+EBUILD windows-2.53.ebuild 539 BLAKE2B b550fa2246759e58cc45546c43f6e620f0b0cebe89376456241172c6a47a61d88ee5c13991abd2e48fe81a98e6a4e4c7b231dc6a0c4cbae5a77b5759be84255d SHA512 1c042c13bef69a2252b36fa2725ed4b6b3d93233f9b5abe5f2e5b713b440d77b0059590c47b5f0c12edc5c77201fc592ef9c2861d38edf550fd1993d8196c278
+MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/windows/metadata.xml b/app-emacs/windows/metadata.xml
index c6a53b949e75..c918cdef9591 100644
--- a/app-emacs/windows/metadata.xml
+++ b/app-emacs/windows/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>gnu-emacs@gentoo.org</email>
-    <name>Gentoo GNU Emacs project</name>
-  </maintainer>
-  <stabilize-allarches/>
+<maintainer type="project">
+  <email>gnu-emacs@gentoo.org</email>
+  <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-emacs/windows/windows-2.49.ebuild b/app-emacs/windows/windows-2.49.ebuild
deleted file mode 100644
index 75cecc5d2318..000000000000
--- a/app-emacs/windows/windows-2.49.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp
-
-DESCRIPTION="Window manager for GNU Emacs"
-HOMEPAGE="http://www.gentei.org/~yuuji/software/"
-# taken from http://www.gentei.org/~yuuji/software/euc/windows.el
-SRC_URI="https://github.com/gavv/distfiles/raw/master/${P}.el.xz"
-
-LICENSE="yuuji"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="app-emacs/revive"
-DEPEND="${RDEPEND}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	elisp-compile *.el
-	elisp-make-autoload-file
-}
diff --git a/app-emacs/windows/windows-2.53.ebuild b/app-emacs/windows/windows-2.53.ebuild
new file mode 100644
index 000000000000..1d66f961b5b5
--- /dev/null
+++ b/app-emacs/windows/windows-2.53.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="Window manager for GNU Emacs"
+HOMEPAGE="https://www.gentei.org/~yuuji/software/"
+# taken from https://www.gentei.org/~yuuji/software/euc/${PN}.el
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-emacs/revive"
+BDEPEND="${RDEPEND}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp-compile *.el
+	elisp-make-autoload-file
+}
diff --git a/app-emacs/xclip/Manifest b/app-emacs/xclip/Manifest
index 42551fa12ce8..7a67e639f645 100644
--- a/app-emacs/xclip/Manifest
+++ b/app-emacs/xclip/Manifest
@@ -1,6 +1,4 @@
 AUX 50xclip-gentoo.el 128 BLAKE2B 8a5ecef89d13e7f65cf59c868adf5c984ff5dc30eedbfa23180f8c0d87a07c54215222fbbc38d0ade389aef2cbd9be1e584b31fd9f9a002f6893e689b8533230 SHA512 beadac08608ab6a45e5162ccb993b7ef99e9f3b811f144a49eb6caae25602f4346bfe15c9771177f0d9495929f92eb1e5e59b60f5957551beb7dd69340ed416c
-DIST xclip-1.3.el.xz 2164 BLAKE2B 739cad92a92732a12ac077fc9749bc883b4386977d4c47e793023811c1e668668277f6e0a6bc7105cb7a1186c0d6b3ab276dfb655478d5a6063882f60fa9a7e6 SHA512 5b51703a365fa3991a97c06734b6baf6473ba672ab2ed572db45330fc6b761258403191079725f8c3e8d72919355a2cadf0c04e31396805718de30474ac08520
 DIST xclip-1.9.el.xz 5120 BLAKE2B a2cdfda709d51d7cb8cc3792d23d97fee5b03d1a1fbcf8dfb7810aa91080b0e4af47854ec1fc9e184055c50590d181639c0da100bf4e0a0d41dd856c2f75269d SHA512 96df6cc4257125876b57f3aba469c78136c2366d045b5be38c1f2d8ba69752e6625ec6deacc25da013da2a1bff54821d2171bab9308b24ab3e49a18c3d39ddbb
-EBUILD xclip-1.3.ebuild 480 BLAKE2B e8d7f48160c6852838d55a08f86717e77aab25d7829324d90cd2887f96890977746e681191f135a0d4af827247514cd48a218ab1634fae4236a9683b21df80f1 SHA512 8d4fdd7e8057b31952f54f9da9eb894116dc591c6ec39141d68a288b9b79016d7747dcaeb9679e437c155664eceaa6a9765c7b106a9514cd913a1e29f425af21
 EBUILD xclip-1.9.ebuild 480 BLAKE2B d75eb007100352e78beae08bc8e75d7ce398d6d35468509b39bf45794b39685518e02ae2b12876ddc69817d65cd806df6ba3aa5a799b97156feaad7bf05b1813 SHA512 db6bffe4ae97fd4cbbd8f411ff4708f5e1dfa0394d634372db777c7e4bb0459b623aed70447ff3bedf5fa85bca4ef77e78e741d4705fb3de1bca940dd9d170ca
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/xclip/xclip-1.3.ebuild b/app-emacs/xclip/xclip-1.3.ebuild
deleted file mode 100644
index 4b0c38d1a017..000000000000
--- a/app-emacs/xclip/xclip-1.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit readme.gentoo elisp
-
-DESCRIPTION="Emacs Interface to XClip"
-HOMEPAGE="https://elpa.gnu.org/packages/xclip.html"
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="x11-misc/xclip"
-
-SITEFILE="50${PN}-gentoo.el"
-DOC_CONTENTS="To enable xclip-mode, add (xclip-mode 1) to your ~/.emacs file."
diff --git a/app-emacs/yatex/Manifest b/app-emacs/yatex/Manifest
index 57b1bac95bee..c46f15e73021 100644
--- a/app-emacs/yatex/Manifest
+++ b/app-emacs/yatex/Manifest
@@ -1,10 +1,6 @@
 AUX 50yatex-gentoo.el 488 BLAKE2B fcc7c76ee0ace31938ac6e7f438832d53542d2cdd0109ddf9ba59c8cdfe535f1bb5f2d2bf5edeb7247cc8903424f3eb5d4eeac56fe01f2d4665c85936a4736bd SHA512 93a1d45bb228d1ac304fd3652246561a5b7a9d91aa230f0f0d62a9e557f9f61a1dafee900139b7588f3310fdb98fbd71d6347ee45b6527ae27e2095da2a652b5
 AUX yatex-1.76-direntry.patch 1646 BLAKE2B 7b13a22accecada28782abac230b7e20aec5aa1e920d98cf9fd68e776a1527181ebe8d99a8d4eecf1415d30336b7021edd2e9cbc1934d7022a3251095dd74702 SHA512 4415c8ebc8e3bfb7f15ac842e05743d7689def9365fae75a466b05daa7356f51625348e1b68f4eb6ff0144eec12feecb0054562aa91414ba6a5ad544999ec42e
-AUX yatex-1.76-gentoo.patch 575 BLAKE2B ac5293869e9624e0f1e53787af07729dbc39191af465103a157c750becc33c7a4ce77605cd24ca2b1564eebc67cbc742544b4fa4b9697d245a0a8064246e13aa SHA512 79362e03f2b4fba1df96d9468bd3fad5fe98d36a8faaa4a4d74ae0eb4401081fd843e8de952498e0d3fd3ed53b0f434ca39f978baa246b24a1c375d82754b6e4
-AUX yatex-1.77-texinfo-5.patch 2884 BLAKE2B 89dc66fdc301ab4a205b8043741a8ac70db603666643515bfdceb93a5fe9ab323ee0e22f42d6521e2787af1be2619e098c43ea4891b32298943cf5308e426ba9 SHA512 e67405720765de50c012363fe77b61614927f6c13b4158cb08e7011fbbd74956eea271394f7bca1bd88419f1d3a52512e3946d466eb6f18b51bf94cd5e55a57b
 AUX yatex-1.80-texinfo-5.patch 8187 BLAKE2B 9039ff22af04b4f7bb7d7538eb73977aed30c14ad5329698691c30222b07c0cf2e531e85037bec790178c4003934ee082978ae37e7959bd5a76842659b1299b9 SHA512 856b16be069c6a77535b1800303b48467366d4765afa1d66ed5ccfc78c031b899ea027de8a95bb4687f19c06f9edb98d3e520e68adf2e93ca68acba96b62fbf8
-DIST yatex1.77.tar.gz 356721 BLAKE2B f923bc80ec32ee3d1654f15a99624251604c94af60738ad2f56b237d4385da0951bec32b32f297662540667da2648789a380b433332ce7e10f50f1d016c3b6d0 SHA512 d6b909b540b0966cfcd35a36ad7c9e8d8a821ca668ea9b0a4d1f3267a45397800769dd47ce64f5f8cbda65c274a7f415c8e86b6598a365ea41104684cf9df07f
 DIST yatex1.80.tar.gz 376944 BLAKE2B 355726fb3b38bfbc314647739d4af6e588848b5ade208fe1e026106a7cc2c220edcf10214f37ee7c9cc461ecb3e776c3969e329d5a331b3d8ce9f669f2361e26 SHA512 6548d1ac95ce95198468698d9b91449736e4be8af15d29352c00f7604fd7b34b2c606afb2d90d1115fd64dc859efdd9c993a6b3733f9321ca7671615977b4bd5
-EBUILD yatex-1.77.ebuild 1190 BLAKE2B 35dd69440203527beeb44ca225d06d0de1bad4b443627fed20b46389ace71992a1b498b2e57147e34bfba7a9e802e3468db11c7517de99c238ad1d85263ee60e SHA512 e9870ed7919d48d71b42e0b77621273c9c3af5d89e59f371beca8962b0190f0495804333e051f1745b12d11e732fa492fdf9ee7835233d447bd11dc6bd3d39c4
-EBUILD yatex-1.80.ebuild 1188 BLAKE2B 37ec4e8ff680962b233156a5ee8d3af623eeae5be35ecfb105f2f4be3848a83a4ad7a6ffef3ed2291dfa84f68572b3584c5ef9db2532f99de5dc863fd8f032ba SHA512 d4f83a73c04be1d56a46e433daf9f69cbc43288b4376e63b067b12bdc7162d2d6e09de79dcf1182bded4692519d6e55b26a8bcb588b677dc80ecd93bb14daead
+EBUILD yatex-1.80.ebuild 1182 BLAKE2B 482b350173cda77b0ffb240059ca72893f24278954e34bf8c31cae588b7bdd919f6d463c157262c913cf8deccd1c21be26ea8eef662848e410e0cf0b9b46fad9 SHA512 635a78f07150dd0bf661e079956ab4262d7a1a8d0ffe427bd9894278cf2bccfc29fceba4b819af3ed8cb6add9bc28667e87042f8c14f791d8416d9cee5181ce3
 MISC metadata.xml 782 BLAKE2B d0c36397f1e8e6a2b12038086db26f4a617cce607962833a40381357159404e33841d4cd011355db4f927d81c723d57b8243cf9e1141cdc8d94b8880a5a73392 SHA512 427d7a218d2355e7a35b5371be149bb1e3c0168c9ab46f4c6e22c92f9d28c3ae430c6b476bda66150755608d7d28c46c80744aa7c5a1b6bf24c15a9aa0a908bc
diff --git a/app-emacs/yatex/files/yatex-1.76-gentoo.patch b/app-emacs/yatex/files/yatex-1.76-gentoo.patch
deleted file mode 100644
index ed2b52aeaa19..000000000000
--- a/app-emacs/yatex/files/yatex-1.76-gentoo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/yatexhlp.el
-+++ b/yatexhlp.el
-@@ -9,12 +9,7 @@
- 			 (cond (YaTeX-japan "jp")
- 			       (t "eng"))))
-       (help-dir
--       (cond
--	((and (boundp 'site-directory) site-directory) site-directory)
--	((string-match "\\.app/" doc-directory)	;For Emacs.app(Darwin)
--	 (expand-file-name "../site-lisp" doc-directory))
--	(YaTeX-emacs-19 (expand-file-name "../../site-lisp" doc-directory))
--	(t exec-directory))))
-+       "/usr/share/emacs/etc/yatex"))
-   (defvar YaTeX-help-file
-     (expand-file-name help-file help-dir)
-     "*Help file of LaTeX/TeX commands or macros.")
diff --git a/app-emacs/yatex/files/yatex-1.77-texinfo-5.patch b/app-emacs/yatex/files/yatex-1.77-texinfo-5.patch
deleted file mode 100644
index d2e2fe1d5694..000000000000
--- a/app-emacs/yatex/files/yatex-1.77-texinfo-5.patch
+++ /dev/null
@@ -1,86 +0,0 @@
---- a/docs/yahtmle.tex
-+++ b/docs/yahtmle.tex
-@@ -1,4 +1,4 @@
--\def\lang{eng} % -*- texinfo -*- for Texinfo V.3.1 
-+@c \def\lang{eng} % -*- texinfo -*- for Texinfo V.3.1 
- \input texinfo
- @setfilename yahtml.info
- @settitle Yet Another html-mode for Emacs
---- a/docs/yahtmlj.tex
-+++ b/docs/yahtmlj.tex
-@@ -1,4 +1,4 @@
--\def\lang{jp} % -*- texinfo -*- for Texinfo V.3.1 
-+@c \def\lang{jp} % -*- texinfo -*- for Texinfo V.3.1 
- \input texinfo
- @setfilename yahtml-ja.info
- @settitle Yet Another html-mode for Emacs
---- a/docs/yatexe.tex
-+++ b/docs/yatexe.tex
-@@ -1,4 +1,4 @@
--\def\lang{jp} % -*- texinfo -*-
-+@c \def\lang{jp} % -*- texinfo -*-
- \input texinfo.tex
- @setfilename yatex.info
- @settitle Yet Another tex-mode for Emacs
-@@ -705,7 +705,7 @@
- @item M-x YaTeX-section-overview
-         @dots{} Generate *Sectioning Lines* buffer
- @end table
--@cindex{Generate the listing of sectioning units}
-+@cindex Generate the listing of sectioning units
- from the LaTeX source buffer.  In this listing buffer, typing @kbd{u} on
- the sectioning command shifts up the corresponding sectioning command in
- source text and @kbd{d} shifts down.  After marking lines in the listing
-@@ -1087,7 +1087,7 @@
- @node Invoking image processor, Jump to main file, Jump to corresponding object, Cursor jump
- @comment  node-name,  next,  previous,  up
- @section Invoking image processor
--@cindex{Drawing tool invocation}
-+@cindex Drawing tool invocation
- 
- `image-including line' described above means such lines as
- @code{\epsfile@{file=foo.ps@}}.  If you type @kbd{[prefix] g} on that
-@@ -2179,9 +2179,9 @@
- @table @kbd
- @item [F]
- YaTeX:read-position
--@itemx [A]
-+@item [A]
- Character list which can show up in the brackets
--@itemx [D]
-+@item [D]
-    Return the location specifier such as `[htb]'.  When
- nothing is entered, omit [] itself.  If the possible characters
- are "htbp", call this function as
-@@ -2189,9 +2189,9 @@
- 
- @item [F]
- YaTeX:read-coordinates
--@itemx [A]
-+@item [A]
- Base prompt, X-axis prompt, Y-axis prompt     (each optional)        
--@itemx [D]
-+@item [D]
-   Read the coordinates with the prompt ``BasePrompt X-axisPrompt:'' for
- X-axis, ``BasePrompt Y-axisPrompt:'' for Y-axis, and return it in the form 
- of ``(X,Y)''.  The default prompts are @code{Dimension}, @code{X},
-@@ -2199,9 +2199,9 @@
- 
- @item [F]
- YaTeX:check-completion-type
--@itemx [A]
-+@item [A]
- One of the symbols: 'begin, 'section, or 'maketitle
--@itemx [D]
-+@item [D]
-   Check the current completion type is specified one and cause error if
- not. The variable @code{YaTeX-current-completion-type} holds the symbol
- according to the current completion type.
---- a/docs/yatexj.tex
-+++ b/docs/yatexj.tex
-@@ -1,4 +1,4 @@
--\def\lang{jp} % -*- texinfo -*- for Texinfo V.3.1 
-+@c \def\lang{jp} % -*- texinfo -*- for Texinfo V.3.1 
- \input texinfo
- @setfilename yatex-ja.info
- @settitle Yet Another tex-mode for Emacs
diff --git a/app-emacs/yatex/yatex-1.77.ebuild b/app-emacs/yatex/yatex-1.77.ebuild
deleted file mode 100644
index 3909baa70f86..000000000000
--- a/app-emacs/yatex/yatex-1.77.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit elisp
-
-DESCRIPTION="Yet Another TeX mode for Emacs"
-HOMEPAGE="http://www.yatex.org/"
-SRC_URI="http://www.${PN}.org/${P/-}.tar.gz"
-
-KEYWORDS="amd64 ppc ~ppc64 x86"
-SLOT="0"
-LICENSE="YaTeX"
-IUSE="l10n_ja"
-
-S="${WORKDIR}/${P/-}"
-
-ELISP_PATCHES="${PN}-1.76-gentoo.patch
-	${PN}-1.76-direntry.patch
-	${PN}-1.77-texinfo-5.patch"
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	# byte-compilation fails (as of 1.74): yatexlib.el requires fonts
-	# that are only available under X
-
-	cd docs
-	makeinfo {${PN},yahtml}e.tex || die
-
-	if use l10n_ja; then
-		iconv -f WINDOWS-31J -t UTF-8 ${PN}j.tex  > ${PN}-ja.texi  || die
-		iconv -f WINDOWS-31J -t UTF-8 yahtmlj.tex > yahtml-ja.texi || die
-		makeinfo {${PN},yahtml}-ja.texi || die
-	fi
-}
-
-src_install() {
-	elisp-install ${PN} *.el
-	elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-
-	insinto ${SITEETC}/${PN}
-	doins help/YATEXHLP.eng
-	doinfo docs/{${PN},yahtml}.info*
-	dodoc docs/*.eng
-
-	if use l10n_ja; then
-		doins help/YATEXHLP.jp
-		doinfo docs/{${PN},yahtml}-ja.info*
-		dodoc 00readme install docs/{htmlqa,qanda,*.doc}
-	fi
-}
diff --git a/app-emacs/yatex/yatex-1.80.ebuild b/app-emacs/yatex/yatex-1.80.ebuild
index 70503b9d1dff..7a2a90dc7a7a 100644
--- a/app-emacs/yatex/yatex-1.80.ebuild
+++ b/app-emacs/yatex/yatex-1.80.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"
@@ -9,7 +9,7 @@ DESCRIPTION="Yet Another TeX mode for Emacs"
 HOMEPAGE="http://www.yatex.org/"
 SRC_URI="http://www.${PN}.org/${P/-}.tar.gz"
 
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 SLOT="0"
 LICENSE="BSD-2"
 IUSE="l10n_ja"
author	V3n3RiX <venerix@redcorelinux.org>	2019-11-03 16:06:58 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-11-03 16:06:58 +0000
commit	bd4aeefe33e63f613512604e47bfca7b2187697d (patch)
tree	adb35b5a9a00ee7ea591ab0c987f70167c23b597 /app-emacs
parent	48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff)