Use elisp-compile instead of elisp-comp, bug 235576. Fix compile failure with USE=emacs, bug 227523 comment 2.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 i686

4 files changed, 53 insertions, 12 deletions

diff --git a/dev-lang/gforth/ChangeLog b/dev-lang/gforth/ChangeLog
index c1e8122375fe..3b05cf9a574e 100644
--- a/dev-lang/gforth/ChangeLog
+++ b/dev-lang/gforth/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/gforth
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gforth/ChangeLog,v 1.25 2008/08/23 05:21:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gforth/ChangeLog,v 1.26 2008/09/06 06:50:36 ulm Exp $
+
+  06 Sep 2008; Ulrich Mueller <ulm@gentoo.org> files/gforth.el-gentoo.patch,
+  gforth-0.6.2-r1.ebuild:
+  Use elisp-compile instead of elisp-comp, bug 235576. Fix compile failure
+  with USE=emacs, bug 227523 comment 2.
 
   23 Aug 2008; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Add GLEP 56 USE flag descriptions.
diff --git a/dev-lang/gforth/Manifest b/dev-lang/gforth/Manifest
index 6b798a9e7170..21bd6ebbd5ec 100644
--- a/dev-lang/gforth/Manifest
+++ b/dev-lang/gforth/Manifest
@@ -1,10 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.6.2-c-to-forth-to-c.patch 702 RMD160 585cd5b1e215c0644df28b55de47133b88c75bcd SHA1 394b90c041742fb8c0113420c3806340fa2a3ad8 SHA256 f50fae8f741b72d4d07155b96d11e59ba663b330910faf49774ffe14e85f5c5e
 AUX 0.6.2-ppc-configure-gentoo.patch 528 RMD160 12719214cd79123a62388c8c69d5db84698e97eb SHA1 bc00a1b23387f092a81b5422e73c2e94c917988e SHA256 868c2951d49bd6752821c885da7fc8e90cb43948c993dfa5c13147de95df2de4
 AUX 50gforth-gentoo.el 200 RMD160 79bceb8512f929d2fc9916a9622ef9e466159acf SHA1 fb70db63f220bc5f7c39e5dbdf5c67f581d85031 SHA256 235051d92cd39a0d327246d60555bd8a8386b5b20276aa35fe8bd34565b691f6
-AUX gforth.el-gentoo.patch 390 RMD160 4957e9a817bb6bb9e58523285a00b2b3445f65ed SHA1 3782b75e0c8019c2988be9e4655c3a350b547ae2 SHA256 920d8b8e07ab8e81f0fe7883ec8ea34507a33a9db337d5e7725e96f804bbb5aa
+AUX gforth.el-gentoo.patch 1209 RMD160 3bf00b4707d023e1653d22f91f99e0949734109c SHA1 19d51674df6430b362f643c4264207136c00d809 SHA256 a6bf4a224e4104a635ac8059f42bc6fa38fd273c3890e47b6639063ace60bb9d
 DIST 0.6.2-debug.diff 5127 RMD160 eade613904465b02ab8c480f136751fc334fd778 SHA1 188c19d8e7c046355b86da5dc37bcf5e896a341b SHA256 accb5c8b06fd11ff56febd32896678e670d2571a90ce7682dd87bd590e6159cb
 DIST gforth-0.6.2.tar.gz 1925536 RMD160 692aa412e59954f87a7b44027901248f8939e9ee SHA1 926faeac7ccc00e86a74954dc7c693b19f13e616 SHA256 28a201ae78b073ef350d7ac4a8283233029c6afe6072620ac6dd6db1d192d462
-EBUILD gforth-0.6.2-r1.ebuild 2217 RMD160 e3ec8e2cbfe31442bf2151e6629784a45f5fd4c4 SHA1 a0e4b34abb7d680ebb24dcadd710c7527fd9ccca SHA256 376629a51c2690c1391473db7aa02a6085d31892e180f514103daff879ba8bc3
+EBUILD gforth-0.6.2-r1.ebuild 2229 RMD160 fd99be90afa761a89bc627b1361d8ec52722ea9f SHA1 fc2c1bb67e3960c0e53d4e361ab37da93b67e405 SHA256 fd62934d6545489a983939906e484803484c2815412ed916225a923a24833bb9
 EBUILD gforth-0.6.2.ebuild 1373 RMD160 4a4ed08b2a79cc87e1d474e826fcfe18b46c91de SHA1 253f366570889b07005124d5f27034c877ab1052 SHA256 79abb9645d3bc1c52b736ee7bf536f430d7a99eff9a1afc2d513d580d468e22e
