Don't bind smtp-end-of-line, for compatibility with latest version of flim;

patch from upstream, fixes bug 280248. Install non-lisp files under SITEETC.
Change install locations and site-init file name from "wl" to "wanderlust".
Install Japanese documentation and samples only with LINGUAS=ja. Fix garbage
characters in texinfo file that caused a failure when saving the info file.
(Portage version: 2.2_rc36/cvs/Linux i686)

5 files changed, 114 insertions, 1 deletions

diff --git a/app-emacs/wanderlust/ChangeLog b/app-emacs/wanderlust/ChangeLog
index bd5a619d84c5..911ce80cb26c 100644
--- a/app-emacs/wanderlust/ChangeLog
+++ b/app-emacs/wanderlust/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for app-emacs/wanderlust
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/wanderlust/ChangeLog,v 1.71 2009/05/05 17:21:00 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/wanderlust/ChangeLog,v 1.72 2009/08/10 14:58:46 ulm Exp $
+
+*wanderlust-2.14.0-r4 (10 Aug 2009)
+
+  10 Aug 2009; Ulrich Mueller <ulm@gentoo.org>
+  +files/50wanderlust-gentoo.el, +wanderlust-2.14.0-r4.ebuild,
+  +files/wanderlust-2.14.0-smtp-end-of-line.patch,
+  +files/wanderlust-2.14.0-texinfo-garbage.patch:
+  Don't bind smtp-end-of-line, for compatibility with latest version of flim;
+  patch from upstream, fixes bug 280248. Install non-lisp files under SITEETC.
+  Change install locations and site-init file name from "wl" to "wanderlust".
+  Install Japanese documentation and samples only with LINGUAS=ja. Fix garbage
+  characters in texinfo file that caused a failure when saving the info file.
 
   05 May 2009; Ulrich Mueller <ulm@gentoo.org> wanderlust-2.14.0-r3.ebuild,
   wanderlust-2.15.5_pre20070921.ebuild,
