slot conflicts. bugs 508002, 509192

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

1 files changed, 6 insertions, 16 deletions

diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index 86542ca2645a..9f696a98f679 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -5,30 +5,20 @@ AUX CVE-2014-0162-2013.2.3.patch 8811 SHA256 408529c141db1a12fadf926e1a1cd2e56a1
 AUX glance-2013.2-sphinx_mapping.patch 582 SHA256 043c3f7ef413cf3675920880af57943b909ec9f3376f6e86a1ae1d5948d9ad98 SHA512 d012ce5eaed00c3ba7b6219813cee503f68cdb14b8e50eedc731afc63767e1867749d6e4824611e0d024b2fdebfe5a2b3ad53b0ad7b18a39defcc17094da4a0f WHIRLPOOL 659bf94e7740be3ea0d2f130b332e694ebdcca8b90acfb479b8502eec4b867eda999ec2c6cdecc1f3dcbe3e3ddf72798c76bdf16ab4ab561ce61975a451c4585
 AUX glance-gbug-474064-grizzly.patch 2377 SHA256 df92ba14455d4379f0c2297f1f087d7f3f08118e6129e45b0e5bf5fd26c7aba1 SHA512 a284b6002c3b4ae39678eb0c492b3adb6311b115761ef43f38427dc08670c0ebfb4011a3879291ee6acdf9480ca135b4cff77f41b7af9fe7a837effafba2c6f0 WHIRLPOOL 8adfcc80adf72b501a7123c29454c446b86c05917cc8a910f799db5c223fc0efb02240f36b842c05c08e8347ae6d6273ddfa088a03f0f65eee0cbfc40176c9c2
 AUX glance.confd 25 SHA256 5a53dcf1eece81a06a2dd0856b15f8abe20eb1072361b110f752e396e86a7843 SHA512 13e671d4544e58d7397c1a87eb1048ed4bb9561587fcd63783e377b2d25e810222ca3944e0c8cf13c524e64f94c435b456a0d6f7cacfb148e275377699a11ca9 WHIRLPOOL 862a310fbdd7b68f132c45797210011b607d9b5c8937d60c9f5933a4d625bc985ad0277fea26804681b7e0a674dc9da15fbef40502c4052d6742ef0a94e88f3d
-AUX glance.initd 660 SHA256 76cab7a39e7aea3b51a5f64e5ac9224b00b9f7347f763b8310de1253d62a2a02 SHA512 9973dc64ac7d235a646d78a859fac9ef9d977a5528f76a4562ebccb019fe28ae97fd2713a7d380f95e8004d167cda2d21f0925825857ac7ce60177168ab55812 WHIRLPOOL 05c590f36ab2f0c077d5c6ff3ac206c92477dbb671f3ec7938ed4f84c1555a2c1fdee960d6e57e6574d1f64d76102a5716d5f2bfc130d922bbe0f466dc93a9c5
+AUX glance.initd 651 SHA256 1b2fc0e11d572bfcc121cb995ea7b3cce63ee705a05d2fb34a9f99d655546553 SHA512 c0ed1cac2038dda8882d5ce013b948debf1e5e411a062d8c9cbfdb1e1683c94bfd78a3f3468de63e0cc28930c59c0ff323a3116ce6a74ccf5d8ad1d547805bad WHIRLPOOL b0b25f4e983bf9f46cb9dd5872d14b24dc90e3c383dc458c79d065e0855bbf838afc4a13f0c92db640cd64311e22985d0b92e1ca4d428ce8b1f08ff23b89cecf
 DIST glance-2013.2.3.tar.gz 1334068 SHA256 8766f8d198ec513c46519f1c44f99a4845ba3c04e7b7c41893cb3d5a7c2a9a28 SHA512 0e4aeacff8bcb10ab563d8b951da81eb3bebfdec6ac381ff3d5f21aad2efbb89db8ee54ec3beffe127331df55fc1445ad3e2891f1955aa8963919f274e07e86c WHIRLPOOL 5f805e15a3a8f1231672494213df3147b1dc38eb39fa8d4a0d6f70a3b489c2f016e78bd864a92816eb8581433c4fcbec597e766787cd2fa9f0122860ce257c81
 DIST glance-2014.1.tar.gz 2111279 SHA256 ade12e5ba5be28dc6a0ebde3c579b26ba3e02e6428eaeaa77f6daf2bf5c762c4 SHA512 7ed0ebe3ccbb1d57160a65ba19e48db87f4dd35d5ef0675ee07b7568513e238b220adad6736c9ba9d791ef52ce11305824c9e70c700fa290a39886f6c8db6735 WHIRLPOOL 5e8d4c9fce4d0f45fcb62857901beb3c69f61864f1c24ca6d17c520baea08a796468461f365d17cc905be7a663db92bfcd6ef999eda204cd1aad35020add93aa
 EBUILD glance-2013.2.3-r1.ebuild 5074 SHA256 c80809d49e13f0f764e3b9aa189a4a69ff7797bf686ce64eb95bcd4267d42cab SHA512 aff576e4292b518baae2662f942a06b6a14814a614a5648a290e7249858813d406f2b6948d77d21ff67b183c1d317a3ea0fea2a222c28f87f0b8afe73e3c2d01 WHIRLPOOL 65ffe068c88b09e55f54345c44018947e09f85d1d214939201a0f29e6e5cabb40b1a5eeaabc95d6cc71cc35a385f2146d4b636b9cfb6c63a90df9023d0e8f3d6
 EBUILD glance-2013.2.9999.ebuild 5038 SHA256 16b123433bbdf44b99624108eb4be1159b0ea4c75eabdfd4d8aa3cc0742957b1 SHA512 44af4b647587d9df5186c29ea157da1607fc5cbdbde34c2aeccc32670949097c46372ca36c686203d6eb29ec493123feda2522440d6f4f7b872128a8dea872c4 WHIRLPOOL 61d39954d8515fc5f82278a8d5d541b363567627cf345c28b67929a6a439a5838c77b1af2eaf033d20217c5c473eb67f208d5a6207ec016fc0ab28063c3a2cbe
