Move away from has_multilib_profile and rely on USE=multilib now that the flag should be sane across profiles #522900 by Xavier Miller.

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

4 files changed, 28 insertions, 23 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index a724c6a09026..f297db71bb18 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.1024 2014/09/17 22:53:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.1025 2014/09/18 16:48:15 vapier Exp $
+
+  18 Sep 2014; Mike Frysinger <vapier@gentoo.org> files/eblits/common.eblit,
+  files/eblits/src_configure.eblit:
+  Move away from has_multilib_profile and rely on USE=multilib now that the flag
+  should be sane across profiles #522900 by Xavier Miller.
 
   17 Sep 2014; Mike Frysinger <vapier@gentoo.org> files/eblits/common.eblit,
   files/eblits/pkg_setup.eblit, files/eblits/src_test.eblit:
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index c6f410f04a47..b1b1f089a974 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -23,12 +23,12 @@ AUX 2.5/glibc-2.5-hardened-pie.patch 1569 SHA256 ff9cde8857c5da89faa4039e2a81748
 AUX 2.6/glibc-2.6-gentoo-stack_chk_fail.c 9545 SHA256 1410ded812be80d452eada5f9d6b9bd7bdb504c14f01cc27dce3e36b6f92b92a SHA512 360b77df2d19d14060e19e763878297bf042eccd5206ce4829a33c78c982b59b46144116d237a7cac73a22dd6cb4987c8dd50f1d16003baa22c2cb2942d2cbdf WHIRLPOOL 44e14dacdd258c46201a44c2c6aae4d975b960a914c24e49f2b39dae960636512049daa052d3cd8e8d93819d263327c28eac947efdb5d9e240d1bc6e9964016f
 AUX 2.6/glibc-2.6-hardened-inittls-nosysenter.patch 8674 SHA256 cf58ded8fbe9fcb3dc094521feec2588c1520ff2c632b20c69d6a210325c4fcf SHA512 094b24474e42a9714f5298b0768d44f2c0e01b7d8c3b0a754bb16caa6c024106e8c0b1acbce670bacec1ead6653f8365397173d62cb8168b946c8f521ca155d2 WHIRLPOOL 9fa16256f9d3bd2f38023549c0bd4c932d3173b6c3f4ef66e19cdb3eff5cb2def6ec02fa72a7e57ba74da6d5f29b82ddb9692d59f6c694d45b5989fa0bfa6057
 AUX 2.7/glibc-2.7-hardened-inittls-nosysenter.patch 8755 SHA256 b0b1bf0746f7160b89cf281502b95c38dec9cb948d6a50a907b84fd6230a2dc3 SHA512 50563c26e1fd2e71cb034c8a1b85e0e4075ac6467bae46d4cba0c105c940c5aa6531c39cf00c63ebf94be4e290ee485d7bd8239ff08dbc781db605b45c4aa38f WHIRLPOOL 2047148b53073bae4031ad864fc360112e2812115ec455142c82d4694a57387b49b36c98f400dd6f77f5dab3d419303faabe8183a16f0fd68387996c95888a43
