Fix "range striding over charsets" error; bug #188112.

Package-Manager: portage-2.1.3.5

5 files changed, 102 insertions, 5 deletions

diff --git a/app-emacs/nxml-mode/ChangeLog b/app-emacs/nxml-mode/ChangeLog
index 6ad6e94f54ad..165f26a578fe 100644
--- a/app-emacs/nxml-mode/ChangeLog
+++ b/app-emacs/nxml-mode/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emacs/nxml-mode
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-mode/ChangeLog,v 1.23 2007/07/02 07:32:10 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-mode/ChangeLog,v 1.24 2007/08/15 07:37:56 ulm Exp $
+
+*nxml-mode-20041004-r1 (15 Aug 2007)
+
+  15 Aug 2007; Ulrich Mueller <ulm@gentoo.org>
+  +files/xsd-regexp.el.2006-01-26.patch, +nxml-mode-20041004-r1.ebuild:
+  Fix "range striding over charsets" error; bug #188112, reported by
+  Martin von Gagern <Martin.vGagern@gmx.net>. Other minor changes.
 
   02 Jul 2007; Christian Faulhammer <opfer@gentoo.org>
   nxml-mode-20041004.ebuild:
diff --git a/app-emacs/nxml-mode/Manifest b/app-emacs/nxml-mode/Manifest
index 442f4ecced21..e945fdb5800e 100644
--- a/app-emacs/nxml-mode/Manifest
+++ b/app-emacs/nxml-mode/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 80nxml-mode-gentoo.el 226 RMD160 bdb8e7fbbd58679e029acb6630d30bfcfbb346be SHA1 602e2e7e8634b347c2c27a3b926f1db378766899 SHA256 79e3bc35ca62c8b77fd3bb35777263a82f0a7d6a9fb8b874c53106568a7a64fc
 MD5 ca04cb4a463ca0758093963bbba71e02 files/80nxml-mode-gentoo.el 226
 RMD160 bdb8e7fbbd58679e029acb6630d30bfcfbb346be files/80nxml-mode-gentoo.el 226
@@ -6,16 +9,24 @@ AUX nxml-mode-info-gentoo.patch 412 RMD160 85cd39acefb9d0478d0ae93703788f9379672
 MD5 b6c0ed2561e83b43a58c2bd8cae88b55 files/nxml-mode-info-gentoo.patch 412
 RMD160 85cd39acefb9d0478d0ae93703788f9379672973 files/nxml-mode-info-gentoo.patch 412
 SHA256 482756e6a3f64f078839d4387f0847f9834130ed8ccf5e687c5d18e16a1d9c75 files/nxml-mode-info-gentoo.patch 412
+AUX xsd-regexp.el.2006-01-26.patch 768 RMD160 b9e2d5873377365898218bbc8887553d699ff5ac SHA1 2d1d28a85b675ece6e4bd63632a373e5cf4d9fca SHA256 b2bb3df2b735ffef1ca7409af8231cba8b163e6a3b8ab7c88f77aa1d0773dcd6
+MD5 a8173e46710e3c4092ee1115c21c3482 files/xsd-regexp.el.2006-01-26.patch 768
+RMD160 b9e2d5873377365898218bbc8887553d699ff5ac files/xsd-regexp.el.2006-01-26.patch 768
+SHA256 b2bb3df2b735ffef1ca7409af8231cba8b163e6a3b8ab7c88f77aa1d0773dcd6 files/xsd-regexp.el.2006-01-26.patch 768
 DIST nxml-mode-20040910-xmlschema.patch.gz 9069 RMD160 59091172e8544cb52fee7d3f44c353fdd6d78584 SHA1 4a0b5935aa4a6b73b52d63c152c8072c6e2828c1 SHA256 66be83896133c7d7e2debd275edb90527b87425bd8c05cf415c905520bc04914
 DIST nxml-mode-20041004.tar.gz 443020 RMD160 37188e12507eea2b24c6ad99c4930c8fe0660e79 SHA1 5d21ca111957f86c9c237af9161f7ca482a1ef9f SHA256 8cf71922962b134e08c4ad9048cd66e85c8297372f14dd1f1ada2d26c69c62ae
