Fix file collision with multilib lcms:0; this requires moving masked -r10 and -r11 to -r13 and -r14 respectively.

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

1 files changed, 14 insertions, 23 deletions

diff --git a/app-emulation/emul-linux-x86-baselibs/Manifest b/app-emulation/emul-linux-x86-baselibs/Manifest
index b9a980577a3f..d31c11247dc8 100644
--- a/app-emulation/emul-linux-x86-baselibs/Manifest
+++ b/app-emulation/emul-linux-x86-baselibs/Manifest
@@ -3,11 +3,9 @@ Hash: SHA256
 
 AUX remove-native-20131008-r6 6437 SHA256 45f8a25fe1335a5d9269e9476a292eef757cb55c57de7c9f78953a574f502120 SHA512 398e903b473336dafb154f4e24aae448adc540778fb5b8c3f4600e9a85d5d80f46ccaef5a485b1daf53b3a2ebfe99514ba7404af4b363ce352328223a763c6de WHIRLPOOL 59b0da70ac0eed8fd862bc5e1731cfe6767749e05d2596f704bddbfea9f1bc62f1695b1b4ec81a6ea7f1456ee776e628222a339612836788d325bc3f6bb3fa0b
 AUX remove-native-20140406-r4 9243 SHA256 f09697207b794b12b4b8ec457b99d3b5d393c636b330d3f8b079a4bc0ebde99e SHA512 6b76a3fe9b76f571897e844129e04b3b56983a194488bbcb056a2a8714a208f0ee6af9f6f819c021110d94ba4db6a152c047d709bd7d307bf1d1ecdf576363d5 WHIRLPOOL 7a89913a67e58d52a616ea9b029385415a386cac61cd9efaf306571cf81b58ba255038f03e390e6fca6a3d1fd5d7207750fbad632fc4afba130ed20364437b2f
