Combine ABI for loops into one helper.

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

6 files changed, 66 insertions, 109 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index e9af381e0b68..e6afd5a13cef 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.1018 2014/09/10 08:16:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.1019 2014/09/10 18:15:55 vapier Exp $
+
+  10 Sep 2014; Mike Frysinger <vapier@gentoo.org> files/eblits/common.eblit,
+  files/eblits/src_compile.eblit, files/eblits/src_install.eblit,
+  files/eblits/src_test.eblit:
+  Combine ABI for loops into one helper.
 
   10 Sep 2014; Mike Frysinger <vapier@gentoo.org>
   files/eblits/src_install.eblit, files/eblits/src_test.eblit:
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 2d2619ef6b06..3af40178a168 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -23,14 +23,14 @@ 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 10280 SHA256 2294af7912518f2a28229a3baaac0c2faaf0577d408eade5f90efab0686f0b61 SHA512 dc9fb66ba7c0dad608901b7e31a27aacc041bf1e9c90ee956187a3092c8d0b02b80ab25966ea0aa7490d71d0139a5bf093ad1871b8ecccad6ef1b3201b4e8495 WHIRLPOOL 960090360cf2295b17563e463cee939bac42754bf549a140c69edcad178ac6faddf535783277402e52fa47d2043548a52ce88d061b7e6d5f45c73f059c844ad0
+AUX eblits/common.eblit 10655 SHA256 904998749e90cae011c589badef12201f6133db2c2573d1cd09b22b931c140cc SHA512 753861d1bae381d2fc88ecf995a7b06c29c9fd255666bf8f376de0632ec2a2091c0247b5c4569152a364ae17825d5792fd392a93cdc7bf76ed5e27c3d8a47e65 WHIRLPOOL c50a66cb4597ad986621f18d56c4db2b3adf62ef8d21a7e579f8ae576dbcc3294bc760d138f5df64f632791fc455e79704394a807721d8c6202fff9d56fe567f
 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 3953 SHA256 b062a64b9206da83f36260e6f99d812014c826df06d339b32ac5f6975986c6ef SHA512 c4dd7e73c335bba90d2c3788f4a9b35e0ff0e9cb1ab91a2ccf72fba9fc466b72fcd3e21e6f2e2c0b479a6dd55770824160a7e0288a84e7282d7d9241c087eccd WHIRLPOOL 7c1379d190de749871fef339b3eb8789b82e65a417e90bb04075ae34d0c999c5516918a3894782b3bc632ef2b772b206aad61afb18222cc438c13fa4c263d75f
