Fix up building with NLS disabled #191111 by Jason S. and fix locale dir setting #190895 by Benno Schulenberg.

(Portage version: 2.1.3.7)
 (Signed Manifest commit)

1 files changed, 18 insertions, 14 deletions

diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 16d8b695c521..b2d77bd93b5c 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -145,6 +145,10 @@ AUX util-linux-2.12r-umount-nosysfs.patch 432 RMD160 cfb2ac318ac2d821d30b1c4d065
 MD5 2ac8d002e13e5fa925551bb42798c363 files/util-linux-2.12r-umount-nosysfs.patch 432
 RMD160 cfb2ac318ac2d821d30b1c4d065d1d361845034a files/util-linux-2.12r-umount-nosysfs.patch 432
 SHA256 d7b3c5f7268e6ecb086bfb188f01f544099079ed9b4ca0f8d87e97269cb91976 files/util-linux-2.12r-umount-nosysfs.patch 432
+AUX util-linux-2.13-locale.patch 3028 RMD160 243732d4e353932908837a3b354e4b7486ed052f SHA1 0f1aec83d55d48112d4a9e954a3c64632e0cd9f3 SHA256 0de4bf7f4d9ae84f42ca656ccaadf814ff5f72325bcc3e687e7dbc7a5034a06f
+MD5 2bc51f870c2b167290521010a077b797 files/util-linux-2.13-locale.patch 3028
+RMD160 243732d4e353932908837a3b354e4b7486ed052f files/util-linux-2.13-locale.patch 3028
+SHA256 0de4bf7f4d9ae84f42ca656ccaadf814ff5f72325bcc3e687e7dbc7a5034a06f files/util-linux-2.13-locale.patch 3028
 AUX util-linux-no-kill.patch 642 RMD160 cb9bef851804fbcd9a0910cb39123f65f72bbdc5 SHA1 7152a9596d9f81fcb6b2ac867d5ce1ad679ebee7 SHA256 c72803b0918589dbd409e22368853330bc84d875c91936fc5e899686c1642aaf
 MD5 65f42fbf981464410f7d5d84a429e920 files/util-linux-no-kill.patch 642
 RMD160 cb9bef851804fbcd9a0910cb39123f65f72bbdc5 files/util-linux-no-kill.patch 642
@@ -158,18 +162,18 @@ EBUILD util-linux-2.12r-r7.ebuild 6687 RMD160 2439048c174299ea7c33a87cb584357df2
 MD5 80a48f84a9364d4661fd96afc56906da util-linux-2.12r-r7.ebuild 6687
 RMD160 2439048c174299ea7c33a87cb584357df216d9f1 util-linux-2.12r-r7.ebuild 6687
 SHA256 64053b1f9b75e9900209925e877c940dc694aad0237ea3f86b8cd934908e7f97 util-linux-2.12r-r7.ebuild 6687
-EBUILD util-linux-2.13.ebuild 1771 RMD160 88eba22ac204f9bfb4821bcdf1a146e452813940 SHA1 06b2dd71f88fa1be8b771298a0c05bff45b4299d SHA256 9f26ba569b398c65f260154d272db1e08783320db310d7801be617d74c534a45
-MD5 7f7f7f554f181400f5bbe2b3337b0746 util-linux-2.13.ebuild 1771
-RMD160 88eba22ac204f9bfb4821bcdf1a146e452813940 util-linux-2.13.ebuild 1771
-SHA256 9f26ba569b398c65f260154d272db1e08783320db310d7801be617d74c534a45 util-linux-2.13.ebuild 1771
+EBUILD util-linux-2.13-r1.ebuild 1881 RMD160 85b7431069b1d60a2a8734f2e11e421b8092e421 SHA1 68a4a424161a63bb7082dffd6cf5aff26c94630b SHA256 56bfc0cde7dad198416faa6e7fcf345bc9e4ce97a1a8d430e0edb1e6b42b6a36
+MD5 b5134ce219e8c5cf291aa1e474ff664f util-linux-2.13-r1.ebuild 1881
+RMD160 85b7431069b1d60a2a8734f2e11e421b8092e421 util-linux-2.13-r1.ebuild 1881
+SHA256 56bfc0cde7dad198416faa6e7fcf345bc9e4ce97a1a8d430e0edb1e6b42b6a36 util-linux-2.13-r1.ebuild 1881
 EBUILD util-linux-9999.ebuild 1695 RMD160 c61be7a1041d86884c3d5a22a922061617b911f2 SHA1 e51e149f937d0bc3d2b7cc4897ae454f0767d217 SHA256 fc4a8751c5d55865d6555a6b8c639426c4ee8700b8928d7dee205fb6d7688df3
 MD5 3358b9404df679e4004ddfc1f0706fbc util-linux-9999.ebuild 1695
 RMD160 c61be7a1041d86884c3d5a22a922061617b911f2 util-linux-9999.ebuild 1695
 SHA256 fc4a8751c5d55865d6555a6b8c639426c4ee8700b8928d7dee205fb6d7688df3 util-linux-9999.ebuild 1695
