Update ebuild to EAPI 5. Specify LICENSE more precisely.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)

3 files changed, 20 insertions, 30 deletions

diff --git a/app-emacs/remember/ChangeLog b/app-emacs/remember/ChangeLog
index ceacb5aaed02..1b32b9a44d05 100644
--- a/app-emacs/remember/ChangeLog
+++ b/app-emacs/remember/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emacs/remember
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/remember/ChangeLog,v 1.17 2012/12/01 19:43:59 armin76 Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/remember/ChangeLog,v 1.18 2014/02/23 09:28:02 ulm Exp $
+
+  23 Feb 2014; Ulrich Müller <ulm@gentoo.org> remember-2.0.ebuild:
+  Update ebuild to EAPI 5. Specify LICENSE more precisely.
 
   01 Dec 2012; Raúl Porcel <armin76@gentoo.org> remember-2.0.ebuild:
   Drop sparc keywords
diff --git a/app-emacs/remember/files/50remember-gentoo.el b/app-emacs/remember/files/50remember-gentoo.el
index 50103820923d..d12bde7b24b1 100644
--- a/app-emacs/remember/files/50remember-gentoo.el
+++ b/app-emacs/remember/files/50remember-gentoo.el
@@ -1,6 +1,3 @@
-
-;;; remember site-lisp configuation
-
 (add-to-list 'load-path "@SITELISP@")
 
 (autoload 'remember "remember" "Remember an arbitrary piece of data." t)
diff --git a/app-emacs/remember/remember-2.0.ebuild b/app-emacs/remember/remember-2.0.ebuild
index adcccabcceae..7a936b720109 100644
--- a/app-emacs/remember/remember-2.0.ebuild
+++ b/app-emacs/remember/remember-2.0.ebuild
@@ -1,14 +1,16 @@
-# Copyright 1999-2012 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/remember/remember-2.0.ebuild,v 1.3 2012/12/01 19:43:59 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/remember/remember-2.0.ebuild,v 1.4 2014/02/23 09:28:02 ulm Exp $
 
-inherit elisp eutils
+EAPI=5
+
+inherit elisp
 
 DESCRIPTION="Simplify writing short notes in emacs"
-HOMEPAGE="http://www.emacswiki.org/cgi-bin/wiki/RememberMode"
-SRC_URI="http://download.gna.org/remember-el/${P}.tar.gz"
+HOMEPAGE="http://www.emacswiki.org/emacs/RememberMode"
+SRC_URI="http://download.gna.org/${PN}-el/${P}.tar.gz"
 
-LICENSE="GPL-3 FDL-1.2"
+LICENSE="GPL-3+ FDL-1.2+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="bbdb planner"
@@ -19,26 +21,14 @@ RDEPEND="bbdb? ( app-emacs/bbdb )
 	planner? ( app-emacs/planner )"
 DEPEND="${RDEPEND}"
 
-SITEFILE=50${PN}-gentoo.el
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-1.9-make-elc.patch"
-}
+ELISP_PATCHES="${PN}-1.9-make-elc.patch"
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="remember.texi remember-extra.texi"
+DOCS="ChangeLog* NEWS"
 
 src_compile() {
 	local EL="remember.el read-file-name.el"
-	use bbdb && EL="${EL} remember-bbdb.el"
-	use planner && EL="${EL} remember-planner.el remember-experimental.el"
-
-	emake EL="${EL}" || die "emake failed"
-}
-
-src_install() {
-	elisp-install ${PN} *.el *.elc || die "elisp-install failed"
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
-		|| die "elisp-site-file-install failed"
-	doinfo remember.info remember-extra.info
-	dodoc ChangeLog* NEWS
+	use bbdb && EL+=" remember-bbdb.el"
+	use planner && EL+=" remember-planner.el remember-experimental.el"
+	emake EL="${EL}"
 }