Introduce multilib support, bug #499390.

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

4 files changed, 133 insertions, 25 deletions

diff --git a/sys-devel/libtool/ChangeLog b/sys-devel/libtool/ChangeLog
index ac8eb1ae0e9b..e80c5c73cbec 100644
--- a/sys-devel/libtool/ChangeLog
+++ b/sys-devel/libtool/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/libtool
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.213 2014/01/18 03:56:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.214 2014/05/02 10:30:31 mgorny Exp $
+
+*libtool-2.4.2-r1 (02 May 2014)
+
+  02 May 2014; Michał Górny <mgorny@gentoo.org> +libtool-2.4.2-r1.ebuild,
+  libtool-9999.ebuild:
+  Introduce multilib support, bug #499390.
 
   18 Jan 2014; Mike Frysinger <vapier@gentoo.org> libtool-2.4.2.ebuild,
   libtool-9999.ebuild:
diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index 8018797ac141..a2f2b113b57a 100644
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -13,24 +13,27 @@ EBUILD libtool-1.3.5.ebuild 799 SHA256 e954a743ece6084861556a273038c9c2fb4bd33e6
 EBUILD libtool-1.5.26-r1.ebuild 802 SHA256 51fcf1490d05f1377f056a2445f2a6945c6ece7835bbf4df80ee6005820e5f25 SHA512 5078be34d000856ede7b2760fd98d1b4fb538cee4e9db1042d391a98641de4d397c3686a890a11cbb2f921c35f78d5eb29355e9584c02cff5987f6e14829dff8 WHIRLPOOL e1b06bbb2e8cabdba5bb8ab46476d8bb821f3ad5eb463f5029ef4c11b38d5d696cd747365dd3f56074d14939bb9170aa628ddc15c8fc3c2e6074a41ec13a10b2
 EBUILD libtool-2.4-r1.ebuild 1860 SHA256 134dc2a2dd2b71d8ac5dc6bd3f0e4535d031407840d51cdd165b71f241cb8dec SHA512 4b92fa287dd6ed676729641c760d23af67112c4a5c202650833a0a53b5f62b6b6a9a5360302a8e9c476133d02a6c954a98eae769d9ed1cf046d736f3ae050bb9 WHIRLPOOL 014b6b8f19f2ca1d13caf3f0e98dce595d22719e5f8396d02a14375ec5a028c522862624488b6b7c16a3586dcf68f4ee00b6d0977ca8d5ab2ab61abeba7ead5d
 EBUILD libtool-2.4-r4.ebuild 2753 SHA256 9070fd9cc352f4a1158dc5e019e68b5f36cc2dab67bf1f1a41f36c3e5241eeef SHA512 e31b8d7e91c3358a9e63293f348c0b5044ea8f4a404c10c9b6537abc9261f4bdf0fb0a3fb5eaac7752905b74d9eaf24acc8b65d6f3e3175d7ff85851ed9a18ea WHIRLPOOL 07f373e88b2e439ba6b7282b17b3da20a3115ba45ec180ada6473e63d4d473f98d93b3511abc57c79a7e87e552e8ccf2ae8d396b5f0ed44771831ae51607a8f6
+EBUILD libtool-2.4.2-r1.ebuild 2858 SHA256 a8a9e600c9459dc911ba9d30a2b8f0bf85c11138f59725708fe315942990545b SHA512 e0cb2b14b4942cb9abc0194a705bc08417a915d102eef3b4ac9d3506fc119948261678eefa4430f65c699b3f0c969007fe3ab62e3355cae69f3dcb4fc7422c8e WHIRLPOOL 069726edf2cccd04c776df11c2cd9c8e17fe00aece7ada0887502083b2ebf546bfa7d989765f5491038beb2dbc98355f8aa7a70b392f08cddc13e0428050ad64
 EBUILD libtool-2.4.2.ebuild 2687 SHA256 8a389b8d5e1b00df338eb93188e916da67fe6f2c019d73a5bc5a49d98d88eae8 SHA512 6372b7e6141770146f0917c01e35a333f285717ea6275343f3184fa622d74624494961dde54c776ed2f895bdbca8637a3d605c4feab06a509cd7b6d4258bb001 WHIRLPOOL da3c1743617d4ca304b715a144bf411de13254b6c5e9d675ab8e0f1a2cdf7d2fb5b6e21af446c753aa7745638c39cab3b596310dee89f885a3a2e3e2ed80ca54
