gentoo resync : 04.08.2018

42 files changed, 500 insertions, 290 deletions

diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 6c83275c7b9a..6a9ba954f6e1 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/apel/Manifest b/app-emacs/apel/Manifest
index 31035d125333..dc5628c001d7 100644
--- a/app-emacs/apel/Manifest
+++ b/app-emacs/apel/Manifest
@@ -2,7 +2,8 @@ AUX 50apel-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b5695
 AUX apel-10.8-010_ikazuhiro.patch 6631 BLAKE2B 729f790c0c638a41a6cd040268544ce2246c3161a7bab43b875c469b678e6fc6600a88741a413fce42a67bc5db58a6db2abb83e7f2ef1db1456290e17362cef6 SHA512 1630c45bec06b019815f1989b2279ba1e85634b9358f65254af1e40fcf51c8426715afe9c014a73928bc4ec59f6b71db1ddffeeadb3499ebc4324571631fd82c
 AUX apel-10.8-020_Prevent-fontset-error.patch 755 BLAKE2B a5d6a5eb718d99c058c736dc66e50affd8a0c748aabdefbb068f210bfb259290573eb5551bb14d3f8dca5e4af4cea89e65af3ef9d1b42c19b80d38ccf623a35d SHA512 4617ec3e48758fb85fffc9d07eb657e00451abc6605b3e65db5d01c99f37824c4232913fd445f387bdbe024409e7b01030b3337fa00ea3f52fafa289ecf11da6
 AUX apel-10.8-040_make-temp-file-for-Emacs-24.3.50.patch 888 BLAKE2B 1e79046bec7fa199eb0c055ee1d3e56c33229f493f2739537bb61012034fce06dd3644315e66c324c716386187ab6b7e92f4f571e03c7c63471d683df27e1ae5 SHA512 50795dff5cdb86a3a778257cfea5894b682e3c74e6b8a0b963606eb0b125158927c499ece14af0da418b491a30f6bbced4d101cf5ee29e4fc110a604d729a778
+AUX apel-10.8-050_escape-backslash.patch 942 BLAKE2B ab6ed79c8d6a8a75a1023dde38a9f8dae6b4d4252d8453dbd3bedd60999abb797294b4c66f291cf334df2e4f47d318aad4c411f3a8a84dbf9318b10934db6a69 SHA512 287d84ff23a22cbf0ae9ebeeb0e20759030239573c1d49d6e4b9bf67a8f7008fc494dade31c05bfb9f3383ea8882ebd9ff775f9ef9a139030cd083a9d5fd20ce
 DIST apel-10.8-030_Use-new-style-backquotes.patch.gz 7869 BLAKE2B 93b93a089693a2fec68033b44f1cf96117fcdcb9dad5dbbf4283a79cd19f358c2a3bdc80ce2f7517e8b396182141583a371c21a8df7db7d05156ffd16987a872 SHA512 4074dc612feb2d63637bea2e9303423d4e9e035fad7f440d2da5331a6adc08f5ec61abb5087c2c4c72ec8931d1ccc4db3ffd061bcf3150d20c222c8df2e0b274
 DIST apel-10.8.tar.gz 126326 BLAKE2B 6fc8f04006a971e9d48dbf5f7b43e201a4f5fa515210bb69829bc3b0f05aba2e9f205915e6117e20220ae5b48a6543520533dc95a90754a30ff3fb8094779901 SHA512 39f13f15ec0a078d8f8dfe797899474cf4dfeb0bf7b8432a0c05bb38cf134d805c171a66b3d3efd074fbf294d68006d1e1d49903e45f1991d79cdcb4cca4aa9d
-EBUILD apel-10.8-r1.ebuild 1455 BLAKE2B a4d4bbad29a3acf63f69d20a6790ca49d0570cfae4736df11e8ce4529aa609bf810dcb814d634ff1a732595fe3deb313134fc8c276c1fe15464abe89e210f03e SHA512 8d61139612e6c74c113d690599675bf13fdf4fb3e8008bd26e38e7a8c4c9ebb21a05fc2f732149bd99337bdd40f59aaf347518a693c892eb4965bf1fca75ab92
+EBUILD apel-10.8-r1.ebuild 1494 BLAKE2B 330d33b3436b607e3de6d46ef5ff15fb4208230c166ff3eccc837a57cdbc7885b5ec0bfad83976b1d3c2ad54e71c5dd1433903daf18c4b00fb14400f6d5c2538 SHA512 5b4881c7a966d1ee0fd82d931964d377c91a4df4647190000e3fb53a46c3eca0df9c705a34a762f2846a5a9696049d240b9549551e6a2e7151f772a16acf5c15
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/apel/apel-10.8-r1.ebuild b/app-emacs/apel/apel-10.8-r1.ebuild
index 7559be4d453d..8fbddf334241 100644
--- a/app-emacs/apel/apel-10.8-r1.ebuild
+++ b/app-emacs/apel/apel-10.8-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
 inherit elisp
 
@@ -18,7 +18,8 @@ IUSE=""
 ELISP_PATCHES="${PN}-10.8-020_Prevent-fontset-error.patch
 	${PN}-10.8-030_Use-new-style-backquotes.patch
 	${PN}-10.8-010_ikazuhiro.patch