diff --git a/app-emacs/wanderlust/files/50wanderlust-gentoo.el b/app-emacs/wanderlust/files/50wanderlust-gentoo.el
new file mode 100644
index 000000000000..ec27dd4eb5ee
--- /dev/null
+++ b/app-emacs/wanderlust/files/50wanderlust-gentoo.el
@@ -0,0 +1,7 @@
+(add-to-list 'load-path "@SITELISP@")
+
+(autoload 'wl "wl" "Wanderlust" t)
+(autoload 'wl-other-frame "wl" "Wanderlust on new frame." t)
+(autoload 'wl-draft "wl-draft" "Write draft with Wanderlust." t)
+
+(setq wl-icon-directory "@SITEETC@/icons")
diff --git a/app-emacs/wanderlust/files/wanderlust-2.14.0-smtp-end-of-line.patch b/app-emacs/wanderlust/files/wanderlust-2.14.0-smtp-end-of-line.patch
new file mode 100644
index 000000000000..f03542522ed2
--- /dev/null
+++ b/app-emacs/wanderlust/files/wanderlust-2.14.0-smtp-end-of-line.patch
@@ -0,0 +1,16 @@
+http://bugs.gentoo.org/280248
+Don't bind smtp-end-of-line. Patch from upstream CVS, by Yoichi NAKAYAMA.
+
+--- wl/wl-draft.el	28 Jan 2006 09:03:41 -0000	1.258
++++ wl/wl-draft.el	9 Feb 2006 03:57:39 -0000	1.259
+@@ -147,10 +147,6 @@
+ 	     (if (eq wl-smtp-connection-type 'ssl)
+ 		 #'open-ssl-stream
+ 	       smtp-open-connection-function))
+-	    (smtp-end-of-line
+-	     (if (eq wl-smtp-connection-type 'ssl)
+-		 "\n"
+-	       smtp-end-of-line))
+ 	    smtp-sasl-user-name smtp-sasl-properties sasl-read-passphrase)
+        (setq smtp-sasl-user-name wl-smtp-posting-user
+ 	     smtp-sasl-properties (when wl-smtp-authenticate-realm
diff --git a/app-emacs/wanderlust/files/wanderlust-2.14.0-texinfo-garbage.patch b/app-emacs/wanderlust/files/wanderlust-2.14.0-texinfo-garbage.patch
new file mode 100644
index 000000000000..6be41a99b70c
--- /dev/null
+++ b/app-emacs/wanderlust/files/wanderlust-2.14.0-texinfo-garbage.patch
@@ -0,0 +1,11 @@
+--- wl-2.14.0-orig/doc/wl.texi	2005-02-25 16:05:48.000000000 +0100
++++ wl-2.14.0/doc/wl.texi	2009-08-10 16:15:29.000000000 +0200
+@@ -4329,7 +4329,7 @@
+ 
+ @item wl-summary-resend-use-cache
+ @vindex wl-summary-resend-use-cache
+-The initial setting is @code{nil}¡£If non-nil, messages are resend
++The initial setting is @code{nil}. If non-nil, messages are resend
+ using cache even in the offline status. Note that if you use cache,
+ the message identity is not guaranteed.
+ 
diff --git a/app-emacs/wanderlust/wanderlust-2.14.0-r4.ebuild b/app-emacs/wanderlust/wanderlust-2.14.0-r4.ebuild
new file mode 100644
index 000000000000..1a5fbe494fb6
--- /dev/null
+++ b/app-emacs/wanderlust/wanderlust-2.14.0-r4.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/wanderlust/wanderlust-2.14.0-r4.ebuild,v 1.1 2009/08/10 14:58:46 ulm Exp $
+
+inherit elisp eutils
+
+MY_P="wl-${PV/_/}"
+
+DESCRIPTION="Yet Another Message Interface on Emacsen"
+HOMEPAGE="http://www.gohome.org/wl/"
+SRC_URI="ftp://ftp.gohome.org/wl/stable/${MY_P}.tar.gz
+	ftp://ftp.gohome.org/wl/beta/${MY_P}.tar.gz
+	http://dev.gentoo.org/~usata/distfiles/${MY_P}-20050405.diff"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="bbdb ssl linguas_ja"
+
+DEPEND=">=app-emacs/apel-10.6
+	virtual/flim
+	app-emacs/semi
+	bbdb? ( app-emacs/bbdb )"
+RDEPEND="!app-emacs/wanderlust-cvs
+	${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+SITEFILE="50wanderlust-gentoo.el"
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+
+	cd "${S}"
+	epatch "${DISTDIR}/${MY_P}-20050405.diff"
+	epatch "${FILESDIR}/${P}-smtp-end-of-line.patch"
+	epatch "${FILESDIR}/${P}-texinfo-garbage.patch"
+}
+
+src_compile() {
+	local lang="\"en\""
+	use linguas_ja && lang="${lang} \"ja\""
+	echo "(setq wl-info-lang '(${lang}) wl-news-lang '(${lang}))" >>WL-CFG
+	use ssl && echo "(setq wl-install-utils t)" >>WL-CFG
+
+	emake || die "emake failed"
+	emake info || die "emake info failed"
+}
+
+src_install() {
+	emake \
+		LISPDIR="${D}${SITELISP}" \
+		PIXMAPDIR="${D}${SITEETC}/${PN}/icons" \
+		install || die "emake install failed"
+
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+
+	insinto "${SITEETC}/${PN}/samples/en"
+	doins samples/en/*
+	doinfo doc/wl*.info
+	dodoc BUGS ChangeLog INSTALL NEWS README
+
+	if use linguas_ja; then
+		insinto "${SITEETC}/${PN}/samples/ja"
+		doins samples/ja/*
+		dodoc BUGS.ja INSTALL.ja NEWS.ja README.ja
+	fi
+}