Fix display of UTF-8 encoded messages on tty.

(Portage version: 2.2_rc46/cvs/Linux i686)

3 files changed, 78 insertions, 1 deletions

diff --git a/app-emacs/vm/ChangeLog b/app-emacs/vm/ChangeLog
index ad160218c71f..901eba1a9cb3 100644
--- a/app-emacs/vm/ChangeLog
+++ b/app-emacs/vm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emacs/vm
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/ChangeLog,v 1.75 2009/10/15 14:10:57 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/ChangeLog,v 1.76 2009/10/16 18:29:42 ulm Exp $
+
+*vm-8.0.12-r5 (16 Oct 2009)
+
+  16 Oct 2009; Ulrich Mueller <ulm@gentoo.org> +vm-8.0.12-r5.ebuild,
+  +files/vm-8.0.12-charset-displayable.patch:
+  Fix display of UTF-8 encoded messages on tty.
 
   15 Oct 2009; Markus Meier <maekke@gentoo.org> vm-8.0.12-r4.ebuild:
   amd64/x86 stable, bug #288397
diff --git a/app-emacs/vm/files/vm-8.0.12-charset-displayable.patch b/app-emacs/vm/files/vm-8.0.12-charset-displayable.patch
new file mode 100644
index 000000000000..e94bf51ec5af
--- /dev/null
+++ b/app-emacs/vm/files/vm-8.0.12-charset-displayable.patch
@@ -0,0 +1,21 @@
+Fix display of UTF-8 encoded messages on tty
+Gentoo patch, reported upstream:
+https://bugs.launchpad.net/viewmail/+bug/453351
+
+--- vm-8.0.12-orig/lisp/vm-mime.el
++++ vm-8.0.12/lisp/vm-mime.el
+@@ -4399,9 +4399,11 @@
+   (cond ((and vm-xemacs-mule-p (memq (device-type) '(x gtk mswindows)))
+ 	 (or (vm-string-assoc name vm-mime-mule-charset-to-coding-alist)
+ 	     (vm-mime-default-face-charset-p name)))
+-	((and vm-fsfemacs-mule-p (memq window-system '(x mac win32 w32)))
+-	 (or (vm-string-assoc name vm-mime-mule-charset-to-coding-alist)
+-	     (vm-mime-default-face-charset-p name)))
++
++	;; vm-mime-tty-can-display-mime-charset (called below) fails
++	;; for GNU Emacs. So keep things simple, since there's no harm
++	;; if replacement characters are displayed.
++	(vm-fsfemacs-mule-p)
+ 	((vm-multiple-fonts-possible-p)
+ 	 (or (vm-mime-default-face-charset-p name)
+ 	     (vm-string-assoc name vm-mime-charset-font-alist)))
diff --git a/app-emacs/vm/vm-8.0.12-r5.ebuild b/app-emacs/vm/vm-8.0.12-r5.ebuild
new file mode 100644
index 000000000000..7f2a1e926584
--- /dev/null
+++ b/app-emacs/vm/vm-8.0.12-r5.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-8.0.12-r5.ebuild,v 1.1 2009/10/16 18:29:42 ulm Exp $
+
+inherit elisp eutils
+
+DESCRIPTION="The VM mail reader for Emacs"
+HOMEPAGE="http://www.nongnu.org/viewmail/"
+SRC_URI="http://download.savannah.nongnu.org/releases/viewmail/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="bbdb ssl"
+
+DEPEND="bbdb? ( app-emacs/bbdb )"
+RDEPEND="${DEPEND}
+	ssl? ( net-misc/stunnel )"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-autoload-vm-pine.patch" #246185
+	epatch "${FILESDIR}/${P}-supercite-yank.patch" #256886
+	epatch "${FILESDIR}/${P}-folder-corruption.patch" #284668
+	epatch "${FILESDIR}/${P}-emacs-23.patch"
+	epatch "${FILESDIR}/${P}-charset-displayable.patch"
+
+	if ! use bbdb; then
+		elog "Excluding vm-pcrisis.el since the \"bbdb\" USE flag is not set."
+		epatch "${FILESDIR}/vm-8.0-no-pcrisis.patch"
+	fi
+}
+
+src_compile() {
+	econf \
+		--with-emacs="emacs" \
+		--with-pixmapdir="${SITEETC}/${PN}" \
+		$(use bbdb && echo "--with-other-dirs=${SITELISP}/bbdb")
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install || die "emake install failed"
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	dodoc NEWS README TODO example.vm || die "dodoc failed"
+}