-AUX remove-native-20140508-r10 14668 SHA256 3c4d8a50ef186e7989497d642feb46c89964ca8e1c579306eece203bfbda6812 SHA512 99e05a95dae5e9ab387c9191014ee57ec503606f58b9628d3cec2bb732f69e773f1862fef72826394d7de3ac489a6ca451b5bcfb4b7ee37d40b26d6fcceaa422 WHIRLPOOL 32d72b02d4da00d53e5140473a3fdd68a11edbf19bf7ff531ff2e40207a010653d42fffb366c7ab5434c430acbd3e39dbab8a9ce054d01e7d4d71342d2003c44
-AUX remove-native-20140508-r11 14770 SHA256 fcd2aa21541058aef13c10e01da937f4f4451228cdb5cac56b74bfa037b655a7 SHA512 f872b066b456818ad4c111e030f9f2ab28c7adeeb0eb60b5a95a22920205b368ac67b3e880013a845569d72837d5be7ba9b2211c68073e2742e243807242ad57 WHIRLPOOL bca1f7b90a51b26ba1e080af221bbf2138f3f0a601e074170f041db191224abceb95687c02dc037d75e76afff041d0bb93167154ca5787464964cae8ad09f56b
-AUX remove-native-20140508-r6 12024 SHA256 647e8f8e5c74cae67bbab5f1408837fa72d5bba6a53eb08d003830849704b05f SHA512 0336fa0bc25bd72633a38a9866403f2ba3afd90697057db8ba15749a748048816e22704cb4c347f195828acff2871f25d126f0059e847e7fe0a224aee1d86e53 WHIRLPOOL b00c72c12cafa437aeab44da55682191da4698650555b05b947beb27d2d2537a6f5a2ff4fc711b2bbc8bf3ea2afb118bf28428fe53a3f9bb08b58244b4b53ccf
-AUX remove-native-20140508-r7 12214 SHA256 fce25fd4e546bc6a94a7c01440af7d66b90bb3b35a010fc55fa17340c11ba392 SHA512 a1c11b99a0c37c2b2c353c294b1e39d31c104f15f18f309600b29657c12f80159712199c5a3b60189871b4e0a2c94475bfeed86ea62cb73008665ac9bab148e5 WHIRLPOOL 6ff9356962bdb1fb53b44f31ee878ecce8c9bac4a91f9d146c819ce8d3c60377a3239ec77f825896ef5d2fafd5f502a9027a341d7b14bea5bb8ad0c5cc6e1c35
-AUX remove-native-20140508-r8 14092 SHA256 55c75c3a08da06071161b08e9ff050ecb0f9016144e0620d9b15dc5f8c527d00 SHA512 722cac80488c39dbb1afddb5ff33e220772844760b303e208a227981e228d1d31510ec8bb4914c7dde5ad4a9bf99632ebefaec6563b5fd2d4e2c3d2f0843ffa9 WHIRLPOOL 19eabf8caee8b450a0613b040c93b031c092161311692f3800b3c53a51dfe6ec4da3da4779d7f62385b736f541a184fea5c9ecd2b2a55d225ecb0555f9665e7f
+AUX remove-native-20140508-r12 14411 SHA256 8e9a53607b7d681bd74ea68adeed27aafca700ce39b40e981eac2b57d5c53dce SHA512 da03257b631be44b7c55cb0e8fa523d9245722d42b18249b7d83fd6724b7ebb2b22e739cdb0dcad6dffd361b42b6fa5ea69d833bbfce47dbdb26279b6fb19fe2 WHIRLPOOL e76b06294f647014fb3ca88e3705a6f7b72e4717d3bb9c8bd71b24d22cac1cddac3b1ccb1641b20da9b3b3385f1d6be44704e4dc60354f877dffda52bb21194e
+AUX remove-native-20140508-r13 14768 SHA256 85fbd0a461dee06056e93235758ba28d8458ff0feb70e999491b73c0b1d77a3b SHA512 7e4330444ac1eea773df097e3f1c3fc405ae3824ec5eb3d6e7f3c223f6725df50c5c2a5cdc0b136f1ea56b1ce7e6d087e3462672cc1a8d277c21acb211a18be4 WHIRLPOOL 71eb93eaa95dc573c1f59f92050338b1d8d91ca24c35d1c85ab8946a7e4ab1fa7c09cb8ca8503af94a6028e3a43e434a8f1c96c818be14c76c519fc864987a6a
+AUX remove-native-20140508-r14 14870 SHA256 8eeb809c35b8dd1127ebec8eb14f5bdc62a6dcf5a1449c08b1bb0f2768e868a3 SHA512 bd51240fbb90e12e2ea046de7b0991fc0e99cbf07ccf894ccd807116516792e6fbf8bb6f090d49319e749e046a6f3190ecf5796a0cf03ddfa6db739838139d41 WHIRLPOOL ef8ce4f3fccc31e6254d4ced33fc857c24072c826a3bd2ffc991f6fe3a60245892c782423daf9c2bef0a61ef7a07166f0e4100be08ca295f6468ad7eafbfa2e1
 AUX remove-native-20140508-r9 14311 SHA256 f31df443522693e2269a596db5d3bf869f5591a9f36ae77675e22a25b3d96efb SHA512 ed16f7050fad1cf58b2ac080a6d110142a050f5b3c400eb73a31f1276739d8784ae6b18edcfbf7412e470ebdf3b0c4e884713b14380817ce7ab9e06a439eb77b WHIRLPOOL 8663c153f49e5df984b9be907ac36494386adab67184a28fa38593b171e1d2e78b5f1527e3b4c23401f5f721435ba73c76b119e541866ffa63edc5ef2e887868
 DIST emul-linux-x86-baselibs-20131008.tar.xz 55992196 SHA256 83c077c2d0668502c26abb4c30e1bd9ebd3eb4d2fdb2bab3ec57331a3df2b449 SHA512 4ec890f8bab877a576024c4d932906a486b5d584026c8a89563735d520258dce6a47a47e41ec5cae32be89d697a903844f15b9c2a16338a0d34c4cc46cd781ef WHIRLPOOL 0ec725072c8fbd1b0e8649f715e6a4e26ea9462c9ed290f0f42a5b606cdfa6736f839396ac6a967cfce9c864e5da4cc2082ce2db83cc4a9cb49824e7b975bb20
 DIST emul-linux-x86-baselibs-20140406.tar.xz 60312556 SHA256 0f242404c5323c4773cbc1c23abe43cc039b826e431d6b78949a4717af4540e1 SHA512 61450a5f9a63458c29e7e0421e77ca6ef25dc50355678a9e0dee1eb50ca23869790e1293ad130ee363be0b19592d735045c8e4a542bcb76a212c68ecdee9382e WHIRLPOOL e00ccbb07a9875dedd25033246fb9367a2610dc2b11541501777270ec00e1ceab880f4f351f2a63663917312699b73626776005584b556935d51716a982a2aa3
