Update EAPI to 5. Specify license more precisely. Use readme.gentoo.eclass.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

4 files changed, 31 insertions, 39 deletions

diff --git a/app-emacs/mailcrypt/ChangeLog b/app-emacs/mailcrypt/ChangeLog
index 7e64dbce6a58..f73d05d3ef4f 100644
--- a/app-emacs/mailcrypt/ChangeLog
+++ b/app-emacs/mailcrypt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emacs/mailcrypt
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/mailcrypt/ChangeLog,v 1.24 2010/10/15 08:34:24 fauli Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/mailcrypt/ChangeLog,v 1.25 2014/04/21 13:09:38 ulm Exp $
+
+  21 Apr 2014; Ulrich Müller <ulm@gentoo.org> mailcrypt-3.5.9.ebuild:
+  Update EAPI to 5. Specify license more precisely. Use readme.gentoo.eclass.
 
   15 Oct 2010; Christian Faulhammer <fauli@gentoo.org>
   -mailcrypt-3.5.8-r1.ebuild:
diff --git a/app-emacs/mailcrypt/Manifest b/app-emacs/mailcrypt/Manifest
index 1cb10b771e68..ba21114bf41a 100644
--- a/app-emacs/mailcrypt/Manifest
+++ b/app-emacs/mailcrypt/Manifest
@@ -1,25 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX 50mailcrypt-gentoo.el 78 SHA256 25917739f5d343a8e79f6d07a5ca42e7625922ed50ee7128da62d4224ef5ae44 SHA512 2a21c0c7d662280e3a9bfe7d97c3142157ebd499ce742ce3f9b9db30a1e1c97de52486debbe768bb17292ae4496ac60acdd30227af5d60918c07d53428fea9b1 WHIRLPOOL 8c9f63c0e128950b5659614e2b8fe9181c13fae5faa0e31d9902adf08558cddfc02a8bda9980d43c564f9b95b0c9f3a63ceea32fd9c75e0ea1005727846ce1f0
+AUX 50mailcrypt-gentoo.el 38 SHA256 f34ea07a3270a25cce3430e4781df47d9903052c9f3a4ea24efb64b1e63bd115 SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5 WHIRLPOOL cc5e2fd5081f5fb0018e1fa461c0802c7c90891accc55c02c2935dd3d413c5f8941e918af9341040526b037be4c34dab26008dfca91c153c11fca41338f77c14
 DIST mailcrypt-3.5.9.tar.gz 172073 SHA256 a195e1e56db44519945861900c6a11c787fc28482d939d5a7564a0f0b900e054 SHA512 df6524ecc42d4c7bdddb34439186690192bc4091a1965e405223106fc71047c33e4bbbd571b030c326efec46961ba0aefd018ff1205d230dc74c34daf93ba079 WHIRLPOOL 19e7cceb7e1cc400e53165f21355ab501e0712f9d3da23cc81569a440bf20ef0d423ffbc7a5f4a9a00271fc3bccae2a322bbdf89a717aae55dea38a071865d5b
