Unbreak xmllint for docbook documents (bug #510508, thanks to Markos Chandras).

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

4 files changed, 263 insertions, 5 deletions

diff --git a/dev-libs/libxml2/ChangeLog b/dev-libs/libxml2/ChangeLog
index ace3956019dc..4b7b60c9e53d 100644
--- a/dev-libs/libxml2/ChangeLog
+++ b/dev-libs/libxml2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libxml2
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.413 2014/05/15 20:05:28 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.414 2014/05/17 02:55:28 tetromino Exp $
+
+*libxml2-2.9.1-r4 (17 May 2014)
+
+  17 May 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +libxml2-2.9.1-r4.ebuild, +files/libxml2-2.9.1-xmllint-postvalid.patch:
+  Unbreak xmllint for docbook documents (bug #510508, thanks to Markos
+  Chandras).
 
   15 May 2014; Markus Meier <maekke@gentoo.org> libxml2-2.9.1-r3.ebuild:
   arm stable, bug #509834
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 721df8c2bf5e..9f52176cd965 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -13,6 +13,7 @@ AUX libxml2-2.9.1-non-ascii-cr-lf.patch 5842 SHA256 1613e564814437ab1ddc28cb468c
 AUX libxml2-2.9.1-python-2.6.patch 912 SHA256 5a6e6def4dda78be1f44eb72c0e108f9c5deb4e74324d7845d024d643042c0b7 SHA512 9bf67f06301e1c59b232b00540305cf570b9dc32e8ac7b91d7bcfe188a668dfa6e5cfa13399267f9683ff484df317433536ad1a4d0c49a4ed068ea55d841cee2 WHIRLPOOL 99de5f267813e0f6ae13e408bc6e596bdd228cf7b72f3f38e2edeceff4ed6fc1ad1a2b1ee1e1d85bd4d3a7f9a27e215e8d1d7f264f3a2e25e3d8313dfd46d3d7
 AUX libxml2-2.9.1-python3.patch 1328 SHA256 3702b2aec5e40b906358d13c11864fa0933b83f908f634171310e912bd6c2cd9 SHA512 29bbc4c4e58d8a5f24b6c58f61b3adef916becd2ba0a4c098faf5e889d0537d7f696237045b47a239b323babf637aa220f964d18cc047b8fb1bd3bf3b829d85c WHIRLPOOL ace0531053dbf8b0d8bafeb8ea03e1ff972608cc44dee8b238163264d43e8e8ffff8550066b30946b8f9a185f05f58b3a7e0892939802a0fc54e0a2c6963d0f0
 AUX libxml2-2.9.1-python3a.patch 1745 SHA256 0df91eae57ccd8db35c80ae479ea155c1b1cb28d6793b0526792a0d02c835028 SHA512 0d5b253af29fa88c1d7011d9f977283fd37aa6899689fad00b4c05cb7aa412fbaffcdc514a03a3da69708e5b347aa7519a901ffa2ae3fa271e9bca53efd802af WHIRLPOOL 61e8a7cd40ddfa89e6997bd47a8d9491e3f6bd15208c6448f6c2d61c99de4c4da6da6257d95eefeed7399cc768de0fb3658f3a441e8c78983cf91ed77b107c85
+AUX libxml2-2.9.1-xmllint-postvalid.patch 1167 SHA256 68e8448e81f56a2ce5e6f87d6330197e1afc8fd95f65705cd90a97f4613e2b7c SHA512 90f1cf6bc58fde94538f3fcc0f9ab8de97443ebafaeb96a4420ac107d4d3ab6c795544db774b3ad58fabc96098dfca7e4f3c8a51384b35cd2ccd02e6310ef98e WHIRLPOOL 220a58c6dc64054d4b925fd59c8cb93950e04eae0d528ddd20950611e1807868f12a88cf2fc537aaaaaacf427429b74653598d20afd796fd01afcd1663ef56ff
 DIST libxml2-2.9.1.tar.gz 5172503 SHA256 fd3c64cb66f2c4ea27e934d275904d92cec494a8e8405613780cbc8a71680fdb SHA512 7b10de749485bc2eb2108063e97d89e70d6fbb78b1bf195ab5528c8c64e79483d55223a49d95934f4e00b00e906c18bdd34344703ffe158dcf08096905a44c1b WHIRLPOOL 5d2874527b637e666ca6afe710991aecb60c490de38edbe09a703c8e80c776d3f121544cc383146c336d46c573f3a3c9a2491c6c9cd5f22c5474d66dcb8ecf9b
 DIST xmlts20080827.tar.gz 638940 SHA256 96151685cec997e1f9f3387e3626d61e6284d4d6e66e0e440c209286c03e9cc7 SHA512 7325d0977c4427fc4944b291ccf896a665f654cc24399e5565c12a849c2bc3aef4fa3ee42a09ac115abcb6570c51a8fbd052c38d64d164279ecdecad5a4e884d WHIRLPOOL 50835380c3ea208df0bf9ce032ed2df69c4c6cb5a53ffdd39a08fb4f1d166f311b2ef2fe0d9911ae1ebff92aeb42f6ea55e727dfe0b7a3b95e6c7240315b3eda
 DIST xsts-2002-01-16.tar.gz 6894439 SHA256 55e5c08db29946a91ea8e70e8f2418d3fd30d8b6777941dfba7f54726ffd9914 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288 WHIRLPOOL 84dd51959460a4f8aa582d57ad39229c546ca7fe155012c57c368b59f5d31400d8b940a343a7320058330ca611303139cacdffed514783f96406ac5366026b11
@@ -20,12 +21,17 @@ DIST xsts-2004-01-14.tar.gz 2761085 SHA256 09bdf9f81f381ebf9bc158a9472e498e896f7
 EBUILD libxml2-2.9.1-r1.ebuild 6040 SHA256 9b36696b19c36c18dfb34407a7d32ff3c39ffbc39b2b06576d6297b44b5bb334 SHA512 3728dadc2f9e414a5bbddf05b5184dbcee7eace6c74ab371eeb9302a8d4e9393814de43e79e16e4f38edda19093fc15019946fa262b1245973a2b8d106fcb6bd WHIRLPOOL 7f8056d104f1fa63bb4b64292a1f08f2519b03a265e5c27069073f3db9ff2d205dcc3396adfe8f15537fd12e073418af85280c9ba7f4ca78230bac0bc32a9935
 EBUILD libxml2-2.9.1-r2.ebuild 6753 SHA256 33cb681c3da5f1a8da6a7be8e0f603bea336e5adf65a6a224646b722b7fdcb81 SHA512 c6a54baf99e412aea032fc89c30d6cc85e84190bd87098091646d75bc413cb8090e8aa1876f4415438e8735111141ffa84f4f5d92f052eb1df2d73f79a9965bb WHIRLPOOL e032b132dda65deede1ecf652fef5156163e16fdf56b003ce8fac43c55396bc366e3f466ddeadff084efea76be542863a4bc5de2501df279a685537e2da471ca
 EBUILD libxml2-2.9.1-r3.ebuild 6710 SHA256 31a3c263b4b0428fdb6296b8d23652a833529558223185ce8e8ce186aff60fdf SHA512 ca4b5afb4c19818b8426165bb8a010b7d729e286a8479ce32dd654ad7ed59a732a0904963f60a4c3d392534f6a9a1519ac9037a7a62692b1fddbeba8dd650610 WHIRLPOOL e3cfd9d5421b009c86edd4fe4f66545fbc40b5a1e18e1509c462221abb191c4b73ea865ed4bf6b495be022d9ab4cdc4f3eea25700207d39b05202cc83f10448f
-MISC ChangeLog 59433 SHA256 563ee9e7f9458598784cb29e1b402eed851218c4d33ffcd175494c435fd70bfe SHA512 61c1ba908c0a5ed92db6d17cd44024b9a09f3a9c75cf50197277d924992d34e7432f068b13b0a816cac8c1b1fdb41b1df60b1dc803e4ef6ed4898a2f413c9106 WHIRLPOOL c4dbef6f4cab25d281a9f8809206871415e8aa46eadfb047ef08b4845c446d9edff15e19b87a2903803b996fbcf3e560fc42847dc92d88401aebc270b2b34224
+EBUILD libxml2-2.9.1-r4.ebuild 6827 SHA256 92f36abaca1ca6c17ca2ca2be5073fcffdf23da6ed0875fa25f3986cb2516ce4 SHA512 9eb2cf5677e7b03a3c04b5abd90fc7ba6e0c4cc8f24055d2836713c68aefa8407aa5d28932b40e7f300594cf151bcbbcf3e7ece789fdbeaac006cc025caf083f WHIRLPOOL c4e2395c05759b6303c0e38b7fb4c9965456707a4587fd4c71db62b68fbaac90cf86f29af702338087b6560af6c6fbd99fb741ffb6a1673580facf99b4de3728
+MISC ChangeLog 59687 SHA256 7044a26521b202f93114a212364f72642d94d7cf8ecf58916a86c5202045ce59 SHA512 df83e4ee3378079ec757dec98a471e09d6b647fc83d2691d36c76c7640f6999cdb00750f388a40aa2cf0413a8c44618c829bfed32bfcfd996359ca04ae74dbd9 WHIRLPOOL 875474123625859ab14b0eaf2862de86a9e07a88ec5de1189997d2b9702035ccf3bb923f2d52146ca7e38410f86b7522e9cff31be65f4b8e76ee5d948b8ce36c
 MISC metadata.xml 240 SHA256 5dcdc1a8fd86d82f00a60bb322fb4f8a579d75ec7be2398164435197ab3903df SHA512 d673fbe248c2fcdf401f91f8d0e15587fd9f94c604d62f7864931f379b35a3ffc20264ae9668661a0d09693cd42db30c7f74fcb606da812312e394272acfeec8 WHIRLPOOL 4d2cc2b44bc446377dc659162e9f638650e82564a3328b0b23c1e6f197e88b9ae545d8778c69829a6f268e8b5f7d0db1b0aee1e3d8aedd909d1d756dc4aa94c3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlN1H/QACgkQkKaRLQcq0GLwXACggiiPFpKeRC/ZSIKb8RErlcLI
-TfQAmwSrS2NdKG5bSqTJqgo+z8uslzur
-=o6d1
+iQEcBAEBCAAGBQJTds9pAAoJEJ0WA1zPCt1hqf0IALnPKzP2Z8inpGxOtc0RRvYi
+J2rMuOR3S5gcYMG/9b84oi7yKnoTepCsxIcdzor8bHsnMpBwUj6T/QodkSrqdqU7
+hNh2Uxsls6qzbif+JFLRqyLmAPvBp25JIBLYSK0dw8l//8Iz1Mngip59w0/8OF03
+H3qoQfb+aXBFW7hEOkuhum5a+oBS17wPgR9vbsUQLIfLFNIzJmHmSypjnG6oAy5M
+PTnUDUgfWqwEJwcNRlcrOQEgJsVbuyYIAek3YMi/npS9uM1Uw5nonukgdBmYFf2w
+vM7CfTC/8ROK5FAf1O4jlETgwipaY29HFtM4eZF+ldrhzaH2TsdR0uOYSBJ5RDc=
+=kXhi
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libxml2/files/libxml2-2.9.1-xmllint-postvalid.patch b/dev-libs/libxml2/files/libxml2-2.9.1-xmllint-postvalid.patch
new file mode 100644
index 000000000000..7ce2f3b95f41
--- /dev/null
+++ b/dev-libs/libxml2/files/libxml2-2.9.1-xmllint-postvalid.patch
@@ -0,0 +1,32 @@
+From 7c3c663e4f844aaecbb0cfc29567fe2ee9506fc4 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Fri, 16 May 2014 22:46:00 -0400
+Subject: [PATCH] xmllint: a posteriori validation needs to load exernal
+ entities
+
+For https://bugzilla.gnome.org/show_bug.cgi?id=730290
+---
+ xmllint.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/xmllint.c b/xmllint.c
+index 9d46ac5..b142b3b 100644
+--- a/xmllint.c
++++ b/xmllint.c
+@@ -3530,7 +3530,12 @@ main(int argc, char **argv) {
+ 	xmlLoadExtDtdDefaultValue |= XML_COMPLETE_ATTRS;
+     if (noent != 0) xmlSubstituteEntitiesDefault(1);
+ #ifdef LIBXML_VALID_ENABLED
+-    if (valid != 0) xmlDoValidityCheckingDefaultValue = 1;
++    /* If we will validate only a posteriori, ensure that entities get loaded,
++     * but suppress validation messages during initial parsing */
++    if (postvalid != 0 && valid == 0)
++	options |= XML_PARSE_DTDVALID | XML_PARSE_NOERROR | XML_PARSE_NOWARNING;
++    else if (valid != 0)
++	xmlDoValidityCheckingDefaultValue = 1;
+ #endif /* LIBXML_VALID_ENABLED */
+     if ((htmlout) && (!nowrap)) {
+ 	xmlGenericError(xmlGenericErrorContext,
+-- 
+1.9.3
+
diff --git a/dev-libs/libxml2/libxml2-2.9.1-r4.ebuild b/dev-libs/libxml2/libxml2-2.9.1-r4.ebuild
new file mode 100644
index 000000000000..8526d62779b2
--- /dev/null
+++ b/dev-libs/libxml2/libxml2-2.9.1-r4.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.9.1-r4.ebuild,v 1.1 2014/05/17 02:55:28 tetromino Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
+PYTHON_REQ_USE="xml"
+
+inherit libtool flag-o-matic eutils python-r1 autotools prefix multilib-minimal
+
+DESCRIPTION="Version 2 of the library to manipulate XML files"
+HOMEPAGE="http://www.xmlsoft.org/"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="debug examples icu ipv6 lzma python readline static-libs 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"
+XMLCONF_TARBALL="xmlts20080827.tar.gz"
+
+SRC_URI="ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz
+	test? (
+		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
+		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
+		http://www.w3.org/XML/Test/${XMLCONF_TARBALL} )"
+
+COMMON_DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] )
+	lzma? ( app-arch/xz-utils:=[${MULTILIB_USEDEP}] )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r6
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+	hppa? ( >=sys-devel/binutils-2.15.92.0.2 )
+"
+
+S="${WORKDIR}/${PN}-${PV%_rc*}"
+
+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/_rc/-rc}.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"
+		unpack ${XMLCONF_TARBALL}
+	fi
+}
+
+src_prepare() {
+	DOCS=( AUTHORS ChangeLog NEWS README* TODO* )
+
+	# Patches needed for prefix support
+	epatch "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch
+	epatch "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch
+
+	eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c
+
+#	epunt_cxx # if we don't eautoreconf
+
+	# Important patches from 2.9.2
+	epatch "${FILESDIR}/${P}-missing-break.patch" \
+		"${FILESDIR}/${P}-python-2.6.patch" \
+		"${FILESDIR}/${P}-compression-detection.patch" \
+		"${FILESDIR}/${P}-non-ascii-cr-lf.patch" \
+		"${FILESDIR}/${PN}-2.9.1-python3.patch" \
+		"${FILESDIR}/${PN}-2.9.1-python3a.patch"
+
+	# Security fixes from 2.9.2
+	epatch "${FILESDIR}/${P}-external-param-entities.patch"
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=730290
+	epatch "${FILESDIR}/${PN}-2.9.1-xmllint-postvalid.patch"
+
+	# Please do not remove, as else we get references to PORTAGE_TMPDIR
+	# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
+	# We now need to run eautoreconf at the end to prevent maintainer mode.
+#	elibtoolize
+
+	# Use pkgconfig to find icu to properly support multilib
+	epatch "${FILESDIR}/${PN}-2.9.1-icu-pkgconfig.patch"
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# filter seemingly problematic CFLAGS (#26320)
+	filter-flags -fprefetch-loop-arrays -funroll-loops
+
+	# 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).
+
+	libxml2_configure() {
+		ECONF_SOURCE="${S}" econf \
+			--with-html-subdir=${PF}/html \
+			--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+			$(use_with debug run-debug) \
+			$(use_with icu) \
+			$(use_with lzma) \
+			$(use_enable ipv6) \
+			$(use_enable static-libs static) \
+			$(multilib_native_use_with readline) \
+			$(multilib_native_use_with readline history) \
+			"$@"
+	}
+
+	libxml2_py_configure() {
+		mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist
+		run_in_build_dir libxml2_configure "--with-python=${PYTHON}" # odd build system
+	}
+
+	libxml2_configure --without-python # build python bindings separately
+
+	if multilib_is_native_abi && use python; then
+		python_parallel_foreach_impl libxml2_py_configure
+	fi
+}
+
+multilib_src_compile() {
+	default
+	if multilib_is_native_abi && use python; then
+		local native_builddir=${BUILD_DIR}
+		python_foreach_impl libxml2_py_emake top_builddir="${native_builddir}" all
+	fi
+}
+
+multilib_src_test() {
+	default
+	multilib_is_native_abi && use python && python_foreach_impl libxml2_py_emake test
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" \
+		EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples install
+
+	if multilib_is_native_abi && use python; then
+		python_foreach_impl libxml2_py_emake DESTDIR="${D}" install
+		python_foreach_impl python_optimize
+	fi
+}
+
+multilib_src_install_all() {
+	# on windows, xmllint is installed by interix libxml2 in parent prefix.
+	# this is the version to use. the native winnt version does not support
+	# symlinks, which makes repoman fail if the portage tree is linked in
+	# from another location (which is my default). -- mduft
+	if [[ ${CHOST} == *-winnt* ]]; then
+		rm -rf "${ED}"/usr/bin/xmllint
+		rm -rf "${ED}"/usr/bin/xmlcatalog
+	fi
+
+	rm -rf "${ED}"/usr/share/doc/${P}
+	einstalldocs
+
+	if ! use python; then
+		rm -rf "${ED}"/usr/share/doc/${PF}/python
+		rm -rf "${ED}"/usr/share/doc/${PN}-python-${PV}
+	fi
+
+	if ! use examples; then
+		rm -rf "${ED}/usr/share/doc/${PF}/examples"
+		rm -rf "${ED}/usr/share/doc/${PF}/python/examples"
+	fi
+
+	prune_libtool_files --modules
+}
+
+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="${EROOT}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 "${EROOT}etc/xml" ]] || mkdir -p "${EROOT}etc/xml"
+			"${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
+			einfo "Created XML catalog in ${CATALOG}"
+		fi
+	fi
+}
+
+libxml2_py_emake() {
+	pushd "${BUILD_DIR}/python" > /dev/null || die
+	emake "$@"
+	popd > /dev/null
+}