Support multilib. Bug #474940, patch by Alexis Ballier.

Package-Manager: portage-2.2.0_alpha194/cvs/Linux x86_64
Manifest-Sign-Key: 0x9627F456F9DA7643!

4 files changed, 115 insertions, 26 deletions

diff --git a/app-arch/xz-utils/ChangeLog b/app-arch/xz-utils/ChangeLog
index 9f65cb3d2318..845346674d91 100644
--- a/app-arch/xz-utils/ChangeLog
+++ b/app-arch/xz-utils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/xz-utils
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/ChangeLog,v 1.62 2013/06/30 19:26:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/ChangeLog,v 1.63 2013/08/07 22:39:51 mgorny Exp $
+
+*xz-utils-5.0.5-r1 (07 Aug 2013)
+
+  07 Aug 2013; Michał Górny <mgorny@gentoo.org> +xz-utils-5.0.5-r1.ebuild,
+  xz-utils-9999.ebuild:
+  Support multilib. Bug #474940, patch by Alexis Ballier.
 
 *xz-utils-5.0.5 (30 Jun 2013)
 
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 95e9292e3478..de83da302a43 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -15,24 +15,27 @@ EBUILD xz-utils-5.0.2.ebuild 1685 SHA256 aedca58672d5f10d617cad24ccb2afbdc32f325
 EBUILD xz-utils-5.0.3.ebuild 1678 SHA256 9f08362e86257864070388a2d3f40b3ec52cb5b62492c4f59a313d61fbd7f346 SHA512 5731bfa63e70dee4b12b8caf166ac4bd5ed6446888cecf9a92322b50bfed3d36f972a8a6f79159787517245c56f168e1c524b8ffb1c9e251f1c47cdb43e59364 WHIRLPOOL bc8d1e5221fdc0feee598843e2ce38131407831300b6ef62a8f7963faabceff873df3934ae8e083d5d4031b58706436da1233dfd53ce6961d902ceb9c6b7050b
 EBUILD xz-utils-5.0.4-r1.ebuild 1906 SHA256 284ac5f7f7ab037eb535121e1910a077263e943c8622a2bdb44c41cc9ecbe8e4 SHA512 7fe7cdbc52ff1abe60a9f5715ddda6ab87ba5ffd6d19b9949247453c1ddfb60e2af212bc50d23d54d6c56b516d5f5b29b862bec8a9fef3c8ee00531359ca1a39 WHIRLPOOL aaa9f5a90888c578751f5511fa48e6fef8916f24ad1e9d9dd47ca52294214d2cd6321310b1ee3ee1cb75c269832caa1e14f312d7b88303504a8679a125cff7c1
 EBUILD xz-utils-5.0.4.ebuild 1916 SHA256 2441fbe41aa27861136717702b49b419560e6f2290d326c51827dc1c75fbecb8 SHA512 d91c9930d2190d631de6ff3ccf8d177d9432bfce40ac6e09498070e50f48c026630ed0909646dd2c38e3a8be18f67e7b3f354b4f6f66f2e1dea85de16d739fc9 WHIRLPOOL 526580bc196c132b24585b18aeac5630099bcaa6857495a6eeba5247cd080ef6d0c190d9ed4608c76ca939aedc24938e57f5020928bfe25430c1dc8b83be5b96
+EBUILD xz-utils-5.0.5-r1.ebuild 2262 SHA256 aa4a85bfbd03c4163ac3d40a5b07c7b40a7876b4b4403ac899ba1959e8e8d850 SHA512 35a0b05362802b87073a458f2c26eb6e13c798c58c88f0d4223b0ff29bff02c072eeb986924edb4437dfaf614ddc43c2d7e2047106d3d676838a8f98f8433165 WHIRLPOOL 27a283f3157596540864859f1e85e64ef2201deeb42d9feafb6e4334592d7df2ffd98c47a2f2ad9b500f2fe86c6dbee8a40ee7767b0dbbf9391e7859bd092df9
 EBUILD xz-utils-5.0.5.ebuild 1914 SHA256 3bc11fcc7a87e58a67b92c42fad6c6baa5fc5a334ff84a8f64c0bb0334e56623 SHA512 f4dd0121777dd50862884c0d0ed10cb7b63952c7bcf57d9a5786b2bf07026b1722e0832ed3403b5ff16d2b70eebabd3ce19ddeb56be538ecdc2f754240744d65 WHIRLPOOL dc8dabcde50b51c0e6a359b530d7be2cd1c70fc24a463fb598712f8d0c05ede86b0f89ad508cd5f70c75d7e7fa6974fdf24b074a267492d785efe765b35676ef
