Add multilib support (bug #480402, thanks to David Heidelberger (okias) and Michał Górny). Punt old.

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

5 files changed, 148 insertions, 132 deletions

diff --git a/dev-libs/libxslt/ChangeLog b/dev-libs/libxslt/ChangeLog
index 005facdce46c..1aade5842522 100644
--- a/dev-libs/libxslt/ChangeLog
+++ b/dev-libs/libxslt/ChangeLog
@@ -1,6 +1,14 @@
 # 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.275 2014/03/01 22:09:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/ChangeLog,v 1.276 2014/03/04 05:50:55 tetromino Exp $
+
+*libxslt-1.1.28-r2 (04 Mar 2014)
+
+  04 Mar 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -libxslt-1.1.28.ebuild, +libxslt-1.1.28-r2.ebuild,
+  +files/libxslt-1.1.28-libgcrypt-config.patch:
+  Add multilib support (bug #480402, thanks to David Heidelberger (okias) and
+  Michał Górny). Punt old.
 
   01 Mar 2014; Michał Górny <mgorny@gentoo.org> libxslt-1.1.28-r1.ebuild,
   libxslt-1.1.28.ebuild:
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index a50f3ca0c8c6..25d1943571db 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -3,29 +3,22 @@ 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-libgcrypt-config.patch 811 SHA256 7630ad1245fb571f268783f316746c702d10ae88a8d4c79522dc60508ba41e2d SHA512 bc77c294b1e7be4c668c50d27ad11b2ae035999fb11ee89627f6aaa9a2071f510b29921cd3fb57fa3f383b38e984820f81bd3a9ca990a93290c78a6d512e50e5 WHIRLPOOL 25fdec8190023ada2f2b976e57efbadb2052efa1fc97a69dce994f41fec0582ee84bffc6684ba35ea023314015679ef11286a01f893197072367d15536711d0a
 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
 DIST libxslt-1.1.28.tar.gz 3435907 SHA256 5fc7151a57b89c03d7b825df5a0fae0a8d5f05674c0e7cf2937ecec4d54a028c SHA512 20b65bdaceaac5bd11d509bf683ce8e344030bc95164639266ae705d41659bcba47b5be1b059d0d67681e6428b0710db675d1749c06aa531bc2212ed3d0511b1 WHIRLPOOL 7f059d7d6b02fc5982c31d3239188ff0a6d211f722635ac3d3cd77bedf54ef9b1a9433ef1c55a9335f353ce618f3dd93a9e1e19c117988358ab31857edff1843
 EBUILD libxslt-1.1.28-r1.ebuild 2649 SHA256 3ab33a2fc7d78901630bdcd560bc87eb7519f7d5b6da2c8212062c9efeda4047 SHA512 3187a7df25b2dd7e987192646872ae45ab753df75aa93d5e81d966045327cb745c630e45112f0dfeae9233a94e462acf124a6f76f646a32d0c1c069853df5526 WHIRLPOOL 48a93091286db2bfc30af34317675a831086bbd4eab964fbcf90ed877519bb35889e4f841cfcc3fde3f782a713d677fdcf4ac3af2f81c27f27135dae4de1ec58
-EBUILD libxslt-1.1.28.ebuild 2656 SHA256 66dd91e1b6092dbb988368b41b809f4d76ddf9a2754f54b8369041d321d6dceb SHA512 089719991da161a7ecb7f5a168ef9edd0b95c5c4e194c7644b710010ec7447693a13bb243cafaabe5a59e6efd176960868cf976317f319ba2024b246a0b891f8 WHIRLPOOL b604eb0fab09ac181bccb7a97037f04d7dfab07a0f39f7a2dc392e7519bd930db25a8f4d8aec8919270dbe8050df3812359cb3a7f3de1e4864ac122c10b4346c
-MISC ChangeLog 34551 SHA256 bbb27329b3a44359437d52679ba3ab5b2938dee85a82fce05b02f3fb8f9730d6 SHA512 d435b45c0a6362775579a29c62eceed0495f2049e609675095e80cca842d65e7580012cec11fb0f1b50a08680ae6d407b98b7e9e6e4505198e1abfa33239d74a WHIRLPOOL 2d50e99cd89493894e9eb5c3637b29cf99f06fd0689ba88cb615aa3153bba0e855d5ba4180495ced3725827e35ba9c94e424a49621d6691f7e0aa245ed974cbd
+EBUILD libxslt-1.1.28-r2.ebuild 3195 SHA256 680055d549497b257270e64ed7b8dbbe89e818f6b280cdbb08dee728947410fd SHA512 43cd409ec55d1d492d82d387d84dfcd3f9fcdd9b75915ff0ed876ebb24446d99efd557e214a0931fea88aea879304007ed79ea53fd2e921fee8bb84f178d7eb2 WHIRLPOOL 5286dd41615a08051a424583e5c7085ff481a7e0b9f5f478cca899f1aaefce957e6e7c77a2dc780282cf44c766157100d046dd476c39ea9a7e0644c929ec1821
+MISC ChangeLog 34856 SHA256 b0f61e319b31b749bda20f4c9682c2fb8fafadcfc8bd82a524a3470c3c746568 SHA512 e93cb7c23519e75e96c6753699bb04bf028e4703d1f117c4e5250c17dacc6c7a767f68ea8332d2fef272ac02aca1649d0fe2a58e1d7a51a92f625ad47303746b WHIRLPOOL b296a4dd655124d56be8b3206837975275bb4354ab8376d607f81bc6ca1349a62bd151921978ea376b1d88105bc0b45c8ca1bce3078a8d41ee94e23d4508ed10
 MISC metadata.xml 160 SHA256 4d793ecb79b17794248102d8409d16bc27b1022c72038bd2d1241e129693d5f2 SHA512 677650c05f31fc27035e12f3f5e4b095715dfe12d2d3483f800bfbc6e986a98dbb1997cd52ad7a177b5c120c9b87fe5a2452a4f0f9852ac9a58262e0c5d576c9 WHIRLPOOL 070602fb27fee6a25035c9e93f5c2422270a5781fd11dac318d3f5c32cf9e49163abf7999729df230d3e181b6a1362982744e1f0ac016bf59a3458ae23abbb83
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTElq4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOQiUP/0hCjztpLnIuy/nFhB4hCoNI
-s5pkfaY9iTEaJn6ryKqsM4fomFEEXh/tjershwJadO2BkumxqNBX2I8rUb0KeXXg
-YfsPWqDILd9GwgRo2PzZ0SbWowHzLErW7w1iJxZluETnkfOns/m8Yr0V/+Ws6n+q
-wQ8+7l+zPJCVu7rSf+1C6/GlsNAdxEvgRXu2yIIcDIi1yKBHOMy4aC3BiYtG9ns1
-QLy0UHlL6Nz4tlxfbYG9O8vrqqPMr31F8gpEY6KWq4GgKR7Vh8yrx+eBATQWp/mE
-Uq/oLQ9xdFKNjJztlgCKYqJUO+B1V9hp/C3QeUzSOfUkbkdbQulcQtRB2e+qFovQ
-RGZjYwGsbK+tpSGVbgfKpmrqvurwEWsY7QaTtbIgh5I/9cJspaEbmEgwt/KI3RT9
-BRuXYYCJ3t95n71B8Kj0gUrORXbdazPXoNROl8fO0+bmU0bKUlSaWVd8agjwlnXN
-IR+eC+T5mzJ50JimMFuAMhwknMqVb0vx5nWcHMtFsRfoyQUXxGxgNzPIH4y5urPL
-cBGZkUOYkeBQ6NDiNa6NKXRnuxWVk4TUAQKlVPlFJIL/3HxgZW29sQ7PqLwKIi+b
-/vfvmF2vueU1imXwFk55ijjB53/Ks61SK1zFbcFhUckyzL4ICJnyHjlzEDUfvm0m
-6lbLe9EFRVVwxJVAGXZy
-=hRB5
+iQEcBAEBCAAGBQJTFWmHAAoJEJ0WA1zPCt1huVQH/jpnQNoi9P3ZN4bbmzUg0Tb+
+r8WNEs9k/kZqXqgf92he8W3V/Eu06IrvgKl3P0WsTuPjN+/EqFK/mK9zQfEf1xBE
+Bvo/X2jw+E47+Bl7q+1Y0hBLi/PpWfIf2GS7SR6+5NTQbXSloO+4U1VpUYXkQPoY
+GT/gHDoJ0HumEDi/XPjDJkRW62qyb81f+sA4+SBgSWFPD+HaTgCCUNPkUiEXJM5l
+lVkyUuX0QVIvjOQhfh1SFPrVmibsT76zQKFklP+4y/PlFmLW/lWcUcvKfWyKRmt5
+cU6pDegbs9GBlMFYiI+B89epdlPsICYI+LbH5onnNpqT/Co+Kk2UHPTEzIegUBg=
+=ZPG8
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libxslt/files/libxslt-1.1.28-libgcrypt-config.patch b/dev-libs/libxslt/files/libxslt-1.1.28-libgcrypt-config.patch
new file mode 100644
index 000000000000..2ed2b5548af1
--- /dev/null
+++ b/dev-libs/libxslt/files/libxslt-1.1.28-libgcrypt-config.patch
@@ -0,0 +1,25 @@
+From 02dcd7d89b231af6ebe7704690de6ae7f8b31a84 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Tue, 4 Mar 2014 00:10:37 -0500
+Subject: [PATCH] configure: use AC_PATH_TOOL to find libgcrypt-config
+
+---
+ configure.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index a861e90..8328625 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")
+-- 
+1.9.0
+
diff --git a/dev-libs/libxslt/libxslt-1.1.28-r2.ebuild b/dev-libs/libxslt/libxslt-1.1.28-r2.ebuild
new file mode 100644
index 000000000000..0b40164eff56
--- /dev/null
+++ b/dev-libs/libxslt/libxslt-1.1.28-r2.ebuild
@@ -0,0 +1,104 @@
+# 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-r2.ebuild,v 1.1 2014/03/04 05:50:55 tetromino 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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE="crypt debug python static-libs"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND=">=dev-libs/libxml2-2.8.0:2[${MULTILIB_USEDEP}]
+	crypt?  ( >=dev-libs/libgcrypt-1.1.42: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}"
+
+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
+	epatch "${FILESDIR}"/${PN}-1.1.28-libgcrypt-config.patch
+
+	# Python bindings are built/tested/installed manually.
+	epatch "${FILESDIR}"/${PN}-1.1.28-manual-python.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
+}
+
+multilib_src_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) \
+		$(multilib_build_binaries && use_with python || echo --without-python) \
+		$(use_with debug) \
+		$(use_with debug mem-debug)
+}
+
+multilib_src_compile() {
+	default
+	if use python && multilib_build_binaries; then
+		python_copy_sources
+		python_foreach_impl libxslt_py_emake
+	fi
+}
+
+multilib_src_test() {
+	default
+	use python && multilib_build_binaries && python_foreach_impl libxslt_py_emake test
+}
+
+multilib_src_install() {
+	# "default" does not work here - docs are installed by multilib_src_install_all
+	emake DESTDIR="${D}" install
+
+	if use python && multilib_build_binaries; then
+		python_foreach_impl libxslt_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_py_emake() {
+	pushd "${BUILD_DIR}/python" > /dev/null || die
+	emake \
+		PYTHON="${PYTHON}" \
+		PYTHON_INCLUDES="${EPREFIX}/usr/include/${EPYTHON}" \
+		PYTHON_LIBS="$(python-config --ldflags)" \
+		PYTHON_SITE_PACKAGES="${EPREFIX}$(python_get_sitedir)" \
+		pythondir="${EPREFIX}$(python_get_sitedir)" \
+		PYTHON_VERSION=${EPYTHON/python} "$@"
+	popd > /dev/null
+}
diff --git a/dev-libs/libxslt/libxslt-1.1.28.ebuild b/dev-libs/libxslt/libxslt-1.1.28.ebuild
deleted file mode 100644
index 710c0b86f2c5..000000000000
--- a/dev-libs/libxslt/libxslt-1.1.28.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# 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.ebuild,v 1.14 2014/03/01 22:09:55 mgorny Exp $
-
-EAPI=5
-
-PYTHON_DEPEND="python? 2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython *-pypy-*"
-
-inherit autotools eutils python toolchain-funcs
-
-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 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="crypt debug python static-libs"
-
-RDEPEND=">=dev-libs/libxml2-2.8.0
-	crypt?  ( >=dev-libs/libgcrypt-1.1.42:0= )"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS ChangeLog FEATURES NEWS README TODO"
-
-pkg_setup() {
-	use python && python_pkg_setup
-}
-
-src_prepare() {
-	# 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 python-config, not python2.7-config
-	epatch "${FILESDIR}"/${PN}-1.1.27-python-config.patch
-
-	# Python bindings are built/tested/installed manually.
-	sed -i -e 's/$(PYTHON_SUBDIR)//' Makefile.am || die
-
-	eautoreconf
-#	epunt_cxx
-}
-
-src_configure() {
-	# libgcrypt is missing pkg-config file, so fixing cross-compile
-	# here. see bug 267503.
-	tc-is-cross-compiler && \
-		export LIBGCRYPT_CONFIG="${SYSROOT}"/usr/bin/libgcrypt-config
-
-	econf \
-		$(use_enable static-libs static) \
-		--with-html-dir=/usr/share/doc/${PF} \
-		--with-html-subdir=html \
-		$(use_with crypt crypto) \
-		$(use_with python) \
-		$(use_with debug) \
-		$(use_with debug mem-debug)
-}
-
-src_compile() {
-	default
-
-	if use python; then
-		python_copy_sources python
-		building() {
-			emake PYTHON_INCLUDES="$(python_get_includedir)" \
-				PYTHON_SITE_PACKAGES="$(python_get_sitedir)" \
-				PYTHON_VERSION="$(python_get_version)"
-		}
-		python_execute_function -s --source-dir python building
-	fi
-}
-
-src_test() {
-	default
-
-	if use python; then
-		testing() {
-			emake test
-		}
-		python_execute_function -s --source-dir python testing
-	fi
-}
-
-src_install() {
-	default
-
-	if use python; then
-		installation() {
-			emake DESTDIR="${D}" \
-				PYTHON_SITE_PACKAGES="$(python_get_sitedir)" \
-				install
-		}
-		python_execute_function -s --source-dir python installation
-
-		python_clean_installation_image
-
-		mv "${ED}"/usr/share/doc/${PN}-python-${PV} "${ED}"/usr/share/doc/${PF}/python
-	fi
-
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	use python && python_mod_optimize ${PN}.py
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup ${PN}.py
-}