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
commit5f4500d90a3bab188f0c0eed21fa34d21a1d4228 (patch)
treec5b4e216ea34b44ca08fe21ff4456744ac375cc7 /dev-libs/libxml2
parentMarked ppc stable for bug #315483. (diff)
downloadhistorical-5f4500d90a3bab188f0c0eed21fa34d21a1d4228.tar.gz
historical-5f4500d90a3bab188f0c0eed21fa34d21a1d4228.tar.bz2
historical-5f4500d90a3bab188f0c0eed21fa34d21a1d4228.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. Package-Manager: portage-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/Manifest16
-rw-r--r--dev-libs/libxml2/libxml2-2.7.6.ebuild4
-rw-r--r--dev-libs/libxml2/libxml2-2.7.7.ebuild4
4 files changed, 24 insertions, 8 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/Manifest b/dev-libs/libxml2/Manifest
index 4de4565d35b2..3328b1f7295e 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX libxml2-2.7.3-CVE-2009-2414-CVE-2009-2416.patch 6356 RMD160 a8c9086e5f0c1816ae1f8de8e27ae828c05c6a04 SHA1 28c2219b8e3b3a693d7e2553d239863ad21b41d5 SHA256 03f26db3f24e7fb91c489208f992f327c767135949e8e25d180df8b76065e7ef
AUX libxml2-2.7.3-printf-rename.patch 17280 RMD160 920065d543127026c526f00856e9a2a8fb41e42d SHA1 9a9515a1ea7c7313aa8e6bb607f987560504aaed SHA256 a7206cbd8a675e2d944f330255d648502d143472a2d96daa4753e422614b8520
DIST libxml2-2.7.3.tar.gz 4789450 RMD160 14018347531fd135366cee9fd9d760a1988546e2 SHA1 fd4e427fb55c977876bc74c0e552ef7d3d794a07 SHA256 432464d8c9bd8060d9c1fdef1cfa75803c1a363ceac20b21f8c7e34e056e5a98
@@ -6,7 +9,14 @@ DIST libxml2-2.7.7.tar.gz 4868502 RMD160 9f72c778c3e9e348a68eada0cf624c012658c08
DIST xsts-2002-01-16.tar.gz 6894439 RMD160 e8905fe1451a1c367b0104af24edca73bad1db08 SHA1 ca6344e6c47f8c28231f5b213d0c8deb0311a409 SHA256 55e5c08db29946a91ea8e70e8f2418d3fd30d8b6777941dfba7f54726ffd9914
DIST xsts-2004-01-14.tar.gz 2761085 RMD160 faff2d7826e47ae9968564bc83dab1b54c5e4bf6 SHA1 5896c2aa2cda464246306c5cf0577ed506eefaab SHA256 09bdf9f81f381ebf9bc158a9472e498e896f7a02eb7461146e9abe1b9493ca17
EBUILD libxml2-2.7.3-r2.ebuild 4457 RMD160 a88ba8bf4844dee50a72ea5f1a0d6c6a5b55f8a4 SHA1 9e55595b368a863bd7cf4b96f272f1ed0da3faf7 SHA256 f7cf9157bfd0afe55edff5365980939edf5fa07c5a9fb72cff7b196f89b809ed
-EBUILD libxml2-2.7.6.ebuild 3932 RMD160 c87a141c90429a28eea755271fe86e23f688fcac SHA1 91b0c0924901b411c91ed64ecded962ffc892213 SHA256 686a385c960c4b6782d932d91ef81cb6ee73c69661700243058e1a2af3853ae4
-EBUILD libxml2-2.7.7.ebuild 4723 RMD160 dda015bdd3b703b28cabe0a89b76707228093876 SHA1 1a337a7459586544d456e30cbc558896796ebfa8 SHA256 9e48e45cf07fdec9c84156ac63e46e45c3f04d5e6645a37c316abfcc8df45f18
-MISC ChangeLog 39162 RMD160 ebec21ce95f8891770b73199e12ed468fc33f08a SHA1 84a286d20de075b3ba44c40bbf6d9126a46544e9 SHA256 2e6cb0cf63e6dba6b1d5a19c81f578ca5cb81a5d3694a2ed64d5aa7cd1209caa
+EBUILD libxml2-2.7.6.ebuild 3961 RMD160 90fc627b1b17ee23fb03dfc19c33e8efcdb79bbd SHA1 054207dfa3e3c2744c94953806720bcb4258568e SHA256 9c80c26d7efbac1c915401b1bfe28a8dbca0e92a7fc58e3d93b77845432d08a0
+EBUILD libxml2-2.7.7.ebuild 4752 RMD160 97a27ff36dcb294e2d745c99719790e2b51e7e3c SHA1 44a2b7fa0cc47f65097b870d163bdfac1eefc7d9 SHA256 78881d60587220d11b30b6b27823bb43efdcad6e35ecf942b6f38a0fcef49db0
+MISC ChangeLog 39472 RMD160 594082bd3ef96ad637c22c4ecd4723b2168622a1 SHA1 c5adf628a1e38fd3e0f2436529b6fec309bc8bc2 SHA256 5028889e341d519b13e697d0a04690cbe8b3f29470a528b0482286cb69fb1ffa
MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkxfZrIACgkQ/ejvha5XGaPqOgCgp4gydE9x4OVrPeoWq4i9x2vy
+kbUAoL1Qir3EKEBll9Jqb1d7HhreD8qF
+=kN3r
+-----END PGP SIGNATURE-----
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}