Use vm-mime-8bit-composition-charset to determine charset for sending.

Package-Manager: portage-2.1.3.7

5 files changed, 89 insertions, 8 deletions

diff --git a/app-emacs/vm/ChangeLog b/app-emacs/vm/ChangeLog
index 5cd15746cf66..72f737182af6 100644
--- a/app-emacs/vm/ChangeLog
+++ b/app-emacs/vm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emacs/vm
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/ChangeLog,v 1.36 2007/08/19 12:41:08 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/ChangeLog,v 1.37 2007/08/26 02:55:19 ulm Exp $
+
+*vm-8.0.2.487-r1 (26 Aug 2007)
+
+  26 Aug 2007; Ulrich Mueller <ulm@gentoo.org>
+  +files/vm-8.0.2.487-proper-charset.patch, +vm-8.0.2.487-r1.ebuild:
+  Use vm-mime-8bit-composition-charset to determine charset for sending;
+  backported from version 8.0.3.
 
 *vm-8.0.3.495 (19 Aug 2007)
 
diff --git a/app-emacs/vm/Manifest b/app-emacs/vm/Manifest
index a5a3602d2bb3..2276e709fbd1 100644
--- a/app-emacs/vm/Manifest
+++ b/app-emacs/vm/Manifest
@@ -21,6 +21,10 @@ AUX vm-8.0-no-pcrisis.patch 620 RMD160 9615e5574f955718ae8fe375afb6bc91dded4d54
 MD5 ebffd720fb4b7479eb718200ba9c04b3 files/vm-8.0-no-pcrisis.patch 620
 RMD160 9615e5574f955718ae8fe375afb6bc91dded4d54 files/vm-8.0-no-pcrisis.patch 620
 SHA256 2c343d31649a152791f31bf14e8ee3d7a849e5645ba028661ab84309f73a5886 files/vm-8.0-no-pcrisis.patch 620
+AUX vm-8.0.2.487-proper-charset.patch 509 RMD160 97debec2ff65302ed4c50a1420b305d7a3e03a73 SHA1 dd33d9c73bb7db7fe270e680c4275c1f156b3dd1 SHA256 4400fc7a4b3f39092e2161b004cc6c83f109d8cf5e8b9d473d7cffa260c6bfbb
+MD5 d37f90e76b3e7ecb2f1b95b61a6e6961 files/vm-8.0.2.487-proper-charset.patch 509
+RMD160 97debec2ff65302ed4c50a1420b305d7a3e03a73 files/vm-8.0.2.487-proper-charset.patch 509
+SHA256 4400fc7a4b3f39092e2161b004cc6c83f109d8cf5e8b9d473d7cffa260c6bfbb files/vm-8.0.2.487-proper-charset.patch 509
 AUX vm-info-dir-fix-gentoo.patch 325 RMD160 51f59c36d9c0ae13eca4db61dc76ef1dabdd6d31 SHA1 3a1bce1bd3e91ef3b2403bab54bb47569933e88d SHA256 8320c7ae7c51a5985bb344ec04a153e263af87de3ff2d95a0a55814e2377d276
 MD5 fbd0ca3e26853a8f8c5f68283f7b3188 files/vm-info-dir-fix-gentoo.patch 325
 RMD160 51f59c36d9c0ae13eca4db61dc76ef1dabdd6d31 files/vm-info-dir-fix-gentoo.patch 325
@@ -37,6 +41,10 @@ EBUILD vm-7.19.282.ebuild 2004 RMD160 ebe79edf9738f00e8e6d861283b2f5a404facb3c S
 MD5 451bc09f8efdae05d4bdee5257a4799e vm-7.19.282.ebuild 2004
 RMD160 ebe79edf9738f00e8e6d861283b2f5a404facb3c vm-7.19.282.ebuild 2004
 SHA256 a8256c354960726aa53295b5ea9bb722a74204ec971b3a7bb3b25c74277b559c vm-7.19.282.ebuild 2004