-MISC ChangeLog 30866 RMD160 fb289632a99998490446a6cbcbfb56de20d24536 SHA1 60f17179d0234a4bb0e793da3476b116c0e7248b SHA256 8adb78b99b25f108451153ff92db318369299e3529fcc4e2cfa1fa65b218c69e
-MD5 9ba516cd4cc4d71a5b528fa5b9424553 ChangeLog 30866
-RMD160 fb289632a99998490446a6cbcbfb56de20d24536 ChangeLog 30866
-SHA256 8adb78b99b25f108451153ff92db318369299e3529fcc4e2cfa1fa65b218c69e ChangeLog 30866
+MISC ChangeLog 31134 RMD160 3d23ae5bdb74b7af8b3da69b88cf4c52c14ee8ef SHA1 7bc2aaedfd9b3051a356bd0ec10a759f178b4a18 SHA256 8af5bae02dc273274b74cc897acb0fff8532baca8f9e38031c220a9299b8dd9e
+MD5 55e71dbfc5afc746d211443ccad6cb06 ChangeLog 31134
+RMD160 3d23ae5bdb74b7af8b3da69b88cf4c52c14ee8ef ChangeLog 31134
+SHA256 8af5bae02dc273274b74cc897acb0fff8532baca8f9e38031c220a9299b8dd9e ChangeLog 31134
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -177,16 +181,16 @@ SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata
 MD5 6f4a7e9af9c890fde37c16cd670219e2 files/digest-util-linux-2.12r-r7 1063
 RMD160 9d0bdb33b8b41435aaaa241e7077f1170db24d16 files/digest-util-linux-2.12r-r7 1063
 SHA256 28d8b5a13df815eb0448175cabb264a92602133401563b47a0a71b6956e2d0fd files/digest-util-linux-2.12r-r7 1063
-MD5 e1ab7f2986fe508f9e8caa0b7b49d123 files/digest-util-linux-2.13 262
-RMD160 97f7a95ec952f82d50569034938cb4043611e1ef files/digest-util-linux-2.13 262
-SHA256 5ef76e2b126dec2a44a83b45afecd748869c337733d1d0167cb418a69c7f6853 files/digest-util-linux-2.13 262
+MD5 e1ab7f2986fe508f9e8caa0b7b49d123 files/digest-util-linux-2.13-r1 262
+RMD160 97f7a95ec952f82d50569034938cb4043611e1ef files/digest-util-linux-2.13-r1 262
+SHA256 5ef76e2b126dec2a44a83b45afecd748869c337733d1d0167cb418a69c7f6853 files/digest-util-linux-2.13-r1 262
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-util-linux-9999 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-util-linux-9999 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-util-linux-9999 0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFG1CuOp/wUKkr7RBoRArO0AJ97Gx4Y0VRoe21U1zQjydBDXSaXUwCg1VOr
-TW4IZc0wD8IIMZTMp/Noz/g=
-=U7p6
+iD8DBQFG3CZnp/wUKkr7RBoRAtDdAKCmAjhCXeRNoxkgTMekKNti6x8D4wCdH3tH
+2wspwHMZmlJ7TlniJP8Z/Zo=
+=V38u
 -----END PGP SIGNATURE-----