dev-lang/ruby: Fix slot conflicts, #498970

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

1 files changed, 19 insertions, 9 deletions

diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 1dd6d5eec809..ee21ff8d779d 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST ruby-1.8.7-p374.tar.bz2 4250351 SHA256 b4e34703137f7bfb8761c4ea474f7438d6ccf440b3d35f39cc5e4d4e239c07e3 SHA512 c6859aec9a796c71bb30c18236bd5548826655b08312181376b8dae4a006575f711065f15a002329c5e62c1e1ee44bb86723138abb3b658c8958920f13a5adea WHIRLPOOL 391ffdb5b3a8c2d4b6c250b2b742bfef94fecfcc9755a823c9b55ddb0edadf8a5067603801b1eebce33423beaafc43ec291ea199b1cfd55c8018949b7162539b
 DIST ruby-1.9.3-p484.tar.bz2 10041514 SHA256 0fdc6e860d0023ba7b94c7a0cf1f7d32908b65b526246de9dfd5bb39d0d7922b SHA512 2c3ef8b6022027d444bd709b1a5db96a7a692e2e3aa895df4fceae101f9689a31f02583703bb0483d80659bbd4555fbb4b9b57ceb2351508fab8cd10ff28f14d WHIRLPOOL 1b1174e012bff8d047db2da654dcf535486bfd1593b8e2f6fc888603c8ed6b41bd72625ff4eeaaa645ae01a81f7edbf62f0345b61eeda02d73743572af3f6b85
@@ -13,16 +13,26 @@ DIST ruby-patches-2.0.0_p353.tar.bz2 1929 SHA256 4feee409319dbcac7525fb9c1c76c36
 DIST ruby-patches-2.1.0.tar.bz2 1929 SHA256 9bc6cf595c274038a6e6945ee254c687fbc273d14746f9e887a3815d6b52897f SHA512 02007b7de38bb845b69b6d3e6363ef61ebbf8a8fcda56f9d66c384822ca58c8794fe47675353824120c66ac02ab460b739851ef33136fbb527ea4c5d7ed68ffb WHIRLPOOL e1e3335b3d17e9a22f84a77fe52954a4e71cac2125e5c7ceee76690b1b9351020156ed085a429d689d7ac58a394985d66f2ed3a67d71cc35cb791a98b1d10264
 EBUILD ruby-1.8.7_p374-r1.ebuild 5584 SHA256 d5d1c19832239a7cbdcb13bdbe66b123a22e5ab207be3852a040ebfe1ce61773 SHA512 14f82543fa21ece835f6d6203a84eaa4b15584db6b663fe666e61389944df83f6259bf292aa0cc86791f0300c9a893a930ffa12e6a110bbba84aeb5423261afd WHIRLPOOL 9595fe2a7501c102baa94e90beb4a57e52defce20576a09c0708755ca2c5a15cd0fec0157771f98810820d43d7e3b025d2653aad2fec9e39d7db748d7451d762
 EBUILD ruby-1.8.7_p374.ebuild 5528 SHA256 abd130fb48479ab4e3f82bac6b6f3fe7acf4416b98626c5d1a41af6498fa5ae8 SHA512 cc458d40b7f242dae1987aa70ba0cb5d0100c61a9d2a7eb04faa707b5d111e772a960299e238e8a40f4aed76d98304ef2c6aaabe7696bfffa685c214542ed411 WHIRLPOOL abafeeae7c0da381f0ab1cc8c8314c3118b0b9922c7e7f32e8f897e3f765679d38cef864c1cd2ec2d26236fc74dee4e419b2be362514b0364ff26427d4b2ed28
