Move builddir logic into a single func to reduce duplication.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

1 files changed, 17 insertions, 17 deletions

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 2480fbc60ecf..8f3b59fcf114 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -21,12 +21,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 10218 SHA256 35de04dad692bd1df273a7d22ca0cb6e8a51b06138b3788d224375eb11afa181 SHA512 286d11bdf26ef43ed921192b8cdcad852a46f523aedd6ab765dfa4dfcda937f8914e349608d6061d196e86e8f20a53645e817c09af741964f5dccb0b9776a8e4 WHIRLPOOL 4c655adcc3dd6fc4c5a6e18ac93847783cbfaf415eb951ceba11930f8f644abc215db8ac4d2f56b9e08457c0d0eb8b866a4b8cb2ecdac919da9bc77083ce69ab
+AUX eblits/common.eblit 10280 SHA256 2294af7912518f2a28229a3baaac0c2faaf0577d408eade5f90efab0686f0b61 SHA512 dc9fb66ba7c0dad608901b7e31a27aacc041bf1e9c90ee956187a3092c8d0b02b80ab25966ea0aa7490d71d0139a5bf093ad1871b8ecccad6ef1b3201b4e8495 WHIRLPOOL 960090360cf2295b17563e463cee939bac42754bf549a140c69edcad178ac6faddf535783277402e52fa47d2043548a52ce88d061b7e6d5f45c73f059c844ad0
 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 7623 SHA256 cf74ee9ba70bbf3a5948a3d822188f0af6476fb3253947ec94f26e6759c454d5 SHA512 0450da146a2434356c1e8e2ea68f9e94ee3a4fcd720e2752e5aa3931dc108e72f1dda5f8695ff0a74c059927ce76a2ae4742e1046b0a9b2c035068b98b38741a WHIRLPOOL 8a2702cd7a464411edb593900699c18981613d639404a5cf45ce2b52299a21eca0ec54418e6b16e583914c374e6289fd8f0ea6513456c6addf454b3f6103d41d
-AUX eblits/src_install.eblit 8789 SHA256 e57c29e9b0f8fdbb70ecb0b6cdb0cc1d896802121092e004153343280cbdfa25 SHA512 7de015b93e170a14baaf6423e65923b36221ae97b1e5345692551f22557160a2d637a28083e8e673a2c7850073ac1506aa615cf490b59526f11e276abe175292 WHIRLPOOL 90e4d43d83aa074a4a1a078daf1c615e5f92bc4e6b24ca0232b82adea64ff17c4dce1efea728da7b3092deb6a1daf1979440c5eecbfd919ba1b2e75ffcd3c37e
+AUX eblits/src_compile.eblit 7575 SHA256 7646d0d0d1d27ab0e1c58352c5a4296d307e84e420166f6e037ed8efd740db66 SHA512 c14fa6696b05bdc69d298c5aaf34442a914c368b36bb2261b31d27f8762d98155fe08be00b2c9f40928dfeaabbaf8460ab427aaf83b6dda9b99da9d60a5b7a5e WHIRLPOOL 74ae31aea3fb064a5f3e4779cf83874b5111e0daab9d531c93d645eb8be28b499f6be1ff9b208248418f1ec32806cf187970474981c632f8e4e15e30cdfbec1a
+AUX eblits/src_install.eblit 8681 SHA256 278c35396d4fde96305e79cb8e8c6f46c45570b2649a4be535f76222b00b4b54 SHA512 9a159b3cfd91c95471e14559252306b8b59e25a8c3571f2835e9b83ffa05d39698e6c24027b9a0f5fc942ad420bc2cfd6495f63eccd3fa7b450f183c979eafd9 WHIRLPOOL 764955f64d16dbd3fdc20ddcc4c622c1c72b3ad96a94102990da61a095727ee28a3a0f7764c0ec0ea111da2a13ba471c4d50b21deb5e57356dd22425c0842281
 AUX eblits/src_test.eblit 1254 SHA256 d487b91ce19218829590ae9776420f8172f4cd0efd01ee0e19be3f744170dbc6 SHA512 6d889366b57b001472fb4c595bc7e4416ee30fdd58a20bbdc88edb63ceb0b79cce8db1bb9a54c6c14f6fc0711bcf20bec91d84706fff08892fff2ccdcb870854 WHIRLPOOL 73731e13688ba0573b72a562244b5ec95cdbff11e41a0b0810d6d70fdbfa06e18e9b7d5facb5f03c435da96c3216645df071d994a07522f357cf0465819a903a
 AUX eblits/src_unpack.eblit 5190 SHA256 e050bbd6e99f001fe518babe2ed70149a0be713f230e32823d1be03d718af9d5 SHA512 0a4961be52ebd4f5a88a2460085e6e98a13a19a85c344bba40a411b9c281fef58e635eca854a7d76bea5c6a9e07efb94e41603b46034f7a8c59e4807d0278956 WHIRLPOOL 9177c9f51cae2e21df5888cc694b3b65faac0c31dea1b0d2184368838ff929710dae1e3bad5834229c634659e2aab2bd59b08de8588807a2b5405641c35d5eff
 AUX nscd 1621 SHA256 6165db3a2fcb251d4f3655c0461e018ce9c92a37f7f22a8fd2b75178b5435bc8 SHA512 3e1255ab014b3806112120000c3d2189a7c1c69dcd6639d5ce55e96bec721683a22b141982f6a6c6d44b14481c33fbbaa470863bef04e9b9eab7ccad1ddd5d95 WHIRLPOOL b7152f8d888fca13a16ea403c44eadbf1da2249dae3add11f73999259061824460a5479aa7e58c012bd737b62ecc81814109832cee33638279d90d4c08bfdbdc
