Move up the libtool static hack to fix unit tests too #384731 by Markus Oehme.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

3 files changed, 26 insertions, 22 deletions

diff --git a/sys-devel/libtool/ChangeLog b/sys-devel/libtool/ChangeLog
index 9ba5edd15e0e..884220347611 100644
--- a/sys-devel/libtool/ChangeLog
+++ b/sys-devel/libtool/ChangeLog
@@ -1,6 +1,9 @@
 # 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.231 2014/11/01 01:44:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/ChangeLog,v 1.232 2014/11/01 02:44:02 vapier Exp $
+
+  01 Nov 2014; Mike Frysinger <vapier@gentoo.org> libtool-2.4.3-r1.ebuild:
+  Move up the libtool static hack to fix unit tests too #384731 by Markus Oehme.
 
   01 Nov 2014; Mike Frysinger <vapier@gentoo.org>
   +files/libtool-2.4.3-test-cmdline_wrap.patch, libtool-2.4.3-r1.ebuild:
diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index 0e68a3718b04..0c9603ebc8e3 100644
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -17,25 +17,25 @@ EBUILD libtool-2.4-r1.ebuild 1860 SHA256 134dc2a2dd2b71d8ac5dc6bd3f0e4535d031407
 EBUILD libtool-2.4-r4.ebuild 2753 SHA256 9070fd9cc352f4a1158dc5e019e68b5f36cc2dab67bf1f1a41f36c3e5241eeef SHA512 e31b8d7e91c3358a9e63293f348c0b5044ea8f4a404c10c9b6537abc9261f4bdf0fb0a3fb5eaac7752905b74d9eaf24acc8b65d6f3e3175d7ff85851ed9a18ea WHIRLPOOL 07f373e88b2e439ba6b7282b17b3da20a3115ba45ec180ada6473e63d4d473f98d93b3511abc57c79a7e87e552e8ccf2ae8d396b5f0ed44771831ae51607a8f6
 EBUILD libtool-2.4.2-r1.ebuild 2846 SHA256 d363a162685573430c2c4e0b50e5ebe5c8faa7584a6bdacf093803ef5837693b SHA512 927845575ebe67cf3db3cd21a3cd180d143b6d796dd0a7490c9770b2c4e78bf2c9893d1d5ca06b27f5090cc3916671320ba1a9ffce8aef68561798087298a92f WHIRLPOOL 65a363bbb770c1ab3c7d46e6d3b99a1b9499acd7b65f2a6cb407281aa49ca58976d99d8f08221a2c252d2a47eaaac1dbdaad38a690e45047ebba430ed33c6024
 EBUILD libtool-2.4.2.ebuild 2687 SHA256 8a389b8d5e1b00df338eb93188e916da67fe6f2c019d73a5bc5a49d98d88eae8 SHA512 6372b7e6141770146f0917c01e35a333f285717ea6275343f3184fa622d74624494961dde54c776ed2f895bdbca8637a3d605c4feab06a509cd7b6d4258bb001 WHIRLPOOL da3c1743617d4ca304b715a144bf411de13254b6c5e9d675ab8e0f1a2cdf7d2fb5b6e21af446c753aa7745638c39cab3b596310dee89f885a3a2e3e2ed80ca54