+EBUILD glance-2014.1-r1.ebuild 4563 SHA256 bf6022ad42e201ff1b8b8cfe71b6b0051d19243bd5da33b6da6b1e45ac842a81 SHA512 885328193acfd5853a7eabb4abbb43267380ca2c12fd52655ab03d91a77cbfb9afdd4ed1d79e5547e92f878fbea8b4816cd25b574109912faab689371c123963 WHIRLPOOL f98fe3cc81a2d9ec07dde0d5bfde78931e699f818f4c2fd4264cfa9dda541d37186fd148046ec26091f7179cbfaeb671bf7cebdf7dbcf5f4b96f30beb986fcef
 EBUILD glance-2014.1.9999.ebuild 4704 SHA256 86a9b8cdd834668d0f3d48572f64c8255f2de6c8db732c43a5a283bcff619984 SHA512 4eb19db754cbe961ebf47a6fba614c30a1829dbce5b2460139017e9573d3fb425b53b52d3e22c1aba8c1ef1d903c6910fd27389ceab227d5a8daa24a5938b20d WHIRLPOOL 844aaa048ef93bf402861c473c01d5957f30fbf462be702cb1efe61cd9116dcb6ff8d0b920b460d1a8ce6ecdfaf932506b158a6a5f0d94d7562d37a45255b829
-EBUILD glance-2014.1.ebuild 4692 SHA256 506165ccbfa740efb14dbbeec3a823b900d27e8d565ea2d02d2cb0671adaf4a8 SHA512 445a5dd884e1d14d8871afa32df03eeba1f82ad99b8853162745e5e9748ab85b86edb0c77602a14a022f7e5b64b2e95ade00a5cfa7891109765b580fb840628d WHIRLPOOL b0060f162abc5cd3b88d0ff85b79b4925d304705b8c042c7b374b14174d8cd186a3c564d92398eaf0a1b349c68d2c3bc184499b999046db9c3343f5d41c8157e
 EBUILD glance-9999.ebuild 3029 SHA256 a0274ad3f834ad7be23bbcaea00c4a8422857bb3903f89954da901ebeeb7872b SHA512 2c9baf347f3577c4fcb62d1bed5f328e2dbd8e2c2149e1dd4b5b4d317520da5e8fa09d8c352d7bbeeb65c4debb35d3fc9df5c436fc51f707717e18bddeb4743e WHIRLPOOL 7f3a20e0ff8404c4ef130b1b2a84543e91acc95d51d332028dca474a2e2e44c2aae2f5e409b2258eec35a09c4c34c93939f99fd182c8050fb845d462e9bde0d4