@@ -94,23 +94,23 @@ EBUILD glibc-2.19-r1.ebuild 6901 SHA256 9c8b212c815bb3d3f586a032a4146484c4718a6f
 EBUILD glibc-2.19.ebuild 6912 SHA256 3a11e60bed77cc2dad678ad97ed7a959a59a91a94ca28fd4d7d8776a6217a00f SHA512 70c9b91f224c276783b96ae60f57ac48886861fda71be6e6e292840b4c8cc0fea798005c26c6c33f198c63fb2c38bf78e994821dfa010086ba7ece443257b851 WHIRLPOOL 98be39cc52c7d8431e46f24f9552db63980f4a38c8e12aaffd4b08c7c66f8931a16fd7deb99e43a5bb330a42e6c1e722a9a8f74d1fe97523d7b4bfe75c9accf5
 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 68963 SHA256 7ab7ec4d844e4a4baef567ed9fa1540aa62d06b07e0375d27da04d76dba89f0f SHA512 22a61083edc6880cfcce6c52116a4f999df4a7698a25cabc38cf6856b113ea2ddc1db5d93ee328c9f19e7c48f76f56ac89877b55af0906268acfab01b972b594 WHIRLPOOL d3a9a06e92ee5f846492ffd7155fa257081113c8624c770f43f27341bde7d661b75224b116103afd7639253e9b76304b6b0237410dbb44e99de1e0863540c47b