-EBUILD ruby-1.9.3_p484.ebuild 6093 SHA256 4d500953401e0743a0d1b6a320f5128b0e08e8be5f16879aa1c1ab587e94f27c SHA512 da508ab370e137f87ec8d2f237da3df4f073d38a7721c6e640e1d9121734c5523c1a584c1efb963d5c3c76675f004813b9d6cd0dca0953d587a8353530ade241 WHIRLPOOL e0acec8c22e4b955a2fe815437d9e7c0fdca40cbf35e796d2349027b56e1ae37da8895be8d7d20e37f928064253d732409c8f94c823c0cf06a94aa4b424ce927
-EBUILD ruby-2.0.0_p353-r1.ebuild 6564 SHA256 aa16e08e635b720041ced31bfed5ce4f7c4f45a179b255b41f3eec880f18695c SHA512 78c1df67b2e5ee3df75dbb8d516fdb6574e5b8f7f7e6e0a3ddb7b213fc4e5ef49df3c0e1d6f1a74f43561b3f1685784602235a15b6823c4173da81683b26e7b0 WHIRLPOOL 77b568ebea1e0591dc30309a16ac342fc42cd6cbca625b34d103f22a5d6deb0eec1e0bf690a857e073903d26c6b91c9a4917c9f437ff00d65281140b7913876e
+EBUILD ruby-1.9.3_p484.ebuild 6123 SHA256 a1f7fc5e97b42f3d76d61edf3a29ef81481d1981cd9c2ad96066ce5445d7b940 SHA512 412fa7c94be040731bd5c35ef8aeadcf4e8c2869f306e43062686256ad3b85e5682f26f019722b2460f08266c377c38d61b3e4be976fde812beee61efcc44c2b WHIRLPOOL 051fbe0d5fd154c8edb509b3cd1f09a85d866b51d5cdacdb086c16d9c768a97bf03d3bfaceedf43fcea81755801320ca07d8dae4cac07b109ac9810878fba95c
+EBUILD ruby-2.0.0_p353-r1.ebuild 6594 SHA256 e6d3f810ad3ff07906ae93be5aa49abdb974bf114c82167ab271121a540d23a1 SHA512 6994ba287fdd5e41ecfc457381a110196e7bf211d2353034d592992747c019431b45bbf2c08b71876462d4018a20d34abca4e7239807eb739824cc47bd8d139c WHIRLPOOL b212678c2fd28961185c767b9e2d3130c101fa0555409ee6d06c09d72007f1b05038e124ea83a46aea353c239e2bf2e00298f03a8b8e2742ebda796c7d38e2a3
 EBUILD ruby-2.0.0_p353.ebuild 6506 SHA256 058c595804049d3022f57ce1e9ac227ae280c97997c82adf225fdd1e61c412e0 SHA512 c189731b5442a123ea23eb3c211539165ccd7a4ff825835190565a8f9639bd4c638e6e1175cddfe2a2f1735b3125e77fbc0971046c0423a0e2cc6cef1702a4e8 WHIRLPOOL f0663c899ccf90cc73a272214fc51d093895eb8fca23d2370e2d0e2f83f0e3bcab1e0dbca7645470b7e93385e12190c1ebcf4ea7938d8bb4fe523dd2c9fa1d34
