Version bump, fixes Relax-NG validation problems.

Package-Manager: portage-2.2_rc60/cvs/Linux x86_64

3 files changed, 151 insertions, 6 deletions

diff --git a/dev-libs/libxml2/ChangeLog b/dev-libs/libxml2/ChangeLog
index dd9fb2892be7..62304f2f01da 100644
--- a/dev-libs/libxml2/ChangeLog
+++ b/dev-libs/libxml2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libxml2
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.275 2009/12/08 00:02:40 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.276 2009/12/23 16:29:20 flameeyes Exp $
+
+*libxml2-2.7.6 (23 Dec 2009)
+
+  23 Dec 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  +libxml2-2.7.6.ebuild:
+  Version bump, fixes Relax-NG validation problems.
 
   08 Dec 2009; Gilles Dartiguelongue <eva@gentoo.org> -libxml2-2.7.4.ebuild,
   libxml2-2.7.4-r1.ebuild:
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 3ae0e0c59f32..bd2735f819cb 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -6,16 +6,18 @@ AUX libxml2-2.7.3-printf-rename.patch 17280 RMD160 920065d543127026c526f00856e9a
 AUX libxml2-2.7.4-parser-grow.patch 1309 RMD160 7364ec69b3929ed5976d8faf3c6cdb2359d2fce6 SHA1 6f703b7a3e32ad2728827a0ca976b93953719d27 SHA256 0003cf89dc6de0ea8be4e063745f4f585b329ab47bfdc71c81e4918dfd461584
 DIST libxml2-2.7.3.tar.gz 4789450 RMD160 14018347531fd135366cee9fd9d760a1988546e2 SHA1 fd4e427fb55c977876bc74c0e552ef7d3d794a07 SHA256 432464d8c9bd8060d9c1fdef1cfa75803c1a363ceac20b21f8c7e34e056e5a98
 DIST libxml2-2.7.4.tar.gz 4835073 RMD160 c1d29b6b869cb07cfd78a93ac9b8dd24c2b801b1 SHA1 5db9fd452d465422f576592c9e5bcf17ce1b53a2 SHA256 f10ff01a25750913828b69625ac9d1f1f82039aa8401ca843c1d335763cbf5b1
+DIST libxml2-2.7.6.tar.gz 4854591 RMD160 849ded7b61f88e75ef0dacf0e5647ce8ad951261 SHA1 b0f6bf8408e759ac4b8b9650005ee8adea911e1d SHA256 238c4f0203c012e5776522640c0fb3ac532c4064981c1ce3e74c00b75501d761
 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 4453 RMD160 37ffaaee427f6eec4d8e683cd0c209dd11ee58b8 SHA1 22b2e24584a39d2f5d372aa15c335fb803bd5de2 SHA256 b9aa76091d1d31340fe8b5092f313ed4b1662b55ac25dfaa07984240c660b38e
 EBUILD libxml2-2.7.4-r1.ebuild 4083 RMD160 f1a2fa0b8220086ee1a69e9e17ea14aedadca7ff SHA1 5cbe3534b2a3a9c47a948b1b76becbeec647b67c SHA256 8fa0b9fcd0aa57cbb6a6881c465c5d8a7b1e34e7e04217b485659d970ef93d3f