+EBUILD nxml-mode-20041004-r1.ebuild 1294 RMD160 da9ccca48c8c23a3a96f1bbc2e275cddc02c7795 SHA1 ac4da8d991ac2742f3f6c5db46a4a40cd358f234 SHA256 21ae05098b4868d4118e71254fb808bc3f11dbc196cc341f028f4ba2347a92de
+MD5 a771449a3fd27cc7072252cd372200eb nxml-mode-20041004-r1.ebuild 1294
+RMD160 da9ccca48c8c23a3a96f1bbc2e275cddc02c7795 nxml-mode-20041004-r1.ebuild 1294
+SHA256 21ae05098b4868d4118e71254fb808bc3f11dbc196cc341f028f4ba2347a92de nxml-mode-20041004-r1.ebuild 1294
 EBUILD nxml-mode-20041004.ebuild 1150 RMD160 9e5295c7470248313ee7e1ee9b09ff48f8d20631 SHA1 ff58d9d5f3c55dbf3ef80cf0d841f599d0b2a230 SHA256 0c87108e29ecf8c6ce19e10d92fdcf7d56096430fc43a400d408ffb120ba8449
 MD5 a0a381a6a30b91702c4beaffae0780ad nxml-mode-20041004.ebuild 1150
 RMD160 9e5295c7470248313ee7e1ee9b09ff48f8d20631 nxml-mode-20041004.ebuild 1150
 SHA256 0c87108e29ecf8c6ce19e10d92fdcf7d56096430fc43a400d408ffb120ba8449 nxml-mode-20041004.ebuild 1150
-MISC ChangeLog 3043 RMD160 67482abf3e459632713c3fdfa92148bce0d15d5f SHA1 0165ec4cd1def7d76d8466bec78c8a1d38bccf12 SHA256 2e582a91c543bf3ec9b2d5814a55045f69327ac6e56adec8ae77fc460c9f62c1
-MD5 e4db0160b93ff50e19595339557cf4df ChangeLog 3043
-RMD160 67482abf3e459632713c3fdfa92148bce0d15d5f ChangeLog 3043
-SHA256 2e582a91c543bf3ec9b2d5814a55045f69327ac6e56adec8ae77fc460c9f62c1 ChangeLog 3043
+MISC ChangeLog 3335 RMD160 bd44ab06c3ba872f031eb96280ba42eef3e830bf SHA1 37f56507b7e7fa0a0767053b58f1d25256847bfa SHA256 91ff6608e63bffcb0be8a9d97bf5e862bf461b2731e186192c9f65a5cc4f9b01
+MD5 56c002bf48bd5665707f504db0f99e0e ChangeLog 3335
+RMD160 bd44ab06c3ba872f031eb96280ba42eef3e830bf ChangeLog 3335
+SHA256 91ff6608e63bffcb0be8a9d97bf5e862bf461b2731e186192c9f65a5cc4f9b01 ChangeLog 3335
 MISC metadata.xml 420 RMD160 5b5de5a4392980dacfad737f6e4dae478317ecef SHA1 4abf6b71618f34d7358329761a18f741cbd151e1 SHA256 81071efdca44f52f577f8c0b698e54546d95b84240602b946e41aba3b869af32
 MD5 103177d81841ac7a82af69df80b2fa31 metadata.xml 420
 RMD160 5b5de5a4392980dacfad737f6e4dae478317ecef metadata.xml 420
@@ -23,3 +34,13 @@ SHA256 81071efdca44f52f577f8c0b698e54546d95b84240602b946e41aba3b869af32 metadata
 MD5 0c9c877fbadb86ff85070dd9c27b0a87 files/digest-nxml-mode-20041004 542
 RMD160 971c83ab6f33dcd7a83ed016426f1c87bbf257b9 files/digest-nxml-mode-20041004 542
 SHA256 cd61c99b668487d3839fafb5c881f1b38ba6dba0e3fbfb6b631215103394edfc files/digest-nxml-mode-20041004 542