-EBUILD ruby-2.1.0.ebuild 6606 SHA256 3af94cb7363828a756ce25ba31930b6a2ddf21c500ecd99475697a90c85fdbc5 SHA512 8f171d4e3794db85ba3134eadb45ee3d87f581c28cf240c79cf7574edbefec1cf89e9c634b0ef49cab6ed63b16c9d59376201adcae35dc041c9346398eb33748 WHIRLPOOL 5a1fbf9d75352d86f25a1aa1c1434c0590b3818597435f92bf94af4f0f77821ddf2eac05b103dadc912ed4a8316477f74c492e6cd3b71d405d5f0bb5b76df43e
-MISC ChangeLog 94989 SHA256 c7672755b11a5e8b79a01ec7012c7ab8a7c576018d24af238cac01e76cfff0cf SHA512 80548370264801b628dcbd77bfd05e27ac5d472d07e5a5b4a2a6280d1a7a09e368c9aae4b0f1482feceed3f4d488724b84c9ef8703675aae063401c6d2ca9ae9 WHIRLPOOL 1a457defa978c3097d34d2b2f0bf96a268dc3c877adc406724e2bdc94559abea583f62babaf8a2b6fceecc02c013641b351bf080593bb692a914182bf74b376c
-MISC metadata.xml 1388 SHA256 365a88ae053d47050b6b50d05eb518755a3aeb0c91ca77d2d8eeabfd24a2447f SHA512 deb4ce50904ebf52f2b390009d23a63fa63a1652063a924406b6d6cd3c1c30fefbd71525aaeda73f57d7178afebcbd348080a5661439a365bb15bdbf95608b55 WHIRLPOOL 8ef6d3c3c05c66b1a960366f7c69fd401ab8b49145ef464eae8c94daf9935dad96f5e499e550d87435aa960a7aa3e2b8b1afc9f693d2a0db0e52bc6c77cdbbe7
+EBUILD ruby-2.1.0.ebuild 6636 SHA256 df8f4d240cb4ecf477a394ebc880a54452dea3fd7dcab1fc945e3efb8a085a9b SHA512 933b99b94184c9afb9a91db87cee7f9706b4d6e3a676103a595a44ace2413171b3b1a7a5ef4b1187929cf0f308af115c90a5c915aeca9a8149329fb16d81408b WHIRLPOOL 214c96c0b1ccdfa9c3db5717109a4d4c954e9b137b2eefe797d74713735b6d246e02aa47c1b4866dfa9bc6dff1cfcab7cc8a9e9a6feb264add49c5ee932b0469
+MISC ChangeLog 95151 SHA256 bf87deb5b9613782b867ed0fd29e54391b5bc30cd69efe3fb472755ee9aacd79 SHA512 e0b2ff0da8a2b7bc6d0bf759dc04525d7ad9186629be6b0255fabef5b805f14510b7e9d1c80dd87ace54f47f290d5a27065fa0bc16431bcdf18af2e69e7934b7 WHIRLPOOL 0292adea7d6a718ba86713df2332d210d2a1245c22e06746f6b9fb759b779afd03630b714b98c61df092209d81a91206f22e96f02c41f24d96e8cff4bc2634f9
+MISC metadata.xml 1384 SHA256 b3528b04bc1430564267c74d98de8107f7b55a20d6a76a2f04068d13c7136e0c SHA512 1e3b7c01915f4484e0ccba766b3649ef8d4e07c1a11be0a2ae28dbc6d8666719ae8ae3e5f4d478e21a3a913eb34c12d7e45f68701100987b81135417265a4eb1 WHIRLPOOL cf7e579efae2d3ac81e2447398addb65a645c0c65ad1bac6aa7ebe8265d5c9f8d3e86175feae988ff10596e9c8b56047cda22942c49224800c9167cefae5bca6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlLgHTgACgkQiIP6VqMIqNe6YQD7BuLVaZ2ECnMF+ZD4MIIbZuEk
-iWS4ab1rmwRNqAP/ktsA/inoec94lfdjVB6g/4At0Q31kHmPcigaVZmV0sOj7vh/
-=1GEv
+iQIcBAEBCgAGBQJS5NTzAAoJELnU8jG9FVircz0QAImfWQw3u4GnNSSb2EKXMPqV
+0gIv2BK5MdcInn9+Il+sPvg21j4tZkT4XGL7Xc/5AQc7Q4otUeVW3bt+w1t/nSGt
+5VbH8ETPYeg2IBDHe2EoME0g+PQox4xK5qZYcImbkBug2/9bJ7f8Ha5hlaiiLfAC
+n3zSvt5GAKZKZOWlD6UhaX9D6CsjADIx71uc+rqGpbVkbCBsvQes5ov1JbslWIzx
+D3lmo0Nh6lVqMLRqkBFQ6uEb6X3zYIaThPl/xFC3VOfaefGc7iWFVyuE+SMYz4oe
+bSI/0PoOSQPSr7qM7j9lq5F8z5PKhOsxC4wuZpYngxHH+rx6nhF/k7fdW3d4TPGi
+g/5zDSSkh0znz5XN7FBrI+08R67nMm7M0gsObhaTtcNuS2BOjMIZ8bI3mzWgLAkF
+IqUASGpmDoW3w1LLgoSc/pXxguuuXwYs90HYWUqxoe+RzkXNsnSLj3+uYWLZYH/M
+5jxm5G5dvkyz0FhkHiNnGF3uKl+q/fXbUMfbUEhREG17DtZCqIJRCA3CZTrJnX1a
+yAOAGDYxr5UyV8q1+MPPT6+845kgR5TKCDRF/59RRobOa69RGbPyJkPykephPrlq
+TtdHxed4XG9oI5UZTaOuY6eFTQkmC6yDMMevbSUjlcc6DV5JDzzfztbDkznPB6Zl
+YDRNzgF/Mh+rtdE8Cm4B
+=J0S0
 -----END PGP SIGNATURE-----