-EBUILD libtool-2.4.3-r1.ebuild 3047 SHA256 c2cb2f487fe3d1b5b55975b56458d6320e0e998d7c0a64b6297b222c50680981 SHA512 b7641d4b1b5b2f9919b7f8e31cc83df4e1699fc1e14233c486fc09ac55bc6c694ecd343c9df239626dfdb377de382d487a5dcb3eaa7d4e782c86bf063b18c8d8 WHIRLPOOL 0955fb81df32c49be0fcb468f30025e16b7cc6a1010d2258ad740d3d53b9e346f7a29a6ea95f24beba474fe9eb57b8b9d180cbb3b85c03cbf39ee4c02506e2e8
+EBUILD libtool-2.4.3-r1.ebuild 3073 SHA256 61c6d753ddcdd85055759db5c51cbac7796564d477f807f53e5ab404acc5d31b SHA512 f3c4286bb8e15f078c7dd73d749eef950ec4937c8500ced32b2d7e8152a4f10d650da579aaf2f6da83fb911760662b367efdb5f540b4745523a419e9d38911e4 WHIRLPOOL a42c662adc68c468e6f654b25290e6d510950516f3fcbc6c431b994e38e7cdb40fca20d6df3c0f089b63860726a80d605ac15ba8fda3a230135f19c8dc5406ca
 EBUILD libtool-2.4.3.ebuild 2861 SHA256 3afc81079fd4b410a53b3ed1626d4c5cd2d7b7b7605fbfe68b9f46e718c24040 SHA512 e886687c33d12767d39c1fe8d28aff93e8d57893b0ad35bb43a920c3de220b08b538afff6c3554aa58783f7527da3d3e2459918f8a572f392adbdec82024143d WHIRLPOOL 2d0e23655f6f66bee202d03e5c1df9d166e55043bb80c1e4f84e40b7979583fcb9f615e81eefbf12764269b711f57dc50d119204f712e3a2627ae32f82518300
 EBUILD libtool-9999.ebuild 2824 SHA256 bd892fc98245c589ee733cf8d6acda3c938555e830f7cbbcb103d596cb4b14de SHA512 92a961614856c5d40299183fa00966cf1872a13cbba5e676c4b08a1fb1835e540e96969c2a8ca9eb08bdc754f69eab87c9889ff960f6507f8cb7dbdfe0c46e0b WHIRLPOOL e56477ccb31ffe67aaf6a25f805e750a98c7915bb6fc1c84f35bc0084450e67ec8c660a66035389bcbac5822e14f6d4dcc46bfe7933b162347f9ca47c63043c5
