8 files changed, 31 insertions, 52 deletions
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 58e3e8f97706..ecaa4ffa09d4 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/circe/Manifest b/app-emacs/circe/Manifest
index 97eebeba76f5..1d8d4123ff34 100644
--- a/app-emacs/circe/Manifest
+++ b/app-emacs/circe/Manifest
@@ -1,8 +1,6 @@
 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
 MISC metadata.xml 365 BLAKE2B b725f9635d4c4b98167ccb4145c0e7c9fa32b39cf18e79e7f86e583897bb2a79bdb0aa6fc070c53ee0fd03b41685ffdb9f7636c10ff6bfc1c7244f81e4b417a1 SHA512 9e3191129263a25e6ecbf4f7252b326a1addcb110a324d9a4c277ce7a152c086f361796454174e01696be6ad3f9404628b4c9264e3bb7ac2644eb2f72c8e3657
diff --git a/app-emacs/circe/circe-2.11.ebuild b/app-emacs/circe/circe-2.11.ebuild
deleted file mode 100644
index eecc09dc8adf..000000000000
--- a/app-emacs/circe/circe-2.11.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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/multiple-cursors/Manifest b/app-emacs/multiple-cursors/Manifest
index 9ab775103cc7..23c8fdbd9776 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/multiple-cursors/multiple-cursors-1.4.0.ebuild b/app-emacs/multiple-cursors/multiple-cursors-1.4.0.ebuild
deleted file mode 100644
index 97a40f1ad198..000000000000
--- a/app-emacs/multiple-cursors/multiple-cursors-1.4.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit elisp
-
-DESCRIPTION="Multiple cursors for Emacs"
-HOMEPAGE="https://github.com/magnars/multiple-cursors.el"
-SRC_URI="https://github.com/magnars/${PN}.el/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-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/vhdl-mode/Manifest b/app-emacs/vhdl-mode/Manifest
index b913b5c68931..8dff75ee68dd 100644
--- a/app-emacs/vhdl-mode/Manifest
+++ b/app-emacs/vhdl-mode/Manifest
@@ -1,5 +1,7 @@
 AUX 50vhdl-mode-gentoo.el 146 BLAKE2B 4a747d323606390205a52c3cebfd1e54b153e9e18ec3fa5ed557493df1579b783cd29fdef2a031f6b8f8c573fa3eb82e312c8e7449a5e91ffd00ebe9b4c874c1 SHA512 22f1d437f487fc2c0e739000687424271027c2defa87eec696c79ff5df958c6087475c7ff84c2af39e2eb756401ec1d4b1f013a27af1639c416843899333ee21
 AUX vhdl-mode-info-dir-gentoo.patch 522 BLAKE2B 35204f9ec727ec5ec44ecc03a99cedd5a5a3bc62e59dac577ed40dd0099cf08788b149e16d4fc0c2953dbe70bad8810eaed8496165e3b65ae1d8c23298a2aa5d SHA512 7ca2b0ea5c07255bf99e6a9105c120df924178a596e97d6a1bfcedfda4bcdf4f093f1383d1ea2a1383207c19971a110696ef9b49b17542e79d92c4501316039d
+DIST vhdl-mode-3.35.1.tar.gz 316090 BLAKE2B 5517c7881fc52df631d3efeb82e88d0b5db7038575eb378e241d062c4746d810ab308005b24570725ab244d1d3229b69896f8821944b15664561a38d828f4ae3 SHA512 963d4c8c938c9c9279a7ab862da6fc91257ab270e8eefb185d73b9c9217c4cc7b7330f2b33300bb7b604ed348543621d8371685e7e4a8f29d596e76ce8795f1c
 DIST vhdl-mode-3.38.1.tar.gz 318400 BLAKE2B 2ddad9f4e8fdb0fafd2e27075f5722fcf7959a2b50ad61c5860af52706d9579065e0880d7b9bd1b884c21cfc902760dff006404490c8cbb1474831aa4c6d841d SHA512 2cc12994e17658d65cffa348c59ac3208cc0f498731941b8f64da68e258ca57d6aa500d72103b005996cf3496e119cf59b52bbc1c4b740401685030b42f272a8
-EBUILD vhdl-mode-3.38.1.ebuild 521 BLAKE2B 6daf2a4dde624f116e6d1aebc272c7cc4e4ed2e35ac7e74892a146ab728becf5bfbf591c1355f789bcfd52472d1a84eeabea247eae72c97d4e0797357b35d9ec SHA512 10a2e5ffa339d897d17eb6618429fbcc4b1e539c03e4d543b39c186d7abc88b83cd8d813b771f67637ec7686e5eb785d031ac84c291708d3b054359e23524776
+EBUILD vhdl-mode-3.35.1.ebuild 530 BLAKE2B 2301997d33cf7a51789b8c66a15439cdb7a63c102cffb8cd48dc381d8f920863fed59a0b50e603516a8e9476d402e8ae09cc172779fe36d6f26e9462b1d47648 SHA512 1c1c7584288f7a3e9a666d4563347441da782deeddb49eed51a305beb21cb1aa6c062a0355ae8454130006532134b8bd0379928ec17fe2d7e035fb0f4da0f515
+EBUILD vhdl-mode-3.38.1.ebuild 533 BLAKE2B 88d38d63abb7ae205d808b248b5fa9656f41f1edf147f0fd797928616aa9901acf44e0365351e941689b11de76dc4d391a0490d738f5d108e877e0ee9239060d SHA512 47b31b47cd00c415f8ddc14814f1339a826e234999b0f36ea6ce170b9a8822c210320e07fa0e03acdbb69a3a0506b5089ad38e7bc40b96af2124edf93c836b6c
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/vhdl-mode/vhdl-mode-3.35.1.ebuild b/app-emacs/vhdl-mode/vhdl-mode-3.35.1.ebuild
new file mode 100644
index 000000000000..60a209731182
--- /dev/null
+++ b/app-emacs/vhdl-mode/vhdl-mode-3.35.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="VHDL-mode for Emacs"
+HOMEPAGE="http://www.iis.ee.ethz.ch/~zimmi/emacs/vhdl-mode.html"
+SRC_URI="http://www.iis.ee.ethz.ch/~zimmi/emacs/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+ELISP_PATCHES="${PN}-info-dir-gentoo.patch"
+ELISP_REMOVE="site-start.*"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="ChangeLog README"
+
+src_install() {
+	elisp_src_install
+	doinfo vhdl-mode.info
+}
diff --git a/app-emacs/vhdl-mode/vhdl-mode-3.38.1.ebuild b/app-emacs/vhdl-mode/vhdl-mode-3.38.1.ebuild
index f6225cb586c5..b998478a45d4 100644
--- a/app-emacs/vhdl-mode/vhdl-mode-3.38.1.ebuild
+++ b/app-emacs/vhdl-mode/vhdl-mode-3.38.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,12 +6,12 @@ EAPI=5
 inherit elisp
 
 DESCRIPTION="VHDL-mode for Emacs"
-HOMEPAGE="https://iis.ee.ethz.ch/~zimmi/emacs/vhdl-mode.html"
-SRC_URI="https://iis.ee.ethz.ch/~zimmi/emacs/${P}.tar.gz"
+HOMEPAGE="http://www.iis.ee.ethz.ch/~zimmi/emacs/vhdl-mode.html"
+SRC_URI="http://www.iis.ee.ethz.ch/~zimmi/emacs/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 ELISP_PATCHES="${PN}-info-dir-gentoo.patch"
 ELISP_REMOVE="site-start.*"