Fix selector and field regexps in xmlschema.rnc, bug #188114.

(Portage version: 2.1.3.9)

4 files changed, 80 insertions, 1 deletions

diff --git a/app-emacs/nxml-mode/ChangeLog b/app-emacs/nxml-mode/ChangeLog
index 165f26a578fe..5257f41a8fc8 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.24 2007/08/15 07:37:56 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-mode/ChangeLog,v 1.25 2007/09/09 10:00:18 ulm Exp $
+
+*nxml-mode-20041004-r2 (09 Sep 2007)
+
+  09 Sep 2007; Ulrich Mueller <ulm@gentoo.org>
+  +files/nxml-mode-xmlschema-xpath.patch, +nxml-mode-20041004-r2.ebuild:
+  Fix selector and field regexps in xmlschema.rnc, bug #188114. Patch provided
+  by Martin von Gagern <Martin.vGagern@gmx.net>.
 
 *nxml-mode-20041004-r1 (15 Aug 2007)
 
diff --git a/app-emacs/nxml-mode/files/digest-nxml-mode-20041004-r2 b/app-emacs/nxml-mode/files/digest-nxml-mode-20041004-r2
new file mode 100644
index 000000000000..431875c7937a
--- /dev/null
+++ b/app-emacs/nxml-mode/files/digest-nxml-mode-20041004-r2
@@ -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/nxml-mode-xmlschema-xpath.patch b/app-emacs/nxml-mode/files/nxml-mode-xmlschema-xpath.patch
new file mode 100644
index 000000000000..b1a00240bc47
--- /dev/null
+++ b/app-emacs/nxml-mode/files/nxml-mode-xmlschema-xpath.patch
@@ -0,0 +1,24 @@
+--- nxml-mode-20041004-orig/schema/xmlschema.rnc	2007-09-09 11:50:06.000000000 +0200
++++ nxml-mode-20041004/schema/xmlschema.rnc	2007-09-09 11:50:19.000000000 +0200
+@@ -809,8 +809,9 @@
+     annotated,
+     attribute xpath {
+       xsd:token {
++        pattern = "[./|:*@]*([^\I:][^\C:]*[./|:*@]+)*([^\I:][^\C:]*)?"
+         pattern =
+-          "(\.//)?(((child::)?((\i\c*:)?(\i\c*|\*)))|\.)(/(((child::)?((\i\c*:)?(\i\c*|\*)))|\.))*(\|(\.//)?(((child::)?((\i\c*:)?(\i\c*|\*)))|\.)(/(((child::)?((\i\c*:)?(\i\c*|\*)))|\.))*)*"
++          "(\s*\.\s*//)?\s*(\.|(child::\s*)?([^./|:*@]+:)?([^./|:*@]+|\*))\s*(/\s*(\.|(child::\s*)?([^./|:*@]+:)?([^./|:*@]+|\*))\s*)*(\|(\s*\.\s*//)?\s*(\.|(child::\s*)?([^./|:*@]+:)?([^./|:*@]+|\*))\s*(/\s*(\.|(child::\s*)?([^./|:*@]+:)?([^./|:*@]+|\*))\s*)*)*"
+       }
+     }
+   }
+@@ -829,8 +830,9 @@
+     annotated,
+     attribute xpath {
+       xsd:token {
++        pattern = "[./|:*@]*([^\I:][^\C:]*[./|:*@]+)*([^\I:][^\C:]*)?"
+         pattern =
+-          "(\.//)?((((child::)?((\i\c*:)?(\i\c*|\*)))|\.)/)*((((child::)?((\i\c*:)?(\i\c*|\*)))|\.)|((attribute::|@)((\i\c*:)?(\i\c*|\*))))(\|(\.//)?((((child::)?((\i\c*:)?(\i\c*|\*)))|\.)/)*((((child::)?((\i\c*:)?(\i\c*|\*)))|\.)|((attribute::|@)((\i\c*:)?(\i\c*|\*)))))*"
++          "(\s*\.\s*//)?(\s*(\.|(child::\s*)?([^./|:*@]+:)?([^./|:*@]+|\*))\s*/)*(\s*(\.|(child::\s*)?([^./|:*@]+:)?([^./|:*@]+|\*))\s*|\s*(@|attribute::)\s*(child::\s*)?([^./|:*@]+:)?([^./|:*@]+|\*)\s*)(\|(\s*\.\s*//)?(\s*(\.|(child::\s*)?([^./|:*@]+:)?([^./|:*@]+|\*))\s*/)*(\s*(\.|(child::\s*)?([^./|:*@]+:)?([^./|:*@]+|\*))\s*|\s*(@|attribute::)\s*(child::\s*)?([^./|:*@]+:)?([^./|:*@]+|\*)\s*))*"
+       }
+     }
+   }
diff --git a/app-emacs/nxml-mode/nxml-mode-20041004-r2.ebuild b/app-emacs/nxml-mode/nxml-mode-20041004-r2.ebuild
new file mode 100644
index 000000000000..1a578cab5ce7
--- /dev/null
+++ b/app-emacs/nxml-mode/nxml-mode-20041004-r2.ebuild
@@ -0,0 +1,42 @@
+# 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-r2.ebuild,v 1.1 2007/09/09 10:00:18 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
+	epatch "${FILESDIR}/${PN}-xmlschema-xpath.patch"		# bug #188114
+}
+
+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"
+}