-AUX eblits/src_compile.eblit 7733 SHA256 a491a52b0747ef4ddf0dc63e06debb237b25d129540bcab411a20a0d8067c7c2 SHA512 4aee3ad7261bb81fc835df2aa54afac176e3d7b0c13340328143b0b0ecbe983e74ef7f0462c15e2b0693d7461c3b183da0a450b92aa22d3b6c6d011b257603f3 WHIRLPOOL 218731f038919816ebdfa7a0ebb92deb2f888818e8b4b2d67e2b32457212d8cf1918e11fd34d6344a831c21fba148f1a4441d8c4a4e7500488d45b45645a3262
-AUX eblits/src_install.eblit 8393 SHA256 3988ef0b3397f58f73208bf5dcdc9d4dbf830f0b14abb788f75f0372596a8478 SHA512 f0f102fe0c02008e5c259d66118ba7448481d65c5143157239e4294c3333a0d4f115bd61023e2c5bede27a31ef4537aec496b52ea5c5e89313ed0f6c50918c3c WHIRLPOOL fd864fd93456060819c3a116b8e3dff218284398d209bf92937c4d85e5c1c1796e50f650692c7578d7b66b180008030e1b163928c085f61e22fa2637b7648831
+AUX eblits/src_compile.eblit 7324 SHA256 ecb9f990a8ff37674955e05c3c9bcfd4032d374dee64094f16220990fea87c96 SHA512 2f1432044587f1eb5cb4aea1f1fac0879b179e78e5dda34e1f136dbed8f718f66ce82499e5a86fa30d90bc8357473f9a3f6c4e15669c677b8771a97c2c6cb99a WHIRLPOOL 269e6c541a9f5474fe33946c6ef75cf01ff2b2545fa28ec50ee29a00a74e6de5294db01dc598dc2c7179e96a3ff5f3f4c91f14bb1eb17f4af5d0d21b176860d3
+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 1192 SHA256 5575d201728fb0fa626c147c1bd374be2943bde0778026995e9f4ccb0b27955e SHA512 2ea4972e162b68b47984e438a52e3602893794d0f4147420f1635b5c2d848e55b6261eb03778536c1363e8570bb96b55d788576f84f7ecfec2969b81d1fc3cba WHIRLPOOL dbdaf2c5ad3c4be845210d41fb3b19b0e58fb3be9e8faae7539ad9e10bb67d1a41ee1d3948db3f41eb7b634c6204f0a0a3fbf05824fe98732334700b5b16d191
+AUX eblits/src_test.eblit 790 SHA256 48b0f5ef0e91258148355f4d2d6be01a5d6c6704cc0cfbe956aa58e1b9171edc SHA512 8435ab9bbf64457be596e58a7fed5775f7b9062eccf36d39c894aa45b96f0aff5d46c58fc53f7bdf9fe828238ade69d49a3fa7e7cc027b0fa0f1e126b33e6779 WHIRLPOOL 030dd714da4a1ea08b743b32c668d38531deff4bf1cb0e5751a8cf32b329e1df50299cb789f59f9d4f06805051800e761ea0ef5add72005e3e8d47452b3f1201
 AUX eblits/src_unpack.eblit 3209 SHA256 82b23ecfe2fc3b7e93545af4b67e2525e1ee3c9f2d4eac3af435cf44e8254da4 SHA512 4f9cb34be2869864c0f814141bf1b6504b4138c3c672dd1fef9c5ad448c6fabab98445551cb364035978898c9e7829168ef702b068b4dadf325cf925c70ab42f WHIRLPOOL bdcf238477e6148dcdb8371eee40cb8ee920e039848e1088923922e615529fea70089fb5f1094630269d3a876c4752f41d0433b2948f5b5283a532938c9858df
 AUX nscd 1621 SHA256 6165db3a2fcb251d4f3655c0461e018ce9c92a37f7f22a8fd2b75178b5435bc8 SHA512 3e1255ab014b3806112120000c3d2189a7c1c69dcd6639d5ce55e96bec721683a22b141982f6a6c6d44b14481c33fbbaa470863bef04e9b9eab7ccad1ddd5d95 WHIRLPOOL b7152f8d888fca13a16ea403c44eadbf1da2249dae3add11f73999259061824460a5479aa7e58c012bd737b62ecc81814109832cee33638279d90d4c08bfdbdc
 AUX nscd.service 337 SHA256 de7bc9946309d34f0ab44aa22a4d3cf259fe91c57e8000d741cb09ecd3a6caa0 SHA512 2001100f3b054843c69b6fd2d38852c7c824282aa8998c25a3c0352db993705429d25c70d8ce6cb3579f836b7089644c520acac423ebd69cb1b36e94a77c5bea WHIRLPOOL f01d191971b0dc45f541c9ebaaa1a40f3497e2cc838cff6a20a7b1828d726c248abbd94322a5a5ff30c33ddb7d9086cd4d2ba3bdc1811fed59ff292ef3983a72