-EBUILD mailcrypt-3.5.9.ebuild 1024 SHA256 1fd859bcd9c6d20ae78002284f9363d6ef68c2c10867a0566e391b6c7daf1bb4 SHA512 5be3d54f03f163c1b6d80732d605fa1f0715d6633f4fa5d7f8987039ee7e5dfab0081fa614174356b3bcfd881d3c89510f602dedbbd7f7318b1d9e029c8fcf7f WHIRLPOOL cf08921dc0fac638631e311fba1fecc894a4c204fa630eb705a8f6d4482084441f4e6276416678ea8755074a5c19ee3defda6ddf172b7928df1b7a4763956bbe
-MISC ChangeLog 3205 SHA256 d1917ff75a87d9252214cddd8a61d877ce5e2760035605e4611252019c59568b SHA512 e21c4d4ec3457cb744c23e9c1b7a68df9c31d65a1d547db7d7bf63b1486b5c28b05ae6b8a020a7f2251e89550c5710b27e74793fc1eaad93a08989ef62fcc2ab WHIRLPOOL eb776c7a264d73401c58caa2aaf9588bfb46861b61409fa5dfc47a6fb847797e632526f7a8e9d2fe3800fcfbd3945ee4e0a1c20bcab43db5d19fb1e05051d71a
+EBUILD mailcrypt-3.5.9.ebuild 968 SHA256 5f9eaf139ca370d410eaf1a587570518dc85fdc04d1725659658301aabcc7733 SHA512 4fe82e2b9831653d7cb19880c9a8c2a169a7cdc9fbca196d14498f960ed819ed88f39b6ee437ec8fe47790a6a72a46cbe067713e4c3eda3152dcbaccf2a24aa0 WHIRLPOOL 739591e57bc1fd1b2a8f80986594897bdf2bbfdbfd91177f96bb3974bca0f1ba5436344c339c1e105097e06a9842ab4f79bbe8fe35a0fbdbd7b381f547d5beb6
+MISC ChangeLog 3353 SHA256 ba8baff3ae7bd25711587b7e2cc9600bfc889f80b96a51830cf5e1f5fcd4632c SHA512 6cecb2681913b213e567e43fa75367fee9cbc5d9c06608319abfb82699f6f4df4d095a229f63a385d8c87aa0b2bd9029fccf2b35f8e1418604de4bc20048a6c4 WHIRLPOOL fe33a40f8ccd32f0e51e594f22dba3f54589e8010d65c8b0c306cae5884a6eb558a7a5e6653fdda54878df6588c148e71d3bd722a2ff3ad4a2d4a767ab371f75
 MISC metadata.xml 158 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab SHA512 e55d75feae933ba948ae987305ea58e36f5880f18687e8acaf91237e33e251be3ecfd5be27048f4907ea6799e0bcf784b602096dd7e2bc9c450eb5e2bb6a73d2 WHIRLPOOL 1d1676172186235a3e99ca1d148298fb24f6a089f9b7908b3c28c246c8854969835fd3742b8b81e0a30b63d76ee0be0c42bfede2416a30dfc3c8b915a147340c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBAgAGBQJP9fDFAAoJEDxpGckxwJCB7JMP/0GegQPJuN1V9TsDQTUxp8NW
