gentoo resync : 06.08.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-09-06 10:28:05 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-09-06 10:28:05 +0100
commit: f1af93971b7490792d8541bc790e0d8c6d787059 (patch)
tree: a38046712bbc3a3844d77452d16c84e716caa3d4 /app-emacs
parent: fc637fb28da700da71ec2064d65ca5a7a31b9c6c (diff)
116 files changed, 960 insertions, 612 deletions
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index f842b31fba31..3d49fd1dd4e8 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/actionscript-mode/Manifest b/app-emacs/actionscript-mode/Manifest
index 10a0686f747f..9a7b8b7262d8 100644
--- a/app-emacs/actionscript-mode/Manifest
+++ b/app-emacs/actionscript-mode/Manifest
@@ -1,6 +1,6 @@
 AUX 50actionscript-mode-gentoo.el 270 BLAKE2B e3ad9140ed1c92d78fdd3aa60855bacce78f798c8cecfcab158c04340da231bc5a0338fa3d8bd111d1770527a9b00bbeb123e50f4e71d7e9e673f70aaeb41462 SHA512 0e991f231e57ff72f992670f6469f36409fc89243afc5d6955b9035fa835cd4af2b107d59031a692c07c3d66b3e6e82941659619e344fef5a5b3b4c423437a3e
-DIST actionscript-mode-7.2.2_p20120405.tar.gz 8226 BLAKE2B e8f33f3320b4b0891b244963fea282e16d50cb256fe4439a2f26bc2640607d5f530b537392248832f695d9f4ac5b89f6a8e0f17ae6941aa4ce58b0ba1c028e1b SHA512 79f59b5c6e53d8b7b5a765579629e956a90adadac65c8a46be883cb22813a15437cc63a0ec1a5c9b44e2034284f5d7c4405bbf3670861186f7a85af0a1e720fb
 DIST actionscript-mode-7.2.2_p20140605.tar.gz 8276 BLAKE2B 8fbe8147b1626f4e454753ae92baf14020424c0806aee4a9e050b789770e7bd1f19f45b0d493fd94af0d05ce541916c0dec1bad2327b285de77e8d27a7a1e675 SHA512 05a3a0a0bc185bdbc96bf292a220912e8649acd20eb3f55dbfde04cd956da3e4f71daa10957bb2ba6e150589f626ec1059908e3b294a643b4034a6c08e507fb8
-EBUILD actionscript-mode-7.2.2_p20120405.ebuild 648 BLAKE2B 7d836606f7f7f3c7add965ea9bd4377c6b4bef01258dd77b49ca5344cd935b4ec253568eb21221e42046c33ff8360e0f4c8f2535d2b105d90aceb512347b872b SHA512 d7ec42df1ab94d55f844491545f2ba533392c3b5e9d67d703a9f60ab9dc6fcae94cca26265590836b9387016d64fd38df09dd450c1485fd792c03ce0365609e6
+DIST actionscript-mode-7.2.2_p20180527.tar.gz 8446 BLAKE2B 4ce386be79ee4059e99cfef523036733a7c16a4bf24950dc77bd66ab03f9e07476507589fbc1a337f1f54cd4bf75234d2307ea630d642ee3306f2390e16fa0e1 SHA512 251877acec4ea79c03a67b3de441633080b421b5e84ef04d072e02916eb3e1c7b89beb18a897fe8165a0b39247da5a01c8d2b6980887dbf15ab3c5d38c39f279
 EBUILD actionscript-mode-7.2.2_p20140605.ebuild 648 BLAKE2B d4cc2e0ecdbde972bc6dd47103be11ba74acbe2d52e93509818b37832b8fa4bc34c88df4882e85dfa2986d56724e6474f100d47b0a4ae33ab6b322171e3f768a SHA512 4375a370c110599c159aec9eab45e7d0ead0272b52a800e320d13a05592749ea241790cf57e33069208dc7a39f92f1d4484559c0a236ad13229771a78c0586bc
+EBUILD actionscript-mode-7.2.2_p20180527.ebuild 525 BLAKE2B 1fd1602e443c88d44e084192f5778ed74c51ca8830db5f92da2255e9b062a6f622634ee006cf82e7ba53892d0115252e006b6e9160c08d25182190605a3dcc79 SHA512 d9672cc6f6471714e237279bfe117ddb23faeb212267c190bfc0468262a06a3a91a5f9dd95d04c06a3724ca2d68ee4c89b655632044f43194aee33a021cc8d64
 MISC metadata.xml 373 BLAKE2B 459d26d032a23887848eca1b521e609ba0799b2b85ee625b4ab6918562c55e0513fd4946caac21b0736d2f65648d30630c7b12f5b74f7b8f191f6d429f1b34f7 SHA512 3459389fdaaec6cf0126421ed50e0e3b06262771233808b5e3f1563ae2216e32f294396336fcf55b9807f1e2418cd17291e10ffad9d23436a19662b7e23d634e
diff --git a/app-emacs/actionscript-mode/actionscript-mode-7.2.2_p20120405.ebuild b/app-emacs/actionscript-mode/actionscript-mode-7.2.2_p20120405.ebuild
deleted file mode 100644
index bcfe47642bf7..000000000000
--- a/app-emacs/actionscript-mode/actionscript-mode-7.2.2_p20120405.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit elisp
-
-GITHUB_USER="austinhaas"
-GITHUB_PROJECT="${PN}"
-GITHUB_TAG="aa7e63d566a815152e7e652010becd46a406abb2"
-
-DESCRIPTION="A major mode for GNU Emacs for editing Actionscript 3 files"
-HOMEPAGE="https://github.com/austinhaas/actionscript-mode"
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/tarball/${GITHUB_TAG} -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DOCS="README.txt"
-SITEFILE="50${PN}-gentoo.el"
-
-src_unpack() {
-	unpack ${A}
-	mv "${GITHUB_USER}-${GITHUB_PROJECT}"-* ${P} || die
-}
diff --git a/app-emacs/actionscript-mode/actionscript-mode-7.2.2_p20180527.ebuild b/app-emacs/actionscript-mode/actionscript-mode-7.2.2_p20180527.ebuild
new file mode 100644
index 000000000000..76ae4442f222
--- /dev/null
+++ b/app-emacs/actionscript-mode/actionscript-mode-7.2.2_p20180527.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
+
+COMMIT="65abd58e198458a8e46748c5962c41d80d60c4ea"
+DESCRIPTION="A major mode for GNU Emacs for editing Actionscript 3 files"
+HOMEPAGE="https://github.com/austinhaas/actionscript-mode"
+SRC_URI="https://github.com/austinhaas/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md"
diff --git a/app-emacs/analog/Manifest b/app-emacs/analog/Manifest
index f06816fe07ba..293176ea561a 100644
--- a/app-emacs/analog/Manifest
+++ b/app-emacs/analog/Manifest
@@ -1,4 +1,4 @@
 AUX 50analog-gentoo.el 88 BLAKE2B 980fb76a8230eb768cc675d46bed630afb1e9a62301f9d47b963f00b0e3b4dee60cf497ee68a9044f48abcf7bf6d23b69eb434961e320232ffda8854c1fedf6c SHA512 a74fbc95f45893507aa84dcb6e10f5e41fc65678ceaba2f1370ca75319a9f3287c9476bc453df9ff4545a976574770dcb1ba906536a8f090aa0a273f2bb7d6dd
 DIST analog-1.9.99.el.bz2 9626 BLAKE2B e96802c075d078b4f8a951176b52457da4a6cc52d909a1ffa6dec32fce85036b38acadc1a667e0d93808abe5b3f3ae2f22be071950948da13712a864cd500233 SHA512 c4ce5dcce93805cf4cbcd3316f044485adaa36e6479956f2a87c8bb6a6c1522e46a60cb8ef5a4bb3fd6a60187c4ed6760f74afe870c7491ba5c3e760ae2d6cc0
-EBUILD analog-1.9.99.ebuild 379 BLAKE2B 487d46f29fe373c6f80a68dbd782159c6ba34075207e240ef4d2e47b714f115162ac0b0b3eef0c34733f6737a2b3c52313cb5e7d54681fe54e4e84924c16bc1a SHA512 0379a4d03f09fd7db408545177d063aed0d3da8ba515172c93fda0689088352f26704155052f77ee9e5bc31f15265dfe98ca510fb9f3594d6b736792425eabf7
+EBUILD analog-1.9.99.ebuild 412 BLAKE2B 349fd4cd63bae197bbee95cae5646837837cd57b73bf038abb3f5a552e131e7e8357739f2f1dd9f7c37ec7419d8dd50fb3f84ceafd7886fda26efea50b811782 SHA512 005fada2dc9bf724bd26bcb48f6fa9c3fd2efc0b413b46412258cbc44cd13bc2ca6517f8e0a55564033826656dedf8158e00d2a8dba71e55109df533680cb060
 MISC metadata.xml 600 BLAKE2B ec65a935c59d940ce6afeb1139aef9dd94ee0528f3d80aecc6fd228afbc9f8db179fc74e51e56bf5481021243ef274821ecb8a7e1389039658aed574c28736f0 SHA512 a4d9c8051340ef0440b989cec1fb43aeaa9bed9fd09d8d5d8d24c7e5d830e76603aee816d984ebf4d7a54517604e74189a97204b855745925852719537ac174a
diff --git a/app-emacs/analog/analog-1.9.99.ebuild b/app-emacs/analog/analog-1.9.99.ebuild
index b4aa33cca786..9e84b75732da 100644
--- a/app-emacs/analog/analog-1.9.99.ebuild
+++ b/app-emacs/analog/analog-1.9.99.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 inherit elisp
 
 DESCRIPTION="Monitor lists of files or command output"
-HOMEPAGE="http://mph-emacs-pkgs.alioth.debian.org/AnalogEl.html"
+HOMEPAGE="https://web.archive.org/web/20150919120435/http://mph-emacs-pkgs.alioth.debian.org/AnalogEl.html"
 SRC_URI="mirror://gentoo/${P}.el.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-IUSE=""
 
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/apache-mode/Manifest b/app-emacs/apache-mode/Manifest
index 86d8be815802..686b2840f77d 100644
--- a/app-emacs/apache-mode/Manifest
+++ b/app-emacs/apache-mode/Manifest
@@ -1,6 +1,4 @@
 AUX 50apache-mode-gentoo.el 499 BLAKE2B a49be09cf0a7ef07263899bcd1ba7485228cec4932bb7e756d2f31fecc63299389b68e9c3d6e08b2664b0e4d187f92550fe785bcd3d8b241b7a8a1bb3b707128 SHA512 4193ed796f1bd433ad33f61e2d23eafb6cde2114304f51c20464827d25185408749eccadb006663be25bb3a62b206deedf654bf0398b3e5ef94773a53ba28caf
-DIST apache-mode-1.1.el.gz 3468 BLAKE2B aa89b18877049fa8399ef75dd048e40eb84c20dec4365b08bcb1d1df2a14e4a2d63a2baff3bfeed1bb01fdd0489a757b3377ad21d311c03e958650e68a0f927b SHA512 4eb42a0b4db847026832f14473dfc6cfea6c436eaed5a52c2ca3ba27cc89b0b36b0e7be1472048e1c559f3b5d5a5e7e85b9e2cb9c5563bf781f241b540e141f1
 DIST apache-mode-2.2.0.tar.gz 16077 BLAKE2B 25b153dde0488febd361463b0f43207bd10680f7db2f28f32aa1955f9edc5a07c501646580afd124c7787da3283aa2ee4a2209bfd57f68bf73d5ad07fac41ca7 SHA512 3b309291813b309215250fc1ae1ff206df6474981302a145c305adebb6ffe6a20338b9d8fd5fef1ba491a6bd2427d372178f02d90af214dd24d389c574789aa5
-EBUILD apache-mode-1.1.ebuild 377 BLAKE2B 8818e51c9504cb143b83046ec9c33b085dfcb24e714e63138127c54f83de31b73c4161144a1b2304508832857fc97b038ed6226f0e23e1c9cde55c8c0e576501 SHA512 ae7e50866fff671b94acd287b8671ec77e5ffecc093c6f685afdb3be1e48f3178f2f4ac5d832e37897add19a2fa14e062a2899f01ec11e34f78fcbd3c7eed894
-EBUILD apache-mode-2.2.0.ebuild 441 BLAKE2B 111fb27fadd500d98507c881a7cc95168bbc98d202651c86365593571810f261efe6118e5bb2ef480e8d032d123f90de0e2c6685e20c9b71df7efbcf5992b182 SHA512 4c5f8a3cdd3015337c0886dd6be0256047a6942de455f4c12faddf23286fc647eb887523f01d509dee1f8ed1fad5301a9189a8b54ee7dec27e0b74d24b3ad66a
+EBUILD apache-mode-2.2.0.ebuild 432 BLAKE2B 8203d0d9d402f4d6f586432f12ca42d5f5b8bea3e87dc080f8b666b54e1902d4e2e2292f3b718695701a192e2f77ee5ad4588fe0919352d35faba0a56566ea71 SHA512 ebeae3f1222bd62dbff9849d70ba304b691980d35a067037aaa62ffbdf19845d692652ee962fe43e03ce07ef1ff179c00e74829d2e9550b8354120536b1f7e72
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/apache-mode/apache-mode-1.1.ebuild b/app-emacs/apache-mode/apache-mode-1.1.ebuild
deleted file mode 100644
index 7fc337a8f516..000000000000
--- a/app-emacs/apache-mode/apache-mode-1.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit elisp
-
-DESCRIPTION="Major mode for editing Apache configuration files"
-HOMEPAGE="http://www.keelhaul.me.uk/linux/#apachemode"
-SRC_URI="mirror://gentoo/${P}.el.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/apache-mode/apache-mode-2.2.0.ebuild b/app-emacs/apache-mode/apache-mode-2.2.0.ebuild
index a3c41f739d3a..fc4c04af2ca7 100644
--- a/app-emacs/apache-mode/apache-mode-2.2.0.ebuild
+++ b/app-emacs/apache-mode/apache-mode-2.2.0.ebuild
@@ -9,10 +9,9 @@ DESCRIPTION="Major mode for editing Apache configuration files"
 HOMEPAGE="https://github.com/emacs-php/apache-mode"
 SRC_URI="https://github.com/emacs-php/apache-mode/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
+KEYWORDS="amd64 ~ppc x86"
 
 SITEFILE="50${PN}-gentoo.el"
 DOCS="README.org"
diff --git a/app-emacs/apel/Manifest b/app-emacs/apel/Manifest
index 50fbb5d92f9b..ad040beb81c7 100644
--- a/app-emacs/apel/Manifest
+++ b/app-emacs/apel/Manifest
@@ -7,5 +7,5 @@ DIST apel-10.8-030_Use-new-style-backquotes.patch.gz 7869 BLAKE2B 93b93a089693a2
 DIST apel-10.8.tar.gz 126326 BLAKE2B 6fc8f04006a971e9d48dbf5f7b43e201a4f5fa515210bb69829bc3b0f05aba2e9f205915e6117e20220ae5b48a6543520533dc95a90754a30ff3fb8094779901 SHA512 39f13f15ec0a078d8f8dfe797899474cf4dfeb0bf7b8432a0c05bb38cf134d805c171a66b3d3efd074fbf294d68006d1e1d49903e45f1991d79cdcb4cca4aa9d
 DIST apel-10.8_p20190407.tar.gz 94808 BLAKE2B 47540e8c3ce96cc91efefe521942a3df4ee8423c7796d7e66b14bed7e9d662469a0767dd4863ae130fb114a1f9335d95abd13d61b6811e039db75e28679ac0f6 SHA512 6c780b0643f248e2a1409f1cea794dc6be515ee2ae766ead0834996bd9c13852492af1b9c343c4efda06fd057fae0c1b8a1ffc6b55b1469afbc7cbf1b579ea68
 EBUILD apel-10.8-r1.ebuild 1494 BLAKE2B 330d33b3436b607e3de6d46ef5ff15fb4208230c166ff3eccc837a57cdbc7885b5ec0bfad83976b1d3c2ad54e71c5dd1433903daf18c4b00fb14400f6d5c2538 SHA512 5b4881c7a966d1ee0fd82d931964d377c91a4df4647190000e3fb53a46c3eca0df9c705a34a762f2846a5a9696049d240b9549551e6a2e7151f772a16acf5c15
-EBUILD apel-10.8_p20190407.ebuild 1196 BLAKE2B 6330a54f618c4346e32c9c07e7f5ad8b8400ef78735d512adbd4940e39ce61f75a7768721e77764a7a6df3408580c960371927f4db822a5645a46015cbc76972 SHA512 c41bc722cb809cd9e1a69f1665e8b7fee05060ec1ce0f3c4975b893c5562f51e740aecab3b6c255d3961754b6950369cabb3ebe6d5d1f1adf2fec805ca107800
+EBUILD apel-10.8_p20190407.ebuild 1219 BLAKE2B 76c23074e899b3f5911d5c82d69168a7f2e0ff3e7475be5244af4fd4c7ad18c79cf7584ad8606de2b9e344a9a7d468a9f3eb69cb4b63e065738a0feaea35e3ed SHA512 a60a906313306d25d2854a5c42db8d7d345b9899462146c6d9634847d03569692841f0449b263c2d5762ca368f07d4fe6cee569b8e5132f1d7baff4d6f634758
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/apel/apel-10.8_p20190407.ebuild b/app-emacs/apel/apel-10.8_p20190407.ebuild
index a218a947a7b3..a810dc04e8d8 100644
--- a/app-emacs/apel/apel-10.8_p20190407.ebuild
+++ b/app-emacs/apel/apel-10.8_p20190407.ebuild
@@ -8,7 +8,7 @@ inherit elisp
 DESCRIPTION="A Portable Emacs Library is a library for making portable Emacs Lisp programs"
 HOMEPAGE="https://github.com/wanderlust/apel"
 GITHUB_SHA1="d146ddbf8818e81d3577d5eee7825d377bec0c73"
-SRC_URI="${HOMEPAGE}/archive/${GITHUB_SHA1}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/wanderlust/apel/archive/${GITHUB_SHA1}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/app-emacs/auctex/Manifest b/app-emacs/auctex/Manifest
index bda9a1fed2bf..390b7c8834ef 100644
--- a/app-emacs/auctex/Manifest
+++ b/app-emacs/auctex/Manifest
@@ -1,7 +1,9 @@
 AUX 50auctex-gentoo.el 157 BLAKE2B c7d59a1ff3fc08b60332f5f578841c942d1a302f9a594409b3cd6509fd254c0d8d4273061d2ec4f444ad9288b073900e4c07e9307ffe0421182e7380c4c73543 SHA512 7cfc10c95da1d920b3861eaa9950d5ddd2388af5086cb81457f084f9c094b15dae9638a8c1e9b662dedba90c2d3c33a972011b99d9e2d71d85f99003de5ebef2
 AUX 60auctex-gentoo.el 97 BLAKE2B 18cad086f4211844f8a32d0f2499d2ecf29cd41f90c9dee6cf87184f81b0ac3836a5a58705677b55f926bdeb5854aa9acd6438f42e29856acf6c6c644592e347 SHA512 2cf945ac36ad5b25afd723d04223556522ac901a469bdd47d0c7562beb985401df957acc100222df6d97f4335b6d3e8d003f6b00b86780eec0a906ff0fc2ccb4
+AUX auctex-12.1-autoload.patch 1373 BLAKE2B 8ef031135245b0f54f3789a8070253f5a32fbf12ed001d1256ec55fb6d349f2fef3fd880cff4c35464c79d2fe041c1744f1918626d671289a46f006973f9aca9 SHA512 935dbc8a145c44d655c85b6725bbe61bc165adf4561d4b6583a63a2c950b5221ed552fe53884ab026a086720d29486c7bb8b07897b8d64b0cf591f5a2db5bd8f
 DIST auctex-11.92.tar.gz 1486606 BLAKE2B 6e34d1da3bacad8f2baee2f13eb44a5b617a342c294ef4d7ba28059b678510e1d161f3f02fbcf38128c09ab4996a035e5ec28898134b967d88ad621b8b477845 SHA512 758bf82903ba0499decf0ade77c7ac70865132a24195d7e8794538b7857c448811b7ef26149a915b60ed3ee34c2ebaddb3282a320bd459c9ee3f461d6ee9b84e
 DIST auctex-12.1.tar.gz 1476296 BLAKE2B 1dd5db94b5b7bb572919fdcb6c7dd2ea4d17f816204bedc69756610b80370ca748a06ab100ef8221107605a5e464b6a8c2587b728ba6a964776ea6dfeb7f7165 SHA512 4c27a3b16eaf98db164832497c497576fcabb274b24c6eb3060625b7711b1de91fce9a52f7c7caaec77a93768a6ce2ec173ab1ccb72f4c56c51cc4740d380d97
 EBUILD auctex-11.92.ebuild 1481 BLAKE2B bdc0e1ceac0c607c80405865897c909be1be015a968419e2ef7302abb104e465a54eac7dc42d1cdaca1d215dc8ccdd07452ef5db20d3b5cf9e40613da935560c SHA512 9048e1c9a7e11f5e6e8b70d50c507083f90f0a2b3d0bdcee52a320902bc4fd78a6f8069442dfef57fb6fe78d18b82bf0787d70c4a22effcd182babb9e0a9b226
+EBUILD auctex-12.1-r1.ebuild 1535 BLAKE2B 9fb6d5cb547dc7e988c6e66577f970dcbee52e1b47f61127bfac636c55264918344e8fe6cd877f8d1378cc24e211e5d121512d433707ca6f754f0843656bda17 SHA512 b873249e97163a1d0ba1fe3824fef57f374c116ab46c188c0071d16741fcb0f428fd80bd6ed447cee531f0d76cb65df76785569685d16509e134e5a8fc68146e
 EBUILD auctex-12.1.ebuild 1492 BLAKE2B 3903ffbf021f696664750fea082ea8ba60901fee19ceb8cc85e4e8eff97237c9af1452c20b49b860b335a7fb3947ecae45896384772cda1a203e589b44f11e37 SHA512 fb4cf29c28e2aab5a316d951033ddb2efc563434983f5e74a42c4d8a02068e70f2d2cf74801aba5fc7ef8696a2c1c3d1c5b23c5fc520c2cd3da9c8e0361591e9
 MISC metadata.xml 947 BLAKE2B 0b5e298fd9ca7112b8bd91bdc8cee455fff18d6ef21820c9e3da7058c860462fe96a7fe29792cc143d9e1876495fe3ee87e09e006b203ad448e511c12983c383 SHA512 61629e82f0004763e776db51ace13d583eac8d1199ebb61d17a101d48dd60258db4310fc938b82822c64b0ee9d39d9095fd86c316585e54ea9e7872a1247763a
