Use wrapped xml2-config, bug #518728. And CHOST-ize xslt-config too while at it.

Package-Manager: portage-2.2.13_pre1/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

4 files changed, 189 insertions, 15 deletions

diff --git a/dev-libs/libxslt/ChangeLog b/dev-libs/libxslt/ChangeLog
index 96c3df78eaf7..92f00c015fbb 100644
--- a/dev-libs/libxslt/ChangeLog
+++ b/dev-libs/libxslt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libxslt
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/ChangeLog,v 1.288 2014/08/25 10:57:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/ChangeLog,v 1.289 2014/09/03 09:51:38 mgorny Exp $
+
+*libxslt-1.1.28-r4 (03 Sep 2014)
+
+  03 Sep 2014; Michał Górny <mgorny@gentoo.org>
+  +files/libxslt-1.1.28-AC_PATH_TOOL.patch, +libxslt-1.1.28-r4.ebuild:
+  Use wrapped xml2-config, bug #518728. And CHOST-ize xslt-config too while at
+  it.
 
   25 Aug 2014; Agostino Sarubbo <ago@gentoo.org> libxslt-1.1.28-r3.ebuild:
   Stable for alpha, wrt bug #512012
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index 1cc4f98f9101..155cbdb4112e 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 AUX libxslt-1.1.26-disable_static_modules.patch 318 SHA256 6c08da472bd1d48af1aab88619e460ad17f56c49bfaa00ccbfd8acf9212c5e80 SHA512 c54fa2b0edcdadde68f3d63bc8f39404eea7d5b866c1b2b0989c0cb343e25bd78da047434314447d3e5773b2c9e1455bcc82153c83541f12ecf4169919f3187a WHIRLPOOL 12984a243827e5bb25293d760f4d74f493254e5e90b48c6be20928aeae68cbfe71c345868165324af83c685781d0fd1b4e3594347e89964dfa3db5bf1ab58a55
 AUX libxslt-1.1.27-python-config.patch 756 SHA256 d8a457bb106b195dd20e738656aed10eb10f93bf5edd4162dcebefffcad4e477 SHA512 905e7db5e90b0c2a4d574ed800b4bdd355734332fb1e76ad19b6446884f9fef315a8d0d25737b5ba556972e2da28f8e0425c298911d360dff2b5e23bd4a204de WHIRLPOOL 89c5d38ab440419e145283f258e25e97350a3a988d7891f88a73607f8e7e886d27b9fc5219532ea5f295d29a87b9113f96fe99e2e76ed4187c22a2a14a2558f3
+AUX libxslt-1.1.28-AC_PATH_TOOL.patch 1698 SHA256 4b9cc20bdd25759b53a664ca46c12d274746525b1c94c79b22ff7084e4fac950 SHA512 629e9b8cc8f5b07cd45deb25ca6112dd38f637404ee951b5d58b314c12159d2ecbb27b9294be674af8ed6b0aeee4abab4e5267e6dcce9e76f89e2b4e8a68a4c6 WHIRLPOOL 8abcfc188295d2a2fade42b77fe152331ef1c8a48978f4740c7ebbbd2fd4d9b31090860bdbfc65a4637039d54b051177a37ca6245077b46d2caa474f3ba46b61
 AUX libxslt-1.1.28-libgcrypt-config.patch 1024 SHA256 8ee49178b88cb3a768e956c85c00774f27c7db27460eda1a632ef239c370756b SHA512 f5d3ac0d792a7800ea05b98035e18bea5c045f5c96a55bcc4c4c81b625d332ce8a0dd2dddd4522b48ad336c1604ccae5379db64462f528a01adb23c5209c6867 WHIRLPOOL 812929d3dcf8222ab0db42b1d57a9dcad3937212aa7c49ac5882f73e7ad8a79bd36eccc9b4eef4a6ad2087400371f1d8c99919b810e2d5322c720d2f3921b617
 AUX libxslt-1.1.28-manual-python.patch 1180 SHA256 905ac247a14998c0dcc44aacc926e7eb49758482769ae66e14194ae0f5aca354 SHA512 cd84143397223d2e1e70c796346dd8ed4359bc9bc6b1f808d6a47f75c54d0589456382dd13723f42983f41267861e742fde60e9e401ded53f0c3a3f4596dfb36 WHIRLPOOL 159e662add550048f7fee53ef98179afe5aa9858a10d517f2dad1dc3903cca2c34cec7d5f1e9cb370f9ca60104cbb528866294db7da0463b86d74b732342f6e6
 AUX libxslt.m4-libxslt-1.1.26.patch 1421 SHA256 c02cd8437064db0921c08e63245c403dad12410d2997715aa7aa36600bfaa895 SHA512 78cfb6bd823805f660c9d07c4f6f83a87cf2385c48fcb11bff82792101f06b36d08f851089497f0c019f5743f31248cbabe341f78f4ca7e7617c86c4e5a8404a WHIRLPOOL 0b4da6d1ce77e653a6c175fc203f5fecd0c831a018a5063e66e5ff0cc19d9a19d8938b06e4318938a35f665f91442290f267bb3fc86b9268c2455ac9616caeff
