Fix compilation with Emacs 24, thanks to Naohiro Aota in bug 425270. Update ebuild for EAPI 4.

(Portage version: 2.1.11.24/cvs/Linux x86_64)

4 files changed, 31 insertions, 15 deletions

diff --git a/app-emacs/lookup/ChangeLog b/app-emacs/lookup/ChangeLog
index a5680358fa5d..85c78d82f480 100644
--- a/app-emacs/lookup/ChangeLog
+++ b/app-emacs/lookup/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emacs/lookup
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/lookup/ChangeLog,v 1.16 2007/12/25 16:41:51 phreak Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/lookup/ChangeLog,v 1.17 2012/10/10 20:54:18 ulm Exp $
+
+  10 Oct 2012; Ulrich Müller <ulm@gentoo.org> +files/50lookup-gentoo.el,
+  -files/51lookup-gentoo.el, lookup-1.4.1.ebuild,
+  +files/lookup-1.4.1-garbage-char.patch:
+  Fix compilation with Emacs 24, thanks to Naohiro Aota in bug 425270.
+  Update ebuild for EAPI 4.
 
   25 Dec 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing usata from metadata.xml as per #22931.
diff --git a/app-emacs/lookup/files/51lookup-gentoo.el b/app-emacs/lookup/files/50lookup-gentoo.el
index eafac10a9a10..9ae8d93a847c 100644
--- a/app-emacs/lookup/files/51lookup-gentoo.el
+++ b/app-emacs/lookup/files/50lookup-gentoo.el
@@ -1,6 +1,3 @@
-
-;;; lookup site-lisp configuration
-
 (add-to-list 'load-path "@SITELISP@")
 (autoload 'lookup "lookup" nil t)
 (autoload 'lookup-region "lookup" nil t)
diff --git a/app-emacs/lookup/files/lookup-1.4.1-garbage-char.patch b/app-emacs/lookup/files/lookup-1.4.1-garbage-char.patch
new file mode 100644
index 000000000000..7c9a3bea9152
--- /dev/null
+++ b/app-emacs/lookup/files/lookup-1.4.1-garbage-char.patch
@@ -0,0 +1,8 @@
+--- lookup-1.4.1-orig/lisp/ndic.el
++++ lookup-1.4.1/lisp/ndic.el
+@@ -1,4 +1,4 @@
+-e;;; ndic.el --- Lookup by free dictionaries
++;;; ndic.el --- Lookup by free dictionaries
+ ;; Copyright (C) 1999 Lookup Development Team <lookup@ring.gr.jp>
+ 
+ ;; Author: Keisuke Nishida <kei@psn.net>
diff --git a/app-emacs/lookup/lookup-1.4.1.ebuild b/app-emacs/lookup/lookup-1.4.1.ebuild
index e1129fe4ed52..16f2b2752285 100644
--- a/app-emacs/lookup/lookup-1.4.1.ebuild
+++ b/app-emacs/lookup/lookup-1.4.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/lookup/lookup-1.4.1.ebuild,v 1.3 2007/12/01 00:08:26 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/lookup/lookup-1.4.1.ebuild,v 1.4 2012/10/10 20:54:18 ulm Exp $
+
+EAPI=4
 
 inherit elisp
 
@@ -8,22 +10,25 @@ DESCRIPTION="An interface to search CD-ROM books and network dictionaries"
 HOMEPAGE="http://openlab.jp/edict/lookup/"
 SRC_URI="http://openlab.jp/edict/lookup/dist/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-SITEFILE=51${PN}-gentoo.el
+ELISP_PATCHES="${P}-garbage-char.patch"
+SITEFILE="50${PN}-gentoo.el"
+
+src_configure() {
+	default
+}
 
 src_compile() {
-	econf || die "econf failed"
 	# parallel make fails with Emacs deadlock
-	emake -j1 || die "emake failed"
+	emake -j1
 }
 
 src_install() {
-	einstall lispdir="${D}${SITELISP}/${PN}" || die "einstall failed"
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
-		|| die "elisp-site-file-install failed"
-	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
+	einstall lispdir="${D}${SITELISP}/${PN}"
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	dodoc AUTHORS ChangeLog NEWS README
 }