@@ -15,27 +13,20 @@ DIST emul-linux-x86-baselibs-20140508.tar.xz 40339976 SHA256 754b9460609d24b89df
 DIST openssl-1.0.1g.tbz2 2665025 SHA256 77e32cb1e9874a09a32c1a9ff87512d462a8870f9dae50c6cd44a0a1f50405d1 SHA512 36e808695b189f118b8e788fa84a68ce0b5e02fd9bb62a2b2efba8cd6de953b7129075b4adc716b5211ee9486e36977b5aa65676dea640c3d2ed4e9fd0d24aa7 WHIRLPOOL 223cac5bc0ccbc685fca610c3823cbf2f074c9976b2fc2212beac2c605f614bb5bfb6cf5426bb3547150afc46315b2633924c1f627c06e475b65b7bcab1e9154
 EBUILD emul-linux-x86-baselibs-20131008-r6.ebuild 2582 SHA256 15f5b90e255f13ff7125fdea43fdf39effd960a44f637ac4408ea9e6f4f38f0c SHA512 034cef7148777fbc149772227654c2fbe7936c17164060d56c651fe8a3706b56596fe10a84a4beb11d1a18ae5aae5f5c2ab9e4e98ecc7fd3f085eadea926be09 WHIRLPOOL 51bba5f43f79e40c17d9f9a1804eca5f53ad4858b8ac2bebf7f13fd2e0715a6d95f62cb0535917b06e78acdc0a56d46eddd6ae49991bcb8cbce84b54c858fa2c
 EBUILD emul-linux-x86-baselibs-20140406-r4.ebuild 3763 SHA256 53d20381e10f2c2e43eb0144d0c1b449848da5eda488e7014eecf5e6b68e3e37 SHA512 501b8731e1218f1c0e0ebf2dcd2017e22578c13d7368b7172b5db288d75eb1d50614ccb2c67ade7ad2e8ba9aa2a72103054e92e7136201a87064e784723406b6 WHIRLPOOL 7f7d8bd6106df9985f372b05449af2ba141e343c629b7849904e087e16b8f7149181acb5d0f8329a36cdae6a1c00a3631ea7c979b3a7264031daad40cde80c6f
