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

Package-Manager: portage-2.1.11.24/cvs/Linux x86_64

5 files changed, 49 insertions, 32 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/Manifest b/app-emacs/lookup/Manifest
index 50da5843a80d..7a86ffdb5930 100644
--- a/app-emacs/lookup/Manifest
+++ b/app-emacs/lookup/Manifest
@@ -1,25 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX 51lookup-gentoo.el 192 SHA256 7b3fe8ac9c5a6f1505726572d9eb1e6891ec38d4c20021534a4ae3fe18286aef SHA512 e15ded5f0aedc1934dc08993307382597e5d0048f03c14b03d7dfbc2c99d17f743c6379a1a2e8aa971ff657ab6fa03d9986a6d74ab2cf5f5907b732243779b90 WHIRLPOOL 2496484a16c3c1ccb761c63640c1133e8ceedeb0f976326ac7885e639706fe2ba70dbc0a23d9ed1c9a87f644c6c1fbb43a7c18dcf3c3cb6684e1a8a5a97b76b7
+AUX 50lookup-gentoo.el 155 SHA256 ecdb0ec220b3848384b5f4f57e7f7e902bea7975b3fa17d772337cce51f2b98b SHA512 021e3bd99a25974788966d840cf5ce9359447c1aa331b9ef517aef23c4dc79581539bfd61a5f35f92551a4c189a64867fbf173212d28172e379da3532c1a9694 WHIRLPOOL ca0664da8528298b0eb255b26555c3fb5af92e67fc60ca729df9983f4cbf51c3d617be097b129cbb0c479a02b011a92b528cbff4709dddb322477f706aa39168
+AUX lookup-1.4.1-garbage-char.patch 283 SHA256 2775dc9aa56a4efc32f483651b783e71d3ac1bfa9b7e39e96588f35701cd62f4 SHA512 7e338e2184454579f2e5675e9b969805bd8954fa51fa55a42b62a58094f1f9a1760f1430cb61916bdfd999428f06705f555b6325c993edad7b119e7083325e11 WHIRLPOOL af7a3a5e71927bf3dc6f686c66420b7380d01671180aa0e56f1e5a4f87fb3ad1f31f46f89d2fc93dc65636854ad9350dd79507886219905edd903066a4948d51
 DIST lookup-1.4.1.tar.gz 346391 SHA256 13ab02652e322773f279db1862e4423c24da0da0b662dd6a29dbd95aca729bfa SHA512 a28a770ba58f07db5a7b2452792fc0e83b74e3b45556e84a9729c73773df661dbb7d356c1f7be803feb66f23e154aa825dab610f841bbe655bc76bd7120370bf WHIRLPOOL 2096df15468826cdd69b53210c3e86cd83823dbc4c5cc4b16f438732a4ddc21e902a057f60a5d076b319b977f485a2b7badd5d8983c79c0b04822c8fa0f00746