-EBUILD xz-utils-9999.ebuild 1903 SHA256 a6b8074940ca1ee6156f9b3667b7cb708c3858ace9d6627825443cf00e7367da SHA512 1d14ba5c7f268d2cea139a2ea4dcdf4d29dd20b282f526e1891f62e0da5b0bc8e08910fb92a5c30b37e4fbcdfcf8617ec806abc1eece32da579b834a591b6232 WHIRLPOOL 6d388422e4df55441939f950c153bd96fd2df46b22e9e05dc22d757c88fcf62daf349c5651c7098a779791da7477779032ce18ad63661c25c955bedc7115b43e
-MISC ChangeLog 8066 SHA256 899a467d452138885d7eaf9b6e0e12bef9a22887d038dc2db615ab3b27a13c87 SHA512 63cc0d24e8cfde615a14f80e7404262fa41c7218b665c56143b5e684c4963968181ebc86949049e67e2ae269eb1fc2076f50cbaf86a1de98560a65398abe5b8a WHIRLPOOL cd078b9309d16881ba550571b34a8f18f4df9d38a53b146ceb1d302c0adfa4e334eb54827003f8b2fae3fc0be0d5787f51f529ef5dcef20cdb54384f3b10f399
+EBUILD xz-utils-9999.ebuild 2248 SHA256 074534a3c11c4d4a7ecc04b048a6f05d5013343463fd5da48af6fb6dd065c928 SHA512 7fc0bb7e637d5271dc8a2e0c788333ba7a0c9f40534c66349077d67a65d5e32730f10c14c656da120e973785bf54e7bf35198569be4741ac0e970c4e19804c9d WHIRLPOOL 5867e29dd8ccfcba89e971543869b2e19ba0d9f06be7bda5a0a7700c96758729df66c1a15bd48be3844437949294a9a91c576cc9745360e4aafa0188dff5aad4
+MISC ChangeLog 8260 SHA256 daceaa8b42be4fdddc154236cd497fa16372e2f03f3e45452bc8267d094308f9 SHA512 12c2a7f6c12afc916bdcfb8dc80b3a17977eefb6034a5aaed8713211c105258d698de0bbb08efe0029e4788bd800a01a9bc9a3f414623192282b73210cbe8ca0 WHIRLPOOL 36bd1021a9b0a019997646a1027b5f6e9e6d1973a3e0c38fbfdcc3f8359b55369ff80470b7fe2ed03b2ad34b24a9431b6c54cf5558c9e37fc2f1c3cc7de306de
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJR0IZpAAoJELEHsLL7fEFWP+QP/jHfF50JKLj4nOpKzC7PSQ/t
-ANNor6wHSLx/3vkXWn9cTOUf/lc0iJDew+2P5DiJ18PizG7APW8Yt2+Na2tAsuPF
-IVw3LhBnxWQuycIuSl/VHZsqCBYkR4gt09VYGXVXdxIE1OSTg6qmpe0/zG88dipd
-0SzCB65Pk0pJxAX6DrcASI3uUYlD4TkOEd34Ag94FqqPROrz0lIuRQ+7JRVPMx2q
-ejl48NW4PG2Ty9PRJyt5WrX7li8fd6snV7wz8Dgee7oy5HYSnvXW2Nz49e4v0vCl
-wc3hWdSyEHMitjYQ8XWos3gw9jsBb6YhusvDRDciHWHX3oRaZib83LI4EO0WLH58
-gXIlS2PdqwRh8EiEim0Ue3Q3yOcoLnc/9uojhpXzH6bIvSzrobeK8v34v7drbfho
-HT1t6oGE05YV5IZeYkwi+jqt1fCyjIoHhZtx/Mei6H8xYz6vWpojZX6KbNCH3IdT
-k/ZXnz378TINXhbUbxyfcE3ON5dLT9bjnkFYBcUwmnPQ+3l7dvnzvG0JTQnao0GF
-vZ/jGkl+NMFo7/aaHIGzTOa/ZIq27B85KOAUh3LQoEvYBH8oGc7BOa4tMnEyARk2
-aXMuhpeokkpJENeVL1bcmRSEUnXV97Txt4n6q/MaMremNeYteZZgXnRAVBVNvSaZ
-6KXAnONoyPsWaLF6D4j1
-=Ah9w
+iQJ8BAEBCABmBQJSAszZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
+NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDbnAQAKc7PY+4QTRmKeg+MTSpPAkx
+LsG7Qw9O8HIRGfoQtia+l0EYoitu1CMdClyFrvgHP6goHXxfkZDOWOUKGHrhO+wd
+2ZW+mRmRrYBumaWKP19ZJVfKwpJ9yjrnU8Fgttaypzkh4K1XBYicO25Nrq4WvbmE
+H0AAq/TTCty6V91MLR43G8aUTTDxEDCvMJiJymSDmub2E9ss/HkaNz75qkKnn8FJ
+Jxa+noUdN7bIcdfvmVExekOnRPao1vaMkeAYc2ueyvU43vIz88V3IbWKmVWlmAZJ
+aWbSM17nmFZ3K8i/45cACAhDKwCR3Jz+dc9a+me7ugMnnfAQ5vo/Kn3kndahM018
+0UL+PkOm46M2Vh7rnSlMNrOZhuMS0t6O0R6m7lm4h0L8QCgTzCY3nB7vb0oPFp1i
++4CzlKFY7r22j13bsqZ+sVZXWcbjV7tXHHQK2d1FP8TXSkOfgcaFgeqYzQnDfT3d
+tY7r7D6xgpp9WhdhGIyYMKKld41dCI7lm/hD86MCyRvNS0QlQfHJhuCuYb1/KGjQ
+SDx+VLwWPkZ755H+DeQDBqhq3lCql6zXO0fwgvRJ9QzvCsxlt4RbuN6wT3t6rxkl
+svTXXKhPJc+t8KeagVIpT3g/6t2CIgs1d8rxO/sx5zIFAim37P5QI3bpsE0kGnk0
+jcwbEmE6QG84HGveNabT
+=x9j8
 -----END PGP SIGNATURE-----
