bump to 2.6.31 and add examples use flag per bug #111508

Package-Manager: portage-2.1.4.4

3 files changed, 135 insertions, 6 deletions

diff --git a/dev-libs/libxml2/ChangeLog b/dev-libs/libxml2/ChangeLog
index da0e97a607db..a13f5654c5d0 100644
--- a/dev-libs/libxml2/ChangeLog
+++ b/dev-libs/libxml2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libxml2
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.204 2008/02/08 19:29:16 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.205 2008/02/28 21:47:39 eva Exp $
+
+*libxml2-2.6.31 (28 Feb 2008)
+
+  28 Feb 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +libxml2-2.6.31.ebuild:
+  bump to 2.6.31 and add examples use flag per bug #111508
 
   08 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   libxml2-2.6.30-r1.ebuild:
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 46451a9ae5ad..b2d967e41309 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -6,18 +6,20 @@ AUX libxml2-2.6.30-CVE-2007-6284.patch 1666 RMD160 5622efd6e110cd9775061c6cb9a58
 DIST libxml2-2.6.28.tar.gz 4716025 RMD160 65d0c2cef5ce40751bd72bb54462d9122558fa17 SHA1 7642a52799efde2e0163d322b2aee8cd9f583268 SHA256 384db143d8ccdf1904439150ef5081f78d7f9f05ac15306f685c10c2bd3e1cb2
 DIST libxml2-2.6.29.tar.gz 4719760 RMD160 489b394fc7dd9c23618a88ba3ddcecf71caf3874 SHA1 2355f2455aa6408244b7e2c444befeb0e93e37d5 SHA256 e34a19e0b9d7ac03874acffd624f181c85a98fb976dc84411d6cd1bdda965992
 DIST libxml2-2.6.30.tar.gz 4726657 RMD160 8adcca2a60b4e90de898d9710a3a45069b73bbfe SHA1 519701df3a10770980e993336fe19ef7d95b5bba SHA256 877762a0f44785487d747ed7bd3db364ade75943e6d8e9c49fa6340c3833735e
+DIST libxml2-2.6.31.tar.gz 4734599 RMD160 de231ec47f14ace35c29cf59d650a5611fd6128a SHA1 97233a210425bad96b35e52aa3e0010ac11bbcc9 SHA256 3e7982341bbb1f11d5df344177955769e16b4d271f1f5c271740b3d1fad9bac6
 DIST xsts-2002-01-16.tar.gz 6894439 RMD160 e8905fe1451a1c367b0104af24edca73bad1db08 SHA1 ca6344e6c47f8c28231f5b213d0c8deb0311a409 SHA256 55e5c08db29946a91ea8e70e8f2418d3fd30d8b6777941dfba7f54726ffd9914
 DIST xsts-2006-11-06.tar.gz 4349266 RMD160 a64caae64dd82c703a94fa63ce1291dc289df376 SHA1 fff51a184bdd310f5b177a87503df2288db83e40 SHA256 542db1d583061f3f713481aab6aa6cb382efec87716d74b94c4a0155981e2d09
 EBUILD libxml2-2.6.28.ebuild 3227 RMD160 40551e351871540f3a278cb88110a6d427b5d91a SHA1 26431b6f08f1d31d53b9302453463279dd43af3d SHA256 70768612278c3c9e9ded9575d2c7120b91ca62408a933378a70081c6d66a2760
 EBUILD libxml2-2.6.29.ebuild 3124 RMD160 ad1c943d31a5e6d63195cae84266064cc90ba424 SHA1 9c583f48de50b7e4e095b838590abd6dd9870402 SHA256 dcbc9c3598c8717a0867e8e16033da3fb92ce532a6393e22261bf1e133f5c4f6
 EBUILD libxml2-2.6.30-r1.ebuild 3461 RMD160 fc6436cd78c1b7bc61257e3229558fec4ae73dd6 SHA1 e3ac2c25c402ce0be461984a74ed05f8d48ced92 SHA256 25b12e5b7b2af8f0d31b594400e9b6724fb3c9b8ef4561ef49170a61ef0dc55a
 EBUILD libxml2-2.6.30.ebuild 3112 RMD160 f1dea1dd1096017d8702d42e2b0431d7309cfbc2 SHA1 33c64e224815225eaaf704df83aeacde8dd6bab8 SHA256 6d173dce141009909c22d489c0ce15b261bd153ccca5d9d5d1ef9f77486cec6a
