needed patch for libxml2 2.6

10 files changed, 87 insertions, 17 deletions

diff --git a/dev-perl/XML-LibXML/ChangeLog b/dev-perl/XML-LibXML/ChangeLog
index 5922d40807bc..b80444467215 100644
--- a/dev-perl/XML-LibXML/ChangeLog
+++ b/dev-perl/XML-LibXML/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-perl/XML-LibXML
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-LibXML/ChangeLog,v 1.23 2004/01/18 22:45:16 tuxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-LibXML/ChangeLog,v 1.24 2004/01/31 01:06:10 rac Exp $
+
+*XML-LibXML-1.56-r1 (30 Jan 2004)
+
+  30 Jan 2004; <rac@gentoo.org> XML-LibXML-1.56-r1.ebuild,
+  files/XML-LibXML-1.56-dupextern.patch:
+  Patch to support libxml2 2.6 from bug 33651, tested with 2.5.11, needs to be
+  stable on all arches on which libxml2 2.6 is.
 
   18 Jan 2004; <tuxus@gentoo.org> XML-LibXML-1.54-r1.ebuild:
   Added ~mips to KEYWORDS.
diff --git a/dev-perl/XML-LibXML/Manifest b/dev-perl/XML-LibXML/Manifest
index b968cc11c5d9..4a194ee8c5bc 100644
--- a/dev-perl/XML-LibXML/Manifest
+++ b/dev-perl/XML-LibXML/Manifest
@@ -1,14 +1,17 @@
-MD5 d848c96b8b5744cd423d1d22b17230dd ChangeLog 3092
-MD5 a155a17aef0ac9db28b59368ae966f7b XML-LibXML-1.52-r1.ebuild 973
-MD5 4ca0abde6321640294a00d4011f97c80 XML-LibXML-1.52-r2.ebuild 973
 MD5 88812dd5232fb6e264727e4510d5579f XML-LibXML-1.52.ebuild 970
-MD5 41c2a540fd2ef3bfafaffe4959fb8258 XML-LibXML-1.54-r1.ebuild 974
+MD5 4ca0abde6321640294a00d4011f97c80 XML-LibXML-1.52-r2.ebuild 973
 MD5 ea33d36b784cd2fb0720fab586a82788 XML-LibXML-1.54.ebuild 969
 MD5 8609fdd9b05d521603a210b55d777d3b XML-LibXML-1.56.ebuild 908
+MD5 10f7cd192704d900db8009926e021651 XML-LibXML-1.56-r1.ebuild 1021
+MD5 a155a17aef0ac9db28b59368ae966f7b XML-LibXML-1.52-r1.ebuild 973
+MD5 d848c96b8b5744cd423d1d22b17230dd ChangeLog 3092
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
-MD5 9785bdcfa35384e28f67378cee4856c9 files/digest-XML-LibXML-1.52 67
+MD5 41c2a540fd2ef3bfafaffe4959fb8258 XML-LibXML-1.54-r1.ebuild 974
+MD5 2c4e6aba085d10088b36bf380b08f9f7 files/XML-LibXML-1.56-dupextern.patch 1122
 MD5 9785bdcfa35384e28f67378cee4856c9 files/digest-XML-LibXML-1.52-r1 67
 MD5 9785bdcfa35384e28f67378cee4856c9 files/digest-XML-LibXML-1.52-r2 67
-MD5 a7deada40f6924f4efd0268190beef74 files/digest-XML-LibXML-1.54 69
 MD5 a7deada40f6924f4efd0268190beef74 files/digest-XML-LibXML-1.54-r1 69
+MD5 c0859d510b1dba6854d4079eecd93237 files/digest-XML-LibXML-1.56-r1 67
+MD5 9785bdcfa35384e28f67378cee4856c9 files/digest-XML-LibXML-1.52 67
+MD5 a7deada40f6924f4efd0268190beef74 files/digest-XML-LibXML-1.54 69
 MD5 c0859d510b1dba6854d4079eecd93237 files/digest-XML-LibXML-1.56 67
