6 files changed, 3 insertions, 59 deletions
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index b2732908ac8a..e15f87b3d020 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/ddskk/Manifest b/app-emacs/ddskk/Manifest
index 54f91457109e..2435171b3b4b 100644
--- a/app-emacs/ddskk/Manifest
+++ b/app-emacs/ddskk/Manifest
@@ -2,5 +2,5 @@ AUX 50ddskk-gentoo.el 112 BLAKE2B 090925d25ada70386b13c259fa0ac6eae72f45c7bcb927
 DIST ddskk-16.1.tar.gz 878564 BLAKE2B 4b57311cf4478999d19835f12594943e1a74ee4f8705ddd6140c924bd1a90251f4127187de7df7ae1bf0635f582c4e9fbd29e644dc80a89fb3fd2eed84589b72 SHA512 68875f7ad89ce847103bbe4644db3800c84cc5907a4769c37f7aab5bc64577e1ea5f49de41c5708daf3f5f2bb7176237dcec5ea05e52a61f7c78cfb2670ced7b
 DIST ddskk-16.2.tar.gz 886618 BLAKE2B 854b9d57993e8f69af4035df49511ec110a1afd83ee290be8934283fc5f2a1a648b80f80811396083fa019d9eb12469998ff26b692296dd770c21da81c3cad3e SHA512 591d66e2d217a289ce8273ed7da10c0ed72029e961efde0537044f7ad3f5f46943cf5c71ec1d97a27743fcea91a9fab81c86e2772047892f53e2852bf58ef45c
 EBUILD ddskk-16.1.ebuild 1530 BLAKE2B 25ca1e53ff1570539f8f55b7506d520fcf937c87ef20801282bf87ddf179c440da028e267321387ca2b32ecb1ed71669a680e8198da069c06938378661cbc6d0 SHA512 554ecbfad8b0a35090c4c5a66ca6eff2f4dcdc665504f77e72fa614c45c7ef7922a293a7436dc63811effd858a28c96335323e98f5747374b5c4039bc264c493
-EBUILD ddskk-16.2.ebuild 1506 BLAKE2B 92ed1ae2b094b0af0182d6250b2aba78a46eac5f6d05a031adc29449170f0d587142e4709297cac54de491e8d2f2bd14aa9af77476da7d7f0f80b81f8fe1e3a0 SHA512 43c7cb4952d3c0ea7529f3873af268efb67b4aac8984ba24bcde8d0436532230e5c58e33ab0a292e0623586317d0d82cb9aa7a1fdedeccf543a90ba9cb6754a2
+EBUILD ddskk-16.2.ebuild 1499 BLAKE2B 6fd21b73afddf010412d836cbb6fdfe4239cddce649613b28d12d4b3132f7c1e853d3497fa6a981242b6a07aee647e0cdfffb7e3236a1ff1902f6845893713a1 SHA512 a632010ecd7fbfc7d238f9a3952fa7b829c8c2d17f9734de0f065f94f97ad40bb1c60df8b91b7f10298df7cab9f193aa37d50568f3b5a2d471a22037b68befaa
 MISC metadata.xml 450 BLAKE2B 5458defeba3a265354c3a885106a590beb379c83bee36af2859e604a2ae19c108962a6400a614443dfb3a6391088c98474cae996e60bd02d320d9f44de990bf9 SHA512 8a7b366ada5366e2713e3850421729b395862f662476225f3a7ae24dcc0067ff51c4a8ce8408c2ce2082722f0649b0ad8c047230a0223c03e2ef8b416c7e65fe
diff --git a/app-emacs/ddskk/ddskk-16.2.ebuild b/app-emacs/ddskk/ddskk-16.2.ebuild
index 7493aff21240..b5543cea892c 100644
--- a/app-emacs/ddskk/ddskk-16.2.ebuild
+++ b/app-emacs/ddskk/ddskk-16.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 NEED_EMACS="24"
 
 inherit elisp ruby-single
diff --git a/app-emacs/yasnippet/Manifest b/app-emacs/yasnippet/Manifest
index add2d717a630..cf18862df683 100644
--- a/app-emacs/yasnippet/Manifest
+++ b/app-emacs/yasnippet/Manifest
@@ -1,8 +1,4 @@
 AUX 50yasnippet-gentoo-0.13.0.el 221 BLAKE2B 51f86d04a825b5e1cb60019bddac2b0e2d91d735ffafdae497c87413eb0ad88efd969575edfe139ba250d2e2115f1c5a242de61f54031b684f35437e6e868989 SHA512 ace64b43229ee327add5d6ac056b86f7468ffb79569ca55d3692c93fd4b9e847d83fa731c8e54ad2aced5d64ed73c9cfa1fc6d6f9a883356dbb6a39142d9a2fb
-AUX 50yasnippet-gentoo.el 209 BLAKE2B 0acf1e2d1d05f5abd807bfd97fded3f1fa40a0289f76f4c4668b1b545b4dc71042d59387d8b58b0fcda4bdcfefbf438a6cf6cc6ab134f40e5f19f4c5d5080012 SHA512 5c2f65e97cece730eed4d34ab3520214b5b6cf63ffdfa82f5252b03122e26fe7d78a0748dbbd95886526fc47e39d3a5675b5df48f50d0ea97f1efe306e3f733d
 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.6.1c.tar.bz2 490738 BLAKE2B e312481c7693094d62eb0aec465412ea1c894ca5132df9c2beba49c3c78daaec90ca80d17fc9404edbdd8cea1fce63804a102cbe9b7d3d7b23f0761b8a0ea552 SHA512 c96955cac11f319107e0ea907c92860049598cbfd47b6a2e3211dc2b030face77b03aa9495d7e9d78171be87083f77268e90c6c86b0cc467a96a5bd724daf8f1
 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 519 BLAKE2B ee75758a0efbdb9bba9ade444a083901bd22dff47f20ace413983e446f0857b59ca1dbe9ae37dfb9e8ac9d3135ccdfc56dcab712d419a6946084b970ad673745 SHA512 cec1174ce420c4040c18719881f4bcba872af9a12d30ec3ba2e937374be62583a3a2e40622659e3823b2e0c81ba37fb8188fb58dbb0c09375a082eca20ae1421
diff --git a/app-emacs/yasnippet/files/50yasnippet-gentoo.el b/app-emacs/yasnippet/files/50yasnippet-gentoo.el
deleted file mode 100644
index d07f448098bd..000000000000
--- a/app-emacs/yasnippet/files/50yasnippet-gentoo.el
+++ /dev/null
@@ -1,4 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
-(autoload 'yas/initialize "yasnippet" "Do necessary initialization.")
-(autoload 'yas/load-directory "yasnippet"
-  "Load snippet definition from a directory hierarchy." t)
diff --git a/app-emacs/yasnippet/yasnippet-0.6.1c.ebuild b/app-emacs/yasnippet/yasnippet-0.6.1c.ebuild
deleted file mode 100644
index 831ffed191b4..000000000000
--- a/app-emacs/yasnippet/yasnippet-0.6.1c.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\")"
-}