[patch] libxslt-1.1.28-r2.ebuild.diff

libxsl-1.1.28-r2.ebuild.diff (text/plain), 3.21 KB, created by David Heidelberg (okias) on 2014-01-04 01:29:07 UTC

--- /usr/portage/dev-libs/libxslt/libxslt-1.1.28-r1.ebuild	2013-09-05 20:31:09.000000000 +0200
+++ /var/lib/layman/ixit/dev-libs/libxslt/libxslt-1.1.28-r2.ebuild	2014-01-04 02:22:23.714167007 +0100
@@ -1,13 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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-r1.ebuild,v 1.16 2013/09/05 18:29:52 mgorny Exp $
+# $Header: $
 
 EAPI=5
 
 PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="xml"
 
-inherit autotools eutils python-r1 toolchain-funcs
+inherit autotools eutils python-r1 toolchain-funcs multilib-minimal
 
 DESCRIPTION="XSLT libraries and tools"
 HOMEPAGE="http://www.xmlsoft.org/"
@@ -15,18 +15,20 @@
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~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
-	crypt?  ( >=dev-libs/libgcrypt-1.1.42:= )
+RDEPEND=">=dev-libs/libxml2-2.8.0:2[${MULTILIB_USEDEP}]
+	crypt?  ( >=dev-libs/libgcrypt-1.1.42:=[${MULTILIB_USEDEP}] )
 	python? (
 		${PYTHON_DEPS}
 		dev-libs/libxml2:2[python,${PYTHON_USEDEP}] )"
 DEPEND="${RDEPEND}"
 
+DOCS=( FEATURES )
+
 src_prepare() {
 	# https://bugzilla.gnome.org/show_bug.cgi?id=684621
 	epatch "${FILESDIR}"/${PN}.m4-${PN}-1.1.26.patch
@@ -41,47 +43,56 @@
 	# and it is propably otherwise too if upstream generated with new
 	# autoconf
 #	epunt_cxx
+	multilib_copy_sources
 }
 
-src_configure() {
+multilib_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
 
+	if multilib_build_binaries; then
+		$myconf = "$(use_with python)"
+	else
+		$myconf = "--disable-python"
+		export LIBGCRYPT_CONFIG="${SYSROOT}/usr/bin/${ABI}-libgcrypt-config"
+	fi
+
 	econf \
 		$(use_enable static-libs static) \
 		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF} \
 		--with-html-subdir=html \
 		$(use_with crypt crypto) \
-		$(use_with python) \
 		$(use_with debug) \
-		$(use_with debug mem-debug)
+		$(use_with debug mem-debug) \
+		$myconf
 }
 
-src_compile() {
+multilib_src_compile() {
 	default
-	if use python; then
+	if use python && multilib_build_binaries; then
 		python_copy_sources
 		python_foreach_impl libxslt_py_emake
 	fi
 }
 
-src_test() {
+multilib_src_test() {
 	default
-	use python && python_foreach_impl libxslt_py_emake test
+	use python && multilib_build_binaries && python_foreach_impl libxslt_py_emake test
 }
 
-src_install() {
+multilib_src_install() {
 	default
-	dodoc FEATURES
 
-	if use python; then
+	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
+}
 
+multilib_src_install_all() {
 	prune_libtool_files --modules
 }