+MD5 0c9c877fbadb86ff85070dd9c27b0a87 files/digest-nxml-mode-20041004-r1 542
+RMD160 971c83ab6f33dcd7a83ed016426f1c87bbf257b9 files/digest-nxml-mode-20041004-r1 542
+SHA256 cd61c99b668487d3839fafb5c881f1b38ba6dba0e3fbfb6b631215103394edfc files/digest-nxml-mode-20041004-r1 542
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFGwq1fOeoy/oIi7uwRAuX+AKDcvLtW9xLbE1/w1Oa5A8VCT2tk/ACeNHi+
+57XkbWFXsv69AzpH7zktUFs=
+=aS70
+-----END PGP SIGNATURE-----
diff --git a/app-emacs/nxml-mode/files/digest-nxml-mode-20041004-r1 b/app-emacs/nxml-mode/files/digest-nxml-mode-20041004-r1
new file mode 100644
index 000000000000..431875c7937a
--- /dev/null
+++ b/app-emacs/nxml-mode/files/digest-nxml-mode-20041004-r1
@@ -0,0 +1,6 @@
+MD5 d98a6a37ad177f89698561416dc1195c nxml-mode-20040910-xmlschema.patch.gz 9069
+RMD160 59091172e8544cb52fee7d3f44c353fdd6d78584 nxml-mode-20040910-xmlschema.patch.gz 9069
+SHA256 66be83896133c7d7e2debd275edb90527b87425bd8c05cf415c905520bc04914 nxml-mode-20040910-xmlschema.patch.gz 9069
+MD5 ac137024cf337d6f11d8ab278d39b4db nxml-mode-20041004.tar.gz 443020
+RMD160 37188e12507eea2b24c6ad99c4930c8fe0660e79 nxml-mode-20041004.tar.gz 443020
+SHA256 8cf71922962b134e08c4ad9048cd66e85c8297372f14dd1f1ada2d26c69c62ae nxml-mode-20041004.tar.gz 443020
diff --git a/app-emacs/nxml-mode/files/xsd-regexp.el.2006-01-26.patch b/app-emacs/nxml-mode/files/xsd-regexp.el.2006-01-26.patch
new file mode 100644
index 000000000000..09820e1546dc
--- /dev/null
+++ b/app-emacs/nxml-mode/files/xsd-regexp.el.2006-01-26.patch
@@ -0,0 +1,22 @@
+--- xsd-regexp.el.orig	2006-01-27 00:31:24.000000000 +0100
++++ xsd-regexp.el	2006-01-27 00:32:20.328529600 +0100
+@@ -290,7 +290,8 @@
+ (defun xsdre-compile-single-char (ch)
+   (if (memq ch '(?. ?* ?+ ?? ?\[ ?\] ?^ ?$ ?\\))
+       (string ?\\ ch)
+-    (string (decode-char 'ucs ch))))
++    (let ((utf-translate-cjk-mode nil))
++      (string (decode-char 'ucs ch)))))
+   
+ (defun xsdre-char-class-to-range-list (cc)
+   "Return a range-list for a symbolic char-class."
+@@ -403,7 +404,8 @@
+       (setq range-list (cdr range-list)))
+     (setq chars
+ 	  (mapcar (lambda (c)
+-		    (decode-char 'ucs c))
++                    (let ((utf-translate-cjk-mode nil))
++                      (decode-char 'ucs c)))
+ 		  chars))
+     (when caret
+       (setq chars (cons ?^ chars)))
diff --git a/app-emacs/nxml-mode/nxml-mode-20041004-r1.ebuild b/app-emacs/nxml-mode/nxml-mode-20041004-r1.ebuild
new file mode 100644
index 000000000000..fbe40d1a5674
--- /dev/null
+++ b/app-emacs/nxml-mode/nxml-mode-20041004-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-mode/nxml-mode-20041004-r1.ebuild,v 1.1 2007/08/15 07:37:56 ulm Exp $
+
+inherit elisp eutils
+
+DESCRIPTION="A major mode for GNU Emacs for editing XML documents."
+HOMEPAGE="http://www.thaiopensource.com/nxml-mode/
+http://www.emacswiki.org/cgi-bin/wiki/NxmlMode"
+SRC_URI="http://thaiopensource.com/download/${P}.tar.gz
+	mirror://gentoo/${PN}-20040910-xmlschema.patch.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE=""
+
+SITEFILE=80${PN}-gentoo.el
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-info-gentoo.patch"
+	epatch "${WORKDIR}/${PN}-20040910-xmlschema.patch"
+	epatch "${FILESDIR}/xsd-regexp.el.2006-01-26.patch"		# bug #188112
+}
+
+src_compile() {
+	emacs -batch -l rng-auto.el -f rng-byte-compile-load \
+		|| die "byte compilation failed"
+	makeinfo --force nxml-mode.texi || die "makeinfo failed"
+}
+
+src_install() {
+	elisp-install ${PN} *.el *.elc
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	cp -r "${S}/schema" "${D}/${SITELISP}/${PN}"
+	cp -r "${S}/char-name" "${D}/${SITELISP}/${PN}"
+	doinfo nxml-mode.info
+	dodoc README VERSION TODO NEWS || die "dodoc failed"
+}