Fix unibyte/multibyte issues with Emacs 23, bug 292449.

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

5 files changed, 86 insertions, 11 deletions

diff --git a/app-emacs/flim/ChangeLog b/app-emacs/flim/ChangeLog
index f2d2e7c29699..090479b4da53 100644
--- a/app-emacs/flim/ChangeLog
+++ b/app-emacs/flim/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emacs/flim
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/flim/ChangeLog,v 1.38 2009/07/20 21:30:43 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/flim/ChangeLog,v 1.39 2009/11/13 14:49:07 ulm Exp $
+
+*flim-1.14.9-r1 (13 Nov 2009)
+
+  13 Nov 2009; Ulrich Mueller <ulm@gentoo.org> +flim-1.14.9-r1.ebuild,
+  +files/flim-1.14.9-mel-q-ccl.patch:
+  Fix unibyte/multibyte issues with Emacs 23. Thanks to Jan Seeger
+  <jan.seeger@gmail.com> in bug 292449.
 
   20 Jul 2009; Christian Faulhammer <fauli@gentoo.org> -flim-1.14.8.ebuild:
   clean up
@@ -130,7 +137,7 @@
 *flim-1.14.4 (31 Oct 2002)
 
   31 Oct 2002; Matthew Kennedy <mkennedy@gentoo.org> ChangeLog,
-  flim-1.14.4.ebuild, files/60flim-gentoo.el, 
+  flim-1.14.4.ebuild, files/60flim-gentoo.el,
   files/digest-flim-1.14.4 :
 
   Initial import.
diff --git a/app-emacs/flim/Manifest b/app-emacs/flim/Manifest
index 9c652edbcf64..38f976066d95 100644
--- a/app-emacs/flim/Manifest
+++ b/app-emacs/flim/Manifest
@@ -1,15 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 60flim-gentoo.el 73 RMD160 f8de9077088748188bbe25c476bc5a6384fc6207 SHA1 72697fb7340ea620324786264c4a7f72c890be89 SHA256 84f6af131fbdcd41ff400f510fb673917c215b62bec03dee08af3cad27eec959
+AUX 60flim-gentoo.el 38 RMD160 93ecb185b2729f847b6b34bbb1dd96a207510df2 SHA1 4363c907b30fe150f1d4de4be733f943256a0b82 SHA256 f34ea07a3270a25cce3430e4781df47d9903052c9f3a4ea24efb64b1e63bd115
+AUX flim-1.14.9-mel-q-ccl.patch 1362 RMD160 d1c10582783af65f6219a15e553435f71a390096 SHA1 3767a94a35e23028c615ce04c4d2049eecf72db2 SHA256 87eca69f3252c339bc0f73422ad80d3a46da9cc3d3f40f6c4f999b2ed83b4038
 DIST flim-1.14.9.tar.gz 182065 RMD160 d7fb99ffabe477afd958589e8e386b7d4e628822 SHA1 fc3f1ecfa757d83b10693dc74d890a1ad7db7abd SHA256 bbd5a8729ea27457c7c2ffdcb1be6219ad38fdfa323341f4fad2d298780070ec
+EBUILD flim-1.14.9-r1.ebuild 1109 RMD160 577ae863e384b92089a6917f2e6db0f243588d7f SHA1 e5de5edbfeb7e104158fb983c448596b54ce1b6c SHA256 25fc4ec23464ae7e903a168ceaa88f702037fc0c4aaf083f1fafb16ad43353a9
 EBUILD flim-1.14.9.ebuild 1067 RMD160 66d87108ef903fe08507c0173f89baa605e760ad SHA1 16f6f973b042c0827cc037a9406c3d0a295fb802 SHA256 70090af9d2b617cccde94254b3e35e1f1ff18dad95e2d28e804f8327405cd8bb
-MISC ChangeLog 4560 RMD160 4c0305d0baa3e612953c0dc6d36bbada76eb7ead SHA1 9ee255a7908abe19d9cfda1bb3085a5cdcba0732 SHA256 121328af938ddc3b458fecb2686d06f97da0909b702110e666e3dfc7752fbfd0
+MISC ChangeLog 4805 RMD160 b35b59a7584db0fb9b6b620d0432bdd3e122c049 SHA1 ee8ca994086874e7ba742b58904b3924e0477315 SHA256 6d43e77399870061c8faa4a463d57031d43a47974807e913bedc0d930636896a
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v1.4.10 (GNU/Linux)
 