-EBUILD emul-linux-x86-baselibs-20140508-r10.ebuild 4439 SHA256 8f829ff0934b6f0c7b0825a8aa7328acf36ebe09dc8d7210d506223de9a026f2 SHA512 c939b08f5af9d37ea7dabdf5339f68092feb818c011748b2e47ecae20a69fafe108ea1e15237cacd5677f329857626ae7f4c3302a69dafa30128a06ff443478a WHIRLPOOL 66997ae06d0d2cfe76511eaa29296b77f005e97938a99f58c43cff263c53b83d23525a9199b7c2b5448a2c843dc5120cc4230b511e47cfeec2f1882ccc1ad3ed
-EBUILD emul-linux-x86-baselibs-20140508-r11.ebuild 4482 SHA256 eb2bdbb391447b5abcc6c624d112dae66329998c81cea6beac4bbed6c379ce95 SHA512 895238952b9db88403b31a59e5f1904817ebbbe11e1242039ddff339030b376d3f535135d8fb2a4d7f3035e9f8f666a819363ebd93c4c916c70ab5c773114085 WHIRLPOOL 98991168b64e71f4fc0f0ce7efc2237477dbdaf85a13c605c87e7bc8360c1d93afb05e3ae618041c7d30ac7a0f7896cd3ec2dd9d148b2393d700ae763e46aaec
+EBUILD emul-linux-x86-baselibs-20140508-r12.ebuild 4404 SHA256 eee8c1e5bab0c56eac91bccf62e26f2bc2e95ca22d726a9bb66d304e758fddf3 SHA512 b866ddfef62642a4380413c12ed3018d8650a5c3dfbd4ffe9001e5b2c27f358e792293e7d77cac1f506185d5ae688b0be232c8eab46fa7e9b752ddd3d9e1c534 WHIRLPOOL fca10a3019d5503bff4f580a25a092e2be75644e903f9b0fcbf7c566cf018eb6bca3d7d4e6f82abe91262c1e720014849e68f21eb570b00eff1c98c3a50866ad
+EBUILD emul-linux-x86-baselibs-20140508-r13.ebuild 4487 SHA256 19ed2444d98b1eab5f2d01690e142b1be73b11bfb424b41814783e8a8f21b502 SHA512 bffe3d936f4f9eb6221dc41f1f2676df5ee1815560016d2dd6b36be497a832ec23d27ef3bff7b5cebff5c2a192650fdf0db3d38dedc681369563ed39dea942fd WHIRLPOOL e7a7847f3418379e4bf5f5d191007e4c306da79bd7bd60ab021382f2ab40a19be559eb76744a885c5e6331604901f992a1799252697657e8636ee12f84d8c379
+EBUILD emul-linux-x86-baselibs-20140508-r14.ebuild 4530 SHA256 d1fb94fe960bdba9e0580b9add19608eac1108ac667d2e07de4014abf65668e8 SHA512 6dd76d88d8cde412a69d36b43184f7e4d6ccfc572c777511e23be48cfa8581ddb179c0bad4bd4d1f292b3005b6c41758651be69bfddb8c2bfde1e2bc9fabfbbb WHIRLPOOL 02768565cac7858fcc6861bb25a66e849382db918fce3b3521d011ed2270e81d3ce88209653ba7444963eb0dfa619e09d67fcefb4c01e0895e701a5cf3ed6435
 EBUILD emul-linux-x86-baselibs-20140508-r9.ebuild 4355 SHA256 d7b9bf8403fdf61c60bbb6c9b0574ca99c04684aa908db18e5ddc0073d93469a SHA512 e30ae3330e111c505695e7dc9241b6dd1beaadde711eb7f6e247aee7017145e4fa91e85e6343ef52c10713fa7afd79a3cb4bb945769c9e98f2ba1d030f595ccc WHIRLPOOL f6986dc8406a91ebf4b6f8c5f45824901b4ac91e1c99e5d60876b04c6156b98c63da7da26ef70229384325ff1c58456dcfe574f0eac83559c75f40abff6497fa