diff --git a/app-emacs/auctex/auctex-12.1-r1.ebuild b/app-emacs/auctex/auctex-12.1-r1.ebuild
new file mode 100644
index 000000000000..dcd803eff7f9
--- /dev/null
+++ b/app-emacs/auctex/auctex-12.1-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="Extensible package for writing and formatting TeX files in Emacs"
+HOMEPAGE="https://www.gnu.org/software/auctex/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+ FDL-1.3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE="preview-latex"
+
+RDEPEND="virtual/latex-base
+	preview-latex? (
+		app-text/dvipng
+		app-text/ghostscript-gpl
+	)"
+BDEPEND="${RDEPEND}"
+
+ELISP_PATCHES="${P}-autoload.patch"
+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/auctex/files/auctex-12.1-autoload.patch b/app-emacs/auctex/files/auctex-12.1-autoload.patch
new file mode 100644
index 000000000000..3ee765d94ca2
--- /dev/null
+++ b/app-emacs/auctex/files/auctex-12.1-autoload.patch
@@ -0,0 +1,33 @@
+commit 1b88eda687913a3a355a010ed0483bfcfce28301
+Author: Tassilo Horn <tsdh@gnu.org>
+Date:   Fri May 17 22:07:10 2019 +0200
+
+    Fix autoload generation code (bug#35758)
+    
+    * Makefile.in (AUTOLOAD,PREVIEW_AUTOLOAD): Use arg instead of
+      generated-autoload-file (bug#35758).
+
+diff --git a/Makefile.in b/Makefile.in
+index 822eea9f..74659f7a 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -52,12 +52,15 @@ PACKAGE=auctex
+ PACKAGE_INFO=auctex preview-latex
+ EMACS=@EMACS@
+ ELCC=$(EMACS) -batch -q -no-site-file -no-init-file -l lpath.el
+-AUTOLOAD=--eval '(let ((generated-autoload-file (expand-file-name "$@"))) \
+-  (mapcar (function update-file-autoloads) command-line-args-left) \
++AUTOLOAD=--eval '(let ((autoload-file (expand-file-name "$@"))) \
++  (mapcar (lambda (file) \
++            (update-file-autoloads file nil autoload-file)) \
++          command-line-args-left) \
+   (save-buffers-kill-emacs t))'
+ 
+-PREVIEW_AUTOLOAD=--eval '(let ((generated-autoload-file (expand-file-name "$@"))) \
+-		(update-file-autoloads "preview.el")(save-buffers-kill-emacs t))'
++PREVIEW_AUTOLOAD=--eval '(let ((autoload-file (expand-file-name "$@"))) \
++  (update-file-autoloads "preview.el" nil autoload-file) \
++  (save-buffers-kill-emacs t))'
+ 
+ # Files and directories excluded from distributed tar ball.
+ EXCLUDEDFILES=autogen.sh .gitignore doc/.gitignore doc/tex-ref.log \
diff --git a/app-emacs/autoconf-mode/Manifest b/app-emacs/autoconf-mode/Manifest
index a4b188b8bf98..2a670128f042 100644
--- a/app-emacs/autoconf-mode/Manifest
+++ b/app-emacs/autoconf-mode/Manifest
@@ -1,4 +1,4 @@
 AUX 50autoconf-mode-gentoo.el 366 BLAKE2B 9394476da3892a5b857fe35ff9a6ecbacec761adec91465201259b03080a7303a1c5e6fe2767ffabfad1b156f4d362e1f025fef9ab131d89799912e0328090a9 SHA512 e917a5c7e7216da4624ac9463aa575569402383fd77d11b510c4752d1dfb54aa93c3cd29f3e3b198693c4f9ee9452611f5f342ecf57bf2c5f72b5e10ffab2d9f
 DIST autoconf-2.69.tar.xz 1214744 BLAKE2B 71d33d72a06e9a05fbed0eda73bc9d8a3805c7c90bf082959862f93f3c5f01192114176e84d84ecb58fa99512eafbc0ab21ad1407be18c8c63bb3dc1117c482d SHA512 995d3e5a8eb1eb37e2b7fae53c6ec7a9b4df997286b7d643344818f94636756b1bf5ff5ea9155e755cb9461149a853dfbf2886fc6bd7132e5afa9c168e306e9b
-EBUILD autoconf-mode-2.69.ebuild 549 BLAKE2B 888a6dcc0036d701a57978d2a38582fe06e3c245d81b6a0269a4cc994f625fb994dddc6a825c8dd7c0ab9596413d69991714bdf705c12007be4955f101f1735d SHA512 e23dd5c865c56bbf4d6f4cb6eac3e5426e72d0281bb21b75c6f162215227fa0d421519c5eb72d15ceb8dc36909a3e10e099f5a2794f97bc2b2dfff0464709e2f
+EBUILD autoconf-mode-2.69-r1.ebuild 549 BLAKE2B 8439c9c21b32ab9e774078f56e54164d8dd9452f523f6f6ebabc93e284aa36544c0055391b8f115ef3d680c87c1c56930da360d68cbfe3cfd5028cc15039cae6 SHA512 f7051a3a65ccf461baa4716da4c2ceb8d384e06b3d6f582739c82429c35c43935ea0fb48728d0096980583fa6539ebb0397b27aee246b78f929454f12b4f1b70
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/autoconf-mode/autoconf-mode-2.69.ebuild b/app-emacs/autoconf-mode/autoconf-mode-2.69-r1.ebuild
index 3ad20e46390a..2e7a5cec2cc4 100644
--- a/app-emacs/autoconf-mode/autoconf-mode-2.69.ebuild
+++ b/app-emacs/autoconf-mode/autoconf-mode-2.69-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 inherit elisp
 
@@ -13,5 +13,5 @@ LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
-SITEFILE="50${PN}-gentoo.el"
 S="${WORKDIR}/autoconf-${PV}/lib/emacs"
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/bbdb/Manifest b/app-emacs/bbdb/Manifest
index 60e2311ce82e..5d002257aa61 100644
--- a/app-emacs/bbdb/Manifest
+++ b/app-emacs/bbdb/Manifest
@@ -1,10 +1,5 @@
 AUX 50bbdb-gentoo-3.1.2.el 63 BLAKE2B 4e066577f6bbc4ddcc7a5b102c1bc650fd957d82468ed9782a97520db6acb2fb600372c4fcff7c21dd020080a3d4a5f41aaea15e5751ed5f22e17b9d2e04996d SHA512 3cb67cba1e12630c40b7c78572e7af0418c56d821c327c7b963cb00401a13f47da622b3a8e7a67795158b1394e860bcdf5ac3e478f8df9c5e3a97963bbd65a2e
-AUX 50bbdb-gentoo.el 115 BLAKE2B 69ff091d2da0819ec7bbc163c453a2621c12e6e1b685b577e9c2c16bce5a9c57c7afdf7ae35d113edc0b5e6e6e433f88155123646dd01f9cdb012824b81172b4 SHA512 c04101cfe2b1a13f9f25c6a8d5a9055cc4cda6e5b9208a563e6f1ed979e2585cffca97303f192f3a2b9f755d65ec3f86e68509293b874bf8020243eedbf99c50
 AUX bbdb-3.1.2-no-init.patch 4709 BLAKE2B 3e38c67d8347a8c6202ecddfa68847f0c9feab1593d84e5564607b3d9da104af93b5bb0862e899386555dd1abe5f8b7894c71575fc6a750db2e4332c5ad9c204 SHA512 3f262323cb35636d0249aafa54ff2a2e462df803d19c356bf2b7ed6a68410fa6e6bc41298a1e7fbeef224c84cf4bf9f80ff1ae068c5226ac6bea3ec62d593355
-DIST bbdb-2.35.tar.gz 393097 BLAKE2B 194924e828cb02022e90b49bc1c1cf8cfa23146e3118dbf6be7310930463c743f1648d54daf5f605f8d7a83ea307974084cbc07d630ae2273e8147a05dced799 SHA512 ee815f62796bcda63d37ae5a3805d065f6cc79648ca86852b97d4c1b849a1eb6c8f46dab2f257b9a8f9efc44d38469739f98137037c10f79f37a1ff235f6a413
 DIST bbdb-3.1.2.tar.gz 378935 BLAKE2B 3fc862d2d68632c997e3f250aa82cced743c3cc3861c74789bb12015ab99745270c79722dc0342334b90f4dd9071ef809ab670a342ac227c24a927870907c25c SHA512 8b32baadc4eb06b0abf533ccb1f540f4f407f27b8d2e847ae25e62d1405e1de5cfc6af16368eecd4086f281ee7a4016cf25568847b3cb798156c7e18e1912576
-DIST dates.el 7048 BLAKE2B 866a9a7a5524290a7762d0ad3c7b91766ca61fa025c2f634ce11909fdbd2a6d8bd7316ec66649590148a92660ef6122c93bac8085f333f1e319cc740349a8e90 SHA512 51b0dca58a1b54e913a0dbd97df12230ec49f05b368404fa3d49cddf4ca8e14dbff47a28087c4ba41b189a38a3608c77454e102ae5bb124d07d1ad3ec9c39e71
-DIST point-at.el 440 BLAKE2B fba28258d84c378985d2f17e28f0258e1e671f831f726e1d1289e84e246d9965300aa303c7f7dd383c9d33ec84e1e8bb014bba1e4f737661a5522a37ce6541ad SHA512 e38cbf39cb3f29f51f6759a7ba548f065c4763668d38c746eb69d9ab2384357f6b1c7f032a6afe739bc64658f5863730b7a4b3023cc9df1cc5e088e591c02760
-EBUILD bbdb-2.35-r1.ebuild 1831 BLAKE2B 27d7dc2da5c45c33d827030d6381b5cd329205c1ea7e51a65b2bd9c1805c0feb9b3fbe065de88f661715468f9a1873f1f26f8d0b4736ee84c158d14dfdb31310 SHA512 7b6a393f6c22933f748de30ce1be9a1b58d0f2d5ed90b403bb232cfb7eace715f14feb962c2543f15d458c11bd6131c2cdcc72cff3830008d8091d8f0726f311
-EBUILD bbdb-3.1.2.ebuild 1236 BLAKE2B b8d33d9d94984aad113fba3fa3ab2e6fdd75b1df4dab9803efe213dc84267fe1ec84625ff9d66bb90e45943c9cb0f3ded556ba7085f2a1201ba353c4b0904762 SHA512 b0a57c163c29f7eb3682ffc4ea6f1da679d9f238194d68d86785994009c96f34f41e97ec77a09f89d804767cb2f49a31cf5326256c8efffc8d4d54d3a3495695
+EBUILD bbdb-3.1.2-r1.ebuild 1252 BLAKE2B aa0e52adf4f144345ce9ab63158c28e0700992fa6166ad0dbaa2c0c774abb0d3096b75a754fd19bb796ddda5f6de3a4c5bbd67f80c0284f293e2e747271d2eb1 SHA512 b1af482f2570358068a5f2548b405cae3860b5493af9d7e212b2fd4091a2a7a8e55a552eb618996ee8b351b9d971726ef481726ab264c2f23a76d54e12a08595
 MISC metadata.xml 753 BLAKE2B 34f54aee0c3090fa9d9ee231f1f3ada71e889a4c4d7db76be9f0e351a4ae2333230c3338b014c2b267fd24610d788ede12749fe135f14d9760e76bd4e47d2827 SHA512 76dad950ad39c0f3442e2339dbf560154cc1b0685137c81e64224686ee31ff856dbd147aa04202250fa9595510c991d15609aec986dab26ad60bda3744902dda
diff --git a/app-emacs/bbdb/bbdb-2.35-r1.ebuild b/app-emacs/bbdb/bbdb-2.35-r1.ebuild
deleted file mode 100644
index f603c567dd93..000000000000
--- a/app-emacs/bbdb/bbdb-2.35-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit elisp
-
-DESCRIPTION="The Insidious Big Brother Database"
-HOMEPAGE="http://bbdb.sourceforge.net/"
-SRC_URI="http://bbdb.sourceforge.net/${P}.tar.gz
-	http://www.mit.edu/afs/athena/contrib/emacs-contrib/Fin/point-at.el
-	http://www.mit.edu/afs/athena/contrib/emacs-contrib/Fin/dates.el"
-
-LICENSE="GPL-2+ Texinfo-manual"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE="tex"
-
-RDEPEND="tex? ( virtual/tex-base )"
-
-SITEFILE="50${PN}-gentoo.el"
-TEXMF="/usr/share/texmf-site"
-
-src_prepare() {
-	sed -i -e '0,/^--- bbdb-mail-folders.el ---$/d;/^--- end ---$/,$d' \
-		bits/bbdb-mail-folders.el || die "sed failed"
-	sed -i -e '/^;/,$!d' bits/bbdb-sort-mailrc.el || die "sed failed"
-	cp "${DISTDIR}"/{dates,point-at}.el bits || die "cp failed"
-}
-
-src_configure() {
-	default
-}
-
-src_compile() {
-	emake -j1
-	BYTECOMPFLAGS="-L bits -L lisp"	elisp-compile bits/*.el || die
-}
-
-src_install() {
-	elisp-install ${PN} lisp/*.el{,c} || die
-	elisp-install ${PN}/bits bits/*.el{,c} || die
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	doinfo texinfo/*.info*
-	dodoc ChangeLog INSTALL README bits/*.txt
-	newdoc bits/README README.bits
-	if use tex; then
-		insinto "${TEXMF}"/tex/plain/bbdb
-		doins tex/*.tex
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	use tex && texconfig rehash
-
-	elog "If you use encryption or signing, you may specify the encryption"
-	elog "method by customising variable \"bbdb/pgp-method\". For details,"
-	elog "see the documentation of this variable. Depending on the Emacs"
-	elog "version, installation of additional packages like app-emacs/gnus"
-	elog "or app-emacs/mailcrypt may be required."
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	use tex && texconfig rehash
-}
diff --git a/app-emacs/bbdb/bbdb-3.1.2.ebuild b/app-emacs/bbdb/bbdb-3.1.2-r1.ebuild
index 58c9da5277c0..f4d2705ce4e8 100644
--- a/app-emacs/bbdb/bbdb-3.1.2.ebuild
+++ b/app-emacs/bbdb/bbdb-3.1.2-r1.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 autotools
 
@@ -11,19 +11,20 @@ SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+ GPL-1+ FDL-1.3+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="tex vm"
 RESTRICT="test" #631700
 
-DEPEND="tex? ( virtual/tex-base )
-	vm? ( app-emacs/vm )"
-RDEPEND="${DEPEND}"
+BDEPEND="vm? ( app-emacs/vm )"
+RDEPEND="${BDEPEND}
+	tex? ( virtual/tex-base )"
 
 SITEFILE="50${PN}-gentoo-${PV}.el"
 TEXMF="/usr/share/texmf-site"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-no-init.patch
+	eapply "${FILESDIR}"/${P}-no-init.patch
+	eapply_user
 	eautoreconf
 }
 
diff --git a/app-emacs/bbdb/files/50bbdb-gentoo.el b/app-emacs/bbdb/files/50bbdb-gentoo.el
deleted file mode 100644
index 7953b3c852a4..000000000000
--- a/app-emacs/bbdb/files/50bbdb-gentoo.el
+++ /dev/null
@@ -1,4 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
-(add-to-list 'load-path "@SITELISP@/bits")
-(require 'bbdb)
-(bbdb-initialize)
diff --git a/app-emacs/binclock/Manifest b/app-emacs/binclock/Manifest
index 5a2fe468a8f0..07aa3003a5f5 100644
--- a/app-emacs/binclock/Manifest
+++ b/app-emacs/binclock/Manifest
@@ -1,4 +1,6 @@
 AUX 50binclock-gentoo.el 100 BLAKE2B 99f128a3e3033ffabad1d18281dd70d091bfa1ad7ba213a87383bd0305829e5368a8d006a6a33bb2a6280726af11df28b6711bc8037fddf6b6b1ae254022abd6 SHA512 08997bbbba82da6b79ae2b8f60396b219bd837674d16a658c62306e13e3fe667d228c7e6e0949b9b44a2a346d3f5d2996cc853c2180ad1c1d877940da97a31f0
+DIST binclock-1.11.tar.gz 9594 BLAKE2B d5de646996cfeecde9000dcd20545005ff036eca24230cb847f4b21a3f458884f955dcb85cedfa21b8c01d60e030f95d426fa8ebbd8e66a61f2e02c0d64d9e62 SHA512 94ddc4a653a1ca119ff86b1c66cf74c3a1b3b15da32d56b4c0080d5226111b0ac31cf4262078ec40488172b14a6b37e66ba16c4bf7b7932293cb1e2a6199c0cd
 DIST binclock-1.7.tar.bz2 2734 BLAKE2B 57d872b2dc4259ca8cb033b8ff5359dd9f57fa2c7469b1ab6f2d0871cae74efef3f4874fac712b63ff783f50e0722e1959586a2e194426e0098c4e3bf16d8b5a SHA512 fe7d69605dc72777236930368e2900b71717a0a96655afa939c9cfcf76fb6cccc8c21cd81e933eed210a9e948b6d3681eb60f494f4aef276a1026a6dfe186354
+EBUILD binclock-1.11.ebuild 453 BLAKE2B e7c0232d0254b3f1e738f6118d9ecfa99982585c95c1b0810736cbcca36c25b7ce3a75132e284b379d2564f8d97f57cda69f74e210b1528fdcba63e2203ff2d6 SHA512 47ebc0e5a2dcfcb6832cb42ea8226a6ea289b2b692738fb1028b00138bf1a02184a0142bcf51a67907750ced85b7986a4b07566532562446534e79cb027e1a34
 EBUILD binclock-1.7-r1.ebuild 378 BLAKE2B 3b47dabd1b888c86dbc7fb29e1fb5ec3c3dc2acdddb9c6694d5f9e8020fd65862c521436c4cb6098ffc295a736015beb5d543c8ab737942ff716d775d2ea77c3 SHA512 964e059e07410d2fb8b878b860cd57e53d4000c7ce3aa7f97297b6823999a3f024a71f7328e621277b110de05644247077625d06f6bb88dfa9e35c942ba6eb33
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/binclock/binclock-1.11.ebuild b/app-emacs/binclock/binclock-1.11.ebuild
new file mode 100644
index 000000000000..7746cd1d12c8
--- /dev/null
+++ b/app-emacs/binclock/binclock-1.11.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="Display the current time using a binary clock"
+HOMEPAGE="http://www.davep.org/emacs/"
+SRC_URI="https://github.com/davep/${PN}.el/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2" # v2 only
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+S="${WORKDIR}/${PN}.el-${PV}"
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/bongo/Manifest b/app-emacs/bongo/Manifest
index f683d36f55f2..1971c13a2d51 100644
--- a/app-emacs/bongo/Manifest
+++ b/app-emacs/bongo/Manifest
@@ -1,7 +1,5 @@
 AUX 50bongo-gentoo.el 192 BLAKE2B 45600e17a12ca18572eb8112d40cd60f74ffe8569a592610829ecd289281a2440ece63fcd9d41733cc9a5817df07e32705173c6fe81bd09a989ce8553dd4a082 SHA512 57d89540ca341578d2ee4c2dd067b4532205874d88ef7d54be065abeb7c1d1e0ca295cf02d02cda6cf8fbc708a5946fc7f2d0541975bc5d56a9b06d27cf175f9
-AUX bongo-20070619-fix-require.patch 224 BLAKE2B c2668c5a34e003c4bdc4efe1ed789d7c6496032b003a94ff824036ca004c8bfdc56f11e0b7f88639b2c5b92792ab623ba097dbf1e86039cbd5d332ca7947462a SHA512 968d2c55d6abd0f22c238e7488c8c96d3faf08df9e74d83cae63df35be556f70608e63e525e280bc497172548678a9c8df976eca342e0190ad58622c1411cffe
-AUX bongo-20110621-texinfo-5.patch 258 BLAKE2B 0b4566c08b1a96874220f7b615bf16f3f4457f3872a89f82d1e4d9dc346e3b599da9611ec6b424e1f3b594bfc6afc2b1539ec8aaf7aeb8a1059481b39c9cb2c2 SHA512 ae03701a1372ee142902763d68d73a3fc0a3862fa7c9b5cbe916a85d965af0f6f2acc859564b56c5336eb1db1400d9f3e36c7f376b44b1dc7caad405a547a2b8
-DIST bongo-20110621.tar.xz 97652 BLAKE2B a3fd04f24b122af580e75ed68ad42dcd99045ab9cc7ea9fd273c9b256dc732fd6a0328f15489a50b427c85dad4de1ea2254afc257a9e3f2896baeefc1cff1c56 SHA512 31c2a477cfb5ff36fbc64da29c725db0b0242ea09f80883fb21feb3b23f5c14c688379c4c4e53b26ffef3aca5d2813d5b2a38b91266da088c73516f7ea1d712b
+DIST bongo-1.1.tar.gz 123552 BLAKE2B 06ee27b9ea77b3227038cd18767d8398e416f43a8cdd0a3ed08831200f2edf42eb1c4ab45d363e289b5a471a4ccd60ccb4efc00d62b225eb589dee96c255d7d5 SHA512 c2a4c4241da3ca432b481f56758958a56f749a25eed345d0f30fe560319fd646712b84751212582c2f4ba410cb8858881150b77166fe919725cc50e3917c98e8
 DIST bongo-mplayer-20070204.tar.bz2 3563 BLAKE2B 684c702da46fedd365f780b165619b20e5da643db7b457cc527017971e18a2b0e843896d28216527adbda1e6e7432ff081a7368b697256ac79f2032b30d97123 SHA512 e503ed7980f011a6fc3fa75d0bb9b1cec1ed49d4fb07da92aad65e3c5096b42cf9eb203a8edbb93f2e7924254e4926e9f3fcf473de877fea130557aefad73ebd
-EBUILD bongo-20110621.ebuild 1155 BLAKE2B f4d555d08f793f1af0585f66d9b2680ea4b2b937ab37028c8f55b5c1965a59d98e97a1514d9f7c5ab4042ec5ce3d626bbb35eb78ada5fe8ce6150e84063e20a6 SHA512 6544d4e41b2359f37d1c3b896ae7993a27f69c7fec6541eddd893804b57ba3908d1519c679335d5b199747bc21415a05d00ede6fc089df26149ac333127b0f35
+EBUILD bongo-1.1.ebuild 1344 BLAKE2B a0715f85f55e17be6615d94fbb64480d907dbe934828def4557e7dbfd20c34326031ef0592c5321d48cfd2073fae87c034d251f714eaa131ef076bd51174ea11 SHA512 024d3dc2064a123f2ebb3628e939b25fd0342b3562a3b2aac1e2690c3dae33dff76c75d47c9147a015583bcc72aa90fdf0b01db9c8b697b6e02cbff7f97a3ee3
 MISC metadata.xml 1729 BLAKE2B b30c20f0fe63c627f79349ff20b07250759f6072c5b6dcfd5075359463b2c6256792e0d42b9ba57348c93947096ec86c60fae7acae3613971fa669505b58cdff SHA512 a8a11da7b2f1ed427d9571ea6259b3b0ed3d99a412bd05e4f01a57b4f5da05f11fb6e6006db1bfc624ed341f198dc8a4bef35ce5237119cee99a6d45687f2048
diff --git a/app-emacs/bongo/bongo-1.1.ebuild b/app-emacs/bongo/bongo-1.1.ebuild
new file mode 100644
index 000000000000..a260dc90ae6e
--- /dev/null
+++ b/app-emacs/bongo/bongo-1.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="Buffer-oriented media player for Emacs"
+HOMEPAGE="https://www.emacswiki.org/emacs/Bongo"
+SRC_URI="https://github.com/dbrock/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	mplayer? ( mirror://gentoo/${PN}-mplayer-20070204.tar.bz2 )"
+
+LICENSE="GPL-2+ FDL-1.2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="mplayer"
+
+# NOTE: Bongo can use almost anything for playing media files, therefore
+# the dependency possibilities are so broad that we refrain from including
+# any media players explicitly in DEPEND/RDEPEND.
+
+RDEPEND="app-emacs/volume"
+BDEPEND="${RDEPEND}
+	sys-apps/texinfo"
+
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="${PN}.texi"
+DOCS="NEWS README TODO tree-from-tags.rb"
+
+src_unpack() {
+	elisp_src_unpack
+	if use mplayer; then
+		mv ${PN}/bongo-mplayer.el "${S}"/ || die
+	fi
+}
+
+src_compile() {
+	# volume.el calls amixer in global scope, causing a sandbox violation
+	# in /dev/snd/. Work around it by disabling the mixer programs.
+	cat <<-EOF >nomixer.txt || die
+		(setq volume-amixer-program "/bin/false")
+		(setq volume-aumix-program "/bin/false")
+	EOF
+	BYTECOMPFLAGS+=" -l nomixer.txt"
+	elisp_src_compile
+}
+
+src_install() {
+	elisp_src_install
+	insinto "${SITEETC}/${PN}"
+	doins images/*.pbm images/*.png
+}
diff --git a/app-emacs/bongo/bongo-20110621.ebuild b/app-emacs/bongo/bongo-20110621.ebuild
deleted file mode 100644
index 5aa2f60e6c65..000000000000
--- a/app-emacs/bongo/bongo-20110621.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp eutils
-
-DESCRIPTION="Buffer-oriented media player for Emacs"
-HOMEPAGE="http://www.brockman.se/software/bongo/"
-# Darcs snapshot of http://www.brockman.se/software/bongo/
-# MPlayer support from http://www.emacswiki.org/emacs/bongo-mplayer.el
-SRC_URI="mirror://gentoo/${P}.tar.xz
-	mplayer? ( mirror://gentoo/${PN}-mplayer-20070204.tar.bz2 )"
-
-LICENSE="GPL-2+ FDL-1.2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="mplayer"
-
-# NOTE: Bongo can use almost anything for playing media files, therefore
-# the dependency possibilities are so broad that we refrain from including
-# any media players explicitly in DEPEND/RDEPEND.
-
-RDEPEND="app-emacs/volume"
-DEPEND="${RDEPEND}
-	sys-apps/texinfo"
-
-S="${WORKDIR}/${PN}"
-DOCS="AUTHORS HISTORY NEWS README.rdoc"
-ELISP_PATCHES="${PN}-20070619-fix-require.patch
-	${P}-texinfo-5.patch"
-ELISP_REMOVE="bongo-emacs21.el"	# Don't bother with Emacs 21
-ELISP_TEXINFO="${PN}.texinfo"
-SITEFILE="50${PN}-gentoo.el"
-
-src_install() {
-	elisp_src_install
-	insinto "${SITEETC}/${PN}"
-	doins etc/*.pbm etc/*.png
-}
diff --git a/app-emacs/bongo/files/bongo-20070619-fix-require.patch b/app-emacs/bongo/files/bongo-20070619-fix-require.patch
deleted file mode 100644
index 6b3e6ff588df..000000000000
--- a/app-emacs/bongo/files/bongo-20070619-fix-require.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- bongo-orig/bongo.el	2007-06-19 16:51:37.000000000 +0200
-+++ bongo/bongo.el	2008-06-22 15:30:23.000000000 +0200
-@@ -67,7 +67,7 @@
- 
- ;;; Code:
- 
--(eval-when-compile
-+(eval-and-compile
-   (require 'cl)
-   (require 'rx))
- 
diff --git a/app-emacs/bongo/files/bongo-20110621-texinfo-5.patch b/app-emacs/bongo/files/bongo-20110621-texinfo-5.patch
deleted file mode 100644
index 3fa257b97f1c..000000000000
--- a/app-emacs/bongo/files/bongo-20110621-texinfo-5.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- bongo-orig/bongo.texinfo
-+++ bongo/bongo.texinfo
-@@ -374,7 +374,8 @@
- 
- @item @kbd{C-u C-u C-u b}, @kbd{C-u C-u C-u f}
- Seek 64 seconds.
--@end table}.
-+@end table
-+}.
- @end table
- 
- To seek a specific number of seconds, give a numeric prefix argument to
diff --git a/app-emacs/browse-kill-ring/Manifest b/app-emacs/browse-kill-ring/Manifest
index 3680a8a92e03..10309a2e58ff 100644
--- a/app-emacs/browse-kill-ring/Manifest
+++ b/app-emacs/browse-kill-ring/Manifest
@@ -1,4 +1,6 @@
 AUX 50browse-kill-ring-gentoo.el 284 BLAKE2B 7f9d01bd6c573eb831dc9a8e4d022eacb3bb26b27b26a7654f7ed51ee1e45680be97520211d748a3501a6e93cd3a8b1fb29a0d5238b8bffb444cc504253f4b37 SHA512 64c5c2f97e97cf01874c5dd310ab9e2b913aa48b91a8d9b2d08f87c0c467658c49a3cc5a9e11e06d17820c36e425f09f0b94cc7cd850eb6c382ff25c0b2861d1
 DIST browse-kill-ring-1.3c.el.bz2 9757 BLAKE2B 3287de095f1909a7da702a12575c6ac0254c5dd4ea485007a96bcda0ac75fb9c9017a1f594b688387b7c005bb2dba2c689464730bb8ea9ff3f005a9cc02f4caa SHA512 a7244db55b08b7247047cb71aa024dd2ba8579bd1588a31d65120145228729a329dac87c268b4be14b79beded6ec4f3473542c26bfb3c5624557023369737644
-EBUILD browse-kill-ring-1.3c.ebuild 440 BLAKE2B 81a502190c3a9c2ac867e4ad90362f22484000275859015364b041afc6bc2e6c692b5cc022bc7bca81c55de12215f5e02a44c04a7271bc698b20fe6cd665fa67 SHA512 dd65ef77111cf6a241a67ad30d70a871c51956f15282de795eb3b5b5dd917b46f9ff1cc35bd45a9ae94caf951857edf64a09b8a856f982b0af2c9cf64ed5f86e
+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
index cda01a9fd76a..bdf7fea25781 100644
--- a/app-emacs/browse-kill-ring/browse-kill-ring-1.3c.ebuild
+++ b/app-emacs/browse-kill-ring/browse-kill-ring-1.3c.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.emacswiki.org/emacs/BrowseKillRing
 # taken from upstream git repo
 SRC_URI="mirror://gentoo/${P}.el.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/app-emacs/browse-kill-ring/browse-kill-ring-2.0.0.ebuild b/app-emacs/browse-kill-ring/browse-kill-ring-2.0.0.ebuild
new file mode 100644
index 000000000000..70171bdeac99
--- /dev/null
+++ b/app-emacs/browse-kill-ring/browse-kill-ring-2.0.0.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="An improved interface to kill-ring"
+HOMEPAGE="https://www.emacswiki.org/emacs/BrowseKillRing
+	https://github.com/browse-kill-ring/browse-kill-ring"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/calfw/Manifest b/app-emacs/calfw/Manifest
index df7f8e3f6150..5b52fa42a798 100644
--- a/app-emacs/calfw/Manifest
+++ b/app-emacs/calfw/Manifest
@@ -1,4 +1,6 @@
 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.6.ebuild b/app-emacs/calfw/calfw-1.6.ebuild
new file mode 100644
index 000000000000..da8343f73582
--- /dev/null
+++ b/app-emacs/calfw/calfw-1.6.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="A calendar framework for Emacs"
+HOMEPAGE="https://github.com/kiwanami/emacs-calfw"
+SRC_URI="https://github.com/kiwanami/emacs-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="howm"
+
+RDEPEND="howm? ( app-emacs/howm )"
+BDEPEND="${RDEPEND}"
+
+S="${WORKDIR}/emacs-${PN}-${PV}"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="readme.md"
+
+src_prepare() {
+	elisp_src_prepare
+	use howm || rm calfw-howm.el || die
+}
diff --git a/app-emacs/df-mode/Manifest b/app-emacs/df-mode/Manifest
index da6f5394d082..2a17a99c4098 100644
--- a/app-emacs/df-mode/Manifest
+++ b/app-emacs/df-mode/Manifest
@@ -1,4 +1,4 @@
 AUX 50df-mode-gentoo.el 74 BLAKE2B e822e639fc1c01f43c4e63b6c9856bcf2353b3251be008348b95be481370f167030fe1a05856bdbca7d146cb9f2656bbf32d3722958a2cd650870ef7d0a7588d SHA512 35de1cfcc792b7da1271bf2ff47b93c706b89aa32cfd77245ea4df15897b5797dfd529ba7c0e89b89acb7e89ac4d4651ba8de0f76badde8b64d45d622c1f4edc
 DIST df-mode-20050509.el.bz2 3867 BLAKE2B f5051cba3b14174017e20983d26cb847ee8daceaf011b0f37f246e4730dd12fef5ed67131a86909636af28f22780563e4c5ba8d282e0272bbf08d0a89cc308e5 SHA512 e4d248d7b1fa9c231bac7d8d478c65d796123234503372ca945f5b122e62d816676c9744d42f41b1c6de6716682ad4233eeb57801155760cf7e4d41dc0e7d535
-EBUILD df-mode-20050509.ebuild 545 BLAKE2B a7131dabc13d3687fa96eb5943e50141968f1bf6836cfa2ebdef163cae9449ef69dee8e9eb671fd3464491002da99e20eb267f5f379346e5dc606d1b388e2d1d SHA512 b6c10bc8055277a67b3d2f713c2ad554bbba85383eeb72b2b7a81b291bbc88beeb293f2fd738d353b8156152ccdeee2dab1d833cd47aea39599bdf09d0032242
+EBUILD df-mode-20050509-r1.ebuild 542 BLAKE2B 32ffedf14da43f45ab2eed7f6484de8ad3be18caf2ce28f50240eebb88cc188d9396100a7305093ed186232e3c7c8baf36f69d53b00ce993abb49753babc9a91 SHA512 71e135f974589937d0b2f2f8c55ba9a48118e9d32eccc561b1378f964fd44825ef8cb3124f5e081057a11d63bd6d86d6b956c700d4b1c13b3f08f043ac95daf0
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/df-mode/df-mode-20050509.ebuild b/app-emacs/df-mode/df-mode-20050509-r1.ebuild
index c46eb76c2460..28fa3a259f40 100644
--- a/app-emacs/df-mode/df-mode-20050509.ebuild
+++ b/app-emacs/df-mode/df-mode-20050509-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 inherit elisp
 
diff --git a/app-emacs/distel/Manifest b/app-emacs/distel/Manifest
index 6a5501baa73d..4b371dbec85d 100644
--- a/app-emacs/distel/Manifest
+++ b/app-emacs/distel/Manifest
@@ -1,4 +1,6 @@
 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.1.1.ebuild b/app-emacs/distel/distel-4.1.1.ebuild
new file mode 100644
index 000000000000..bfe7b568b6c5
--- /dev/null
+++ b/app-emacs/distel/distel-4.1.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="Distributed Emacs Lisp for Erlang"
+HOMEPAGE="https://massemanet.github.io/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/
+# "MIT" according to https://github.com/massemanet/distel
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-lang/erlang-11.2.5[emacs]"
+BDEPEND="${RDEPEND}"
+
+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
+	dodoc AUTHORS ChangeLog NEWS README*
+	use doc && dodoc doc/gorrie02distel.pdf
+	docinto html
+	dodoc doc/distel/*.html
+}
diff --git a/app-emacs/ebuild-mode/Manifest b/app-emacs/ebuild-mode/Manifest
index 27aaf0c16008..55e58e10ac24 100644
--- a/app-emacs/ebuild-mode/Manifest
+++ b/app-emacs/ebuild-mode/Manifest
@@ -2,5 +2,5 @@ AUX 50ebuild-mode-gentoo-1.39.el 805 BLAKE2B 3cdb41677c5ef11ef6fb44001cc36b58f92
 DIST ebuild-mode-1.46.tar.xz 34928 BLAKE2B ee2686f3862fc7aa5f820311a6e45d62b153426134422c56a2a6222795163f454291da5510e86c52edee1b22b7bec641ceb132147b29243ee647774a8e91342b SHA512 e7a81c9a3692db1c6db41e138b382e3027094529d4ad3244ecde5a245340f911f8a63ce8ce8bbd7910116c704bcf8fcce90142b8863ecc1b543760ef1411833e
 DIST ebuild-mode-1.47.tar.xz 34812 BLAKE2B abbc3be110239f9e1765d4f1293856a7fc616d497ac5256a28b7d78fc57c8d725abccbf7b9e5908cb85f9a684dc1be26ab88152d836c2ec3a481802091729717 SHA512 13ee756ef914a314f6705df78735a3926a50d156f4abeff917bed68298aec81f072d53a60f7b985d9bb2caddcdbf65fd26f6c9189e6c5c1822674d9142b7db17
 EBUILD ebuild-mode-1.46.ebuild 737 BLAKE2B 18addf37cb9fb79decaccc0608f8e6d89ddd0fb50bddb902fd4bcf50d49803fd767ea7c1c2b3fa3f7d784b9497f243878d90439161f46e89d27db99c03caf660 SHA512 8babf31bdfc3c9efd68d333803d2d5d2edfa9a1d3e68dbdb114d5df917395186588a7b0cf02e523d2b87efd421bfdb3ab382655e2f74746777d131384a1c3780
-EBUILD ebuild-mode-1.47.ebuild 746 BLAKE2B 2fb9810ae3f03695f8f46627e5f837a6278f06e796a73af2490a329e9372390542f868fbd42686d5d309057dcc1fba5469c48d1379c1485414481e1889ed3e98 SHA512 53a478631570cd375ffa1554c9e13b9611850307922ee09b010510b15453d015e9b2b879fe78735f7366638b0341841f486e7f2a48218b561a9ccb6a28474aa4
+EBUILD ebuild-mode-1.47.ebuild 736 BLAKE2B 75dc00c3beb75c965d25a279b48589b34b9723e129e95adcfcf79368f49624a633f3ebd592e421ab8c9495d296939091151ff49d75dca9e5b19dbf120f617b6e SHA512 b6b9543141d5b0955a52227670a57a5ee13a93954515b099d64d586f01599cf5766792dade5c8c669bc92c318d80daf75b914f050c2aa5b4b51833758a4eeffb
 MISC metadata.xml 426 BLAKE2B d0b4dc2bd01fc6fb2f0c58b01676b80d09a4677876adc9681c3c436ebc437b6b034187b19fea30cf980927fec1f6a9feee9a0b7d1a4dd15818d02e4c8ec77af6 SHA512 058df2768030185953c7ac3622819c430681eae3ca60b0d02ad48ed22ab6a0ac7c169d93f8f54a3dddcade3f84c9bf58f662a58bfd78217ea8fc27a580ab9077
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.47.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.47.ebuild
index 7ff7faf0a815..62f2cf76c60d 100644
--- a/app-emacs/ebuild-mode/ebuild-mode-1.47.ebuild
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.47.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 BDEPEND="sys-apps/texinfo"
 
diff --git a/app-emacs/elscreen/Manifest b/app-emacs/elscreen/Manifest
index 94ac8de60f15..0289b73ff7ab 100644
--- a/app-emacs/elscreen/Manifest
+++ b/app-emacs/elscreen/Manifest
@@ -1,6 +1,9 @@
+AUX 50elscreen-gentoo-20180321.el 82 BLAKE2B 6f7d7f574bc931161a8baac7c4bd43165703c1b4102755950aaffabb2c09d42be3ce546c0c546ffc43a04f5c946f69e43f92d4d3137befb5a299c2542a331029 SHA512 cd303735ee0a8f293e0d0d5e3e7dafd01d398d6eb6cd8871d99e6727f4d3c06711572ef9a199055f639c2a44c1f8833fafde37f2c71ca92bffc4f7e2454ab2fd
 AUX 50elscreen-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
 AUX elscreen-1.4.6-emacs-24.patch 5925 BLAKE2B 1c1b7868093a56aadf4e8b2794d767b07de9123dc2be71f4af063d0ab100ca06a187186c3f685024b44b97a69cdab06732dbda3cf1201e5808e5f531d4b4aa07 SHA512 581f5c2c30fa4ae5a8a2266c40842076126a365f947ceaae32299ac680e74a7ca33b077130ff566c12008c79ba4da504160290da72d33ffab5a4d0b40e46557e
 AUX elscreen-1.4.6-void-variable-argi.patch 2789 BLAKE2B 173a2c94528d93660009e0b73e58cedf9343e415f789219350d41fb7b90fc12d7ee7774f6b5b9a97277d54a34e04b4ac4ff93a413018ca0dc872202ad376e6d2 SHA512 254c76e291848caf19983bc896b5a405b9d52dacb871ba5e9009d77968d5249c2445606fb2507f0d0f67859a955aabf4c717dae2acf94f52daa999237fd27333
 DIST elscreen-1.4.6.tar.gz 21680 BLAKE2B a23b7eb617e67205e816cb5c6588f65d8140788ab9c32b90b9c1f53dc4497e6f8250f3c51c38aa40780872f3d878a34aaf2fb455c61640d327df6e3166a59dc7 SHA512 2f19941c9c3e74bbe3912e99f53710f42d33a5b063af99c3907c478d2f571a50a75942519bfcad3bf178585f736bb6e2baf2cdffe8ac66b8e4dbd1b0d881fab2
+DIST elscreen-20180321.tar.gz 36840 BLAKE2B 7157a2040cb3d1bb60eb5c4f672dde35b5f1437a83a0af32138d252cfe44bf8a23013f5672182ece7f2dda5bfbe266247188d59408005d8963837d0958c100d3 SHA512 777835daf328aeddfd8999c37553bf5f57683292cea4f2fdca774e16d7a137ad26e791515000e8092c2ba5e4c2d0aeb03b260e4a2069c4f8a091b014d69ff201
 EBUILD elscreen-1.4.6-r1.ebuild 905 BLAKE2B 729e11a757c23a3a863c8fcc8c1be4971793326e03abd0c1f914518cadbf5ad041b1ddb9f3c1eb3e8fde4088f880e28779998498417a3ef65ef2152a8cae356e SHA512 9a5f82f0fac66c21e48ed258768bf9ab76c1c01dca4a19227d20e5785e262fbdf3256949fc215e8314d84cfe25f2e02d6c1610c5960d93fab97f315f8c516485
-MISC metadata.xml 1086 BLAKE2B e9254ee3a2f72cd43136c84c0fe5765e91f2fc846bdf94943dc739b5123a936df8b9e6d1210835da5f6dc55db70f7f8858c6a548e684954be63a4cd5c2fa9dd6 SHA512 87bf0cf357b0573f74ef28b6910de612b01f009070277c8ff386e0956913c04683819b8df22a3d4aecbd48f014d2741cd4b852235e3539752465648c754d7f55
+EBUILD elscreen-20180321.ebuild 758 BLAKE2B 113ae19fb9dbb206653fd9bc2cda596d5d1773edda797a0f43cf3958ed5556bd0a6b46f89e5fa779eb946db48068235548b49fb5c70eb1ddc088e4ac7686ba82 SHA512 d62ef569842c5b25d9dbbccce89eb719ac768f73932b88f85e26e109d904e19703c3ec8ffd307b20110a0ff78f5e20e83f22aa8ed309e4acaab9334fc150954a
+MISC metadata.xml 1188 BLAKE2B bbd91c8e116ead86174542013b33e6e83d1a464d96191e76619ec31e6c325390bb8516e70c4f81d4e73a98149be619b466ec62aa61178692c1de57b110699017 SHA512 736c8159defd57e17f46623187edb72f03fad76723062a4de6714d45fb1568838109754e735fd691ee9cfcfcb70c1223d641e112f6fcda74e5b84133cb4bdc08
diff --git a/app-emacs/elscreen/elscreen-20180321.ebuild b/app-emacs/elscreen/elscreen-20180321.ebuild
new file mode 100644
index 000000000000..f954068810f1
--- /dev/null
+++ b/app-emacs/elscreen/elscreen-20180321.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="Frame configuration management for GNU Emacs modelled after GNU Screen"
+HOMEPAGE="https://www.emacswiki.org/emacs/EmacsLispScreen
+	https://github.com/knu/elscreen"
+SRC_URI="https://github.com/knu/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="wanderlust"
+
+RDEPEND="wanderlust? ( app-emacs/wanderlust )"
+BDEPEND="${RDEPEND}"
+
+SITEFILE="50${PN}-gentoo-${PV}.el"
+ELISP_REMOVE="elscreen-dnd.el"	# does not compile
+DOCS="Readme.md GF-README GF-QuickStart"
+
+src_prepare() {
+	elisp_src_prepare
+	use wanderlust || rm elscreen-wl.el || die
+}
diff --git a/app-emacs/elscreen/files/50elscreen-gentoo-20180321.el b/app-emacs/elscreen/files/50elscreen-gentoo-20180321.el
new file mode 100644
index 000000000000..4e9093e829fc
--- /dev/null
+++ b/app-emacs/elscreen/files/50elscreen-gentoo-20180321.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'elscreen-start "elscreen" nil t)
diff --git a/app-emacs/elscreen/metadata.xml b/app-emacs/elscreen/metadata.xml
index 71b064d851b0..71a0a92588f1 100644
--- a/app-emacs/elscreen/metadata.xml
+++ b/app-emacs/elscreen/metadata.xml
@@ -13,11 +13,15 @@
   etc. These applications likely consist of two or more windows, so when you
   switch among applications, you may want to save or restore how windows are
   located (this is called as "window-configuration"). For this purpose, Emacs
-  has two functions, window-configuratin-to-register and jump-to-register, but
-  these are too primitive to use on a daily basis.
+  has two functions, window-configuration-to-register and jump-to-register,
+  but these are too primitive to use on a daily basis.
 
   ElScreen provides the ease-to-use environment to save or restore several
   window-configurations.
 </longdescription>
 <stabilize-allarches/>
+<use>
+  <flag name="wanderlust">Include support for <pkg>app-emacs/wanderlust</pkg>
+  </flag>
+</use>
 </pkgmetadata>
diff --git a/app-emacs/emacs-common-gentoo/Manifest b/app-emacs/emacs-common-gentoo/Manifest
index af04281d42ed..84acac06b8bd 100644
--- a/app-emacs/emacs-common-gentoo/Manifest
+++ b/app-emacs/emacs-common-gentoo/Manifest
@@ -1,3 +1,4 @@
 DIST emacs-common-gentoo-1.6.tar.xz 61224 BLAKE2B 70e4f30c26c9098fdb02a53cab5d60cb611143d8bac6947707f3c7596b5a81ceb513b5a0809ee90f351472824f1d4216720c02cadb51d25b3dfce5e436e02bdf SHA512 a7daed2241d778ab283482ecc016801e25084eed10fcbbc50e187d5f842df5a0d278a77f94ae950b086c8651e8ca1a18f89c11dffdde9cf9168755288aae926a
-EBUILD emacs-common-gentoo-1.6-r2.ebuild 2888 BLAKE2B 7f7037a5712a7b3b1943e457b86c01a53db206f17e918b15d1c8d7dff361b9fac86d3c7eade82eeccc3ae582a73a6a941d7691f999a734938c95b44644e500bc SHA512 7e6de29ed815b67ce99bd3c8f30fbc57ee75bbd38b5c3698e8396a593fbb1d6c07cc4decad4fd71f5c4da1921759d79432c1b80e459337549a2bdd358e0b9bcb
+EBUILD emacs-common-gentoo-1.6-r1.ebuild 2878 BLAKE2B aafb8c7842b9075d08dd037ed2e3fd59699bf0110d380f10a2c8adf4dba2aea3008b5670b3bd9ee8f33dca4ca1f88a4e081df292e4eb9c0578b9a51cb9b0c84b SHA512 d9b0cb62a397af1ee382aff2c9344891f9632b9eafd54f56c7f34c29b4712b0ae4006420798e6022e4ffa9658aa2874c1f43a824a3eba5ddc0e1f056af730fce
+EBUILD emacs-common-gentoo-1.6-r3.ebuild 2849 BLAKE2B 0f526443ee423c4e77c5b07da987c84da4303a449a3e955b680fb9faeb61b3c8dd158ccb1cf9c32d97d5e430f70a5141288a73d11a0e103e2c0733b9b8c1a9b9 SHA512 641b456b2f238d69dc6542b400488201c10d08a2b6fdd2e28408c93a325bff325bca1099c74b79ece849640e3f6681010b66c986cc74e0649526b50a882eb150
 MISC metadata.xml 360 BLAKE2B e7e420afb7a8377bffcf2a23f3954bbf4cc80fcd19a8514733e2e0164f4235271e21dc860bf77cb9cfcd1a4026ef3dafe97a10dc397e2d8e6f001f02bf6e9bc7 SHA512 d57f8f097617229f774b06437aaa83595aab2a6d9321d51b97dac8bd56fa94db396c7bdca538570f0912390e25ae8643c5adc374908757f67f1422fa1f872605
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r2.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r1.ebuild
index 5e48e30334cd..84eab96b484e 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r2.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=6
 
-inherit elisp-common desktop xdg-utils gnome2-utils readme.gentoo-r1
+inherit elisp-common desktop xdg-utils gnome2-utils readme.gentoo-r1 user
 
 DESCRIPTION="Common files needed by all GNU Emacs versions"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
@@ -11,13 +11,15 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="games X"
 
-RDEPEND="games? ( acct-group/gamestat )"
-DEPEND="${RDEPEND}"
 PDEPEND="virtual/emacs"
 
+pkg_setup() {
+	use games && enewgroup gamestat 36
+}
+
 src_install() {
 	insinto "${SITELISP}"
 	doins subdirs.el
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r3.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r3.ebuild
new file mode 100644
index 000000000000..b6a09310a9f4
--- /dev/null
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r3.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp-common desktop xdg-utils readme.gentoo-r1
+
+DESCRIPTION="Common files needed by all GNU Emacs versions"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
+SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="games X"
+
+RDEPEND="games? ( acct-group/gamestat )"
+DEPEND="${RDEPEND}"
+PDEPEND="virtual/emacs"
+
+src_install() {
+	insinto "${SITELISP}"
+	doins subdirs.el
+	newins site-gentoo.el{,.orig}
+
+	keepdir /etc/emacs
+	insinto /etc/emacs
+	doins site-start.el
+
+	if use games; then
+		keepdir /var/games/emacs
+		fowners 0:gamestat /var/games/emacs
+		fperms g+w /var/games/emacs
+	fi
+
+	if use X; then
+		local i
+		domenu emacs.desktop emacsclient.desktop || die
+
+		pushd icons || die
+		newicon sink.png emacs-sink.png
+		newicon emacs25_48.png emacs.png
+		for i in 16 24 32 48 128; do
+			[[ ${i} -le 48 ]] && newicon -s ${i} emacs22_${i}.png emacs22.png
+			newicon -s ${i} emacs23_${i}.png emacs23.png
+			newicon -s ${i} emacs25_${i}.png emacs.png
+		done
+		doicon -s scalable emacs23.svg
+		newicon -s scalable emacs25.svg emacs.svg
+		popd
+	fi
+
+	DOC_CONTENTS="All site initialisation for Gentoo-installed packages is
+		added to ${SITELISP}/site-gentoo.el. In order for this site
+		initialisation to be loaded for all users automatically, a default
+		site startup file /etc/emacs/site-start.el is installed. You are
+		responsible for maintenance of this file.
+		\n\nAlternatively, individual users can add the following command:
+		\n\n(require 'site-gentoo)
+		\n\nto their ~/.emacs initialisation files, or, for greater
+		flexibility, users may load single package-specific initialisation
+		files from the ${SITELISP}/site-gentoo.d/ directory."
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# make sure that site-gentoo.el exists since site-start.el requires it
+	if [[ ! -f ${ED}${SITELISP}/site-gentoo.el ]]; then		#554518
+		mv "${ED}${SITELISP}"/site-gentoo.el{.orig,} || die
+	fi
+	if [[ -d ${EROOT}${SITELISP} ]]; then
+		elisp-site-regen
+		cp "${EROOT}${SITELISP}/site-gentoo.el" "${ED}${SITELISP}/" || die
+	fi
+
+	if use games; then
+		local f
+		for f in /var/games/emacs/{snake,tetris}-scores; do
+			if [[ -e ${EROOT}${f} ]]; then
+				cp "${EROOT}${f}" "${ED}${f}" || die
+			fi
+			touch "${ED}${f}" || die
+			chgrp gamestat "${ED}${f}" || die
+			chmod g+w "${ED}${f}" || die
+		done
+	fi
+}
+
+pkg_postinst() {
+	if use X; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+	fi
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	if use X; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+	fi
+}
diff --git a/app-emacs/eselect-mode/Manifest b/app-emacs/eselect-mode/Manifest
index 9575f4958cb4..8c6252a50fe3 100644
--- a/app-emacs/eselect-mode/Manifest
+++ b/app-emacs/eselect-mode/Manifest
@@ -1,5 +1,7 @@
 AUX 50eselect-mode-gentoo.el 178 BLAKE2B 50fea27e7add6d31f37801593430154636bb58ac6e3f7cc44c68a16d49c9156cf37285778a38bf97a1f4805a22d6d5cf9d597acdcdedfd77c62a5825a0d1d88f SHA512 200da398adf72241112bcda74b432a8a313cf29018c9f6fbdf6021674b23a201ada6ba884d4c9c3a4ee4c042d6c8fc7c3ba59702c8ddb6ea20b652f9ded9d32f
 DIST eselect-1.4.14.tar.xz 177492 BLAKE2B 236ddb09231283a153c20be779d012979a25d42a7043c75af866e777731761406d92896bfef399c3bc63e529af4e36cf538801302dc4bb719f065d6bab8ad9e4 SHA512 b17fb63039577f20515056fae1b0f7e86fa2d96f38a5eec22e637cee0b25f4d68087ef8a5bd4043893db5be66ea201bc8ae6437bb049d208b81e76a57612d658
+DIST eselect-1.4.15.tar.xz 178996 BLAKE2B 4354d975c8af2e1de0f0c6efe2badc92584e947f9b73c05aac144caf8f9d74c850d366c7c225112322a504262b5f285f6e2e8d32223f1b2d4bac87db740a148c SHA512 ceb55fecc2bf70e816679af9b20653b29aa9ce24ca2d4cd0c6e02ab214689459bc2ccd5b3968ac49249b8fb6613c6055e7e76598b86c6a114a9abf847c4a2b58
 EBUILD eselect-mode-1.4.14.ebuild 569 BLAKE2B d7e4dd474ca2ba2703d8a84939f79da3cfed9b942a8e44f4a26f742ce0b54cc6473ccff07172df91d528132e404ffc14adb5478402d6f4bc0ceff8919690926b SHA512 1a684d4e547c7da81bd62f723cd03053295119f664543f50ef8edcd69c8ad6717aaf616868d0ab56dc9a6b639822d17d56517b8279b7f1a2dd879ab94ce97b81
+EBUILD eselect-mode-1.4.15.ebuild 582 BLAKE2B 721100792af38d09632673239f1956a15af5bc0b2aba872e024bf7c454b7882dde3d8eebf5ab2a1e3a11bc7be6611d1611efd8fac795c2bf015553875d0697d3 SHA512 957edb82115c3985d6a8cfa6eb6f5260f0ad84ac12075122d305372dd4b408f9046668ecf7107a72bd49f346320213b134a468b490026abe75b257df8cdfda0f
 EBUILD eselect-mode-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
new file mode 100644
index 000000000000..b342275247a8
--- /dev/null
+++ b/app-emacs/eselect-mode/eselect-mode-1.4.15.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+MY_P="eselect-${PV}"
+DESCRIPTION="Emacs major mode for editing eselect files"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Eselect"
+SRC_URI="https://dev.gentoo.org/~ulm/eselect/${MY_P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+S="${WORKDIR}/${MY_P}/misc"
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/flim/Manifest b/app-emacs/flim/Manifest
index 3b857c685d4b..c45b69ee9b87 100644
--- a/app-emacs/flim/Manifest
+++ b/app-emacs/flim/Manifest
@@ -3,5 +3,5 @@ AUX flim-1.14.9-mel-q-ccl.patch 1362 BLAKE2B 4883dfdb3ede7b93ec41cd02fe1da397a82
 DIST flim-1.14.9.tar.gz 182065 BLAKE2B e15779e93a422bc2c2b82ab5969f2b3d30a31d47b96769abf89bfe7e9aebf74e5f0f0e87270bcc187bdaf3e1af4bdd663c7d6661f1adc9575af0e4ba1dd316f1 SHA512 a272a30f27cea24f537b9bf3a6dbb25113deff0ab8e1c03bd802e4d32d673d567d282297ed9e4d35217f069699a1fc25bfdde09778171a188dfa46f49e9bb7dd
 DIST flim-1.14.9_p20190526.tar.gz 173261 BLAKE2B f28b0d1474d894fd93d9899fe66bc88d6669cc6bdbb2511dcd0b2f13c05abbe42ad4cc06e2de34664204f3ddbb3cb4f09e232394419892b3fd8e71c1ab3aab75 SHA512 8991c460bf9eb411e89edb8fb05088cc09dc354e4c14d7accba26d922b2d1041742e96d8a64407ee8dd2574984c5b3a8fbd66e828c8f8fadc55f8da6428d634e
 EBUILD flim-1.14.9-r2.ebuild 969 BLAKE2B 97aa74a6ad442c1d762001782ac19a5438dc06a4cdf06718a598aefe2e134851f97fe0cc844c84904bcb336edf2016e04d9691051f4832b0eb2b97b621ac1dce SHA512 fb65778615d632680803699f358cc8c66f422638e87308ec9a387f280a6594eec500d7ef77eb3679bdfc68511eb427e7273707ebbd714965927f82a05d07c1a7
-EBUILD flim-1.14.9_p20190526.ebuild 1021 BLAKE2B dc6713790abe82a20e31bef7a9a63d165dce2b8fac87cec0e7f2d50e1af0eba08299a26b9094f3eeb256b728e0192a60bd340a59096f95fa56c51ce9da81f6a7 SHA512 ddca7988aa99f6a7db4f84ac0f05a0218625c8aa08810b788e4c27bd5f9ae329b7aba1ba7948bf0976849889b8507f72a4ec172ef8bc064e00601a50e75512b8
+EBUILD flim-1.14.9_p20190526.ebuild 1051 BLAKE2B 841d8342cc1a13f301ce91c5b1d00d10746946270b9ce52ab04a1716038a22ddfc0b7e875f5efe9e87c5f5b385b0bf93668122d12da89fdcb0c8bf39954899c0 SHA512 c7cc71091c9f28a7386fe5688e183894d72616a2da3ced26a1024399478bd413c219542e3a516c6b0de71e2e4dbc6832134a21bd5b71513df506d8a2285a4864
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/flim/flim-1.14.9_p20190526.ebuild b/app-emacs/flim/flim-1.14.9_p20190526.ebuild
index d37cb72db079..4e621f14165b 100644
--- a/app-emacs/flim/flim-1.14.9_p20190526.ebuild
+++ b/app-emacs/flim/flim-1.14.9_p20190526.ebuild
@@ -8,11 +8,11 @@ inherit elisp
 DESCRIPTION="A library to provide basic features about message representation or encoding"
 HOMEPAGE="https://github.com/wanderlust/flim"
 GITHUB_SHA1="e4bd54fd7d335215b54f7ef27ed974c8cd68d472"
-SRC_URI="${HOMEPAGE}/archive/${GITHUB_SHA1}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/wanderlust/flim/archive/${GITHUB_SHA1}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 
 DEPEND=">=app-emacs/apel-10.8"
 RDEPEND="${DEPEND}
diff --git a/app-emacs/google-c-style/Manifest b/app-emacs/google-c-style/Manifest
index 77b9b1507d88..415d0a318113 100644
--- a/app-emacs/google-c-style/Manifest
+++ b/app-emacs/google-c-style/Manifest
@@ -1,4 +1,6 @@
 AUX 50google-c-style-gentoo.el 258 BLAKE2B 7ec733ac75a1d1570d11f3b978e0f55c3641b6e1ded4792afe54c3757453424fa0f76724f13bd060d5a63be7f37442649669043a8b7ed326c6b46cd58db1572b SHA512 f39b91a6af6e16ac70a5baee459790efb00aa10c3a83c16429fa5d97201bec2bfb3f6645ab1327f7325eb3428a3c938914b4a63c6009109dda99a4f0fe7d89c2
 DIST google-c-style-20091009.tar.bz2 2178 BLAKE2B 72d7b430f9148589e8b4b1a57c9b4b96203c7ffddae3bbbc7aa9978e85c2c51510571f8617ac5d2bcaabe5688ed7799d5de597e96a2479d844a49e6661f93a05 SHA512 5d61d6e021643ffc1468c14cdbbde0b52dc9346330983c19bdb7f4d6fb8960c662ca6198658963ff6d2b4d7d2dc96853a8c58de48da77364a860f2f777855b5a
-EBUILD google-c-style-20091009-r1.ebuild 602 BLAKE2B 5e9cbb6e0f5df7a7aaf1695b28a20ce0ecfac59fbe8a2357f2534a848ab720500c2ac3de410adcf9eda084a914b5da3fdf86fbfdddd02162c020cab232ff7615 SHA512 454136b3a79e9b4cd21a51b8771daa4efeab80b13c1fc09c8d372b864c96e10b26bcdcbe21e48b934689f69b263ba8cb8d758a8b32ac8f41a25ddc3c5c5621a3
+DIST google-c-style-20140929.el.gz 2147 BLAKE2B c1e151e0aacac5fa39b4a293ab2663d9e784c15bb020ca4f46f09ea4736f84d7e33050632c6620d65cd45b5a631d2b08f5864096435bf9d58b321460e6a20518 SHA512 ad8682e06a2a607e4c7baa9177a03796afcbedc251281a53657fa44f718fee0416e6d60bdc9e0339ac95a0bac05389de0dd0616a6bb4577ff7b02e00c80d1df5
+EBUILD google-c-style-20091009-r1.ebuild 588 BLAKE2B 3d751da28f4dde2b94840cec08cf527f30a50c5a20d1fac805f6df2fb72018a0de7bb64460243d433bb944b98baf41424d9e5eb98c2560a902cf02e9cb9cef77 SHA512 e25c5a9e81b4a461cbf89c5de972024ba73fdd72ed4eb11740861f7f2281197e9905a886a8d748c82d0c8d0e54b2a85e90fa31a107471e3fa69f9cc02ee5dfa8
+EBUILD google-c-style-20140929.ebuild 577 BLAKE2B ac92eb6045770f507ca5c20aa0c5b7116d7a595efe812f10aebbb4231753ca7b817fb55459129aa2e22104e326f1831d950c3344d6cd8f9bef9abb97b048ddc0 SHA512 e708bf367966841f070dc3ba7f5478bfa88b5a484b23a2e12b4aa42cdf3db74c8b70ff4cc77f392938f35637121bcd6324816adde3cdbd58cbd03a11d7a6e0eb
 MISC metadata.xml 483 BLAKE2B 5321c357a3c496a72254753a00ca9e11ad6fdc420b2ab01990348c3d232d744d433ed01e5fc3de3aa6017dd805b057d3b2004d500db6fe1e38d69053c0d73179 SHA512 0f0c374e0ced07f64bf529899a190e7c4d1dadac58ef44355021fe00eeda190e2f270951242e8b1cc0b405328f2c251272da4713557600391e0ee82a35f689cb
diff --git a/app-emacs/google-c-style/google-c-style-20091009-r1.ebuild b/app-emacs/google-c-style/google-c-style-20091009-r1.ebuild
index c7353765122e..a99bcc7f98f6 100644
--- a/app-emacs/google-c-style/google-c-style-20091009-r1.ebuild
+++ b/app-emacs/google-c-style/google-c-style-20091009-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -9,7 +9,7 @@ DESCRIPTION="Provides the google C/C++ coding style"
 HOMEPAGE="https://github.com/google/styleguide"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
-LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
+LICENSE="|| ( GPL-1+ Artistic )"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
diff --git a/app-emacs/google-c-style/google-c-style-20140929.ebuild b/app-emacs/google-c-style/google-c-style-20140929.ebuild
new file mode 100644
index 000000000000..74ea088e1ecf
--- /dev/null
+++ b/app-emacs/google-c-style/google-c-style-20140929.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="Provides the google C/C++ coding style"
+HOMEPAGE="https://github.com/google/styleguide"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.gz"
+
+LICENSE="|| ( GPL-1+ Artistic )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}"
+SITEFILE="50${PN}-gentoo.el"
+DOC_CONTENTS="Example usage (~/.emacs):
+	\n\t(add-hook 'c-mode-common-hook 'google-set-c-style)
+	\n\t(add-hook 'c-mode-common-hook 'google-make-newline-indent)"
diff --git a/app-emacs/htmlize/Manifest b/app-emacs/htmlize/Manifest
index a00f4bba574f..addbdd60db0f 100644
--- a/app-emacs/htmlize/Manifest
+++ b/app-emacs/htmlize/Manifest
@@ -1,6 +1,6 @@
 AUX 50htmlize-gentoo.el 543 BLAKE2B 65ee2f1bd7aeb315827301a74582d9c04ceacf898a5cdd9a72f6783bcc2e4d1f97d681f67daeea24fa3489ae7a4db02875161c20a88330edaaa828a0c37b3bb5 SHA512 7bc9bc6cd113ec9090223b6bf3f373b25da1e4330039be37186904360a515ea102b51c2c6567e9e3fed7f78c4c29a0f80642e35878a2af61e83772b8a5bad99e
-DIST htmlize-1.43.el.bz2 21018 BLAKE2B ff07571bda31c3733e3a5ef703625ea485721080d13ad28f7e2be3f7470cae7f00ebf7f7a899a7351942643c5f3b854f01918b9fd3175b8f7ba0ae9237665d42 SHA512 cdef3f8478862e9743cad23697775111fbd64737daa6e0525923cff1ccc8dfd20ad554e5e92ec99281d87acf9ecd358474761858c8c6639c5459234bf79d4be9
 DIST htmlize-1.47.el.xz 21544 BLAKE2B c00222fa39bbd530fae89b6a71cc515dd37cce4d787267eca9d23eddd9f3054b932df8908712971c46c28fc89921a42ac613e826d73094b333aa977335077f54 SHA512 2cca746f696d382336a800d3f15e6a5812afa7c6965d6695c501085ed6c8f447da8ee6ed31a27c240e9d70f7c30b91292ac60c0c903a7ca0d52f2a4bfedbf06f
-EBUILD htmlize-1.43.ebuild 399 BLAKE2B e5b22c1cd35481e4cd89200d42adcccd1ff6ab751e40927161b9095f938d9674b2646cfe6359153f97c4155e39f477785169e0b4442489a37934a663d3d6081e SHA512 f46ebc4c02904c46990d99fe860c7189dde0df5c74807d547809b7ef0207bfa1c152ec4c4701df7747f3bab0e6fbc5dd455b8aa8ec66cb39701f3f361266f33e
+DIST htmlize-1.54.tar.gz 51401 BLAKE2B 8c00c1482fa1dff852d0e0c51d0c6a337878418dd84fdf1c2522d937a4e2181766e23302936bb1e9f774b883ad3df4295897a1aaabfaea802457aa096a0ab337 SHA512 ddd256162760fc1e6e08eaf4cd44ec987bf2c49ef61d23798923ba0bd241a16aab02cab77ca7524169796453d44951257acd9bda58c055be80d9612bbfff10f7
 EBUILD htmlize-1.47.ebuild 412 BLAKE2B e6ba52cf40a4941a1efa543d5d94bfc2fb521fbff3dfcf9086a89949c772634c44d566f8c4808badfa58c273a06107d6308f4bfd27ee6be7458186a0eed5d60f SHA512 0255f5a8d6b4d03f8ee3c502e59b719baf3842ceae9510254a2f533a8f08616d4a5e4d2ce747a3b567ad42864652e09f7f2504cf8d77d389e93caff3ad60019a
+EBUILD htmlize-1.54.ebuild 526 BLAKE2B 0e4e855712141cdc41122f4539fc0d6e9fd465277e14f59244633619d0391fbc662cfd504c0ac32eb310061461af6932b8f0dae05b1d267e524257fed86e8fe7 SHA512 fc6007ac202ee7b9a007e70c57efa66feb27099adfc3ccc9e01f6cf95e9ef5b23b9ffb1b08992035c0edb7114136bc3d2f6f7afbb4df7ff99a1d716b53d19fd1
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/htmlize/htmlize-1.43.ebuild b/app-emacs/htmlize/htmlize-1.43.ebuild
deleted file mode 100644
index e614aa73039a..000000000000
--- a/app-emacs/htmlize/htmlize-1.43.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit elisp
-
-DESCRIPTION="HTML-ize font-lock buffers in Emacs"
-HOMEPAGE="https://www.emacswiki.org/emacs/Htmlize
-	http://fly.srk.fer.hr/~hniksic/emacs/"
-SRC_URI="mirror://gentoo/${P}.el.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/htmlize/htmlize-1.54.ebuild b/app-emacs/htmlize/htmlize-1.54.ebuild
new file mode 100644
index 000000000000..98ded842db43
--- /dev/null
+++ b/app-emacs/htmlize/htmlize-1.54.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
+
+MY_PN="emacs-${PN}"
+DESCRIPTION="HTML-ize font-lock buffers in Emacs"
+HOMEPAGE="https://www.emacswiki.org/emacs/Htmlize
+	https://github.com/hniksic/emacs-htmlize"
+SRC_URI="https://github.com/hniksic/${MY_PN}/archive/release/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+S="${WORKDIR}/${MY_PN}-release-${PV}"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md NEWS"
diff --git a/app-emacs/ledger-mode/Manifest b/app-emacs/ledger-mode/Manifest
index c6cfc82acb73..d7cf6a4406b8 100644
--- a/app-emacs/ledger-mode/Manifest
+++ b/app-emacs/ledger-mode/Manifest
@@ -1,4 +1,4 @@
 AUX 50ledger-mode-gentoo.el 364 BLAKE2B 5972883970743cfc2d2732b0a50ba96bfa7e82000f26e6b3bfcdc81cf7e999ac8d2687cc2e1cb416e1863d91be1fab0bb2446ed851d9c26773908858f795d6a3 SHA512 45b4e233dd4f821828c56daf3c5e7d044a0850825e9a4f32ce639de274e1e5cf23407cec337a607b1e373347de77444b851cdc17983d779fb113419c05446ce2
 DIST ledger-mode-3.1.1.tar.gz 55876 BLAKE2B 49dce2a58c278d3bca6ceba353766296609595609ce0976c8efdc6f17836ace4a0cc8676ab2de9522cafc036e97b2eaafe6fede1dd4d795201a676a2a519c761 SHA512 0d79e15f5a91eb361662761a3cc0a2d556584f3310e270b8a4db5648fea06022f74970faa5716e3726da902922eceabf4c8c5d281d02be66e8d785a4d7044d71
-EBUILD ledger-mode-3.1.1.ebuild 547 BLAKE2B 73708e3ba029db55272653390f00ded60bbfdeb8340033798a0612ed2e3e3dbad2f1bf4445d3af69cf134b3941abe2eba93b7a1cd21080fc4f91530b9e7f8f75 SHA512 fc0c6598800f42f2c8625bcc6db85640ca47ca37645acb780f6807ebe5bef51731bdc20720b8064fd7b0f93b3fbde13b96cd8c456683280f1855166c848f03b9
+EBUILD ledger-mode-3.1.1.ebuild 545 BLAKE2B fde286fefdc51565f44c3d65d4ec5b4518e2b6225274f4b1adf1e03de148b5d91a000bca49da8684c3102ac2215071aa74ba565b6d69fc8775f65ff470c8f1cd SHA512 daaa28419116512582c5e5e4422990d32feac83117f098c27cdf740e296b2136935b6a556547484d1b0c7aea5d868ed7ba4b92d5afd8eb5f89b1a88d12b4d72c
 MISC metadata.xml 363 BLAKE2B 10d170578cc809b95267779ebee32b798cd93d79436298db85abc9ad748feed0320a6d71ad452f375f34b77ab1d70fe4e65559e588f70e1a33d0fd1a7b4405b8 SHA512 3f39a02e7859d601c91ec7fb9239062ca81b52a3e3b39d2e5788209273c2c869bd504af58451b515e2abd09ad72230b2879648aa8ab56dea07f99d88485ffb58
diff --git a/app-emacs/ledger-mode/ledger-mode-3.1.1.ebuild b/app-emacs/ledger-mode/ledger-mode-3.1.1.ebuild
index 1ae2ba672dc1..6453a3601379 100644
--- a/app-emacs/ledger-mode/ledger-mode-3.1.1.ebuild
+++ b/app-emacs/ledger-mode/ledger-mode-3.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ledger/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+ BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 SITEFILE="50${PN}-gentoo.el"
 ELISP_TEXINFO="doc/ledger-mode.texi"
diff --git a/app-emacs/lookup/Manifest b/app-emacs/lookup/Manifest
index d157df7cfd89..5c2152ad0656 100644
--- a/app-emacs/lookup/Manifest
+++ b/app-emacs/lookup/Manifest
@@ -1,5 +1,7 @@
 AUX 50lookup-gentoo.el 155 BLAKE2B b6b3c5a64fc880aa261a632d8f14f8bc6cd1e94b9d0f03ede917fc4eb88a6203d71a0d71a92c4ce51080adf54f7740397038378f631ad1a7dc6dab126f1b8189 SHA512 021e3bd99a25974788966d840cf5ce9359447c1aa331b9ef517aef23c4dc79581539bfd61a5f35f92551a4c189a64867fbf173212d28172e379da3532c1a9694
 AUX lookup-1.4.1-garbage-char.patch 283 BLAKE2B f69000bc367024bb71d14e5d687b4159f810779a524712870e3f25ebbb1db8711b7d94495659e0faee46bf640a7d2707a921f07a181155d542d8d9fc1f67dc55 SHA512 7e338e2184454579f2e5675e9b969805bd8954fa51fa55a42b62a58094f1f9a1760f1430cb61916bdfd999428f06705f555b6325c993edad7b119e7083325e11
 DIST lookup-1.4.1.tar.gz 346391 BLAKE2B 4de52e0bf444e4822408db580f1aacbeb8a42ea1492eda2c7678f1838615da00a370b1d12efdf0ff1fef4e81302426245e0c2411f42bf17667966c90f8b39cbb SHA512 a28a770ba58f07db5a7b2452792fc0e83b74e3b45556e84a9729c73773df661dbb7d356c1f7be803feb66f23e154aa825dab610f841bbe655bc76bd7120370bf
+DIST lookup-1.99.96_pre20180209.tar.gz 220833 BLAKE2B 2555b28919991356fe2e655d8058b7a23257bab413ee542fb6a3c5f719e22c1dce1bd08f144f0c71c6590438deeae5b8798fbf9c29edbffe21ddafc499b420a8 SHA512 2292a2d4e61a5fc8d17ca8afb02e172691babd47f296c2b2ff5e284c27a805608fc4b5c63dec07a0387bb52ee4fbd736d7b2d4320d74efc4c210ed156873e8c0
 EBUILD lookup-1.4.1.ebuild 720 BLAKE2B 713e5e5ac686f549a819c1b596e750ea632e81f1b2bf0ae7bccbed89f5c3c02c933111ae6a08db4eba69ea52b75cf907bf37244e3c383004a72fd53bf09e0f1b SHA512 b03163a1cc77f9e926d04e9260748e64f17aa434d011aa13f1c88123064feba5cb922edc8b06e7a15c2411a5bbeaf0d530c41c56f106ad6237243c61f5e80173
+EBUILD lookup-1.99.96_pre20180209.ebuild 801 BLAKE2B 880fec441ccec3be6776650dd991438df5cb07432337c5850029bcfa9c40009cd044cad1504da46616ffcb8162dc5bc76c7263b2067aaf8caf0b81ea12a6002d SHA512 cf41d9846d81122fb5d3a58a41f1cca3a915b8794c3cfc9cc4d834587185726ed189ebd46c53c670b897b6bbfe4b3d5e15088c795efe70fadbaa50c697d14dd9
 MISC metadata.xml 375 BLAKE2B 022df13d1d586579ed08af80b893ce2a1a9d1275720ec5d447efca002dd05a5544eaa6c1f01a5d6df2c0e7cf594eacf6a0c1fb840989674f8af537e1468ec6ee SHA512 24ea62246bc2d2c433dd071cf9906fe2f0c9dd834ba4d5bfadbbefcb9d47a063cd07da9c6756043c296c2ae56da39f18714416dab862d5f36fbd2f6100dc663b
diff --git a/app-emacs/lookup/lookup-1.99.96_pre20180209.ebuild b/app-emacs/lookup/lookup-1.99.96_pre20180209.ebuild
new file mode 100644
index 000000000000..83eb373c097b
--- /dev/null
+++ b/app-emacs/lookup/lookup-1.99.96_pre20180209.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools elisp
+
+COMMIT="c4f4986aac6c339e03b9e56a5dfc7c8f5c0bb5e0"
+DESCRIPTION="An interface to search CD-ROM books and network dictionaries"
+HOMEPAGE="https://lookup2.github.io/lookup2/"
+SRC_URI="https://github.com/lookup2/lookup2/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="sys-apps/texinfo"
+
+S="${WORKDIR}/lookup2-${COMMIT}"
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --with-lispdir="${EPREFIX}${SITELISP}"
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	dodoc AUTHORS NEWS README.md
+}
diff --git a/app-emacs/mew/Manifest b/app-emacs/mew/Manifest
index 94a5bf645c3a..68d9b853b68e 100644
--- a/app-emacs/mew/Manifest
+++ b/app-emacs/mew/Manifest
@@ -1,6 +1,6 @@
 AUX 50mew-gentoo.el 195 BLAKE2B cca28ee1ad51b86b1fea56490f93365aead98f123df2f778a1f2ef2207745c551a5ac9eb10386208a8ffafbd5f3498a9ef27aa5eb0bb5d4ffcc6e4bd3c854ca6 SHA512 2bd1f98dbedcbd4529f63bad9ac6093e4e783afb95270f672b30e9a50f8d0f3fbc7527ae975d35b9650ac6fa8b3ea32352985e8757adb5d9f064449623459eeb
-DIST mew-6.5.tar.gz 1026322 BLAKE2B 16fa19eb19ce4b49ea1b33db13c46a8b6c79cdc602e6bc295d1ab3310db772dc2a73c6c218ce6358baba943e6572a803103e8bc56d3eaeb67dd29666e482f3f5 SHA512 481c55915e57889e7b8c6d27c3d21802b624a886eb8f6541c2997db4d5328e16c3b5a8c9a9ce09637b1779b8c52af86a8662ee30dfbab0a411a586d4679ac69e
 DIST mew-6.6.tar.gz 989941 BLAKE2B 7ec4e502865e13108cc51dc74ffa246dd1084ae369979c05b9c1fc326c01f716766b7aa445ac489fe7c34cbc610e130738fa7578ab338d496970f6e59847c295 SHA512 55a91faaba09a28dfe7da33d34a8c3638540db71a3572ce01646976fbdd0ac3e327475ccc2908876ee6f516c6ee60082a27413b210c4591ef12cc4f878a07472
-EBUILD mew-6.5.ebuild 978 BLAKE2B 9bc36170e0da4cbe8391be66fc0b6e5247bb98b43e9f40c1c5f306fa37283c996de02af4544c9a8fbb3230ad322168824943b8970d1774a714f32fc39e8bbb20 SHA512 66aed50ab39771fca6272f6faf87acfb83a39f51d777f1935b619148d590c40ceb1748a94bf577c5a8137d06887d8204e2294b1c3179d1791b20e2092e4c8fab
+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 1002 BLAKE2B d7c478298ebfe30709bf7ea0bb93da522b1d779d2a60b8866512a6a5cb40e8d496bd81edd09bf9b4c01fc7aca2485fdef2f46925d95f05ccd146c9768a2c0c9b SHA512 704df5d49bc392707ec5ab911720c93a491b2590f54501f47857b8f73662905ecb99581427381e9dab5b7a7a0917bbb24d9168013f64c958574659a5347e736d
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/mew/mew-6.5.ebuild b/app-emacs/mew/mew-6.8.ebuild
index 40d3f282f443..765ba677f2b4 100644
--- a/app-emacs/mew/mew-6.5.ebuild
+++ b/app-emacs/mew/mew-6.8.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
+NEED_EMACS=24
 
-inherit elisp
+inherit elisp readme.gentoo-r1
 
 DESCRIPTION="Great MIME mail reader for Emacs/XEmacs"
-HOMEPAGE="http://www.mew.org/"
-SRC_URI="http://www.mew.org/Release/${P}.tar.gz"
+HOMEPAGE="https://www.mew.org/"
+SRC_URI="https://www.mew.org/Release/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="ssl l10n_ja"
 RESTRICT="test"
 
@@ -36,12 +37,10 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install
 	use l10n_ja && emake DESTDIR="${D}" install-jinfo
-
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	dodoc 00api 00changes* 00diff 00readme dot.*
-}
 
-pkg_postinst() {
-	elisp-site-regen
-	elog "Please refer to /usr/share/doc/${PF} for sample configuration files."
+	DOC_CONTENTS="Please refer to /usr/share/doc/${PF} for sample
+		configuration files."
+	readme.gentoo_create_doc
 }
diff --git a/app-emacs/mldonkey/Manifest b/app-emacs/mldonkey/Manifest
index 04b76c7dfb10..55734ccacecb 100644
--- a/app-emacs/mldonkey/Manifest
+++ b/app-emacs/mldonkey/Manifest
@@ -3,4 +3,5 @@ AUX mldonkey-0.0.4b-emacs-26.patch 387 BLAKE2B aa881c515f8c1d5125af2bd237e94ba20
 AUX mldonkey-0.0.4b-vd.patch 3511 BLAKE2B 00e05b1d18183fd8be439e7987b9dabdfb0c3e419b5497842c7598e534ae3e867943244a17991ce573dc0b3d86ab2844bba7cc09738d0ead137199a2bdfeb3fc SHA512 18ae6a4925b54b5d40ad9342fa65596df47e48a7223ca1a89c8622ab324f805d55c9bfaeea71c8465fd276997a34d979ff16532b8d8d86c4748fedf9ed02381b
 DIST mldonkey-el-0.0.4b.tar.gz 17442 BLAKE2B d9057a00c3b3532162564f59afb838a41b83b17adeb569d86c13cef8a6338083f12d078a19d0568936d9116e0c9adf0b53db3933116dc46925ac095c1a529d89 SHA512 3c6a16292968e0f40d319614bfd2a53c9612ec4121c5720f51498d8983f6b944c38fc1d664f1c7ebe1d68653ba62d828fa00092b1a1d278547c225b33f4e740b
 EBUILD mldonkey-0.0.4b-r1.ebuild 926 BLAKE2B 442018577f992d42349d97f58dffeb5749229011602e6117ef3001a211b076409705e9c503bf2cf485eda552e90110f41cf3a472673e20adb31e52b20fdb99e9 SHA512 9a85aadc2beeeceebc925cb14683331528d728758873d73aa04e180af93e4f469a0a74b55c230af13411d6e1a816e3effaac65e37e46b2487731f176cdebee83
+EBUILD mldonkey-0.0.4b-r2.ebuild 879 BLAKE2B 36f8e3cead9de9acccfc67a654b24015e3b428a98260bd02ce3dcc4f1118a84b7eccdf070560f6074f0df495152f63f88d4fc73c40634d883134801b455ffa56 SHA512 755765111da47d49951804248e8813d0220e76354281832587e6e9fe4405c646a0e4b6289b3cfc21e9418dd72c4a5f979ec6169b6370da6608125dbc885ea8e1
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/mldonkey/mldonkey-0.0.4b-r2.ebuild b/app-emacs/mldonkey/mldonkey-0.0.4b-r2.ebuild
new file mode 100644
index 000000000000..b5714cc69480
--- /dev/null
+++ b/app-emacs/mldonkey/mldonkey-0.0.4b-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp readme.gentoo-r1
+
+MY_P="${PN}-el-${PV}"
+DESCRIPTION="An Emacs Lisp interface to the MLDonkey core"
+HOMEPAGE="https://www.emacswiki.org/emacs/MlDonkey
+	http://web.archive.org/web/20070107165326/www.physik.fu-berlin.de/~dhansen/mldonkey/"
+SRC_URI="http://www.physik.fu-berlin.de/%7Edhansen/mldonkey/files/${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+S="${WORKDIR}/${MY_P}"
+ELISP_PATCHES="${P}-vd.patch ${P}-emacs-26.patch"
+SITEFILE="50${PN}-gentoo.el"
+DOC_CONTENTS="If your network gets really slow when you use mldonkey,
+	consider reducing the max number of connections. See bug #50510.
+	\n\nRemember to install net-p2p/mldonkey separately if you want to
+	work with a local instance."
+
+src_compile() {
+	elisp-compile ml*.el
+}
diff --git a/app-emacs/mmm-mode/Manifest b/app-emacs/mmm-mode/Manifest
index f0e9ddc65d52..072ec612f986 100644
--- a/app-emacs/mmm-mode/Manifest
+++ b/app-emacs/mmm-mode/Manifest
@@ -1,4 +1,6 @@
 AUX 50mmm-mode-gentoo.el 58 BLAKE2B 0114bc73a9125264dd76189479ec708455f88c2d50765154c64f7bd5ad386889b055b280a1dae5fe661962f27caabb06a8b6a0fc709fce83abfe9c21be6fd8da SHA512 4cbf0da7bcadcdb30947fdb789542daef059112c894be4ad418321cf526f7789e86f612c92bc5c11504ae2538f0e73650589663b3f87421543f0047932c6126f
 DIST mmm-mode-0.5.4.tar.gz 174680 BLAKE2B fbe69ffe291d7144ddaa22d161545350893285e2594f9343d6b4e3b6c929a83209c8dbdf5f270b179c98c7fd1ab88d2c5f68066e6aca0ef5e8533335c4c194e9 SHA512 71828769f40ca56d87c581481fc6531466de30155af3f22eb96ee176cd9dae354ed95a6c37d79e47a033bb79c67335e0f50dac2fb57f262bbe0ef43266af2b6e
+DIST mmm-mode-0.5.7.tar.gz 176034 BLAKE2B 23fed0f260c9f46134d83d29e96b96ff331aa0fbe8d121663b74de944489d1a51948f6fba729129e47a34e1ef48cfb0f8bbc45f6ab8f548001bbe0e88a61aeca SHA512 3afb77b3351c8ea5844cd57bb873e6ebe91ce1e268d0d585581482f5039c64ea80fc7aa620e45330eca0eb7839223764164ccc09e932b54f23f3f37c9953cb39
 EBUILD mmm-mode-0.5.4.ebuild 590 BLAKE2B ad5eb39888db88049f25b124eac984cc989393db979ab9ea2f8623f8743151119ffb7b762c901d8bfba4b0dfe683c0058ffae64c1cb08b603b5b8fc893e50332 SHA512 181a5e26bf067446f5be999f4b42f8c2edbfd249e0cacd31f7586a2b401c27fc392f5c4d06ca4bff95c2594f5e998d9212ca3a44d1ac9e7835ce42eb6706d818
+EBUILD mmm-mode-0.5.7.ebuild 581 BLAKE2B 962a19ab381f8e8b0b6b147e7d89ddbadd8987f0a3bf65ee5cb5b498cc58ec480c0bc3dcf9ffd3b551572fe0f2a1b856485b6053c9c19b62a77def58076fdbba SHA512 be5b0830cbc6b85463a605171a0d3110c1563e7fb2c3709769664e5a7d6e92824629c0f6702708a16c8394fbb15e14e2d1175d8d2d9d094d69a24dfea623714e
 MISC metadata.xml 414 BLAKE2B f62c75a172d2da325b4f7b0e41e0bc2d7f128e96493b46cd6bc5232915418a506c0d2e2dec88c2b2ac3eace003b4dfdafdeb3da147230c3675a5c3413ee4714f SHA512 ef3005e7c7016dae433d8612bbcf154c928f264ee3203784f2d3756c89c66545cbb3dd29349048b47fb07a1764677068d758d900b4f77fd825c11d5ae82dbd1b
diff --git a/app-emacs/mmm-mode/mmm-mode-0.5.7.ebuild b/app-emacs/mmm-mode/mmm-mode-0.5.7.ebuild
new file mode 100644
index 000000000000..74ec2b53ffae
--- /dev/null
+++ b/app-emacs/mmm-mode/mmm-mode-0.5.7.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
+
+DESCRIPTION="Enables the user to edit different parts of a file in different major modes"
+HOMEPAGE="http://mmm-mode.sourceforge.net/"
+SRC_URI="https://github.com/purcell/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ Texinfo-manual"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+BDEPEND="sys-apps/texinfo"
+
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="mmm.texinfo"
+DOCS="AUTHORS FAQ NEWS README README.Mason TODO"
diff --git a/app-emacs/muse/Manifest b/app-emacs/muse/Manifest
index c341a6a05b40..90f2edb2ce16 100644
--- a/app-emacs/muse/Manifest
+++ b/app-emacs/muse/Manifest
@@ -1,4 +1,4 @@
 AUX 50muse-gentoo.el 64 BLAKE2B 1af4c3cb29edfe7f0263b2eefb1483c2f680a4199c1ec27ae7b4db26f7923d86418b3b3a87fdfae90edff728fa20cf628075a320985bde0a132d1bc864e2ad49 SHA512 c4b1049b70cd62c2490621d123227e5cc62d80c8a2fa3575d69443ec09e5fbb6294b1f3b3dda530139d9318610bc3c806f3984ae697e246778aab5aad0bbc632
 DIST muse-3.20.tar.gz 411316 BLAKE2B a67c72a470e7e2d75cf94ed262b0e9503166326666a119f41968a603b4e48f3527705691a1b4b819ae6ec69c382a09074eef74ddad598faa08be6c74793b1e97 SHA512 23cd0e864586f907418753bc3284afde51b4f8559c5d043c52baa70de70ec4a845d9e8362b93e701308dbbd662e3429035df8ad440916e61d5909498cd55f7be
-EBUILD muse-3.20.ebuild 798 BLAKE2B c1e1bfa6ee31439f39693a20edd4e6ae3fce0ecbde857fdbfae4972f5eaa85bfbf390e8e69cf01a5e88218e10139ce276101a466d41db738aa569273932892d4 SHA512 73f3d55410e94b60f40be8ddf8ce9e64e19534e26f67326bfa06d88bfae7d624026e56d1167484da5a70741ff8656f3c74fcc96b1e34c92eb4705a2c7e310856
+EBUILD muse-3.20.ebuild 772 BLAKE2B 33041b5eae18b5ae332c2371d741f1103d75c5663a517a2002e6eaec2d4916e3fa4ec9c945d722c50358eeec9f674e31b50c575dbff9dba712be3e764e10ab6d SHA512 e2eb889fc80ee956b1aa278d1c9060700f2dd91774804edaf406f4054df5f6fac351b82016e7c0e4ada486ef2717c2620bb2ff6f950a88dd258a05ecd6141379
 MISC metadata.xml 1573 BLAKE2B df1f66340b61bf97f534274155310fabbfaa2ae8b4cf64f1bd1cba27b38ca4bc1d9f7a5ea4e6c9c74e02ba333a81638c97a8cd0cf540a3433182cfce02f26b5a SHA512 e61095db5b26acf2fdd0143cffe5146a4d1755ce3a2a5fb27041d94b0f76d09c1423af83b3d65caae3ac784f6155c8ee0bcde05e3c6f3a02e677aeeda5435aea
diff --git a/app-emacs/muse/muse-3.20.ebuild b/app-emacs/muse/muse-3.20.ebuild
index 0b93b90bc77b..24997d6aa576 100644
--- a/app-emacs/muse/muse-3.20.ebuild
+++ b/app-emacs/muse/muse-3.20.ebuild
@@ -1,22 +1,21 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 inherit elisp
 
 DESCRIPTION="An authoring and publishing environment for Emacs"
-HOMEPAGE="http://mwolson.org/projects/EmacsMuse.html"
+HOMEPAGE="https://www.gnu.org/software/emacs-muse/"
 SRC_URI="http://download.gna.org/muse-el/${P}.tar.gz"
 
-LICENSE="GPL-3 FDL-1.2 GPL-2 MIT"
+LICENSE="GPL-3+ FDL-1.2+ GPL-2 MIT"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-IUSE="test"
+#IUSE="test"
 RESTRICT="test"					#426546
 
-DEPEND="test? ( app-emacs/htmlize )"
-RDEPEND=""
+#DEPEND="test? ( app-emacs/htmlize )"
 
 SITEFILE="50${PN}-gentoo.el"
 
@@ -25,8 +24,8 @@ src_compile() {
 }
 
 src_install() {
-	elisp-install ${PN} lisp/*.el lisp/*.elc || die
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	elisp-install ${PN} lisp/*.el lisp/*.elc
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	doinfo texi/muse.info
 	dodoc AUTHORS NEWS README ChangeLog*
 	insinto /usr/share/doc/${PF}
diff --git a/app-emacs/nagios-mode/Manifest b/app-emacs/nagios-mode/Manifest
index 76c83e44d996..6eaa587b5cd1 100644
--- a/app-emacs/nagios-mode/Manifest
+++ b/app-emacs/nagios-mode/Manifest
@@ -1,4 +1,4 @@
 AUX 50nagios-mode-gentoo.el 195 BLAKE2B 9462de25d1de1f9c0d972841339dac53458b6534bfe76b744312b4f0af8063fcdf11fe3d404c49bdf4ede28550d0390b6e3ff1d7068c9bc8f30d4454f117bbc5 SHA512 07e3dfbf4b4142b6b6bbf4138c76b9252f94b9cc1c25f2eaeb9cfddf2294995ffd5fbf40b6bdc032320f94dc93e8463cb270ef841ee11424939dcf5889a54fe1
 DIST nagios-mode-0.3.tar.gz 7917 BLAKE2B 17f69dd9736b5a3f94a69ef2af7827503d2ee87f97346e5ead44563d1e056457bb425f0145b58246dafebbb0fd346857e5fe9aa11a616c8e6608722013a73500 SHA512 e9ff6e0684ee0f9f1919ec9dd4c8e0dfa7faab347f56724f7fe69bc366cf8d81f98c4c4245ddde95bbf9a2b9f72fec80a100c22b6b0b9e3c28c999515d0b6a50
-EBUILD nagios-mode-0.3.ebuild 453 BLAKE2B 20c8e87cf76c917447bdffc285a714a93730c5cc4d59ed9375c9b49aaaa02336e4ce8c3e714063527e3500ab3dcae5f5bfd0ae9859baef9bf1da353a34331bbb SHA512 39ff8f5ee30350407cf6d03bfcdb8adda2baeff902ecbf5e4fafc81724b0f2499d6238f691102e360225dbe77e0d7dd376be5105a8503f3a64b9f1da88119eab
+EBUILD nagios-mode-0.3-r1.ebuild 443 BLAKE2B 3455952b7b891118d1114699bec2e02a5924aecf87e9bd0a87d03f38303a2885b629098a9848b551d958759110155769123ac302a14380c97cb642d8afea6532 SHA512 2985915962259010645477aed1a46b3a6a85122eabd73eadee8b9d8d673ed822c95e1f9085a55eb8794c774b9d5e7c0ea51d95b8f2bd9d82e0ee61c3885dfa5d
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/nagios-mode/nagios-mode-0.3.ebuild b/app-emacs/nagios-mode/nagios-mode-0.3-r1.ebuild
index d8df07e7fb29..4993e417bc3a 100644
--- a/app-emacs/nagios-mode/nagios-mode-0.3.ebuild
+++ b/app-emacs/nagios-mode/nagios-mode-0.3-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 inherit elisp
 
@@ -9,10 +9,9 @@ DESCRIPTION="Major mode for editing Nagios configuration files"
 HOMEPAGE="http://michael.orlitzky.com/code/nagios-mode.php"
 SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.gz"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE=""
 
 SITEFILE="50${PN}-gentoo.el"
 DOCS="ChangeLog README test_suite.cfg"
diff --git a/app-emacs/nxml-docbook5-schemas/Manifest b/app-emacs/nxml-docbook5-schemas/Manifest
index bdc84e38682c..6702754190d2 100644
--- a/app-emacs/nxml-docbook5-schemas/Manifest
+++ b/app-emacs/nxml-docbook5-schemas/Manifest
@@ -1,5 +1,7 @@
 AUX 60nxml-docbook5-schemas-gentoo.el 206 BLAKE2B ae9d1fe1da9c86d14796c09597ca34b10dd0e28abb02fdeac4607b8d950bfdf636f5f3c1de49cd5b9cf1fa808513522ab43272f3c26361b871ad0d630a942ed6 SHA512 5592edb5663066fcccaf5b05c3df671b4069d4d259376a8a91ef3f7ae5990687b15dfdf40e6f7aa6cc7d62b7cdaa5090fd851de0ed2718d20ecfe3e3a78530ea
 AUX schemas.xml 198 BLAKE2B 723ce69dc7b0e63267b0e7b93965ad238b9a919f088aa5dd7611a84c7ebe0a053ae5d8e33ddd6dbf6584f6a9a5406cdf2c727c00907dbd8d5da344405c47bfe2 SHA512 1f41a1e907ae92637845803cdc0c569ad444c9c03a0ba5d9c3f909d42e41353a84f20ca50dbf4f49c0f96836af5c0d5ff0b1f034dbb9b8a45f6083a3ae955ada
-DIST docbookxi.rnc 292523 BLAKE2B 13ae2f3756485845e2fc6dca87bce5eb12c419c84b6edaab5051b075700387c32904f54286756c5fed2480c17af00e385845105a94b13ced9fe13ba959e22224 SHA512 13309beb2dbf76168889a962782d3dd1849fb254ebf1941ffd4fcfc272353ba0ddece509a9b74250462b3e1eff12f31fc408aa790e0efea01d527482b3fa3a48
-EBUILD nxml-docbook5-schemas-20080922.ebuild 586 BLAKE2B 107ad2114cb166c515237fd07c48700a3a69a0149d03a299fab73691f2b64b2994ed00cb69ea9b4e9ec3bee02aeb84a5e59b958436e713ec47f876d050ccb1c0 SHA512 2f17befae09d09e81e9a2b98d86a9d5bf479d6f5de74e8bbedace24f1c974917b1a1b7af2ff17c6b2619023dae8087010912c492d7893a37d2ce9974269a0579
+DIST docbookxi-5.0.rnc 292523 BLAKE2B 13ae2f3756485845e2fc6dca87bce5eb12c419c84b6edaab5051b075700387c32904f54286756c5fed2480c17af00e385845105a94b13ced9fe13ba959e22224 SHA512 13309beb2dbf76168889a962782d3dd1849fb254ebf1941ffd4fcfc272353ba0ddece509a9b74250462b3e1eff12f31fc408aa790e0efea01d527482b3fa3a48
+DIST docbookxi-5.1.rnc 361312 BLAKE2B 374c622718b0c9969561a76874fe878570af4fd2a1288f79c8b51c1474ac75e7e98cddd2be7bedadf8271aefccd770cf70ac4499d45187b327c0a50e402b1a48 SHA512 28191653224a301a3ce7541ca1fcc5d526b76fcce00533adbdc16507ddaa768efedebe31b0fade6b8ea7b28d3d33e9656363dfc667eab227280bf6061673a31c
+EBUILD nxml-docbook5-schemas-5.0.ebuild 630 BLAKE2B a78cad9375dc90fd0b8d404a6f72831c65d73a2c528d97763a2ca7c769e48f940dc5dbfa263427f6a9049dc49f22a3e87389272942acd55b50a742b34166a413 SHA512 1abe4eda77aa0c594c32270ed609cdd5bd2f3f06f1d32050bdca393df4f34e4d7f943d37fc07a54721165fac85c187e078fd0d3a7da83103dcb2e9bb0844ab2d
+EBUILD nxml-docbook5-schemas-5.1.ebuild 632 BLAKE2B a542a05df2a47f1c9191bcabc5d027cfaec566f6f34076ee65dd98f74b2095054bdfc133211b9559af8298054613672f7058c4c1498d71be1e8ef998a39af8f1 SHA512 24c67ca4505c8cee94d2c265192cbef6dee9c764086e5e25f456b2a1d36878d3dd00263f744398d400858d8ba661dbee679776a91818f8091591feb447630bf4
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/nxml-docbook5-schemas/nxml-docbook5-schemas-20080922.ebuild b/app-emacs/nxml-docbook5-schemas/nxml-docbook5-schemas-5.0.ebuild
index c136f7675203..946c21d0a832 100644
--- a/app-emacs/nxml-docbook5-schemas/nxml-docbook5-schemas-20080922.ebuild
+++ b/app-emacs/nxml-docbook5-schemas/nxml-docbook5-schemas-5.0.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 inherit elisp
 
 DESCRIPTION="Add support for DocBook 5 schemas to NXML"
-HOMEPAGE="http://www.docbook.org/schemas/5x.html"
-SRC_URI="http://www.docbook.org/xml/5.0/rng/docbookxi.rnc"
+HOMEPAGE="https://docbook.org/schemas/5x.html"
+SRC_URI="https://docbook.org/xml/${PV}/rng/docbookxi.rnc -> docbookxi-${PV}.rnc"
 
 LICENSE="HPND"
 SLOT="0"
@@ -22,6 +22,7 @@ src_compile() { :; }
 
 src_install() {
 	insinto ${SITEETC}/${PN}
-	doins "${FILESDIR}"/schemas.xml "${DISTDIR}"/docbookxi.rnc
+	doins "${FILESDIR}"/schemas.xml
+	newins "${DISTDIR}"/docbookxi-${PV}.rnc docbookxi.rnc
 	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 }
diff --git a/app-emacs/nxml-docbook5-schemas/nxml-docbook5-schemas-5.1.ebuild b/app-emacs/nxml-docbook5-schemas/nxml-docbook5-schemas-5.1.ebuild
new file mode 100644
index 000000000000..3cede296fe4d
--- /dev/null
+++ b/app-emacs/nxml-docbook5-schemas/nxml-docbook5-schemas-5.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="Add support for DocBook 5 schemas to NXML"
+HOMEPAGE="https://docbook.org/schemas/5x.html"
+SRC_URI="https://docbook.org/xml/${PV}/rng/docbookxi.rnc -> docbookxi-${PV}.rnc"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}"
+SITEFILE="60${PN}-gentoo.el"
+
+src_unpack() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	insinto ${SITEETC}/${PN}
+	doins "${FILESDIR}"/schemas.xml
+	newins "${DISTDIR}"/docbookxi-${PV}.rnc docbookxi.rnc
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+}
diff --git a/app-emacs/nxml-libvirt-schemas/Manifest b/app-emacs/nxml-libvirt-schemas/Manifest
index c20b7d3aeee2..8bf73fb8a699 100644
--- a/app-emacs/nxml-libvirt-schemas/Manifest
+++ b/app-emacs/nxml-libvirt-schemas/Manifest
@@ -1,8 +1,6 @@
 AUX 60nxml-libvirt-schemas-gentoo.el 206 BLAKE2B ae9d1fe1da9c86d14796c09597ca34b10dd0e28abb02fdeac4607b8d950bfdf636f5f3c1de49cd5b9cf1fa808513522ab43272f3c26361b871ad0d630a942ed6 SHA512 5592edb5663066fcccaf5b05c3df671b4069d4d259376a8a91ef3f7ae5990687b15dfdf40e6f7aa6cc7d62b7cdaa5090fd851de0ed2718d20ecfe3e3a78530ea
 AUX Makefile-trang 108 BLAKE2B 4f80e5f4e0550bd4732668ae5298d890d2293d34379902cf204c43bbea5db01626847af7ab96854efcbcc34e7fe9b1c32873ad22ef13873a1a06790e9580371d SHA512 3544959cc57ce1b273e4b9de95f51e1e21d23cc35fb48e02f179a055a61ee9092efdc43405f72c3aacb3c74eada7fabf5952eb49e3ff0514fd69a3092268dc4f
 AUX schemas.xml 560 BLAKE2B 32f01d2dd047aa7109112b47155a21825686385845fae2af0f6d052dbd36f3e1ca5027ec39d654735e390ef9aa8a31f7ae5c86b15b0cd9c4ef84128326e87ee9 SHA512 82ef6189610fc4e1a0d5546ae15f2f315e7c0d460fa141201c43a93e59d147613c7186302fdc3e6b2f0ec5c343e5566966892d4e9f55dc4957e4ad58793fc3ff
-DIST libvirt-0.9.7.tar.gz 17853636 BLAKE2B d149fe4f095c76d003bdca1a307e588a9bd1b011b34119e90b8875837ced533caa2f05f2b9e7709d13f5af0a078fdc4779b7fc8a247f7ca04ad490b18fe728c5 SHA512 ac082f3872b37fc7aad891ba3f2a9614bdc85123b3d626fc7a2e43327a7ec346a0ec154c25161592a4337e3f694d9b27d031544190dec7d6086343f15fe9ba2d
 DIST libvirt-1.2.1.tar.gz 27228694 BLAKE2B 5552508f87bddbd8d2dd65a37298f7f7e7238a7ac5aeef878bd8b3c6d5ecab8f2cf6fb94c8d520312b6c6399f1e663f8d68febf2badd544020635df841f5488f SHA512 6184840623156ca01ee7f59078ebf031bc84c25b37bb110372c7bcf230a79b74e267475f989fb73db5e3c096dcc74f03cb30adfc5de022f756ed2cd6ab05bfd0
-EBUILD nxml-libvirt-schemas-0.9.7.ebuild 1293 BLAKE2B eb3c85bbd2f35c7d02a0d81f25aa5abc1c69b4c75ce6a40647d455c9f2ae19ef8be55a7ec50aac62964197d43f84be4148fa7c94438fda69a650050c7a786f78 SHA512 1cf461b494a820e22b870620dccab37ae225361ab6406b5d22c7b1c04a6291175ef52d081cdffc5146f5865e1b2342d8345e2bf4e36d9eb9e2bc06161627de55
 EBUILD nxml-libvirt-schemas-1.2.1.ebuild 1293 BLAKE2B 6dda0f1cfff26b8f85c21178ff5df4b6259ae982b6c4a2b5423d4bbc54410c2c118461aa56d4f9bdcdd34ff66ff5a772d2cf93bcca66f39ebe56bf65c21071b2 SHA512 265f6a389fc41b15d31fb257a77c7b7fe5e7796988b3aea592c5f2cf09fdcd321e151cd09ec2cbeb2403ddd86cf1029b0598264ff4fa0e764d58a73e813701a6
 MISC metadata.xml 389 BLAKE2B 5874fa7fb23c84408f3e1c975b11cfe88067da63a91d93447f26c682d868ad822e092a186a14cb17d3ca48f8543b64c86ea0086cc26d434e3b5d03e1bd0a5e26 SHA512 5def622fb849779446a7026e11f2f9216c70da203712c4611ac21b0c487adb050159a7775906da34184bed12e4d12033e730722d152670524b4c29bd422f9307
diff --git a/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-0.9.7.ebuild b/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-0.9.7.ebuild
deleted file mode 100644
index 9a8a326fa0db..000000000000
--- a/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-0.9.7.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-#BACKPORTS=
-
-inherit elisp eutils
-
-MY_P="libvirt-${PV/_rc/-rc}"
-
-DESCRIPTION="Extension for nxml-mode with libvirt schemas"
-HOMEPAGE="http://www.libvirt.org/"
-SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz
-	${BACKPORTS:+mirror://gentoo/${MY_P}-backports-${BACKPORTS}.tar.bz2}"
-
-# This is the license of the package, but the schema files are
-# provided without license, maybe it's bad.
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# Yes this requires Java, but I'd rather not repackage this, if you
-# know something better in C, I'll be glad to use that.
-DEPEND="app-text/trang"
-RDEPEND=""
-
-SITEFILE="60${PN}-gentoo.el"
-S="${WORKDIR}/${MY_P%-rc*}"
-
-src_prepare() {
-	if [[ -d "${WORKDIR}/patches" ]]; then
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		EPATCH_SOURCE="${WORKDIR}/patches" \
-		epatch
-	fi
-}
-
-src_compile() {
-	emake -C docs/schemas -f "${FILESDIR}/Makefile-trang"
-}
-
-src_test() {
-	# No we don't need tests here... trang will take care of checking
-	# the well-formedness of the schema files for us
-	:
-}
-
-src_install() {
-	insinto ${SITEETC}/${PN}
-	doins "${FILESDIR}/schemas.xml" docs/schemas/*.rnc
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-}
diff --git a/app-emacs/nxml-svg-schemas/Manifest b/app-emacs/nxml-svg-schemas/Manifest
index 1f056ece7e1e..c97188ba2ec9 100644
--- a/app-emacs/nxml-svg-schemas/Manifest
+++ b/app-emacs/nxml-svg-schemas/Manifest
@@ -3,5 +3,5 @@ AUX Makefile-trang 108 BLAKE2B 4f80e5f4e0550bd4732668ae5298d890d2293d34379902cf2
 AUX schemas.xml 495 BLAKE2B ecb678b98a23e0631da09f9befa73b2b41c5204f78423f9957eaabd6963c5e8b63114c0f908039618744e4aa4643603b58a9ded5fdbf157e0cc60b1810afce84 SHA512 d6a9f0b9db51e05b4f3d0395c8d43a0577d23fdb6c0e9d0123682f00d4ccac5897dfdbd157560b3bb9f06a8a768298489e8b8a2843d7e7a65ffb4a5e20c1b316
 DIST w3c-svg-rng-1.1.20081123.zip 48420 BLAKE2B a89da9708ea79085ad5aef1f85769683af2a5c8ab84a5a4f53b9c2fdeebf422a96065309d69eb4ac9bd069bcd3685ee849c7cdb4b9b9e7829ff58fb0b7b8b754 SHA512 69e44a7c04a3af77d0fed8f19372cfcad7998e262a44b520145fe2c0ad03bf20daf57e1e97f71ff27f0e06bd3f07d1ec0b0976fdd893d77df2f82709f7c1ce1f
 EBUILD nxml-svg-schemas-1.1.20081123-r1.ebuild 1184 BLAKE2B 309e2700423b5796056a83e92caf0146edc437fafcd586995b233710af862ba7b98789bf4e0d1f872f5466503729bdfa8a0b55efb3c83c88abbe3c9c7693e28e SHA512 ec30f4253cd4161af7db052bc77f0b1ebe1803747cbe83ffc1b5d2eda9042092dce315273c862d5c016f0de2cd8fe9858b0aa75ecec012c5425c582749ae7264
-EBUILD nxml-svg-schemas-1.1.20081123.ebuild 1161 BLAKE2B 3091c7f6fd45b238fe2fae9fc88bb2458b7b883748d2ea50d11d2930c127db57bad275c9b2e9d3e3230a85cfa88b0da14d2062a079f8dd7aaf13db7a7abd2b2c SHA512 c889a3c55acbbdc5909f1c960404bc431d0902f1bb515459547debbb5af7ef26262b8f46844eba63831ed72c2a1795bdb9d40b6917d7ef917a658915566594fa
+EBUILD nxml-svg-schemas-1.1.20081123.ebuild 1176 BLAKE2B ada7a527f213685649ad3507f4f2e6048e37e1a00e8acce8d8ada3658a11473049cdac1614670d4c0c29a7ea5ef52bad1af8cbb814fc7be15074dc20a94e350b SHA512 09781d45de2872b53ac1087dfbfef8eb4881c070caea3d301b8847a63bbc00eeb57569471684684c2d82baee9d95ada14e99c985dd86b606406cc4cd4d1a6098
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/nxml-svg-schemas/nxml-svg-schemas-1.1.20081123.ebuild b/app-emacs/nxml-svg-schemas/nxml-svg-schemas-1.1.20081123.ebuild
index 639661441bd5..5180d7bed52f 100644
--- a/app-emacs/nxml-svg-schemas/nxml-svg-schemas-1.1.20081123.ebuild
+++ b/app-emacs/nxml-svg-schemas/nxml-svg-schemas-1.1.20081123.ebuild
@@ -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=4
@@ -20,7 +20,9 @@ KEYWORDS="amd64 ~x86"
 
 # Yes this requires Java, but I'd rather not repackage this, if you
 # know something better in C, I'll be glad to use that.
-DEPEND="app-text/trang"
+DEPEND="
+	app-arch/unzip
+	app-text/trang"
 RDEPEND=""
 
 S="${WORKDIR}"
diff --git a/app-emacs/ocaml-mode/Manifest b/app-emacs/ocaml-mode/Manifest
index 6ffbbef189cd..53966bba597e 100644
--- a/app-emacs/ocaml-mode/Manifest
+++ b/app-emacs/ocaml-mode/Manifest
@@ -1,8 +1,6 @@
 AUX 50ocaml-mode-gentoo-3.12.1.el 499 BLAKE2B 30d49a4e43fbf4fac02f4a2dd8a9fe7c3aeea623836330e3ed0f8921cc96a02d087f35a32a93f6e404392a1f915539799d1a5c8168b06cb1d8ab76ea0ac6b8fa SHA512 0be69a30c07caeff818e4d6fb0147e18855e88a3bb6a6e876b170edddb32382c0bd19ca960836d8442eecd00e78be09cba7de08030420645c2ef1ba5d9198524
-AUX 50ocaml-mode-gentoo.el 501 BLAKE2B 68182139142156463bc5ee18db988deb8ca61e512970ba317c34cf76422f47ccf2f1b8837d954139a82c07f84546ea39ecbe14db9ba589ef2dd614a42df483fc SHA512 a8e665564f8b8394c677d7495ba1aac1e3f6cf1f3cd52c8ae1fdb37028fdaac8b021eeb17ce7c2e2e40dda0294888abf0e1078f821367c8a05715b5326dc73ec
 DIST ocaml-3.12.1.tar.bz2 2949124 BLAKE2B 8814927411cb9b604c78f44d172fd1f8b3d5f6009a1e722d442b8e49709778824cd6d1341e8129454d49000ea4d1234c533ee72cf0fa8fa84ee3b4d664177c4a SHA512 cbb050aabcbe19a4aa070d6cb74f3774cb136692dfd9433ca977f0f9520ad2f583b6cfb1a9cedfedc92e7dc794ac4a869e20aa5a67a4739002feb290435dc7e7
 DIST ocaml-4.00.1.tar.bz2 2762205 BLAKE2B f9a788eef67158b036ee551360410921beab87f1b01684ca17d5cb87a30cc0cd475ca640fcb284ad88d9054927ae0fd397921574cc9098956d60e80915d4cbb4 SHA512 77899430706394af558666361b152d47df3a3e21831059875f8b317d0ff9d1a010177bf1e5851e522e086c20768e92c71344aa53eda0ce003f278752870ab5da
 EBUILD ocaml-mode-3.12.1-r1.ebuild 478 BLAKE2B 57435b46af18eb982cb38ed4fb156635c19edcd9f48c26498704c9a4b2fea05e0c61ebd4d84d94ce9e8b1977ea0753df56baa675a660ddc367d0008f241a6975 SHA512 7f455663560d3ed3b52564192e353f1dda06afbd4ffc99f99332c179ed62f602fa66ff0b07daf4ebdc248e44dba35867e7b10f78630efcdd4d02f1854934107a
-EBUILD ocaml-mode-3.12.1.ebuild 481 BLAKE2B b55dd0c58c9f1f6615032c95066fb7bdbf425067f9a71b1dcb6e353eed96d60a332820725041a1c5a0ac2b96335938c590c8e7f828ea990150d6c2e33ad1f0d2 SHA512 d31b7980be6f5240927a313ae43729a06a0b5a31470a41192c00dbeeb43e3190c33097832dc580fa62fe33c3aeef0603c07afe184945a069dc145a5137d0149b
 EBUILD ocaml-mode-4.00.1.ebuild 512 BLAKE2B 8624b8a5cd72bdca4c4b684b9aa10bb2d1b74d4b39b97c29acea1c25b60a5efce98bd8be0654625d40eddf38bf565b4f44092685f9f6ba1978ac4fc9cedee9a7 SHA512 f4d728f9a8702a0f577cec7f7868c58323116b749306a4d5edf1f0795715aac9a0cabc2436789243a5b8be641df3efb900581109b15d412c6d9ec5a1fbda014b
 MISC metadata.xml 388 BLAKE2B 3b0d21b61541c15e807ececd8bfeb3a91ceefd5075836b4a22a990b1f0c9b4ad71ce68b9d65935382e5f84ae6fc49d022fc2b1c0704a5cf331857b33e09bd327 SHA512 d997ec7cfd421fa931b5ef0cc7713a75cffd1c1fb0204364253fa5243b67ae60389723f9ea473e7558bc87fcb6df54b85c987ca269c15ddc4613157ccee6b9db
diff --git a/app-emacs/ocaml-mode/files/50ocaml-mode-gentoo.el b/app-emacs/ocaml-mode/files/50ocaml-mode-gentoo.el
deleted file mode 100644
index 8f45033a3fce..000000000000
--- a/app-emacs/ocaml-mode/files/50ocaml-mode-gentoo.el
+++ /dev/null
@@ -1,10 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
-(add-to-list 'auto-mode-alist '("\\.ml[iylp]?\\'" . caml-mode))
-(autoload 'caml-mode "caml" "Major mode for editing Caml code." t)
-(autoload 'run-caml "inf-caml" "Run an inferior Caml process." t)
-(autoload 'camldebug "camldebug"
-  "Run camldebug on program FILE in buffer *camldebug-FILE*." t)
-(autoload 'inferior-caml-mode-font-hook "caml-font")
-
-(eval-after-load "caml" '(require 'caml-font))
-(add-hook 'inferior-caml-mode-hooks 'inferior-caml-mode-font-hook)
diff --git a/app-emacs/ocaml-mode/ocaml-mode-3.12.1.ebuild b/app-emacs/ocaml-mode/ocaml-mode-3.12.1.ebuild
deleted file mode 100644
index 095b08c559eb..000000000000
--- a/app-emacs/ocaml-mode/ocaml-mode-3.12.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-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 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}/emacs"
-SITEFILE="50${PN}-gentoo.el"
-DOCS="README README.itz"
diff --git a/app-emacs/org-mode/Manifest b/app-emacs/org-mode/Manifest
index 27be46526d57..25333f857c2c 100644
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@@ -1,8 +1,8 @@
 AUX 50org-mode-gentoo.el 95 BLAKE2B 9c74869edce0915d9793a3b10f61e8002dec553a93fe9856c526d77e5e988a35203c35322a1ea7ce9e19b02ff9a5ce1b2b4d73b8ba19bada30b7fbf453e43b01 SHA512 aa2e47c060d441ef1f631f2a44f3b7adc7cf5306155b9cc3f3f808aa053b411980671a89933c77fe02aac79bb6f25f2fe98c676e13e097dd885f23bc9d8cb000
 DIST org-8.3.2.tar.gz 4442361 BLAKE2B f21f07578e870cd3edaa3721a53f679627c0115c320c666c2086e201e272c0ef03540bfdd90936a624cd4c4dcbac21b91346ba975b6006ada2d46184f73574f3 SHA512 3e1ff47c875a2db3239add8b060f555da357e465161ca62860c0ac2734c2e31c5387d2df4223ab7ea8ea60050f9a845d160b0bcb3afcf36f1d3cabcaa961e6a2
-DIST org-9.0.4.tar.gz 4431853 BLAKE2B 1ecb8fa08597e08a6143cdf5d262274472eb5b245fa1103fe6b5509a5bb0d0aa471e9414b8f6293c3d5720c7b307a77e0f03ad6a9b590bf2469da5d54ddedfaf SHA512 fc3ab3e7c2b5f3243937497ea9515ea81434f2274ac158da7d0418e8ddc33debae2f1887ffbe37e3768d32a028834cc0ef35f3c3cc3938d7b24e0c5bfcf65ae0
 DIST org-9.1.13.tar.gz 4625532 BLAKE2B c7044913b8fd0bde43fa1ff0f4bc9963ebce1cda17753fe7642aff914603a4278e7396acf2236c27334f2b9a009bd9e3310ec6144d851e121c3f6ec6516ad6c7 SHA512 a1cb1b2a8db082b7f7a03e90109352bad219808cb506af30082b87fc2c6d66733ce304df4379542e7a85e20c213e1cbc8bf4c9d6c9777fea393a88755129c4bf
+DIST org-9.2.6.tar.gz 5720665 BLAKE2B 19346696b41c2ab5b66ca58b0e28c4ddfa184a390d39b1edc80536901754ac81a479cfb1ead5aaca6d93c9060fc122bbdfe1307900fbf0fc8cdb8fb7a2b2153c SHA512 8aba98bcd2e8e8d40c90524c7b0fd85526fc64725823a6ba66ef80b8f5f2e7d2b1d3363db2553af6672ded085a0abbf00311e36f02cfc1c2dbb18184df8f34a5
 EBUILD org-mode-8.3.2-r1.ebuild 1777 BLAKE2B f05cf006f13a39b5cdc62da3e5ba742c88b2cbdc64787218e0f2862095637714e2319c406327ce69649ac163e2e9f8cf06031d8e9464337b051ebb71da56f67f SHA512 2e5c6790fc10a7df5859ff7893ad6b37417099152e8021b306f536fcd92f7c4b2b3ca2477f268ff166b7eea92cd0c1b76ff0c3db3da4003c6181e6480959e126
-EBUILD org-mode-9.0.4.ebuild 1778 BLAKE2B b5a6c58c509c1531f9327bf7551c76eb49612061635eddb7d71a50371edb2f7e09e637d76ef30c5c7f4f63e1a24c9b9d45ad0421f43b5bf4513e8eff71c75c1a SHA512 6ebb922aec745216d6b10b4e025ffc30ecd6cb8c937396ddce75a0589b1b2ab0a953c1e10fb623a3b078822d3b2db6a10283078d8db48a83a2dfffc288b64065
 EBUILD org-mode-9.1.13.ebuild 1750 BLAKE2B f2e0c7a8921ca7583cd9417294cc3c692097694777cb6f0024361748dc88ff95bee545a1746073df475451b082f6795aec84633b14235714a60e8fe3fd6db8e4 SHA512 350915aedb567f6752dfef8debb8ac5d3c34a6a582341925ce03f52d7909c07a6bd86ee53ad579b3479442448136ee85f45b5976ff8f32c5d36d7cc40f27a1b7
+EBUILD org-mode-9.2.6.ebuild 1751 BLAKE2B 199663bcfcf3e176bc883549d18c542a618a70c08b182060f91ec8fcf2e56c46b0bc9e39a16887db66adf5f66ef0e527b91e7a06db771f515ef5174503eb69b0 SHA512 79223a957005bc4042a51cc851152fe68748493530274852d429cbd7ae7779329c3372ab9cafd4194ee4dda23b0f4fc21c6546e9231fdc7d2d0e8ebecbc68049
 MISC metadata.xml 1368 BLAKE2B 2680c11ca69b9acd8b96b6dc76586037bd1b7ce0e9cdc183781742f373ce8d0be5b8820b7fa4d18c4f59523e10d3b40df3edbba5178169fb993bacc8d10cdfe1 SHA512 6c557a3a3ecb9b1993bd8c976d0a81460cd1ecc6e53fbaeb0d086e8d78497485a1b34470b72a73e779878b4947a22d61ef36259037cf6ff0315a823e15e09c66
diff --git a/app-emacs/org-mode/org-mode-9.0.4.ebuild b/app-emacs/org-mode/org-mode-9.2.6.ebuild
index 4ff2e904df26..9fb4aebaeff2 100644
--- a/app-emacs/org-mode/org-mode-9.0.4.ebuild
+++ b/app-emacs/org-mode/org-mode-9.2.6.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
 NEED_EMACS=24
 
 inherit elisp readme.gentoo-r1
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-macos"
 IUSE="contrib doc odt-schema"
 RESTRICT="test"
 
-DEPEND="doc? ( virtual/texi2dvi )"
+BDEPEND="doc? ( virtual/texi2dvi )"
 
 S="${WORKDIR}/org-${PV}"
 SITEFILE="50${PN}-gentoo.el"
@@ -49,7 +49,7 @@ src_install() {
 	fi
 
 	elisp-site-file-install "${T}/${SITEFILE}"
-	dodoc README doc/library-of-babel.org etc/ORG-NEWS
+	dodoc README etc/ORG-NEWS
 	use doc && dodoc doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
 
 	DOC_CONTENTS="Org mode has a large variety of run-time dependencies,
diff --git a/app-emacs/popwin/Manifest b/app-emacs/popwin/Manifest
index b3cca907614a..44b70cf9a88b 100644
--- a/app-emacs/popwin/Manifest
+++ b/app-emacs/popwin/Manifest
@@ -1,4 +1,6 @@
 AUX 50popwin-gentoo.el 336 BLAKE2B 5f76341b524d373ed3aa8d15e99123f5be33a45eed4e865f647e8c40353bceefb8775dabadce9f0cbb630742893de1354dd09062ccc2cc4c4c68484ee380a02d SHA512 a9b72edf953d67a16aad44186d3f0f3deead224ce57342d73ba43abe15c0c2b170311380926d1195d98884b6e64fbeca23b74c3dd9a67b13015ec0b491861905
 DIST popwin-0.6.2.tar.gz 16821 BLAKE2B 6fcf2e711c28db3465fd4e267195f8526eff26aedeb04f07d66f5adac83f2447beef1ee988f692b9062a0e0eabbbe0760d3df6f1f7679fb4ab76317237aa8fdf SHA512 3c086361d6b79d7c68583cdbfb76cfd95b6ed56883382e42a863137d93e2a64fa8dce7b7873a4c46ce04a742942dd5f16367c691be608438079555578709b108
+DIST popwin-1.0.0.tar.gz 69319 BLAKE2B 2dea34f002a97ac58848abaecfb9b591ceeb58539f581918101604a485b6d45b9dd078dc89b3020bbe38e99646127a784582c51ffaa3a76de5b6ccaa365b22d6 SHA512 5b3ba489e747ec80d80e516024ca8bdafdb17a56df3f89c20053765d551173f448fbc10db348c6ec0e6efc5557eec672da3477980fb41f1fbbbf220f757f98e6
 EBUILD popwin-0.6.2.ebuild 471 BLAKE2B d76ac412dbdefe4a1449bd95b0552d5605e5fa5f27e4f4c4d2400b8f4bccaf3954d994e729927fb1537949aa4fdc52ba0af14ae234520b9bb88ca8000c2225b7 SHA512 a4dbeca3a4bd29b666fc533e01315fe02dae86ffad5653559ca3c4443189faf2b987d3b7960d04afa0a01425cc28f3a4f663d02b4bd56fd237bda367dcfedd23
+EBUILD popwin-1.0.0.ebuild 487 BLAKE2B a2b2ba9b5a428e3b58aabd2f83df7626212345fea65b4770e45633124226b8fb8fce5f5c3a2e1a0d6e9b44df513484f38d26fe453f5c5a446a4bddd40f42469d SHA512 310efe067b267ba1d0f843489f65429437773d906342d6ec94eac68b02742a5e57f972cb3c1863b46208a643359d001bddef02e8b36b0fdd6eb3504f361e0d72
 MISC metadata.xml 434 BLAKE2B 7a3d9e391906d94c7325bb2b3037ac72a17592c7000ea7952d1a24307972ac5e76197ab65757111c67b9e08714b5e8af3e96afa6b01ec6ebaba522bb07edcdcb SHA512 aecd01bc0b93d462be5de0f33709bde26740f9d5c86b926201a215c6eeedf79f8216d9906260f61b65f81f5850b958d1ac94a767775ddacee6df4547ec01efe9
diff --git a/app-emacs/popwin/popwin-1.0.0.ebuild b/app-emacs/popwin/popwin-1.0.0.ebuild
new file mode 100644
index 000000000000..1d4800d33dc5
--- /dev/null
+++ b/app-emacs/popwin/popwin-1.0.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
+
+DESCRIPTION="Popup window manager for Emacs"
+HOMEPAGE="https://github.com/m2ym/popwin-el"
+SRC_URI="https://github.com/m2ym/${PN}-el/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"		# "make test" starts Emacs in non-batch mode
+
+S="${WORKDIR}/${PN}-el-${PV}"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md"
diff --git a/app-emacs/pov-mode/Manifest b/app-emacs/pov-mode/Manifest
index f2dbe43a1b13..5270cafc4a4f 100644
--- a/app-emacs/pov-mode/Manifest
+++ b/app-emacs/pov-mode/Manifest
@@ -1,4 +1,4 @@
 AUX 50pov-mode-gentoo.el 423 BLAKE2B e622ca33adb577987c9d68e1baa2e7415e12cb74866cf64f16f693f06fa886866d3154e68cdbffaf2d929f50ffc8db29ef2c6b356f98f873eced5ee8ff4da518 SHA512 d2d27e6770909ebd08a8c53dbfba3896aca814637c861623746e66097f0f21686507322c734c0a48e15ee281cca0e51a82fff716276f9aec65e5a1419c8dc028
-DIST pov-mode-3.3.tar.gz 65929 BLAKE2B eddaa355b58ad397e377c055fbc06fcdf552fd32057246d11d9b11908635da72c9b19e8b2179fcad54bbe5a5d158a36faf0d42e62b79d4a4e5a57405672dafde SHA512 e705f25f1eb719152dbf5ec17c833f67b4c7be5b1ff9ddab94f67830d9d2caddabc47bcc6ce4864521eedd2728f4b59a6d2c0ddaba83f0b194bb0834d86e9396
-EBUILD pov-mode-3.3.ebuild 615 BLAKE2B 9a69e7ac29c7b44f42380b9e363e339340dac9e2bd052008f903f2df0e135525e1108c63317bef38b4808043674cf83da99fb2267db179bd24babaec5d048f89 SHA512 e2b80cf0fba25fc171d4e3f6c2f07ba65a091470a630cd8efaf1cd19ca4070dc6e7db1f22131c45f4945077504be4fa05ba4a62f02eeacdb211059e7ba174ddd
+DIST pov-mode-3.3.tar.gz 65926 BLAKE2B a2d217a0876fba0a490a77ee026eb555819d2668c50e6b4a289491a8cfbecc62fc55ad8c97d6b7011420098ba7052ce80ac39bd6bc8cccc78c5bd49dcc5d41ea SHA512 bdac1b6b872b8de08660adc8eec706cce4b085b62e7c48bb6bd57e25d9e1f9b8c0086f30ee9c5befee7b0d933831d459eb0704dfe5e8cce8cae378d7404b9c9e
+EBUILD pov-mode-3.3-r1.ebuild 612 BLAKE2B 935282b7f5235686ecdb93ac988f3262d37e9c73679acdda09fb9de2dcd30bbf2c8d4a473347ee5489bdf56f157d650e3f63abba53f45f4d07c6c7f80f727d32 SHA512 21f2deaca40b2a8796bab81d17f63edbbd306d883ca69ce9d58c83333728f0f02c30a7f122743b4fdd9f038fb152a0e8212ffbea33f827b82891f2aae464116f
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/pov-mode/pov-mode-3.3.ebuild b/app-emacs/pov-mode/pov-mode-3.3-r1.ebuild
index 4251766d372c..62ecc80c9bd1 100644
--- a/app-emacs/pov-mode/pov-mode-3.3.ebuild
+++ b/app-emacs/pov-mode/pov-mode-3.3-r1.ebuild
@@ -1,21 +1,20 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 inherit elisp
 
-DESCRIPTION="Emacs mode for povray"
-HOMEPAGE="http://gitorious.org/pov-mode/"
-SRC_URI="http://gitorious.org/${PN}/${PN}/archive-tarball/v${PV} -> ${P}.tar.gz"
+DESCRIPTION="Major mode for Povray scene files"
+HOMEPAGE="https://github.com/emacsmirror/pov-mode"
+SRC_URI="https://github.com/emacsmirror/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-3 FDL-1.2"
+LICENSE="GPL-3+ FDL-1.2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="sys-apps/texinfo"
+BDEPEND="sys-apps/texinfo"
 
-S="${WORKDIR}/${PN}-${PN}"
 SITEFILE="50${PN}-gentoo.el"
 ELISP_REMOVE="${PN}-pkg.el ${PN}.info"
 ELISP_TEXINFO="info/${PN}.texi"
diff --git a/app-emacs/proofgeneral/Manifest b/app-emacs/proofgeneral/Manifest
index 8b03b5b1faca..1243783843b9 100644
--- a/app-emacs/proofgeneral/Manifest
+++ b/app-emacs/proofgeneral/Manifest
@@ -1,5 +1,9 @@
 AUX 50proofgeneral-gentoo.el 68 BLAKE2B 14c41f176f78dee51fdb893f355c2b8cf00456e0b586c7c41c91f2eea6f8d0baaf8d6a04eda385031c96c138d47c0e7e99a75be7cd27ffd0d2087e0a69ded0b2 SHA512 32f3d33d85776f1695d542adadb8e35e372659fcce2805fc205732cd911be186cd5a1a63a8438287467dea744da9ef212f7338c0edb735a525ec30f892f1afca
 AUX proofgeneral-4.2-bytecomp-warn.patch 1150 BLAKE2B 0e4b577a1fcdbf27d2a75055ddbb970945d494ae4de2f01da4c4b1c8fc7c39bd8745a5e62abd3a7f401cb4d2ef5f30452dfae9c1899b85d7929fe4ed87bc3a66 SHA512 ad7f972148cec19c60d58e7ee7808735b92d6f642d178453d123988c68e873824a7bf8ceeded82dfd3b6109e5b50e24bd7fa8753822b5f36cbb2e73ff4e0d30f
+AUX proofgeneral-4.4-desktop.patch 425 BLAKE2B fdefa2835502ded79bc08ffff7906315913a0e740269ba5a1863bf4ef8c602ee56eda1c25fc2ff161cd0131b6c615bbcea3770bc39ef18ae654b892571c92deb SHA512 dc594dc08432fb5a4068b7aabcb85ff58b9e784903f912694da08ef97ec9bfca229dcc4d965ca5286993173083c89dc53805f09f7152eb183829985c3c4c5b22
+AUX proofgeneral-4.4-images-dir.patch 358 BLAKE2B 8c06cd031ff3dca8d9537acb86245ba01ac06e505f0baf6146dbbe89c81dee9dc471b0103f6e2dd0ec5e1c80e72d1a3682393528ea262af187e2548e29c464ef SHA512 06fed75bf855d8cbd8938ca96f9e1cb61cdf01b7f68e58188d4ef287bab847156454dea0c2bc44adfd8979e900b58e5cc7a64b742606e694b3b0717b9a735151
 DIST ProofGeneral-4.2.tgz 1613190 BLAKE2B e12913d67f95b20d99d5bdaa82a36f0dd2b664441a86dc86cb4f8afaac2379691c01e60cfe6af3bbf177f0dc2f82ce34ea4d706ee34c2d5986de3f807ce05045 SHA512 102c56a1bc113439b1fa8aa10efe571d47d68b344d3489fe18ca3bdbf8828bb31fd2302a68a4bd639c59c429d41e82e5d933abddd3444781cb0e8a603db432ab
+DIST proofgeneral-4.4.tar.gz 14105056 BLAKE2B 8d45218cde620411d14ab3c703fea37f0482c0e1f6fc8d104b4de7506140d4d0491b5e23ddbf458bfa3aeb683b71f6e4deea31c2a46b902342fc686c2945162a SHA512 8be7f78b61a225fa4770698bbbb251424a0afe093efc3229f74f3a764317dc8cc00a72cb29e751f755dc5fdab59983906c9185f7828a1644a87d160265f12061
 EBUILD proofgeneral-4.2.ebuild 1385 BLAKE2B 53d5c6afb8058ea87d4b78a23a8bf20d9e7dc2ce84b25eae8f57a16df35508ae9677698f781c8e5ffa5b7aaec306825ffbdd02dba69263ccbe0c7f5dc9faaf58 SHA512 e0e59f6ec4b73a47ee44be048a7139246502f642cda5f1a9a0a5ea3b20f37158c5109b9701ac1eeacb0f154a0b0dba34270f2d2ca418665c9e5e2c2a435b68fc
+EBUILD proofgeneral-4.4.ebuild 1633 BLAKE2B 2f5af9e77e52d28dadf546909633b91edb67dd31baed0a631bcc2255d4fe3d4b9fa9b738ab0c7d36994e5233d47decc182324607ac9dd387b0d4774c352f59bc SHA512 116240b7871c2929b56691e4ab620a08bdfc192a80749b2b72ac206da7292aa0ecefbe8cb2d0b88fd0389bbc4dff085af69192cc2ae8e5330f4f54c8e7d2241f
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/proofgeneral/files/proofgeneral-4.4-desktop.patch b/app-emacs/proofgeneral/files/proofgeneral-4.4-desktop.patch
new file mode 100644
index 000000000000..56937b8394c2
--- /dev/null
+++ b/app-emacs/proofgeneral/files/proofgeneral-4.4-desktop.patch
@@ -0,0 +1,14 @@
+--- PG-4.4-orig/etc/desktop/proofgeneral.desktop
++++ PG-4.4/etc/desktop/proofgeneral.desktop
+@@ -4,9 +4,9 @@
+ Name=Proof General
+ GenericName=Theorem proving environment
+ Comment=Organise your proofs!
+-Icon=proofgeneral.png
++Icon=proofgeneral
+ TryExec=proofgeneral
+ Exec=proofgeneral %F
+ Terminal=false
+-Categories=Application;IDE;Development;TextEditor;Math
++Categories=IDE;Development;TextEditor;Math
+ StartupWMClass=Emacs
diff --git a/app-emacs/proofgeneral/files/proofgeneral-4.4-images-dir.patch b/app-emacs/proofgeneral/files/proofgeneral-4.4-images-dir.patch
new file mode 100644
index 000000000000..555837deda0d
--- /dev/null
+++ b/app-emacs/proofgeneral/files/proofgeneral-4.4-images-dir.patch
@@ -0,0 +1,11 @@
+--- PG-4.4-orig/generic/proof-site.el
++++ PG-4.4/generic/proof-site.el
+@@ -127,7 +127,7 @@
+   :group 'proof-general-internals)
+ 
+ (defcustom proof-images-directory
+-  (concat proof-home-directory "images/")
++  "@SITEETC@/images/"
+     "Where Proof General image files are installed.  Ends with slash."
+   :type 'directory
+   :group 'proof-general-internals)
diff --git a/app-emacs/proofgeneral/proofgeneral-4.4.ebuild b/app-emacs/proofgeneral/proofgeneral-4.4.ebuild
new file mode 100644
index 000000000000..0b9df0133b68
--- /dev/null
+++ b/app-emacs/proofgeneral/proofgeneral-4.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="A generic interface for proof assistants"
+HOMEPAGE="https://proofgeneral.github.io/"
+SRC_URI="https://github.com/ProofGeneral/PG/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ GPL-2 GPL-3+ HPND CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND=">=app-emacs/mmm-mode-0.4.8-r2"
+BDEPEND="${RDEPEND}"
+
+S="${WORKDIR}/PG-${PV}"
+ELISP_PATCHES="${P}-images-dir.patch
+	${P}-desktop.patch"
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	elisp_src_prepare
+	sed -i -e "s:@SITEETC@:${EPREFIX}${SITEETC}/${PN}:" \
+		generic/proof-site.el || die
+	sed -i -e '/^OTHER_ELISP/s:contrib/mmm::' Makefile || die
+}
+
+src_compile() {
+	#emake clean		# remove precompiled lisp files
+	emake -j1 compile doc.info EMACS=emacs
+}
+
+src_install() {
+	emake -j1 install-elisp install-bin install-desktop \
+		EMACS=emacs \
+		PREFIX="${ED}"/usr \
+		ELISP="${ED}${SITELISP}"/${PN} \
+		DEST_ELISP="${EPREFIX}${SITELISP}"/${PN}
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+	# move images out of elisp dir
+	mkdir -p "${ED}${SITEETC}"/${PN}/ || die
+	mv "${ED}${SITELISP}"/${PN}/images "${ED}${SITEETC}"/${PN}/ || die
+
+	doinfo doc/*.info*
+	doman doc/proofgeneral.1
+	dodoc AUTHORS BUGS CHANGES COMPATIBILITY FAQ.md INSTALL README.md REGISTER
+}
+
+pkg_postinst() {
+	elisp-site-regen
+	# Already in REGISTER, so no need to install README.gentoo
+	elog "Please register your use of Proof General on the web at:"
+	elog "  http://proofgeneral.inf.ed.ac.uk/register"
+	elog "(see the REGISTER file for more information)"
+}
diff --git a/app-emacs/quilt-el/Manifest b/app-emacs/quilt-el/Manifest
index 6017bf525ef0..d3a352fb503a 100644
--- a/app-emacs/quilt-el/Manifest
+++ b/app-emacs/quilt-el/Manifest
@@ -1,6 +1,8 @@
 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 564 BLAKE2B 4fda05d3ffa64a1f0f1e0c2d4b84b5399b29434d2b7c71eabaa865522e98d16597825f6497e6867d3ccdea285e53d86205cd9ef4e641aeda3389e17c62173118 SHA512 b8de253e365fad1530055a841f32c21179dec4b347f1c5bb5771dbba2db3c98013b9694f4116284b6e60d9140c44c5eda96cb3b2905ef4e0e5b8301f62592c8e
 MISC metadata.xml 657 BLAKE2B f42a9f750c0914dae5ebf3cf8798857d8bb2b8135597470991dfe3e3644716e47d3079d77754305be689a337609e719ba277e5e0a4119bed5e2ae2272147bebd SHA512 d7e9d85957ad96345d3394977312e5ffbb37c61f7529b7b179c2dfcb1e41208089a469fc5db8760f0f62a6cdb5ddf801e11673d126711569fc2a61bfd8a04e4b
diff --git a/app-emacs/quilt-el/quilt-el-0.66.ebuild b/app-emacs/quilt-el/quilt-el-0.66.ebuild
new file mode 100644
index 000000000000..4a2ffef3d55c
--- /dev/null
+++ b/app-emacs/quilt-el/quilt-el-0.66.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
+
+MY_P="quilt-${PV}"
+DESCRIPTION="Quilt mode for Emacs"
+HOMEPAGE="https://savannah.nongnu.org/projects/quilt
+	http://satoru-takeuchi.org/dev/quilt-el/"
+SRC_URI="mirror://nongnu/quilt/${MY_P}.tar.gz"
+
+LICENSE="GPL-1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="dev-util/quilt"
+
+S="${WORKDIR}/${MY_P}/lib"
+ELISP_PATCHES="${PN}-0.45.4-header-window.patch"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="../doc/README.EMACS"
diff --git a/app-emacs/riece/Manifest b/app-emacs/riece/Manifest
index 548933ee7dd2..5e67f42c9db5 100644
--- a/app-emacs/riece/Manifest
+++ b/app-emacs/riece/Manifest
@@ -1,6 +1,4 @@
 AUX 50riece-gentoo.el 81 BLAKE2B 861847fd8393a454a03c810c895a62b9741a33c640988b5370fb726b0428eb506c44199009d2b593c9c9f1d0d44373e5f971642016ec4fd1b13d0383c808de59 SHA512 bbf327290280b0e5e43298c44ea62c9fb5260de5a615fb056a1d7b11e8fb26f04666dd16e272fad731469dce42b41491229123e0a107dd7a1f958931ef5a3a32
-DIST riece-8.0.0.tar.gz 432370 BLAKE2B 042392697d6110490dcdb278fe8c9c68983b1d926f97231ddf08967735c3f526f41a7135378d49dcfba1344c0092cf43ce7ebe05ca039053002d166182c22601 SHA512 ac219f882c2dedcba2bf3d75e5b934c363dfdd6d8f9e35ce11040d85fca526f8368a57535b729952d6f2731f3ec328bad3913426d0bb0b4bff78a407bfd63a96
 DIST riece-9.0.0.tar.gz 438553 BLAKE2B eaa54c7f5b445657b0a1e09914b145ccaa88a26c5f14d7b6c37061c25b90210f4fd0ec9bb6867ed881212314d0f4d9fe81f60fbde64accf8091d72cc6f9a8576 SHA512 3fbfa4a6d898a713248ce217939af208729eb441ab7ecea2d2c028ce228db1363cb7d90d0de4636bd9fe10813c73f9ef70fb003cfc2fe64ec25b71c9821e8bf6
-EBUILD riece-8.0.0.ebuild 819 BLAKE2B 753750910d723231a88bcb6c45257e93aa71a271f095d369be5397599ae569eae118cce9e2c917ebeaef15e066e0c3958952450d00c2769e3c4f5b4434cfb394 SHA512 3df864f1b103c8fc8dd7f754df9760d3154ce3675cb8da14b5cec8d9c0fbe7db08ab7c3800a6cef53689dcb81492c30e29e15f382f07b0218a8501f6339771c0
 EBUILD riece-9.0.0.ebuild 819 BLAKE2B c187c3eeef7f5a6d8b6f0e2a356e73f7cc024fd873eed25428d15e1984907c51f6da1740b03116721f6404f15e362a19d3a80740fa1138becf850a378b3c0b64 SHA512 cda075586389ebbe038f1cbf43f012481071a32f4d3445c645f60ac7fea556db37e36721c9f37844475a735443a0519570c95903bd056676090130f69f7aea3e
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/riece/riece-8.0.0.ebuild b/app-emacs/riece/riece-8.0.0.ebuild
deleted file mode 100644
index 68b8bfcd09ea..000000000000
--- a/app-emacs/riece/riece-8.0.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit elisp
-
-DESCRIPTION="A redesign of Liece IRC client"
-HOMEPAGE="http://www.nongnu.org/riece/"
-SRC_URI="http://download.savannah.gnu.org/releases/riece/${P}.tar.gz"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="l10n_ja"
-RESTRICT="test"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_configure() {
-	econf --with-lispdir="${EPREFIX}${SITELISP}"
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		lispdir="${ED}${SITELISP}" \
-		install
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	dodoc AUTHORS NEWS README doc/HACKING lisp/ChangeLog*
-
-	if use l10n_ja; then
-		dodoc NEWS.ja README.ja doc/HACKING.ja
-	else
-		rm -f "${ED}"/usr/share/info/riece-ja.info*
-	fi
-}
diff --git a/app-emacs/scheme-complete/Manifest b/app-emacs/scheme-complete/Manifest
index 5c18545c0b89..cd3f7de4b213 100644
--- a/app-emacs/scheme-complete/Manifest
+++ b/app-emacs/scheme-complete/Manifest
@@ -1,6 +1,6 @@
 AUX 60scheme-complete-gentoo.el 219 BLAKE2B bf71fafbd85fea667e895ca9dbb91761e4de7f3856d109f3fb1990788ff0f04b66c6edaa835ab681cbfb303d71ec60af8d04d0a1d7e3119c59799c7526903c52 SHA512 52314ed8b643c11fb7058ec5aa8e38e6b9b78800d6daa04b9bdbb9567b4b78c0c804277966c58d69199cab0e5e74d07d9728faab0ff95ba1af65eee7b04eccd2
-DIST scheme-complete-0.8.10.el.gz 38713 BLAKE2B cdb1e821ef752dcb5e1067f636e3b023c114bf564fe44c0e7224c879858d5da51d2ecbfa659d9699f6c7feb1f74dad3462b4ab769e834f2e4b8d9132d4b4a63a SHA512 7058983a57f1fe3cbbc4066f62075b755bd8e9a83ce65bf26a3568889d05abc9972d4b7be57ac54867fc4abe5567e223c9640bd8c898dbc6422d449f41090956
 DIST scheme-complete-0.8.11.el.gz 38847 BLAKE2B 649a4124b0b643211c2132dc0e03e8930ea7f311637b3afd375d75e3aa33abaae888b1aa34744bf22d13738179d4048faa173ec8e5e0868f5789623fb7b11c0c SHA512 90fe73dfee3377f19eca2107deb6c9d88260b2097358416dab5ad839dabc0a0678b7254ab6dbdc058cae2be5feeaa4cba2f66296e49060df5251c1888044fea8
-EBUILD scheme-complete-0.8.10.ebuild 422 BLAKE2B 2a1fc9d9f59ae079de9b6adbbac3746eefb9d2142c56564029e64c914a5527681df356508710b66dea494f1f0f0e0a6cd2c1afd5097d973c8101bf61c26d2472 SHA512 ea4b6cc9e7be6f923b361710022f5d7008938c6e71bdddfc49256ccda0e973e2fbae5823fd5b80814ce1ceb51a9b02885996bce0eb75491b456e4a608c19fa14
+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 416 BLAKE2B 3151d7d4191f5d8e172b42c5b908123860a9d83ed5c32dcaee72396fd1e5fdc3ba241ff70a7e11e93088b13248ec358d560ca4178c7596614e9b1cf331bd0851 SHA512 a0c751d7088531ac8ce6aa76b7173e052daf8f437c0948511b82fa04373dc903a3afb5a0502e467d11ff4b88dc4b69274925998a6a75a271c8765ced9d455c28
 MISC metadata.xml 453 BLAKE2B eee674044e30666eb05beaa44a67781bbdf407fdddc1b175e30f7034a0dd6a3efa3c23361d23b47d7bd0076a17b01b8593deedb1524dfc1597b53f94b9ffa0fb SHA512 34268e756461ba2420bf3552b7f73caa9c95f5feef714b09615b295056598f4d7486771fda804320565cf99dd0ad36754d6b966b492f74347a53f4678e12c715
diff --git a/app-emacs/scheme-complete/scheme-complete-0.8.10.ebuild b/app-emacs/scheme-complete/scheme-complete-0.9.8.ebuild
index 8fd6adc6b2f8..77ad8bb3eec8 100644
--- a/app-emacs/scheme-complete/scheme-complete-0.8.10.ebuild
+++ b/app-emacs/scheme-complete/scheme-complete-0.9.8.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 inherit elisp
 
@@ -11,7 +11,6 @@ SRC_URI="http://synthcode.com/emacs/${P}.el.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 SITEFILE="60${PN}-gentoo.el"
diff --git a/app-emacs/scss-mode/Manifest b/app-emacs/scss-mode/Manifest
index 90a52d6c6a10..ab36b808fc10 100644
--- a/app-emacs/scss-mode/Manifest
+++ b/app-emacs/scss-mode/Manifest
@@ -1,6 +1,6 @@
 AUX 50scss-mode-gentoo.el 161 BLAKE2B bbe35fe0ab2a4857ad2ab3fa6866e39f873c9c32fec93eb321de9fbb20128be2fb49d36028f778217f4199603a5d5be8e4d1932a5799173b92768ec7b80c0f16 SHA512 099fe31e6a15247502498b3e27e8e462b0ca08b719becc8c22e3e6877aafa1987934b68e916cd2be1237fccda2bdd550402fd168c28967721ce472a033a61a7d
-DIST scss-mode-20130215-git.tar.gz 2632 BLAKE2B f73ad6ee5120518c6e083cc5c963601649866a826e0bf5628f90a1c1e952c36b66a7f1a385244b71d0f78f958edf1d39142aabd309af380a650f5205a1300ba3 SHA512 2241d7e0c2689ba3997e4ffdf1ed167409c1d99a4f6a11911de39775a409d3299ba7e1bb2f7f0878b5b0d91e46706b65ef8e25cef83278894d8842af8bbc95be
-DIST scss-mode-20150107-git.tar.gz 2718 BLAKE2B 5551ca7258caf22957e1d3becf147cfb617378c606c05196b87fa2ce7b035f06e48db1ad01476bcca87bde461971ab040fc7085422cd076469c6d7a9b73b624a SHA512 68a33d14166289af119625a5609c4dec47a05eb8c8452b42cf8e819368cc7561270c8223ac0624fee989f8c51592f456f91009c153fb857549d9c7e7c7e801a2
-EBUILD scss-mode-20130215.ebuild 521 BLAKE2B 5a0da27b242f938a5062bdc31925122cdfe019874ab0e34a924add392b899e675eb738eb24b5247dc0b38f53646547ff9dd7e4a06324a7907fb9f0a3062809b1 SHA512 e226eb79a179878b930dba4c85562580b562b8d06ed0c210a64531c22f7a34917fbce93b87b7c3e9f5227917e479835d8abe629e02d4888c99a28f09999bc2c4
-EBUILD scss-mode-20150107.ebuild 521 BLAKE2B fb253ab30ecd7ea705e1b20d34bc4f5b65c9db685422e4d746465b8a9afae54072dea8e210b79df9a42f31f1236363f5e78a3c3902be3ab0f797b863c7924002 SHA512 a258b0f13e1468f110164354f62dfc6cb64c21525105ed695cf0a5866ad42f1ffcbf7b9b2088f8d1ed700056e9bd72f98b7bd9fec30c82f35c01fa3035cc9fce
+DIST scss-mode-0.5.0_p20150107.tar.gz 2718 BLAKE2B 5551ca7258caf22957e1d3becf147cfb617378c606c05196b87fa2ce7b035f06e48db1ad01476bcca87bde461971ab040fc7085422cd076469c6d7a9b73b624a SHA512 68a33d14166289af119625a5609c4dec47a05eb8c8452b42cf8e819368cc7561270c8223ac0624fee989f8c51592f456f91009c153fb857549d9c7e7c7e801a2
+DIST scss-mode-0.5.0_p20180123.tar.gz 2802 BLAKE2B 0254fd89ee50de2bb9c6abb1ed1ff5f97f8a938b4fa84f38409b87049fe5e0618bc4be9c0a85d17b3911cb1d0b731b1602f76e047b3acd6e290dc091a80c9c93 SHA512 0c83d9c956d197e33c71840818dae1ad722812d1aa95ff7896091682ba7e710f3ee9855210fc403a30d76ef4986803da5dbcd7907c22b221a5cc2d619db22bff
+EBUILD scss-mode-0.5.0_p20150107.ebuild 518 BLAKE2B 137b61d375bbf2b6751e2416a16352673cb3f682e8814f7a8e57898d59b5f079252830350681d994edd1c6a5c1275e9442687612f743cb74268a6b812a25b5d1 SHA512 724f62c4a6783cee97f8cd270e325173a59ad8fd69fc13b9f7603acb6632a89a3f537b53fd4c17655d7cab484225c5f1f40fb8e840696196b7b69406ad9a25df
+EBUILD scss-mode-0.5.0_p20180123-r1.ebuild 518 BLAKE2B d02ec0d733fb453268e5fe071a6a26dee8ab4e0dc899c74042ffca09434721bd2a1512cb8670fe2ab183787af15505e586fbca1adc53a8ba9179d5176936dd41 SHA512 1d5e4eb09f7d46eb12963a7b55af2aff16e9a6c03cee40b11ba5e4bf8d471340ba204f522e7d565e934dc1935d4cfcfbe804eff2ac8ad0022240481a3c34b174
 MISC metadata.xml 361 BLAKE2B 71d6b259ce979cdcf349de35893a68db5a895e4ebb12379fe98e1bd0d7eb6f193b128659418254f3fd31071c6e2d4f8604127297cb0474831658ccbbe1c87e11 SHA512 8178cf34cff42d3d4320190b5a93c52a6387d1732459e00edbe304bc9ff585eec4b5917fa56b6a345c51fea0bb587cdf88ab816b50ee47010f039ee5943cef67
diff --git a/app-emacs/scss-mode/scss-mode-20150107.ebuild b/app-emacs/scss-mode/scss-mode-0.5.0_p20150107.ebuild
index 4641fb9938a7..f92573000689 100644
--- a/app-emacs/scss-mode/scss-mode-20150107.ebuild
+++ b/app-emacs/scss-mode/scss-mode-0.5.0_p20150107.ebuild
@@ -1,23 +1,21 @@
-# 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
 
-GITHUB_SHA1=b010d134f499c4b4ad33fe8a669a81e9a531b0b2
-
+COMMIT="b010d134f499c4b4ad33fe8a669a81e9a531b0b2"
 DESCRIPTION="Major mode for editing SCSS files in Emacs"
 HOMEPAGE="https://github.com/antonj/scss-mode"
-SRC_URI="${HOMEPAGE}/archive/${GITHUB_SHA1}.tar.gz -> ${P}-git.tar.gz"
-S="${WORKDIR}/${PN}-${GITHUB_SHA1}"
+SRC_URI="https://github.com/antonj/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
+KEYWORDS="~amd64 ~x86"
 
-DOCS="README.org"
-SITEFILE="50${PN}-gentoo.el"
+RDEPEND="dev-ruby/sass"
 
-DEPEND="dev-ruby/sass"
+S="${WORKDIR}/${PN}-${COMMIT}"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.org"
diff --git a/app-emacs/scss-mode/scss-mode-20130215.ebuild b/app-emacs/scss-mode/scss-mode-0.5.0_p20180123-r1.ebuild
index 06f928f8b652..8b50724af54f 100644
--- a/app-emacs/scss-mode/scss-mode-20130215.ebuild
+++ b/app-emacs/scss-mode/scss-mode-0.5.0_p20180123-r1.ebuild
@@ -1,23 +1,21 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 inherit elisp
 
-GITHUB_SHA1=3452e92800c345690195f55a74ba4118c5c4d004
-
+COMMIT="cf58dbec5394280503eb5502938f3b5445d1b53d"
 DESCRIPTION="Major mode for editing SCSS files in Emacs"
 HOMEPAGE="https://github.com/antonj/scss-mode"
-SRC_URI="${HOMEPAGE}/archive/${GITHUB_SHA1}.tar.gz -> ${P}-git.tar.gz"
-S="${WORKDIR}/${PN}-${GITHUB_SHA1}"
+SRC_URI="https://github.com/antonj/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
+KEYWORDS="~amd64 ~x86"
 
-DOCS="README.org"
-SITEFILE="50${PN}-gentoo.el"
+RDEPEND="dev-ruby/sass"
 
-DEPEND="dev-ruby/sass"
+S="${WORKDIR}/${PN}-${COMMIT}"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.org"
diff --git a/app-emacs/semi/Manifest b/app-emacs/semi/Manifest
index 20c50449256d..99dca1057e4e 100644
--- a/app-emacs/semi/Manifest
+++ b/app-emacs/semi/Manifest
@@ -3,5 +3,5 @@ AUX semi-info.patch 1009 BLAKE2B 936ce69c254eca176f7bdbaae92dcda7fe921214b1d089c
 DIST semi-1.14.6.tar.gz 142549 BLAKE2B e417b305ad814b2a23fad4fd37057395efb47bdb61778aa167149eda4277cda47dc81148821d9e4ad3225a858c77f781a6565c3e49747d78882b9401fd5fbac1 SHA512 1011271c58414f4ca23da079f16f273b408643e0d9f4961db321b65c1ed9a7d4ca66a7d7cb5b0c9fa2b4904fa992c9188858de6131180ee30132d3cadaeef33f
 DIST semi-1.14.7_p20190517.tar.gz 152636 BLAKE2B a22b1f9a5de0a695de2d8e342ca313af05c12a1c0b597890d926496e9ce240e3329365700f91e6268cf399976ec067163ac8197c7a643e499d70851501f63798 SHA512 d25c940fdd0a048d21079d905ae91521a1f1247b8f78145baeba24c994c0d5b30985a76c909a793f82f6253b323fb4699bbf059ea48037bb49ae92505b0c6d18
 EBUILD semi-1.14.6-r2.ebuild 1297 BLAKE2B 9ac36cba82f5bada681bf11756509bc32d112b4c16b4063b8c09b17ba45e8d7dc266b405bce5c38f1686880c75aa6951823fb998c3c33c5e40d72787033a5da0 SHA512 bf13d405220097a73409b90076da8615ed3b773b6b69c7e95d2c1e159fc01aba0d9ee38f3be68fd239134e36d0f398c4dc7dc21728d21bcbc0da6e249b375062
-EBUILD semi-1.14.7_p20190517.ebuild 1330 BLAKE2B 3b2f0b304110c8574c6b0543249a4fd590b4f2d015086db1e3419d77b7ffd7e60a8e1a2c5848143284060144e5f57e60ccd26985e85c0b02c54f7a36e6a40b54 SHA512 45646f4be5fc4787b4dc900d6cadf1a823c04da17fca24c5ae06abad5a35a2d5fb502187fe79106537701bac26529db777ef5323ab38bcee8ff6364e8427e124
+EBUILD semi-1.14.7_p20190517.ebuild 1360 BLAKE2B ab44406317c2b443f0a5ed1e3f6009b23fe41cafe392331838f24ac3eedaa0f9a38238a4a6afb37c0580573213ebd98ca77e4d420c135f6e07898ec057e98ec9 SHA512 f0eb4fcf7307db30d13dd2b1485b1e5d45767592f570512037123f274136f7d974ec79882ca8ba27b0b7ec75d6e6a0a207e8c5436219b8d9a3cc96776f6de33e
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/semi/semi-1.14.7_p20190517.ebuild b/app-emacs/semi/semi-1.14.7_p20190517.ebuild
index b235b850d5ef..0402be23ef31 100644
--- a/app-emacs/semi/semi-1.14.7_p20190517.ebuild
+++ b/app-emacs/semi/semi-1.14.7_p20190517.ebuild
@@ -8,11 +8,11 @@ inherit elisp
 DESCRIPTION="A library to provide MIME feature for GNU Emacs"
 HOMEPAGE="https://github.com/wanderlust/semi"
 GITHUB_SHA1="4cf114c95fb49ad75eb6916f678b45b04bad8122"
-SRC_URI="${HOMEPAGE}/archive/${GITHUB_SHA1}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/wanderlust/semi/archive/${GITHUB_SHA1}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="l10n_ja"
 
 DEPEND=">=app-emacs/apel-10.8
diff --git a/app-emacs/tuareg-mode/Manifest b/app-emacs/tuareg-mode/Manifest
index f7230682298b..f2f4db92dac4 100644
--- a/app-emacs/tuareg-mode/Manifest
+++ b/app-emacs/tuareg-mode/Manifest
@@ -1,8 +1,8 @@
 AUX 50tuareg-mode-gentoo.el 343 BLAKE2B 15545f9aebe6b47e6fa445e32282c4dadf8a6d3fc11d3cb9f8dd2a78ef32dfa5227248644dee8ad12587d96e2c17bf16220a92f447edf8716cd7646347fc2c57 SHA512 41cdc5aa7c083afbe044c730b898e06817fb8c5d9799d0c88be9ad15501d4135e16597623b66ae65a40160d9a04358392a98e03646ba2207e0f981f33e28750d
 DIST tuareg-2.0.7.tar.gz 57999 BLAKE2B 12649da41c8bbc547d28fe391cec51ca552dd66bb1fbf052a9d44d693b9df45ac6dc10336e146109248b130ea7ba94f7097398b598f3a7eb113b0031eea83486 SHA512 6cf290879dd9b7993a046dbebb9944a245fa82d1e7849b46f477b7217b46026ce5195e40e4d9b990e047a03680197827334e6d54d82610da6fc2e62386357d42
-DIST tuareg-2.0.8.tar.gz 57777 BLAKE2B 38d401319640ab4e691ccdbbca03c95b3bd03189aa2399a7258cfcd6660b0c30e7931072ec791ae000ceb228bb8195bd96c6b681a53e3c4cbb861037ab0f7678 SHA512 c9e268eb550fd36614e6632335b623a0916d64dd84a0259fd83c6f08e3138196d3871bc7664d6debe62732d4459130ef1e9271b24982138ff69d90442d031990
 DIST tuareg-mode-2.0.10.tar.gz 102576 BLAKE2B fac81b5f43dc9143a62fe7ebf5d35bc44994db3a155b780329339b73b087cf53e63aa15b7e817388a92f1effcc08febc617747b242d57d5e900b20fe100a8f03 SHA512 53bdc3b2b78bcf7e6b075932b9319f9d08b02b4b3fd74fc9aa30b390b30e4069e19e09e0fbb03fb11877e6d89649b8e59c645cc8de196115c1bbdab308145743
+DIST tuareg-mode-2.2.0.tar.gz 83392 BLAKE2B eead49dff45bb039abef0ffa8f4b874dd6d3bb36e81791b84e411031b4d714324637f99a0cfc3d4029b47032c61ca45424831a2d837fe5b01fa93383237cb14d SHA512 5f0b470920abd44e5b99e84e817ba678aded3042751b8949884c06f3a928105acbe96a28af3a8a089f6b607f8dd70cba7a669e9a61b906b1dad840c7f88bce12
 EBUILD tuareg-mode-2.0.10.ebuild 461 BLAKE2B 5b5bb6cbb0d25fb99e0dd82d8fd09a6b80c4622a72effc589f054b5223ca0a77344b88f27d7ff17665cb69a42f4b939c40afae2ebc125624d271e1d11725b10c SHA512 d4c20260eba3b5151d2d550e0f75e910c9f40e1a47cf96a8e548bdab2074dbd3351709be1b1c3fe32b97c57eaf5cf58bc3ead1eb35c10c472aa7eff313f68337
 EBUILD tuareg-mode-2.0.7.ebuild 505 BLAKE2B 7dd6a1e0c7da751aff504724d03892385c73bfc4afbc52f4ff997040ea67e5c413b2e0b108bba8c19f062b8dac301f0be4aa21186538cf63bf2486900caff277 SHA512 5a982624d089ce91f1b31f20f65f295c9d8cda900888007f41b498ac70b8282edd61000206d8dcdcd000a7a95ac5de3e7d2ac58981e95391131aacce47dc29cd
-EBUILD tuareg-mode-2.0.8.ebuild 518 BLAKE2B 7a3276f4a662c2d51bee7c3f7f731780ae1ecc2c5748708323db075e63b0cf1e0d0e56c8456d10d1a7d7bce762490577a4c9da318132bbcabd4309e56b046a66 SHA512 b61c58e72b5d207a85bfeebf2e94d01451ad74192c8d2f8431780f23ef02658794e72b5c2309cb925063482fb055f30de42637160ff016e9891ca40c14432435
+EBUILD tuareg-mode-2.2.0.ebuild 508 BLAKE2B f102eabd6554e8d52a68da2ad2596d54566aefac8a9c82430dcf59a736c5fb38e1872c3ee96d0f2c4c25078d5b2c8d60675c3cc88ebf6ae9678a2758cc0355ff SHA512 e3774236f306e07e839b1430c071008f28ef4929ed38cd2388713066c9c549139de1133937e4f6bfc4404b46ef7492b5a48cd40453f17215cff74e74126a8cc3
 MISC metadata.xml 780 BLAKE2B 9262902650dea63fa833d0b57f32054a6858e741f404d6f5393273518533e9008ec8a322ec013232b69e8475d9db7f407f3985477ce4449e08913e0eed84337c SHA512 480ad1fcd7b12c56081dac425686a17ad07d912c4ac0f5f259c126d4a07489d9660e1429a7f0570aac3957ec8712d406314d68c76cd45dd8ec99a7f62dba6c5d
diff --git a/app-emacs/tuareg-mode/tuareg-mode-2.0.8.ebuild b/app-emacs/tuareg-mode/tuareg-mode-2.2.0.ebuild
index c2eb95e0e14e..3481178825af 100644
--- a/app-emacs/tuareg-mode/tuareg-mode-2.0.8.ebuild
+++ b/app-emacs/tuareg-mode/tuareg-mode-2.2.0.ebuild
@@ -1,19 +1,19 @@
-# 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="An Objective Caml/Camllight mode for Emacs"
 HOMEPAGE="http://forge.ocamlcore.org/projects/tuareg/"
-SRC_URI="https://github.com/ocaml/tuareg/releases/download/${PV}/tuareg-${PV}.tar.gz"
+SRC_URI="https://github.com/ocaml/tuareg/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-2+"
+LICENSE="GPL-2+ GPL-3+ ISC"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 
 S="${WORKDIR}/tuareg-${PV}"
-ELISP_REMOVE="tuareg-pkg.el tuareg-site-file.el"
+ELISP_REMOVE="dot-emacs.el"
 SITEFILE="50${PN}-gentoo.el"
-DOCS="README.md"
+DOCS="README.md CHANGES.md"
diff --git a/app-emacs/vm/Manifest b/app-emacs/vm/Manifest
index 7b255936c516..937d3683aca2 100644
--- a/app-emacs/vm/Manifest
+++ b/app-emacs/vm/Manifest
@@ -1,12 +1,8 @@
-AUX 50vm-gentoo-8.0.el 147 BLAKE2B 3f4da8804a26a4b931aa52409062cd9de6e4b16941e64a139216b2afcb27d09447ea3e8d4ee03ed35931f2163d1932c66b5a247ee2dee60868ba2472572e112d SHA512 9573b5ff6b747c8ac8a8d41c52391c320fe93d9e3a2aa8c22bfe5b4ea2e703fdd1cf18c59ec22aebc8fbedbc324561945bdd3407ebde432edb0015af7ad2c4e1
 AUX 50vm-gentoo.el 62 BLAKE2B 2e5093b9d4244ac229fa63fd62b7bacdf3902ea0f33616adb94852424d2078c11743f4ebd9d080e0aeaa628f66a2de38ed40dc00d6ec9023902a0670468fcb71 SHA512 e58660519b0f7e6d4f608ef09d0861293133ce25e7799e163a1afdf62193f73f0c29a081b4eb26d808a54168ab6f5f6083a107dec7228bf054357bbf16bc90c7
 AUX vm-8.0-no-pcrisis.patch 620 BLAKE2B eb8615854424645a673a62da4c9546e8ac42679d0fb74a14cc54b38006865c3e8c59fd84fb8f0d3a7b7a216cda84403836b6b759340c397de942291f8f17e042 SHA512 57e0ca67484db7a517f1e45cd7ef6974a0938c1ebb9ea740cab36ee328b1b99ce152c14701109862d89918445efc918ab1f7dacfd9228f6466f40177f38f1ae2
-AUX vm-8.1.2-texinfo-5.patch 2608 BLAKE2B 1cbfe5cfd5d633f577a3767c930d2a78e5ea29b7f880529b10e6017e1e16463be89a6c47b2d5fac70d3417b3badb390e5dd6eda0928720bc1e498586a4994ffa SHA512 cfb55e3ec2311fc1b5ca5268e8ee07ad2ea8a276804c9e891727b90fab6aec0b0f7bad274b65bb692fc7391bb95892ca1f87092594ba48716621925b82347bc9
 AUX vm-8.2.0_beta-datadir.patch 1177 BLAKE2B bb0379126f4521ba8c75e1c7fe0d3c7e179333c10acb915ce8cc9e034202d17ebd89855d0ec7b682f174d27022ace06deb545df5a73130b380aa83797b4732ed SHA512 2097837ee4d7fe28356102452f4b110d358624b607c440aee654edcaf577b3e1319bac0eb0a44c2ecefb64334e28a08731c512116bcedd4c8930ba2cee1d48c3
 AUX vm-8.2.0_beta-optional-args.patch 556 BLAKE2B 9c07937f43b99484b5973aa63b386e6e127444b11d026192be868542d98dd83a3d6d6b0816dbba4c78a3d8b8c30f1759beac7d6406bc8280e2c50dde8db884f4 SHA512 4861df97f0f1fe05a85f019a2e74ca4588fa877f67bc0a9dabfe43e9fda7ff7a349cfe23693ec29ba04f75d1698d200b39afd88550c82f1dda1e2667f52fe8c8
 AUX vm-8.2.0_beta-texinfo-5.patch 8594 BLAKE2B 542c755aa7aee4f39c8977ec0a33eab53954bdecfc9e9b65a5fa069c3f3fa89311a00356a8dfdebc2159bfd5a047dbb3500b78e0f1f21398e41fe1ac55516aba SHA512 dbc8f9456735f4d1757a7094bf2cde86148444bf4c46136eb5170b94e9124bee48c08d8f7d82e3b3c03ebd3443f0ec3dc988178e335189904c3d2b4edb6d2cd3
-DIST vm-8.1.2.tgz 703527 BLAKE2B 34b6326363893b830d76a48dc6e103100d8da6891392926d21eff00bb25217af58eb6f161ba38e99becc31f6bf1496eb75fb71709b57b08cd247fa1b28543a1b SHA512 6b879e237d6509ecd95aff3fb5e26018cb38dd19b29a57545bd28b0ca45961a7106cefd6fdd42e123119ac465a4b9ef66b683c47a9f1d9ac683a954b484a0ff4
 DIST vm-8.2.0b.tgz 839789 BLAKE2B fc032e0a6259d2397d80cc80fbb7cf5845e43a228124f867402738a9123c78c798822d8d9c8edbdb823bfe3bce946d53afb6cd24e02d28925a51d458cf21eedf SHA512 37b642975e8fe7e350c0a648f83608b28d8616417d376d9888c89b37c90d8bdb3c91cdc4c91a0f5072d29ac81bfea3d88f9b36699379bf8a5bdd15dd5a70858d
-EBUILD vm-8.1.2.ebuild 1112 BLAKE2B 978e66b2ed8cb96d8ea78afc5724359edd1d5d0137386d8e8cb55f58c974f4f8e5d758176bd1f8722fcbb4df08455058476658e619635271ea72e6265881d1ee SHA512 2679c307a2aed43826913b48b3e4055f6fb4ae0c1effec8180376ac8ae037d15a184982fde37142fe86fd0778478bdb45cdc5ed4e6e3aa5e53c4e92c58662339
-EBUILD vm-8.2.0_beta-r1.ebuild 1545 BLAKE2B 400750df3f9fc3418cf41ea127101c79e673cd7bbb1e84b186081ce296ebc433fbbf0c7d922cf5bba9d1ba486535a9f36a00a01edc2ff10cd41b1c6daee85f16 SHA512 0e056ceb100b49ec6aad8067f76971ec686f8589f266f6bd4e1519267038ec48eec0494fa3ee234cba0b3723188da7a3bdee06e364fe419018d016e7b0cb55cb
+EBUILD vm-8.2.0_beta-r1.ebuild 1546 BLAKE2B f0c2917580d70d1ac4a8a279d4b87d341c7fd233049246fa7dae22bfb271af4853d043870aeafcb84da02023cdfd5997f4cb5c486acc1b8f18c6c5f878f50247 SHA512 a24bee960aa97ad25f8f4d1d1f09d672cb9383fddfafdf873a872995dbe667c31efa4be4fca6b80a135c4b04353f6d4e16a3a9d58f71350ada40353389e2ec88
 MISC metadata.xml 785 BLAKE2B 1d8be69c7be90cb03815bad0324c55e4ed4be6443246922054dc6ebf4b66090bb9f7f30916cb5df07a664d151a77de6591a45d923847547898ebc32ac9505038 SHA512 62df38ecfe4b3de679d856cbca5b58d73c73a885f86998f00aa75e67efc2def4ce973bc1e2f40fa22f6f79cc9f4fc4185a916e6ba176a89d685b1092ea9eddfe
diff --git a/app-emacs/vm/files/50vm-gentoo-8.0.el b/app-emacs/vm/files/50vm-gentoo-8.0.el
deleted file mode 100644
index 554b6634a2ee..000000000000
--- a/app-emacs/vm/files/50vm-gentoo-8.0.el
+++ /dev/null
@@ -1,4 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
-(setq vm-toolbar-pixmap-directory "@SITEETC@")
-(setq vm-image-directory "@SITEETC@")
-(require 'vm-autoloads)
diff --git a/app-emacs/vm/files/vm-8.1.2-texinfo-5.patch b/app-emacs/vm/files/vm-8.1.2-texinfo-5.patch
deleted file mode 100644
index 0283e19a8a73..000000000000
--- a/app-emacs/vm/files/vm-8.1.2-texinfo-5.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -up emacs-vm-8.1.2/info/vm.texinfo.texinfo5 emacs-vm-8.1.2/info/vm.texinfo
---- emacs-vm-8.1.2/info/vm.texinfo.texinfo5	2012-03-05 18:43:21.000000000 +0100
-+++ emacs-vm-8.1.2/info/vm.texinfo	2013-05-19 00:05:10.000000000 +0200
-@@ -783,7 +783,8 @@ following formats:
- 
- @example
- ``pop:@var{HOST}:@var{PORT}:@var{AUTH}:@var{USER}:@var{PASSWORD}''
--``imap:@var{HOST}:@var{PORT}:@var{MAILBOX}:@var{AUTH}:@var{USER}:@var{PASSWORD}''@end example
-+``imap:@var{HOST}:@var{PORT}:@var{MAILBOX}:@var{AUTH}:@var{USER}:@var{PASSWORD}''
-+@end example
- 
- @noindent Remote mailboxes accessed by VM in this fashion are referred
- to as @dfn{server folders} (and @dfn{POP folders} or @dfn{IMAP
-@@ -996,8 +997,7 @@ The variable's value should be an associ
-  ((@var{IMAPDROP} @var{NAME}) ...)
- @end example
- 
--@var{IMAPDROP} is an IMAP maildrop specification (@ref{maildrop
--  specification}). 
-+@var{IMAPDROP} is an IMAP maildrop specification (@ref{maildrop specification}).
- 
- @var{NAME} is a string that should give a less cumbersome name that you
- will use to refer to this maildrop when using @code{vm-visit-imap-folder}.
-@@ -2342,7 +2342,7 @@ MIME encode it as necessary.
- * MIME preview::        Previewing a MIME message before sending.
- @end menu
- 
--@node MIME attachments, MIME characters, MIME Composition, MIME Composition, 
-+@node MIME attachments, MIME characters, MIME Composition, MIME Composition
- @unnumberedsec MIME attachments
- 
- @kindex C-c C-a
-@@ -3328,13 +3328,15 @@ The fifth is `f' or ` ', for messages fi
- The sixth is `w' or ` ', for messages written.
- @*
- The seventh is `e' or ` ', for messages that have been edited.
-+@vindex vm-summary-attachment-indicator
- @item P
- indicator for a message with attachments.
--The variable @vindex vm-summary-attachment-indicator
-+The variable
- @code{vm-summary-attachment-indicator} is the inserted string, by default a @code{$}.
-+@vindex vm-summary-postponed-indicator
- @item p
- indicator for a postponed message. 
--The variable @vindex vm-summary-postponed-indicator
-+The variable
- @code{vm-summary-postponed-indicator} is the inserted string, by default a @code{P}.
- @item c
- number of characters in message (ignoring headers)
-@@ -4588,7 +4590,7 @@ The project code base is maintained at t
- @uref{http://launchpad.net/vm}.  The ``VM Development Team'' can be
- reached here using the email address @code{vm@@launchpad.net}.
- 
--@unnumberedsubsec Savannah project site
-+@unnumberedsec Savannah project site
- 
- The changes made in each of the releases is described in the @samp{NEWS}
- file, which can be found in the source code repository.  The changes made
diff --git a/app-emacs/vm/vm-8.1.2.ebuild b/app-emacs/vm/vm-8.1.2.ebuild
deleted file mode 100644
index 3cc65011f9ca..000000000000
--- a/app-emacs/vm/vm-8.1.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit elisp eutils
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="The VM mail reader for Emacs"
-HOMEPAGE="http://www.nongnu.org/viewmail/"
-SRC_URI="https://launchpad.net/vm/${PV%.*}.x/${MY_PV}/+download/${MY_P}.tgz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="bbdb ssl"
-
-DEPEND="bbdb? ( app-emacs/bbdb )"
-RDEPEND="!app-emacs/u-vm-color
-	${DEPEND}
-	ssl? ( net-misc/stunnel )"
-
-S="${WORKDIR}/${MY_P}"
-SITEFILE="50${PN}-gentoo-8.0.el"
-
-src_prepare() {
-	if ! use bbdb; then
-		elog "Excluding vm-pcrisis.el since the \"bbdb\" USE flag is not set."
-		epatch "${FILESDIR}/${PN}-8.0-no-pcrisis.patch"
-	fi
-	epatch "${FILESDIR}/${P}-texinfo-5.patch"
-}
-
-src_configure() {
-	econf \
-		--with-emacs="emacs" \
-		--with-pixmapdir="${SITEETC}/${PN}" \
-		$(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}"
-	dodoc CHANGES NEWS README TODO example.vm
-}
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 2027647cf11c..143e0808b91d 100644
--- a/app-emacs/vm/vm-8.2.0_beta-r1.ebuild
+++ b/app-emacs/vm/vm-8.2.0_beta-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/vm/${PV%.*}.x/${MY_PV}/+download/${MY_P}.tgz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE="bbdb ssl"
 
 DEPEND="bbdb? ( app-emacs/bbdb )"
diff --git a/app-emacs/wanderlust/Manifest b/app-emacs/wanderlust/Manifest
index e56fdc359e6a..32366092a41f 100644
--- a/app-emacs/wanderlust/Manifest
+++ b/app-emacs/wanderlust/Manifest
@@ -1,6 +1,6 @@
 AUX 50wanderlust-gentoo.el 244 BLAKE2B 57be93cdfb9e1854ec5841996b586843ca6e514830d2c979ba9aa400200a6514220e632985a5fd6191969ef5b8a2ff32c4d2d7edfb83017c4230028107b4ab87 SHA512 2057a8d18d5c7c91c968921799d502e02a61718d437ce9a69de68ebe4f409414a799ca7b5737a8994afd52793cf03eebce03b85311db02c441efba92f0d30233
 DIST wanderlust-2.15.9_p20180814-git.tar.gz 1207081 BLAKE2B f52259b15040287f0afcf0768b3ae3237415b44960e205e48d4b658f3e522db993b87bac59ee3d9ba94ad26c830beaf26d9cf5f03830fcb1f01e4f5567ee4804 SHA512 67616cc1d35b25af1b56fa800943ad0c7e7d9b35f99c48fac96b77a68a3eb8db02b36525021ff8bba4d181530505face2a58725b7dff33b1bfe4f48a4314949f
 DIST wanderlust-2.15.9_p20190623.tar.gz 1210223 BLAKE2B 50416e27062a9837c18660ea9a1a7a3ff596639763965b09925ca16c89617d159b9aa5d08d93d8b5c6a504da2b048df8b4c489d4fc11ff6abc530f741a5d8fb9 SHA512 369f8d93af4d0d98f66c4c8500aa3535e3f772d8a1920c1bdc434f0d9078555f40d0d4278937d97bccf0f417cf1b1fdeb6c8a891d42b2675fb7737382425c91d
-EBUILD wanderlust-2.15.9_p20180814.ebuild 1324 BLAKE2B fb7abd2e4252ac534463e89502d674e4481be355bdb3c7c79ac73d09d03d31930a86af306cca4198b5020fd75c390b3864019daed60f22ff9461443bc0af6127 SHA512 a0619df4f09bae8da12e472a86e460f9791f4f95285253fde06a035a5ff469d2ad22e357697202815b9adc40b66942d92779649a3029f744d64de262e7a1aa10
-EBUILD wanderlust-2.15.9_p20190623.ebuild 1335 BLAKE2B 2fe37f003e660137388d46587c743ba3581509b10795dfcb46cdc22b014a62db95acd16c430ebf3f4e83864b6be835956fcf68c08c11f426ac56f9b8b973cdc5 SHA512 615a1fe8b68b3f2c0684fa150fd0b548992e8322b00e36e42db5db663836042401e5e268cde98c19692c76aebf27c1b63d2aa140e5eb1ff5589be368a4177472
+EBUILD wanderlust-2.15.9_p20180814.ebuild 1353 BLAKE2B 1c593e02a45e5dc45030e84c1f0e2a07b1a1e229588abed803bfad6d80947376087168f774c944dbe47719f946fcc5d217e5d3e602ff87d592973d3504313c78 SHA512 62947cf22c4b380e90e4a1a0d55f001928ed57f40720a944e9977a5feea7dae9542fd97169c2ed67d25ba0dc0d729dc767a2c5a7d184c3d072d48b175e7bfd53
+EBUILD wanderlust-2.15.9_p20190623.ebuild 1371 BLAKE2B 42d00364f87a57408cac79875886872a168b45904e6bd3627330e70aa345904dfab6ebd2c64c81f943f22e7aa78cedfdb100c69218ff2f5513f4a9bcf306084d SHA512 5bf8d08b8da7f88d8c6ee6c54e008eedcd709360af3b06b895a332de396b285580d0f554cb1e499606bfc2c8961f459ce7b72bd64e607fb69f4e81cae753c774
 MISC metadata.xml 452 BLAKE2B 79c5173a90f5687cadfb5fbf4bddfdaf4838d7b8b13d8df5f6221f2fc3a8ef777eebd7f13ec4bad09621082d688566cde30154b9c684deadd0e05c083e079857 SHA512 449539b7243e9d6646fa5cf7d56aa2cf227a6104c1dd2f1fbfdb843d7561b94315e649e2cfd5646093bed06f4f172e08adeb034a52b7b654fb3e49cabc45f8e6
diff --git a/app-emacs/wanderlust/wanderlust-2.15.9_p20180814.ebuild b/app-emacs/wanderlust/wanderlust-2.15.9_p20180814.ebuild
index b425c3ba6b4e..9fc16f03c0f9 100644
--- a/app-emacs/wanderlust/wanderlust-2.15.9_p20180814.ebuild
+++ b/app-emacs/wanderlust/wanderlust-2.15.9_p20180814.ebuild
@@ -8,7 +8,7 @@ inherit elisp
 DESCRIPTION="Yet Another Message Interface on Emacsen"
 HOMEPAGE="https://github.com/wanderlust/wanderlust"
 GITHUB_SHA1="395826e99b84051396d503392f52462b6cb683a5"
-SRC_URI="${HOMEPAGE}/archive/${GITHUB_SHA1}.tar.gz -> ${P}-git.tar.gz"
+SRC_URI="https://github.com/wanderlust/wanderlust/archive/${GITHUB_SHA1}.tar.gz -> ${P}-git.tar.gz"
 S="${WORKDIR}/${PN}-${GITHUB_SHA1}"
 
 LICENSE="GPL-2+"
diff --git a/app-emacs/wanderlust/wanderlust-2.15.9_p20190623.ebuild b/app-emacs/wanderlust/wanderlust-2.15.9_p20190623.ebuild
index bfb9cae0e084..d5f2f842462a 100644
--- a/app-emacs/wanderlust/wanderlust-2.15.9_p20190623.ebuild
+++ b/app-emacs/wanderlust/wanderlust-2.15.9_p20190623.ebuild
@@ -8,11 +8,11 @@ inherit elisp
 DESCRIPTION="Yet Another Message Interface on Emacsen"
 HOMEPAGE="https://github.com/wanderlust/wanderlust"
 GITHUB_SHA1="b9a529a54b9e7eafa4ed230ad28efffe0d25a20e"
-SRC_URI="${HOMEPAGE}/archive/${GITHUB_SHA1}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/wanderlust/wanderlust/archive/${GITHUB_SHA1}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="bbdb ssl l10n_ja"
 
 DEPEND=">=app-emacs/apel-10.8
diff --git a/app-emacs/xclip/Manifest b/app-emacs/xclip/Manifest
index 099feb72f471..42551fa12ce8 100644
--- a/app-emacs/xclip/Manifest
+++ b/app-emacs/xclip/Manifest
@@ -1,4 +1,6 @@
 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.9.ebuild b/app-emacs/xclip/xclip-1.9.ebuild
new file mode 100644
index 000000000000..8c192847ee8d
--- /dev/null
+++ b/app-emacs/xclip/xclip-1.9.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 readme.gentoo-r1
+
+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/xslide/Manifest b/app-emacs/xslide/Manifest
index c38eb264194f..aa7380871df8 100644
--- a/app-emacs/xslide/Manifest
+++ b/app-emacs/xslide/Manifest
@@ -1,4 +1,6 @@
 AUX 50xslide-gentoo.el 264 BLAKE2B 8a3cbd3159bcd3092e381e702576987e7f2389732063d7e0b0aaa84f98b1b975d4462ccdc1ac17603ede616eb052887c8da9df489c62ab2b9f0c9424072062bb SHA512 54dfb6e7d40591dcf7ee5625ded053056305eb72c64f3808758d20b9c9fdbc78f914765909c44ff9685b075f5d87e03a94afea156b179d6ae16275d1f9ad05e8
+DIST xslide-0.2.2.tar.gz 23469 BLAKE2B a7628267b45b1da9ba1cefef5b186ed0a01975546e0bd0f551dcac6810c59e7a75bd7d479c21e4199eb12725d8a0babb2e1ae1912ae53702ad72021b4775a7bf SHA512 e0cc7b42eddcaf9fe7860fad4eff14dd3c963578302884c9aa1caf09eaef08e73b7a3f60d15de7e31ce39d735751dbef33db2181531947ace9af25d0c5092697
 DIST xslide-0.2.2.zip 29051 BLAKE2B d29bfb9b932c1370d51695ccc00d16e6d0c3ea5025f42281df51bed016cead5bdaef95dbc2fc538ba493641ca799b7a048f48b659692e975feaf5ae8b545f1ec SHA512 df658464517704289d2695faed02d733adea9f5858310b497d66bf103be5c3e1c3635aa1aa3c93f63c64cd2927b4948e53e7b2593622564f5292c583d6e245a8
+EBUILD xslide-0.2.2-r1.ebuild 476 BLAKE2B 3cd48d7a6af0fec4624999a62514e55693958604afc7df4660b5710fa7ea15d4fdb16ab3e5f1fa1a044ab0a5e1e456a0445787d798a4ca5d779ed4570b7a5a8a SHA512 9e6bdee5ef94bb82fb6d15490a29c16943bfff7571987731396abcb1f46bf4664dc85c4be99c187bb6115801ff3a97263047f5682a9b5590c49feb78de155d03
 EBUILD xslide-0.2.2.ebuild 520 BLAKE2B 0b5041a161c7c35187303f44729479153957d10effa5cac35f1418b0284e5b4c755c80f7b0cf07a5626c59d5d90920beeeb9ea941f0bc609c7da67de0aef88ce SHA512 4b3895a41210215deb5aba2172d31aacf64f3869e2a178c3d8c42c735aff544874cce557e6e09b0ffa7c20be6bc4a8a17cc0568ad49c6ebc928ede3db92e2dc1
 MISC metadata.xml 356 BLAKE2B 6b8ff8b4ccbc7f2c5c85c154ec1eb694bb83306d9832227556873cea83a29684b63ec6e95fefcf3cec83e8f3585c00882f12186d37aed81f022aae04c1c8019e SHA512 ee8540b29674e44b7aa072c02ca5031df5c5283c1eaaab2ca6a549dce024c40e25a2316949d7997951f8db69322e592d5efcd59a4f9e4480ccda668d096459d8
diff --git a/app-emacs/xslide/xslide-0.2.2-r1.ebuild b/app-emacs/xslide/xslide-0.2.2-r1.ebuild
new file mode 100644
index 000000000000..f940babe7d83
--- /dev/null
+++ b/app-emacs/xslide/xslide-0.2.2-r1.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="An Emacs major mode for editing XSL stylesheets and running XSL processes"
+HOMEPAGE="https://sourceforge.net/projects/xslide/"
+SRC_URI="mirror://sourceforge/xslide/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
+DOCS="ChangeLog NEWS README.TXT TODO"
+
+src_compile() {
+	default
+}
diff --git a/app-emacs/zenburn/Manifest b/app-emacs/zenburn/Manifest
index 223244062895..ebaeac50a010 100644
--- a/app-emacs/zenburn/Manifest
+++ b/app-emacs/zenburn/Manifest
@@ -1,4 +1,6 @@
 AUX 50zenburn-gentoo.el 180 BLAKE2B 9ddd4068d000d8aec01e864f90c4ab1f418d45b4bd04c65ebdd3159e93dc6a2cf63dd1a11c88aa65a571dc1b89fc5e474ce6515f4b8f25392a870ec3961ccff5 SHA512 712853121e485d5100b89c69de853e8c0437c7b4c8fc47068281f6bc7dc3934a8417bb7e50f06b814991a016e6bb0be4859f01f63d4159523fb0ebc0acfbab23
 DIST zenburn-20110907.el.bz2 6979 BLAKE2B 3f38e857c9e09d73d5aafc7e5a98292c122b5ab903c902fe43be1d91ab20a9703a974707354b9f07eab190324ee4ac8a392efae06f2c05a07dd9914a78ebde4c SHA512 552f4a751ffadaf2f4174c7f722abc1fb7a8f84934df01f61c2d7cf653328ce8fd18473f0748eaa570ab9221544e5e9c81243e731a2fff5f2c9028b992163062
+DIST zenburn-20110907.tar.gz 7952 BLAKE2B c1d63eacd5e77f1d453ddd9323a7f573e487625e1f210c0a93f8992fe741d097f7662fca23900cbca320c9b0aa1484ada885b0b9c077f9a9370863172683b255 SHA512 be19da75b1f776128a8c8701655a0c7cae0d1228ed9d92cf5b57047f99385cf996c27aec9514118612a1728c126feb8892f1375c156a1b345e1018154edf6e79
+EBUILD zenburn-20110907-r1.ebuild 728 BLAKE2B d0c98e1372c7b948f72c9d71205a6e337eb233a70d6e44d6e8898bca7770ccbf4d7a852cba3013472498d6f1ce511ea4d191163439b049db485547d926a7fbd9 SHA512 f2a02a743424bf6b65825667a7017fd2845dc7bc838e46d69c7307145407851a3902502e7ecc3b4c8e46950288986b17330deb05646723e8adbeaf1af590fd8f
 EBUILD zenburn-20110907.ebuild 614 BLAKE2B 60a98f4d9c3301f50ef849bc4cb7b8f54b37bfd1e552c34a1e3b0ef783a5797a1f24039539ba46d122a03b83966285de99592c74a196adb8b94c36a387cbb929 SHA512 5fa53e44441c3f8ebd2ce3d6288b1f9191c6b2fc69caf81b816cf7f15dcfc8c0e215717939119a2273b2c4d670da6099a4f98d900e5c9ce5e06916992f5b76cf
 MISC metadata.xml 534 BLAKE2B d7a3d1d169842f90c9ce6ccc7b835c154f171098a8994f4769c041877c8d746915f461b2f97f651a62e4c750fb80290ce0549de9ccc6724c3e6fde9a5daf8947 SHA512 b1f6d9b271628e63c77f095228095581c7174207d6f1b24bac7c3b5de5ae7429b53621056a671e481dacaeba003f37e5911db3c47633ef3d80f64526214e4342
diff --git a/app-emacs/zenburn/zenburn-20110907-r1.ebuild b/app-emacs/zenburn/zenburn-20110907-r1.ebuild
new file mode 100644
index 000000000000..a444bae490e2
--- /dev/null
+++ b/app-emacs/zenburn/zenburn-20110907-r1.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 readme.gentoo-r1
+
+COMMIT="2b0672b04ef3e95c25f849dceb10d669296a188b"
+DESCRIPTION="Zenburn color theme for Emacs"
+HOMEPAGE="https://web.archive.org/web/20140612104441/http://slinky.imukuppi.org/zenburnpage/
+	https://github.com/dbrock/zenburn-el"
+SRC_URI="https://github.com/dbrock/${PN}-el/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-emacs/color-theme"
+BDEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}-el-${COMMIT}"
+SITEFILE="50${PN}-gentoo.el"
+DOC_CONTENTS="To enable zenburn by default, initialise it in your ~/.emacs:
+	\n\t(color-theme-zenburn)"
author	V3n3RiX <venerix@redcorelinux.org>	2019-09-06 10:28:05 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-09-06 10:28:05 +0100
commit	f1af93971b7490792d8541bc790e0d8c6d787059 (patch)
tree	a38046712bbc3a3844d77452d16c84e716caa3d4 /app-emacs
parent	fc637fb28da700da71ec2064d65ca5a7a31b9c6c (diff)