@@ -10,22 +11,25 @@ DIST libxslt-1.1.28.tar.gz 3435907 SHA256 5fc7151a57b89c03d7b825df5a0fae0a8d5f05
 EBUILD libxslt-1.1.28-r1.ebuild 2649 SHA256 3ab33a2fc7d78901630bdcd560bc87eb7519f7d5b6da2c8212062c9efeda4047 SHA512 3187a7df25b2dd7e987192646872ae45ab753df75aa93d5e81d966045327cb745c630e45112f0dfeae9233a94e462acf124a6f76f646a32d0c1c069853df5526 WHIRLPOOL 48a93091286db2bfc30af34317675a831086bbd4eab964fbcf90ed877519bb35889e4f841cfcc3fde3f782a713d677fdcf4ac3af2f81c27f27135dae4de1ec58
 EBUILD libxslt-1.1.28-r2.ebuild 3190 SHA256 d55a79d6af77e599891191ef4a7d9c8d6674c78f147cd8b4b25da288228c69e3 SHA512 02a5d22618c85aaedfeced3914d968e5e99e48dfd416705f6fb68cd2016b021f1d93ebbc822d69a8b816546cdbcd0b1641faa3e3e6a021fdeddae632939a18b9 WHIRLPOOL 4d24b55c0a2c2e55f33273585933888fb2567f597e2b4be41ab1995b9bd0f1170cd1f475c2aca46ed0ca5faddf26b5e91ffb6249024f88c85cb3a8fabe9a7006
 EBUILD libxslt-1.1.28-r3.ebuild 3455 SHA256 3f7344b8937ee73a56c836bc814202f9733b1f160e675ea63e94b46aa6e5e403 SHA512 6ea117bd524f84fe95d44215ed324871a776103f66010084681a052f8bc48c3cd8a588455f8037132c931a9de5b0c2fdc51c13badfb06dc98013cee71dea71a4 WHIRLPOOL 4ce01b9b766f79876d55bffa97ebdf6fe3753cd3c811c207c6992df770c46a0f04c2b45a9d176b291b9f93a20363e9d611b64bce335cdf3aaa2807861d9bb3a7
