summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2014-09-03 09:51:28 +0000
committerMichał Górny <mgorny@gentoo.org>2014-09-03 09:51:28 +0000
commitad8225b3714cbd0b95f09aef380159d4ccc37546 (patch)
tree53bcf5064c72069b7f1358e2a7c55def6a816605 /dev-libs/libxml2
parentamd64 stable wrt bug #521952 (diff)
downloadhistorical-ad8225b3714cbd0b95f09aef380159d4ccc37546.tar.gz
historical-ad8225b3714cbd0b95f09aef380159d4ccc37546.tar.bz2
historical-ad8225b3714cbd0b95f09aef380159d4ccc37546.zip
CHOST-ize xml2-config, for bug #518728.
Package-Manager: portage-2.2.13_pre1/cvs/Linux x86_64 Manifest-Sign-Key: 0xEFB4464E!
Diffstat (limited to 'dev-libs/libxml2')
-rw-r--r--dev-libs/libxml2/ChangeLog7
-rw-r--r--dev-libs/libxml2/Manifest31
-rw-r--r--dev-libs/libxml2/libxml2-2.9.1-r5.ebuild217
3 files changed, 240 insertions, 15 deletions
diff --git a/dev-libs/libxml2/ChangeLog b/dev-libs/libxml2/ChangeLog
index f7fee4d3b81e..20215a18ce46 100644
--- a/dev-libs/libxml2/ChangeLog
+++ b/dev-libs/libxml2/ChangeLog
@@ -1,6 +1,11 @@
# 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.426 2014/06/24 19:59:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.427 2014/09/03 09:51:22 mgorny Exp $
+
+*libxml2-2.9.1-r5 (03 Sep 2014)
+
+ 03 Sep 2014; Michał Górny <mgorny@gentoo.org> +libxml2-2.9.1-r5.ebuild:
+ CHOST-ize xml2-config, for bug #518728.
24 Jun 2014; Mike Frysinger <vapier@gentoo.org> libxml2-2.9.1-r4.ebuild:
Mark arm64/m68k/s390/sh stable.
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 75a44d82306f..25184179a2d6 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -19,22 +19,25 @@ DIST xmlts20080827.tar.gz 638940 SHA256 96151685cec997e1f9f3387e3626d61e6284d4d6
DIST xsts-2002-01-16.tar.gz 6894439 SHA256 55e5c08db29946a91ea8e70e8f2418d3fd30d8b6777941dfba7f54726ffd9914 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288 WHIRLPOOL 84dd51959460a4f8aa582d57ad39229c546ca7fe155012c57c368b59f5d31400d8b940a343a7320058330ca611303139cacdffed514783f96406ac5366026b11
DIST xsts-2004-01-14.tar.gz 2761085 SHA256 09bdf9f81f381ebf9bc158a9472e498e896f7a02eb7461146e9abe1b9493ca17 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe WHIRLPOOL c46a3bf7d6dd771757f4304995cc177cf51c6cdd0e9778851fc13d3809c7b984690b4f273b3e075abe018110968eb7fc78f5b83170d3e18bacf00a4ed64b213d
EBUILD libxml2-2.9.1-r4.ebuild 6844 SHA256 0f70fc40ba1c7648be51cc7120468f8f3af6c8f3e07cc4b29beb1c95a5d5f518 SHA512 3d6e247c03d4a044fb0a5cefeefa1c36eb505301f04606eb38c8dc2cea5380ca28914f899bafef28993e5d60edf680fca7e5384e533be8d4c0ba558d63f9da85 WHIRLPOOL a662604a03c7d221049227f76865ec9a43eff52846c98a43d41d3ad167faed16cee387e121518505f3a6ca0dcf79d5b7bbdcb04a9383932c199961a81ee00391
-MISC ChangeLog 61111 SHA256 592157f0e181f063c47ea7fe34ba9a86d7d8c5fc6e5d54179ca51592155e86f7 SHA512 6c78f39f65461ac3c76951737865290209b2236a6ce8d7b154c420a66490aaa8568f6a35b2f8ebd19eb2d7c606e3ccd7badd2da5f006e01d2bb1cd8cf5389aa9 WHIRLPOOL e1aed3c24580dd9874d7c796232891e126eb6a4db11f3ea8e99f2a7eb492f42187f7e03b8f9bbb9c81b219aa5566327f18f5cc6abda6dc6fa770c068684473c2
+EBUILD libxml2-2.9.1-r5.ebuild 6904 SHA256 98548735420b4c438465d184301d1be6e54791b9b5e67ad676f76154f26ccc29 SHA512 f8b248e5dcf2e2ea5ef8589094946b6b36f9225e8226c373899165076957d9d1fbc9aea3adb9095159b2e5a3a460e3931c0873ccc958bc1966b524c1e9722ea8 WHIRLPOOL 44a5fe3bf62c731e316f54f976b75bf0082ac389cbade522788dbf195d5ae0772ae6724500af802f506d505c1880456b01d4c8522c7494ea0ed98b991ff946f8
+MISC ChangeLog 61263 SHA256 5115f2c5c4946a48ac8520d65458e4c565ddec113bd3f1fba3dd3cff33c0d2f1 SHA512 513530a1c8f230209d229283290b54465dd714843183ae8bd411c850df5b508a306a2fcd8c3d9fb5c02a05b6095bc7deeb606eeb71e4fa859d7be3f7ebd20b20 WHIRLPOOL 5470ba27c20583c55b8e329467401fe2ebb575dc2d9707a673f273753ac6816d785dc9c3d8819a7e5b5fa3b801bac737f219319685033602762065b53b8f999a
MISC metadata.xml 240 SHA256 5dcdc1a8fd86d82f00a60bb322fb4f8a579d75ec7be2398164435197ab3903df SHA512 d673fbe248c2fcdf401f91f8d0e15587fd9f94c604d62f7864931f379b35a3ffc20264ae9668661a0d09693cd42db30c7f74fcb606da812312e394272acfeec8 WHIRLPOOL 4d2cc2b44bc446377dc659162e9f638650e82564a3328b0b23c1e6f197e88b9ae545d8778c69829a6f268e8b5f7d0db1b0aee1e3d8aedd909d1d756dc4aa94c3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQIcBAEBCAAGBQJTqdi6AAoJEPGu1DbS6WIAyDkQAJaKp7ER32juZc8NIEv2SXLD
-kLvMSglSlql/D6DV3Pmj4Mu8i2nuyA2VTTEBM5rxtGqM7AV7QpEvHqQ796ecNNod
-MIHPjRNOqsOkYjpTVrgb8iLJ5vAWDWmQnhmi0VlEGsfCn01ZBZECieaogJAgtG9k
-mue8c+0ln3FGWAwNBXI+9IyliuS4/d8KpwOnPBXwdIjdvAfVz1Tm6GuH/CrT3Fcg
-VRgKTuA1i3oOCZlz9XUTdM3hBwY6O+92JfRSmtWLxblu0V5rQqrXBv67CnmDmI9O
-AL0aJ3TWkhJ/5K9LGjE+96RixwM5taG07Ib+kCMFESoIQRdKpmhQjN+DAvp/H6Lq
-0g6eNz6W+hQLMq6zOGNYZDB9yzOHKG/xj/OPkeSMv9MA1d4116Iw9rQHBF8zfJnt
-ZmnYgD7SyrCRoqzCPLV9RqlaEaqeqFg4BBCkL+7DWDJpKQ+inLASMBXS9YEE8Nfd
-JKP3aY6b3ObSYuKrns8Hq64l6qEubX2fQXKiRr6bwmgorc/kUDRzccgZzliV5nT/
-wb2XgLi9Wg3bsUKbIwptJQCPDXQYU8SXe1H5XgiOZ94uRaZ7WayXGV9JEyddThOk
-s9s1KHBbn6SuRbuzR6JLAlqXanXPS/LI1gWz4dhznGAnKKz0il66AxEhRQ1QCE56
-/A2qY6db/2m74WCnbQjl
-=4jOb
+iQJ8BAEBCABmBQJUBuSgXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOPYcQAMSQOxT/3wXcEMznQ5/fPVtl
+dkfHaInaymuzhfq1/0aw10HR62GrwJp/wL23CqA68gmg7UkKAAH5HJ/WOOlWF+nu
+kd+9BdvOGB1s/ll9Pg22p+9cgdASsQcq6L861jhZKxZr/qJ1FvjfSZP2Mwxw9OgY
+BoWEwQZsxys5elkSDyNDdPYjshF/uIGCDKYMqnQANGlgFklm/77rvTVQQelaO42T
+Ez1IIvsaeMjwoJY5M9lODEq5XV4KCOwleWcibkbYV1iNswXY3okhnQM7BNMEkicv
+kNBe91C3bW41dVbcoESim8HQMAQjnB+N4C5zJU1cSsAYPNcosfX4o/RE0fMPtH7N
+fy9G+1VomDoVB7rCW6jRj0WbVgQG8di1BjWCsfi3ekGKtBGzpqALFE+pZZABMrlJ
+w6GklemKtQbs8dc3/YSjG0gtdisCwwClk3ssAROYbzS7DX1oYiG+Tc8TpqqK3Qq/
+3DaOnVJsFq/pLP2qQ9//ZqeXJgrT6AQp0qy6mIKaRUJbyRjQCWXPeSDA52iN96N3
+A8h1Hm+ZodbgR/GL3J4gjZnYf8Jqp/5YHDxVpb8np7omf/GQE9gyqHe4JBcedym5
+ZfIrIXZB+iwA89rMK3VpAcSoqfKqL79PHOOWoOEiLakWOITVyROPX3i8wS+92lsT
+G0QK9AhGL0Osc9vXAJCh
+=OMLY
-----END PGP SIGNATURE-----
diff --git a/dev-libs/libxml2/libxml2-2.9.1-r5.ebuild b/dev-libs/libxml2/libxml2-2.9.1-r5.ebuild
new file mode 100644
index 000000000000..9a2f7e39f5c2
--- /dev/null
+++ b/dev-libs/libxml2/libxml2-2.9.1-r5.ebuild
@@ -0,0 +1,217 @@
+# 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-r5.ebuild,v 1.1 2014/09/03 09:51:22 mgorny 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-1.2.8-r1:=[${MULTILIB_USEDEP}]
+ icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+ lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${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*}"
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/xml2-config
+)
+
+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
+}