gentoo resync : 09.06.2018

37 files changed, 230 insertions, 190 deletions

diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index b40bafa874e6..8d0d6a08fbe4 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/autoconf-mode/Manifest b/app-emacs/autoconf-mode/Manifest
index 7afda73b57a4..5088fdf0262d 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 554 BLAKE2B fa3a4ede29844a297d7bef4685922073d32ca727574764d24d903ede381545b63c20633c567962ba3ccd682f9251c16461ab59ecdc3c239aa96351388ed2a553 SHA512 11f7a68fe829fb5a87b05f1a6c23d5f698aef3c7c302d5e74e73bf19d6242e73f128fbe2b3f3be45f31a8833931f02c7d85d88a557822d4574a89f435f87f8b1
+EBUILD autoconf-mode-2.69.ebuild 553 BLAKE2B 23eac6cc14d85b900c3aa3cd0dfada99e7b39d76d2d97a57bdd296c1026263b3820e26caf604899d90b095bae25ca6a08ee4280686743b98ae190989f81efe38 SHA512 82c68336825df0021f0452d9c071cefe932668c7c866761835dd876e4e6bb72e17f5ab0bdfb249681277cf18696addaf4d7eac4cf4fb5d0d37fa88128d639d4f
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/autoconf-mode/autoconf-mode-2.69.ebuild b/app-emacs/autoconf-mode/autoconf-mode-2.69.ebuild
index ba5dec445115..5ebadce64015 100644
--- a/app-emacs/autoconf-mode/autoconf-mode-2.69.ebuild
+++ b/app-emacs/autoconf-mode/autoconf-mode-2.69.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=4
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/autoconf/autoconf-${PV}.tar.xz"
 
 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"
+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"
diff --git a/app-emacs/dash/Manifest b/app-emacs/dash/Manifest
index 64c2acf233e0..4e2e6a71d938 100644
--- a/app-emacs/dash/Manifest
+++ b/app-emacs/dash/Manifest
@@ -1,4 +1,6 @@
 AUX 50dash-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
 DIST dash-2.13.0.tar.gz 146280 BLAKE2B e9552a19b1f84db0e16fba07fe5bcfc0eb8a6871aabf395fa7ca527b77ba23616fdaa29e67d73e6cf11260bd23807be17de1e52f4abd23b0f9562cb26e6a5feb SHA512 59969e3df1b258a1bae76904e5abaf64c5143de9b8994a04799dad3a317c6ccc1dcd19b99a337a23bce0e46cfb6bc90bf8c6b0e6a532946b4f0ec188d331b559
+DIST dash-2.14.1.tar.gz 141115 BLAKE2B 87fc7a02c66161d1c16debc54c6336f36cc47cf7c7c470d190424b9c463723058ef6f72cadf3f4d4215b36f369b9e5356101c4ea16fede10cefde90b5e0b384b SHA512 cfd4ed7a9eab881a0c3bd2744e78c5ef99a92db4d3afee8c632c0a766adcdbf1999f4e9770e2c4e941526d488dd6f9327937389490cc2310d79b38c5bf2ddd12
 EBUILD dash-2.13.0.ebuild 545 BLAKE2B 083977c9bcd22b3c3e86c7f1e78f54b40ea3483b5873bdda957b9ea290a8ead2807178e1b2948001e32bad26b855f24215d87ea2a5cfcae847d2625a9144b307 SHA512 0179b3c93d4fdf86889bc649599cd27684c037e07efda724069ea5618e41c1f8c52a63d680266b703f743c0c9e322cfaf354634822523dfeff56a55519257d57
+EBUILD dash-2.14.1.ebuild 547 BLAKE2B 5c2a534c0635c33eaec2d55e65292e7cd52509ea4a06156dc80f11fe8216f8a3b8d63bd273bac818cbf19d1f0b467a5c60c7e32bf7e69f5035a8310816c67889 SHA512 82efe262885da628b70bc2656b0dfad8f26d59084f026830a15af9b1b62906474d7f7e7618c77f785253e65cf6fc5eb80ed412a47b8927ae91fd3547fd0e70cb
 MISC metadata.xml 337 BLAKE2B 2097c9b128e3518750e976825d18c46da6ef5126299637288d0f1239ddbf37864420aae2d859bc6a199001b7693a235004a5bd35f47d770b60edc2a305e3dc2f SHA512 1f6a16c99a4b7d7129f82a855bc133e15c75190e6dc9c70971fd2588044dbb010101ff14c0cbb8504153ff4d1936260acd96d5b80eabf451462082bd6a6ca9e8
diff --git a/app-emacs/dash/dash-2.14.1.ebuild b/app-emacs/dash/dash-2.14.1.ebuild
new file mode 100644
index 000000000000..da2a16d87b0b
--- /dev/null
+++ b/app-emacs/dash/dash-2.14.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="A modern list library for Emacs"
+HOMEPAGE="https://github.com/magnars/dash.el"
+SRC_URI="https://github.com/magnars/dash.el/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="sys-apps/texinfo"
+
+S="${WORKDIR}/${PN}.el-${PV}"
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="dash.texi"
+DOCS="README.md"
+
+src_test() {
+	./run-tests.sh || die
+}
diff --git a/app-emacs/ebuild-mode/Manifest b/app-emacs/ebuild-mode/Manifest
index cad9ca62ebb8..28ed7f648ba2 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.42.tar.xz 34936 BLAKE2B dd94d17dc57e2d32b329ab62ec6eec8ada6a4aeddadb8d978736f5dcb4d613759fd860043cab92d12db11614f8b7fa71fc5537576a2af3f5e6c9d56fc2fdcc05 SHA512 119f954eaf009bd0c9f0a75810b94a54d65ed91c6ffef20dd164c7a5ef095410dd0f3642426817f5efa6623d4f3e120ed3b27076222b02a90e75a83bb80b8703
 DIST ebuild-mode-1.43.tar.xz 34688 BLAKE2B 577900e2fa7ccb2362ec7f9046affb58e92bdfde44f2ea48274ba61d65f35fa6a1852bda6d9c64bd3f63aba99df244b4cb3378de079259508b149cdacf7caf28 SHA512 91f9a06de6feeeadb27d765a6ca6f2fa17e01938a6c953efe3586646f1bf48da87fe269ee9b07b2e16199d3ba4a76f42b8be9143218b808fac2971fc6f64f36d
 EBUILD ebuild-mode-1.42.ebuild 732 BLAKE2B d80092df36e90cc356b7b0c3ae66405a08c5aab836f046ab9ddc268abb79766ed011ea390d0356f56555026af132d0b8d9be6f14c0eb82d3c09bd4835168e57f SHA512 fa0f2767f3eb6a4a5c94b9f633f4b3f778cd956f3995e5452b4c7548b6a79d9068f3d89e916aea696b34cf763c8754a193a546f35d7f7c9710b2eecb43853e2c
