Convert src_{install,test} fully over to `builddir`.

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

4 files changed, 27 insertions, 30 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index cff05a905865..e9af381e0b68 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,10 @@
 # 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.1017 2014/09/10 07:46:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.1018 2014/09/10 08:16:30 vapier Exp $
+
+  10 Sep 2014; Mike Frysinger <vapier@gentoo.org>
+  files/eblits/src_install.eblit, files/eblits/src_test.eblit:
+  Convert src_{install,test} fully over to `builddir`.
 
   10 Sep 2014; Mike Frysinger <vapier@gentoo.org>
   files/eblits/src_compile.eblit:
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 371709fcdba0..2d2619ef6b06 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -28,9 +28,9 @@ AUX eblits/pkg_postinst.eblit 1081 SHA256 21c349d6999841b277dd00ed6f2bf4b33d1472
 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 8681 SHA256 278c35396d4fde96305e79cb8e8c6f46c45570b2649a4be535f76222b00b4b54 SHA512 9a159b3cfd91c95471e14559252306b8b59e25a8c3571f2835e9b83ffa05d39698e6c24027b9a0f5fc942ad420bc2cfd6495f63eccd3fa7b450f183c979eafd9 WHIRLPOOL 764955f64d16dbd3fdc20ddcc4c622c1c72b3ad96a94102990da61a095727ee28a3a0f7764c0ec0ea111da2a13ba471c4d50b21deb5e57356dd22425c0842281
+AUX eblits/src_install.eblit 8393 SHA256 3988ef0b3397f58f73208bf5dcdc9d4dbf830f0b14abb788f75f0372596a8478 SHA512 f0f102fe0c02008e5c259d66118ba7448481d65c5143157239e4294c3333a0d4f115bd61023e2c5bede27a31ef4537aec496b52ea5c5e89313ed0f6c50918c3c WHIRLPOOL fd864fd93456060819c3a116b8e3dff218284398d209bf92937c4d85e5c1c1796e50f650692c7578d7b66b180008030e1b163928c085f61e22fa2637b7648831
 AUX eblits/src_prepare.eblit 2344 SHA256 7898682539bc85f126e491bc9c9a727cc5d922680f91dd409aec50c068ca93aa SHA512 30d706f26475db2dfe8cfaaa003c3a21988328ba0cc7cdca439d248c968430308d8d0afefa60302315d4c76011e4de51925307ee19d15eba10e24f1ede2b956f WHIRLPOOL 3a5ad0de18649805d97b0d78ea33e52608e7b6694ac567313db9e09da18a0bca9b95a027fe0181b50738b5bfe83ac49254d29b077cef36fb311a9707683261b5
-AUX eblits/src_test.eblit 1254 SHA256 d487b91ce19218829590ae9776420f8172f4cd0efd01ee0e19be3f744170dbc6 SHA512 6d889366b57b001472fb4c595bc7e4416ee30fdd58a20bbdc88edb63ceb0b79cce8db1bb9a54c6c14f6fc0711bcf20bec91d84706fff08892fff2ccdcb870854 WHIRLPOOL 73731e13688ba0573b72a562244b5ec95cdbff11e41a0b0810d6d70fdbfa06e18e9b7d5facb5f03c435da96c3216645df071d994a07522f357cf0465819a903a
+AUX eblits/src_test.eblit 1192 SHA256 5575d201728fb0fa626c147c1bd374be2943bde0778026995e9f4ccb0b27955e SHA512 2ea4972e162b68b47984e438a52e3602893794d0f4147420f1635b5c2d848e55b6261eb03778536c1363e8570bb96b55d788576f84f7ecfec2969b81d1fc3cba WHIRLPOOL dbdaf2c5ad3c4be845210d41fb3b19b0e58fb3be9e8faae7539ad9e10bb67d1a41ee1d3948db3f41eb7b634c6204f0a0a3fbf05824fe98732334700b5b16d191
 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 69997 SHA256 018739bae8518d2f504fbc327de641d7757849541a5b43ac76641efa55e67250 SHA512 09fa95e8ff9956327b170bde7c6e5c47f190e7179cb4750700a028d4b07cad5a6142a81ac50160d4a562b9ada219ff075866c4e26b81f578a96b38e886074837 WHIRLPOOL 928603ac81257944ceae9b0ac6416326c8a3bd012a731acc2e586e1988eab6a4b06228eec802a94543b74454ce4fa8a1d7cc30cc25302a13e3de213e93eeb55c