-MISC ChangeLog 4015 RMD160 85a3461a6a645eec1d188c23ab8be0d1114e053c SHA1 6c7b30490bf8485cf64e861014c99456c539742c SHA256 13470310dc59ce7b43c340fa573d16899aea658f9fafee2837e8db9f83ac8bbd
+MISC ChangeLog 4234 RMD160 4c2c8bb08701ba15f764d76742b4e976047e5dfb SHA1 64148b3fd10c738a5106ea0b7c01a1ce36d9e590 SHA256 3dfd25e13c4f63fef24567863db4459da17e314cdc18fb9f38143aeb07c2ee7e
 MISC metadata.xml 359 RMD160 3ae6125fe3fdc91e4dc01423db5793176836ff9a SHA1 bbb9f4ff49b0b9e54b9f77494f8fef2dfbbdc44f SHA256 2349cc0436e7ef8fd15070d31d02285ded6fa75643d4f09165196c39a525c806
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iEYEARECAAYFAkjCKEIACgkQOeoy/oIi7uxVAQCePWvLzwGOzwEik/Zvli1RVvh4
+bMgAoJkjydlNwRae2A/Rb8LKU4QO8ODs
+=gG+/
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/gforth/files/gforth.el-gentoo.patch b/dev-lang/gforth/files/gforth.el-gentoo.patch
index 710556f3ddba..cc98537e766d 100644
--- a/dev-lang/gforth/files/gforth.el-gentoo.patch
+++ b/dev-lang/gforth/files/gforth.el-gentoo.patch
@@ -1,7 +1,32 @@
-diff -ur gforth-0.6.2.orig/gforth.el gforth-0.6.2/gforth.el
---- gforth-0.6.2.orig/gforth.el	2003-08-05 04:12:47.000000000 -0500
-+++ gforth-0.6.2/gforth.el	2006-02-17 11:30:49.000000000 -0600
-@@ -1702,6 +1702,6 @@
+--- gforth-0.6.2-orig/gforth.el	2003-08-05 11:12:47.000000000 +0200
++++ gforth-0.6.2/gforth.el	2008-09-06 08:29:44.000000000 +0200
+@@ -61,9 +61,10 @@
+       (progn (string-match "^[0-9]+" emacs-version)
+ 	     (string-to-int (match-string 0 emacs-version)))))
+ 
+-(defun forth-emacs-older (major minor)
+-  (or (< emacs-major-version major)
+-      (and (= emacs-major-version major) (< emacs-minor-version minor))))
++(eval-when-compile 
++  (defun forth-emacs-older (major minor)
++    (or (< emacs-major-version major)
++	(and (= emacs-major-version major) (< emacs-minor-version minor)))))
+ 
+ ;; Code ripped from `subr.el' for compatability with Emacs versions
+ ;; prior to 20.1
+@@ -79,8 +80,9 @@
+ 
+ ;; `no-error' argument of require not supported in Emacs versions
+ ;; prior to 20.4 :-(
+-(defun forth-require (feature)
+-  (condition-case err (require feature) (error nil)))
++(eval-and-compile
++  (defun forth-require (feature)
++    (condition-case err (require feature) (error nil))))
+ 
+ (require 'font-lock)
+ 
+@@ -1702,6 +1704,6 @@
  	  (error "No current process.  See variable `forth-process-buffer'"))))
    )  ; (memq 'comint features)
  
@@ -9,3 +34,4 @@ diff -ur gforth-0.6.2.orig/gforth.el gforth-0.6.2/gforth.el
 +(provide 'gforth)
  
  ;;; gforth.el ends here
+
diff --git a/dev-lang/gforth/gforth-0.6.2-r1.ebuild b/dev-lang/gforth/gforth-0.6.2-r1.ebuild
index 6f79e7675c68..d3e9c454a65a 100644
--- a/dev-lang/gforth/gforth-0.6.2-r1.ebuild
+++ b/dev-lang/gforth/gforth-0.6.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gforth/gforth-0.6.2-r1.ebuild,v 1.5 2008/03/17 15:56:08 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gforth/gforth-0.6.2-r1.ebuild,v 1.6 2008/09/06 06:50:36 ulm Exp $
 
 inherit elisp-common eutils toolchain-funcs flag-o-matic
 
@@ -55,7 +55,7 @@ src_compile() {
 		|| die "econf failed"
 	make || die
 	if use emacs; then
-		elisp-comp *.el || die
+		elisp-compile *.el || die
 	fi
 }
 
@@ -71,8 +71,8 @@ src_install() {
 	dodoc AUTHORS BUGS ChangeLog NEWS* README* ToDo doc/glossaries.doc doc/*.ps
 
 	if use emacs; then
-		elisp-install ${PN} *.el *.elc
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+		elisp-install ${PN} *.el *.elc || die
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
 	fi
 }