-AUX eblits/common.eblit 10721 SHA256 6767d18788d137f512d264a5dae2dedc80655b0ca8b8056594e5611cb1b1ec39 SHA512 ac7d0298b3a35fd346ef55637ce3f66bbbea31a30bb5864c073c276372524630cecd5c1559024d0184f097744447ed8a15e3e860df657a1345a53947c58abaef WHIRLPOOL 8df28c590d0c07e48a554bd460d12b752f740015af17aacea803cf17e66c3d44df1a6064995e797909d5240aeb49a1fbeee6cf57233824d240f24d940c7e31d7
+AUX eblits/common.eblit 10658 SHA256 2c741cc8cd72a93f5bc9db27909afb1278614f22f7c55f5b68b96020b5107bf1 SHA512 52396b78b78fc77d3360cc338a00b919ef6f220938894b5897b31f1b2a0d0c340e9bfcba051bbf3964fd578114546a38c764ce2f68b13ccc640e8197237c2650 WHIRLPOOL a5ba35dc00d0b2f68c947b7f2a9bb4f9924740ac633776ef2684f02bf7d9d37d4fa917621528f419cafbf034664a8d705e38a428b919933fb2383600448ca261
 AUX eblits/pkg_postinst.eblit 1081 SHA256 21c349d6999841b277dd00ed6f2bf4b33d14724510da3c15a99e775cb71bd180 SHA512 b491761a0923b779535b4a5abf6e00efb6f2c0bbb68e7fb01b2cad54034b63ddfa271afce16b17b17b53ac809ed869c55f94c44443d661052779770f4302318b WHIRLPOOL 8e3a3f35a4cefa903bc578d2fb6b22506f3ac94939f9ad1e703f470b13ba0fd3353061e38e3142ecb5c693749c84d4a1e4f4a5920e36ce20dc2f7e3b6b67ed9f
 AUX eblits/pkg_preinst.eblit 2608 SHA256 e49f274efe309b4bfed88195d413afa3363f40fb6c2caf50b4ab8ce5ab548864 SHA512 debfe0679d51eff7a154f7772179cf6bfe01beacf63fe101370c172e71b0524da0ceb7b0571e69a8050e5b75953b1d4c8968e1982ff4bc7362caeedde0be595e WHIRLPOOL 7b5c69c319651d860b3495d658b7275308f69504050699aada21ce5ecdd3114c1ea50ee7eac4436ee33738d02a0eb4bc6fff41484ff840aa2400bdd484ae3e93
 AUX eblits/pkg_setup.eblit 3962 SHA256 ac99b2a5ff69ffc96ff9fca0c149b406e8fccc81702f5fcb8ba2d355e0c0eee5 SHA512 a636b09f898af0ba3d1555683d8def7ae92a6003445f851127f7de420cdf9741420e4eea93f9603f8d46596041a67132dae0ef22bb614b300a17c3f55e6d35d8 WHIRLPOOL c57ae01d0514b9e67fbe37957a1f0b7c225094d80114bad666f9a756b81c8835152676b523277e9162daa3b2a1d9b4ac9bf6be15ba3c18431a09a5c1ddb958c1
 AUX eblits/src_compile.eblit 712 SHA256 2f7250659b1ea316dd67a0baa229b9248693b55738416e242bcacbd6efec96b2 SHA512 f812075621013eb9db7748e16997f7785e6029f691147ef63c9c5e4c0ec98ca47cad81a9aa135e69dd57296454d158191deced0cb47201343698d9495b8dd34e WHIRLPOOL 0692b14ac23a7f995e68c15fc91643bd72707f4072e319460a31014a91fe789794b10ac155021b48f02b9bea636305408ec56bb161664a21ec7f5ff86ccff7fe