-EBUILD lookup-1.4.1.ebuild 856 SHA256 cfd1b05ea6d3f25aef1d240dd86db3024b30ea324107a3d7e65dd2bd2627de5a SHA512 7d958487e7f05ed8618c234143458f2da03ba0d1f9b071890d9e274c1e0549590749d87b7155af181f541762e8552637540801998c8246bff306249fda7d0842 WHIRLPOOL b8b2654ab0bd0024e0b476678592eba850cc8ceb727714a1d70048686717bf3375122f96651836f2c0d720bd8541f9b9ae6ef0f961435d43f0704b41f852ab00
-MISC ChangeLog 2182 SHA256 f63540abde2044ba38ec8ab83027dd170bd9ac244e38630bc206b9df9fc29df9 SHA512 b9781ab9fc449b1ef255964534cc02f852b8372eec2bff5a27dc7a5741ea64602ddd20840ef0dd6892ea750f433a71b4f3a3fceb5b74571b8eb853df726a8ab3 WHIRLPOOL 8be45200610259bdaaee100b60f884cc19f76a1e14e1121736cf99cb940f7bd8b078c8eb81218b56f7e1d87200d69d4dcd147a93d0e5d6c054200f215b7605ab
+EBUILD lookup-1.4.1.ebuild 800 SHA256 d54c6479929fe3886e22d25c634cffe992349015b465999be3510e96271445a0 SHA512 00d06689133c743fd159fc59a8d681bad04dbdba2927b694d598fe9cde8e80f65a94c67031370f2a22b9758188178e0e82b688a3e9903d10169628ce695efe76 WHIRLPOOL 3518071b3eb2ba5e02f83d40224c4cab791266a60eebf503288fcf52af51d6038cdcd0907332c7011672c9208e7f68b116d5935c141dcb2d82560c7b84cea4d3
+MISC ChangeLog 2445 SHA256 b2c5d51370cfc79074c2cc52dec2e3d1482b89bff4897d5bbe6899bb87955a22 SHA512 47ccf4641a44a06de9ba8fc58fbba6bbad8d7ee6636aa8c1558f940b4b694a3da46cf403d9d16c3bdc35c5eed7d4e78000cbf5cff2736428347d71eba3e0e48f WHIRLPOOL ffc567091dc3c5156c5735cd32fc76e46e6cbea41949926a5b64eaaf331c4c0fbae38290cc0988acc5bb2e8fc816b918703f16597c66c4fb4ce4b68d6c328bbe
 MISC metadata.xml 175 SHA256 e2e9036049fea5db03defb9ea98a8f5d3ff6cfa8394d226af2eec366d0d9d7ee SHA512 013d8e27b5d70ee9fad253f22952e9de2e6bf3cfb12353f6cd57765c682ce8dd8a2e07c4570081e3d7917722e5d2c3f4725b12e303512be5e496f7632c5aa02f WHIRLPOOL 79a86abd08f3f82d5dc3b2dd980f4c6cc76dde0b103c74ff834021dc53a765ecf188d8cd10a95d9795e35769b7e4fe7ff1b641b72e32d0a97324c7193fe1c088
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJP9fB2AAoJEDxpGckxwJCBS/sQAItJIw3Ib1bJBIgJ1VkOMkmE
-EVgIEzgacQDCViR4lSknFIhLroq43njf00sPrAIreO0ZWBBdc2BWO5a7Xp+k8bsc
-+GSREN3ccPEsqlS/+q2cpiMAdU4PEFP78P5R2OQnkPhYzdAfT3PepJtDSNmszFla
-HjD7NHtTWRxa0bLIayxuK131TowFVjmg9sJSmFlNipxIHueF0wfdV0NlYejsCLKx
-ojn/oH1JezOPza3lRNTKt0VLZwcLbDHJJUGudn1/nWhKfziL+p5d11TNcoq3GFSN
-muaZ9r/n/vAN+JYwlIkqxaiG4dGKcIxhFb0V2sgWQT8D6O3XG3zWE6jr4HtL5Q27
-35rFThYVZCxQR20YtWWf9QGXwPIZHA767W0JmoVXm7Iq8aQXj9Dn6hxk/GW4rwTF
-v3YQnYe1BxZxGVYQHWRJVKLxzV+MWVWLaKqsgDrEIp7Kq5VD9QM+8uXLWHZPddO6
-ZGP/g2AER8shpKZNsjAIzbz5O7T90j4xHlwFKCZP++WR80v1souBGk2xXhhCn8PN
-7UkF21AZPPjwti9HrMZhC9Rf9Q6i4bH+fbgX4qid7yyVdEgOuOJLY6Y8t/stDVbm
-TThST25Ln2psI39ZGebYnfMSWdwZMgWTMyPUJJusuKQk+fq/+JCc/X0RuUMRX07T
-AYJkpQEmx9zxO6psm7ey
-=8B9f
+iQIcBAEBCAAGBQJQdeKxAAoJEDxpGckxwJCBXSsQAIBeJBiiyknvMw3rlvxKMhen
+zUO5XOGXCfSvuoNo3QCP0Q6s5wW2AfAEzfpjbDkuGoSi7WKCeWACeIjMIKmrxbW+
+xBGPsxuy7gkELfE9ZO1Tjlt0UrDtcmBmOXgN5V4E46YDXfXDROE1XuLV2qel+MRI
+pkJEh8Nl6T/dVaP6rlKoXf79v9Yqf7NERXOXUVfg9b/MiSzkWG2cfqqtYcIIY7aD
+h55P7yMoYiUvOOFcWOHrYyGmWdNJtvNa/3jOgyNmq0iy9/6FquCk8A2Y231XWXDJ
+oONulMamIt+XsW32MVZuAzNLhr6UgAy1PSLH4DCpDon8UMNCWedU5R+oyjCK4Mdz
+9hq0NXd++sxe5XeQ6WxbLJyn9eG6zKlaFSapxDZs2WVKNOx5YKInlan3odVYZWLn
+z1LtCRenWSrVccDEUiMVuZmIWlLChr/zXwVeYYnmNgQXI1GF7BdYbK/fkadJPVI0
+66eZzIbHhJCMEdap7lYN2MP7eI3Eqhkr71eIAIRZrYp7RJnfa7Gk55IiC6N9Kn/a
+WXk/uJOz8hsr+p1/xvAErFy44mm7RNwf+AmC44Pp0nz2tkaQ4FfOfYZz+Cf8lHFD
+NFFDi7C/LWyd6kEyQqQOOmzWLFcWOj5EiF21Us5lRY9JV2v0nW7gZYQQp8PV/sGD
+nVDKUaZtQWg9sychj3RV
+=p/qZ
 -----END PGP SIGNATURE-----
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
 }