-EBUILD ebuild-mode-1.43.ebuild 741 BLAKE2B b6e42cfad3813fb04b76e8c372178e01f8af7e26b2718b8ef99a043466340aaffe7f52e35459fb10740f2b45e0cf2fbb4c917caa6b6d5658c5225e223b4c9502 SHA512 23250c905bdb39036d70c7b4e1f15609077268469b7a370be9ca1d4169f4b9af1db68b010124753fb60ef0560f2e8b58a9cd5dc943bed8d8c61f2018970dc326
+EBUILD ebuild-mode-1.43.ebuild 748 BLAKE2B bfa78ba46b43271570ec44f42ab4dc506f93608b5237e884f6aba76458d7ea1bf58019a74c5c82ac0e0a48d71cce1f1073c86fe2b1f036d62ca4284db323b285 SHA512 9daa72324659b956e08565fae7953da567ef67c77c91a6b06b4f6228a2bf2714db3bb1e267ddbcf2b82998c87cee0bc37cfc6c88fc360a4c73febabbd95a801f
 MISC metadata.xml 403 BLAKE2B b3996463afa7f1471fafe74467cc3b2bfac32c9ed6f8cbab1390ac1b974be057982f8f3ec7d796f7eb45b023d702b668f979e962d6c33c525f1e644de2703007 SHA512 b6c2ed67a0eac9b03f15bc00374f925eb8ba28000f8d1ebbe03f75e26c953ef799fe73c0bc1658089e5ab687cb07e97ff8d74123b6a67cd5dd8246e81051c239
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.43.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.43.ebuild
index eb98435ed6c5..f36b2533c5f9 100644
--- a/app-emacs/ebuild-mode/ebuild-mode-1.43.ebuild
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.43.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 ~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/ghub/Manifest b/app-emacs/ghub/Manifest
index 889551609ccc..27bfb3206962 100644
--- a/app-emacs/ghub/Manifest
+++ b/app-emacs/ghub/Manifest
@@ -1,4 +1,6 @@
 AUX 50ghub-gentoo.el 124 BLAKE2B 84170098bd01bb9f165eaf06f7cb21c56d2caaf964d2658520311757845d053072a7704fcb90cce2a2dfbd2385f357d2e7569061ebe0ca41b575efd752d29fd8 SHA512 596c7e75560f3734b57525bdfb42f3985fb49ab4d86637231361f6673d2431c0a6e73f91f58f003f9027f1143b9be3f4330ef2e1ff6c627ca6057256f4afbfca
 DIST ghub-2.0.0.tar.gz 48150 BLAKE2B b9142f33f92dc08a1d5f3f3467361866b41d0d2c943465e803987a41a7bbba1bc4c7e30c058e6e3899110a57d3e1d49545df01efbceb67711186e6411ebc9a58 SHA512 39e1ac1760e1a8532ee5d6fd29386ccc24d7f0278f6c900d565a709f86ac6acf01ae49a3462b54054d5b0040102db82ea048157a12663c46b0c45fe11f2e86d6
-EBUILD ghub-2.0.0.ebuild 491 BLAKE2B c80d78142751618b9ca62759099663feae8c8ee73f7aa2ced2cae9e9e9840a04a17b6406ae392df2a2fe53b458aa1d04fda0f23f395c0c816d2e455de28fc131 SHA512 4506d4292a0ac7d0fb3a5ac8bf133e0e5b598305b5edff4a8f30746481e5581beb59fbfe475a97453c3dca9f4be95e1c181e0cc75634c76cf2813f9a8d11cca8
+DIST ghub-2.0.1.tar.gz 50014 BLAKE2B 449c12b4a75b8de75249fa8f3fd624551d36ae745325fe62b20d8a68a6bad565a308e8c9be6d742c24fff5238fe2cd56fda9d8353465dec28e0f42b2ee10dc77 SHA512 d27b3f150b1b871dd31746ee7396b7bea544a6209f73039fa0ac6b670e3fcdbddc2f888cfa3dfe89b64325d208f5fe18ad90869e012758dea54878d0dcc82528
+EBUILD ghub-2.0.0.ebuild 489 BLAKE2B e3889ff149dc2f09ba8af3e685fa91d32afb9b3522e4efab84cd8bca82258818a2fb2c322c796c719fcd5020d47f0df327917fe7c10bc887c0ccb55eee999f4b SHA512 a97f25b7c8eb7be16b10494ad540db5f4337cb5cb86527eb90993fe4daf41e12ea4013591b159415d1d117b1652bcaf0e11e8dc00d54ec16ea678a8c01b79146
+EBUILD ghub-2.0.1.ebuild 491 BLAKE2B 05a95bdb2094248383afa5eaa75d681dbac6e8c2f4e553a75cce9f6e66506e3db60332fe53071566ee3d709852c05b02d91f542568ff6f7043bf980df8de7250 SHA512 d46a2d66289098737c75d393a42cd1e22a0d4741e5c223a310a41d1159f0a6ff0d88c15e88144682703dd65e46942a28039f35e41f3a247b8d40b4bfaf0bba5e
 MISC metadata.xml 1273 BLAKE2B d1248c9061827cfb587b5d4a54ba5aeaba5be8302bc1a2f11252b9fe0946d96ce292f01983a2e82b23008649ee44af169d570a3226887fc22852edb022d1608a SHA512 e8161b23fd2310b303508c80c6af7b428c77ce2eb594bc3bd52b71eab874350d8f8920fa7e348fe48b5f6302fe6242665724dfbe83e308ee5e9d0e8813f2dbf1
diff --git a/app-emacs/ghub/ghub-2.0.0.ebuild b/app-emacs/ghub/ghub-2.0.0.ebuild
index 86b8b246a84b..b81e58b6400b 100644
--- a/app-emacs/ghub/ghub-2.0.0.ebuild
+++ b/app-emacs/ghub/ghub-2.0.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-NEED_EMACS=24
+NEED_EMACS=25
 
 inherit elisp
 
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/magit/ghub/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 SITEFILE="50${PN}-gentoo.el"
 ELISP_TEXINFO="*.texi"
diff --git a/app-emacs/ghub/ghub-2.0.1.ebuild b/app-emacs/ghub/ghub-2.0.1.ebuild
new file mode 100644
index 000000000000..e5be353be611
--- /dev/null
+++ b/app-emacs/ghub/ghub-2.0.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+NEED_EMACS=25
+
+inherit elisp
+
+DESCRIPTION="minuscule client library for the Github API"
+HOMEPAGE="https://magit.vc/manual/ghub"
+SRC_URI="https://github.com/magit/ghub/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="*.texi"
+DOCS="README.md"
+
+DEPEND="sys-apps/texinfo"
diff --git a/app-emacs/icicles/Manifest b/app-emacs/icicles/Manifest
index e489a65c4284..bed0dbe1664e 100644
--- a/app-emacs/icicles/Manifest
+++ b/app-emacs/icicles/Manifest
@@ -1,4 +1,6 @@
 AUX 50icicles-gentoo.el 112 BLAKE2B c4d0e44325f27cb725bce0aff0ac8186807295c9b20642f42fabfa956703836c65a23b3a71221e736d95aefa1e4e188834df53c9a275ddc0ec7389a810bd405f SHA512 dee9b1945ea378792e71efa674bdeae5ec82eaa8f8ea07fd7859ff3e48d812fc50c8a4809a2a66c99ffe08c4b2b71a107245970ec2cddbe0505b63999b62320e
 DIST icicles-2013.04.23.23400.tar.gz 886525 BLAKE2B 92325f9486f3008b45d336828025e828b83bdeb91ea7fef3a72f8093b9800ca1303cebcc3cc6c7c4bfadb9b66a26371f55a98498a34d23dc3511d1e2f6de4b36 SHA512 548c20fe83f72d03820d620d0d5f9feb6d249ca96c8f951ddbf650691ad30649d28d736b7c01677e260fed0490382a5771c0e88adef6c9c0089ecbd225f9acd5
+DIST icicles-2018.02.13.23733.tar.xz 697112 BLAKE2B 63b60a74cfcc5b855e9ffbf7a91d0cb561c46ef1a93fb1baca00a0a5462326da983c734bef1943c0f17583aeb065d8fd5d88769eec2dc35f36a59ea4ff86609b SHA512 6c5d2270c735fafa8e2180134fbe7175e1c99cb6ae904a70dbdf1144293bd1ffa84d9e81b1c1b03296348a6b31ebab62ea7981a4b7f5be8bb5238bd143ccb3c0
 EBUILD icicles-2013.04.23.23400.ebuild 401 BLAKE2B deae89002a1509b6087b034c18b9f4ec560e5cc39308948d5f92123410ca287cc9d1effc7e479e6194009affed126a1fc6d98581c6e1d20b169f568e7b970409 SHA512 3d697cbed9b5e35db6bc370eea722a8d5c5ada439bcfddc14498740a02ff81bc4065628dd11e5002b3c2e796877e1fd079638f2468551083ac893ba16091cfd8