-MISC ChangeLog 25992 RMD160 aad9f09cb92245ea82f975e37141589cddcc03f6 SHA1 a554a0b7ae0f10d4d303dcda1d1622455f383d60 SHA256 88085aeaab7a648f8afc59db45e279f5d732add14dff2a605cc6225a83ae46ea
+EBUILD libxml2-2.6.31.ebuild 3565 RMD160 d72991e67f4b88bcbe5315328ae0b3c46fb3bffd SHA1 93d242b25171351728ef3254c51b66bca752bd97 SHA256 2e7e4e32144c6b33c7fb25f2588ea0b92c83058f98e1bc5f629338c0ed05226d
+MISC ChangeLog 26158 RMD160 2063b7b78d4dda6465deb7a99f97a7f58e1f3c14 SHA1 4a9024869beae8fcdb7441ae77ce6b9c740b0e51 SHA256 a27e084839975b3988699ec3dccee49bcc5abeeedd67aa1c675e38fab8d47fbe
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iEYEARECAAYFAkesrZAACgkQkT4lNIS36YERkwCgvClxMAtMvEWZkzvwK2q6GYjB
-j1IAoLB/zu35wI0jgg8r9AzYCIKBqGz5
-=qgG0
+iD8DBQFHxywJ1fmVwcYIWAYRAvBtAKDZkEip4JOOYgCiTySROTA+Hmc4mACfa4YL
+EYYZ5Ws5fzBYpzA38ynnOcg=
+=BJSf
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libxml2/libxml2-2.6.31.ebuild b/dev-libs/libxml2/libxml2-2.6.31.ebuild
new file mode 100644
index 000000000000..b74cac66f02f
--- /dev/null
+++ b/dev-libs/libxml2/libxml2-2.6.31.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.6.31.ebuild,v 1.1 2008/02/28 21:47:39 eva Exp $
+
+inherit libtool flag-o-matic eutils
+
+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 ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="bootstrap build 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="xmlschema2006-11-06"
+XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
+XSTS_TARBALL_2="xsts-2006-11-06.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() {
+	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
+
+	epunt_cxx
+}
+
+src_compile() {
+	# 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 \
+		$(use_with debug run-debug)  \
+		$(use_with python)           \
+		$(use_with readline)         \
+		$(use_with readline history) \
+		$(use_enable ipv6)"
+
+	# 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 || die "Configuration failed"
+
+	# Patching the Makefiles to respect get_libdir
+	# Fixes BUG #86766, please keep this.
+	# Danny van Dyk <kugelfang@gentoo.org> 2005/03/26
+	for x in $(find "${S}" -name "Makefile") ; do
+		sed \
+			-e "s|^\(PYTHON_SITE_PACKAGES\ =\ \/usr\/\).*\(\/python.*\)|\1$(get_libdir)\2|g" \
+			-i ${x} \
+			|| die "sed failed"
+	done
+
+	emake || die "Compilation failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Installation failed"
+
+	dodoc AUTHORS ChangeLog Copyright NEWS README* TODO*
+
+	if ! use doc; then
+		rm -rf "${D}"/usr/share/gtk-doc
+		rm -rf "${D}"/usr/share/doc/${P}/html
+	fi
+
+	if ! use examples; then
+		rm -rf "${D}/usr/share/doc/${P}/examples"
+		rm -rf "${D}/usr/share/doc/${PN}-python-${PV}/examples"
+	fi
+}
+
+pkg_postinst() {
+	# 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
+}