-AUX eblits/src_configure.eblit 7209 SHA256 5a7ec1de2cd43b76ddf0757df2c76422afbf97b7109bcb6535def0c8009d8199 SHA512 75312c0fe4e2c55b8ed2e851a8da79bdf9fb975e60703cf726ffb8fe1025f0eaee32f946a00ae021f08501ff26998fb91c4a0970a5244bf63f6f59bf9cb2765d WHIRLPOOL 594d87f6fdf53564e5fbd9e880ef8a62bae1caab8c498ea607a7f33b0d015e546518ab62b9330448e6b06a8219af49a272e4313c864ebe77a0b3ee6118a074c6
+AUX eblits/src_configure.eblit 7185 SHA256 f13cead0265f1093ce33b9972ed5a92a7b5f1323f22ad2ac6fe5e39ac3574663 SHA512 6b2cb52c4dabeeff480362fff6ea3739a6ec964a93c4ce2eb65fdf34a4284afbfb76537a70679a719d67bfca95d42d1c8ad819ca579e1ad546afa5769bdd1c33 WHIRLPOOL 818d5f94484aee19155bcd3da3896deca743eff7861d28aab6552262e85fef6aa081b9a66b1886f8a378a607ff8fc457af6f15c5a074b503b4871b394aa43eea
 AUX eblits/src_install.eblit 7927 SHA256 d0c6dc3c96dce898bdef54a3211828526aeb7ed93d39f817ba81c84b4d183926 SHA512 f2f9775e2a6788ac894e917c96179360c4209e3c48f394741a7a977481a34a01e1db2fc474589e24c49d61427bb6e6b88de4d015a9e59868c520d1afe9eeefa3 WHIRLPOOL cb52b17487d58cae8fbb1069c0783de9318841ef510501f9c65ca3f62cae3d2bbbb0a34b2ca1416928604d180e8e944d83e817212883e3bfe727c1626c85f17a
 AUX eblits/src_prepare.eblit 2344 SHA256 7898682539bc85f126e491bc9c9a727cc5d922680f91dd409aec50c068ca93aa SHA512 30d706f26475db2dfe8cfaaa003c3a21988328ba0cc7cdca439d248c968430308d8d0afefa60302315d4c76011e4de51925307ee19d15eba10e24f1ede2b956f WHIRLPOOL 3a5ad0de18649805d97b0d78ea33e52608e7b6694ac567313db9e09da18a0bca9b95a027fe0181b50738b5bfe83ac49254d29b077cef36fb311a9707683261b5
 AUX eblits/src_test.eblit 808 SHA256 8a652acb87e941fe767ddfbe0e0a42e3b5f208f5408606c5d9de22a85b1f8ebe SHA512 b8a37cd8294f5b6d2735d9971e7bc4bde1a7671540d6f76764d06203f5f179c143c487f57c57747c8e72e7a1d89d05928df51331a44f46d4290e9b89449eed63 WHIRLPOOL c33b33b71431f3438fbe350c8c1d3c67d17fdccef61687bc645397635875d09af8b4e2b545a4405429c2b8ee4a012fd753205e4b5ce3bb2f93e4341d34a18eb4
@@ -101,23 +101,23 @@ EBUILD glibc-2.19.ebuild 6912 SHA256 3a11e60bed77cc2dad678ad97ed7a959a59a91a94ca
 EBUILD glibc-2.20.ebuild 6234 SHA256 c27d95696a65beff849af0544142d5e21f08757713cabc003d5c309498d93b86 SHA512 7d03b0e9eb76858734ec44a7e4c74d38d22e4734b2bd1de167130b138f0e5d2fa2cd45d8377ca6400bb5dbbf16bc0eb4635cb6cb8c8a0a9d821833bf88a9474b WHIRLPOOL f83b820dafa9dbbfd4b48be196dbb4f076b34a17d3d4573d8ec745bf22be1ef1d94fe0ca3c14d859b26b84bc8139bfb735f393457ec3df586ffd061231db8884
 EBUILD glibc-2.9_p20081201-r3.ebuild 6787 SHA256 3d9ff2b86df088b8e8cc082c5ddef164b48cffcccfa2ea001306e79a6d52a52c SHA512 7070020105a777bbf6d846fab291b238d7861472c737031e8c52b6d5c2a0524e228b724751325448ce94a42ee39112088b91d0597cd2cdbcc68c51248d2d5a11 WHIRLPOOL aa0e2d11377c3a30478afbef0fa3daa12aa9711d68dc92ab08fca999e599c613648644da2e6f81c38dc98192ed26934c4a35418a97d3146650cd4c82e39a7fed
 EBUILD glibc-9999.ebuild 6839 SHA256 3d51b4a03932748b6716fdb1c63f6c083651f3d1bae585c989adf0c106c86d58 SHA512 14339b49e597d744e488ccecb17eef69ee22f2a49cf69a280377816cde522e56abf690c487a9cdcb396ef8084b165dd716956c02ee16bea45f39a0875ef2ffcd WHIRLPOOL f52e905e4f29d7d3e9da861028eae695160d1aff250060748e5ee5da2eb4b39a895ddf0a5fa3995f844631cc89f114e58ff9ac603b4c76f6bc36ed6855f037cd