-z277cyEBUj7YqOiCWsqu2+NPFFstBfoRxMaXHGaXTR91Ynp+4FaORo/5EGChZ44i
-BLfUup4Y+96Ys4oxSFXdB/Z2c8YmQn823O5F118RY4uLt8T6qYIk1x2gBAaUnOZo
-7ee3ba7Qaesax9Z9vPu8yTBlMaWnsVWtdb7j442m93JSKxTO11Gp/DLao6h4rKzE
-6o5oQUX/d4b1mX9RI5hjv+goJ6Y6t51s/u4NZL0xQZmwZ6nJWgHcFauGdXE+khu4
-gUs4k58yPPMzULtDXzJ07kFdW37xpMy97UIgMSP6YdzZUpLzJFw3FJyYIqojF+8j
-rAWdsVqnx+p2IZKyZ5iHE394od9rpO0WVYL24Edxwxo959/lrPu5MlNUVRZZT6hx
-gFLOfkT9JFovmrrvwUQvyvRI+AFy6gtazbNIDjfJQ3bqEq8GsAVT+ppm2N65HDPe
-z2Cw6S3zKJbtIo6WDudJkgD67L+C3Cbo5oUSR5bh5/FeXWnss/hefrKWFPlK2wtn
-WTch26NfjRVEWbpI5t1jqFdZhyGCPLdHKAH6wqn88CIDZWMjb63TqWBCK3wq5xXy
-oA3dxfenD6zvptqVXNmOhdLDm+2HuHUzZsCc2BHYHM0FPojBsNDWjXKupms5scVl
-4z5lfMR9UGmjEnXzHeTa
-=TQEP
+iQGcBAEBCAAGBQJTVRitAAoJEJQzkH1pP7W4iYkMAIRKqqi+1H1YLeQme15ligKu
+ckakE5UnqgFm70xWg3BZkKTYl7X88aljOam9oibqzCy61hbphS3ZzPIR5PRB/lpR
+OdVQAhlGoIcvclraUMqQQnqnLU221fdPo1Wu0Tq7pWufK+Rzm/yvs2YmNXExSCm2
+fcj5qP/gq9IDsgSqSf1wV9KlvfV/S6hB5yag9J9pl5URQfedKRjuQXj7Qp6MiKlr
+WVPCkYM2wEDwx//SKkAkX5bNMPkhXMdAlsPRTDdb8AXiH3Li2NERSaIx+GxiVpJh
+OZ4xYQRCYsAmSIIM3n39TqKTxupU5aOe6nDG0MKLqnRUR4EJ2o8V4tbIxrYTNNjC
+RpF0xRnxSLlG8TbxgDMbFeTc2HBWKaMJGZBtWVK1mxI4gWLAaJYOIvHAoTi+nPDT
+thCV0A2snReNhy0CR0venS27PLaMS28slEaHZZ47NMUp481FTp6sJ0Th4U8DGp0+
+ZNrh+TdsKuTuuvLLLhZ1tIDNk8eWrAEUTqCySF68+Q==
+=GCC+
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/mailcrypt/files/50mailcrypt-gentoo.el b/app-emacs/mailcrypt/files/50mailcrypt-gentoo.el
index b937f30982b5..431f7e90ae73 100644
--- a/app-emacs/mailcrypt/files/50mailcrypt-gentoo.el
+++ b/app-emacs/mailcrypt/files/50mailcrypt-gentoo.el
@@ -1,4 +1 @@
-
-;;; mailcrypt site-lisp configuration
-
 (add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/mailcrypt/mailcrypt-3.5.9.ebuild b/app-emacs/mailcrypt/mailcrypt-3.5.9.ebuild
index 03e2264fb3b7..0a6cbc21c9e1 100644
--- a/app-emacs/mailcrypt/mailcrypt-3.5.9.ebuild
+++ b/app-emacs/mailcrypt/mailcrypt-3.5.9.ebuild
@@ -1,19 +1,18 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/mailcrypt/mailcrypt-3.5.9.ebuild,v 1.5 2010/10/14 16:49:05 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/mailcrypt/mailcrypt-3.5.9.ebuild,v 1.6 2014/04/21 13:09:38 ulm Exp $
 
-EAPI=3
+EAPI=5
 
-inherit elisp autotools
+inherit readme.gentoo elisp autotools
 
 DESCRIPTION="Provides a simple interface to public key cryptography with OpenPGP"
 HOMEPAGE="http://mailcrypt.sourceforge.net/"
 SRC_URI="mirror://sourceforge/mailcrypt/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
 RESTRICT="test"
 
 RDEPEND="app-crypt/gnupg"
@@ -26,19 +25,15 @@ src_prepare() {
 
 src_configure() {
 	export EMACS=/usr/bin/emacs
-	econf || die
+	econf
 }
 
 src_install() {
-	einstall lispdir="${D}/${SITELISP}/${PN}" || die "einstall failed"
+	einstall lispdir="${D}/${SITELISP}/${PN}"
 	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	dodoc ANNOUNCE ChangeLog* INSTALL LCD-entry  NEWS ONEWS README* || die
-}
+	dodoc ANNOUNCE ChangeLog* INSTALL LCD-entry NEWS ONEWS README*
 
-pkg_postinst() {
-	elisp-site-regen
-	elog
-	elog "See the INSTALL file in /usr/share/doc/${PF} for how to"
-	elog "customize mailcrypt"
-	elog
+	DOC_CONTENTS="See the INSTALL file in /usr/share/doc/${PF} for how
+		to customize mailcrypt."
+	readme.gentoo_create_doc
 }