Fix display of UTF-8 encoded messages on tty.

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

4 files changed, 85 insertions, 6 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/Manifest b/app-emacs/vm/Manifest
index 0f2c3ba216eb..65a973b104e6 100644
--- a/app-emacs/vm/Manifest
+++ b/app-emacs/vm/Manifest
@@ -9,6 +9,7 @@ AUX vm-7.19-gcc4.patch 1194 RMD160 74c8421cfc845fb0ce7807f9ea74b980ae11877b SHA1
 AUX vm-7.19-install-info.patch 412 RMD160 1fc5a5c5e20c1bb18acd013904812c5fed1f550f SHA1 299c51bbcd5e3e0ac2ba7a6c0b50a33edb54f2b2 SHA256 c8b998e29bed776fa75405fc432cd493fd8d9e01fb35935ceb5b96a58945730c
 AUX vm-8.0-no-pcrisis.patch 620 RMD160 9615e5574f955718ae8fe375afb6bc91dded4d54 SHA1 ea87f99aec9d6b03318e58b6197412745fafee4f SHA256 2c343d31649a152791f31bf14e8ee3d7a849e5645ba028661ab84309f73a5886
 AUX vm-8.0.12-autoload-vm-pine.patch 448 RMD160 d9e80c1817d3e64ae7b5ee62c79a3d67eddf0134 SHA1 1913d786c728af81bd9bf52d2087e5a28650f665 SHA256 2693ac867ae356e0ee0aec6bc900e27517910b66c10e17edefa36ab2a1e50c8b
+AUX vm-8.0.12-charset-displayable.patch 921 RMD160 784c0beee5917952e9ed5424260273d4e52689d0 SHA1 d512f20d57b0f3856cc1296cc5fae56110bac587 SHA256 4184115266c2c2250a4f86fcea5276f3a60fea23f03ea1c9143cb7b0427a56d1
 AUX vm-8.0.12-emacs-23.patch 3704 RMD160 ad0a36c08968566d7abac86801c7ea072e8e122f SHA1 b1037b2364517cde8e10fd8edc10581329da766f SHA256 7ef9861270b019303968f5db993cbfef1ab13c69ec094d117da1ce91d9c93f45
 AUX vm-8.0.12-folder-corruption.patch 635 RMD160 1dc3454b6df2bfd9944c63e0e90b23ea18f45b03 SHA1 b11b9fb8de22f879313c5cd203cbf2cf76bd8f64 SHA256 f78007ef176ea9e8dd98ed01e2edec4055b9ef9356b0d85f8e3ca6341198febc
 AUX vm-8.0.12-supercite-yank.patch 642 RMD160 9a590b66a7ec907809fff3dedf8f7098c86b02cb SHA1 92ea521824b1f06dacb8cc463dca962c438eed8d SHA256 0b8f8242c31761b5dd0bb6510984e2099eff958acfe376dc16de7d6876bd910c
@@ -19,13 +20,14 @@ DIST vm-8.0.9-544.tgz 538966 RMD160 76a1a11efe519d7f044bea2ae7b2e50161e7b566 SHA
 EBUILD vm-7.19-r4.ebuild 1249 RMD160 cce2daf9056af80464421a39333a165dc5960c91 SHA1 bfcd041bedbf950d2c60d4bd5c0fb97d2852bd33 SHA256 5f95b9365e5081d690ea8f6d9ccd7343405673c0504af55dc856c89339761873
 EBUILD vm-8.0.12-r2.ebuild 1440 RMD160 821595b3fe4b2e9f69ce96b3c2e19178431b0681 SHA1 eeae4b47b20442767878c86f6a2b5dd51fc1a2a9 SHA256 a652c48a4e0dd234fa9b9de0e3c46e7fd12b2cae3a479dae9f37b264e8f0a152
 EBUILD vm-8.0.12-r4.ebuild 1391 RMD160 1381c5085abd7971f266392b723a7b6fe835eab6 SHA1 7a245550a671dd8c62789b0d07782f9f718fa70f SHA256 0ff5558cbb86cd87401b2c0020e49b16612ab4a57198ed5e18c0d032d5dfebd2
+EBUILD vm-8.0.12-r5.ebuild 1425 RMD160 61025fc44f6812624261e60c3fbff1cb1e6651a4 SHA1 81c217518777b7b2289962b1b385d3319560c8cd SHA256 fa52650276cfdf83ba93da7a0563991319b8ebfbc3543fb854d294541423a22b
 EBUILD vm-8.0.9.544.ebuild 1398 RMD160 a35b0a2721224439bb69827250abe73447a9b858 SHA1 4973420077123c5f3a2debfedaf5d7814df12338 SHA256 489c89c39e5814f93acfdc47d2fa6ab80f2320797dad10f5bec855fad6b08e76
-MISC ChangeLog 10592 RMD160 afc7bf642a0bbe4438608075797317096c03f8af SHA1 e52ce4575db13cdf3db07c6de6833b9a3b9b7af9 SHA256 6a12ff26b23e8c5c2b5636c8579a59983d833ce1aee335ed9be9e81f89e46386
+MISC ChangeLog 10782 RMD160 a763cc965db3c0f3253adc1b80ffd2b2a9f73602 SHA1 8b9577eda7171ba57d19754b77018ad68871229d SHA256 03cc703d33f6a2e53869bc9f7ac267aac800d25785c4413aab0c71b3cd0e2dad
 MISC metadata.xml 616 RMD160 0671bc015f427662d3614403112ee15d0c457125 SHA1 27754651e0a70d9c85c159cb1e6175bc44c85de6 SHA256 9f491a8f5a4adb6bebc5ce9d5177a87d3daff04c7fa9cb3aad9a6a8e4909dec7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v1.4.10 (GNU/Linux)
 
-iEYEARECAAYFAkrXLZAACgkQkKaRLQcq0GLItACdFyb+e+FZdgwTTBFQ6SHRfYq4
-Zb4AoJJXg/456SgqvakoD8Itz54akT+d
-=jmE4
+iEYEARECAAYFAkrYu5sACgkQOeoy/oIi7uyLUwCeLN0ZDHX4xbOzq+xcnGk8HtTp
+rfEAn2M9KamU0KWrGc+yezwzYIyhwQ0o
+=PyHo
 -----END PGP SIGNATURE-----
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"
+}