-EBUILD libtool-9999.ebuild 2655 SHA256 88f1b78c6304df041a385f6a560d1152251c3d6025ee85d6ed4782f03c974815 SHA512 dfb95d2a4562579c4217da8522bf173bbb7b2eec8eba2634f9cf29c809f875ed6fdaae493ad77a49523646493dccd7749a7299199438447ebcd788a345b36490 WHIRLPOOL 03fb4fd1968066607ba04f9097ff98f2cb2d0638d64e2994c19f951ea0d4cc8123636648951b09fc1dd35e3a36337ed584ada83cfbeb3f816f045fe788eb0772
-MISC ChangeLog 31542 SHA256 852a471d92272ee9c360c5e53596fc726e248c4597aac083a6043cd6eb10b7bb SHA512 d6e515d40abfa7ee13ba4950cf50f103ef60cbd3105499eedaa0878b9db237a9e488c9e9c287b4395f2a27993f7567d5597e559c355c29070eff2b43e7c22fa9 WHIRLPOOL a35f89902b3f6aecb2980837fece1dc8ddd22f3041cbb8994a7a757301e3b6408ec7741c444c7f6eb4d1b5a4ceb51f56847e99e8abee9dccb1904cb358ea5d93
+EBUILD libtool-9999.ebuild 2811 SHA256 ae3657e74584fba45bd9501bab95b25330700f38f38a07e548425d41c7470230 SHA512 c91d133664011a89f764dbf69810026dae514a951ba1e017642e828652c1bcc5fac0ed7dc94f10bb724974aaa320225bc4a75a03d46f4c3d03647d7e7344776b WHIRLPOOL b256fc1bbc9105f7b87f017eab77ee046ec9aad48b535267dd05200565bb434dcfefac5fcb65b70255d7505e03a7986152dbb90c65f13650493cc92168bae256
+MISC ChangeLog 31718 SHA256 35cec4667e0ca155e9440cc843f48b5dc1e7d0cfdb05e45e8ac35c0d36e0295b SHA512 b7097f5966f0067d38a98ace283cfe7b3d4b5cbde1e2fd772b4d31ec1943166ed3e4bf561cdd1ff0eb9907652345fdc574bc20036dfb40092767babb6fb04014 WHIRLPOOL 208ad41e70bf8424d6d52bec8858f4c0b67b824e18abbdb569dee9e9fda2347868913e0afdb6b4e46d096cffaeca39c9466dd6401d0f8f35d774c151b86611f6
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS2fuSAAoJEPGu1DbS6WIANkoP/0UDKsIvQS1x81MPE0ZOnUr8
-vD+0nRaBaAjH1nItsNaA9GTNH0jOHINFG+3Mb6uljg5D0LTe0xu61zIguuGM1TA0
-uEmeDudndqAPKGWEosIoaGLDh3YL3XjIiVT/NM5pZ4cg/ttaJEKYOdB1GzTWSTzS
-cPfyiJQJ1WGWNP10ikt3cd0BjKRi3/C6YZ+LbhgrcPy7sJ1FgCOR6XI/rWuI9S+P
-uIKYaCD8Od6HYb1/LqQhUUcFeMDFbj6W6MrTjXEPWaKxDJW1vipTQtpt+EXZvpwL
-50YtH1Dm0+2Qu22NQ3m0YybkeP9N/OgjW3TK3Bjty0Ctf25Xxa9ODbUKE5K5enPQ
-abBC3hkP76nMTalokcxqlBO5YE3OOs6teoWG9+jBrcwJ/ghLCAnXJdiggqKtnKfv
-P7ESWnfmuBGziwbtWbtgBCP6u7WyqnievFTyLwa91KD/9uci8yD5gEoXhGSwp4/t
-hVRC1V8D3KZhB+orWOLJX96R5mHo7qJB9UM1Ebupbfbbz3hmA6d1DVI25JfFPlV+
-Sw8r6AcaQ9ylk3Fkgk848xDVaUu7DYdGD39Ku++JJjdDWM/m9IckFbXcjgW+L2nN
-aAKMrNH8VmYBq3HQXJhLohWuXijNrC54yWdtFhmjbqZzUHA3Fn9QNVH5sJVapqyC
-Y0wzT5fxUlKS7LarGq5S
-=NqrW
+iQJ8BAEBCABmBQJTY3PJXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOgBYQALJ0xvlSNd8o49nXZC87v/tc
+RqM4vj+FqXRoa3abejJSmPoEVzT5V3deMsHaS5sQ0FatBt8jXqT5ekm3h23Wwo2K
+mQq2PdgxEDfob9IpZQd9sSoyx5cOlBvZPOzIzwBe2Bq4C++MohS5do3GjGh04nPk
+EsuziHqHHFAf7KHwNHMeL9UhxcIXuU2lptP2oSbWPHPMigrk2G3BFEo8EELHLPwH
+15F8ajVItwE6PNVpmGIU/akjvAJoWRNC4+c8XrliIRF08mLOA4CWzOGX5ZMOQuH4
+/KfTAgj8qqBPS5z+u+SL34mHx3/bEwrjk2w+CigZyJhG45lfVR/clHL3mE3avd9H
+TtuGQ3ZWHzGBuM882mungHSaFnDW8u8CJ3DYZh5JX24OYkrxSJNxSTg1JUcgckDR
+1owHl5CJGblqNXxDlKVT4bjVxbAyQC//cv4CxuBMC+KgycwhlX2Vx/3Z8FpRnZPn
+A40WFkPb3ZoejPzYewAoxx3AElZEh2xeV4W5pfac1xkG0l91opR3G31IEpC79W7R
++X8jFCuPtPJ/3ZRJi2fIdLwosV/rO1FIiil7IGIL8lGvbGEiB99qjZKIV18E+PXe
+RPPNLKKH+lUWhxn9iWiqDMrJusOdfBj0J+d8zoJfyJheTyqkARjwUoux3be6dsco
+47haZ94LgNre7Q4zKKU0
+=Qlrb
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/libtool/libtool-2.4.2-r1.ebuild b/sys-devel/libtool/libtool-2.4.2-r1.ebuild
new file mode 100644
index 000000000000..cb2d18a09f77
--- /dev/null
+++ b/sys-devel/libtool/libtool-2.4.2-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-2.4.2-r1.ebuild,v 1.1 2014/05/02 10:30:31 mgorny Exp $
+
+EAPI="4"
+
+LIBTOOLIZE="true" #225559
+WANT_LIBTOOL="none"
+inherit eutils autotools multilib unpacker multilib-minimal
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.savannah.gnu.org/${PN}.git
+		http://git.savannah.gnu.org/r/${PN}.git"
+	inherit git-2
+else
+	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+fi
+
+DESCRIPTION="A shared library tool for developers"
+HOMEPAGE="http://www.gnu.org/software/libtool/"
+
+LICENSE="GPL-2"
+SLOT="2"
+IUSE="static-libs test vanilla"
+
+RDEPEND="sys-devel/gnuconfig
+	!<sys-devel/autoconf-2.62:2.5
+	!<sys-devel/automake-1.11.1:1.11
+	!=sys-devel/libtool-2*:1.5
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140406-r2
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+DEPEND="${RDEPEND}
+	test? ( !<sys-devel/binutils-2.20 )
+	app-arch/xz-utils"
+[[ ${PV} == "9999" ]] && DEPEND+=" sys-apps/help2man"
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git-2_src_unpack
+		cd "${S}"
+		./bootstrap || die
+	else
+		unpacker_src_unpack
+	fi
+}
+
+src_prepare() {
+	use vanilla && return 0
+
+	cd libltdl/m4
+	epatch "${FILESDIR}"/1.5.20/${PN}-1.5.20-use-linux-version-in-fbsd.patch #109105
+	cd ..
+	AT_NOELIBTOOLIZE=yes eautoreconf
+	cd ..
+	AT_NOELIBTOOLIZE=yes eautoreconf
+	epunt_cxx
+}
+
+multilib_src_configure() {
+	# the libtool script uses bash code in it and at configure time, tries
+	# to find a bash shell.  if /bin/sh is bash, it uses that.  this can
+	# cause problems for people who switch /bin/sh on the fly to other
+	# shells, so just force libtool to use /bin/bash all the time.
+	export CONFIG_SHELL=/bin/bash
+	ECONF_SOURCE="${S}" \
+	econf $(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	dodoc AUTHORS ChangeLog* NEWS README THANKS TODO doc/PLATFORMS
+
+	# While the libltdl.la file is not used directly, the m4 ltdl logic
+	# keys off of its existence when searching for ltdl support. #293921
+	#use static-libs || find "${D}" -name libltdl.la -delete
+
+	# Building libtool with --disable-static will cause the installed
+	# helper to not build static objects by default.  This is undesirable
+	# for crappy packages that utilize the system libtool, so undo that.
+	sed -i -e '1,/^build_old_libs=/{/^build_old_libs=/{s:=.*:=yes:}}' "${D}"/usr/bin/libtool || die
+
+	local x
+	for x in $(find "${D}" -name config.guess -o -name config.sub) ; do
+		ln -sf /usr/share/gnuconfig/${x##*/} "${x}" || die
+	done
+}
+
+pkg_preinst() {
+	preserve_old_lib /usr/$(get_libdir)/libltdl.so.3
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /usr/$(get_libdir)/libltdl.so.3
+}
diff --git a/sys-devel/libtool/libtool-9999.ebuild b/sys-devel/libtool/libtool-9999.ebuild
index 20538a76f24e..8dec4fa9401e 100644
--- a/sys-devel/libtool/libtool-9999.ebuild
+++ b/sys-devel/libtool/libtool-9999.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-9999.ebuild,v 1.15 2014/01/18 03:56:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-9999.ebuild,v 1.16 2014/05/02 10:30:31 mgorny Exp $
 
-EAPI="2" #356089
+EAPI="4"
 
 LIBTOOLIZE="true" #225559
 WANT_LIBTOOL="none"
-inherit eutils autotools multilib unpacker
+inherit eutils autotools multilib unpacker multilib-minimal
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.savannah.gnu.org/${PN}.git
@@ -26,7 +26,11 @@ IUSE="static-libs test vanilla"
 
 RDEPEND="sys-devel/gnuconfig
 	>=sys-devel/autoconf-2.65
-	>=sys-devel/automake-1.11.1"
+	>=sys-devel/automake-1.11.1
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140406-r2
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
 DEPEND="${RDEPEND}
 	test? ( !<sys-devel/binutils-2.20 )
 	app-arch/xz-utils"
@@ -54,18 +58,17 @@ src_prepare() {
 	epunt_cxx
 }
 
-src_configure() {
+multilib_src_configure() {
 	# the libtool script uses bash code in it and at configure time, tries
 	# to find a bash shell.  if /bin/sh is bash, it uses that.  this can
 	# cause problems for people who switch /bin/sh on the fly to other
 	# shells, so just force libtool to use /bin/bash all the time.
 	export CONFIG_SHELL=/bin/bash
-
+	ECONF_SOURCE="${S}" \
 	econf $(use_enable static-libs static)
 }
 
-src_install() {
-	emake DESTDIR="${D}" install || die
+multilib_src_install_all() {
 	dodoc AUTHORS ChangeLog* NEWS README THANKS TODO doc/PLATFORMS
 
 	# While the libltdl.la file is not used directly, the m4 ltdl logic
@@ -75,7 +78,7 @@ src_install() {
 	# Building libtool with --disable-static will cause the installed
 	# helper to not build static objects by default.  This is undesirable
 	# for crappy packages that utilize the system libtool, so undo that.
-	dosed '1,/^build_old_libs=/{/^build_old_libs=/{s:=.*:=yes:}}' /usr/bin/libtool || die
+	sed -i -e '1,/^build_old_libs=/{/^build_old_libs=/{s:=.*:=yes:}}' "${D}"/usr/bin/libtool || die
 
 	local x
 	for x in $(find "${D}" -name config.guess -o -name config.sub) ; do