[patch] ebuild diff

xz-multilib.patch (text/plain), 1.17 KB, created by Alexis Ballier on 2013-07-31 20:33:14 UTC

Index: xz-utils-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-arch/xz-utils/xz-utils-9999.ebuild,v
retrieving revision 1.14
diff -u -B -r1.14 xz-utils-9999.ebuild
--- xz-utils-9999.ebuild	7 Dec 2012 22:15:01 -0000	1.14
+++ xz-utils-9999.ebuild	31 Jul 2013 20:31:57 -0000
@@ -7,7 +7,7 @@
 
 EAPI="4"
 
-inherit eutils multilib toolchain-funcs libtool
+inherit eutils multilib toolchain-funcs libtool multilib-minimal
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="http://git.tukaani.org/xz.git"
@@ -44,16 +44,20 @@
 	fi
 }
 
-src_configure() {
-	econf \
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
 		$(use_enable nls) \
 		$(use_enable threads) \
-		$(use_enable static-libs static)
+		$(use_enable static-libs static) \
+		$(multilib_is_native_abi || echo --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts})
 }
 
-src_install() {
+multilib_src_install() {
 	default
-	gen_usr_ldscript -a lzma
+	multilib_is_native_abi && gen_usr_ldscript -a lzma
+}
+
+multilib_src_install_all() {
 	prune_libtool_files --all
 	rm "${ED}"/usr/share/doc/xz/COPYING* || die
 	mv "${ED}"/usr/share/doc/{xz,${PF}} || die