add scrollkeeper fix, mark x86

5 files changed, 33 insertions, 7 deletions

diff --git a/dev-libs/libxml2/ChangeLog b/dev-libs/libxml2/ChangeLog
index 607bffdf79e6..d751c922c07b 100644
--- a/dev-libs/libxml2/ChangeLog
+++ b/dev-libs/libxml2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libxml2
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.93 2004/10/29 22:35:31 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.94 2004/10/30 14:15:21 foser Exp $
+
+*libxml2-2.6.15-r1 (30 Oct 2004)
+
+  30 Oct 2004; foser <foser@gentoo.org> libxml2-2.6.15-r1.ebuild :
+  Add patch to fix scrollkeeper crash
 
 *libxml2-2.6.15 (30 Oct 2004)
 
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index b3676932baab..9a7010dff819 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -1,14 +1,15 @@
 MD5 b40c981bc48af5d494d9903c64395e8b libxml2-2.6.12.ebuild 1670
+MD5 58b56e9b93c6cbb3b98c99bbaff90b3a libxml2-2.6.15-r1.ebuild 1778
 MD5 5900215d6556e3e2aa098da214f3f302 libxml2-2.6.7.ebuild 1887
 MD5 aded0bbec70dc0a90dc3cdb5d25d16da libxml2-2.6.11.ebuild 1662
 MD5 086f5dd9238430853ec8bfc5d82b47c4 libxml2-2.6.9.ebuild 1948
 MD5 0eededeaa59fa4582aa5176d034a9f19 libxml2-2.6.6.ebuild 1892
-MD5 9fa1ca89830f52dae175a979d4681bed libxml2-2.6.15.ebuild 1671
-MD5 833170e959a48a56a83c1ae52e1b1cc7 ChangeLog 11179
+MD5 8319aa6292c8518f1c921ca585218f0f ChangeLog 11319
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 df8aa422d2ef75d0fbb2dfd7e3691d2c files/digest-libxml2-2.6.6 67
 MD5 e1d3673ddc47844934e0894da13d7c31 files/digest-libxml2-2.6.7 67
 MD5 02c6697e95e4ac68f27f42bc47bd211b files/digest-libxml2-2.6.9 67
+MD5 6f985801b3703cf758165d018cad9132 files/libxml2-2.6.15-reverse_error.patch 670
+MD5 e7fb4717d64a8f4b7c4f35a6924bdbd4 files/digest-libxml2-2.6.15-r1 68
 MD5 58ae52ba5b2d6b7aed29f8a08b324d2c files/digest-libxml2-2.6.11 68
 MD5 fa747ea5704458d21c71742d5bd870d4 files/digest-libxml2-2.6.12 68
-MD5 e7fb4717d64a8f4b7c4f35a6924bdbd4 files/digest-libxml2-2.6.15 68
diff --git a/dev-libs/libxml2/files/digest-libxml2-2.6.15 b/dev-libs/libxml2/files/digest-libxml2-2.6.15-r1
index b501eb5fa9ff..b501eb5fa9ff 100644
--- a/dev-libs/libxml2/files/digest-libxml2-2.6.15
+++ b/dev-libs/libxml2/files/digest-libxml2-2.6.15-r1
diff --git a/dev-libs/libxml2/files/libxml2-2.6.15-reverse_error.patch b/dev-libs/libxml2/files/libxml2-2.6.15-reverse_error.patch
new file mode 100644
index 000000000000..f19f6168e5d2
--- /dev/null
+++ b/dev-libs/libxml2/files/libxml2-2.6.15-reverse_error.patch
@@ -0,0 +1,16 @@
+===================================================================
+RCS file: /cvs/gnome/libxml2/error.c,v
+retrieving revision 1.73
+retrieving revision 1.74
+diff -u -r1.73 -r1.74
+--- error.c	2004/10/02 03:54:00	1.73
++++ error.c	2004/10/25 16:23:56	1.74
+@@ -453,7 +453,7 @@
+         return;
+     if ((domain == XML_FROM_PARSER) || (domain == XML_FROM_HTML) ||
+         (domain == XML_FROM_DTD) || (domain == XML_FROM_NAMESPACE) ||
+-	(domain == XML_FROM_IO)) {
++	(domain == XML_FROM_IO) || (domain == XML_FROM_VALID)) {
+ 	ctxt = (xmlParserCtxtPtr) ctx;
+ 	if ((schannel == NULL) && (ctxt != NULL) && (ctxt->sax != NULL) &&
+ 	    (ctxt->sax->initialized == XML_SAX2_MAGIC))
diff --git a/dev-libs/libxml2/libxml2-2.6.15.ebuild b/dev-libs/libxml2/libxml2-2.6.15-r1.ebuild
index 5fe5656184c2..1546892ac857 100644
--- a/dev-libs/libxml2/libxml2-2.6.15.ebuild
+++ b/dev-libs/libxml2/libxml2-2.6.15-r1.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.6.15.ebuild,v 1.1 2004/10/29 22:35:31 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.6.15-r1.ebuild,v 1.1 2004/10/30 14:15:21 foser Exp $
 
-inherit libtool gnome.org flag-o-matic gnuconfig
+inherit libtool gnome.org flag-o-matic gnuconfig eutils
 
 DESCRIPTION="Version 2 of the library to manipulate XML files"
 HOMEPAGE="http://www.xmlsoft.org/"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm -hppa ~amd64 ~ia64 ~ppc64 ~s390"
+KEYWORDS="x86 ~ppc ~sparc ~mips ~alpha ~arm -hppa ~amd64 ~ia64 ~ppc64 ~s390"
 IUSE="python readline ipv6"
 
 DEPEND="sys-libs/zlib
@@ -21,6 +21,10 @@ src_unpack() {
 	unpack ${A}
 	gnuconfig_update ${S}
 
+	cd ${S}
+	# Fix scrollkeeper crash
+	EPATCH_OPTS="-R" epatch ${FILESDIR}/${P}-reverse_error.patch
+
 }
 
 src_compile() {