@@ -100,23 +100,23 @@ EBUILD glibc-2.19.ebuild 6912 SHA256 3a11e60bed77cc2dad678ad97ed7a959a59a91a94ca
 EBUILD glibc-2.20.ebuild 6154 SHA256 7dea0ee804ebe1a6268155c519b85b9f265a964d570f68490a3035467f928f98 SHA512 11a594c74fec00b919ec98ece7d82ef8404280913b2f3047c0076c822234f99f8a9e67cdf1384ee4b52bcc25a381bf5706a85204adda90b0d914035db4338865 WHIRLPOOL 5f2cb7a927f6d317fe4cec4482a56b95c1464e6f46e810c9c5c02b06fc10aa51a3c2cec217bf6c339f18b7e30c296b72d8ab7fa85570bbe8bd49aec16b6b5720
 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 70166 SHA256 05b6bfc2a13c978482b2e31b8193e814f8a30f11a27b3267512ef40824928c66 SHA512 9dbcf6d27b2c2d5994c82ded9a8a6980c40b0f2d69c57421e91426966cfffd03d7d6bce098d828ab81952517b0fcbff8dc337559791fa63f259701ff1367034a WHIRLPOOL e625edd392e5d2ce9adaef48ca94e6a4f3b093be3332782bf3efdb8cdd41646ca9d659cfb8c7e8fd5c74b7e66239574750632e2b17c970e198fedc792354776d
+MISC ChangeLog 70382 SHA256 c1d5546015ea28ab04672c173e297a54d95ec49964b270a54602ba3ddea8d245 SHA512 7a83a86400f24a03061095dfa5a220a40358eef5142b8c99c385d453e7116e291d64e8d98836214a2d31d52db0b36f32392918ad07cfe5d1723708ebddc4aeac WHIRLPOOL 45c31d412b49e093ce8e1ae0b584bf03ecc80065f89509e898c7d39e99bae272ecfc2ee8403061a12e8804e50bcb7f54a947e1c66e6ac954739818fcbc5427fd
 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
 