+EBUILD icicles-2018.02.13.23733.ebuild 488 BLAKE2B 0aba0b0c414bd4eae4ff6387374fe4db7cf7c5f74338ce512d1b7ccd64ec3b7492d6f3418116e07ef75d39f61ebfb0adca0424bf21d3066272524fc0e89eb18a SHA512 de723e4123003f1fba99840c9dcdc7c99e329294b96a5650c518bf9cb559abecc2231ec373d76ba121b289e37a8961a3baa4968da25b1e653c4b4e805351488f
 MISC metadata.xml 341 BLAKE2B f358671ac8ca5a8aac6a6fb365c67c02b4cd65ead725be504866bb47ff2e2e792a3787985a1d672623fce4fea302f316482270a7ce7141db4695956113d18b13 SHA512 6ae47225ce001e28b8f49fbab8be2949aa74b6e7a4daa99330ce1b24c3dcb7519cc886516f34f38b49e50a188068b63e426ef116a63956344e8723bfc9524a10
diff --git a/app-emacs/icicles/icicles-2018.02.13.23733.ebuild b/app-emacs/icicles/icicles-2018.02.13.23733.ebuild
new file mode 100644
index 000000000000..e8cd70e63cc3
--- /dev/null
+++ b/app-emacs/icicles/icicles-2018.02.13.23733.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="Minibuffer input completion and cycling"
+HOMEPAGE="https://www.emacswiki.org/emacs/Icicles"
+# Snapshot of https://github.com/emacsmirror/icicles.git
+# PV is <Version>.<Update #> from header of icicles.el
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/magit-popup/Manifest b/app-emacs/magit-popup/Manifest
index 6dad27224087..c4f14320792b 100644
--- a/app-emacs/magit-popup/Manifest
+++ b/app-emacs/magit-popup/Manifest
@@ -1,4 +1,4 @@
 AUX 50magit-popup-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
 DIST magit-popup-2.12.3.tar.gz 40195 BLAKE2B a351e949207b674c734f66b0431fa4c137293ccff880e3f457dfb825d7a36afd37f59197170a86d52606d371c181cd8a23be54d74aeee192a2d1a56588a55b3d SHA512 50620ce1d364ae28f30658dedd8f235bb1055be5cf4320142b7648e2ff6137f84cf865ea8f41e34ad7fb42612ff5d36fc0c4f6caa0aa0d2071bf775c15be5833
-EBUILD magit-popup-2.12.3.ebuild 596 BLAKE2B 39e54e5f14d5648c2e8d1c30f2da09cfb7345d1cf80650a4fd226dc7dbbdb0560ca24761ed46a4910a47bc46bd6a5a403edab90afc051b7ea60c5af813106191 SHA512 60cf12225cf6a27a5ecbe0afe7ff6d3e6c20b351aae312518a150bd8bfbb485e7310b2a17ab4743f413f3cb7da35aef5ccc00d3a99fa23ee675eeb11e181a204
+EBUILD magit-popup-2.12.3.ebuild 594 BLAKE2B 4e1f7e95d6581b55aac702d4d4aed048f0ab0f9815b1d9a8dfb3688c541eadd13e39e9f9f40cb7ab931e6841f9cc9c86205d40dfff0560b8417a9764c7d12e15 SHA512 750cd4a10d07188fc9113e2e71604c3742f6d9ed02179f7cceef982fa1d4c037ef88eb4faf9ead8cc46d798cba9044c5f83cb183ceda69c110dccbd9a1d66e4a
 MISC metadata.xml 1147 BLAKE2B 68fe5e7240434621fe4d1148e8f05d162771f8c90123790d757fec03d3c54dd686630860eec299371bf2f5356e0b8880a8ec46e1c7bff3d697d477fc095f58e1 SHA512 1e1aac2080140c50012bb3e35cb62c53fb782f9ac3041df3b7d1f8c86822bd7eba2f773c65205a58c65c791a095fc82bd39265dd05cdff52ace51e38a58666e0
diff --git a/app-emacs/magit-popup/magit-popup-2.12.3.ebuild b/app-emacs/magit-popup/magit-popup-2.12.3.ebuild
index 10997ff1cf60..84e13cac60d7 100644
--- a/app-emacs/magit-popup/magit-popup-2.12.3.ebuild
+++ b/app-emacs/magit-popup/magit-popup-2.12.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/magit/magit-popup/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 SITEFILE="50${PN}-gentoo.el"
 ELISP_TEXINFO="*.texi"
diff --git a/app-emacs/magit/Manifest b/app-emacs/magit/Manifest
index 363db8dc722f..1f990589a76e 100644
--- a/app-emacs/magit/Manifest
+++ b/app-emacs/magit/Manifest
@@ -1,10 +1,8 @@
 AUX 50magit-gentoo.el 77 BLAKE2B 85c942a0eeb84d6d45931a318108dff2006fc38e9e9eac37e906e03619c41fce8c151417a5e3b4fd9cf8db8fd084363a5ab6ca0765ea74e9a052d409528b6c39 SHA512 ab812cd1f5451868dd62a4bd3e87b2d5061ef4e3010a2a4c63396c9b797fbfb45c02d045dfde55de1b7e91c98375ba7a56b98f65beaa697d35228b9c870daae6
-DIST magit-2.10.3.tar.gz 430343 BLAKE2B 61afda0c50ca315d1d601ddaa2b6df2425a83d6dd3f501f5499df446c8498db0846d2ec58c7f1760933c0d05aec89d4b39d2ea19297f1302a156a97e29f3bd0c SHA512 54cd4c54548583972111ffb18c3b4e0834e061d84d071d5b559fe4b800872eadc214d01c8efc4452ed725184ec5bb1954e897d94fdb82397c9e953aa7236532b
 DIST magit-2.11.0.tar.gz 451030 BLAKE2B e5a5301d720e927c6c81aca4c5572a9a7fda938c695738246a87c46adc00a13e94438bb18d5f33e796c798cfec7dc438632cac6e4a452cff7d6e899a67f33575 SHA512 d32abdc9e89e77f65f05cc3dbec720320bc93d9ae827604c4f90acd115e76f8d05e445a96a141fbfbe88cdacca8383615fb73bddf01e776eeb3f63a459e973b6
 DIST magit-2.12.1.tar.gz 505873 BLAKE2B 076d9c08d3cb80274f5a6259ea5593ed419a0e140cda26bc65dc0c843373dcac1627d6bf098c5bdd9f0efb6b40ff3d7b823ed328b713390ea8916303b77ffd27 SHA512 7755aea8e7d9f0b82099143a76334be4c468536bdc0becad71acc097d9cef123394144b321f30093e079fef89e30ed1e5037fc92052ba9742112a30c6d3d586e