diff --git a/dev-perl/XML-LibXML/XML-LibXML-1.52-r1.ebuild b/dev-perl/XML-LibXML/XML-LibXML-1.52-r1.ebuild
index 9c904fb64619..af168fcde353 100644
--- a/dev-perl/XML-LibXML/XML-LibXML-1.52-r1.ebuild
+++ b/dev-perl/XML-LibXML/XML-LibXML-1.52-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-LibXML/XML-LibXML-1.52-r1.ebuild,v 1.6 2003/09/06 22:37:58 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-LibXML/XML-LibXML-1.52-r1.ebuild,v 1.7 2004/01/31 01:06:10 rac Exp $
 
 
 inherit perl-module
diff --git a/dev-perl/XML-LibXML/XML-LibXML-1.52-r2.ebuild b/dev-perl/XML-LibXML/XML-LibXML-1.52-r2.ebuild
index 4629ae22b854..423cc3f3be19 100644
--- a/dev-perl/XML-LibXML/XML-LibXML-1.52-r2.ebuild
+++ b/dev-perl/XML-LibXML/XML-LibXML-1.52-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-LibXML/XML-LibXML-1.52-r2.ebuild,v 1.3 2003/09/06 22:37:58 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-LibXML/XML-LibXML-1.52-r2.ebuild,v 1.4 2004/01/31 01:06:10 rac Exp $
 
 
 inherit perl-module
diff --git a/dev-perl/XML-LibXML/XML-LibXML-1.52.ebuild b/dev-perl/XML-LibXML/XML-LibXML-1.52.ebuild
index 3b84a5d2f84b..a0f664648e29 100644
--- a/dev-perl/XML-LibXML/XML-LibXML-1.52.ebuild
+++ b/dev-perl/XML-LibXML/XML-LibXML-1.52.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-LibXML/XML-LibXML-1.52.ebuild,v 1.9 2003/09/06 22:37:58 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-LibXML/XML-LibXML-1.52.ebuild,v 1.10 2004/01/31 01:06:10 rac Exp $
 
 
 inherit perl-module
diff --git a/dev-perl/XML-LibXML/XML-LibXML-1.54.ebuild b/dev-perl/XML-LibXML/XML-LibXML-1.54.ebuild
index c07819a79c72..c22b688010bc 100644
--- a/dev-perl/XML-LibXML/XML-LibXML-1.54.ebuild
+++ b/dev-perl/XML-LibXML/XML-LibXML-1.54.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-LibXML/XML-LibXML-1.54.ebuild,v 1.8 2003/09/06 22:37:58 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-LibXML/XML-LibXML-1.54.ebuild,v 1.9 2004/01/31 01:06:10 rac Exp $
 
 
 inherit perl-module
diff --git a/dev-perl/XML-LibXML/XML-LibXML-1.56-r1.ebuild b/dev-perl/XML-LibXML/XML-LibXML-1.56-r1.ebuild
new file mode 100644
index 000000000000..d03b80bda2a2
--- /dev/null
+++ b/dev-perl/XML-LibXML/XML-LibXML-1.56-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-LibXML/XML-LibXML-1.56-r1.ebuild,v 1.1 2004/01/31 01:06:10 rac Exp $
+
+inherit perl-module
+
+DESCRIPTION="A Perl module to parse XSL Transformational sheets using gnome's libXSLT"
+SRC_URI="http://cpan.org/modules/by-module/XML/${P}.tar.gz"
+HOMEPAGE="http://cpan.org/modules/by-module/XML/${P}.readme"
+IUSE=""
+SLOT="0"
+LICENSE="Artistic"
+KEYWORDS="x86 ~amd64 alpha ~ppc sparc "
+
+newdepend ">=dev-perl/XML-SAX-0.12
+	dev-perl/XML-LibXML-Common
+	>=dev-libs/libxml2-2.4.1
+	>=dev-perl/XML-NamespaceSupport-1.07"
+
+export PERL5LIB=`perl -e 'print map { ":$ENV{D}/$_" } @INC'`
+mytargets="pure_install doc_install"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	patch -p1 < ${FILESDIR}/${P}-dupextern.patch || die "dupextern patch failed"
+}
+
+pkg_postinst() {
+
+	perl-module_pkg_postinst
+
+	perl -MXML::SAX \
+		-e "XML::SAX->add_parser(q(XML::LibXML::SAX::Parser))->save_parsers()"
+
+}
diff --git a/dev-perl/XML-LibXML/XML-LibXML-1.56.ebuild b/dev-perl/XML-LibXML/XML-LibXML-1.56.ebuild
index ebee9a107178..b901f5853b2e 100644
--- a/dev-perl/XML-LibXML/XML-LibXML-1.56.ebuild
+++ b/dev-perl/XML-LibXML/XML-LibXML-1.56.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-LibXML/XML-LibXML-1.56.ebuild,v 1.1 2003/12/20 22:48:10 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-LibXML/XML-LibXML-1.56.ebuild,v 1.2 2004/01/31 01:06:10 rac Exp $
 
 inherit perl-module
 