-MISC ChangeLog 8391 SHA256 71c85146e014080cab3ed7bd1b8ece67a9a8091410af35aadc4d5dadfdfa21b8 SHA512 c70f56145226836cfb958450790c2a2e0042b01cf4cbef36ae5351a293541797531929e2c1dbcb6666c9341228b459889be386ce15886ab5c4eec8873a536c02 WHIRLPOOL fe7086757c77799ed5ff67f7cc5505b06efc0a5c5fcd7f0eba3983440da729074f51e16cebb1c945dcd956eaef2aaaada6359666c992ecafa34940fb41d325dd
+MISC ChangeLog 8575 SHA256 94bf25137eb31466915e17eedc7ce0bb96d0fe5eaf292a6cf0036cddf9cc1d42 SHA512 4aa9ef5e6bbf4c7d26c130e948fe7cecfe91955b0ad852e302cd0176a8a78706f3e6413bd02bc6976e255b64608c32fd633e0e13ec2b0ed1f21ec1535761b3b0 WHIRLPOOL ccde55f9c63c40dfd80d6c6850d19fdc1c000f9632f280fe958a7de50f7bf53d7ee613aea1c7cfb1ebd649711d903c5569d77b27744b6cbaaf4ecd18d03d4342
 MISC metadata.xml 607 SHA256 b74d960c096528dbb7c9be6b0da777e10abe32928459f045e7c58b0156e22d95 SHA512 e38e4dd740fe55d73d6d97fd9ffa3aec5466fbb5f8e6484b125560313245ae697a0dcf612fb065125c6737a8254b6218c0703f7de79437bb2799c6c67f386e45 WHIRLPOOL 445bf712fd733fa90c395cc24fd02155bed15b092713d502b54331da9237f397877c2328adbf4049ee64ae163713ce031ebe5048c8826ed1a011d4ebcdbb681d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTXbT1AAoJECRx6z5ArFrDBWwQAKbKVLLF7qOABSMpWXxcJcku
-Go+rLEnDhSlsv79jTJlD8TDy8K0IjXdw61J6OLMDZ90jWZSvAx6KXDgYefiDfXvD
-sro6AxJkKy7YAF7hz5kHFjIesW6R7d0DsVQO0JVxHWxmjYtG73OR72oZPFN4LGdH
-VdhsS1QdiWNqY1Slwn//Qffj5JovT3UNlcWFQAwgBgwBh0EtdCuyy4gOzOZ7TTct
-+42OBnE/DDzDDf6mERtTiyUTc26DjX92X2ERgc45z8y7GoZ6Hu6G8BT68C6UzJNl
-gmM0qE0He5qQfCVunBgalgS30oNYCwe+ao8ElF3ZZYFop9wQ2+KPlEOjghZjiVf8
-uddXQUnV63lwk2QqdVDfNiCeOfZdlj+LT8E6iAbE7XABNIOaRZt4GAookqMEToUI
-vg9W3zTk/eW6kgzalz+AxDQu6DU9EkxQq2sVtMhkGMMQR6Q5vuXPtGTliLicDPJk
-XiAFFeIkgkZ39nOghFQw7hzb4oxdfN/8HhYPeq8pCHaePRhu2qt2w01v3sG+BJnB
-555a1PoMniSrX8x8Kiw35HqVHMGs/MNoxETL+GZ5J8tjwmruxRzEo9G2BfUsgJki
-TCxSDiwij26iNMStT4WgM+wzWYyvGbx5kiTwxGTlwg8TMzHEaKcTMAZeQxSOKRkl
-hHNtZMLiHO9pDFkmAFNz
-=T0O8
+iEYEAREIAAYFAlNvZFYACgkQiLKviuHfItWLJQCgqUZri3AlBKLSNAgcB78RD3cS
+Xn0An0Cs8Ylfm8pp13JnOYCWvivespgm
+=1ygs
 -----END PGP SIGNATURE-----