-MISC ChangeLog 71240 SHA256 3da7de5770e0c02b81e830217f64630160537d00d6cda29c8cae59d169e98e94 SHA512 d91984642ecbf5e9ff95299dcae3e36ce7ef2ef4ef8ce91eb290ca3b8722246a22eefd7aad5fd5382b90ecfb5312df26b2b810268b0c2ead8ebb5312f95f5e19 WHIRLPOOL 28275069e072f0cb34513acf195185749284b7a6b16558f6cb0e9cf53c93c2cfd0ad3c826275bb65dd782174dd1469b94bb56a587e375c574b0784d07d79f171
+MISC ChangeLog 71494 SHA256 d4cd234870e928b8d35804326c828f79b5eb09b3e7c00c71d0fc42f4c74fd09c SHA512 0a91662305fd898d76632904836081d105f56adba17a4b2c84631268c2541f1d762514b15c288ef60d28d8106b0ebe949ba6bf48507cdde6a3cb849d0de667fd WHIRLPOOL b856f6b1c7a1b3b168b6365456e0c96f468c31831e3a04e529ce0fe74f61940feae156298df0ab968fa6a632c305cca9bea818c32ae10ef593208c6014009629
 MISC ChangeLog-2007 108548 SHA256 d622be202eb0d61a363b0ae4065012cd1d494fefaa0c03d4aa7986177cdde6d0 SHA512 fdb3f311a3be4b97a6acfceb1763af5ea69e74d8195522c5d03307f75e15a9382991e9e29dbfdec79e74f1c36328f82648768749bc929e5050ff64b628c7ca98 WHIRLPOOL e550f354394569069e000a7e70ec69c94388a0f415c19b427203f0dcbcbeeec0f5e379ee2af7886cd2d68559e749fab8122e7e077985729d7e0e728ae9096d7a
 MISC metadata.xml 724 SHA256 b9d8df62b36ae314b29a3177c534495036ef97a819c152247383e907004fe4dc SHA512 8c215338bbf47de95f40f9f24c50d107ec0bbe4a47282d3cbc253d4003db85a88c542aee33756dd9d2d2ec4c70992009261d821a8c145c24c24d2ad448595b77 WHIRLPOOL 954f5d080c7219ffe85e128eddd05c74a32a457219d423441bb58d54a7de1786da6a2efb541861b3bfc93a9acf2ae6f79168d1ccc37385f84af0eb439fff2954
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUGhD9AAoJEPGu1DbS6WIAhPAP/07V8J16DYHzRdjnKgBi6hR9
-OpNEo5h1OwSIXOfrmw7zq9ffShh3CdDrNVvGVO2ZjAdV6gusjuVLa47cQdQqAJuD
-ZxiEF7WjKUCfLVbnYKkWbafbNTDmFXGQSc/NGw7Ir8H7LBabJqzUT7sBYZHhqS2e
-bLHZCzvOJOyArhTSzuF7OJ3s7gdtr/LkHF4mTAIMp5ovUiHByfjKxhQFqtFoKPn3
-toJt37jp5X1QDLQkeCFv/dGdxOdL4FRUjNmLSJU1rw9TnId4X2gmV/cFdVg0AHTj
-DEGIH0isH+ArC8DibErH/jhLyZAsr9ICujqTANLdlH6qvUNdZ4Di106ZAI0Aj8T6
-x0m8pCVxU9K4daNufzMkES3qCgMYcxEiYyyD/V/MCs3NswyoCD2hGVnZGPeErgYr
-azdaog3ZLKJJZE51C7DSKXo1yxJ8sCeDDT5dKRIdhPWu++DJ+rKR8ojOcved+LKK
-hUKabR+Juwu7bQ8q23mhKo5xfxFK1C1WfbjD0ywNyAKnPEFh3UrHuMRf7H4mdtql
-z57pML8ve00FH8f/cFaiTEqcnWTNyIGeyPQdxVZz00lhp34MYIvVF6JY36ctZ1Wc
-ocCPyM7yWtJ0KID3JkiPz1FhM1+mFbOnHLI+wP3gg1OeGZ4JRal0T7x8v6CFnPQF
-Kg8vSlgL4nnZ0l9oH+dx
-=zM1X
+iQIcBAEBCAAGBQJUGwzTAAoJEPGu1DbS6WIAxqUP/3n+hE+29ja5N5DzAGXziwzq
+9ZT33EpdYf6A/JPE1u5nhySFPN5NCN2BJD315iaIsvvEJHISyyEXE+g2k1YmreOx
+cI9vcqkIEr2Qg+qQEA5cEFvV0j8nCyIfcvJBgkV5yutMz1iquVd16dQ5mmgjW9Zd
+FzvhRnvKCYOtWXLeY7UjhjMbCa3KHDflc7Fs781MIB0f4C8bVYmUZCpY1uGawiRl
+rlxPPc3S6HZAd6Ve8mDRctKIzJ1wmTDLiRJ9dIh/AHqtgEbOmPv6HdshNCPk7p4Y
+fMqixi6TNllUNi1LKDFTLfFrSC+7nXb4EGNXLXLE3A1Y1jTuSZeRm2sT3MuPPWw3
+qyXnBGiKF3Qk0Z/tNYByHwP1kyvQeoTc+I/Ytn6g6+pDLpe7whCXo70yD4QNDyJm
+u4pcTiHUmXGbRZ9f9VxSL/KpVjP2fRy7f8JR0micjzQ/NOavUPGnMX39AAFeYdcN
+un+zkCn9VMZ5oyrWNrSKj03JZ1TOt/4eGiAJU1JEjAu38//T9CQu0dyhl+muzXtN
+DLc6Lv+F8vuZGju35SO8FJOw7VJMWze8MnsfAKIPbom+dpFEzQ8tlp/AdGap0Rdo
+SnZDHVAo5ALDw/1qnlQFXhYVaEScxuuybnLxBaCT6sl7aBpUPSXE9XYu5icOMrGl
+0Cfj2WRIwA7nJYW89xEu
+=U9QB
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/files/eblits/common.eblit b/sys-libs/glibc/files/eblits/common.eblit
index eb65d98dc87b..c42375cbe69b 100644
--- a/sys-libs/glibc/files/eblits/common.eblit
+++ b/sys-libs/glibc/files/eblits/common.eblit
@@ -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-libs/glibc/files/eblits/common.eblit,v 1.42 2014/09/17 22:53:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.43 2014/09/18 16:48:15 vapier Exp $
 
 alt_prefix() {
 	is_crosscompile && echo /usr/${CTARGET}
@@ -169,7 +169,7 @@ setup_flags() {
 	filter-flags -frecord-gcc-switches
 
 	unset CBUILD_OPT CTARGET_OPT
-	if has_multilib_profile ; then
+	if use multilib ; then
 		CTARGET_OPT=$(get_abi_CTARGET)
 		[[ -z ${CTARGET_OPT} ]] && CTARGET_OPT=$(get_abi_CHOST)
 	fi
@@ -310,9 +310,9 @@ foreach_abi() {
 
 	local ret=0
 	local abilist=""
-	if has_multilib_profile ; then
+	if use multilib ; then
 		abilist=$(get_install_abis)
-	elif is_crosscompile || tc-is-cross-compiler ; then
+	else
 		abilist=${DEFAULT_ABI}
 	fi
 	evar_push ABI
diff --git a/sys-libs/glibc/files/eblits/src_configure.eblit b/sys-libs/glibc/files/eblits/src_configure.eblit
index aab777ab10e9..e0fc185761e0 100644
--- a/sys-libs/glibc/files/eblits/src_configure.eblit
+++ b/sys-libs/glibc/files/eblits/src_configure.eblit
@@ -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-libs/glibc/files/eblits/src_configure.eblit,v 1.1 2014/09/10 18:45:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_configure.eblit,v 1.2 2014/09/18 16:48:15 vapier Exp $
 
 dump_toolchain_settings() {
 	echo
@@ -78,7 +78,7 @@ glibc_do_configure() {
 	# 2. only for the primary ABI on multilib systems
 	# 3. Not a crosscompile
 	if ! is_crosscompile && use selinux ; then
-		if use multilib || has_multilib_profile ; then
+		if use multilib ; then
 			if is_final_abi ; then
 				myconf+=( --with-selinux )
 			else