diff --git a/dev-perl/XML-LibXML/files/XML-LibXML-1.56-dupextern.patch b/dev-perl/XML-LibXML/files/XML-LibXML-1.56-dupextern.patch
new file mode 100644
index 000000000000..80279dbef9a5
--- /dev/null
+++ b/dev-perl/XML-LibXML/files/XML-LibXML-1.56-dupextern.patch
@@ -0,0 +1,23 @@
+diff -ur XML-LibXML-1.56.orig/LibXML.xs XML-LibXML-1.56/LibXML.xs
+--- XML-LibXML-1.56.orig/LibXML.xs	2003-08-22 17:07:07.000000000 -0700
++++ XML-LibXML-1.56/LibXML.xs	2004-01-03 13:13:26.000000000 -0800
+@@ -70,13 +70,13 @@
+ extern int xmlSubstituteEntitiesDefaultVal;
+ #define xmlSubstituteEntitiesDefaultValue xmlSubstituteEntitiesDefaultVal
+ #else
+-LIBXML_DLL_IMPORT extern int xmlDoValidityCheckingDefaultValue;
+-LIBXML_DLL_IMPORT extern int xmlSubstituteEntitiesDefaultValue;
++LIBXML_DLL_IMPORT int xmlDoValidityCheckingDefaultValue;
++LIBXML_DLL_IMPORT int xmlSubstituteEntitiesDefaultValue;
+ #endif
+-LIBXML_DLL_IMPORT extern int xmlGetWarningsDefaultValue;
+-LIBXML_DLL_IMPORT extern int xmlKeepBlanksDefaultValue;
+-LIBXML_DLL_IMPORT extern int xmlLoadExtDtdDefaultValue;
+-LIBXML_DLL_IMPORT extern int xmlPedanticParserDefaultValue;
++LIBXML_DLL_IMPORT int xmlGetWarningsDefaultValue;
++LIBXML_DLL_IMPORT int xmlKeepBlanksDefaultValue;
++LIBXML_DLL_IMPORT int xmlLoadExtDtdDefaultValue;
++LIBXML_DLL_IMPORT int xmlPedanticParserDefaultValue;
+ 
+ #define TEST_PERL_FLAG(flag) \
+     SvTRUE(perl_get_sv(flag, FALSE)) ? 1 : 0
diff --git a/dev-perl/XML-LibXML/files/digest-XML-LibXML-1.56-r1 b/dev-perl/XML-LibXML/files/digest-XML-LibXML-1.56-r1
new file mode 100644
index 000000000000..a0ee1bce4bb2
--- /dev/null
+++ b/dev-perl/XML-LibXML/files/digest-XML-LibXML-1.56-r1
@@ -0,0 +1 @@
+MD5 e22a4d79e6afdc8965518bf8a3abb492 XML-LibXML-1.56.tar.gz 165047