-MISC ChangeLog 46537 SHA256 560ea87e3940b22fed3025a2b501d448aa5bb488e6e3ee13d3f2da963e38b9c6 SHA512 fe3ce1596d8fb6ac8f5a4592c124574b47fa473b0bcf4e7f3da7e83e635e7bcdaf23e047c02330f76aeba782dc2815427b4906000c527a1a7402a6656f70d362 WHIRLPOOL fdb3c5869fb1ee765f9e58251982772f47d1770f10eb9c4704a07ffb58c8e7586246f1ff2863672ffd1a820d4fdcf788cb14f47459d62198fb2f42b54b08b5a7
+MISC ChangeLog 47400 SHA256 47cf8f5650ba106f65e131b45206f5749c2f0f61d6c4f281da549cf2d7704275 SHA512 e8298d23f85127b06e237073756f104d10c7ec9cfdd321ec06b9969f6e1ffad96c61faaeb4699a540c1a0707778c0148e0e046331091ee6ebd2e75746224a43d WHIRLPOOL 5be0c42ac1d68bbfe1a6e146dc4238d94a004f5caaab8660cf514f89858f584343f0f44fc8787d0500a2859ffb1a20a01c8088fddd52d71e00e83044410814bc
 MISC metadata.xml 312 SHA256 9d3f082956c89c24d50eacf1a35e6d3f7e7605a2b290b3ca01123c357595b680 SHA512 21f9fbd2145e18c319f089f1cb2f99cec289daac7e35c944335d979fca8ae595ac2ab81a025c55d56dde80ed7db88fdcd0b644bf2070b6eee7c26bf643fc4e19 WHIRLPOOL 5cfe4fa3453b53f0d056331b905da9584e13a48af3671f248b7ede707b587338b145613a77cf655af74734ae1e9d0dfe50f13d34a2cb069a73c76abc3a753262
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJToeIBXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOIXoP/inVrxKPSyWiRDnt4DsWXVCg
-qZ8hlnh+8zeq9RFR08WsbknNoqs//DClorEAA0DJNrEhLI1u6jKpzyt4CSZ+BVEg
-YIg2qlwjN5q5zCwk4X2usDthuwzg3Rd15zqTM7IPnKo56Ev1UAAHv1OIKahoN0G0
-j07956Ostlq02keq2sCVsXdhxePDK6EJWPQ15bGRQywc/ms6g7OWI2Al24OEMMvY
-P5zPAv6H04OXpNrWxwZkhIaL2tCMDTezIvAD4ds5Y9lxHh3iCO877+8By7LoEoZJ
-fEwBJq+zpTqES60Wk/Lqbv/bAZT/Sc/eBLerq/mH6SrruL0v1c1L8U1Qp+ak0Vac
-cthNmIKwWJMwscVeD3IQ2HzcqyqPqr46fImytDKY4cqsg2WZU87Qr8RDQFGX7L6/
-K9OMDhYRuzzeZnOX7OW0KUwk+sl6uzope0UXaDMthUTKpe5W7yibu7TrU6ahWLmZ
-jeiA932Irp4WtD/BdSx7l8t/6aQVsP4MkBnQ758QB8deWAvi/dIBxMjql57GEXl8
-Sd3BdzTmO0cVPGpQc/YT0Y1CopFWR3+3EZX2rQwVcF4hDWOvq1i66/+pBloN2OTR
-ANaHKd1W+0XQDbO1aetvpZE3sUcvvbg0yIBpNaAkM9p9aFaE7TU1XCsa7dLSouz1
-cA/v0bqkJOVSi3cmmCUL
-=Usos
+iQEbBAEBCAAGBQJTolTcAAoJEJ0WA1zPCt1hHGkH9Riyq5I3I1rbYpawwzv6/eEx
+zcRVClZg9XtOkk5qkrX9PBJliT+CI7nNv//BudWb+XKscnIqwlopcpnxX7qlyxes
+qZkdQ5RQ3WXb+XqTEK3ERyTOx6sQ6ruz7iBvhL5KNROCJs3UFx/EMcmOFv4tuu3i
+MFBRPvTBkIIXvyegfhF7Q8VKvojJIE8Z6/lTcCq0hQ/Gh/p7KCTUOrcP7Vve8s3V
+8yKe4zOi0eR7eDQnwgqm0Xq3YA3LMaJT0410/KF+FPsDndUNJ3nU9pZjxp2bBBaT
+TTkvhveEY3YFlOvpoEQuMWUnxeo5ygh5lkHisH4HrNFX3DemWGVVWyij2i9Exg==
+=WbFl
 -----END PGP SIGNATURE-----