-MISC ChangeLog 36499 SHA256 1b9b5752269b2942263c5aadd60069cd760bc566e8f2d654a593d6a1b8485627 SHA512 d7ad56f7811c5305a83734183e83159f5cf2686e4146dfbde4903b7cf865f7e638de6bf0970d0f73f9f96cf2b9e6bb0740c311ab5ad830941baefe740b8cf71e WHIRLPOOL 3ec39530deaf6fba3c70f6a738583fab0870dfa2f555e5ac7861df57ebab0ad8bb7a4463ca253b08fad07dbb80a3d467f02f41678fb291f96556f7852aef4359
+EBUILD libxslt-1.1.28-r4.ebuild 3583 SHA256 a8f97ca05b78225409b3b7a175080cb1a1bf09a03bcbc6d0aaf01c40a8e154ca SHA512 a6427fe0d9bb876898089d135f649d64371d890f8f76e9fcc4a3466340cc6a128d3257b3dfddf9c6f4f97321dd10bd3add73736d7883930b4b56ca33210f4f2b WHIRLPOOL 59dfcdb5614a07b3b9ca44ff203938c529a729edcb1f8c472ddf5d09598134e913c82afe392b8574a38385b89e5f4ecda4f7bd833d27c18bcdf2a1eda6eb3c3c
+MISC ChangeLog 36743 SHA256 90afa9924c264cfb367662c03493bbb4a384d3929d316622e6013d0e4edc01e2 SHA512 feaaa83304ce583291e42bba62492263af98afb27c9f343c643b41670186aeb2b8b1d56bc32c9f82af9c5d24023acd6d6cea29f8761da56394fab622b6b144d3 WHIRLPOOL 0919efe6221a80f11e4a8ef51552738495e7a0a5b6f9399c09599f4cf258010d268bd2662db135364d9955b3fc49c8f115e963a22424d8e67f6d38185d80043c
 MISC metadata.xml 160 SHA256 4d793ecb79b17794248102d8409d16bc27b1022c72038bd2d1241e129693d5f2 SHA512 677650c05f31fc27035e12f3f5e4b095715dfe12d2d3483f800bfbc6e986a98dbb1997cd52ad7a177b5c120c9b87fe5a2452a4f0f9852ac9a58262e0c5d576c9 WHIRLPOOL 070602fb27fee6a25035c9e93f5c2422270a5781fd11dac318d3f5c32cf9e49163abf7999729df230d3e181b6a1362982744e1f0ac016bf59a3458ae23abbb83
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT+xaPAAoJELp701BxlEWfoGgP/3qwHYe59UrYQ9zkHTzjdHpv
-vmWWpcprFgN5yvjHU4/6ZauRXWkD1trjG94JjCtVghAkQPv+aa7G33s8LeNIwVRN
-gxDqOoRZ6HXleVfi4wx5nz4yqcI8qmFk/+hBy17HgkYamoZGZEt4ke/IwT/hYAfd
-79lHd3OQGPNNh+Ue6zepCTjnc5onjNRXWQIkGhLVbt9UXSAe+OCCd9qD0l3eOgFg
-BP3frJG0MQSBVdxtO35FmdccKu2v5BrZ6Xm4fIgXbLTi6RagyKp/x4puPUvYoT+s
-zWRD0Y/6wyjiZjbuAoY46V1WxfIATghvdDUGPmL2I7E28ucVDPzqwylrFkTgSS1g
-93MMi/o3N3Ol6IHxQS7d5/dMSSmRdsUDYMPe6hEOE8/gF8RsS6ITl6tvSNDF3d4v
-hrdUkPnbDeHQBMBunaxt0MDX0J6GWgCcK5gwanwSrjFwQabievggX5rHFkAIysTF
-Tm8tmytzphJflgKjWGQqfxGYy7Df52CGUZRizYFAzCa4rhIHG7Wdf3TaznJXNqup
-av4MxTtoYBn9OTvrL9kBNsgTLZF9n5VhDWFeV/kuIH1lsBWt2ydOpkjY1hETo99l
-n6ce42rylkU6IkW9lmBQ8L1/N0JdpBLuQ4ZKasiQO3fl3rsNOJLRm0ryinT7RaSC
-TMM54s4lDTX5Kpmy21n0
-=0c05
+iQJ8BAEBCABmBQJUBuSrXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO4E8P/R2a75Acz5fUGzlyfydZNevw
+wTrU+uL+I8L12PPP/ghCFOaHCfwxjjKhTlcp6cGfvvJe+Bf3sXBBgkwa3Woyt4P6
+/kOURbZR+Zt7MlCDGwYdN2QZuToYoKvXYXFaEE4CIN0tCAYROAaH2IennG+e4oD2
+ZXI7hvWZTpjLSsa3KyPqcgPNuFBnu2ciXgBfV94BgGrrxbKCK6iJWUwuoW2DDIn6
++yKKLdse56I/M6rjAU/0XDSxX0jYGAwWH0/sK5C3cO0YxB2yjU1rovd07JP1umSI
+2lZgZmDwStZRQncNChnkLBeJ03RQZjNeI+nQ3/+2WQZVsPjCgHLCwUho+r+lg3IK
+JWCXBNEHmBUBGu3QgqlO4u+vnb0XKW9PlB9XuKigM6pOFFAAxSGt02B2wKHrZ5vk
+ZMAeZ+6kL2ad9ib7p0vdkP9Fvus5oIcKpl8njHZI1aLg92BT7XZWyGLUjovBvzAi
+Gt3OcxjnxYg+dVVDMXPty4t3ImAF+q5BWkkF8EQJas4JKP1aZQy7V/2miCBDhti8
+KeToPV0m2uxoY36DG91M5y4o6tWV+P3BazagaGR16k0BPDdeIL3fBk726OQZ043g
+ExpeoBFlFzMH2ovdpI3/QJRfR2EszMGiPQQY4zD0Rz1B3n0PPxfSgNbN9Dgi8ZTT
+519O9dnMYR+UYrOO+Q74
+=NJdV
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libxslt/files/libxslt-1.1.28-AC_PATH_TOOL.patch b/dev-libs/libxslt/files/libxslt-1.1.28-AC_PATH_TOOL.patch
new file mode 100644
index 000000000000..bc9ff7fe3594
--- /dev/null
+++ b/dev-libs/libxslt/files/libxslt-1.1.28-AC_PATH_TOOL.patch
@@ -0,0 +1,46 @@
+From 1fc82ea63f16efc0d607b39a162e3032d7c2d602 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 3 Sep 2014 11:21:01 +0200
+Subject: [PATCH] Use AC_PATH_TOOL to find libgcrypt-config and xml2-config
+
+Using AC_PATH_TOOL prefers ${CHOST}-prefixed tools over 'bare' ones,
+therefore improving support for cross-compilation and multilib. This
+is useful for environment where libgcrypt-config and xml2-config
+correspond to the build host environment, while
+${CHOST}-libgcrypt-config and ${CHOST}-xml2-config are installed for
+each supported build targets.
+
+Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=725635
+Fixes: https://bugs.gentoo.org/show_bug.cgi?id=518728
+---
+ configure.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index a861e90..f1639a8 100644
+--- a/configure.in
++++ b/configure.in
+@@ -393,7 +393,7 @@ case $host in
+     CRYPTO_TESTDIR=crypto
+     ;;
+   *)
+-    AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no)
++    AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, no)
+     if test "$LIBGCRYPT_CONFIG" != "no" ; then
+       LIBGCRYPT_VERSION=`$LIBGCRYPT_CONFIG --version`
+       if test VERSION_TO_NUMBER(echo $LIBGCRYPT_VERSION) -lt VERSION_TO_NUMBER(echo "1.1.42")
+@@ -507,9 +507,9 @@ AC_SUBST(LIBXML_REQUIRED_VERSION)
+ AC_MSG_CHECKING(for libxml libraries >= $LIBXML_REQUIRED_VERSION) 
+ if test "x$LIBXML_CONFIG_PREFIX" != "x"
+ then
+-	XML_CONFIG=${LIBXML_CONFIG_PREFIX}/bin/xml2-config
++	AC_PATH_TOOL([XML_CONFIG], [xml2-config], [false], [${LIBXML_CONFIG_PREFIX}/bin])
+ else
+-	XML_CONFIG=xml2-config
++	AC_PATH_TOOL([XML_CONFIG], [xml2-config], [false])
+ fi
+ 
+ dnl
+-- 
+2.1.0
+
diff --git a/dev-libs/libxslt/libxslt-1.1.28-r4.ebuild b/dev-libs/libxslt/libxslt-1.1.28-r4.ebuild
new file mode 100644
index 000000000000..cc9bc835995f
--- /dev/null
+++ b/dev-libs/libxslt/libxslt-1.1.28-r4.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/libxslt-1.1.28-r4.ebuild,v 1.1 2014/09/03 09:51:38 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="xml"
+
+inherit autotools eutils python-r1 toolchain-funcs multilib-minimal
+
+DESCRIPTION="XSLT libraries and tools"
+HOMEPAGE="http://www.xmlsoft.org/"
+SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+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 ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="crypt debug python static-libs"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND=">=dev-libs/libxml2-2.9.1-r5:2[${MULTILIB_USEDEP}]
+	crypt?  ( >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] )
+	python? (
+		${PYTHON_DEPS}
+		dev-libs/libxml2:2[python,${PYTHON_USEDEP}] )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20131008-r20
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)
+"
+DEPEND="${RDEPEND}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/xslt-config
+)
+
+src_prepare() {
+	DOCS=( AUTHORS ChangeLog FEATURES NEWS README TODO )
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=684621
+	epatch "${FILESDIR}"/${PN}.m4-${PN}-1.1.26.patch
+
+	epatch "${FILESDIR}"/${PN}-1.1.26-disable_static_modules.patch
+
+	# use AC_PATH_TOOL for libgcrypt-config for sane cross-compile and multilib support
+	# https://bugzilla.gnome.org/show_bug.cgi?id=725635
+	# same for xml2-config
+	# https://bugs.gentoo.org/show_bug.cgi?id=518728
+	epatch "${FILESDIR}"/${PN}-1.1.28-AC_PATH_TOOL.patch
+
+	eautoreconf
+	# If eautoreconf'd with new autoconf, then epunt_cxx is not necessary
+	# and it is propably otherwise too if upstream generated with new
+	# autoconf
+#	epunt_cxx
+	# But Prefix always needs elibtoolize if not eautoreconf'd.
+#	elibtoolize
+}
+
+multilib_src_configure() {
+	libxslt_configure() {
+		ECONF_SOURCE=${S} econf \
+			$(use_enable static-libs static) \
+			--with-html-dir="${EPREFIX}"/usr/share/doc/${PF} \
+			--with-html-subdir=html \
+			$(use_with crypt crypto) \
+			$(use_with debug) \
+			$(use_with debug mem-debug) \
+			"$@"
+	}
+
+	libxslt_py_configure() {
+		mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist
+		run_in_build_dir libxslt_configure "--with-python=${PYTHON}" # odd build system
+	}
+
+	libxslt_configure --without-python # build python bindings separately
+
+	if multilib_is_native_abi && use python; then
+		python_parallel_foreach_impl libxslt_py_configure
+	fi
+}
+
+multilib_src_compile() {
+	default
+	multilib_is_native_abi && use python && libxslt_foreach_py_emake all
+}
+
+multilib_src_test() {
+	default
+	multilib_is_native_abi && use python && libxslt_foreach_py_emake test
+}
+
+multilib_src_install() {
+	# "default" does not work here - docs are installed by multilib_src_install_all
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi && use python; then
+		libxslt_foreach_py_emake DESTDIR="${D}" install
+		python_foreach_impl python_optimize
+		mv "${ED}"/usr/share/doc/${PN}-python-${PV} "${ED}"/usr/share/doc/${PF}/python
+	fi
+
+	prune_libtool_files --modules
+}
+
+libxslt_foreach_py_emake() {
+	libxslt_py_emake() {
+		pushd "${BUILD_DIR}/python" > /dev/null || die
+		emake "$@"
+		popd > /dev/null
+	}
+	local native_builddir=${BUILD_DIR}
+	python_foreach_impl libxslt_py_emake top_builddir="${native_builddir}" "$@"
+}