+EBUILD vm-8.0.2.487-r1.ebuild 1288 RMD160 d1356bf6d180d919bab4331627a23d15d1747f3c SHA1 e988f0786ea471d7b6f4ab91b37614747575dd44 SHA256 888ff78c4220f607a29656f9ce259702a4d167204a3a993d4256015248aaeb1a
+MD5 3a2021567aa3f5f9a02ab6804dc1c8d6 vm-8.0.2.487-r1.ebuild 1288
+RMD160 d1356bf6d180d919bab4331627a23d15d1747f3c vm-8.0.2.487-r1.ebuild 1288
+SHA256 888ff78c4220f607a29656f9ce259702a4d167204a3a993d4256015248aaeb1a vm-8.0.2.487-r1.ebuild 1288
 EBUILD vm-8.0.2.487.ebuild 1236 RMD160 e82dd24318b92db34a74016c5651d33a1be0abfa SHA1 0cab630fc4882fd3fc6ff670e93e46a5560f13cb SHA256 a362654c7c84e5dd57e62a8e11f44915ef931b964187fd05b72979e8952f546f
 MD5 7e36910d27a56df86b34248684a1ecc1 vm-8.0.2.487.ebuild 1236
 RMD160 e82dd24318b92db34a74016c5651d33a1be0abfa vm-8.0.2.487.ebuild 1236
@@ -45,10 +53,10 @@ EBUILD vm-8.0.3.495.ebuild 1236 RMD160 73a68d27a50cc148bd90477cb5ed4e9327fb8767
 MD5 70c6959141f01a167db1d586cb7d6415 vm-8.0.3.495.ebuild 1236
 RMD160 73a68d27a50cc148bd90477cb5ed4e9327fb8767 vm-8.0.3.495.ebuild 1236
 SHA256 cb7de25c29957889e30b7ef9c4226a93f1dc4e3242121dbd761a5ad7c7e0c548 vm-8.0.3.495.ebuild 1236
-MISC ChangeLog 5088 RMD160 3ca70b3c8487cebe698914f5a102cbb871c0fcba SHA1 c12419de1e596d52ed0e1d3242afe9d3baa42bee SHA256 44ac5b326ff198ef71a97cc2bd9007d64c02eaa2b1b817ee40858d6ba47ba383
-MD5 270bdab32485fa8a5ddc8907eed3e6ea ChangeLog 5088
-RMD160 3ca70b3c8487cebe698914f5a102cbb871c0fcba ChangeLog 5088
-SHA256 44ac5b326ff198ef71a97cc2bd9007d64c02eaa2b1b817ee40858d6ba47ba383 ChangeLog 5088
+MISC ChangeLog 5343 RMD160 826ec6f6c48674f7cb1854354ec961cd42416702 SHA1 1dd5f6c11808f4e3c10b5a4cd5d8b029ccf98092 SHA256 85885688c81eec17da1b56e0080f41b1bfb36a8d298adb412458d2180db3622e
+MD5 74eed8cc144e4cb06bcb457bc18c428e ChangeLog 5343
+RMD160 826ec6f6c48674f7cb1854354ec961cd42416702 ChangeLog 5343
+SHA256 85885688c81eec17da1b56e0080f41b1bfb36a8d298adb412458d2180db3622e ChangeLog 5343
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -62,13 +70,16 @@ SHA256 6ef96c2d3bf3a36c835c9acffba748b2b14c6ebb90098be938597be4c6f82a68 files/di
 MD5 44481340a74d2e8815e430abe2903f49 files/digest-vm-8.0.2.487 229
 RMD160 ac693b8dbc8cd17a512b9754523c47354e94ee3b files/digest-vm-8.0.2.487 229
 SHA256 1858b98bcdd1986eedded644b38913fafaa2e03a9281c3d4047dd20072e20b7b files/digest-vm-8.0.2.487 229