-DIST magit-2.9.0.tar.gz 421074 BLAKE2B 6fb8305ccf3933c2ee7962da897484b0d5860b656aa84f8e95a6950ca1c7491deb535f52418d9156ca8a71f5a08fc8e10fd4af9143d6fe26f77d724d799ed24a SHA512 0a15e4b6c145c081929f4f49cb40f7827bb3e68b4122e9e76b74ea24ded4c3bd3ea5c431ef6d56b08705fe3b77f2d32ee4383c7eddc93de2a3170add098e15ed
-EBUILD magit-2.10.3.ebuild 781 BLAKE2B eed9d6c038a6a6cc69819a665487d39d13198b507bdfb0a1487928c2c4731b289885034e5eb536aad8ec3bcf6538802374bdae32ff3578904e44a793a60170e8 SHA512 500e8eacb213c63566d3f1b300199443ed5f88a5526b617d39d394165117cad082b3249ad7ee086b3c0b2648aebc970c454be885cc8c566ca617f3b67f6d1a42
+DIST magit-2.13.0.tar.gz 519614 BLAKE2B 4bf1eeb8db563acd69ed65ec462f9436601c042e5ecceb2c899a920dc5710f544a9218c647fddc76ca265401f0027cd67f4de0155c3f79792f8e2f46d6fb4371 SHA512 4b840e2cf4b0fd2c5bb43c70766c6675c7e0adfc9cc7eac9f35bb9632e1eb03242dbe55870bd40436b49e9f333f00dfd361bcc63fc70c3a3a2a6b3e3e64f33a7
 EBUILD magit-2.11.0.ebuild 778 BLAKE2B 97d42aab39c4f55fa9bdf9a10d385c9fb3ac29aad78972d340200aa077176287a532310ef14f7716c2f42b6cab13cee760bb83ea13edfc4743f8d7b4ff31de62 SHA512 2c3944d01b6b0689b935aaef0ff0551e8a9e304fd8d236d65747c6167e98b97eea37970be402c3880019ac72ad4895e9195955384313d07cdefe14855b8f65fa
-EBUILD magit-2.12.1.ebuild 840 BLAKE2B dc663e17d4a680a69ba19999eb730ef270381baf8b9da2db9733c9817d85e63aaca916ba5d67666fec738e79921f04400a8772096bb490690ab051efaec20b8b SHA512 4c0b3fdff23aa8e09eec41f722ee83ff0aa0d99a24f5bbdf97747e5c4829276bd525fbeb2f71f7229c4a1676b436df241f0bc80a971325e546e6012504448e4d
-EBUILD magit-2.9.0.ebuild 778 BLAKE2B 7063541fafed02cade386a4bd478ce701cde7a81ef05a8b754d5505a17f499e64e2eb5d22ead97cfa4ef034aff548b066492688a8cf692bda39cef66409cb415 SHA512 fe3858a40518be189a482b9ee146cb3154c98ab053379c38aa00528a4908a25a4e48a182af22b8c604497fcbd6fa1e508e05826c55e596686a1a1f2bbe6f262c
+EBUILD magit-2.12.1.ebuild 838 BLAKE2B 6f331d506d79e6eaf72af0e7356ebef236fab9e53951f3c7bfb3ede44891d0717f622262b6e4096208d5dd45ebd3d44b2881d18de5d7cacc6100e0a8f863733a SHA512 10a3f964ad9c9c689eebc2cede09e092db9037879aa904714f0a18ea94983c76de52d8a7085110ac4a20859c5eeaf80ae30e37cd94eb9d8d9dd9cea284d412b3
+EBUILD magit-2.13.0.ebuild 840 BLAKE2B fb57094e6f463dcce9b2b0186fe0464e2c81240cbec1cb2bbb98b96a932620924a23f5701508c5cf2903c79c5ad629e8b2694c3d2c23854966e3eb8499c3e4b2 SHA512 52061b11b59b8c9427a9b29fb3818faa99e2196b7dac9a760d9055286133106ef56e7704af8e6fb84f00b67476e173ab0b0baac7b48b2a10d35ae05181c9b0c9
 MISC metadata.xml 788 BLAKE2B 32b9faec3bea7c347dae0d2da1246c43ac234b865fa26738a64736fea6a8e3107fbd7d1615b5ab28985cf1b78ee3d008c3cbbc461cf251dd4a3da5e893e81277 SHA512 ae77f9b917a135d4b9d39f7c0428a6e0a616cccce613cc17a6672e7bb0515709deef76889982640efca7fd9014801d7b951ddc5fde4eeb0134b3e568ea076396
diff --git a/app-emacs/magit/magit-2.12.1.ebuild b/app-emacs/magit/magit-2.12.1.ebuild
index 8290bab91243..8008ee12420b 100644
--- a/app-emacs/magit/magit-2.12.1.ebuild
+++ b/app-emacs/magit/magit-2.12.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/magit/magit/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 S="${WORKDIR}/${P}/lisp"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/magit/magit-2.10.3.ebuild b/app-emacs/magit/magit-2.13.0.ebuild
index 490d7199ec45..2bb11ae04844 100644
--- a/app-emacs/magit/magit-2.10.3.ebuild
+++ b/app-emacs/magit/magit-2.13.0.ebuild
@@ -1,7 +1,7 @@
-# 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
 NEED_EMACS=24
 
 inherit elisp
@@ -19,7 +19,12 @@ SITEFILE="50${PN}-gentoo.el"
 ELISP_TEXINFO="../Documentation/*.texi"
 DOCS="../README.md ../Documentation/AUTHORS.md ../Documentation/RelNotes/${PV}.txt"
 
-DEPEND=">=app-emacs/dash-2.13.0 >=app-emacs/with-editor-2.5.10"
+DEPEND="
+	>=app-emacs/dash-2.14.1
+	>=app-emacs/ghub-2.0.1
+	>=app-emacs/magit-popup-2.12.3
+	>=app-emacs/with-editor-2.7.3
+"
 RDEPEND="${DEPEND} >=dev-vcs/git-1.9.4"
 DEPEND="${DEPEND} sys-apps/texinfo"
 
diff --git a/app-emacs/magit/magit-2.9.0.ebuild b/app-emacs/magit/magit-2.9.0.ebuild
deleted file mode 100644
index e14b89b7735f..000000000000
--- a/app-emacs/magit/magit-2.9.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-NEED_EMACS=24
-
-inherit elisp
-
-DESCRIPTION="A Git porcelain inside Emacs"
-HOMEPAGE="https://magit.vc/"
-SRC_URI="https://github.com/magit/magit/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-S="${WORKDIR}/${P}/lisp"
-SITEFILE="50${PN}-gentoo.el"
-ELISP_TEXINFO="../Documentation/*.texi"
-DOCS="../README.md ../Documentation/AUTHORS.md ../Documentation/RelNotes/${PV}.txt"
-
-DEPEND=">=app-emacs/dash-2.13.0 >=app-emacs/with-editor-2.5.8"
-RDEPEND="${DEPEND} >=dev-vcs/git-1.9.4"
-DEPEND="${DEPEND} sys-apps/texinfo"
-
-src_prepare() {
-	default
-	echo "(setq magit-version \"${PV}\")" > magit-version.el || die
-}
diff --git a/app-emacs/po-mode/Manifest b/app-emacs/po-mode/Manifest
index 05d44deb1e25..5301283b44db 100644
--- a/app-emacs/po-mode/Manifest
+++ b/app-emacs/po-mode/Manifest
@@ -2,7 +2,7 @@ AUX 50po-mode-gentoo.el 373 BLAKE2B dedf37969c42ac3dbeb4b4cb01af0f9ee79e40aad858
 DIST gettext-0.19.3.tar.gz 17414357 BLAKE2B b2b2085e8ee7339c6b6509807a9601163498edd9265f2ec899337943bd2c1394a905b01e8a9f44e7a57985cb11f4fdfe302ff9320dacf1da78fdc4fdb5e30fd9 SHA512 2ec02065b376cf9ec2b9d32328a7181d292ac940356a710f785450f37e03a8513e07d4b981824374671cfa2f60024e4649fc89ad79ee0adda87a8b9b63ad28e8
 DIST gettext-0.19.4.tar.gz 17717034 BLAKE2B 2022ed7963ff01c842c345f13c33ea7cc7221629c6beaa73cee7af68f709c6b8824d1e93ef919318b5d0a63286821efe2fdffbbdd709edf25a1f25be8909222d SHA512 274e00fe0149468e3073562f8f3b292597e9dbd82dfe8d068e4a1983914d25b603bb26f3fa4aa10e9fcd65826e3552c1871218342270927481e95eb64288ad97
 DIST gettext-0.19.8.1.tar.gz 19704011 BLAKE2B 17dc7aad338a26d71b818fea51e46a47dccf14744ee575ce86b591becaea402e36d64dc018e1a84113c356122ffef367cf2fa424e51ebc9720350040b4960091 SHA512 073042fa2dc48804c58e76f036130a669e19612c25427b0ab14d0b366b549a63751bf3af03bfd0745d7c4f72497a4b2aab26a3cc6de83189ce111679073878e1