-iEYEARECAAYFAkpk4g8ACgkQNQqtfCuFneM/2wCgi7qRD4uzvLgY2hw/BAPhpngN
-ivsAn1DPK+h9NUQFxMQH0qTtUXzwHMxM
-=Bfoc
+iEYEARECAAYFAkr9cnoACgkQOeoy/oIi7uy81wCfRRibfzcIVvSE5q78MARuj+eC
+pGkAoJt2nAn5ptA3Ryg5kNAPmggnzt1T
+=ZfXy
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/flim/files/60flim-gentoo.el b/app-emacs/flim/files/60flim-gentoo.el
index 8c9af98c5ec1..431f7e90ae73 100644
--- a/app-emacs/flim/files/60flim-gentoo.el
+++ b/app-emacs/flim/files/60flim-gentoo.el
@@ -1,4 +1 @@
-
-;;; FLIM site-lisp configuration
-
 (add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/flim/files/flim-1.14.9-mel-q-ccl.patch b/app-emacs/flim/files/flim-1.14.9-mel-q-ccl.patch
new file mode 100644
index 000000000000..35f645052284
--- /dev/null
+++ b/app-emacs/flim/files/flim-1.14.9-mel-q-ccl.patch
@@ -0,0 +1,31 @@
+http://bugs.gentoo.org/292449
+
+--- flim-1.14.9-orig/mel-q-ccl.el	2006-06-12 17:10:02.000000000 +0200
++++ flim-1.14.9/mel-q-ccl.el	2009-11-13 15:38:28.000000000 +0100
+@@ -893,7 +893,13 @@
+   (defun quoted-printable-ccl-encode-region (start end)
+     "Encode the region from START to END with quoted-printable encoding."
+     (interactive "*r")
+-    (decode-coding-region start end 'mel-ccl-quoted-printable-lf-lf-rev))
++    (save-excursion
++      (goto-char start)
++      (insert (prog1
++		(decode-coding-string
++		  (string-as-unibyte (buffer-substring start end))
++		  'mel-ccl-quoted-printable-lf-lf-rev)
++		(delete-region start end)))))
+ 
+   (defun quoted-printable-ccl-insert-encoded-file (filename)
+     "Encode contents of the file named as FILENAME, and insert it."
+@@ -932,7 +938,10 @@
+ (defun quoted-printable-ccl-write-decoded-region (start end filename)
+   "Decode quoted-printable encoded current region and write out to FILENAME."
+   (interactive "*r\nFWrite decoded region to file: ")
+-  (let ((coding-system-for-write 'mel-ccl-quoted-printable-lf-lf-rev)
++  (let ((coding-system-for-write
++	 (if (coding-system-p 'mel-ccl-quoted-printable-lf-lf-rev-unix)
++	     'mel-ccl-quoted-printable-lf-lf-rev-unix
++	   'mel-ccl-quoted-printable-lf-lf-rev))
+ 	jka-compr-compression-info-list jam-zcat-filename-list)
+     (write-region start end filename)))
+ 
diff --git a/app-emacs/flim/flim-1.14.9-r1.ebuild b/app-emacs/flim/flim-1.14.9-r1.ebuild
new file mode 100644
index 000000000000..0646ccb52a11
--- /dev/null
+++ b/app-emacs/flim/flim-1.14.9-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/flim/flim-1.14.9-r1.ebuild,v 1.1 2009/11/13 14:49:07 ulm Exp $
+
+inherit elisp
+
+DESCRIPTION="A library to provide basic features about message representation or encoding"
+HOMEPAGE="http://cvs.m17n.org/elisp/FLIM/"
+SRC_URI="http://www.kanji.zinbun.kyoto-u.ac.jp/~tomo/lemi/dist/flim/${P%.*}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=app-emacs/apel-10.3"
+RDEPEND="${DEPEND}
+	!app-emacs/limit"
+
+ELISP_PATCHES="${P}-mel-q-ccl.patch"
+SITEFILE="60${PN}-gentoo.el"
+
+src_compile() {
+	emake PREFIX="${D}/usr" \
+		LISPDIR="${D}/${SITELISP}" \
+		VERSION_SPECIFIC_LISPDIR="${D}/${SITELISP}" || die "emake failed"
+}
+
+src_install() {
+	emake PREFIX="${D}/usr" \
+		LISPDIR="${D}/${SITELISP}" \
+		VERSION_SPECIFIC_LISPDIR="${D}/${SITELISP}" install \
+		|| die "emake install failed"
+
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+
+	dodoc FLIM-API.en NEWS VERSION README* ChangeLog || die "dodoc failed"
+}