-MISC ChangeLog 36990 RMD160 1f1beb1047963253b4f2152d9fa62259603d5187 SHA1 e47cf741b768e5777ef5be5b34142d4d463d3f4a SHA256 33ae1b4d8690f083431ed21b17116c0d6eafee5d6f085cef90fc1a64a66b28a5
+EBUILD libxml2-2.7.6.ebuild 3942 RMD160 92eabf1850a806405e0c2910389d28c4c5679da8 SHA1 84910e4f5e4ea0037090b85db6ae760a9cecc6b0 SHA256 f6343b66e818d8a2acb746d49a0e09150b1d000c2f77046a9ac455a700ee9321
+MISC ChangeLog 37160 RMD160 4cd6f8af72b1f1ea3c4377f477c9229cc82b1dab SHA1 bcc99a95573184a8c55bee55967470b7e143b704 SHA256 ded5f05bff8f74f179e99104cfe1d6dbc7308069c5d85ac48e9bd22c921b6225
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAksdl6sACgkQ1fmVwcYIWAbgawCg67APPZ59vORWsIvBRSY4C3yx
-l8QAoLl108omyD2gv4fx9GZxEUZwRlbL
-=cpXn
+iEYEARECAAYFAksyRUoACgkQAiZjviIA2XhtwQCg6yWpSdj3wlwXxtJ7BydyVQIT
+C+0AoJirBQO6k7Dv4ORo4rhgzuhCNtMa
+=/8O7
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libxml2/libxml2-2.7.6.ebuild b/dev-libs/libxml2/libxml2-2.7.6.ebuild
new file mode 100644
index 000000000000..1c940075e093
--- /dev/null
+++ b/dev-libs/libxml2/libxml2-2.7.6.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2009 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.1 2009/12/23 16:29:20 flameeyes Exp $
+
+EAPI="2"
+
+inherit libtool flag-o-matic eutils python
+
+DESCRIPTION="Version 2 of the library to manipulate XML files"
+HOMEPAGE="http://www.xmlsoft.org/"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="debug doc examples ipv6 python readline test"
+
+XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
+XSTS_NAME_1="xmlschema2002-01-16"
+XSTS_NAME_2="xmlschema2004-01-14"
+XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
+XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
+
+SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz
+	test? (
+		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
+		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2} )"
+
+RDEPEND="sys-libs/zlib
+	python? ( dev-lang/python )
+	readline? ( sys-libs/readline )"
+
+DEPEND="${RDEPEND}
+	hppa? ( >=sys-devel/binutils-2.15.92.0.2 )"
+
+src_unpack() {
+	# ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR,
+	# as they are needed as tarballs in ${S}/xstc instead and not unpacked
+	unpack ${P}.tar.gz
+	cd "${S}"
+
+	if use test; then
+		cp "${DISTDIR}/${XSTS_TARBALL_1}" \
+			"${DISTDIR}/${XSTS_TARBALL_2}" \
+			"${S}"/xstc/ \
+			|| die "Failed to install test tarballs"
+	fi
+}
+
+src_prepare() {
+	epunt_cxx
+}
+
+src_configure() {
+	# USE zlib support breaks gnome2
+	# (libgnomeprint for instance fails to compile with
+	# fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002).
+
+	# The meaning of the 'debug' USE flag does not apply to the --with-debug
+	# switch (enabling the libxml2 debug module). See bug #100898.
+
+	# --with-mem-debug causes unusual segmentation faults (bug #105120).
+
+	local myconf="--with-zlib \
+		--with-html-subdir=${PF}/html \
+		--docdir=/usr/share/doc/${PF} \
+		$(use_with debug run-debug)  \
+		$(use_with python)           \
+		$(use_with readline)         \
+		$(use_with readline history) \
+		$(use_enable ipv6) \
+		PYTHON_SITE_PACKAGES=$(python_get_sitedir)"
+
+	# Please do not remove, as else we get references to PORTAGE_TMPDIR
+	# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
+	elibtoolize
+
+	# filter seemingly problematic CFLAGS (#26320)
+	filter-flags -fprefetch-loop-arrays -funroll-loops
+
+	econf $myconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		EXAMPLES_DIR=/usr/share/doc/${PF}/examples \
+		docsdir=/usr/share/doc/${PF}/python \
+		exampledir=/usr/share/doc/${PF}/python/examples \
+		install || die "Installation failed"
+
+	rm -rf "${D}"/usr/share/doc/${P}
+	dodoc AUTHORS ChangeLog Copyright NEWS README* TODO* || die "dodoc failed"
+
+	if ! use python; then
+		rm -rf "${D}"/usr/share/doc/${PF}/python
+		rm -rf "${D}"/usr/share/doc/${PN}-python-${PV}
+	fi
+
+	if ! use doc; then
+		rm -rf "${D}"/usr/share/gtk-doc
+		rm -rf "${D}"/usr/share/doc/${PF}/html
+	fi
+
+	if ! use examples; then
+		rm -rf "${D}/usr/share/doc/${PF}/examples"
+		rm -rf "${D}/usr/share/doc/${PF}/python/examples"
+	fi
+}
+
+pkg_postinst() {
+	if use python; then
+		python_need_rebuild
+		python_mod_optimize $(python_get_sitedir)
+	fi
+
+	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
+	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
+	if [ "${ROOT}" != "/" ]
+	then
+		elog "Skipping XML catalog creation for stage building (bug #208887)."
+	else
+		# need an XML catalog, so no-one writes to a non-existent one
+		CATALOG="${ROOT}etc/xml/catalog"
+
+		# we dont want to clobber an existing catalog though,
+		# only ensure that one is there
+		# <obz@gentoo.org>
+		if [ ! -e ${CATALOG} ]; then
+			[ -d "${ROOT}etc/xml" ] || mkdir -p "${ROOT}etc/xml"
+			/usr/bin/xmlcatalog --create > ${CATALOG}
+			einfo "Created XML catalog in ${CATALOG}"
+		fi
+	fi
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages
+}