+MISC ChangeLog 69171 SHA256 7f5ec8467f82962fab4fa1fc95924a63ca6e68c490fb24076738714427ef3d4d SHA512 c4e8e412cb2b7bef3659726eb27823b299e3c41e94ff9aa14e07ce1ac27051d8a015dd8420475482112cbe50c97d5bc7a1b2a9b1e5677c46e95d7911179c2bd3 WHIRLPOOL a1d837b59878ed63aeef0c46df14f3da0e7e95c7fc6404ce8879e90da3878bb773719117dc32014a21b95e113dd889d83b7b2efec2fed3835858fbc160528537
 MISC ChangeLog-2007 108548 SHA256 d622be202eb0d61a363b0ae4065012cd1d494fefaa0c03d4aa7986177cdde6d0 SHA512 fdb3f311a3be4b97a6acfceb1763af5ea69e74d8195522c5d03307f75e15a9382991e9e29dbfdec79e74f1c36328f82648768749bc929e5050ff64b628c7ca98 WHIRLPOOL e550f354394569069e000a7e70ec69c94388a0f415c19b427203f0dcbcbeeec0f5e379ee2af7886cd2d68559e749fab8122e7e077985729d7e0e728ae9096d7a
 MISC metadata.xml 596 SHA256 b01caf6893890849a5aef5350b9b8528edb49554ea35b689ae778d475d4a84be SHA512 2ea5bd979d036f6844df11b8e1ee8bd90b61cf66fccf988a5a53e8777710b9e7aa137cf79c8e2f840986805220d1c19ac2b1c83778a5b1bb2b0976b2354768f4 WHIRLPOOL 6cadab521e9b1ef68f9b5f827fcd123e13a58291dd6a958b17193d9e6ac44aae4f73d09f4b1dbc4a9b81612073da6361e50bb1ba9733418ce008f6191e5a0f39
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT9f1sAAoJEPGu1DbS6WIAxlsP/jJpi3h3LDTogumZe+L514lr
-2Ql1u/clnpSZAkesRQL2LcE8j4CB8X+qnIIC3jBuMf2xJOtiQbbLKwCuHilWzpRI
-eQcA6ZS8492+6/kzJS1JK61Ov129WHhrW01Q/pMP1vhw5vOKfICCmIYSIdvs9pOO
-fr2RsvgGoPS+2R5RonjVeYqRA9srJrGcteQeafQjWwHSZx4G6xf2GJ5QlaK7LTOJ
-WUIBapPde8s7NT5aK99pS8PdQi0HpkuRkS5iecEjiJfMrCnv0ukQOccguyQ2o67I
-z2w38f6cAdhc3LtvbqTI6emGp9qwz1QIZRqbEDKzw/Gujhg01CCMinU9NjVjg6Ow
-gNgL+4TZtyQB0AiAR0IvO34WPin6JeoQStdgT4JehkLH2dWt0GrTJNHBFEDgu5O7
-gj1TzwPTWBMYx6B9hswgbs677ui324e1QU6wDJDT28AJCrOLKLJy+32PVZEbNbpm
-M+lf1qg0hrB7rzcCaNC8e/20j38Gf7MA5Yj9tOFhEEWY8VzaW1Cp1XnunA+t/Q6+
-unJ/gekDvGrt5Rkj/bT6+hBd2dmdp9MGPdjE6qojlRLxfNTZ2aXs4xxHURklYeUb
-FtZmKFpm4+bgGjSSCyYZN8/Ve8brV855Rx4Bpi5Qo+2hXFAaMMqf1GVkpuaNatKu
-Kvd5QwFSV/WX2JCTBF3O
-=vlb2
+iQIcBAEBCAAGBQJT9gUnAAoJEPGu1DbS6WIAas0P/iVkQqFRWVwPzbnIKvnvm26p
+Aby1iyLM/YPzyJ80xo2+uETA98NpGfdI4/+E8jbdlbYzrLGAHe1mf8apmodtWYss
+bDwr5tLw1nKtNVrdtgMMBnD8ih3CRAzK+g1s5cmpw46qpK1pCMXtaksMCRpjCpCM
+f6kXXPGPLqgPJ4ISqbIhqbFhz5JDbsKszLKbEDL8O7yEDxJlVI8NeJjAkf2aIKCj
+gL0Gn/e4fnG/kyTV3oOkFaI2aQQRk5F+97J7ITzr5ugmtYex7TqamtPJBnISNMiG
+O9tW/d7hvsA0SBNrBYfZgm8IBWzl+k5aqLFy72bBsU7KvmqHGi467OGoXjLzHotc
+fNwr8fyVhnpWXXDipwQ42MBK10uE1dljd4nA9/mOU+0hzWDFp1ZJLbqGTuL16SVC
+9k6Hqnn8GSPdEWvyn1g9voTOARUPtzcCd246Oy6WgVz17YnxgnJwaqTKK+wTrCxk
+Nra0PIdR2R3DH0wY4GVqQuRHVaU70ehufpcfFBPipAMX0gwqDPJH/WS2i4YCgZqm
+xaHlTNVzPTPNB/haa4ZfIs8acQGwD816Kwb96uPZHNXt1n+GyjB16IRWDOaAITXs
+pCL1WKud7ET0cz+p9LLzMNgdxZqeTVeJkikqGKNIASij/C1RnZqXfaZhowigfWKt
+j10oDxZtfniGXN2PAwSp
+=qr15
 -----END PGP SIGNATURE-----