-MISC ChangeLog 33933 SHA256 1c3d27ddbd663e74d2ebd6a7a15bc2ad30884db142119027126b139ad83afdc5 SHA512 5d40e228d2dde795d9dec68c825d008b2f9c26883e7f3479235d2e690f5eb6616737a3f4069db9a435dc790640f89bc230c5e5c9d2a0505436d9b8523e8b0d33 WHIRLPOOL c04fbf24d872445fd91e451751fadc56e3ef53647c048e37fbbd091721e9b3ff8ffc83f60771e84b3a654eca3f44012f8ee7bb564dbbc5197abd4b115542e195
+MISC ChangeLog 34090 SHA256 0962c6ab1efb4d9156562b65fbe1d38e91edda0c232dc4f36e9a7cd5dcb8c0da SHA512 ee63f67106948d27f635f0130ae8375c91500291ba5741a4957b391a2d0ce2163c4c8e147ab821ed9078c0c526422ec708d9e26fe94ef00e47d3226a06cc53bb WHIRLPOOL a63499e3784271eab15468bc9b806950ae70ccb8380ce7050c5b4fc6f6c89d35d17ec9b067d8681b66f93c73573f7d2691888223f790be40a184809e8871673d
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUVDsGAAoJEPGu1DbS6WIAdkgP/1MuevwRIG0OkifJz+XaZ8kp
-UARWVAEBwPkzCneeoGqajHUuuJ5gUAdPPXTNZSrNYSIfkHtSPZ4rsHBFM3FMvGC1
-FB9fNlbabv1sQdaj5LBH2HWN6evo4RkWbXlWEiOcBhfKDt2U2lRMxz7sBC8XXGMV
-FM3QbSOODGe8yFu1tGCxd5x15JiaSKBH0LZV4VwzVUur09D3OFszrw4uwDHYsgT8
-u0JigUlgvryS1c4uueLft1FxLM0Cz9/fDcUnEDQ3OgSbXKFcUdunoD+sbVccjv2I
-98Eh4V+hplrXfgsiNIt81XFXfV4pJGLs5j6uc3dmErPIY3A82hVaVPe44+KI2Gqm
-7vXKObf4YMzXo6l5Uo6ckbV1UFCZ+HDkj53QQ5DcUBiEl0ZN/p/FhmgwPCfUpQ2D
-ig7ctQaM+5HSTpyRXAmkWX5KEq7PMjS7zrY/L8DeIxXSyg+a5IrxiTtDHbxSMX+B
-FYeMcVXLLDiiUipOVowFp2WxW+Ie89CttnxVc3SPiBSENP2AdeBUdAY2ee6rpqlI
-EM13YWtFT6J2Rts3W+4ep111XMfF++dgBTmAAG04FRgj5okhqB/c3gu0E239eZzD
-aBvC7gORPOBcwyDA0i6KdCONV7Xo/oJRI3RFz07FaI8bVXRenSSdgIrSwQYQIwlH
-rjj5DR2l3/tyfhD8+O8Q
-=SGAB
+iQIcBAEBCAAGBQJUVEj0AAoJEPGu1DbS6WIAiMAP/iifd6549LyrDnSxCvu9dT/5
+Pb8ya1Ht3Qszsl+TRg90Z1qkSzKoxHTzir5JtX6qKW6BZyYrJDVz1UYtvWddSrYu
+IOb5qIWhKU6JT44R9hKEYxFJ77YOOoGAlqyOLSd1cst6YBdY/I+fM4OsFq1SnuA9
+sGL/hfK9TFTfZG+ROtFkaggg0VYaYh8/areS0+GMDkgV1BEu/bOxYIrwbLAOzwqA
+Au4LM+Zo2OvamiLwEn5RD3YIe/mRPqHzhR02jA69nR4qpTCmn+nPlReoJTv2bmfs
+1Xwm/DdkE/Sil58BPyWb/vYnBfxq36Hbj+TE2u1pkbgkU45drNNY72tk0D2+z+CD
+82ftkW+En3jfRcrlkEsCTemobzgcXwSGCouHy3Hz1nVp2zz+ejjQwnJHenCeP91n
+tT3k5Sz5aX6H9pHJ3MpWH77U3gkbANzN3fsVAvYX4YpbOZkQyZGpamxXc+hSS2Hw
+ftsApfmlZ4tGTBjx+qbrUKDHuyJExbYfSjLwMXwvUxMnrT9ohVt4xTna5T2D000T
+NEzODWixi1edRtB+0SYIozBuRySNfVFT0+DtWBp+B+vqTbmqMOmedtAYZZ0IZ04F
+pNAMGkT0TsMkYgqbciItVDJ/6elSwTSF9aZSAnpax9beK/cGuBLBzurlEq5gNxGC
+rYRPywBSx+OvgljED411
+=ukFL
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/libtool/libtool-2.4.3-r1.ebuild b/sys-devel/libtool/libtool-2.4.3-r1.ebuild
index 97f0872655b4..d53c4b1c0611 100644
--- a/sys-devel/libtool/libtool-2.4.3-r1.ebuild
+++ b/sys-devel/libtool/libtool-2.4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.3-r1.ebuild,v 1.4 2014/11/01 01:44:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libtool/libtool-2.4.3-r1.ebuild,v 1.5 2014/11/01 02:44:02 vapier Exp $
 
 EAPI="4"
 
@@ -68,6 +68,12 @@ multilib_src_configure() {
 	export CONFIG_SHELL=/bin/bash
 	ECONF_SOURCE="${S}" \
 	econf $(use_enable static-libs static)
+
+	# 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.
+	# It also breaks some unittests. #384731
+	sed -i -e '1,/^build_old_libs=/{/^build_old_libs=/{s:=.*:=yes:}}' libtool || die
 }
 
 multilib_src_test() {
@@ -81,11 +87,6 @@ multilib_src_install_all() {
 	# keys off of its existence when searching for ltdl support. #293921
 	#use static-libs || find "${ED}" -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:}}' "${ED}"/usr/bin/libtool || die
-
 	local x
 	for x in $(find "${ED}" -name config.guess -o -name config.sub) ; do
 		ln -sf "${EPREFIX}"/usr/share/gnuconfig/${x##*/} "${x}" || die