-iQIcBAEBCAAGBQJUEAjgAAoJEPGu1DbS6WIArF4P/i0Vw1ikoMjcX14BAi36EMat
-Q+Gr0DYpy3SwhfCREz55fqVNXgr+WEllwBpzjRYUFkDNJJdSYPJpCYF7B3sb3+VV
-g6Kii33Xl15k5JCP5WlvzU1IE1RjjtKHwhovUl4ATq/XI0QhnSiW2iZvQEfcMIdm
-NFAk7Orj6uSTkgdyxpIJ9FB0E+6c/zL8xJ951pwJmWD/PQLJy8ESGizhJ/DJY314
-Madq1IsqjZ0cewG0Ob7N8YBEQublRsg4TM8oOSRqG/Z2agZ0fa4+733JJvMwjSN9
-GGyyNtS4EGn+EjAGP0MTG/Mxyizs530Hzrlj4enYejJ2I64nfrl/LNbd+KfBTDzF
-heaAYC1GkwUv9/sMdyogaWoA+n6/OxJiaqcWbsp1OrwEhuj/CnvhCTp414CjY1C/
-WqtAjTLPsqkuC5JazylexJAc/U+lzQSwV/0R782uZNljxw5pbGiDQAE6nO76pxL3
-I8Ln9CNdyfj6Ok0ALwGzDZ2PzVJbg1S1yZQgC8OJJaqqjcoSq7zjTIfgMIhYiWj/
-iUyKNM3Gfuy3Qul6sbcf3S+le9JJNTD5/F+d2Rb2N1eG38iT7OHSwHPm6vhJ8GFZ
-c5apYhkakAVLY8YzunV9Nh19jOIIxZxFIvF5IXRi2FlZM8p39CADKDTWOYkOBpC1
-aZ2/yzOxbBEI4ltTe8/h
-=rnTf
+iQIcBAEBCAAGBQJUEJVfAAoJEPGu1DbS6WIARnYP/2GYVViRfcfz7qFDq3hEsDG7
+r4ZFAWGg4fpFHi5BofnBbFlD4WuIEYnwFij0XAD7AQZysFUmhOJXtiZ94RSUt2zE
+dvQJQ+pOvVuz4/Kk9lJzdm/alGmTP1Emvvsr9yhWNXPocv87eCSPt+/ctcsVYQ6x
+4pV5XwawDnwQLEgVH9LxTnmgfw3B8a5bdw0uk93qoYzyS6eTyzhY8ALlcVoskVAL
+0PYC3Ve3w+ZwMISIVGWkxuwX6SXyLe2w289KsxtKwgoR+3FK9D2MEn0l/xD6v19d
+ikbtS6FRyTWWAaLHWSdDhUoiFE9EY7KAplzcLOANvAqo71ssW24euYcpw/1lPsdh
+34HvIr2iZImRK0/VysHTYAx6XI1zyT0SHDJehxZC6KJnTenlUGq3AaRlsBf8GvU7
+fbQCwE0bAQY2KdbPzQ6FFqCol8rU5qlWBfgMeeJCrvfpDrUTx+rR7xoG5pieIm/i
+cQxUu9uKGbvOT0qKb8yXbd9ieTdM03ef/b6o9sJo4gvsRXcuoobiM3zJKNAkx+xX
+VE0/84LEG/MMdce54U6intlmRXGqzzX6laEMDYXXguk3NpOYettFJ8TQuNX+Duve
+5CXXHdEVKzQuDaqlgafL0o5ONroZDuXoAZWa4DOgUTp1pzx60IzHmv1oHz/Te8JZ
+3LbHMepdsOirRIj0/sRN
+=qN1i
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/files/eblits/common.eblit b/sys-libs/glibc/files/eblits/common.eblit
index 43c0f3bdfbb3..2b0c1c96f952 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.39 2014/08/21 14:41:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.40 2014/09/10 18:15:55 vapier Exp $
 
 alt_prefix() {
 	is_crosscompile && echo /usr/${CTARGET}
@@ -302,6 +302,28 @@ setup_env() {
 	export __GLIBC_CC CC="${__GLIBC_CC} ${!VAR}"
 }
 
+foreach_abi() {
+	setup_env
+
+	local ret=0
+	local abilist=""
+	if has_multilib_profile ; then
+		abilist=$(get_install_abis)
+	elif is_crosscompile || tc-is-cross-compiler ; then
+		abilist=${DEFAULT_ABI}
+	fi
+	evar_push ABI
+	export ABI
+	for ABI in ${abilist:-default} ; do
+		setup_env
+		einfo "Running $1 for ABI ${ABI}"
+		$1
+		: $(( ret |= $? ))
+	done
+	evar_pop
+	return ${ret}
+}
+
 just_headers() {
 	is_crosscompile && use crosscompile_opts_headers-only
 }
diff --git a/sys-libs/glibc/files/eblits/src_compile.eblit b/sys-libs/glibc/files/eblits/src_compile.eblit
index ae3673f02723..83e526eba0be 100644
--- a/sys-libs/glibc/files/eblits/src_compile.eblit
+++ b/sys-libs/glibc/files/eblits/src_compile.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_compile.eblit,v 1.43 2014/09/10 07:46:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit,v 1.44 2014/09/10 18:15:55 vapier Exp $
 
 dump_toolchain_settings() {
 	echo
@@ -250,27 +250,5 @@ eblit-glibc-src_compile() {
 			libc_cv_forced_unwind=yes
 	fi
 
-	setup_env
-
-	if [[ -z ${OABI} ]] ; then
-		local abilist=""
-		if has_multilib_profile ; then
-			abilist=$(get_install_abis)
-		elif is_crosscompile || tc-is-cross-compiler ; then
-			abilist=${DEFAULT_ABI}
-		fi
-		einfo "Building glibc for ABIs: ${abilist}"
-		if [[ -n ${abilist} ]] ; then
-			OABI=${ABI}
-			for ABI in ${abilist} ; do
-				export ABI
-				src_compile
-			done
-			ABI=${OABI}
-			unset OABI
-			return 0
-		fi
-	fi
-
-	toolchain-glibc_src_compile
+	foreach_abi toolchain-glibc_src_compile
 }
diff --git a/sys-libs/glibc/files/eblits/src_install.eblit b/sys-libs/glibc/files/eblits/src_install.eblit
index 5971681d56cd..8030d935a67a 100644
--- a/sys-libs/glibc/files/eblits/src_install.eblit
+++ b/sys-libs/glibc/files/eblits/src_install.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_install.eblit,v 1.37 2014/09/10 08:16:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v 1.38 2014/09/10 18:15:55 vapier Exp $
 
 toolchain-glibc_src_install() {
 	local builddir=$(builddir $(want_linuxthreads && echo linuxthreads || echo nptl))
@@ -239,29 +239,6 @@ eblit-glibc-src_install() {
 		return
 	fi
 
-	setup_env
-
-	if [[ -z ${OABI} ]] ; then
-		local abilist=""
-		if has_multilib_profile ; then
-			abilist=$(get_install_abis)
-			einfo "Installing multilib glibc for ABIs: ${abilist}"
-		elif is_crosscompile || tc-is-cross-compiler ; then
-			abilist=${DEFAULT_ABI}
-		fi
-		if [[ -n ${abilist} ]] ; then
-			OABI=${ABI}
-			for ABI in ${abilist} ; do
-				export ABI
-				eblit-glibc-src_install
-			done
-			ABI=${OABI}
-			unset OABI
-			src_strip
-			return 0
-		fi
-	fi
-
-	toolchain-glibc_src_install
-	[[ -z ${OABI} ]] && src_strip
+	foreach_abi toolchain-glibc_src_install
+	src_strip
 }
diff --git a/sys-libs/glibc/files/eblits/src_test.eblit b/sys-libs/glibc/files/eblits/src_test.eblit
index 088da439b13b..7d08b9395752 100644
--- a/sys-libs/glibc/files/eblits/src_test.eblit
+++ b/sys-libs/glibc/files/eblits/src_test.eblit
@@ -1,8 +1,8 @@
 # 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_test.eblit,v 1.7 2014/09/10 08:16:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_test.eblit,v 1.8 2014/09/10 18:15:55 vapier Exp $
 
-toolchain-glibc_src_test() {
+glibc_src_test() {
 	cd "$(builddir $1)"
 	emake -j1 check && return 0
 	einfo "make check failed - re-running with --keep-going to get the rest of the results"
@@ -11,45 +11,20 @@ toolchain-glibc_src_test() {
 	return 1
 }
 
-eblit-glibc-src_test() {
-	local ret=0
-
-	setup_env
-
-	_maybe_die() {
-		if [[ -n ${OABI} ]] ; then
-			return ${ret}
-		elif [[ ${ret} -ne 0 ]] ; then
-			die "tests failed"
-		fi
-	}
-
-	# give tests more time to complete
-	export TIMEOUTFACTOR=5
-
-	if [[ -z ${OABI} ]] && has_multilib_profile ; then
-		OABI=${ABI}
-		einfo "Testing multilib glibc for ABIs: $(get_install_abis)"
-		for ABI in $(get_install_abis) ; do
-			export ABI
-			einfo "   Testing ${ABI} glibc"
-			eblit-glibc-src_test
-			: $(( ret += $? ))
-		done
-		ABI=${OABI}
-		unset OABI
-
-		_maybe_die
-		return
-	fi
-
-	local t
+toolchain-glibc_src_test() {
+	local ret=0 t
 	for t in linuxthreads nptl ; do
 		if want_${t} ; then
-			toolchain-glibc_src_test ${t}
-			: $(( ret += $? ))
+			glibc_src_test ${t}
+			: $(( ret |= $? ))
 		fi
 	done
-	_maybe_die
-	return
+	return ${ret}
+}
+
+eblit-glibc-src_test() {
+	# Give tests more time to complete.
+	export TIMEOUTFACTOR=5
+
+	foreach_abi toolchain-glibc_src_test || die "tests failed"
 }