gentoo resync : 09.06.2018

6 files changed, 45 insertions, 106 deletions

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\")"
-}