-EBUILD po-mode-0.19.3.ebuild 538 BLAKE2B c18f56f15495ce1c04f76c4a97a421718d9d272a435f6de7d56d1ae040a01a54933ee9fdf30f40f9054377f3fb7e914b047277357435a31c0f242d590c3232af SHA512 f4bfd73baf5a0b8fa76828bda9155dcf72d690b4025049ad312a1bfcc750a99a0ac5f7b55dcb69336151113d8cc49019f24442dae4f014ba5d99a94d237dc31c
+EBUILD po-mode-0.19.3.ebuild 537 BLAKE2B 3d25b14bf751bd076c8564b023f95f5359029c59c1886664f2701eec59cd88d713743521881a02a6810940aa104416f0aa77675dbdef7e569d6fb325a5f4e452 SHA512 8c68235c48f5732bead7688739cc00588a9d49c57f800f935cdd3b3a0ef51ee135ce541f7a57cc22d2e0c1f9ffccf7957e04f9dd56da933340c3e21b2eccf48c
 EBUILD po-mode-0.19.4.ebuild 547 BLAKE2B 4ee75a670d6036faaf684669926db9a8b33cc939d7ae93bc24068ea1a7d0b9098978407d204cd56dcd43e9ea06c961ffd8b390a712a5bfccce18f729eb4b8f3f SHA512 45220bc03bab40288510bb6e33d29f75ea6da1263176d64381651f3c1aef24c584b0eda00a3bd248e756157efddaa05c7de5ebec164e2093303bce2546628bf2
 EBUILD po-mode-0.19.8.1.ebuild 553 BLAKE2B 5799809a62002f314e805c63c47d7b1ee608de724534ed2b06b1866d6f7df4207dd9fd00259cc3e6fd6b7b60529aab11a2232a4f3d1f16d93eeb2d939ae36aed SHA512 1dc5864fb2dc0df0c008d90a9362fed05ce1b8c6ca84da32350e8eb6e1b83e8ce7c125d52927fd5331fdb0d68641585ad927df848c5533322b14da071b8b385a
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/po-mode/po-mode-0.19.3.ebuild b/app-emacs/po-mode/po-mode-0.19.3.ebuild
index dee68ca726b3..c8911054c996 100644
--- a/app-emacs/po-mode/po-mode-0.19.3.ebuild
+++ b/app-emacs/po-mode/po-mode-0.19.3.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=5
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gettext/gettext-${PV}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 S="${WORKDIR}/gettext-${PV}/gettext-tools/misc"
 ELISP_REMOVE="start-po.el"
diff --git a/app-emacs/websocket/Manifest b/app-emacs/websocket/Manifest
index b05271ff98f4..75d9f9aa8634 100644
--- a/app-emacs/websocket/Manifest
+++ b/app-emacs/websocket/Manifest
@@ -1,3 +1,6 @@
+AUX 50websocket-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST websocket-1.10.tar.gz 27108 BLAKE2B b164b3ca47e0705322d9bcd0d9535c8e84777487e8783bf599f5391c88ee6193a1ef1750ec4b3cbd4fac2968c449c4f3a140255a434f3de38e66ad7364c192ba SHA512 ef1a34eccd173eb206cd9eeb4ea988a5b076f178bd4ca903e03b2f2301a34c2cbd08e43a13c8d24a64d10da28b3a77c15b2321978460db7a6b23c601abe31197
 DIST websocket-1.9.tar.gz 27029 BLAKE2B 9a492beda1b7f7211d1a72b5af0cab445f0fa78439797f05b565a0421a798a4fe0c6fb0e24aac0454f5b48f8f536762d0fcc5d92c216bd6b83b6ac34a1e024a4 SHA512 bcd98e7edcbe95cae2f196cea05fd6cfa9083ed1ab2392530ca00cb05b87d6fa95b5f5319981fd94244b74989850c171e4c31c8758a8b7fe95d49299103a4410
+EBUILD websocket-1.10.ebuild 755 BLAKE2B a8976dea9543cc526657f5dbf8f03cc75a66286ff55668f0ff5836b0674aa875271db94f98f06a6fa0d7ddaee2f254a793b610f7922122857ecf160b46021225 SHA512 0f1989593f39be725bdb12292fdf4b51713bf8c36b11d42f04a9d73b8aa19f68cee101b054d4c5b15686778acdea4a9f32ee4e7f772ffe02724a9febc78d9e5a
 EBUILD websocket-1.9.ebuild 675 BLAKE2B 0ff94c4f36f3f470afc00e7aad5fb34f7cabfc5c6b0eafd9b58779142f7c101d4230524a8b0b23ff94e58061e54777972adfb5e89123bed0df4e198794bb16c3 SHA512 09e2563f1b81dd015213a5583d242b4740c6aaae8ef361e6a2b29aac54c3d443cceab424703620bed2cf12c63bb083836c53ac270db7db715fa50a9a0d9ab41b
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/websocket/files/50websocket-gentoo.el b/app-emacs/websocket/files/50websocket-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/websocket/files/50websocket-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/websocket/websocket-1.10.ebuild b/app-emacs/websocket/websocket-1.10.ebuild
new file mode 100644
index 000000000000..2211d645c5a3
--- /dev/null
+++ b/app-emacs/websocket/websocket-1.10.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="A websocket implementation in elisp"
+HOMEPAGE="https://github.com/ahyatt/emacs-websocket"
+SRC_URI="https://github.com/ahyatt/emacs-${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/emacs-${P}"
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp-compile websocket.el
+}
+
+src_test() {
+	${EMACS} ${EMACSFLAGS} -L . -l websocket-test \
+		-f ert-run-tests-batch-and-exit
+}
+
+src_install() {
+	elisp-install ${PN} websocket.{el,elc}
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	dodoc README.org websocket-functional-test.el testserver.py
+}
diff --git a/app-emacs/with-editor/Manifest b/app-emacs/with-editor/Manifest
index dd7da0838aee..18c1b8c9de68 100644
--- a/app-emacs/with-editor/Manifest
+++ b/app-emacs/with-editor/Manifest
@@ -1,10 +1,8 @@
 AUX 50with-editor-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
-DIST with-editor-2.5.10.tar.gz 28081 BLAKE2B 6e5b0478509022669ecada46a26dc74d4277b0221f8a1691690e60c56a4e24a1c47526c1b75e0b283d2651749069c2a9e0f277ab3805f42c98d2b3d271076b98 SHA512 797c7d905eeb4d7398dfba10e4a9b7e7729098a87e48dd75c14fd80f1dd9c5a9693033367a0a9788c4b6c6cc3aa8d2a6ef66ac8bddd24457a61c830887e66a59
-DIST with-editor-2.5.8.tar.gz 27978 BLAKE2B a14db76077ec2254f79856c018ea4aed277997b3b35d0cdd1992ded2a5715a13dc2fd909041eafb69150e5bfbc7441e6d5b1549a20e0937aac2a59413cbcd01f SHA512 abd42a096e3318cc25576b240df1ed670de327afabe675d3df12780c392779f33b88e7a76d125f31cf37e3b22eda88391329c73d21ccc834e611893e759ea3e0
 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