+MD5 44481340a74d2e8815e430abe2903f49 files/digest-vm-8.0.2.487-r1 229
+RMD160 ac693b8dbc8cd17a512b9754523c47354e94ee3b files/digest-vm-8.0.2.487-r1 229
+SHA256 1858b98bcdd1986eedded644b38913fafaa2e03a9281c3d4047dd20072e20b7b files/digest-vm-8.0.2.487-r1 229
 MD5 78e3a32fe29e09aafe4d0788b23a23fd files/digest-vm-8.0.3.495 229
 RMD160 318fc2cc06cb4ebac2b71a160620115528564b81 files/digest-vm-8.0.3.495 229
 SHA256 9ae23a552996ad10403dcb8c8e9f1c3db649a55126173e34d61f59f1d851dc0b files/digest-vm-8.0.3.495 229
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGyDpuOeoy/oIi7uwRAiQNAKDY/5Dc9GDqtXuZHKHsKgEfzVk0JwCfd5fU
-EDpPPF9pQxk48t5YgXRJH0s=
-=Pl/E
+iD8DBQFG0OuZOeoy/oIi7uwRAtJJAKDadhZgmodhIGXNgh/qoGjxZI2ncgCg2ujF
+Odlw7Fz6X4bjSdlYsOZTA5I=
+=1L2K
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/vm/files/digest-vm-8.0.2.487-r1 b/app-emacs/vm/files/digest-vm-8.0.2.487-r1
new file mode 100644
index 000000000000..e64393392275
--- /dev/null
+++ b/app-emacs/vm/files/digest-vm-8.0.2.487-r1
@@ -0,0 +1,3 @@
+MD5 1829a2e8296f681ac5414f11013c34f9 vm-8.0.2-487.tgz 536869
+RMD160 f4c13d135dc79ee5f31d4c1000b88d831928e591 vm-8.0.2-487.tgz 536869
+SHA256 5fa6d10596ec28d1a0db035c75ac724e4942744551ed708247983d9c150b24d9 vm-8.0.2-487.tgz 536869
diff --git a/app-emacs/vm/files/vm-8.0.2.487-proper-charset.patch b/app-emacs/vm/files/vm-8.0.2.487-proper-charset.patch
new file mode 100644
index 000000000000..eb9fb9ee26f1
--- /dev/null
+++ b/app-emacs/vm/files/vm-8.0.2.487-proper-charset.patch
@@ -0,0 +1,11 @@
+--- lisp/vm-mime.el~	2007-07-25 00:21:40.000000000 +0200
++++ lisp/vm-mime.el	2007-08-26 04:41:18.000000000 +0200
+@@ -1536,7 +1537,7 @@
+ 		    (throw 'done nil))))
+ 	       ;; Couldn't do any magic with vm-coding-system-priorities. Pass
+ 	       ;; back a Japanese iso-2022 MIME character set.
+-	       (t "iso-2022-jp")))
++	       (t (or vm-mime-8bit-composition-charset "iso-2022-jp"))))
+ 	  ;; If we're non-MULE and there are eight bit characters, use a
+ 	  ;; sensible default.
+ 	  (goto-char (point-min))
diff --git a/app-emacs/vm/vm-8.0.2.487-r1.ebuild b/app-emacs/vm/vm-8.0.2.487-r1.ebuild
new file mode 100644
index 000000000000..d4334cb880ba
--- /dev/null
+++ b/app-emacs/vm/vm-8.0.2.487-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/vm/vm-8.0.2.487-r1.ebuild,v 1.1 2007/08/26 02:55:19 ulm Exp $
+
+inherit elisp eutils versionator
+
+VM_PV=$(replace_version_separator 3 '-')
+VM_P=${PN}-${VM_PV}
+
+DESCRIPTION="The VM mail reader for Emacs"
+HOMEPAGE="http://www.nongnu.org/viewmail/"
+SRC_URI="http://download.savannah.nongnu.org/releases/viewmail/${VM_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="bbdb"
+
+DEPEND="bbdb? ( app-emacs/bbdb )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${VM_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-proper-charset.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() {
+	local myconf
+	use bbdb && myconf="--with-other-dirs=${SITELISP}/bbdb"
+	econf --with-emacs="emacs" \
+		--with-pixmapdir="/usr/share/pixmaps/vm" \
+		${myconf} || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install || die "emake install failed"
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	dodoc NEWS README TODO example.vm || die "dodoc failed"
+}