diff --git a/app-arch/xz-utils/xz-utils-5.0.5-r1.ebuild b/app-arch/xz-utils/xz-utils-5.0.5-r1.ebuild
new file mode 100644
index 000000000000..233f0af03228
--- /dev/null
+++ b/app-arch/xz-utils/xz-utils-5.0.5-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/xz-utils-5.0.5-r1.ebuild,v 1.1 2013/08/07 22:39:51 mgorny Exp $
+
+# Remember: we cannot leverage autotools in this ebuild in order
+#           to avoid circular deps with autotools
+
+EAPI="4"
+
+inherit eutils multilib toolchain-funcs libtool multilib-minimal
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="http://git.tukaani.org/xz.git"
+	inherit git-2 autotools
+	SRC_URI=""
+	EXTRA_DEPEND="sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2" #272880 286068
+else
+	MY_P="${PN/-utils}-${PV/_}"
+	SRC_URI="http://tukaani.org/xz/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~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 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	S=${WORKDIR}/${MY_P}
+	EXTRA_DEPEND=
+fi
+
+DESCRIPTION="utils for managing LZMA compressed files"
+HOMEPAGE="http://tukaani.org/xz/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="nls static-libs +threads"
+
+RDEPEND="!<app-arch/lzma-4.63
+	!app-arch/lzma-utils
+	!<app-arch/p7zip-4.57
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r6
+		!>app-emulation/emul-linux-x86-baselibs-20130224-r6[-abi_x86_32] )"
+DEPEND="${RDEPEND}
+	${EXTRA_DEPEND}"
+
+src_prepare() {
+	if [[ ${PV} == "9999" ]] ; then
+		eautopoint
+		eautoreconf
+	else
+		elibtoolize  # to allow building shared libs on Solaris/x64
+	fi
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable nls) \
+		$(use_enable threads) \
+		$(use_enable static-libs static) \
+		$(multilib_is_native_abi || echo --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts})
+}
+
+multilib_src_install() {
+	default
+	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
+}
+
+pkg_preinst() {
+	preserve_old_lib /usr/$(get_libdir)/liblzma$(get_libname 0)
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /usr/$(get_libdir)/liblzma$(get_libname 0)
+}
diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild
index e3a22b079834..505a4884ee2e 100644
--- a/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/xz-utils-9999.ebuild,v 1.14 2012/12/07 22:15:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/xz-utils/xz-utils-9999.ebuild,v 1.15 2013/08/07 22:39:51 mgorny Exp $
 
 # Remember: we cannot leverage autotools in this ebuild in order
 #           to avoid circular deps with autotools
 
 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"
@@ -31,7 +31,9 @@ IUSE="nls static-libs +threads"
 
 RDEPEND="!<app-arch/lzma-4.63
 	!app-arch/lzma-utils
-	!<app-arch/p7zip-4.57"
+	!<app-arch/p7zip-4.57
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r6
+		!>app-emulation/emul-linux-x86-baselibs-20130224-r6[-abi_x86_32] )"
 DEPEND="${RDEPEND}
 	${EXTRA_DEPEND}"
 
@@ -44,16 +46,20 @@ src_prepare() {
 	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