summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-08-09 02:24:43 +0000
committerZac Medico <zmedico@gentoo.org>2010-08-09 02:24:43 +0000
commit9bb6939e0b07c250dc5fe6d178e672b3f5983293 (patch)
tree95fe06d964888ad35420cd69156c3fc1db937a16 /dev-libs/libxml2
parentMarked ppc stable for bug #315483. (diff)
downloadgentoo-2-9bb6939e0b07c250dc5fe6d178e672b3f5983293.tar.gz
gentoo-2-9bb6939e0b07c250dc5fe6d178e672b3f5983293.tar.bz2
gentoo-2-9bb6939e0b07c250dc5fe6d178e672b3f5983293.zip
With USE=python, require either python[xml] or pyxml, in order to avoid
a "SAXReaderNotAvailable: No parsers found" exception raised from xml.sax.make_parser(). This should solve stage3 libxml2 build failures. (Portage version: 2.2_rc67_p365/cvs/Linux i686)
Diffstat (limited to 'dev-libs/libxml2')
-rw-r--r--dev-libs/libxml2/ChangeLog8
-rw-r--r--dev-libs/libxml2/libxml2-2.7.6.ebuild4
-rw-r--r--dev-libs/libxml2/libxml2-2.7.7.ebuild4
3 files changed, 11 insertions, 5 deletions
diff --git a/dev-libs/libxml2/ChangeLog b/dev-libs/libxml2/ChangeLog
index a3dbe18f7cee..37ab80e53181 100644
--- a/dev-libs/libxml2/ChangeLog
+++ b/dev-libs/libxml2/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-libs/libxml2
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.292 2010/05/30 17:36:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.293 2010/08/09 02:24:43 zmedico Exp $
+
+ 09 Aug 2010; Zac Medico <zmedico@gentoo.org> libxml2-2.7.6.ebuild,
+ libxml2-2.7.7.ebuild:
+ With USE=python, require either python[xml] or pyxml, in order to avoid
+ a "SAXReaderNotAvailable: No parsers found" exception raised from
+ xml.sax.make_parser(). This should solve stage3 libxml2 build failures.
30 May 2010; Raúl Porcel <armin76@gentoo.org> libxml2-2.7.7.ebuild:
alpha/arm/ia64/m68k/s390/sh/sparc stable wrt #317819
diff --git a/dev-libs/libxml2/libxml2-2.7.6.ebuild b/dev-libs/libxml2/libxml2-2.7.6.ebuild
index 6d23c4dae833..15a3e923fc85 100644
--- a/dev-libs/libxml2/libxml2-2.7.6.ebuild
+++ b/dev-libs/libxml2/libxml2-2.7.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.7.6.ebuild,v 1.7 2010/04/24 19:02:44 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.7.6.ebuild,v 1.8 2010/08/09 02:24:43 zmedico Exp $
EAPI="2"
@@ -26,7 +26,7 @@ SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz
${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2} )"
RDEPEND="sys-libs/zlib
- python? ( <dev-lang/python-3 )
+ python? ( || ( <dev-lang/python-3[xml] dev-python/pyxml ) )
readline? ( sys-libs/readline )"
DEPEND="${RDEPEND}
diff --git a/dev-libs/libxml2/libxml2-2.7.7.ebuild b/dev-libs/libxml2/libxml2-2.7.7.ebuild
index bc1417dbdf83..14cad0ffa70d 100644
--- a/dev-libs/libxml2/libxml2-2.7.7.ebuild
+++ b/dev-libs/libxml2/libxml2-2.7.7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.7.7.ebuild,v 1.11 2010/05/30 17:36:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.7.7.ebuild,v 1.12 2010/08/09 02:24:43 zmedico Exp $
EAPI="2"
SUPPORT_PYTHON_ABIS="1"
@@ -28,7 +28,7 @@ SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz
${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2} )"
RDEPEND="sys-libs/zlib
- python? ( <dev-lang/python-3 )
+ python? ( || ( <dev-lang/python-3[xml] dev-python/pyxml ) )
readline? ( sys-libs/readline )"
DEPEND="${RDEPEND}