-	${PN}-10.8-040_make-temp-file-for-Emacs-24.3.50.patch"
+	${PN}-10.8-040_make-temp-file-for-Emacs-24.3.50.patch
+	${PN}-10.8-050_escape-backslash.patch"
 
 src_prepare() {
 	elisp_src_prepare
diff --git a/app-emacs/apel/files/apel-10.8-050_escape-backslash.patch b/app-emacs/apel/files/apel-10.8-050_escape-backslash.patch
new file mode 100644
index 000000000000..a2892d303b37
--- /dev/null
+++ b/app-emacs/apel/files/apel-10.8-050_escape-backslash.patch
@@ -0,0 +1,20 @@
+--- a/poe.el	2018-07-27 19:34:05.959194677 -0500
++++ b/poe.el	2018-07-27 19:40:06.409212629 -0500
+@@ -1081,7 +1081,7 @@
+ If third arg LITERAL is non-nil, insert NEWTEXT literally.
+ Otherwise treat `\' as special:
+   `\&' in NEWTEXT means substitute original matched text.
+-  `\N' means substitute what matched the Nth `\(...\)'.
++  `\\N' means substitute what matched the Nth `\(...\)'.
+        If Nth parens didn't match, substitute nothing.
+   `\\' means insert one `\'.
+ FIXEDCASE and LITERAL are optional arguments.
+@@ -1133,7 +1133,7 @@
+ If third arg LITERAL is non-nil, insert NEWTEXT literally.
+ Otherwise treat `\' as special:
+   `\&' in NEWTEXT means substitute original matched text.
+-  `\N' means substitute what matched the Nth `\(...\)'.
++  `\\N' means substitute what matched the Nth `\(...\)'.
+        If Nth parens didn't match, substitute nothing.
+   `\\' means insert one `\'.
+ FIXEDCASE and LITERAL are optional arguments.
diff --git a/app-emacs/dash/Manifest b/app-emacs/dash/Manifest
index 88632fb3061d..9d46cadfb5ae 100644
--- a/app-emacs/dash/Manifest
+++ b/app-emacs/dash/Manifest
@@ -2,5 +2,5 @@ AUX 50dash-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b5695
 DIST dash-2.13.0.tar.gz 146280 BLAKE2B e9552a19b1f84db0e16fba07fe5bcfc0eb8a6871aabf395fa7ca527b77ba23616fdaa29e67d73e6cf11260bd23807be17de1e52f4abd23b0f9562cb26e6a5feb SHA512 59969e3df1b258a1bae76904e5abaf64c5143de9b8994a04799dad3a317c6ccc1dcd19b99a337a23bce0e46cfb6bc90bf8c6b0e6a532946b4f0ec188d331b559
 DIST dash-2.14.1.tar.gz 141115 BLAKE2B 87fc7a02c66161d1c16debc54c6336f36cc47cf7c7c470d190424b9c463723058ef6f72cadf3f4d4215b36f369b9e5356101c4ea16fede10cefde90b5e0b384b SHA512 cfd4ed7a9eab881a0c3bd2744e78c5ef99a92db4d3afee8c632c0a766adcdbf1999f4e9770e2c4e941526d488dd6f9327937389490cc2310d79b38c5bf2ddd12
 EBUILD dash-2.13.0.ebuild 545 BLAKE2B 083977c9bcd22b3c3e86c7f1e78f54b40ea3483b5873bdda957b9ea290a8ead2807178e1b2948001e32bad26b855f24215d87ea2a5cfcae847d2625a9144b307 SHA512 0179b3c93d4fdf86889bc649599cd27684c037e07efda724069ea5618e41c1f8c52a63d680266b703f743c0c9e322cfaf354634822523dfeff56a55519257d57
-EBUILD dash-2.14.1.ebuild 547 BLAKE2B 5c2a534c0635c33eaec2d55e65292e7cd52509ea4a06156dc80f11fe8216f8a3b8d63bd273bac818cbf19d1f0b467a5c60c7e32bf7e69f5035a8310816c67889 SHA512 82efe262885da628b70bc2656b0dfad8f26d59084f026830a15af9b1b62906474d7f7e7618c77f785253e65cf6fc5eb80ed412a47b8927ae91fd3547fd0e70cb
+EBUILD dash-2.14.1.ebuild 552 BLAKE2B 4d0d78f4b7c6ff1aa6f9bbd71f764d64457d313a92ebcfc6558d3c03ba494f1bfe3bf4a3edd47980f5bd0ef121a6398b2d48155669b4fd7bb7d963d3eaa0197f SHA512 0508a63aff42cccf5a6f772a41deca40162034bc60654001ce59b225a54c36f0d5b29ccc2722c9c5f321635de89c40abf4a909da2a5f578e2a675fe989eb0e77
 MISC metadata.xml 360 BLAKE2B e70caec7e3633788a79217f8d41bd69056ed620396e4d22ecd0d80ad82f7dbe2e9ac3872c55cd94682cd16960e682b1f648863373cc941559b40045612188f8c SHA512 8de7334410a02599aff54733234d7b3333c4a61cd2ffc846f3f69df3b43a53c510b2235100fab79274e0727393ecec24e051b42aa36b878d6b45130b5b2e3ff3
diff --git a/app-emacs/dash/dash-2.14.1.ebuild b/app-emacs/dash/dash-2.14.1.ebuild
index da2a16d87b0b..b406d183cd27 100644
--- a/app-emacs/dash/dash-2.14.1.ebuild
+++ b/app-emacs/dash/dash-2.14.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/magnars/dash.el/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="sys-apps/texinfo"
 
diff --git a/app-emacs/ebuild-mode/Manifest b/app-emacs/ebuild-mode/Manifest
index 2e7d18d65572..7fbb5f8bdd83 100644
--- a/app-emacs/ebuild-mode/Manifest
+++ b/app-emacs/ebuild-mode/Manifest
@@ -1,8 +1,4 @@
 AUX 50ebuild-mode-gentoo-1.39.el 805 BLAKE2B 3cdb41677c5ef11ef6fb44001cc36b58f923c2be4090fe8635fa85d338af3d170b1ad3d6b2f31704cf24e1528d3ce9b6fd3d305c2e3c1b1923e345e011642307 SHA512 8038b7bac0f3322b1149467152790dac7cd133234afe7c362c0e14686e378bc27eaf432a7194e1748dda80b41483943facb44e1a66466ebdcb4e7a0768e8f629
-DIST ebuild-mode-1.42.tar.xz 34936 BLAKE2B dd94d17dc57e2d32b329ab62ec6eec8ada6a4aeddadb8d978736f5dcb4d613759fd860043cab92d12db11614f8b7fa71fc5537576a2af3f5e6c9d56fc2fdcc05 SHA512 119f954eaf009bd0c9f0a75810b94a54d65ed91c6ffef20dd164c7a5ef095410dd0f3642426817f5efa6623d4f3e120ed3b27076222b02a90e75a83bb80b8703
-DIST ebuild-mode-1.43.tar.xz 34688 BLAKE2B 577900e2fa7ccb2362ec7f9046affb58e92bdfde44f2ea48274ba61d65f35fa6a1852bda6d9c64bd3f63aba99df244b4cb3378de079259508b149cdacf7caf28 SHA512 91f9a06de6feeeadb27d765a6ca6f2fa17e01938a6c953efe3586646f1bf48da87fe269ee9b07b2e16199d3ba4a76f42b8be9143218b808fac2971fc6f64f36d
 DIST ebuild-mode-1.44.tar.xz 34468 BLAKE2B 05c420979c2e4e145ab6230e9218d2ace8250abcc07e819610e9ac1fbb86147a641b88e69328ff624f9787b87cef56f9fe02a1205a02d01a0157b0293656647e SHA512 4d9b01939af089794255faf747264f948b8b2df47936e364ccfa23da493a33f56fbce1277526089e60b716e38e248b12fac39eca0d59d4974e2e70236ffbcd44
-EBUILD ebuild-mode-1.42.ebuild 732 BLAKE2B d80092df36e90cc356b7b0c3ae66405a08c5aab836f046ab9ddc268abb79766ed011ea390d0356f56555026af132d0b8d9be6f14c0eb82d3c09bd4835168e57f SHA512 fa0f2767f3eb6a4a5c94b9f633f4b3f778cd956f3995e5452b4c7548b6a79d9068f3d89e916aea696b34cf763c8754a193a546f35d7f7c9710b2eecb43853e2c
-EBUILD ebuild-mode-1.43.ebuild 748 BLAKE2B bfa78ba46b43271570ec44f42ab4dc506f93608b5237e884f6aba76458d7ea1bf58019a74c5c82ac0e0a48d71cce1f1073c86fe2b1f036d62ca4284db323b285 SHA512 9daa72324659b956e08565fae7953da567ef67c77c91a6b06b4f6228a2bf2714db3bb1e267ddbcf2b82998c87cee0bc37cfc6c88fc360a4c73febabbd95a801f
-EBUILD ebuild-mode-1.44.ebuild 748 BLAKE2B 6db0a7b028c513c130f665594a65ea28bcc6f3f712729877d6ee2e5401c3c86a1d9f51639332a5ff365143ebaa205ea8f15a7f7c4dff02751c845bbdc892d55a SHA512 b3e406f615844cfbe5a236f76ca993682c93da0fbacf928a7d951a8f3c9ed057822a900a4c7eca131e343e21697ff4ca9cf5f1b3d7ce721fde81c3f11706599d
+EBUILD ebuild-mode-1.44.ebuild 739 BLAKE2B b405c07f981e1b7a4c66ba9a703755d3312d885d9c0fd9ccf6512ee9b9103b432eef54101cd32ecfab070f360f6d9ca602395224f47ae3b89d094f3bc24c2ea7 SHA512 ed757337e4aa9e9c7c43967ca8c1898aed45743eb65483fb5171fcdbfa7bc465bcb47b52ea597ac966d90937f0e34eff133a576a8963b12d6af3dc1ca087be75
 MISC metadata.xml 426 BLAKE2B d0b4dc2bd01fc6fb2f0c58b01676b80d09a4677876adc9681c3c436ebc437b6b034187b19fea30cf980927fec1f6a9feee9a0b7d1a4dd15818d02e4c8ec77af6 SHA512 058df2768030185953c7ac3622819c430681eae3ca60b0d02ad48ed22ab6a0ac7c169d93f8f54a3dddcade3f84c9bf58f662a58bfd78217ea8fc27a580ab9077
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.42.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.42.ebuild
deleted file mode 100644
index fe2cc0744917..000000000000
--- a/app-emacs/ebuild-mode/ebuild-mode-1.42.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit readme.gentoo-r1 elisp
-
-DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
-SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-DEPEND="sys-apps/texinfo"
-
-DOCS="ChangeLog keyword-generation.sh"
-ELISP_TEXINFO="${PN}.texi"
-SITEFILE="50${PN}-gentoo-1.39.el"
-DOC_CONTENTS="Some optional features may require installation of additional
-	packages, like dev-python/docutils-glep for glep."
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.43.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.43.ebuild
deleted file mode 100644
index f36b2533c5f9..000000000000
--- a/app-emacs/ebuild-mode/ebuild-mode-1.43.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp readme.gentoo-r1
-
-DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
-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"
-
-DEPEND="sys-apps/texinfo"
-
-DOCS="ChangeLog keyword-generation.sh"
-ELISP_TEXINFO="${PN}.texi"
-SITEFILE="50${PN}-gentoo-1.39.el"
-DOC_CONTENTS="Some optional features may require installation of additional
-	packages, like dev-python/docutils-glep for glep."
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.44.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.44.ebuild
index 3e82ece8f10e..dd4ebc169319 100644
--- a/app-emacs/ebuild-mode/ebuild-mode-1.44.ebuild
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.44.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"
 
 DEPEND="sys-apps/texinfo"
 
diff --git a/app-emacs/f/Manifest b/app-emacs/f/Manifest
index be8e552e4f3e..99cf927d27a0 100644
--- a/app-emacs/f/Manifest
+++ b/app-emacs/f/Manifest
@@ -3,6 +3,6 @@ DIST f-0.18.2.tar.gz 18485 BLAKE2B 5b450b82eb31b23243a14308121380f53310de6b312c0
 DIST f-0.19.0.tar.gz 19477 BLAKE2B 47cfb8c876e11cae7eca61815085c4290f65f9d72a7c5d397d8b53f6d57421f46997786556074027de5405acbf38ddb42ecbb767c809763e84d880286e6942dc SHA512 694eca1872cb0a0da7f75f610e4101993a79a5e7601c3f72fd2c642b1a44f5eada24777313b5166d901d9d983c18b4d412b4c6f01c382ace7530bacaa3b67c56
 DIST f-0.20.0.tar.gz 19907 BLAKE2B 20b82a19b227d2e0863e540e75bc5094c0cf267eae00d699ff5b00fa574213d303135c246c454c92785080feae63ba6c529b115aeb1368774dd548852d94fb48 SHA512 0c44e63cd527a37bd5582d5a2a4cb2269d179930d7f41b378b9100ad5bb4518291b02197b1d55e1bf603bb5b1c12181b982d9b9a3f8fbd48860f6e86ea36c03e
 EBUILD f-0.18.2.ebuild 516 BLAKE2B d79552b1a98a6abb0d0f0a3339c425aa6d1c6e763cd814c5764e5a3f47e3909f9303b3868cc072b1523b35cd73f838b1228f178f30c008e8b28ba9de03ef0022 SHA512 679ec5a1dc6a778582ab90b55a2f6e65cd10dfd846b44d2f2900acd9f1ce70f1029b06336e38e025a7417dfc4e61c70986b9a9fd7674a20f5999fe143dffdebb
-EBUILD f-0.19.0.ebuild 516 BLAKE2B d79552b1a98a6abb0d0f0a3339c425aa6d1c6e763cd814c5764e5a3f47e3909f9303b3868cc072b1523b35cd73f838b1228f178f30c008e8b28ba9de03ef0022 SHA512 679ec5a1dc6a778582ab90b55a2f6e65cd10dfd846b44d2f2900acd9f1ce70f1029b06336e38e025a7417dfc4e61c70986b9a9fd7674a20f5999fe143dffdebb
+EBUILD f-0.19.0.ebuild 526 BLAKE2B c8f84f7ea67d86cccf39dccb13e887026da2c4a52b16c9cbf9272c62694af5dbf5666a0688d0e8c8bad8d5b3639040676df11cbcad4ef1eb7eb4e325ecfeb4ba SHA512 f56bdbcd85b0aae7c3c70d3b9edee58ef668f9f12939f4f87e705d64d68dccd28f97e2838c0dfcdd6f64be780a5628af349507c9601fc054b6f536a4ca24e356
 EBUILD f-0.20.0.ebuild 516 BLAKE2B 6795e6be1fd1981f6d208468d12c4cf9867eb4fc40bde7de17a1f8594d5f4f7e22fe8474010d388ccf7f5daf3727f87372cfd7557256005fe1466234400621a7 SHA512 3a46342e1c9f621146e8f543fa928f3273c6a0690be84dcfa9946ed70c9a210be45f9f631a0cafa14022b90f2b960cbe91b9c5d7fe6a9244090c8cf2b50258d4
 MISC metadata.xml 372 BLAKE2B 5ed577f7fa8b397ecfd738274b02ed1204aac09546624852be6698d88f15264d6edfe2a31528e9cf9a8051fcd6a53831ee7b0f024deaff2f652ede945f837e54 SHA512 5c0147862c0d432fab74199058bb650eca428cef988fd1f4a7d654f1cb13393e02f1193be3434b397489c9554e13a719d128e0d9c6c31d4b0cb496bdaf176a31
diff --git a/app-emacs/f/f-0.19.0.ebuild b/app-emacs/f/f-0.19.0.ebuild
index c29120179b0b..72b552759a6e 100644
--- a/app-emacs/f/f-0.19.0.ebuild
+++ b/app-emacs/f/f-0.19.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rejeep/f.el/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~x86"
 RESTRICT="test"
 
 RDEPEND="app-emacs/dash app-emacs/s"
diff --git a/app-emacs/lyskom-elisp-client/Manifest b/app-emacs/lyskom-elisp-client/Manifest
index b2cfb98b28c3..709bfd14d8e0 100644
--- a/app-emacs/lyskom-elisp-client/Manifest
+++ b/app-emacs/lyskom-elisp-client/Manifest
@@ -1,9 +1,7 @@
 AUX 50lyskom-elisp-client-gentoo.el 83 BLAKE2B fc6ddc15aefba06dab5ab19d3c3bfbe071c14ffc1a486330f728e3af89d0b457ab7a1c4ccd633da575acff1effbc4f7f7649279365850339b31a13982c296027 SHA512 f7e3f23ecbadc1fde023a6cd176e45719affaa6f03a015c3d399719c53cb4f56ea7269d725ac0fffcc9311fc8e8ed1fd0d3de93f0d1973a2abdcd14b073389ce
 AUX lyskom-elisp-client-0.48_p20161231-no-git.patch 898 BLAKE2B 77719e2cf527fd91e7fd122b7474a588231948113acf7b999dd4d6e7229ed3b9768d76932cadd2a6227f7474322e7cda68cd4a3493ab33536b99dea68eb05240 SHA512 3e0e9df1388af428dde8ba879beefb62fd261a557d6bf5b6fac59311029bfc613a1c407059ed533949fccb77aa99e0815a23116286895ff8ea33c5462e66095c
-DIST lyskom-elisp-client-0.48_p20131231.tar.xz 888212 BLAKE2B 54bcd028a8adc51aeedd8f8e8940b391d06bfda389c3ce776c113a2f1fe738d5d46a5332bba07c708dc38b06f6c4d6feff3328a4ff10bce1c22dd9c73d6bf349 SHA512 124dc45194d68588535e134acae9de9b19484b568c43d2eb49d3c4e8ee923e0baf64a634181a3238f34cf59a98a5a1e92e988519d26e8f3c3a0e867f500d53e9
 DIST lyskom-elisp-client-0.48_p20161231.tar.xz 889464 BLAKE2B fda0de6e335c0f50dd8ca78c45ea161ce1e8290beba54567c1352609f9f5b1fd69be5d651b33ed89e6a19a52665954e80cb22dfafbf8d396d87bef735114f528 SHA512 f412a0b1b9f71be26ac511f66ba5215e757287baa668ce71802802eb13f907137fe27a96614c58abac510104c1d9558cf9b62b3bf8e598c11b4fa3bc33269f81
 DIST lyskom-elisp-client-0.48_p20180410.tar.xz 889468 BLAKE2B b8a1766b6f6b1d4b01676792f45d66517cdc43d2e29ae6e5b0704b90e4dfc749f8e4155159fd28a25426d79502bcaf7f2cbded32b2e64e22b2b36f11cbdbd123 SHA512 efb04b2100d59fac971898a6db3e48cf45e3bdc4455f06a0cdd065a97db5441edd4eda2e838a5e88c0b0246387dba0e3f71777892b3a6889c51960f0259fbdfc
-EBUILD lyskom-elisp-client-0.48_p20131231.ebuild 1017 BLAKE2B 3b787c1bbc84f6c879b7af861e570278d2ffac065ac614ac00c2e37037d45a4e8ada8630d8c3c94153492101f9ebd311dff83cf0c10e5d679eeba2b64eed1d06 SHA512 79cd45680c7b09cf7883923de6cdd30d15b8fd3c1b7102d7e2760e8772817d30dca276df173bb14b24f208b3f209f3abccd50c05310c728b8fd695c247baec58
 EBUILD lyskom-elisp-client-0.48_p20161231.ebuild 1181 BLAKE2B eb4639a4e1ffd8efeaf5929eb2470bb56d044bb2c1ef2b0a5069b0109914b6f026bf56c7c4f645257727a6a39fc7e2116fe9db7368f7ad67388367140c9755f1 SHA512 ca99f1f79abc1c179a849907a935d826994d467b060b6362d1e551a624d905a0e616fdb4d35cdca698776356e8943ad007c0006518f20fc6471c5e8bc2d67f7c
-EBUILD lyskom-elisp-client-0.48_p20180410.ebuild 1199 BLAKE2B f3f79b5ae59444d8618d7ab131cc7fbe55476254e6da2bd437e389b796ca7681c7aa17bc8268a28b95ac07af6a4d0081ecc35087f57f1641f59b5201f7d3a7bc SHA512 feed06df76225b2a2e1857c6b93ff513f54ce20c3fa4c686a4120efe836e0880c7b5d6c5ee760e3e659dc3a4d0f982614e20504f7155f1831d10c45296bb63bb
+EBUILD lyskom-elisp-client-0.48_p20180410.ebuild 1196 BLAKE2B fb057585bbf00cc0ae59e235cf4d85ae0ba97723f821883eb76436ae29c4a44a2a3b2faf6c01b0507f7d41da36047fd47b616b57805936229c6cbabdb9b4f3c1 SHA512 254bd3d5c15eeeeae13643e88bce7330cf0e3f3b68c7dd3d93a0bd7be9fb9d8cf545671481ce2764afb5b4476ef24abf05f2556ef38a01d49c8aa4dc48ad79d4
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/lyskom-elisp-client/lyskom-elisp-client-0.48_p20131231.ebuild b/app-emacs/lyskom-elisp-client/lyskom-elisp-client-0.48_p20131231.ebuild
deleted file mode 100644
index 5d037934fe8d..000000000000
--- a/app-emacs/lyskom-elisp-client/lyskom-elisp-client-0.48_p20131231.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit readme.gentoo elisp
-
-DESCRIPTION="Elisp client for the LysKOM conference system"
-HOMEPAGE="http://www.lysator.liu.se/lyskom/klienter/emacslisp/index.en.html"
-# snapshot of git://git.lysator.liu.se/${PN}/${PN}.git
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 sparc x86"
-IUSE="l10n_sv"
-
-S="${WORKDIR}/${PN}"
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	emake -C src EMACS=emacs
-	# Info page is in Swedish only
-	use l10n_sv && emake -C doc elisp-client
-}
-
-src_install() {
-	elisp-install ${PN} src/lyskom.{el,elc}
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	dodoc src/{ChangeLog*,README,TODO} doc/NEWS*
-	use l10n_sv && doinfo doc/elisp-client
-
-	DOC_CONTENTS="If you prefer an English language environment, add the
-		following line to your ~/.emacs file:
-		\n\t(setq-default kom-default-language 'en)"
-	readme.gentoo_create_doc
-}
diff --git a/app-emacs/lyskom-elisp-client/lyskom-elisp-client-0.48_p20180410.ebuild b/app-emacs/lyskom-elisp-client/lyskom-elisp-client-0.48_p20180410.ebuild
index ad8068bd1ab9..58460bf45b94 100644
--- a/app-emacs/lyskom-elisp-client/lyskom-elisp-client-0.48_p20180410.ebuild
+++ b/app-emacs/lyskom-elisp-client/lyskom-elisp-client-0.48_p20180410.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="amd64 sparc x86"
 IUSE="l10n_sv"
 
 S="${WORKDIR}/${PN}"
diff --git a/app-emacs/magit-popup/Manifest b/app-emacs/magit-popup/Manifest
index cad250249e49..e4f5d839f48e 100644
--- a/app-emacs/magit-popup/Manifest
+++ b/app-emacs/magit-popup/Manifest
@@ -1,4 +1,6 @@
 AUX 50magit-popup-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
 DIST magit-popup-2.12.3.tar.gz 40195 BLAKE2B a351e949207b674c734f66b0431fa4c137293ccff880e3f457dfb825d7a36afd37f59197170a86d52606d371c181cd8a23be54d74aeee192a2d1a56588a55b3d SHA512 50620ce1d364ae28f30658dedd8f235bb1055be5cf4320142b7648e2ff6137f84cf865ea8f41e34ad7fb42612ff5d36fc0c4f6caa0aa0d2071bf775c15be5833
+DIST magit-popup-2.12.4.tar.gz 40233 BLAKE2B 959ed85a1a4fec06ea30cd8d3482616fcaf145e4c043e48d872c830f24d627c4047c68d9424649a1c6b24a027309e900792a342f5a048d6f5aab32e8130eaa9d SHA512 c538d8227ebed85a161a62deb351994cfa3ea67b400ddd8423ae90a6ada8653f3798db2dfb942921bcb505af3fa757f8c2c911c9da583a42210db82e20d7fa3d
 EBUILD magit-popup-2.12.3.ebuild 594 BLAKE2B 4e1f7e95d6581b55aac702d4d4aed048f0ab0f9815b1d9a8dfb3688c541eadd13e39e9f9f40cb7ab931e6841f9cc9c86205d40dfff0560b8417a9764c7d12e15 SHA512 750cd4a10d07188fc9113e2e71604c3742f6d9ed02179f7cceef982fa1d4c037ef88eb4faf9ead8cc46d798cba9044c5f83cb183ceda69c110dccbd9a1d66e4a
+EBUILD magit-popup-2.12.4.ebuild 596 BLAKE2B 39e54e5f14d5648c2e8d1c30f2da09cfb7345d1cf80650a4fd226dc7dbbdb0560ca24761ed46a4910a47bc46bd6a5a403edab90afc051b7ea60c5af813106191 SHA512 60cf12225cf6a27a5ecbe0afe7ff6d3e6c20b351aae312518a150bd8bfbb485e7310b2a17ab4743f413f3cb7da35aef5ccc00d3a99fa23ee675eeb11e181a204
 MISC metadata.xml 1170 BLAKE2B ab77cb475c6f77b7829a4fa62de4ab29423ed5e7531e64b60523ccf619b3e4edf4c69037d528bf3705f0de1311833445d02932d0a8b633860319ce200cadb454 SHA512 70806e5c38f43fcfe23b2eb64f818ad6d62fdacc61cb6d1be0b8aad236f766fd558592db617aeb0b41cc9330d1789339b8a3b9eefcf65f1bced7b18633cf884f
diff --git a/app-emacs/magit-popup/magit-popup-2.12.4.ebuild b/app-emacs/magit-popup/magit-popup-2.12.4.ebuild
new file mode 100644
index 000000000000..10997ff1cf60
--- /dev/null
+++ b/app-emacs/magit-popup/magit-popup-2.12.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="Define prefix-infix-suffix command combos"
+HOMEPAGE="https://magit.vc/manual/magit-popup"
+SRC_URI="https://github.com/magit/magit-popup/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="*.texi"
+DOCS="README.md"
+
+CDEPEND=">=app-emacs/dash-2.13.0"
+DEPEND="${CDEPEND} sys-apps/texinfo"
+RDEPEND="!!<app-emacs/magit-2.12.1
+	${CDEPEND}"
diff --git a/app-emacs/php-mode/Manifest b/app-emacs/php-mode/Manifest
index 81afff018978..131f1bb66411 100644
--- a/app-emacs/php-mode/Manifest
+++ b/app-emacs/php-mode/Manifest
@@ -1,6 +1,8 @@
 AUX 50php-mode-gentoo.el 286 BLAKE2B 1c823d8244e714811c5f1be402d1cd41e7b81951aafdedd01f36fe93f3cb6150792b5ed09ef5fd859211692f766fb8e931581c5e9cd60401d6eade364696edec SHA512 5f6205a7f3300d02b612a0aba58566dba1ad2a5f090c827c7d2d740af9c425cccb8384b37ac81e05eb81b4e31e649726433105b9862b92913e56752c554eec93
 DIST php-mode-1.18.2.tar.gz 81772 BLAKE2B fc27453c15fbc3da1cba8e61392501ba71da7979cd9b9770e147b562950a7a68ec1be19b28cfde1770e48a9edd86e4f7ddda1f280f0c5dc2b58428758ebaf585 SHA512 39c00216c6a1801ae0be016eadc95bf9574ab285dd6125a343cf4c3a5c3ef5b8e579877513c94843a836b97a969402fa0a3714a8cf2f68f7007d629e86834bc3
+DIST php-mode-1.19.1.tar.gz 94857 BLAKE2B 65ecb228fd4cd2c09cf38836b7d04ac270051976dc97dd7a3124f5a86d4e95bf9a097c6885f55c0ea40599fc2d3f813204e7f28a5f75223cae9eb51e74136017 SHA512 ca4fd798690d5b855a8d4b0cf5b631c32a561466b7697c9498bd89ad1059b774616acab10e30877b3053ba613b63db5da74a479c0a09c57b9b7b2350f42e68dd
 DIST php-mode-1.5.0.tar.gz 42687 BLAKE2B 70ed666e5561bbd879ddd3d56d6cf602b873c2a3c68a2f1bab08bc44648c252ae23519bcefc9a215922a137d69b956ebd74c202d8e567ec21ba4db3c68e44a44 SHA512 e05cf9eeff3d17f6af29b03d08f279e4c04f79a2c018de5ddcf097adbf9e67978eeb9f0f9e67b9406c1f33c494597ab1bfa629bdab131d668de40b81d68e796f
 EBUILD php-mode-1.18.2.ebuild 489 BLAKE2B 8a0bdf5c0bf837f4d52e8cb3619427d22a9a3063cf515001ef8cf45a40af6889dfc6bee915cd22eb92f80dadc35366c1b69801e118f280659354473227ae6b4c SHA512 9db42aaeac1ca750ffa6917f6a5543866d6c04460087dc66a009422e5dd69568f132dc69ee59cd2220b67d9cb8d7b80d234c7727fbe3e0525a0eb446cc21b576
+EBUILD php-mode-1.19.1.ebuild 521 BLAKE2B 040cc3bbd97479abe560e5caf0ecd2da4e78f99a4824c210c5aee2ef1415c6684056c023b5c1926b1a2cbb4923adfd656404af7f57ade5bad2b35b29166b25af SHA512 c80efbbc052cd155220107abc0050d24d55b58390c39b3edc8bca2f5dbd550bd95cd0554cd913a59802dba46a1d9c0b067121c5774e211956154c9b07e42cf7e
 EBUILD php-mode-1.5.0.ebuild 492 BLAKE2B d19744f28e7163d8eb8d2e4fc7e05540d967b38377946d377b35d10de9e168b3edb39ba35a335194507df3a48c63482513d2b6a09d6dfdb61ce69e0b07ac10e4 SHA512 4d65e4d8d7c382f47743c7fb8470c3f6844cf5a8f4babc314fb823a1f8d069be8e6701f408df9b96b53560dd631e14ef2918de77b8284b77136f917dcb9e4ce1
 MISC metadata.xml 358 BLAKE2B e43dc1a1d876d29121c6745f2e66c3b3585ea5ab0aed824c28bece59078fea9df0f6f438701dfc64fdbf90cb258091d5b96b4dc8fa320161ee241fc17be0a4b9 SHA512 eadc968656b4fe2150fd3d360c32d3fc66d42408c61ea60b3df5be2ba6cd3ed6abec1ba45e37269f5d06721eea30d3dbf95f3a747000e5b5d60e614c56ce3f85
diff --git a/app-emacs/php-mode/php-mode-1.19.1.ebuild b/app-emacs/php-mode/php-mode-1.19.1.ebuild
new file mode 100644
index 000000000000..7d41678db2b6
--- /dev/null
+++ b/app-emacs/php-mode/php-mode-1.19.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="GNU Emacs major mode for editing PHP code"
+HOMEPAGE="https://github.com/ejmr/php-mode"
+SRC_URI="https://github.com/ejmr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md Changelog.md"
+ELISP_REMOVE="php-mode-test.el"
diff --git a/app-emacs/ruby-mode/Manifest b/app-emacs/ruby-mode/Manifest
index 716e52f035c7..2eb443cf617e 100644
--- a/app-emacs/ruby-mode/Manifest
+++ b/app-emacs/ruby-mode/Manifest
@@ -1,17 +1,12 @@
-AUX 50ruby-mode-gentoo-2.2.2.el 493 BLAKE2B d6a26c800c7fe4b3ff7e795be725861bde5115bf0d83845ab55fb686ff445cbc00e24989d69424d30d16a1460dad7e66e56dc18ff2c7714ad6c03f2b5c8fa8fd SHA512 fe876332aca925ae085ab78f77abc5f32aac6eadc9e34decbd337d9f08c1e5f3d27bb72a577717565610e7606a2fc9061ff06d8ed7b5c6293eafe498b904f3f9
 AUX 50ruby-mode-gentoo-2.3.0.el 493 BLAKE2B d6a26c800c7fe4b3ff7e795be725861bde5115bf0d83845ab55fb686ff445cbc00e24989d69424d30d16a1460dad7e66e56dc18ff2c7714ad6c03f2b5c8fa8fd SHA512 fe876332aca925ae085ab78f77abc5f32aac6eadc9e34decbd337d9f08c1e5f3d27bb72a577717565610e7606a2fc9061ff06d8ed7b5c6293eafe498b904f3f9
 AUX 50ruby-mode-gentoo-2.4.1.el 493 BLAKE2B d6a26c800c7fe4b3ff7e795be725861bde5115bf0d83845ab55fb686ff445cbc00e24989d69424d30d16a1460dad7e66e56dc18ff2c7714ad6c03f2b5c8fa8fd SHA512 fe876332aca925ae085ab78f77abc5f32aac6eadc9e34decbd337d9f08c1e5f3d27bb72a577717565610e7606a2fc9061ff06d8ed7b5c6293eafe498b904f3f9
 AUX 50ruby-mode-gentoo-2.5.0.el 493 BLAKE2B d6a26c800c7fe4b3ff7e795be725861bde5115bf0d83845ab55fb686ff445cbc00e24989d69424d30d16a1460dad7e66e56dc18ff2c7714ad6c03f2b5c8fa8fd SHA512 fe876332aca925ae085ab78f77abc5f32aac6eadc9e34decbd337d9f08c1e5f3d27bb72a577717565610e7606a2fc9061ff06d8ed7b5c6293eafe498b904f3f9
-AUX 50ruby-mode-gentoo.el 420 BLAKE2B 349d61eaae28873b6381139e6ec79b7f87ada03665e1611196d8997324429b2c757cb63568de106f75ca2b6e3084f21cfdeabd8568874da1722833a832cbfc3f SHA512 1b1063effe3132f2ab4f122957e8fb2cec1bb2ce4dfda38c183851408f33da3440730caeb3db96d1310f01163ad042e2753e1b5c3e1e04183a694230782c8b1e
-AUX ruby-mode-1.9.3_p429-last-command-char.patch 763 BLAKE2B eae2ec3ab822cabc08a8a2f958e5a2ac5ec2cf7b530e8be95ad7cae65b2bce26b983fcd89d78d5ca95b649450055ddfff50227606bed4dca9fb18b3df614d56a SHA512 3b42fb73b882350e9ef3d39fdfa91b5f43f19602ffd47db6bed912c36d360aae76519ecf6db6b2573ff98624bc2e9f4f404ae94ab3d4c24e0724d8fa693c2485
-DIST ruby-2.0.0-p247.tar.bz2 10804581 BLAKE2B b7f2f8234426361f7e53965ef93aada24f63975c4f920656541024ffced84a19b0e53f1c985879e3ca08ae9424f2b5b005afa31527eccb581ff7201e94b5b27c SHA512 9bd793d0df8f0704fb1521a937c09ecc89b777851312793f0b3391df11dec8239808585697b932c4a94665fa29c7781503166dbd109f269811788c4c648f285f
-DIST ruby-2.2.2.tar.xz 10463044 BLAKE2B 77e1bda547102da9aa47c1ca58c9c8189b204019605ca6363df678a4590fe59f63910a657bb653d605aab612351e09ba0384351e552c788fb6c54520fe9c6277 SHA512 bd72d0a4c017e2527659f64ef2781bbe8bd540a2302eaa60234a12282fd53c359e04205c56385402c67e81bb9dab3b88de53de82e12bb13e3386c26301043b64
 DIST ruby-2.3.0.tar.xz 11294412 BLAKE2B 2c1324154aadd287952cc6430891048ea69922c063b1b2bac89b58603247eb09a79a8c527259d59ceabfc7be08ec2528c982bf2b0f1a223cf3e60d7a3934e8bc SHA512 d893c5e6db5a0533e0da48d899c619964388852ef90e7d1b92a4363d5f189cd2dba32a009581f62b9f42a8e6027975fc3c18b64faf356f5e3ac43a8d69ec5327
 DIST ruby-2.4.1.tar.xz 9939188 BLAKE2B 5be893c8996d17ff333276a772747d3099cec0c41331e1a1916679afc43a8ad5ed99a827bc76b32652ec950eaec933dbe28e1dde313987c2891f258ba7097af7 SHA512 e6fd290b6edd166348b70f0f1c56f7ed9d956c4c1eb91d97d0548041ca4196b9b75ec1ad35c745bdbfd4de195899093e7205d7f02b014ecf1c48e6f31cf25903
 DIST ruby-2.5.0.tar.xz 11292472 BLAKE2B 852ce003a79d9d77e72928353382962440e99ed1d03558c89a928e8f4a582b27357ef63e3ef45f3b30009f7a95f356100941bd84151571ade3a88b2d0595f8ad SHA512 55714a33d7661fe8b432f73c34fd67b49699f8b79df1cbd680a74899124d31111ab0f444677672aac1ba725820182940d485efb2db0bf2bc96737c5d40c54578
-EBUILD ruby-mode-2.0.0_p247.ebuild 568 BLAKE2B 24b39cf684d204d000ccee421c8d06186e36c7bf444790e36ffa6987ba6a2b5d1927b527ee47af55cf0cfccf8990692dcb31ab584d3d1befc811afe96a8a19bc SHA512 69a1c4bcecb6a545b5a9c871152f5917524b158df8fdf507989f53f0968830613a86986e82c62771f3632979e4129c0fc1b70ed262ce193fb7730484590b0a6b
-EBUILD ruby-mode-2.2.2.ebuild 496 BLAKE2B 7227da6ffc85192d2c13ac6e1a172e26f40892f0dfb39e11020584d5e4dca28bea31f864b26fdb429e9633bf2c40b8e55a3ed9f1078d459032fa7ee767f33212 SHA512 5dd65768c7b7d51f1bff2b4ac12918fbb4178f876fa1ef8ade21623fa51bdb36496c4e247b40a3dc27c6f8e2786276f73c77fa7287fd8d8534213606b986b374
+DIST ruby-2.5.1.tar.xz 11348108 BLAKE2B ea1019a81f96169ab8d435215362b36b098df373ac4f53ecda328686ec2c13204a38c66bb1bf9504d18e1762e7e6ae277bab3b16bb53b8e628962df715769f3b SHA512 31bacf58469953282cd5d8b51862dcf4b84dedb927c1871bc3fca32fc157fe49187631575a70838705fe246f4555647577a7ecc26894445a7d64de5503dc11b4
 EBUILD ruby-mode-2.3.0.ebuild 494 BLAKE2B 31c71bd89eff5c173571f09ceff570f16c8f9ca01ded4541f8f021c96212f8c0112b49ba58f409ecd1caf9016706d8f254d938575cb3a324b6890ed6f2a3bb14 SHA512 0df916f8b8a5d7a3d2a7fa0613e74e3306398cb5f1a1c59f2bde940c9dba060f5675580cf5091333a243227b5c23bb4e176f86f9151e0311c95799c82a181efa
 EBUILD ruby-mode-2.4.1.ebuild 504 BLAKE2B 1328c07be2fd2c8e082cef902a973b79ae3962b3c0696c25602a2461020e47275ed378d791b6bd1208919cd02ff84e874359ee118caed5c5b1b0d41070184bb7 SHA512 fc416f5069b4758a889555f087882846b86fb482e3b615475ee2ab2f4c469662094f4b2b4ccc027ce2d874a0c4e31413a5e25e90a9ac5edf789550a9e1c7c744
 EBUILD ruby-mode-2.5.0.ebuild 504 BLAKE2B 1328c07be2fd2c8e082cef902a973b79ae3962b3c0696c25602a2461020e47275ed378d791b6bd1208919cd02ff84e874359ee118caed5c5b1b0d41070184bb7 SHA512 fc416f5069b4758a889555f087882846b86fb482e3b615475ee2ab2f4c469662094f4b2b4ccc027ce2d874a0c4e31413a5e25e90a9ac5edf789550a9e1c7c744
+EBUILD ruby-mode-2.5.1.ebuild 504 BLAKE2B 9572a046e742b45c05294bf4ff41b31c28f58ab56ec221903bb75a6bdbdf76ac6fc5a82fb6b0885445a5a9bed70e352206c954dcaf391cdd6cb1a3fce9607da9 SHA512 f268e47220d02c6dc37365dd87c66fd50bf8bb27d55c5d6b5293b9d0805a287b32744c648ffaad47d47859e95fd06876545647bbf8cc0969fc92ba71313221f4
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-emacs/ruby-mode/files/50ruby-mode-gentoo-2.2.2.el b/app-emacs/ruby-mode/files/50ruby-mode-gentoo-2.2.2.el
deleted file mode 100644
index 691abdfdaf99..000000000000
--- a/app-emacs/ruby-mode/files/50ruby-mode-gentoo-2.2.2.el
+++ /dev/null
@@ -1,12 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
-
-(autoload 'ruby-mode "ruby-mode" "Major mode to edit ruby files." t)
-
-(add-to-list 'auto-mode-alist '("Rakefile\\'" . ruby-mode))
-(add-to-list 'auto-mode-alist '("\\.\\(rake\\|rb\\)\\'" . ruby-mode))
-(add-to-list 'interpreter-mode-alist  '("ruby" . ruby-mode))
-
-(autoload 'run-ruby "inf-ruby" "Run an inferior Ruby process" t)
-(autoload 'inf-ruby-keys "inf-ruby" "Set local key defs for inf-ruby in ruby-mode")
-
-(add-hook 'ruby-mode-hook 'inf-ruby-keys)
diff --git a/app-emacs/ruby-mode/files/50ruby-mode-gentoo.el b/app-emacs/ruby-mode/files/50ruby-mode-gentoo.el
deleted file mode 100644
index c1f9602d19d8..000000000000
--- a/app-emacs/ruby-mode/files/50ruby-mode-gentoo.el
+++ /dev/null
@@ -1,11 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
-
-(autoload 'ruby-mode "ruby-mode" "Major mode to edit ruby files." t)
-
-(add-to-list 'auto-mode-alist '("\\.rb\\'" . ruby-mode))
-(add-to-list 'interpreter-mode-alist  '("ruby" . ruby-mode))
-
-(autoload 'run-ruby "inf-ruby" "Run an inferior Ruby process" t)
-(autoload 'inf-ruby-keys "inf-ruby" "Set local key defs for inf-ruby in ruby-mode")
-
-(add-hook 'ruby-mode-hook 'inf-ruby-keys)
diff --git a/app-emacs/ruby-mode/files/ruby-mode-1.9.3_p429-last-command-char.patch b/app-emacs/ruby-mode/files/ruby-mode-1.9.3_p429-last-command-char.patch
deleted file mode 100644
index 4d4bb2775c83..000000000000
--- a/app-emacs/ruby-mode/files/ruby-mode-1.9.3_p429-last-command-char.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit 595825dc577616862b271ffac4c58eb27f0610af
-Author: hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
-Date:   Sun Apr 21 10:04:54 2013 +0000
-
-    Replace use of obsolete variable `last-command-char` by @maser [fix GH-290]
-    
-    
-    git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40401 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-
-diff --git a/misc/ruby-mode.el b/misc/ruby-mode.el
-index dcaa396..ace0f27 100644
---- a/misc/ruby-mode.el
-+++ b/misc/ruby-mode.el
-@@ -874,7 +874,7 @@ Also ignores spaces after parenthesis when 'space."
- 
- (defun ruby-electric-brace (arg)
-   (interactive "P")
--  (insert-char last-command-char 1)
-+  (insert-char last-command-event 1)
-   (ruby-indent-line t)
-   (delete-char -1)
-   (self-insert-command (prefix-numeric-value arg)))
diff --git a/app-emacs/ruby-mode/ruby-mode-2.0.0_p247.ebuild b/app-emacs/ruby-mode/ruby-mode-2.0.0_p247.ebuild
deleted file mode 100644
index 3b51eb835fcc..000000000000
--- a/app-emacs/ruby-mode/ruby-mode-2.0.0_p247.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-MY_PV=${PV/_/-}
-DESCRIPTION="Emacs major mode for editing Ruby code"
-HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI="mirror://ruby/ruby-${MY_PV}.tar.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-S="${WORKDIR}/ruby-${MY_PV}/misc"
-DOCS="README"
-ELISP_PATCHES="${PN}-1.9.3_p429-last-command-char.patch"
-SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/ruby-mode/ruby-mode-2.2.2.ebuild b/app-emacs/ruby-mode/ruby-mode-2.5.1.ebuild
index 0f4ff6d39b9f..aa54df2d0db9 100644
--- a/app-emacs/ruby-mode/ruby-mode-2.2.2.ebuild
+++ b/app-emacs/ruby-mode/ruby-mode-2.5.1.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit elisp
 
 DESCRIPTION="Emacs major mode for editing Ruby code"
-HOMEPAGE="http://www.ruby-lang.org/"
+HOMEPAGE="https://www.ruby-lang.org/"
 SRC_URI="mirror://ruby/ruby-${PV}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 S="${WORKDIR}/ruby-${PV}/misc"
 DOCS="README"
-SITEFILE="50${PN}-gentoo-${PV}.el"
+SITEFILE="50${PN}-gentoo-2.5.0.el"
diff --git a/app-emacs/s/Manifest b/app-emacs/s/Manifest
index e572f8d5d593..3ef0e8b73b9b 100644
--- a/app-emacs/s/Manifest
+++ b/app-emacs/s/Manifest
@@ -2,5 +2,5 @@ AUX 50s-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b5695179
 DIST s-1.11.0.tar.gz 46771 BLAKE2B 5cc93e4f52ea4fbb4d4b9b418a632e8bbc789f0f36b9486a4a1b36725e255f4a78d1924a420fd04af5c2bc50a652adfc83db3285569367749fe3712f2f0b560b SHA512 364fa7ea875e9be6db464a826c1259889b67d87817b41cff40ab7da80e0bfc3e27dcadadfd005a64a895ee92644c2dea82789bdf1b1fe538501c40f748455608
 DIST s-1.12.0.tar.gz 59193 BLAKE2B 89e4c453b6590116a4cc08fc1be73519e6c95586c1e80b37f37d7273232aa707cd030cf74106fdd7eb7f05fe8ebd04253592076573472c3927cc1428b4c029f8 SHA512 036369011295dfde7567ae8bd479be9635de479e8821c3fe117a6c3827bc83492bb91e6ac64d4b20b061da95690f5585ed58f116a2b8c877dceee22153c8c990
 EBUILD s-1.11.0.ebuild 432 BLAKE2B 293d3bbd4140bfe798b5329a111ff9f61feda85ca3e913947206e71fdf0d989f60ab7019ff4bb17b0e6d1a0d311a8ab8ce1d1b91c0c280c1df1e9e4e9a6b6131 SHA512 311ded1caa4563d85c897a05343239330131c70f8ebf8e2aa41161315813503f683365e1216280759d9c5928537054525a9220cfad321535edffcf53786dab03
-EBUILD s-1.12.0.ebuild 432 BLAKE2B 2ade0825dfc084c186d5bc08e67ddee272d0227bfa4cc0946972347de9003858cf60e66c368fd3e6aa1065218267199b231ff553a4f65ed3a1fd44aefc4d580c SHA512 36c6d2f266315821f67dfa486c63f2987f525346432e0cbd137157125ce8c9af2de1772d85219068285f7212d23aa4d4e9331577e86ae3b861e216b9fa09c977
+EBUILD s-1.12.0.ebuild 442 BLAKE2B 0642e76c8f537d2174d393f829d979b6f7200bb49e0850bb613b11dd12784c6aa0b4e5ab5c211315120fc75933fcc45c4d9c4906638e5999e728c1807c8b6996 SHA512 f0f6a4f83090465c15a0900b2a35c4b340e1ae508b3de68c93548fe83064b210e937ba1d86bd7d9ea5f9e5ce42ecd19b3fd787ff6a2a23a7bed83c3e91577229
 MISC metadata.xml 373 BLAKE2B 7553de03e6dabdf1b74352b5876211bc8f0c5a6ba9e6e84334c3ca069e4521ae56dd28df2ab3574000cd54765486f23ebe13db350821605e77190344514aeef1 SHA512 05637c489e2e7b23f585775b41853c60a7bbf1607679545a129aefd3b125ead6740b26b9c8045fd5721ea67df88773da6deced9973ee346647aa570057d46338
diff --git a/app-emacs/s/s-1.12.0.ebuild b/app-emacs/s/s-1.12.0.ebuild
index 2a3d49f9a3eb..795079c3c538 100644
--- a/app-emacs/s/s-1.12.0.ebuild
+++ b/app-emacs/s/s-1.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/magnars/s.el/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~x86"
 
 S="${WORKDIR}/s.el-${PV}"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/wanderlust/Manifest b/app-emacs/wanderlust/Manifest
index 66ec28cc86cd..89d814097fa2 100644
--- a/app-emacs/wanderlust/Manifest
+++ b/app-emacs/wanderlust/Manifest
@@ -1,9 +1,10 @@
 AUX 50wanderlust-gentoo.el 244 BLAKE2B 57be93cdfb9e1854ec5841996b586843ca6e514830d2c979ba9aa400200a6514220e632985a5fd6191969ef5b8a2ff32c4d2d7edfb83017c4230028107b4ab87 SHA512 2057a8d18d5c7c91c968921799d502e02a61718d437ce9a69de68ebe4f409414a799ca7b5737a8994afd52793cf03eebce03b85311db02c441efba92f0d30233
 AUX wanderlust-2.14.0-smtp-end-of-line.patch 628 BLAKE2B 0d4252e6ee9df868c2abf68ba43f7a641a295da96830a3f907b75bac92a870391b3f610a52fa778ef130e7196c433befc3ef5b3aaa30c14248f50cddf8dcddbb SHA512 a365e24bd369dd3dcc66c45651742a33bbe847536c1362c466a64cdbcdc0908f5119e8daed70f42e2634bf4d09b9e1c4dabf8405794fa915685b1647aa5eeeef
 AUX wanderlust-2.14.0-texinfo-garbage.patch 473 BLAKE2B 390a5da8f74008b4c4c707d3ac11e8b66a9337e6b904a4072ac319ed7bee22f507a1b1dcbbb025c1ab5647e88c9da0feab4303d53e1336541f26e3f44256a279 SHA512 1f728259179beba3cc543725b5087ce2d80c9167c9f447ed60aa38225b23eef7da2a018f6150ee6eeadea0d7bf4d55269c32df9bdb4120e4a99d3955bba839ce
+AUX wanderlust-2.15.9_p20130619-default-truncate-lines.patch 538 BLAKE2B db1e43daadd1a90eb25f1da6049956af1a242da0579b7e6f5bed31663c380d0626deaf33061eccd35c6def09f3f31243736eed44bf831f1e60fb5a1f06ae6baa SHA512 80cfa3aa2353cab77032111da3527660c9458d3bab74f73dde7030744f0ea3318f53c614e325bf4b971e1307f7dbecd9f645f4f4ba6e902820df5e56f02740f6
 DIST wanderlust-2.14.0-20050405.patch.gz 3926 BLAKE2B 0986f743e512cc7216554585c1c62af659fe35873bfcdfdb520e4085ec2606360ae1a29566ac756ad0e7f03cc51d1e5c0bd7460c8448ceb6251004d887858885 SHA512 103e8eda374eab453363f3a735d877e313ff341e09abd66093bd090b404738d42d98edf5d1c9c8e8966963bf972d462aebc28ea6e470126af9266188247c4044
 DIST wanderlust-2.15.9_p20130619.tar.xz 818124 BLAKE2B b6bbd6f63d862f81a5a0c194f0fe1b276303f75f8ffde29c844f1f7d2d8ef55f1c211ac1d0b6c3357c2507b2abe73ba1c4c8f5fc65e067d93eb6bf23fd8490a6 SHA512 91bdcc1b29370b7be7a2072f4d8c638b3c0604ba31b5419952b848af268e73a3f199f07a88caabec56f66b38013e0f9cd7c1de26b46d1062ddff782e8080d4e0
 DIST wl-2.14.0.tar.gz 1101505 BLAKE2B 5ceb3a8e294b230d48d50134e3dc07b9e19a9470907a488a2e41e53da54a8826a50cb53c06c5f3f1a5bdd1b5760bc6acd6cc75a25e63d092f1a9b80b3f073ed5 SHA512 edb49c0c9ddbd50cba4ce4cdd1b2d609cee9553d063aeb4775d0b43e0ed83cc6374aa47b11b3ff94a55827f7a9a29f7c1054e0fd9b3a5a25a2c410b241d268d2
 EBUILD wanderlust-2.14.0-r6.ebuild 1424 BLAKE2B 0219b71a6101f9e0c1de504fbcd90e1abde1f16349307b0c55c2010e8461f8a42f9f05c162c91dd0161d45d7dd17223e81cbdad3e9ef383ca225e47da6d19602 SHA512 6bf2c20f0aea275049dbb05d49b441c5a6214a8f81d9a47ea2891e150d1a70a51700c1b9189392d6aa55dd64acab4cdf9607d574094b5ab49139f12655131c24
-EBUILD wanderlust-2.15.9_p20130619.ebuild 1291 BLAKE2B 106e6e86713dd6577613e43e9c92610229e6f369564f38e130dbe001afd536f1eb037e6befd8ac68b57d7bcd395df5b06c9efff5501f0f2d601b1f51eaac0c5f SHA512 99dda215ebb42ab815073df27e7f0717e22eff119aa694425aaaaa26ed6a33ff0588412b10d2b0296f3349140e6008e40ec4f49fd5cb2919fbe39d2138468642
+EBUILD wanderlust-2.15.9_p20130619.ebuild 1341 BLAKE2B d24c529f032eff7536c0a6593ef1a8296b0d98c690884c989e2fc008ebdb0a2aad1dacc4b6d56977b9c5fc85cce15d03b20ad4d544a170838ff95123e4e74c28 SHA512 585137298c2e4c2a5788cffca6a99911cf1411e36358bd183e7b67f26025bbd34e627cee6001025281377de960dd2b51c3d4094e3cb5063c412d83f5bade2035
 MISC metadata.xml 555 BLAKE2B d79b7e7d4593193186111d653cb9f6943c0ca0a3b7b6482a1b35693727c6417ebae905b0e0d6b30912d06dfc40d22aa176b9af703cde70d0b0ee9828a1d36bf1 SHA512 338caf1728fadcca31f3c3b4d61c53150e6f3e040e0736d33a4246529ebf6ba20d1ca92dc9e04f931f619f0d1c5aa317c2c533cf1aaa0f113965cca2aa8a6c36
diff --git a/app-emacs/wanderlust/files/wanderlust-2.15.9_p20130619-default-truncate-lines.patch b/app-emacs/wanderlust/files/wanderlust-2.15.9_p20130619-default-truncate-lines.patch
new file mode 100644
index 000000000000..d6da446cc84a
--- /dev/null
+++ b/app-emacs/wanderlust/files/wanderlust-2.15.9_p20130619-default-truncate-lines.patch
@@ -0,0 +1,17 @@
+--- a/wl/wl-vars.el.orig	2018-07-27 21:05:15.768467090 -0500
++++ b/wl/wl-vars.el	2018-07-27 21:05:45.590468576 -0500
+@@ -1742,12 +1742,12 @@
+   :group 'wl-pref
+   :type 'string)
+ 
+-(defcustom wl-message-truncate-lines default-truncate-lines
++(defcustom wl-message-truncate-lines nil
+   "*Truncate lines in Message Buffer."
+   :type 'boolean
+   :group 'wl-pref)
+ 
+-(defcustom wl-draft-truncate-lines default-truncate-lines
++(defcustom wl-draft-truncate-lines nil
+   "*Truncate lines in Draft Buffer."
+   :type 'boolean
+   :group 'wl-draft
diff --git a/app-emacs/wanderlust/wanderlust-2.15.9_p20130619.ebuild b/app-emacs/wanderlust/wanderlust-2.15.9_p20130619.ebuild
index 2f035471caad..51d5a4750a4c 100644
--- a/app-emacs/wanderlust/wanderlust-2.15.9_p20130619.ebuild
+++ b/app-emacs/wanderlust/wanderlust-2.15.9_p20130619.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit elisp
 
@@ -22,6 +22,7 @@ DEPEND=">=app-emacs/apel-10.6
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}"
+ELISP_PATCHES="${P}-default-truncate-lines.patch"
 SITEFILE="50${PN}-gentoo.el"
 
 src_configure() {
diff --git a/app-emacs/with-editor/Manifest b/app-emacs/with-editor/Manifest
index c4e531fa792a..c223f4e45d48 100644
--- a/app-emacs/with-editor/Manifest
+++ b/app-emacs/with-editor/Manifest
@@ -2,7 +2,9 @@ AUX 50with-editor-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c6723772
 DIST with-editor-2.6.0.tar.gz 28124 BLAKE2B b727fc645cba8c85e0ff688ffbb7fd165feeb3e2fe5033475d9f9b333435cdbb4bc6e0c05f862021c1cd32dcdf1c813a0d3a8fb6221a757c7cf4ee4853d40272 SHA512 454af6222f54b6695aedb085b6f9a4e60d4ebd9dd6047d67cba13087d3966670aa63358dff45633f3492152f6a15c4c1e92efbaaa787867fef9edcf8b14f690c
 DIST with-editor-2.7.2.tar.gz 30121 BLAKE2B a610348a3a2b26059bf58b4b26fdb4e2edddcf70604db7c9d69d2050f4ed1ac745cf94638656339a915ac11a2abe0e8eee5fcb73c768747a8d14078931106332 SHA512 9d412928ce5234d3541d717b5b800312c82495f937088cb8308ff64ab92d2639ce078cdc8eb86d34b775a0e6567409249d58d94eb61183b82b5c19e2465905a7
 DIST with-editor-2.7.3.tar.gz 30133 BLAKE2B af4455f06f5aa867fa7b57222b62a060dd325bea8ef4b408177666914cb97a4f614f13daaf281fe9ca65b90e94dbda33fcb845e822e025ed8b415c4d0d01d3a9 SHA512 1c613e49bfe4a9812e69ec62d6518b29e59bfde84c83097323dfa3274da7fe4ff6431c0ebcbbc889c2237bc535d7cdb2ab7ab1dd171b26e553f03dcf71efd09c
+DIST with-editor-2.7.4.tar.gz 30159 BLAKE2B 2e1e84dd1e4bd0c4f5c0e0bb8730e8c4327e58ae38ee445c4f7f365279f7b8293639be675e735e82fea15c0fa93ff7b02c18d0fdb81889d6b44459d40f7322ae SHA512 d35409bc761e5ee797ca758878365a11695e0e8558275e8dd8eb2b22c92b7ea92024a56c1adbab47d4b5e0cc49a2e6adf5e8d1f7fd3e784774dab39bdbf1d93c
 EBUILD with-editor-2.6.0.ebuild 648 BLAKE2B 04711d6eb908747d7f6d6043f4460b20e4d9f0aabe88c416cb1dc384f68c6109ea8f623c49780c31e5da572b79905ee206d3152158239f7fb02393fa058733a8 SHA512 39ead2bcf75c013d858a46192058c928bc20bd35de52cd8b572138df7506145091220d4c637867418b1a3c211acc1dfbd655fec0f0001b459e2689b4f8de9e1f
 EBUILD with-editor-2.7.2.ebuild 648 BLAKE2B 04711d6eb908747d7f6d6043f4460b20e4d9f0aabe88c416cb1dc384f68c6109ea8f623c49780c31e5da572b79905ee206d3152158239f7fb02393fa058733a8 SHA512 39ead2bcf75c013d858a46192058c928bc20bd35de52cd8b572138df7506145091220d4c637867418b1a3c211acc1dfbd655fec0f0001b459e2689b4f8de9e1f
-EBUILD with-editor-2.7.3.ebuild 650 BLAKE2B ee112b0810c2887cff5b32f8d908e554418047ae5e1a849e22f52c7c86cd4c91df74ace9abf52e0aabe1940fac4646a2329fc6575953ba3a5e6706f739c5880f SHA512 71ea9ef54e63f64f229e64119475368156b8858f1ab20d9af1755bb61ceae632075af6287ad42546f0b9eb441fdd8d1ede739d0fc9129d4c022892f947b39613
+EBUILD with-editor-2.7.3.ebuild 655 BLAKE2B 8d0d6629289795be8f4fabe9880f6971c9ec98a0c6d1f5a11456b5690cf8fc1669bc4df119231dc75edb57de73e8045cc02b4313319b748e7890198b3657c3da SHA512 4d2f41a2971798dcd96e9742e0fcd9c3221bf61a2906c0000426bd84d64166ea4d72dbce98157cb2e335e914d408f73dac825dce3bbc91c3ae6cdd373b6ebdf5
+EBUILD with-editor-2.7.4.ebuild 655 BLAKE2B 8d0d6629289795be8f4fabe9880f6971c9ec98a0c6d1f5a11456b5690cf8fc1669bc4df119231dc75edb57de73e8045cc02b4313319b748e7890198b3657c3da SHA512 4d2f41a2971798dcd96e9742e0fcd9c3221bf61a2906c0000426bd84d64166ea4d72dbce98157cb2e335e914d408f73dac825dce3bbc91c3ae6cdd373b6ebdf5
 MISC metadata.xml 707 BLAKE2B 7f4c983cfd2f8b87a3708301ccc570a0d88b3d9b21b3e089e44dc5b22f8313826d2469efabe7ff4dc2b27262f93dc4b5e8fe0e68b2b3b7a6f79fa6f34283eeab SHA512 bce73ef41113175585cc46d00fc1306537c71f860b1f2d699c086f2b1042d26fb02e9770122c586594ab9012eeea0fa73438a2fb9a9cf3b2c077481eef13a5b6
diff --git a/app-emacs/with-editor/with-editor-2.7.3.ebuild b/app-emacs/with-editor/with-editor-2.7.3.ebuild
index e967a12c4df8..3bfe3dca845d 100644
--- a/app-emacs/with-editor/with-editor-2.7.3.ebuild
+++ b/app-emacs/with-editor/with-editor-2.7.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/magit/with-editor/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 
 SITEFILE="50${PN}-gentoo.el"
 ELISP_TEXINFO="*.texi"
diff --git a/app-emacs/with-editor/with-editor-2.7.4.ebuild b/app-emacs/with-editor/with-editor-2.7.4.ebuild
new file mode 100644
index 000000000000..3bfe3dca845d
--- /dev/null
+++ b/app-emacs/with-editor/with-editor-2.7.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="Use the Emacsclient as the \$EDITOR of child processes"
+HOMEPAGE="https://magit.vc/manual/with-editor"
+SRC_URI="https://github.com/magit/with-editor/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="*.texi"
+DOCS="README.md with-editor.org"
+
+DEPEND=""
+# Versions of magit before 2.5.0 bundled with-editor
+RDEPEND="!!<app-emacs/magit-2.5.0 ${DEPEND}"
+DEPEND="${DEPEND} sys-apps/texinfo"
diff --git a/app-emacs/yatex/Manifest b/app-emacs/yatex/Manifest
index 86ce28f2c5f9..57b1bac95bee 100644
--- a/app-emacs/yatex/Manifest
+++ b/app-emacs/yatex/Manifest
@@ -1,9 +1,10 @@
 AUX 50yatex-gentoo.el 488 BLAKE2B fcc7c76ee0ace31938ac6e7f438832d53542d2cdd0109ddf9ba59c8cdfe535f1bb5f2d2bf5edeb7247cc8903424f3eb5d4eeac56fe01f2d4665c85936a4736bd SHA512 93a1d45bb228d1ac304fd3652246561a5b7a9d91aa230f0f0d62a9e557f9f61a1dafee900139b7588f3310fdb98fbd71d6347ee45b6527ae27e2095da2a652b5
-AUX yatex-1.76-direntry.patch 1730 BLAKE2B e705e6f7b6a0bc7206aafe33af43f239be54b4203dc3e55e7f8221b3509f474c978165c62f8876633b7052247592ce4584beccce93cfe95b046cdedc48e527b5 SHA512 e7ddb8270e5ece483a5a796b7c5b712059b3093ec1994565400afa6731efe76494cb86163632edde3b3bd167cf78886c216482ab4377c9fd8a969b37a41aee6e
-AUX yatex-1.76-gentoo.patch 668 BLAKE2B 8ddfcc0d7f189462777ddd30ad77e4053230f701fc94448ad6ea0bc0096ba02c911e057b071278eb5c4e3b61151d16e247b4fd38c66b7314a2df82c342a00443 SHA512 dc1bd4d95cec7eb9268560ba78c93a1551f28e0da83d9beb99313e034dfd86044f2971a2dc0ae830e975e78d0a79b951d02378c677eb4d39d5e7f6885e6377cd
-AUX yatex-1.77-texinfo-5.patch 2968 BLAKE2B 834f913dfef0d56e12fe163cdee501fc681b6f33beef5f5757598a9c5703c36619ffaa13ad811dc29a36b5fbcb9c7fd2e797ce8ee07bfa2bd2ddf1df65c2242e SHA512 91b2caf1adcd805fa10d9c0b2576a83fb57f549d64e9ee37b6873cd705ebaecf96853efb265b3f7e42f821f37c79b469ca8507fd1d3470190e04594788b7d8ad
-DIST yatex1.76.tar.gz 357552 BLAKE2B c829cf73d38fd0ea12bd9b831059fabae2d8cf6d7f111762a409770910aefc6f0617979e38ef0fb5c489d92c38c83832cf74e075f68a190c794aa15b5f0a696b SHA512 ff2afea1cb1b7e4bef223c13d4cc6b942b1d555959321e7cb97595dfe7ca3adbc9efa6db7d7d13cdd0bb5aa62eabc1d3383d07635b1dbbe5b15175bf99c4c416
+AUX yatex-1.76-direntry.patch 1646 BLAKE2B 7b13a22accecada28782abac230b7e20aec5aa1e920d98cf9fd68e776a1527181ebe8d99a8d4eecf1415d30336b7021edd2e9cbc1934d7022a3251095dd74702 SHA512 4415c8ebc8e3bfb7f15ac842e05743d7689def9365fae75a466b05daa7356f51625348e1b68f4eb6ff0144eec12feecb0054562aa91414ba6a5ad544999ec42e
+AUX yatex-1.76-gentoo.patch 575 BLAKE2B ac5293869e9624e0f1e53787af07729dbc39191af465103a157c750becc33c7a4ce77605cd24ca2b1564eebc67cbc742544b4fa4b9697d245a0a8064246e13aa SHA512 79362e03f2b4fba1df96d9468bd3fad5fe98d36a8faaa4a4d74ae0eb4401081fd843e8de952498e0d3fd3ed53b0f434ca39f978baa246b24a1c375d82754b6e4
+AUX yatex-1.77-texinfo-5.patch 2884 BLAKE2B 89dc66fdc301ab4a205b8043741a8ac70db603666643515bfdceb93a5fe9ab323ee0e22f42d6521e2787af1be2619e098c43ea4891b32298943cf5308e426ba9 SHA512 e67405720765de50c012363fe77b61614927f6c13b4158cb08e7011fbbd74956eea271394f7bca1bd88419f1d3a52512e3946d466eb6f18b51bf94cd5e55a57b
+AUX yatex-1.80-texinfo-5.patch 8187 BLAKE2B 9039ff22af04b4f7bb7d7538eb73977aed30c14ad5329698691c30222b07c0cf2e531e85037bec790178c4003934ee082978ae37e7959bd5a76842659b1299b9 SHA512 856b16be069c6a77535b1800303b48467366d4765afa1d66ed5ccfc78c031b899ea027de8a95bb4687f19c06f9edb98d3e520e68adf2e93ca68acba96b62fbf8
 DIST yatex1.77.tar.gz 356721 BLAKE2B f923bc80ec32ee3d1654f15a99624251604c94af60738ad2f56b237d4385da0951bec32b32f297662540667da2648789a380b433332ce7e10f50f1d016c3b6d0 SHA512 d6b909b540b0966cfcd35a36ad7c9e8d8a821ca668ea9b0a4d1f3267a45397800769dd47ce64f5f8cbda65c274a7f415c8e86b6598a365ea41104684cf9df07f
-EBUILD yatex-1.76.ebuild 1213 BLAKE2B 4e707f3c0c9b17209ebc2546044de5b3ec7266d94227f4e5c06bc5fe1f5a00094af364f7133cb06228498b8cb9d3ba3bf1337c1c3a3e3865b46545e673fdf72b SHA512 bfbcf7cf87bb592e8ed9cdb0c17cc2bdaf31246412e145913e993553b1f7ba69fd24625e0941699abec2b5fdb4111cf548641a900f0d24d934df7ad460c14a86
-EBUILD yatex-1.77.ebuild 1241 BLAKE2B 005fadf3bba18e44aa6483f149ab29c5c643a94168f1a575ec5eed48e5dc948c36c8761317ad723cf367051577fe6bf1a58ac512973e5b1b13ca444a8d3d4fe2 SHA512 f935dd5ca28fb1c1eb6ed7eb4828ee08e2b17ed2c73c84986762f9befeab712f7b186c522a8400c4948899b258080230d802722c6934582eb85952d351d4fdac
-MISC metadata.xml 775 BLAKE2B 1bbb59c7ea19bb7527aa04a2c4f85310ba955a05cb3a03081c76ab3802fe6756bcdc209b45194c29caf3bc0ab429687e3e262e1a120f57d1ede05b01a8580ab2 SHA512 51bcb805b7e9f0669d6c8b213061bd948662a89545921375bd4caf4dae84b2e68332b220992c00b70dae3a1de1cf3605f546295195b01b5366b730adea2196bf
+DIST yatex1.80.tar.gz 376944 BLAKE2B 355726fb3b38bfbc314647739d4af6e588848b5ade208fe1e026106a7cc2c220edcf10214f37ee7c9cc461ecb3e776c3969e329d5a331b3d8ce9f669f2361e26 SHA512 6548d1ac95ce95198468698d9b91449736e4be8af15d29352c00f7604fd7b34b2c606afb2d90d1115fd64dc859efdd9c993a6b3733f9321ca7671615977b4bd5
+EBUILD yatex-1.77.ebuild 1190 BLAKE2B 35dd69440203527beeb44ca225d06d0de1bad4b443627fed20b46389ace71992a1b498b2e57147e34bfba7a9e802e3468db11c7517de99c238ad1d85263ee60e SHA512 e9870ed7919d48d71b42e0b77621273c9c3af5d89e59f371beca8962b0190f0495804333e051f1745b12d11e732fa492fdf9ee7835233d447bd11dc6bd3d39c4
+EBUILD yatex-1.80.ebuild 1188 BLAKE2B 37ec4e8ff680962b233156a5ee8d3af623eeae5be35ecfb105f2f4be3848a83a4ad7a6ffef3ed2291dfa84f68572b3584c5ef9db2532f99de5dc863fd8f032ba SHA512 d4f83a73c04be1d56a46e433daf9f69cbc43288b4376e63b067b12bdc7162d2d6e09de79dcf1182bded4692519d6e55b26a8bcb588b677dc80ecd93bb14daead
+MISC metadata.xml 782 BLAKE2B d0c36397f1e8e6a2b12038086db26f4a617cce607962833a40381357159404e33841d4cd011355db4f927d81c723d57b8243cf9e1141cdc8d94b8880a5a73392 SHA512 427d7a218d2355e7a35b5371be149bb1e3c0168c9ab46f4c6e22c92f9d28c3ae430c6b476bda66150755608d7d28c46c80744aa7c5a1b6bf24c15a9aa0a908bc
diff --git a/app-emacs/yatex/files/yatex-1.76-direntry.patch b/app-emacs/yatex/files/yatex-1.76-direntry.patch
index 8dc0c5f310f7..d792a0710961 100644
--- a/app-emacs/yatex/files/yatex-1.76-direntry.patch
+++ b/app-emacs/yatex/files/yatex-1.76-direntry.patch
@@ -1,5 +1,5 @@
---- yatex1.76-orig/docs/yahtmle.tex
-+++ yatex1.76/docs/yahtmle.tex
+--- a/docs/yahtmle.tex
++++ b/docs/yahtmle.tex
 @@ -1,9 +1,10 @@
  \def\lang{eng} % -*- texinfo -*- for Texinfo V.3.1 
  \input texinfo
@@ -13,8 +13,8 @@
  @end direntry
  
  @iftex
---- yatex1.76-orig/docs/yahtmlj.tex
-+++ yatex1.76/docs/yahtmlj.tex
+--- a/docs/yahtmlj.tex
++++ b/docs/yahtmlj.tex
 @@ -1,9 +1,10 @@
  \def\lang{jp} % -*- texinfo -*- for Texinfo V.3.1 
  \input texinfo
@@ -28,8 +28,8 @@
  @end direntry
  
  @iftex
---- yatex1.76-orig/docs/yatexe.tex
-+++ yatex1.76/docs/yatexe.tex
+--- a/docs/yatexe.tex
++++ b/docs/yatexe.tex
 @@ -1,9 +1,10 @@
  \def\lang{jp} % -*- texinfo -*-
  \input texinfo.tex
@@ -43,8 +43,8 @@
  @end direntry
  
  @iftex
---- yatex1.76-orig/docs/yatexj.tex
-+++ yatex1.76/docs/yatexj.tex
+--- a/docs/yatexj.tex
++++ b/docs/yatexj.tex
 @@ -1,9 +1,10 @@
  \def\lang{jp} % -*- texinfo -*- for Texinfo V.3.1 
  \input texinfo
diff --git a/app-emacs/yatex/files/yatex-1.76-gentoo.patch b/app-emacs/yatex/files/yatex-1.76-gentoo.patch
index b961b31798e1..ed2b52aeaa19 100644
--- a/app-emacs/yatex/files/yatex-1.76-gentoo.patch
+++ b/app-emacs/yatex/files/yatex-1.76-gentoo.patch
@@ -1,5 +1,5 @@
---- yatex1.73-orig/yatexhlp.el	2006-12-24 07:25:29.000000000 +0100
-+++ yatex1.73/yatexhlp.el	2008-05-12 12:19:02.000000000 +0200
+--- a/yatexhlp.el
++++ b/yatexhlp.el
 @@ -9,12 +9,7 @@
  			 (cond (YaTeX-japan "jp")
  			       (t "eng"))))
diff --git a/app-emacs/yatex/files/yatex-1.77-texinfo-5.patch b/app-emacs/yatex/files/yatex-1.77-texinfo-5.patch
index 73ff873cce34..d2e2fe1d5694 100644
--- a/app-emacs/yatex/files/yatex-1.77-texinfo-5.patch
+++ b/app-emacs/yatex/files/yatex-1.77-texinfo-5.patch
@@ -1,21 +1,21 @@
---- yatex1.77-orig/docs/yahtmle.tex
-+++ yatex1.77/docs/yahtmle.tex
+--- a/docs/yahtmle.tex
++++ b/docs/yahtmle.tex
 @@ -1,4 +1,4 @@
 -\def\lang{eng} % -*- texinfo -*- for Texinfo V.3.1 
 +@c \def\lang{eng} % -*- texinfo -*- for Texinfo V.3.1 
  \input texinfo
  @setfilename yahtml.info
  @settitle Yet Another html-mode for Emacs
---- yatex1.77-orig/docs/yahtmlj.tex
-+++ yatex1.77/docs/yahtmlj.tex
+--- a/docs/yahtmlj.tex
++++ b/docs/yahtmlj.tex
 @@ -1,4 +1,4 @@
 -\def\lang{jp} % -*- texinfo -*- for Texinfo V.3.1 
 +@c \def\lang{jp} % -*- texinfo -*- for Texinfo V.3.1 
  \input texinfo
  @setfilename yahtml-ja.info
  @settitle Yet Another html-mode for Emacs
---- yatex1.77-orig/docs/yatexe.tex
-+++ yatex1.77/docs/yatexe.tex
+--- a/docs/yatexe.tex
++++ b/docs/yatexe.tex
 @@ -1,4 +1,4 @@
 -\def\lang{jp} % -*- texinfo -*-
 +@c \def\lang{jp} % -*- texinfo -*-
@@ -76,8 +76,8 @@
    Check the current completion type is specified one and cause error if
  not. The variable @code{YaTeX-current-completion-type} holds the symbol
  according to the current completion type.
---- yatex1.77-orig/docs/yatexj.tex
-+++ yatex1.77/docs/yatexj.tex
+--- a/docs/yatexj.tex
++++ b/docs/yatexj.tex
 @@ -1,4 +1,4 @@
 -\def\lang{jp} % -*- texinfo -*- for Texinfo V.3.1 
 +@c \def\lang{jp} % -*- texinfo -*- for Texinfo V.3.1 
diff --git a/app-emacs/yatex/files/yatex-1.80-texinfo-5.patch b/app-emacs/yatex/files/yatex-1.80-texinfo-5.patch
new file mode 100644
index 000000000000..49e55b608f1d
--- /dev/null
+++ b/app-emacs/yatex/files/yatex-1.80-texinfo-5.patch
@@ -0,0 +1,247 @@
+--- a/docs/yahtmle.tex
++++ b/docs/yahtmle.tex
+@@ -1,4 +1,4 @@
+-\def\lang{eng} % -*- texinfo -*- for Texinfo V.3.1 
++@c \def\lang{eng} % -*- texinfo -*- for Texinfo V.3.1 
+ \input texinfo
+ @setfilename yahtmle
+ @settitle Yet Another html-mode for Emacs
+@@ -14,10 +14,9 @@
+ 
+ @titlepage
+ @sp 10
+-@center
+ @subtitle Yet Another html-mode for emacs
+ @title // yahtml //
+-%@subtitle // yahtml //
++@c @subtitle // yahtml //
+ @author @copyright{} 1994-2012 by    HIROSE, Yuuji [yuuji@@yatex.org]
+ @end titlepage
+ 
+--- a/docs/yahtmlj.tex
++++ b/docs/yahtmlj.tex
+@@ -1,4 +1,4 @@
+-\def\lang{jp} % -*- texinfo -*- for Texinfo V.3.1 
++@c \def\lang{jp} % -*- texinfo -*- for Texinfo V.3.1 
+ \input texinfo
+ @setfilename yahtmlj
+ @settitle Yet Another html-mode for Emacs
+@@ -14,7 +14,6 @@
+ 
+ @titlepage
+ @sp 10
+-@center
+ @subtitle Yet Another html-mode for emacs
+ @title 『HTML屋』
+ @subtitle // yahtml //
+--- a/docs/yatexe.tex
++++ b/docs/yatexe.tex
+@@ -1,4 +1,4 @@
+-\def\lang{jp} % -*- texinfo -*-
++@c \def\lang{jp} % -*- texinfo -*-
+ \input texinfo.tex
+ @setfilename yatexe
+ @settitle Yet Another tex-mode for Emacs
+@@ -14,7 +14,6 @@
+ 
+ @titlepage
+ @sp 10
+-@center
+ @subtitle Yet Another tex-mode for emacs
+ @title Wild Bird
+ @subtitle // YaTeX //
+@@ -713,7 +712,7 @@
+ @item M-x YaTeX-section-overview
+         @dots{} Generate *Sectioning Lines* buffer
+ @end table
+-@cindex{Generate the listing of sectioning units}
++@cindex Generate the listing of sectioning units
+ from the LaTeX source buffer.  In this listing buffer, typing @kbd{u} on
+ the sectioning command shifts up the corresponding sectioning command in
+ source text and @kbd{d} shifts down.  After marking lines in the listing
+@@ -1133,7 +1132,7 @@
+ @node Invoking image processor, Jump to main file, Jump to corresponding object, Cursor jump
+ @comment  node-name,  next,  previous,  up
+ @section Invoking image processor
+-@cindex{Drawing tool invocation}
++@cindex Drawing tool invocation
+ 
+ `image-including line' described above means such lines as
+ @code{\epsfile@{file=foo.ps@}}.  If you type @kbd{[prefix] g} on that
+@@ -1756,44 +1755,44 @@
+ @end defvar
+ 
+ @defvar YaTeX-cmd-gimp
+-Command name of GIMP (code{"gimp"})
++Command name of GIMP (@code{"gimp"})
+ @end defvar
+ @defvar YaTeX-cmd-tgif
+-Command name of tgif (code{"tgif"})
++Command name of tgif (@code{"tgif"})
+ @end defvar
+ @defvar YaTeX-cmd-inkscape
+-Command name of Inkscape (code{"inkscape"})
++Command name of Inkscape (@code{"inkscape"})
+ @end defvar
+ @defvar YaTeX-cmd-dia
+-Command name of Dia (code{"dia"})
++Command name of Dia (@code{"dia"})
+ @end defvar
+ @defvar YaTeX-cmd-ooo
+-Command name of OpenOffice.org/LibreOffice (code{"soffice"})
++Command name of OpenOffice.org/LibreOffice (@code{"soffice"})
+ @end defvar
+ @defvar YaTeX-cmd-gs
+-Command name of Ghostscript (code{"gs"})
++Command name of Ghostscript (@code{"gs"})
+ @end defvar
+ @defvar YaTeX-cmd-dvips
+-Command name of dvips (code{"dvips"})
++Command name of dvips (@code{"dvips"})
+ @end defvar
+ @defvar YaTeX-cmd-displayline
+ Command name of displayline
+-(code{"/Applications/Skim.app/Contents/SharedSupport/displayline"})
++(@code{"/Applications/Skim.app/Contents/SharedSupport/displayline"})
+ @end defvar
+ @defvar YaTeX-cmd-edit-ps
+-Command name for editing PostScript files(Value of code{"YaTeX-cmd-gimp"})
++Command name for editing PostScript files(Value of @code{"YaTeX-cmd-gimp"})
+ @end defvar
+ @defvar YaTeX-cmd-edit-pdf
+-Command name for editing PDF files(Value of code{"YaTeX-cmd-ooo"})
++Command name for editing PDF files(Value of @code{"YaTeX-cmd-ooo"})
+ @end defvar
+ @defvar YaTeX-cmd-edit-ai
+-Command name for editing `.ai' files(Value of code{"YaTeX-cmd-inkscape"})
++Command name for editing `.ai' files(Value of @code{"YaTeX-cmd-inkscape"})
+ @end defvar
+ @defvar YaTeX-cmd-edit-svg
+-Command name for editing SVG files(Value of code{"YaTeX-cmd-inkscape"})
++Command name for editing SVG files(Value of @code{"YaTeX-cmd-inkscape"})
+ @end defvar
+ @defvar YaTeX-cmd-edit-images
+-Command name for editing image files(Value of code{"YaTeX-cmd-gimp"})
++Command name for editing image files(Value of @code{"YaTeX-cmd-gimp"})
+ @end defvar
+ 
+ @defvar YaTeX-need-nonstop
+@@ -2289,9 +2288,9 @@
+ @table @kbd
+ @item [F]
+ YaTeX:read-position
+-@itemx [A]
++@item [A]
+ Character list which can show up in the brackets
+-@itemx [D]
++@item [D]
+    Return the location specifier such as `[htb]'.  When
+ nothing is entered, omit [] itself.  If the possible characters
+ are "htbp", call this function as
+@@ -2299,9 +2298,9 @@
+ 
+ @item [F]
+ YaTeX:read-coordinates
+-@itemx [A]
++@item [A]
+ Base prompt, X-axis prompt, Y-axis prompt     (each optional)        
+-@itemx [D]
++@item [D]
+   Read the coordinates with the prompt ``BasePrompt X-axisPrompt:'' for
+ X-axis, ``BasePrompt Y-axisPrompt:'' for Y-axis, and return it in the form 
+ of ``(X,Y)''.  The default prompts are @code{Dimension}, @code{X},
+@@ -2309,9 +2308,9 @@
+ 
+ @item [F]
+ YaTeX:check-completion-type
+-@itemx [A]
++@item [A]
+ One of the symbols: 'begin, 'section, or 'maketitle
+-@itemx [D]
++@item [D]
+   Check the current completion type is specified one and cause error if
+ not. The variable @code{YaTeX-current-completion-type} holds the symbol
+ according to the current completion type.
+--- a/docs/yatexj.tex
++++ b/docs/yatexj.tex
+@@ -1,4 +1,4 @@
+-\def\lang{jp} % -*- texinfo -*- for Texinfo V.3.1 
++@c \def\lang{jp} % -*- texinfo -*- for Texinfo V.3.1 
+ \input texinfo
+ @setfilename yatexj
+ @settitle Yet Another tex-mode for Emacs
+@@ -19,7 +19,6 @@
+ 
+ @titlepage
+ @sp 10
+-@center
+ @subtitle Yet Another tex-mode for emacs
+ @title 『野鳥』
+ @subtitle // YaTeX //
+@@ -1146,7 +1145,7 @@
+ @section 括弧入力補助
+ @cindex 括弧入力補助[かつこにゆうりよくほしよ]
+ 
+-  3種類ある括弧 () {} [] の開き括弧を入れたときに閉じ括弧を自動的に入れます。
++  3種類ある括弧 () @{@} [] の開き括弧を入れたときに閉じ括弧を自動的に入れます。
+ @code{\} の直後にの @code{[} を入れると行を分けてインデントを揃え、
+ 数式入力に備えます。その他 La@TeX{} のマクロに応じて括弧の釣合の取れた
+ 状態に導きます。開き括弧そのものを1つだけ入れたいときは @kbd{C-q} で
+@@ -1965,44 +1964,44 @@
+ @end defvar
+ 
+ @defvar YaTeX-cmd-gimp
+-GIMPを起動するコマンド (code{"gimp"})
++GIMPを起動するコマンド (@code{"gimp"})
+ @end defvar
+ @defvar YaTeX-cmd-tgif
+-tgifを起動するコマンド (code{"tgif"})
++tgifを起動するコマンド (@code{"tgif"})
+ @end defvar
+ @defvar YaTeX-cmd-inkscape
+-Inkscapeを起動するコマンド (code{"inkscape"})
++Inkscapeを起動するコマンド (@code{"inkscape"})
+ @end defvar
+ @defvar YaTeX-cmd-dia
+-Diaを起動するコマンド (code{"dia"})
++Diaを起動するコマンド (@code{"dia"})
+ @end defvar
+ @defvar YaTeX-cmd-ooo
+-OpenOffice.orgまたはLibreOfficeを起動するコマンド (code{"soffice"})
++OpenOffice.orgまたはLibreOfficeを起動するコマンド (@code{"soffice"})
+ @end defvar
+ @defvar YaTeX-cmd-gs
+-Ghostscriptを起動するコマンド (code{"gs"})
++Ghostscriptを起動するコマンド (@code{"gs"})
+ @end defvar
+ @defvar YaTeX-cmd-dvips
+-dvipsを起動するコマンド(環境によってはpdvipsなど) (code{"dvips"})
++dvipsを起動するコマンド(環境によってはpdvipsなど) (@code{"dvips"})
+ @end defvar
+ @defvar YaTeX-cmd-displayline
+ displaylineを起動するコマンド
+-(code{"/Applications/Skim.app/Contents/SharedSupport/displayline"})
++(@code{"/Applications/Skim.app/Contents/SharedSupport/displayline"})
+ @end defvar
+ @defvar YaTeX-cmd-edit-ps
+-PostScriptファイルを編集するコマンド (変数code{"YaTeX-cmd-gimp"}の値)
++PostScriptファイルを編集するコマンド (変数@code{"YaTeX-cmd-gimp"}の値)
+ @end defvar
+ @defvar YaTeX-cmd-edit-pdf
+-PDFファイルを編集するコマンド (変数code{"YaTeX-cmd-ooo"}の値)
++PDFファイルを編集するコマンド (変数@code{"YaTeX-cmd-ooo"}の値)
+ @end defvar
+ @defvar YaTeX-cmd-edit-ai
+-.aiファイルを編集するコマンド (変数code{"YaTeX-cmd-inkscape"}の値)
++.aiファイルを編集するコマンド (変数@code{"YaTeX-cmd-inkscape"}の値)
+ @end defvar
+ @defvar YaTeX-cmd-edit-svg
+-SVGファイルを編集するコマンド (変数code{"YaTeX-cmd-inkscape"}の値)
++SVGファイルを編集するコマンド (変数@code{"YaTeX-cmd-inkscape"}の値)
+ @end defvar
+ @defvar YaTeX-cmd-edit-images
+-その他画像ファイルを編集するコマンド (変数code{"YaTeX-cmd-gimp"}の値)
++その他画像ファイルを編集するコマンド (変数@code{"YaTeX-cmd-gimp"}の値)
+ @end defvar
+ 
+ @defvar YaTeX-need-nonstop
diff --git a/app-emacs/yatex/metadata.xml b/app-emacs/yatex/metadata.xml
index d82c1ecb87c7..809a13113afc 100644
--- a/app-emacs/yatex/metadata.xml
+++ b/app-emacs/yatex/metadata.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>gnu-emacs@gentoo.org</email>
-  <name>Gentoo GNU Emacs project</name>
-</maintainer>
-<maintainer type="project">
-  <email>cjk@gentoo.org</email>
-  <name>Cjk</name>
-</maintainer>
-<longdescription lang="en">
-  YaTeX is an intelligent, acquisitive and integrated package which reduces
-  your efforts of composing LaTeX source on Emacs. And yahtml is the honest
-  and bright YaTeX-compatible major-mode package for writing HTML. If you have
-  noticed the power of YaTeX, you can drive yahtml over the HTML files quickly
-  and steadily. And vice versa, of course.
-</longdescription>
-<stabilize-allarches/>
+	<maintainer type="project">
+		<email>gnu-emacs@gentoo.org</email>
+		<name>Gentoo GNU Emacs project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<longdescription lang="en">
+		YaTeX is an intelligent, acquisitive and integrated package which reduces
+		your efforts of composing LaTeX source on Emacs. And yahtml is the honest
+		and bright YaTeX-compatible major-mode package for writing HTML. If you have
+		noticed the power of YaTeX, you can drive yahtml over the HTML files quickly
+		and steadily. And vice versa, of course.
+	</longdescription>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-emacs/yatex/yatex-1.76.ebuild b/app-emacs/yatex/yatex-1.76.ebuild
deleted file mode 100644
index 47cd7c4e7d43..000000000000
--- a/app-emacs/yatex/yatex-1.76.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit elisp eutils
-
-DESCRIPTION="Yet Another TeX mode for Emacs"
-HOMEPAGE="http://www.yatex.org/"
-SRC_URI="http://www.yatex.org/${P/-/}.tar.gz"
-
-KEYWORDS="amd64 ppc ~ppc64 x86"
-SLOT="0"
-LICENSE="YaTeX"
-IUSE="l10n_ja"
-
-S="${WORKDIR}/${P/-/}"
-ELISP_PATCHES="${PN}-1.76-gentoo.patch
-	${PN}-1.76-direntry.patch"
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	# byte-compilation fails (as of 1.74): yatexlib.el requires fonts
-	# that are only available under X
-
-	cd docs
-	makeinfo yatexe.tex yahtmle.tex || die
-
-	if use l10n_ja; then
-		iconv -f WINDOWS-31J -t UTF-8 yatexj.tex >yatex-ja.texi || die
-		iconv -f WINDOWS-31J -t UTF-8 yahtmlj.tex >yahtml-ja.texi || die
-		makeinfo yatex-ja.texi yahtml-ja.texi || die
-	fi
-}
-
-src_install() {
-	elisp-install ${PN} *.el || die
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-
-	insinto ${SITEETC}/${PN}
-	doins help/YATEXHLP.eng
-	doinfo docs/yatex.info* docs/yahtml.info*
-	dodoc docs/*.eng
-
-	if use l10n_ja; then
-		doins help/YATEXHLP.jp
-		doinfo docs/yatex-ja.info* docs/yahtml-ja.info*
-		dodoc 00readme install docs/{htmlqa,qanda} docs/*.doc
-	fi
-}
diff --git a/app-emacs/yatex/yatex-1.77.ebuild b/app-emacs/yatex/yatex-1.77.ebuild
index 7b7534cc7785..3909baa70f86 100644
--- a/app-emacs/yatex/yatex-1.77.ebuild
+++ b/app-emacs/yatex/yatex-1.77.ebuild
@@ -1,20 +1,21 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI="6"
 
-inherit elisp eutils
+inherit elisp
 
 DESCRIPTION="Yet Another TeX mode for Emacs"
 HOMEPAGE="http://www.yatex.org/"
-SRC_URI="http://www.yatex.org/${P/-/}.tar.gz"
+SRC_URI="http://www.${PN}.org/${P/-}.tar.gz"
 
 KEYWORDS="amd64 ppc ~ppc64 x86"
 SLOT="0"
 LICENSE="YaTeX"
 IUSE="l10n_ja"
 
-S="${WORKDIR}/${P/-/}"
+S="${WORKDIR}/${P/-}"
+
 ELISP_PATCHES="${PN}-1.76-gentoo.patch
 	${PN}-1.76-direntry.patch
 	${PN}-1.77-texinfo-5.patch"
@@ -25,27 +26,27 @@ src_compile() {
 	# that are only available under X
 
 	cd docs
-	makeinfo yatexe.tex yahtmle.tex || die
+	makeinfo {${PN},yahtml}e.tex || die
 
 	if use l10n_ja; then
-		iconv -f WINDOWS-31J -t UTF-8 yatexj.tex >yatex-ja.texi || die
-		iconv -f WINDOWS-31J -t UTF-8 yahtmlj.tex >yahtml-ja.texi || die
-		makeinfo yatex-ja.texi yahtml-ja.texi || die
+		iconv -f WINDOWS-31J -t UTF-8 ${PN}j.tex  > ${PN}-ja.texi  || die
+		iconv -f WINDOWS-31J -t UTF-8 yahtmlj.tex > yahtml-ja.texi || die
+		makeinfo {${PN},yahtml}-ja.texi || die
 	fi
 }
 
 src_install() {
-	elisp-install ${PN} *.el || die
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	elisp-install ${PN} *.el
+	elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 
 	insinto ${SITEETC}/${PN}
 	doins help/YATEXHLP.eng
-	doinfo docs/yatex.info* docs/yahtml.info*
+	doinfo docs/{${PN},yahtml}.info*
 	dodoc docs/*.eng
 
 	if use l10n_ja; then
 		doins help/YATEXHLP.jp
-		doinfo docs/yatex-ja.info* docs/yahtml-ja.info*
-		dodoc 00readme install docs/{htmlqa,qanda} docs/*.doc
+		doinfo docs/{${PN},yahtml}-ja.info*
+		dodoc 00readme install docs/{htmlqa,qanda,*.doc}
 	fi
 }
diff --git a/app-emacs/yatex/yatex-1.80.ebuild b/app-emacs/yatex/yatex-1.80.ebuild
new file mode 100644
index 000000000000..70503b9d1dff
--- /dev/null
+++ b/app-emacs/yatex/yatex-1.80.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit elisp
+
+DESCRIPTION="Yet Another TeX mode for Emacs"
+HOMEPAGE="http://www.yatex.org/"
+SRC_URI="http://www.${PN}.org/${P/-}.tar.gz"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+SLOT="0"
+LICENSE="BSD-2"
+IUSE="l10n_ja"
+
+S="${WORKDIR}/${P/-}"
+
+ELISP_PATCHES="${PN}-1.76-direntry.patch
+	${P}-texinfo-5.patch"
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	sed -i "/(help-dir/,/)))/c\      (help-dir \"${SITEETC}/${PN}\"))" ${PN}hlp.el
+
+	elisp_src_prepare
+}
+
+src_compile() {
+	cd docs
+	makeinfo {${PN},yahtml}e.tex || die
+
+	if use l10n_ja; then
+		iconv -f WINDOWS-31J -t UTF-8 ${PN}j.tex  > ${PN}-ja.texi  || die
+		iconv -f WINDOWS-31J -t UTF-8 yahtmlj.tex > yahtml-ja.texi || die
+		makeinfo {${PN},yahtml}-ja.texi || die
+	fi
+}
+
+src_install() {
+	elisp-install ${PN} *.el
+	elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+
+	insinto ${SITEETC}/${PN}
+	doins help/YATEXHLP.eng
+	doinfo docs/{${PN},yahtml}.info*
+	dodoc install docs/*.eng
+
+	if use l10n_ja; then
+		doins help/YATEXHLP.jp
+		doinfo docs/{${PN},yahtml}-ja.info*
+		dodoc 00readme ${PN}.new docs/{htmlqa,qanda,*.doc}
+	fi
+}