-EBUILD with-editor-2.5.10.ebuild 673 BLAKE2B 28e76191273b926fa2ff32e8a2649081a6f1fe825c3b544b7fdbf2d32d24a731db60d0233c84effd5cb488ed1b3d81bc1cee7cfda5535eaef4a52b8a10b8230f SHA512 de1f447911eab432ea9efc4c6a0dfd6e669bada47c797160592aa446ab26240a303bb887a605e282b5864e32e5f272006713d331bf644367fb0d2bae2fd88c5f
-EBUILD with-editor-2.5.8.ebuild 672 BLAKE2B c4975e572dd90ba5f559c4f055b5761428fe1d1948e35328f26c0c33b4e1bc89078888ecf42fcd8d4bc35816279c377b22d2de0d9ae624a4a9fde5264524faf2 SHA512 b05314fa3013b5e0772dfce3755b97dafeb89549faf91768367b3581506b1c760edec1b9244aa6bd2845ffb62d6bcc054bf648f08fac3901bc28cba3ad88c9d5
+DIST with-editor-2.7.3.tar.gz 30133 BLAKE2B af4455f06f5aa867fa7b57222b62a060dd325bea8ef4b408177666914cb97a4f614f13daaf281fe9ca65b90e94dbda33fcb845e822e025ed8b415c4d0d01d3a9 SHA512 1c613e49bfe4a9812e69ec62d6518b29e59bfde84c83097323dfa3274da7fe4ff6431c0ebcbbc889c2237bc535d7cdb2ab7ab1dd171b26e553f03dcf71efd09c
 EBUILD with-editor-2.6.0.ebuild 648 BLAKE2B 04711d6eb908747d7f6d6043f4460b20e4d9f0aabe88c416cb1dc384f68c6109ea8f623c49780c31e5da572b79905ee206d3152158239f7fb02393fa058733a8 SHA512 39ead2bcf75c013d858a46192058c928bc20bd35de52cd8b572138df7506145091220d4c637867418b1a3c211acc1dfbd655fec0f0001b459e2689b4f8de9e1f
-EBUILD with-editor-2.7.2.ebuild 650 BLAKE2B ee112b0810c2887cff5b32f8d908e554418047ae5e1a849e22f52c7c86cd4c91df74ace9abf52e0aabe1940fac4646a2329fc6575953ba3a5e6706f739c5880f SHA512 71ea9ef54e63f64f229e64119475368156b8858f1ab20d9af1755bb61ceae632075af6287ad42546f0b9eb441fdd8d1ede739d0fc9129d4c022892f947b39613
+EBUILD with-editor-2.7.2.ebuild 648 BLAKE2B 04711d6eb908747d7f6d6043f4460b20e4d9f0aabe88c416cb1dc384f68c6109ea8f623c49780c31e5da572b79905ee206d3152158239f7fb02393fa058733a8 SHA512 39ead2bcf75c013d858a46192058c928bc20bd35de52cd8b572138df7506145091220d4c637867418b1a3c211acc1dfbd655fec0f0001b459e2689b4f8de9e1f
+EBUILD with-editor-2.7.3.ebuild 650 BLAKE2B ee112b0810c2887cff5b32f8d908e554418047ae5e1a849e22f52c7c86cd4c91df74ace9abf52e0aabe1940fac4646a2329fc6575953ba3a5e6706f739c5880f SHA512 71ea9ef54e63f64f229e64119475368156b8858f1ab20d9af1755bb61ceae632075af6287ad42546f0b9eb441fdd8d1ede739d0fc9129d4c022892f947b39613
 MISC metadata.xml 684 BLAKE2B 8deeae00b1046056120a352a462a4c93039275356dd5731edbb0975883f745b0a2b49f4109c89ef0535f97d29a095b803b8e91834ef95a67b479a0baaf518de8 SHA512 9c5cc636acec025b66df91e9a2500a9f5beeefeab3be42f2eb291d3a221151ca1748e80709b3bfac68a800c34cfd954339f1edbb2c9247ac85b4efe47c29621a
diff --git a/app-emacs/with-editor/with-editor-2.5.8.ebuild b/app-emacs/with-editor/with-editor-2.5.8.ebuild
deleted file mode 100644
index 667dac00cbf7..000000000000
--- a/app-emacs/with-editor/with-editor-2.5.8.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-NEED_EMACS=24
-
-inherit elisp
-
-DESCRIPTION="Use the Emacsclient as the \$EDITOR of child processes"
-HOMEPAGE="https://magit.vc/manual/with-editor/"
-SRC_URI="https://github.com/magit/with-editor/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-SITEFILE="50${PN}-gentoo.el"
-ELISP_TEXINFO="*.texi"
-DOCS="README.md with-editor.org"
-
-DEPEND=">=app-emacs/dash-2.13.0"
-# Versions of magit before 2.5.0 bundled with-editor
-RDEPEND="!!<app-emacs/magit-2.5.0 ${DEPEND}"
-DEPEND="${DEPEND} sys-apps/texinfo"
diff --git a/app-emacs/with-editor/with-editor-2.7.2.ebuild b/app-emacs/with-editor/with-editor-2.7.2.ebuild
index e967a12c4df8..075601caf822 100644
--- a/app-emacs/with-editor/with-editor-2.7.2.ebuild
+++ b/app-emacs/with-editor/with-editor-2.7.2.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 x86 ~amd64-linux ~x86-linux"
 
 SITEFILE="50${PN}-gentoo.el"
 ELISP_TEXINFO="*.texi"
diff --git a/app-emacs/with-editor/with-editor-2.5.10.ebuild b/app-emacs/with-editor/with-editor-2.7.3.ebuild
index 5ee7f41db32f..e967a12c4df8 100644
--- a/app-emacs/with-editor/with-editor-2.5.10.ebuild
+++ b/app-emacs/with-editor/with-editor-2.7.3.ebuild
@@ -1,7 +1,7 @@
-# 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
 NEED_EMACS=24
 
 inherit elisp
@@ -18,7 +18,7 @@ SITEFILE="50${PN}-gentoo.el"
 ELISP_TEXINFO="*.texi"
 DOCS="README.md with-editor.org"
 
