Replace some functionp calls for compatibility with Emacs 23, bug 290575.

Package-Manager: portage-2.2_rc46/cvs/Linux i686

4 files changed, 102 insertions, 6 deletions

diff --git a/app-emacs/gnus/ChangeLog b/app-emacs/gnus/ChangeLog
index 38363e747c28..32f1c19c082a 100644
--- a/app-emacs/gnus/ChangeLog
+++ b/app-emacs/gnus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emacs/gnus
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/gnus/ChangeLog,v 1.35 2009/02/19 22:53:43 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/gnus/ChangeLog,v 1.36 2009/10/26 22:00:52 ulm Exp $
+
+*gnus-5.10.10-r1 (26 Oct 2009)
+
+  26 Oct 2009; Ulrich Mueller <ulm@gentoo.org> +gnus-5.10.10-r1.ebuild,
+  +files/gnus-5.10.10-functionp.patch:
+  Replace some functionp calls for compatibility with Emacs 23, bug 290575.
 
   19 Feb 2009; Christian Faulhammer <fauli@gentoo.org> -gnus-5.10.8.ebuild:
   clean up
diff --git a/app-emacs/gnus/Manifest b/app-emacs/gnus/Manifest
index 966f9565a644..3315f1e2a9a4 100644
--- a/app-emacs/gnus/Manifest
+++ b/app-emacs/gnus/Manifest
@@ -2,14 +2,16 @@
 Hash: SHA1
 
 AUX 70gnus-gentoo.el 94 RMD160 39b9778e45868b09070446e16c5ef34c46a8fb41 SHA1 04072fbca094bff218ff484c6acb76ad6ff080a2 SHA256 b70fd86dcfda451bc585f38aa8eb2b12a097ca602f4116d3c86aef2ed889023a
+AUX gnus-5.10.10-functionp.patch 1340 RMD160 d341b44131e3385d93dfe4790516db48732241e5 SHA1 7912fa579cf99992750cb4b32feeb05f048b97ba SHA256 e7551ecb8d1ea63203991440fd79299f016377c8bf692b0b74fb2ac9e8a816ce
 DIST gnus-5.10.10.tar.gz 2569569 RMD160 8289bb37f067c59c50f647ae516f535a2f50bee7 SHA1 b03c7bba0b67c6fbc30bc1ef4c92e7a583481818 SHA256 5ae7cacb785e48a0005dfa3182bc9401597f3d7706795ca55cf32cadb5fad770
+EBUILD gnus-5.10.10-r1.ebuild 1092 RMD160 b976564c4b9a6f9a80df25f6d885a03585055abc SHA1 6e02278733a012c6029238b0c31b1ac29fee852c SHA256 32d67106ed49bc1d1a02e6afd69ca16c408f7d988e43890dce765ffc82401ef9
 EBUILD gnus-5.10.10.ebuild 1121 RMD160 82ea009458436fc2e31f651731a45951590f371d SHA1 e0856c1fd0b81fe2b73d4482c72673d975161948 SHA256 2054618846e05e0b62e1ddf3bfdc654b988d7e474ae38829fb3e130ab2377c23
-MISC ChangeLog 4164 RMD160 720e3b10cf176fd28b5dcc57bac01a244ac0da00 SHA1 9a56b1688ace45797406a23a306d9876a33ee948 SHA256 13ff828cc032cd9e2c3ab5c8f01e59bb76002f77154ffbea53073b6535dff9a4
+MISC ChangeLog 4382 RMD160 0ce2cb56a282b1e090c35921c572ac1f5719a1a1 SHA1 59206006a422434b3ecb4a0d2e1c768bb20bf211 SHA256 4d992bc12a99d3a44961019c7a0cc76d150844ee48e28252518864973f75cecd
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v1.4.10 (GNU/Linux)
 
