Sync git-2 updates between all versions, and merge KEYWORDS code paths.

(Portage version: 2.2.0_alpha107_p3/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)

1 files changed, 23 insertions, 13 deletions

diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 84171f399ca6..af128ae459eb 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -19,20 +19,30 @@ DIST util-linux-2.20.1.tar.bz2 4614302 RMD160 4ab3435dbd8b83a0c353301b6e0f89a91a
 DIST util-linux-2.20.tar.bz2 4615091 RMD160 c293bee7d9b6b03c0f3981c2020de1471d37b560 SHA1 e8cd2c8e968cdbdc097d82cceaf15d536e0254c1 SHA256 c1cffbf5a1a7a32965f2e8e9ce76336310031e10b87c418d0679075724271d4c
 DIST util-linux-2.21.1.tar.xz 2975120 RMD160 877752a63a0eae362d439b04db06a7be726469ae SHA1 49e130a456516e15c6bb0238f370f2125ad1cfe2 SHA256 6ffaffb46bfb1aa403f83f0c8d2700e5ec35ffcb35a0573adb10404ed16c9004
 DIST util-linux-2.21.tar.xz 2954504 RMD160 0e0a5b16ef13fb2e0f238e1332dc31e14e358ea6 SHA1 0ee465519bbe6aad3a22f83bf92221e85c4e2e51 SHA256 5192e8ba7dcf3cf0dc447f07b3d177f6cb3fb49dfae54ac45d6c8c7d86eeab0f
-EBUILD util-linux-2.19.1-r1.ebuild 3558 RMD160 b6024990e9501090a22fa40548aa70e54a061bfa SHA1 966efb8292b03a9a4280941587f7d2b8a90c9b5e SHA256 c1993f3f5e30ea1d30c9331f21e040dac54fd470789a7b059b91488ab54e7f8d
-EBUILD util-linux-2.20-r1.ebuild 3639 RMD160 8dad7cbdd3c818084c42cbbe49a37fbf179a6d41 SHA1 a5046f99c84b287513ff0a21ede079f809b444a5 SHA256 bcc4068e636e22caf5ed3b2736a4925b91f692afdb93bf5f241833b97f6adfe1
-EBUILD util-linux-2.20.1-r1.ebuild 3620 RMD160 b1bc87f5d9c8c4511f04e4bcde1ab7bc98415be0 SHA1 67d129374f3662e4a0e9dc9823430535e26ad6a5 SHA256 002cb9143538c0baf53d3375f41ab8a5fb912784e8f50343ea5d47610b368f8a
-EBUILD util-linux-2.20.1-r2.ebuild 3751 RMD160 1bcb990d8421da73ba03af0e99877d77ea3eb441 SHA1 2ee0bf14f974a613528a7d0035f32cbb715f187c SHA256 f1216450a8275cca660430b02c2c38b63ea34e1e9b92466dc6710fb5d34f92c6
-EBUILD util-linux-2.20.1.ebuild 3547 RMD160 4a1bbfca3a9ef92434a97c67f60a713169b65f8b SHA1 f4dda0c5897a41db10cd99cf05d21c398ec04d94 SHA256 e243573ddec8195c5ce78caba20995751e51fa50cf73166064937bb5456d1e63
-EBUILD util-linux-2.21.1.ebuild 3538 RMD160 1b7529e9c34fdf70dbfcf5312c344f64a4d26e6e SHA1 92165ce00df5034a80c1808e7e4d53ffe04581dd SHA256 59f29efbede30f176e03b62965cb178bb9612406ba6a0e3e38242d737f42fe4f
-EBUILD util-linux-2.21.ebuild 3608 RMD160 8f40b519ec0a7bc5d95d00f71dc7042d99614947 SHA1 fa91be772698974568e3a7d9ec7ff873c9f829c2 SHA256 aec386a2c0a8acf1e5ed3ebb2de308bcb384d8df58c0971c431880fd8aa37225
-EBUILD util-linux-9999.ebuild 3340 RMD160 874e76030a36f8d574ea4ae1078bd9854d417665 SHA1 acfadc52030822ac78311d1d29009609fffbde84 SHA256 ffef8ca212e7cfadea498bcd0e69949b41861cd399dbcaadecbdd20e7b851d38
-MISC ChangeLog 59168 RMD160 6305e9d7af2b7069de2876feb0086926e58e80ca SHA1 6e40a68543b60757724ba50545bf0817dbb52c64 SHA256 93d5ac5fb6c6854bd66a6630ea81aa6c5f3a283d909d32cac4dc13b4adc01f15
+EBUILD util-linux-2.19.1-r1.ebuild 3576 RMD160 f956145c03b7150f178ba9b6ab9976d11ed7554b SHA1 e17be1b8ececc4d7c24330652d9fd70ac956891a SHA256 3c2a9ac9cb13d9c482dee747b30807adedce7b3190352ac541b59ddfd3409913
+EBUILD util-linux-2.20-r1.ebuild 3660 RMD160 f96e1330ee8f7576e1915bfe7b397c8e8f6b357d SHA1 f3966b016ead3842657d042ae2f41c07206b7fdd SHA256 dde41b4f74295112027ce2fd633e41b4b22f310ba4f4052d9b980e810853a354
+EBUILD util-linux-2.20.1-r1.ebuild 3638 RMD160 2b53da69e9ba138021459011720ca26f3cb63e36 SHA1 52b81f9b6202fa9a5878159870d35ae49836f66c SHA256 e32cc2840620cbea4a938e1ae59c472e9340ed1c61ee4aaab79a638c1fee6aa8
+EBUILD util-linux-2.20.1-r2.ebuild 3769 RMD160 7b1fdaaa88ca8b68dc1076ac33fbea6a83324147 SHA1 2a7593a87c6488eff87357be07e49afc17e35b06 SHA256 1654ce32516a7445f8753543a6183c6d10996bb8da27023a6d68a3ed1dc8480e
+EBUILD util-linux-2.20.1.ebuild 3568 RMD160 66d7c2256b856b80a5e7ee40b5d8ad826ed26d69 SHA1 813811ca633ec87f004352af6dbe860c43498279 SHA256 7d05102c92b2a29f9244bf329e57476bd27d657fe63a499b4d0b78e88c53744a
+EBUILD util-linux-2.21.1.ebuild 3554 RMD160 4209678e82f723e9d8f8aca8200e67b7a5ffc518 SHA1 3088f2bb8d36793e734a8a5d78586eda5cb3a65b SHA256 0c8bfb3d96c931d75d6334b628a494ceff213e1a5c2bb0776d281a7151ce18a1
+EBUILD util-linux-2.21.ebuild 3624 RMD160 831a86c7a6ebfa911ebf6b802f6c9fb36e3ece00 SHA1 c3f2ca9bb654fc3d0625d4e57ae5a623a4e27854 SHA256 3a037c6f463a83352cc4582b997141ba48d584fc1f640ec6e2a7f9d0c06acb19
+EBUILD util-linux-9999.ebuild 3356 RMD160 faa3e55b62e84ad0111dde729c566167e850e78b SHA1 309af3510ab1d0dba3159eeea16b74318c045067 SHA256 e5bbb2a53a5ce26d0b51c58b590aaf661731d9a104e9aa0ab32d760213fd2bd4
+MISC ChangeLog 59512 RMD160 0366c48af3287d0929abb894d54f3d20f3ac4de1 SHA1 62a9d88254c1b6c48cff1f470716ecf4fd9410bc SHA256 f023d2e4aa86644bd71b5c339ae4c71bec34ce6ca829cd42025993afbfd8e911
 MISC metadata.xml 581 RMD160 0177cde9a7c9906f5d14fbefec5d689b0271a95e SHA1 9275f30ed4bc6a340dfa3b5d88e1ab1715e23a42 SHA256 869450d739d36b4731860f8fa357276b3f9f30be37cbecd1aec0048f667d643f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+uiDwACgkQuQc30/atMkDBxwCeOq315/0LIbe/QBOtTg5Py34d