-DEPEND=">=app-emacs/dash-2.13.0"
+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/yasnippet-snippets/Manifest b/app-emacs/yasnippet-snippets/Manifest
new file mode 100644
index 000000000000..5d3ac481b174
--- /dev/null
+++ b/app-emacs/yasnippet-snippets/Manifest
@@ -0,0 +1,4 @@
+AUX 50yasnippet-snippets-gentoo.el 161 BLAKE2B af28f32bcf248a9557c25e4afd50110b6fdeb8f376b41ba645da1ee3c39429cf6b967bc77ce60f29a28d7dc01903a620997cb9a6bf7a62628bd3ff7495f8a015 SHA512 f675ccdd153f0c386d384df2db90598c08f2d49cadc434d1bba7707a7681b0d1dfa410bf188250b05003544c17bba11b132d9d8f3741865cf64ccce5b117c4d4
+DIST yasnippet-snippets-0.3.tar.gz 97229 BLAKE2B 26fe83c35be1b20b6a1e414144149cf1feaf4463833634bbd0a3db6f56b1da46d8e379c3dd19217cfd36f12cb9dc796eac4efef5c2ba472ce79f8c8b8d816969 SHA512 4aaac9d7c880642a1e802abb98bd6d6c94557fe0e609db5ce5b4ce2af921235d3e6bb2488c052adbe2940d41e85297520081ae0847b52642bc97610e6614727f
+EBUILD yasnippet-snippets-0.3.ebuild 614 BLAKE2B 73559131e05601b6a1f80ee513e8a2eef5f718d9b037476adfe2dfdb9d15162ee0dc6e2b249851aa1e3aef2ebf0b9363eab6f9e2996adf1d5c19496d75b3012c SHA512 d9d3d0044e4a527ce6b8b0e93f9ec4e63ac0a331d2834c9d283d9cd5f00c0627ece69b5ae17e346401cd345ec32a2daf97f7c86e1833980de2689b85bf0bb89b
+MISC metadata.xml 353 BLAKE2B ff3ba75ade80daba29d9f23bc25aeed1a284e15b56fdfe8b352f74a9e64a5ba9c3f5e927383b66461d5dba70e9d3c1ca45b107748d8164e15b1d12a767512876 SHA512 d3c7d0b96ba6306a6af696e57a933e0cfbd3a6386c167a3885e4b4d7be5af156a840f625833bda5e8732a4a12d202699bc24136cf1b71a3e13340ee4904e4a91
diff --git a/app-emacs/yasnippet-snippets/files/50yasnippet-snippets-gentoo.el b/app-emacs/yasnippet-snippets/files/50yasnippet-snippets-gentoo.el
new file mode 100644
index 000000000000..2db51796990b
--- /dev/null
+++ b/app-emacs/yasnippet-snippets/files/50yasnippet-snippets-gentoo.el
@@ -0,0 +1,4 @@
+(eval-after-load "yasnippet"
+  '(let ((snippets-dir "@SITEETC@"))
+     (add-to-list 'yas-snippet-dirs snippets-dir t)
+     (yas-load-directory snippets-dir t)))
diff --git a/app-emacs/yasnippet-snippets/metadata.xml b/app-emacs/yasnippet-snippets/metadata.xml
new file mode 100644
index 000000000000..c95e9b9f3b90
--- /dev/null
+++ b/app-emacs/yasnippet-snippets/metadata.xml
@@ -0,0 +1,11 @@
+<?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>
+<upstream>
+  <remote-id type="github">AndreaCrotti/yasnippet-snippets</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-emacs/yasnippet-snippets/yasnippet-snippets-0.3.ebuild b/app-emacs/yasnippet-snippets/yasnippet-snippets-0.3.ebuild
new file mode 100644
index 000000000000..693935e3fecf
--- /dev/null
+++ b/app-emacs/yasnippet-snippets/yasnippet-snippets-0.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="A collection of yasnippet snippets for many languages"
+HOMEPAGE="https://github.com/AndreaCrotti/yasnippet-snippets"
+SRC_URI="https://github.com/AndreaCrotti/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-emacs/yasnippet"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() { :; }
+
+src_install() {
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	insinto "${SITEETC}/${PN}"
+	doins -r snippets/.
+	dodoc README.md
+}
diff --git a/app-emacs/yasnippet/Manifest b/app-emacs/yasnippet/Manifest
index 789ed0ff8b85..949e095386ca 100644
--- a/app-emacs/yasnippet/Manifest
+++ b/app-emacs/yasnippet/Manifest
@@ -1,11 +1,8 @@
+AUX 50yasnippet-gentoo-0.13.0.el 221 BLAKE2B 51f86d04a825b5e1cb60019bddac2b0e2d91d735ffafdae497c87413eb0ad88efd969575edfe139ba250d2e2115f1c5a242de61f54031b684f35437e6e868989 SHA512 ace64b43229ee327add5d6ac056b86f7468ffb79569ca55d3692c93fd4b9e847d83fa731c8e54ad2aced5d64ed73c9cfa1fc6d6f9a883356dbb6a39142d9a2fb
 AUX 50yasnippet-gentoo.el 209 BLAKE2B 0acf1e2d1d05f5abd807bfd97fded3f1fa40a0289f76f4c4668b1b545b4dc71042d59387d8b58b0fcda4bdcfefbf438a6cf6cc6ab134f40e5f19f4c5d5080012 SHA512 5c2f65e97cece730eed4d34ab3520214b5b6cf63ffdfa82f5252b03122e26fe7d78a0748dbbd95886526fc47e39d3a5675b5df48f50d0ea97f1efe306e3f733d
-DIST yasnippet-0.5.10.tar.bz2 30583 BLAKE2B 28f9d3eaffe8f98fac55fdb0dc9021fe50be77ac2c980fbceb2d4be331e3135530d0e09a31f820a460f3b1c9ae0154b47504361cc13dfd8357e8f72e820e8c7b SHA512 2533ca3c9a3f9210d43cbf871ad82fe7c6ad7d850b1c4c9ef36b299c72190cf535706e434f39b54a70611871ad6329f3386527d77c7bb14b709d7594c75ae4a5
-DIST yasnippet-0.6.0c.tar.bz2 39844 BLAKE2B e49d1bbbe6f44270fc7d1e76532e3666dba35d69105a4ce902cbd53e5b6ab36b4534f389504b06ec7ec5b5b8a4b87c7adac2dbf10c55dcfd0023f3c14cf32ce2 SHA512 ab60149f867ccda7a9b4f8f97b280c22d1130addb811291459df8b32b8a3ec65b4eaea7b36e1b0ffa80c6338b5094430fc9c2812bd03bc46e582321caafee375
+DIST yasnippet-0.13.0.tar.gz 577330 BLAKE2B 21830c0a2e99d7669093c16f527debb4921e96aad006887ec1c7e35da58745721658417f1aec96ea78ba4dc5f3951c857848fce67e6d2ff7f255d4aea5687ab9 SHA512 73b111f72e98c4183764cef08ddfaa861dba49f171f96026b074bf62a7aa5e2d8529f616805ba386dd4157b675da953784d5bcd832d6015ce1b72e9c240988c5
 DIST yasnippet-0.6.1c.tar.bz2 47493 BLAKE2B d3bb0d1c343c05f9bc212a0fc114d3c816c02d8de685c55c0f3407a02ee6d1c1e6c24681872dc66e67af773e0e98a78a0366bbfe72ebfd543c5174d2e2f994b0 SHA512 ea4c5850ae80e4db9a188788654a099eddc43e29371ef0cb6367e1a39d3ee9f3e9dab7201178955ae47c92bcecbb5120e0b817e47e9c88c5bcef9e561636a603
-DIST yasnippet-doc-0.5.10.tar.bz2 182436 BLAKE2B a258088d26acd494d848b4cf8723d88d1787ed1812dc0427b6c8be689a9e8be266f1a2c1833a540faeabccdae6f8090407b1396f3d82b08139af7afaf7ea8a82 SHA512 2abdea253a23291089e34366f3cc95dbad6904ec8cf9f603e1fce0d9995ee32fd1b8b69f98f27ddd3fd33318514cb6e269f2418c8575df98240e6a3c3e19a0ed
-DIST yasnippet-doc-0.6.0c.tar.bz2 246554 BLAKE2B 1ee5aacb33b5f058791c81332ec5a60cd1854a50327c00680e1782f322706175cef2d73faccc390285e9ffb95163eed699fd0c81ac47c3566993d089253b3e3b SHA512 3e32936e1fed8ab5ac963e9cbb68a61d80f22acde910e4a700cc4005463f0aae0fb5ce6f6f5cbdf2e8dd9bd7e39e912cac8ea05f8efca08d58a07fd35ff26160
 DIST yasnippet-doc-0.6.1c.tar.bz2 490738 BLAKE2B e312481c7693094d62eb0aec465412ea1c894ca5132df9c2beba49c3c78daaec90ca80d17fc9404edbdd8cea1fce63804a102cbe9b7d3d7b23f0761b8a0ea552 SHA512 c96955cac11f319107e0ea907c92860049598cbfd47b6a2e3211dc2b030face77b03aa9495d7e9d78171be87083f77268e90c6c86b0cc467a96a5bd724daf8f1