+MISC ChangeLog 70166 SHA256 05b6bfc2a13c978482b2e31b8193e814f8a30f11a27b3267512ef40824928c66 SHA512 9dbcf6d27b2c2d5994c82ded9a8a6980c40b0f2d69c57421e91426966cfffd03d7d6bce098d828ab81952517b0fcbff8dc337559791fa63f259701ff1367034a WHIRLPOOL e625edd392e5d2ce9adaef48ca94e6a4f3b093be3332782bf3efdb8cdd41646ca9d659cfb8c7e8fd5c74b7e66239574750632e2b17c970e198fedc792354776d
 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
 
-iQIcBAEBCAAGBQJUEAHkAAoJEPGu1DbS6WIA/G8P/1hKjveQnegdlwPDgJfgmACb
-f8o2kavP/Mbj1afrML+EIv8zyRd0h4l7hdehC3A2oL+WbM8bTyMMQDawurzqciFs
-k/WbtEktvA234BCHEtebstNPOtM0ZgQElyqFD+jlZlRl30m8rmu2e4TDAij1g8xT
-TQ+tukXRGtViNkSufcYTL2efpc47/MXXZxqZ6QI9PGmn1XNMB3vD71llvuZ6/aMn
-SydN2OL/sAKuNgnfhi2Vfb1IkEyllWNt42bIx3Fxx95hIFiPG0hnQpNzHThpCLud
-dF7HqDu4rOjVOVGrj7WqYjL5oV2ORbEgryIGEQUhi7Yq1e/Gg0BaPSZNz5O2fBd7
-dcuuP6/+ud0+oGe7KhMR0nvhH7iCMErlzAtGga9/npPkmumTO1tKx61NoDQewP/N
-JU4IKWhMdZxmgGDfgfaeC5cyHCQ1ldrHINcdWTAuAM6ncS1NIOEerCIoWLoUpBko
-sPZZvCQnwB9ra4/ByNJHea4ung0PkxQBCDGc5UyIZMJtiWeZdvk/hVhQgvMrioxq
-YsUxc7SwwVmj1A/RMMAIVxgD9Ivueqb3z1QSeLSS9t3mu9W4c0HLjgR9Fa3q2j4p
-C7zMHR6JpbchgmY4bZOvH90CDmihW9yZ0BpZpwhIVjgknIBCK89yHnVLc7zPSdb+
-Yz6NoJi+FvFz/jB8j97J
-=Yuro
+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
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/files/eblits/src_install.eblit b/sys-libs/glibc/files/eblits/src_install.eblit
index f667e6e32925..5971681d56cd 100644
--- a/sys-libs/glibc/files/eblits/src_install.eblit
+++ b/sys-libs/glibc/files/eblits/src_install.eblit
@@ -1,23 +1,16 @@
 # 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.36 2014/08/21 14:41:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v 1.37 2014/09/10 08:16:30 vapier Exp $
 
 toolchain-glibc_src_install() {
 	local builddir=$(builddir $(want_linuxthreads && echo linuxthreads || echo nptl))
+	cd "${builddir}"
 
-	local install_root="${D}$(alt_prefix)"
-	if want_linuxthreads ; then
-		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-linuxthreads
-		einfo "Installing GLIBC ${ABI} with linuxthreads ..."
-	else
-		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl
-		einfo "Installing GLIBC ${ABI} with NPTL ..."
-	fi
-	emake install_root="${install_root}" install || die
+	emake install_root="${D}$(alt_prefix)" install || die
 
 	if want_linuxthreads && want_nptl ; then
 		einfo "Installing NPTL to $(alt_libdir)/tls/..."
-		cd "${WORKDIR}"/build-${ABI}-${CTARGET}-nptl
+		cd "$(builddir nptl)"
 		dodir $(alt_libdir)/tls $(alt_usrlibdir)/nptl
 
 		local l src_lib
diff --git a/sys-libs/glibc/files/eblits/src_test.eblit b/sys-libs/glibc/files/eblits/src_test.eblit
index c1441aad98b4..088da439b13b 100644
--- a/sys-libs/glibc/files/eblits/src_test.eblit
+++ b/sys-libs/glibc/files/eblits/src_test.eblit
@@ -1,9 +1,9 @@
 # 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.6 2014/08/21 14:08:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_test.eblit,v 1.7 2014/09/10 08:16:30 vapier Exp $
 
 toolchain-glibc_src_test() {
-	cd "${WORKDIR}"/build-${ABI}-${CTARGET}-$1 || die "cd build-${ABI}-${CTARGET}-$1"
+	cd "$(builddir $1)"
 	emake -j1 check && return 0
 	einfo "make check failed - re-running with --keep-going to get the rest of the results"
 	emake -j1 -k check