-ResAn2r+uz40s60mUEme9Z7t4Ed1La5p
-=12zO
+iQIcBAEBAgAGBQJPvaLMAAoJELEHsLL7fEFWmS8P/3I8BHoyM33GFR4/pjqkF7W+
+Czdefh86sNNyNPq3eDg2XoUUX0oIyA90CRPCOGFFIdBCllMa+cGYqKF5FqYG4zfq
+xheXcXM30pv4E7TG0jjzFV8X8IEp/8lVVLoE/Pnw/290jxUrOZuAYoz+hLbxOXdk
+ELCIcTJFf8yLSh8Tdrp+vlOJvq0XSK6EYK4VzgC/Rah8PGqvvyob4ZdqBJyNmMgA
+38TP5tc5F130XQB0dTe7M9j1OLzT1+eRHlNr2ZOkIlfaJnCoG9r+vQQDSOm7IZ+I
+4JoVORINoKaDElWAIH59WjQ0epH+scZUvlkyvlF5BkU/PzBH8+rAz2MNihgm3GT1
+gxRZ6xMOL+6SfBuaZWKHgCuQe71ThBmzlzkYbb4f+2XJeiRTKDcl5ToyplXnULP8
+qhuHkKNtJrF2GIatj1EypQ5vlqfHHJ1LgbvdMq0ZtII9W+b4gtmgGuTgD3Qpzh3y
+uiPfQ72QwP+dRGy5AT1OVD5Va7/fqLJHSkDW3ohiV1RlXn+LMDE6nAubgD+7hto2
+cH8Yyv/rS7VGmIn7YaHCiEtfeV6DZdKsFMzOtv6ohbjV2HXgKW+kT42rlMweGrMk
+OqgrFH7APZkRW9ovBt3Y+Q/78fU6/ktEIAhNeHP+17CjeM1+yW7KLLWJ1+gli6Tu
+O53vPGvMDNKbS3pHbhb8
+=hzSx
 -----END PGP SIGNATURE-----