-EBUILD yasnippet-0.5.10.ebuild 1144 BLAKE2B 4ce2ed8a4f10858eac1127585ecebb23b614004efeea4957a8fd3b0179e311113a383a17e6cdbf907d2bac3e818feccf798d7a36ae339bfdf01a1d2105995c35 SHA512 b6c57f947bf7cdd1f5a61131cd7a4457e60be9db08abbfc13a2a995e28a3bb9168b87edc4cd218a9308b73fd84026c21efeff8848abd79dc3e4a022facd0f76f
-EBUILD yasnippet-0.6.0c.ebuild 1093 BLAKE2B a0c53dfdfe77b80116aec9cb388b9e395fa7e47a83c87509e233c91ce90a0d9e3987de76e1940272e54757f471cf7eedbdac8685fcdb7ea1deee11350ff8be55 SHA512 cdb88233be17383d6ff5244aaf1997e2315ac6e35d792e32110748197c9c4abe4cf60a4e12a4def47a5d2787c94e9cc2ca40963ec172f760246ad2f30799676b
+EBUILD yasnippet-0.13.0.ebuild 1014 BLAKE2B 37db6268c4d6d08820e368c26fc6e488f50da201740e03acdb1aab3885de6163dd0d827dbb70d55ff8baf77ec030ca318f44db111ef862a66d1e5555c01174bb SHA512 64122bd778495c2c8114dffba65a1f556e18594679270996759c6edaff19662711e2482152b0cb8c4d658046aa601fb93115b32b884dc2931e1becb0e23da244
 EBUILD yasnippet-0.6.1c.ebuild 1093 BLAKE2B a0c53dfdfe77b80116aec9cb388b9e395fa7e47a83c87509e233c91ce90a0d9e3987de76e1940272e54757f471cf7eedbdac8685fcdb7ea1deee11350ff8be55 SHA512 cdb88233be17383d6ff5244aaf1997e2315ac6e35d792e32110748197c9c4abe4cf60a4e12a4def47a5d2787c94e9cc2ca40963ec172f760246ad2f30799676b
-MISC metadata.xml 552 BLAKE2B 640774f8c51ac6af70498e88be5a9bb7873036376a13f869388f57e1babff0188b2f390fb52b6bf88e73331618e89ccb3dc8056a22976bc8f76066433fba62b8 SHA512 da85f0d9d20ac134af0bc33a3e0b0d72de57c9b5f27635cc1477bf83b96b51a8b98c2227196f44628c0337f9204873a085da5f8d9030f974933cf9da158a609d
+MISC metadata.xml 496 BLAKE2B 9478af00a630e80eee4c50ad20f8337fd090c4268bb57122619ffad5607d5f814ca98159677bb0835f5ee741cd0ae7582bc8732fa8df528c9e1d2e3eefabc433 SHA512 9110ef599f3ca052c5eaa1208729b5ad4b6975e30b15f011a75c7b2dc0fd0a1662e01352ece980ace994f021eaeb7758668930ca5cf561aa7e7430a8780ba90b
diff --git a/app-emacs/yasnippet/files/50yasnippet-gentoo-0.13.0.el b/app-emacs/yasnippet/files/50yasnippet-gentoo-0.13.0.el
new file mode 100644
index 000000000000..e58ee2b29cf3
--- /dev/null
+++ b/app-emacs/yasnippet/files/50yasnippet-gentoo-0.13.0.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'yas-minor-mode "yasnippet" "Toggle YASnippet mode." t)
+(autoload 'yas-global-mode "yasnippet" nil t)
+(autoload 'snippet-mode "yasnippet" "A mode for editing yasnippets" t)
diff --git a/app-emacs/yasnippet/metadata.xml b/app-emacs/yasnippet/metadata.xml
index 3ae6c22024b9..1f59a55f0dcf 100644
--- a/app-emacs/yasnippet/metadata.xml
+++ b/app-emacs/yasnippet/metadata.xml
@@ -10,7 +10,6 @@
   cleaner and more powerful than smart-snippet.
 </longdescription>
 <upstream>
-  <remote-id type="google-code">yasnippet</remote-id>
-  <remote-id type="github">capitaomorte/yasnippet</remote-id>
+  <remote-id type="github">joaotavora/yasnippet</remote-id>
 </upstream>
 </pkgmetadata>
diff --git a/app-emacs/yasnippet/yasnippet-0.13.0.ebuild b/app-emacs/yasnippet/yasnippet-0.13.0.ebuild
new file mode 100644
index 000000000000..e6ba47b23dc4
--- /dev/null
+++ b/app-emacs/yasnippet/yasnippet-0.13.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="Yet another snippet extension for Emacs"
+HOMEPAGE="http://joaotavora.github.com/yasnippet/"
+SRC_URI="https://github.com/joaotavora/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+SITEFILE="50${PN}-gentoo-${PV}.el"
+
+src_test() {
+	${EMACS} ${EMACSFLAGS} -L . -l yasnippet-tests \
+		-f ert-run-tests-batch-and-exit
+}
+
+src_install() {
+	elisp-install ${PN} yasnippet.el{,c} yasnippet-debug.el{,c}
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	dodoc CONTRIBUTING.md NEWS README.mdown
+	use doc && dodoc -r doc/*
+
+	DOC_CONTENTS="Add the following to your ~/.emacs to use YASnippet:
+		\n\t(require 'yasnippet)
+		\n\t(yas-global-mode 1)
+		\n\nYASnippet no longer bundles snippets directly. Install the package
+		app-emacs/yasnippet-snippets for a collection of snippets."
+	readme.gentoo_create_doc
+}
diff --git a/app-emacs/yasnippet/yasnippet-0.5.10.ebuild b/app-emacs/yasnippet/yasnippet-0.5.10.ebuild
deleted file mode 100644
index a01cc65c4718..000000000000
--- a/app-emacs/yasnippet/yasnippet-0.5.10.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit elisp
-
-DESCRIPTION="Yet another snippet extension for Emacs"
-HOMEPAGE="https://github.com/capitaomorte/yasnippet"
-SRC_URI="https://yasnippet.googlecode.com/files/${P}.tar.bz2
-	doc? ( https://yasnippet.googlecode.com/files/${PN}-doc-${PV}.tar.bz2 )"
-
-# Homepage says MIT licence, source contains GPL-2 copyright notice
-LICENSE="MIT GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND=">=app-emacs/dropdown-list-20080316"
-RDEPEND="${DEPEND}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_unpack() {
-	elisp_src_unpack
-
-	cd "${S}"
-	# remove inlined copy of dropdown-list
-	sed -i -e '/^;;/N;/Contents of dropdown-list\.el/,$d' yasnippet.el || die
-}
-
-src_install() {
-	elisp_src_install
-
-	insinto "${SITEETC}/${PN}"
-	doins -r snippets || die "doins failed"
-
-	if use doc; then
-		dohtml -r "${WORKDIR}"/doc/* || die "dohtml failed"
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-
-	elog "Please add the following code into your .emacs to use yasnippet:"
-	elog "(yas/initialize)"
-	elog "(yas/load-directory \"${SITEETC}/${PN}/snippets\")"
-}
diff --git a/app-emacs/yasnippet/yasnippet-0.6.0c.ebuild b/app-emacs/yasnippet/yasnippet-0.6.0c.ebuild
deleted file mode 100644
index 831ffed191b4..000000000000
--- a/app-emacs/yasnippet/yasnippet-0.6.0c.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit elisp
-
-DESCRIPTION="Yet another snippet extension for Emacs"
-HOMEPAGE="https://github.com/capitaomorte/yasnippet"
-SRC_URI="https://yasnippet.googlecode.com/files/${P}.tar.bz2
-	doc? ( https://yasnippet.googlecode.com/files/${PN}-doc-${PV}.tar.bz2 )"
-
-# Homepage says MIT licence, source contains GPL-2 copyright notice
-LICENSE="MIT GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND=">=app-emacs/dropdown-list-20080316"
-RDEPEND="${DEPEND}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_unpack() {
-	elisp_src_unpack
-
-	# remove bundled copy of dropdown-list
-	rm "${S}/dropdown-list.el" || die
-}
-
-src_install() {
-	elisp_src_install
-
-	insinto "${SITEETC}/${PN}"
-	doins -r snippets || die "doins failed"
-
-	if use doc; then
-		dohtml -r "${WORKDIR}"/doc/* || die "dohtml failed"
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-
-	elog "Please add the following code into your .emacs to use yasnippet:"
-	elog "(yas/initialize)"
-	elog "(yas/load-directory \"${SITEETC}/${PN}/snippets\")"
-}