-iEYEARECAAYFAkmd4xIACgkQNQqtfCuFnePyOQCgjNjlT1VVVVkJvt8w7NbdE3ns
-PrAAoJN4qul7jCauL1QmFlKUPF1LHQzV
-=zYvl
+iEYEARECAAYFAkrmHKYACgkQOeoy/oIi7uySHQCg0MdiA3qs2+jpz7KsJ4J5OUkl
+OX4AoOlmG158o8Q24E9dG9Im2OC5d8ms
+=fJVr
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/gnus/files/gnus-5.10.10-functionp.patch b/app-emacs/gnus/files/gnus-5.10.10-functionp.patch
new file mode 100644
index 000000000000..080bfe823b59
--- /dev/null
+++ b/app-emacs/gnus/files/gnus-5.10.10-functionp.patch
@@ -0,0 +1,44 @@
+http://bugs.gentoo.org/290575
+Backported from Emacs 23
+
+--- gnus-5.10.10-orig/lisp/gnus-win.el
++++ gnus-5.10.10/lisp/gnus-win.el
+@@ -308,7 +308,7 @@
+     ;; The SPLIT might be something that is to be evaled to
+     ;; return a new SPLIT.
+     (while (and (not (assq (car split) gnus-window-to-buffer))
+-		(functionp (car split)))
++		(fboundp (car split)))
+       (setq split (eval split)))
+     (let* ((type (car split))
+ 	   (subs (cddr split))
+@@ -371,7 +371,7 @@
+ 	  (while subs
+ 	    (setq sub (append (pop subs) nil))
+ 	    (while (and (not (assq (car sub) gnus-window-to-buffer))
+-			(functionp (car sub)))
++			(fboundp (car sub)))
+ 	      (setq sub (eval sub)))
+ 	    (when sub
+ 	      (push sub comp-subs)
+@@ -511,7 +511,7 @@
+       ;; The SPLIT might be something that is to be evaled to
+       ;; return a new SPLIT.
+       (while (and (not (assq (car split) gnus-window-to-buffer))
+-		  (functionp (car split)))
++		  (fboundp (car split)))
+ 	(setq split (eval split)))
+ 
+       (setq type (elt split 0))
+--- gnus-5.10.10-orig/lisp/mail-source.el
++++ gnus-5.10.10/lisp/mail-source.el
+@@ -482,8 +482,7 @@
+    ((stringp value)
+     value)
+    ;; Function
+-   ((and (listp value)
+-	 (functionp (car value)))
++   ((and (listp value) (symbolp (car value)) (fboundp (car value)))
+     (eval value))
+    ;; Just return the value.
+    (t
diff --git a/app-emacs/gnus/gnus-5.10.10-r1.ebuild b/app-emacs/gnus/gnus-5.10.10-r1.ebuild
new file mode 100644
index 000000000000..aa4b8640aea9
--- /dev/null
+++ b/app-emacs/gnus/gnus-5.10.10-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/gnus/gnus-5.10.10-r1.ebuild,v 1.1 2009/10/26 22:00:52 ulm Exp $
+
+inherit elisp
+
+DESCRIPTION="The Gnus newsreader and mail-reader"
+HOMEPAGE="http://gnus.org/"
+SRC_URI="http://quimby.gnus.org/gnus/dist/${P}.tar.gz"
+
+LICENSE="GPL-3 FDL-1.2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="!app-emacs/gnus-cvs
+	!app-emacs/ngnus"
+
+ELISP_PATCHES="${P}-functionp.patch"
+SITEFILE="70${PN}-gentoo.el"
+
+src_compile() {
+	econf \
+		--with-emacs --without-w3 --without-url \
+		--with-lispdir=${SITELISP}/${PN} \
+		--with-etcdir=${SITEETC}
+	emake || die "emake failed"
+}
+
+src_install() {
+	einstall \
+		lispdir="${D}${SITELISP}/${PN}" \
+		etcdir="${D}${SITEETC}" \
+		|| die "einstall failed"
+
+	# fix info documentation
+	for i in "${D}"/usr/share/info/*; do
+		mv "${i}" "${i}".info || die "mv info failed"
+	done
+
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+
+	dodoc ChangeLog GNUS-NEWS README todo || die "dodoc failed"
+}