gentoo resync : 10.11.2017

14 files changed, 0 insertions, 2046 deletions

diff --git a/dev-lang/scala/Manifest b/dev-lang/scala/Manifest
index 6dbbdb77ab96..58be3ca194a7 100644
--- a/dev-lang/scala/Manifest
+++ b/dev-lang/scala/Manifest
@@ -1,10 +1,3 @@
-AUX scala-2.10.2-jdk-1.7-swing-SI-7455.patch 6539 SHA256 161aa9289a46e95a5ef0b596de0b20967cacebce7e27818af2fe384b0cc358e9 SHA512 b2ff90b7bbd45658b503b4b01a380e1f4f99481db3e94e28651862fd48dac6b7e9adcad3244d1cac632a2a8cc55c9616b0b6fd04d7c0b8e0eb3796f67a8c55df WHIRLPOOL aac8cafc94920f8099db3d9339e51d74bfff3f6ecff245c822eef3f8e19e7078158a3c9dec44e818e69fdcdc121f81f0d7e42a25043455c4c59480f07d94f057
-AUX scala-2.10.2-jdk-1.7-swing.patch 11030 SHA256 8a02334c59bfa6ee7edb216dcb2c2010089653e42df8688d97f9bacacbe0e1c3 SHA512 15f2812c204d5ec8b3f3e24356b26118beb00f7a593d976c21725bfc285f257fbd2d8913580d0b758307c3f50763e4f62027de6ad9a3dd4798722e23d0ccec69 WHIRLPOOL 08109cb10f232a2ca86a896d0efaeb08fc5fc85a68487086426c103816a951ff94e6109fbf87f7d6c99772653d167ef4260c640a9e74f2e3bd8daa76b7ea7b46
-AUX scala-2.10.2-maven-deps.patch 3846 SHA256 15a42a970d139ba488c796cf90e6c7b667900a863001676e000747e67fd9bad4 SHA512 91008b42462b4ca2449c83770982cec757e7bd1cb21e1c736f68fa10e52185015aa2985c1442b7808789cbf8652f6547fbc4f07f4ac7b7b8374248ce8e48e8dd WHIRLPOOL 9ad9f710d00f508eebbd2cea9537791a2a1870d53dd6d5721ede966f3e3f4de1756317f08e7d6d880fe1288b41039b1c5609972b79a6e714c143d63f0d133dab
-AUX scala-2.10.2-no-git.patch 919 SHA256 898ef449dc536e1809d1f16870398eb43fc947b51c8cbb6ef99273da6dc8d933 SHA512 7d5be40d7f97bc2c15bd59fb64178e06b3b0be3f88906cd2d821bbb14d6141c03a5da2f3454fd1d02872bcf7ef8582be83cf413a2368ec51336a13b2cd2f4b70 WHIRLPOOL 7a1d69a6c298cf29b274981263f12c0a4ba8be1957b49602e0d56de7af090accc0660c498c9dc6f905214716a5b92a563768fa34e900cf620c230c513283e46e
-AUX scala-2.10.3-no-git.patch 919 SHA256 fb3c9e50302647b198271d5a3185db17e618ae36e47a44ddd6a3e9f31608a671 SHA512 fe7e76871142666ea23ac7d0788f318ba707cb300771b74cc00409d71b602c3dae75bb5a2ddcd5919093f63695fd05d2780b51dc8b2a3240128d2d1c0feb0502 WHIRLPOOL 0008fbef4320f6121a8ad20d6abae3d42b435d91e6f4af289cbe458b2c1d34c061c8e65359d48f8645e0dc27aa5d69b3091aad03e0e14c6a38ffddc83f8a32a2
-AUX scala-2.10.4-no-git.patch 919 SHA256 3d4cf54bde5def9f990e8bafe98a1992e40059b415d682f0d264bcad26a07ad1 SHA512 78a8b85f2151a96b66f7e9d872b40e6d103b55f1372cb5090e5f2c1edae508e434ac7ac9111f2eebd63f0aab41b36d1209ee7ba5deb8c41644184d3c12ebf9e2 WHIRLPOOL 702c1eb5701a997d1b28481caeda2bf7f128cd15cea536cb6cfdcca835850ed96aa9555ef040b926fe40ac6062c0e849fa08219f3db79938c4a4d6f55a61aa5b
-AUX scala-2.10.6-no-git.patch 919 SHA256 e3f3e3e1fdc64200a6e5b2057f4258af0a999dbca7ba1ca0d3f680b726a43d3e SHA512 c0d91463dab1a857ed3e25f9af4a4165c54753550d457b93612595a9ef47d6ca8a4787a44aa529691d1425b9344d77c62381be0954112f53d965dc7882cc748d WHIRLPOOL 2a296b87fcf734deb6aeaedba2784c68b92d4a5cdddfa03722cb04877cdf6d7c3d97044b3d412419e90fbc90e6033fe81b4783785906606387d69781b399b649
 AUX scala-2.11.1-no-git.patch 919 SHA256 27b64c79ab589788562fdb83ffdeef8a39eb7d96d7b163f72609833b05239a91 SHA512 b2ef4da42d192c95a1974ed0caba52b6530c7f77de35cd817520ced906ec72d578ff68212add7cc0f7ded6b2486b03aa0e5f52c094f326cfc017ecc1d97116be WHIRLPOOL ec6e2cce830b12ddfbafe3ff2202e63d79a70b8234f80acfca209b3493df3c23b794c5c0b4f18f6f05a116e7328a7d097d61c3626d7d84d962d03d1709077f33
 AUX scala-2.11.11-no-git.patch 919 SHA256 0f6a302e157c4841d867b76bb4a732222603ed274d5df2e2a286388360bfbee5 SHA512 e6ccbd8ce6ee719e52ed16ef0d344223e93476277f7a131abf8841e82e9660a4fde992cace80f2a0ad5897eaee2920f9b1fbe1a2798b4c25973095018110f4b7 WHIRLPOOL 941c7cd50828e0a115cca6bdd18333473debaa0b62ec3fe6289cae08d26dead30636c4d8d31894c1184e21efd446caf6d51e8fe21fb8f4a31aed0727e61b16a2
 AUX scala-2.11.2-no-git.patch 919 SHA256 d3bb0cd3b00759646409a0f44bb780239c388c062de0c2a08f9858062302c0ee SHA512 26e590dedbedfc072b2613f1445835f5c3d215b5102fcbca8bebfff4908897a6f0e70f014b6597083586453cba6ff7d63e4d12abb25d5ca53002c551fe62c9e4 WHIRLPOOL 7dde4efe4f4cc643878f8b0d38cc48a40c67e8fa5709f2f6bf4b901cd06b745be30ae9115bed30b12639c24b83bcb787ff39ed75d06ebb2e655f289d445b7b03
@@ -15,90 +8,6 @@ AUX scala-2.11.8-no-git.patch 919 SHA256 0f6a302e157c4841d867b76bb4a732222603ed2
 AUX scala-2.12.1-no-git.patch 1226 SHA256 aa7329ed90f5c5a6e8825ba8102f5663ce5896209d5078438bffedfa370aab56 SHA512 e01c99f14e07feb2f7195d1126ba055951b629633f5de6acd9a99305917e5f159d805a68a37e003abb9c96197d7570da13cb88612a384cd5cd6b4302b0825d1a WHIRLPOOL c836365aef5c725c0c96a66db2b9687c6bec54ff351770dc86dc03f52b087a5df37fedf218006a44864e66f51a2a093d6e8507789b3ed768d871a0456fe56eae
 AUX scala-2.12.1-runner-script.patch 1367 SHA256 60d880faaec45c945e594ed2bccf16ba80a194d4b463bcee7453e4ee451ebec4 SHA512 3eb730457f6100b0117c0c7a70d95421fa0a911780d5da02af38abc4ae8747939f9827593695c302914ee6362a0d3d548e54400e807ca450f25158f484fcb3b6 WHIRLPOOL bcc08e1f0106b577ccd2b3dc7efe614b94a6e4ae3ffef200e60e0aa0cae7ecfdf012ff5b207a367aef6085739b393c14a60256d7beae57d6ab037b30406c7639
 AUX scala-2.12.2-no-git.patch 1059 SHA256 0798fc1cb547a7918a6db03d38ba0eef655563c76902e73755932e4b69cb0b8c SHA512 db6515c0f0282e236ad1600b33059e382e2a35617b2f116b86895c4c439430ee7227274ca34c843a1f6a1de932b4e3db7e03b6da060cbff1f0895dd7000f16b2 WHIRLPOOL 6f01a69205382017ffd09f196957131e2c90c32715eca4f5432a516f65ad651f0eb3db1835c420e34d0f78063aa1b1e3363ac14371327898ccf450c9e443e745
-AUX scala-2.9.2-java7.patch 9250 SHA256 a51edce6c6c96549559792faaf201245b5b6724d66269bca44e64e0bb912b87c SHA512 5e038663166e5702bedc9c93aa4b6461c5efefac1a5896c231510864e646c04998a818854a06a476ca98517e67b30db619b24a45031adda6230b1446fc461d13 WHIRLPOOL c1f14d93dcfa88c77b0b057c84f4072bf4737796609ca553cbda001a56f52ca07022394ca41716d80d59174be09cdd88da2b3eb726c00c6c35d91c9cffaed233
-DIST annotations.jar 2242 SHA256 f2d057a006bba4253d069795284a7610f1c837af6a80c0057736099962e24bcc SHA512 3ceee0b1361b9e0911c1ff060ad108a1d93f7ea3e82ef946401cd5f895cb06016ac0ecdfd095f99b11cfb28c4cef7705c1b564c7af644c5f19b45c14a413c4dd WHIRLPOOL 51fa0efc5dd14cf8364e9639375511fc3e716bd520a193e6c17a2fe3f02eebd1529eb98fd3b382a6386baa5b779ebd0327e8f141aee172d11d9548d9921c58e1
-DIST ant-contrib.jar 224277 SHA256 be33a69818310b5c55e41dc11d48cd895f5f129da4b0d28c2f4c6c3e1cbcf3fc SHA512 5ec325a55bb213226c86faf8a99951839319e9579956ae58e2ccfe84f62d2742542998f98eed3f0dc8f8f94635d6dff1fe02e3c0f5289df1f09027ae2b9bee83 WHIRLPOOL aa713cc04b10c46adbbb8a5904e3fb34c6e32b67bb9a5f1a89768ceab8c31b977875c84434bc03c5b42105a4019f55cc10d806b0345c365a309e93d3f02e0a10
-DIST ant-dotnet-1.0.jar 57795 SHA256 40c18fcfb8c28e4ee82e53f72a3257db43bcba01e16ebd5a4550fc419edf30c1 SHA512 72afc387cf9dbeb99e627ca7f35f919f627bbf3f072eb46036120695fb70311490593c255c2a2e79b684adb8f213d8ab591d4ceda5d5f2e6b6906a6977b38867 WHIRLPOOL 18aa33fe259bd52e2f37b903be39d462e8622ff744f990fc92871eaa4fe10ff69cd25b2c968cc353b3c5138cd3fffd755715aef6bb16c57b0b72e7e5fd1975e1
-DIST ant.jar 1506140 SHA256 0251dbb938740ace07a53675113eee753ba389db65aebc814b175af50321620e SHA512 ddee72ca62adb20e700022609749a4d6cc848c94e597a7450226770c8b97aa2c1f7f23b7a1c6ac8acd63047101997ebd68c19b393ebffde9ff5c7bb1957cd18c WHIRLPOOL 1b2b7e0289cb16f5131a9c0b1b6eb1279011e7af79fc470dd6dc2047afc7fa99bdeec6d9db4f46adb83f6110593118d0909a4b1fa6b01dc56890bf6d2785373b
-DIST code.jar 683 SHA256 4a03a08954e6b912a469b5e0db898247ea3ebc25b641f328e80f19163a0d908a SHA512 d963c186f3029858b1f6b53cf6e3470946365f13a6bcc334a7c959fd449dace10a953c496dbf3036828f2b5e5ad17d22f5e3912446bed14bd71b2f0de2f6c767 WHIRLPOOL 06e44b713306b3bdb7e878db1598546b45857091eb457c0fdba738d5f8c4de726920532e5cdf10260002c69299bd2756df52f407373053c5883e961899624d85
-DIST enums.jar 1372 SHA256 95c53606c7113333ef95b4efbd3ae08af715ca49f71845a5d33150e6b7e9a072 SHA512 3d2356b9f610e98a03f64cbdd18ee36138b68ba5b170bb9b78bc7449439c3870f6f5bc795f3e1b8d325daf468ae85c581b60d1d360c1ae68c70792ad62b9c1dc WHIRLPOOL 30b26ba56a36272cf5973d3a89850cb3f5bff6c45a7a6bbd6ccf4ff342720bba89dfc0cdbe10058b770b7e73093ea948e574d5e081c36ab866f3bea9f0e14f95
-DIST fjbg.jar 130039 SHA256 a5acb5ca309b764a72e436fc770103277f4151233519b9ce7074f8000d259d6b SHA512 68f0bf76337fb243b9ca901eab985cfeb897d79d07ba81aaae516c890bbfb600a370c1e1df505275a12c723212fd88b5a03e97c73013d912be1be860d214e5ea WHIRLPOOL c4390956a00fad5a16018d5d4747e8585ba707339738b3e0c304a7093c4c8fd11111349377951916cee78c312735e823ee5e4ced19a1f568598e8fd553952426
-DIST forkjoin.jar 60850 SHA256 4007ca649f037ed5ecc87c74529f499b75ed1a0f3f78e8f82cd97a71f5d2d5c7 SHA512 702370f2654b1c06f340c100078c630a82808e56c4dcc323881d6547945ce028345a5ee3048cbb9502a3b340b1d84ab5a635f80dbb381fdd88cc25b60cad768f WHIRLPOOL 9d561c9872c140e266efefb1c1afe76a2754eda32357718d048ff0896d6a2d14f168e1e2eddfcb37bbd0ac07fb7a7079b63e0f512946a7e30ff62883ee8bfd84
-DIST genericNest.jar 1136 SHA256 c2c23341eec9fb379b57d7bf1156fedb3e2b9f97d2d5729fbfc7d766fd390faa SHA512 32c3b3e14bc72db2572bf120c1fda49a369b27ff8ae6ae12f6d7b12fdffef4064b515671c8f1b6dbfd78209247f6a7b7b26e700dd70a105de3ca59f5185ff9d6 WHIRLPOOL 61b2d9f840fc0ed86a8207cf353a2f7b9bf8523d31b4e8f74eb21ecac1a405ed04c5a4a8e78a13d64b2dd186a7ec3885cd5e2514ad572e600e5744c3f15f74c5
-DIST instrumented.jar 31725 SHA256 8a424c8bd5805ec429a9477cbd0f44bf65a2b79b720d438bfd347dba8da06484 SHA512 b1d77c4380a2b8ffe715ec106e58081e5c89e314c5a13071d627c3f974144ad453e79d405cd722d75095b62e8682b7414d40b691506c7d2f5dde62e2fce51e39 WHIRLPOOL 5ef8ee89b3fa66bf5025fd1b5db65d4d628b3452ba8530e3c3b1dd530fb5286fe3acee2cf56de09148cf2d37968626708690cc03da202cf3d58159cfd56fe8bc
-DIST jline.jar 164623 SHA256 813f2bc34a096cc7780c6946acf401c82e739cf9d5359edf414f74662137d3b1 SHA512 2d97f0d1bc1df67423f54102f8b360a6dba0bfac67ba12673e781d9461485a6124cf985cbab96283af7b366a8fb53e526aa667ccec466aae7002d5030f2e1369 WHIRLPOOL a7c848acf502c2247d0a9c83fa45295e5ede7487ac2129e50d4bd05a0271050b274cd25af24fb4215dc20283ca7df750618b31fea8973fffa125a3fb37f33bf3
-DIST jsr166_and_extra.jar 728574 SHA256 e33a59e291bae8dbd2b37c6a4d5eae459a313db3a588f42c59ac5fd8edf6e13b SHA512 40d949cfefc5111c79b79f085657d56aa046d1b318e6ad78de5869f61a6515c2076b70344be5ae3fb93a7b3f54f46a129e2536515b258e0d5bf2e670c5001306 WHIRLPOOL ef8414d7862736cf072ff60fff5008f38dadcf826364cf21929fdfca7d331872d8097e6a6907dd500ef5d5a68964d8c2ed9ebeedf6470dc25ede269c1a8172b5
-DIST maven-ant-tasks-2.1.1.jar 1314262 SHA256 b8891b4a90aca2793ad385ab57216f51c4879c6ab7e927354f407b46510cab51 SHA512 e3f0ff1d41ec31b2b64acb2ebcc175709714033589cb8e763f94aa80359c84f5d960c46dae713c9e37e1a09b977e7da617f8fe10a5b6fb30c55efd19bc307e68 WHIRLPOOL 73c44ea6aba4a3c697f64d08475b4c17bdc929ac9f320a25714fbe7cdc2939ad334deb7a90eb6c950cce8ba402d19bc2615a104788bafed7d247b997d3146743
-DIST methvsfield.jar 609 SHA256 730b33d098319d969760f2250dc6924c9f85f94a8a2eb2b2a025dcf05378d9c6 SHA512 6db923ed7059bc91c8442d5804ccd8336e94f5202b3dcc348a4eb5026f09e1e86862f6e94818beae9ad42fcdc8e51df4d59a27109903a8ccb78054425ae47a71 WHIRLPOOL d5362d5fc2795ff0671f386429840bb4f84173f9308e34c2b0eb585fb7cacbd308ab87c42f2fd407597abc4f010e8ffde600dd30addcd63c2d71c2d5f22f1582
-DIST msil.jar 298973 SHA256 5b9e6dc2f4dd79644a1480b7cb4db053d73fc5d0e41015b95f15ec4dacf2da0a SHA512 1e9be7bfea639cffd638c78b4368f599753e8bd4df8f9b3c192b72c2860d6f96002c94fcf751e9c6cdacfead1ae3bd851d61395ce83c49d66f801284bd2046dd WHIRLPOOL 3828f08bb47f038d3f6e52c0d077cdecd06195de3d29b326833f47a6713bbab644ddcd20b8d39aa814d25637dae31adc1d0f0aec6f489857d7b115aeab29a301
-DIST nest.jar 2920 SHA256 3c7cf1a1b9fe9ad2abf3bfcedaa17a976c72f4bccb0e0c7dbcf7ecf27bc20aa5 SHA512 5eaaa870e06b5e00efb1f6ccced71343e8aa01578ea2b320b2d051f2df3713df9c500f074cc74a9e3c5cc509e03cf9c71265329bf2ddb3e82cb331524202fa38 WHIRLPOOL 1d73b612946a6a226841d3e0ad8cb3ebb06997c70e94feb1f9236e4e58a93c429cc7cdecaa4175fd5b78920253bcc157f798593b6a8eacb873b3d9a51284be34
-DIST plugins.jar 4181 SHA256 13313e0c3a42bb401377ab4f228e3c81db482c8f33295c6a1d021fc3c9727871 SHA512 d44427df9acf4611acb492b6268b65f63a8be2d47ef29598bf5d242f702af57f0ee2eff52378b8371755d5ddf58c79d48b18a6a056ee9fee5091e478ce5ec1a2 WHIRLPOOL b2e846b5965ea7f04844b4c49e3fcc2f5b3f0e31669a662557bd36a113dd94372bae55d46f1986e03099c6f51217bf10986e5e265874854ba479c36d041a1e41
-DIST push.jar 8886289 SHA256 58eb2b8c501bbff0e78074a058e3fc160012a80952c1cc96ed301d8a08d7e98d SHA512 b5539d381c8978ac57fc4258696e4cb552f47917178152b38b5683e42ed60da4d9da198a0344652f201541a71f92afd2ac8b3c3d3ec5266a8c222e9661d8a06a WHIRLPOOL 8fa6522a0fd9939f4ffd443b55e7a5adbb93a9dc5cbad569ccecd6be77ecd259eadbdb16c2c7eab6d9f175fbf33746faf9c41cf4d1050e7f576b86119301e126
-DIST scala-2.10.2-gentoo-binary.tar.bz2 42071067 SHA256 0e47e9585c67971f319782fe81214fd7babfbc8cfb28108f5dc3f12d16bb0f35 SHA512 e207c4b12f5c89e24d48c37a3342280bf93447c053ae2bc58a5b389439633d332eaa444119d73967e23bedd36b0f4349d6d075469e7cefa1d2f7dce32dfb6af7 WHIRLPOOL 52bdd96fc742904bc222a3944adf33898b3a07b28868ee598852554b00f677294522332eecd293fb8c62dc6800a0264ddb9167b36054a37040323277de5d884a
-DIST scala-2.10.2-maven-deps.tar.gz 12324758 SHA256 0880b9f2ab27e2e5afa315bcfd84a5fa7348f0b0d6e4184ad2793862df939676 SHA512 4ddf0b76724609940fe732335b3b34ea41405bbf39d91312b4db3b79d5682c0ef98020b7e0dabf098acc94d782300e47c7b80ae1f6f1b82f4358de859086575f WHIRLPOOL 8d13459a2026b9e304d649aa93abab200648ab3f54d1b870572d2a0a4526b7fc7c5febd2e2e65d7d032404036a8db2d2cb46a88cd41474735e569008359e13b4
-DIST scala-2.10.2.tar.gz 5526015 SHA256 c0b7e41924a2673e8cdf8af364e5c3249f7c52a5f931693301493ed71cc7ef32 SHA512 61be047c50f5919c1ba3e4f665a1a1f4c6f7fcf5061f94816e385b97fdec139e381cc2a3df720b3679c3056cbc5baa6d4f8cf1e53923c5b5cad37f522557dc85 WHIRLPOOL 8bf09843bc824941ae4be7875515c4c03f68fa865f1b56180bedef0c9b8e8328badc091d4eff655df3cf7729a39f117e9f129f4b7eb388cb27361d8bc611857f
-DIST scala-2.10.3-gentoo-binary.tar.bz2 45352632 SHA256 f9ecad6bf7c59496233ad080c9b11cd75ca28e324e368c0551665837cc10e2d6 SHA512 1e61748e68d32c88cc1e6812514a37f15894220d0256237bf82897dfc9f5f0b2d0d9c4f6536e49daf62f72113d4e43635d2abd93d848ab828a0e67e2a5c6ef68 WHIRLPOOL 9f2717d926622a0cf4bf61aa140dca6d1c8a95dc397b16b32e00ce2979b8bd2347608ce4eb3a30e1721b852b50a85358f564e8718994a2957914efd06420a37a
-DIST scala-2.10.3-maven-deps-2.tar.gz 6614692 SHA256 32e8d5a71dcf6432bb4554a0f346561eea621c567d154a7820d7b4f532a6b194 SHA512 50010e79656b60fb28501f255634e28ba4fb3a65c7790fc5db4651460921310e0e469e08cad38295afe9a58a39c8af7bb6c0c2e800096fbcdd3055534f17ebb4 WHIRLPOOL a9866879f25bc3d765f2905d6321298d71abcb98b7f3d65f951ac2dcc4cfa0e7dbec4872fe928049239e251a91fd637d3cfad2782d0dc59d215bf0d295407a4c
-DIST scala-2.10.3-maven-deps.tar.gz 5715856 SHA256 1fdabc22fdef4ddd7ed31dbedf97e216cdd11d27d702475f30d0b459da8f22f8 SHA512 c05555d07777e0c325aadfcec1cd10381cdc95945acc262925992918fcc321e51a20454dd19b4111b1fdcc14bd32e34ba5fe853e45e9b4467771186242a85335 WHIRLPOOL 11773fc2862fa0a27b4ad204dafd4723b478552f1557180b316932edc3657d3e68b1f8ce12a9bfbedf55598c656a196850586fbe7998fb2a28f4fd58cf5d1c55
-DIST scala-2.10.3.tar.gz 5570015 SHA256 4cd9c67d73fb98942b78982bcfc8f4da8522e3fb3dc3210dfb7f60f749389d29 SHA512 b78d8d6a759b3de8010093dfc4104a86b0084fc466bd739ea12a7b015aef07a09e6793c4d0bb146904faf1a0cf6f60e6ea68843aef6616b7dc682a3f3e89e528 WHIRLPOOL 41caa0c54363c116c023f60699fe9074abea646acd4dcaa24336a8925d3f04ef1443a4ed397c90e966374d99097663315c47bc9088725276c91986bd4a99f45a
-DIST scala-2.10.4-annotations.jar 2242 SHA256 f2d057a006bba4253d069795284a7610f1c837af6a80c0057736099962e24bcc SHA512 3ceee0b1361b9e0911c1ff060ad108a1d93f7ea3e82ef946401cd5f895cb06016ac0ecdfd095f99b11cfb28c4cef7705c1b564c7af644c5f19b45c14a413c4dd WHIRLPOOL 51fa0efc5dd14cf8364e9639375511fc3e716bd520a193e6c17a2fe3f02eebd1529eb98fd3b382a6386baa5b779ebd0327e8f141aee172d11d9548d9921c58e1
-DIST scala-2.10.4-ant-contrib.jar 224277 SHA256 be33a69818310b5c55e41dc11d48cd895f5f129da4b0d28c2f4c6c3e1cbcf3fc SHA512 5ec325a55bb213226c86faf8a99951839319e9579956ae58e2ccfe84f62d2742542998f98eed3f0dc8f8f94635d6dff1fe02e3c0f5289df1f09027ae2b9bee83 WHIRLPOOL aa713cc04b10c46adbbb8a5904e3fb34c6e32b67bb9a5f1a89768ceab8c31b977875c84434bc03c5b42105a4019f55cc10d806b0345c365a309e93d3f02e0a10
-DIST scala-2.10.4-ant-dotnet-1.0.jar 57795 SHA256 40c18fcfb8c28e4ee82e53f72a3257db43bcba01e16ebd5a4550fc419edf30c1 SHA512 72afc387cf9dbeb99e627ca7f35f919f627bbf3f072eb46036120695fb70311490593c255c2a2e79b684adb8f213d8ab591d4ceda5d5f2e6b6906a6977b38867 WHIRLPOOL 18aa33fe259bd52e2f37b903be39d462e8622ff744f990fc92871eaa4fe10ff69cd25b2c968cc353b3c5138cd3fffd755715aef6bb16c57b0b72e7e5fd1975e1
-DIST scala-2.10.4-ant.jar 1506140 SHA256 0251dbb938740ace07a53675113eee753ba389db65aebc814b175af50321620e SHA512 ddee72ca62adb20e700022609749a4d6cc848c94e597a7450226770c8b97aa2c1f7f23b7a1c6ac8acd63047101997ebd68c19b393ebffde9ff5c7bb1957cd18c WHIRLPOOL 1b2b7e0289cb16f5131a9c0b1b6eb1279011e7af79fc470dd6dc2047afc7fa99bdeec6d9db4f46adb83f6110593118d0909a4b1fa6b01dc56890bf6d2785373b
-DIST scala-2.10.4-code.jar 683 SHA256 4a03a08954e6b912a469b5e0db898247ea3ebc25b641f328e80f19163a0d908a SHA512 d963c186f3029858b1f6b53cf6e3470946365f13a6bcc334a7c959fd449dace10a953c496dbf3036828f2b5e5ad17d22f5e3912446bed14bd71b2f0de2f6c767 WHIRLPOOL 06e44b713306b3bdb7e878db1598546b45857091eb457c0fdba738d5f8c4de726920532e5cdf10260002c69299bd2756df52f407373053c5883e961899624d85
-DIST scala-2.10.4-enums.jar 1372 SHA256 95c53606c7113333ef95b4efbd3ae08af715ca49f71845a5d33150e6b7e9a072 SHA512 3d2356b9f610e98a03f64cbdd18ee36138b68ba5b170bb9b78bc7449439c3870f6f5bc795f3e1b8d325daf468ae85c581b60d1d360c1ae68c70792ad62b9c1dc WHIRLPOOL 30b26ba56a36272cf5973d3a89850cb3f5bff6c45a7a6bbd6ccf4ff342720bba89dfc0cdbe10058b770b7e73093ea948e574d5e081c36ab866f3bea9f0e14f95
-DIST scala-2.10.4-fjbg.jar 130039 SHA256 a5acb5ca309b764a72e436fc770103277f4151233519b9ce7074f8000d259d6b SHA512 68f0bf76337fb243b9ca901eab985cfeb897d79d07ba81aaae516c890bbfb600a370c1e1df505275a12c723212fd88b5a03e97c73013d912be1be860d214e5ea WHIRLPOOL c4390956a00fad5a16018d5d4747e8585ba707339738b3e0c304a7093c4c8fd11111349377951916cee78c312735e823ee5e4ced19a1f568598e8fd553952426
-DIST scala-2.10.4-forkjoin.jar 60850 SHA256 4007ca649f037ed5ecc87c74529f499b75ed1a0f3f78e8f82cd97a71f5d2d5c7 SHA512 702370f2654b1c06f340c100078c630a82808e56c4dcc323881d6547945ce028345a5ee3048cbb9502a3b340b1d84ab5a635f80dbb381fdd88cc25b60cad768f WHIRLPOOL 9d561c9872c140e266efefb1c1afe76a2754eda32357718d048ff0896d6a2d14f168e1e2eddfcb37bbd0ac07fb7a7079b63e0f512946a7e30ff62883ee8bfd84
-DIST scala-2.10.4-genericNest.jar 1136 SHA256 c2c23341eec9fb379b57d7bf1156fedb3e2b9f97d2d5729fbfc7d766fd390faa SHA512 32c3b3e14bc72db2572bf120c1fda49a369b27ff8ae6ae12f6d7b12fdffef4064b515671c8f1b6dbfd78209247f6a7b7b26e700dd70a105de3ca59f5185ff9d6 WHIRLPOOL 61b2d9f840fc0ed86a8207cf353a2f7b9bf8523d31b4e8f74eb21ecac1a405ed04c5a4a8e78a13d64b2dd186a7ec3885cd5e2514ad572e600e5744c3f15f74c5
-DIST scala-2.10.4-gentoo-binary.tar.bz2 59680465 SHA256 4225042bfe9c066c05c4d70383c27f48994f0e9733c5b3c4d4b970fe3e5f8c62 SHA512 ab4199652395215557bcb1d424227604e86bcd2278d556ca9f9130a534f70be39a74a36dfbeacf5125fd6ad9044770bb8c0cf068cca46d100c7e880df1c0d479 WHIRLPOOL 43a99bac419e2d23f01159becc546c633a25137eee033c2057486652ecfa6f98151f2fd60fa73e8e87bbece562c837da2340b3957037fa23c13bfeb1af28e91d
-DIST scala-2.10.4-instrumented.jar 31725 SHA256 8a424c8bd5805ec429a9477cbd0f44bf65a2b79b720d438bfd347dba8da06484 SHA512 b1d77c4380a2b8ffe715ec106e58081e5c89e314c5a13071d627c3f974144ad453e79d405cd722d75095b62e8682b7414d40b691506c7d2f5dde62e2fce51e39 WHIRLPOOL 5ef8ee89b3fa66bf5025fd1b5db65d4d628b3452ba8530e3c3b1dd530fb5286fe3acee2cf56de09148cf2d37968626708690cc03da202cf3d58159cfd56fe8bc
-DIST scala-2.10.4-jline.jar 164623 SHA256 813f2bc34a096cc7780c6946acf401c82e739cf9d5359edf414f74662137d3b1 SHA512 2d97f0d1bc1df67423f54102f8b360a6dba0bfac67ba12673e781d9461485a6124cf985cbab96283af7b366a8fb53e526aa667ccec466aae7002d5030f2e1369 WHIRLPOOL a7c848acf502c2247d0a9c83fa45295e5ede7487ac2129e50d4bd05a0271050b274cd25af24fb4215dc20283ca7df750618b31fea8973fffa125a3fb37f33bf3
-DIST scala-2.10.4-jsr166_and_extra.jar 728574 SHA256 e33a59e291bae8dbd2b37c6a4d5eae459a313db3a588f42c59ac5fd8edf6e13b SHA512 40d949cfefc5111c79b79f085657d56aa046d1b318e6ad78de5869f61a6515c2076b70344be5ae3fb93a7b3f54f46a129e2536515b258e0d5bf2e670c5001306 WHIRLPOOL ef8414d7862736cf072ff60fff5008f38dadcf826364cf21929fdfca7d331872d8097e6a6907dd500ef5d5a68964d8c2ed9ebeedf6470dc25ede269c1a8172b5
-DIST scala-2.10.4-maven-ant-tasks-2.1.1.jar 1314262 SHA256 b8891b4a90aca2793ad385ab57216f51c4879c6ab7e927354f407b46510cab51 SHA512 e3f0ff1d41ec31b2b64acb2ebcc175709714033589cb8e763f94aa80359c84f5d960c46dae713c9e37e1a09b977e7da617f8fe10a5b6fb30c55efd19bc307e68 WHIRLPOOL 73c44ea6aba4a3c697f64d08475b4c17bdc929ac9f320a25714fbe7cdc2939ad334deb7a90eb6c950cce8ba402d19bc2615a104788bafed7d247b997d3146743
-DIST scala-2.10.4-maven-deps.tar.gz 35071635 SHA256 906e515af637444bcf31110ff56ac34278dc433f6438a97f3f3e3fa080130cef SHA512 724eea3b041b78975c27578bc285dedb0b472801c34406496adfaaf58d4a058eeff17ad19377e3a092844a23ae0a5a9aeb9787689109ee2cc4df33e7f2f049b4 WHIRLPOOL 5a85030f77c88b74a457da0b56577a563a1385f26d08114032681923005cc16dd59f77295aadac4dd1b5d1c83098539600a7857a59bb5da48096595d733d3993
-DIST scala-2.10.4-methvsfield.jar 609 SHA256 730b33d098319d969760f2250dc6924c9f85f94a8a2eb2b2a025dcf05378d9c6 SHA512 6db923ed7059bc91c8442d5804ccd8336e94f5202b3dcc348a4eb5026f09e1e86862f6e94818beae9ad42fcdc8e51df4d59a27109903a8ccb78054425ae47a71 WHIRLPOOL d5362d5fc2795ff0671f386429840bb4f84173f9308e34c2b0eb585fb7cacbd308ab87c42f2fd407597abc4f010e8ffde600dd30addcd63c2d71c2d5f22f1582
-DIST scala-2.10.4-msil.jar 298973 SHA256 5b9e6dc2f4dd79644a1480b7cb4db053d73fc5d0e41015b95f15ec4dacf2da0a SHA512 1e9be7bfea639cffd638c78b4368f599753e8bd4df8f9b3c192b72c2860d6f96002c94fcf751e9c6cdacfead1ae3bd851d61395ce83c49d66f801284bd2046dd WHIRLPOOL 3828f08bb47f038d3f6e52c0d077cdecd06195de3d29b326833f47a6713bbab644ddcd20b8d39aa814d25637dae31adc1d0f0aec6f489857d7b115aeab29a301
-DIST scala-2.10.4-nest.jar 2920 SHA256 3c7cf1a1b9fe9ad2abf3bfcedaa17a976c72f4bccb0e0c7dbcf7ecf27bc20aa5 SHA512 5eaaa870e06b5e00efb1f6ccced71343e8aa01578ea2b320b2d051f2df3713df9c500f074cc74a9e3c5cc509e03cf9c71265329bf2ddb3e82cb331524202fa38 WHIRLPOOL 1d73b612946a6a226841d3e0ad8cb3ebb06997c70e94feb1f9236e4e58a93c429cc7cdecaa4175fd5b78920253bcc157f798593b6a8eacb873b3d9a51284be34
-DIST scala-2.10.4-plugins.jar 4179 SHA256 929863f42c87921e203665006e8b3dd9a1cce7733c9441ab9b82c891729b8372 SHA512 d55b72473f124443673693f5df8f7692558d87e6ef352d649eda5a706297fe7a9d47580b1d80db5119529cce5467e0aa211bc6c56c236de26bd51de36963e5cb WHIRLPOOL 7ce16b8db4eee26716342e682fa4d0e968c18c941a75efd87d102df35b38f9e9d40a51e3ae16fa55c954842e69a1f2a19e02a21643b5e36b866f70560cfb36e2
-DIST scala-2.10.4-push.jar 8886289 SHA256 58eb2b8c501bbff0e78074a058e3fc160012a80952c1cc96ed301d8a08d7e98d SHA512 b5539d381c8978ac57fc4258696e4cb552f47917178152b38b5683e42ed60da4d9da198a0344652f201541a71f92afd2ac8b3c3d3ec5266a8c222e9661d8a06a WHIRLPOOL 8fa6522a0fd9939f4ffd443b55e7a5adbb93a9dc5cbad569ccecd6be77ecd259eadbdb16c2c7eab6d9f175fbf33746faf9c41cf4d1050e7f576b86119301e126
-DIST scala-2.10.4-scala-compiler-src.jar 2462738 SHA256 ca43298237583dfd362ab4d773ef0f791a075d9187ecf30cc8ee4f4b7ae12e76 SHA512 a71eab8ada2fd23aa1408577dc3bde28847484643618a752ab68bbe5c8a4ef19ad852ace6f44c8e66668e6b6098de8b0cb3eb8d0c4674ed332562463b43a8a38 WHIRLPOOL 8cc711357fe2b393c1e28a3ebd0249fb633c1135c6c4d8819c6ab14081c9fbbb4c1e0a6b84eb9a5711c9874814e54676905da90a1d8d6c5e28213e189bb0f37b
-DIST scala-2.10.4-scala-compiler.jar 15095501 SHA256 dbad9d1e0e300c62945d8d8aa21ebfa614e1f7b1c8378550b0314aa006be21c0 SHA512 98588884da2a01af5df9898f5d3055cbf5fa04af7d5f87bd6076dbfca329a7f2fa5645fa87cc14720204e00dc540971f8c44b2233fd4706db0df00ce8978349f WHIRLPOOL 311db7bc73ac1584403b12ea8c712a4b6a0450c502328ac26d7d9e051db4f5dd185dfc1c7c8304d32991c374fc2ed3c89cf8cfd61759f9049e1b5e55f4a7c54c
-DIST scala-2.10.4-scala-library-src.jar 1378653 SHA256 4a347825a0856a14803ec2c9cc205e192f19f15e417d334f4d22276d898d0dfd SHA512 06b0944c53b145c71239ec5aa90a78fbdee8130508f02d6cecd4c6c5e26878f19751471ba5d54c80e8d1380645787512c6e7566471675f0c9e3f0c29e38b4ff7 WHIRLPOOL 27fcbc2e52d52b30a8d0f1d68caaf8fb0f201d1509609aa361aaae412f0ceb6d95e6c3c4210b60027eae1ebb406ba3bdad770a2b087145572255b452bf0028bc
-DIST scala-2.10.4-scala-library.jar 7113040 SHA256 66057366dc9c541d0fadb7f64a4e06f7c5c86a90b289d724e7db0153b7e92c2c SHA512 af8a57145c8bcac6f72abade3b21f066ae082c7ab858c3a7b0641240fb99fe24bac3c224b7b1418c47c852793cecc7e8f5838e0cf6ae2b78ee538839cebdffeb WHIRLPOOL 29cffc4e84730549ed25384411e1a9341f56d348800d1bbc04958d88071e0c36b7290969b8f9d6ea865d9c82fbb76b1727cf66b81e420950c7ad356f2bd02aea
-DIST scala-2.10.4-scala-reflect-src.jar 467879 SHA256 45846f176eba3e072282b597fbea58977e1ac08d7161571e2601a86adbff4e35 SHA512 c172be4d0ec724be4f62cbcaf848a71c99cffc706fcaa5b46fe2970088ba9a8f406d42728f64a0dfdef1cbe18e313b8be8142d68b9b3d7a592dec5e1fd7366b6 WHIRLPOOL 876bd9e3186d76d351e128cf990789459b51bca1ad6e4f51aa397d1941311ed51a1048188a4b94bd8709551c0cb3ab3985d3a1534594bb840082d0b555496d7c
-DIST scala-2.10.4-scala-reflect.jar 3307596 SHA256 910b58279250371e034859227fb5d9015297eb6bf607f9d3ec0836a822c1fff0 SHA512 466c55b8ce98e48f851c446b986388351ac4b0fb2b0cf6888d56fe2a4af1f5f3916e78f3fdea395ee18ef0a5128bc6b0d4cdcdce8f5b0f2fcc30c2bdbd41eb40 WHIRLPOOL 73a42b7b557bf29d14511f798e22f1ba8039e7c41bb165d9a4be7c66d393fa63c2836239fca56158eb2c5dd07567b1febb18d9f4f514de48e0c6ec5d155a46a2
-DIST scala-2.10.4-scalacheck.jar 763570 SHA256 96814bea5818186086473da5c657191d03145649eee0c300abec9c3380fdd418 SHA512 5383e80dbcb11cb3fba033bd6a0e8c220ec3dd6fc153062b9d44d346ff17bea014a8c7a412af85ff487a34011cdc2042191c4c4ad66ea44eb7eba139a0b358d4 WHIRLPOOL d6276010ce4d1bcc647e1d7673cc18f645ac92abf03c4aa5be03735853a33692763883fcd8e325d36b2a18cca758d6f1636294b182f247da1094c82476f36b58
-DIST scala-2.10.4-vizant.jar 15910 SHA256 a54e19093725d0d085544553246e48607c1e6ab65575ae0ff721b788118461d6 SHA512 4464d7349016f4999199e227e8eaf7bb3ef6b7e38ad0e8e710faad55df2e1243d99b53b9a789a1ffd3c39aef0d979dffc543f4691feae68cfa743e51bcf61390 WHIRLPOOL 1b957b8b850f79309c3577a2dcac52a620fa54f810f242a02c52bbcee1cc9c5818785baa7db8e2b82b850bcb56b528c4dd07cdfad2f991c0025293ca02c0dc99
-DIST scala-2.10.4.tar.gz 5510555 SHA256 d67ed8747bcdf5a598688d027be418790b59158c5dee5b46f51a88b067da59f3 SHA512 1d26d78d120377ba376b507ea484c245bfa289d55b6838211e8e7d2ca38fc7e6d6375e9467bad528d9d51a9eff9c766fbaf452a851e88f156295d89827514e26 WHIRLPOOL 0997c7c1489fa5438c54ffc4d44d32bdb4b6868455903448a6d9c5f9a3ee43fb1cd68ce00ecacacdaf667214cce6840054f3204647af391e48ae05dc5422ab3e
-DIST scala-2.10.6-annotations.jar 2242 SHA256 f2d057a006bba4253d069795284a7610f1c837af6a80c0057736099962e24bcc SHA512 3ceee0b1361b9e0911c1ff060ad108a1d93f7ea3e82ef946401cd5f895cb06016ac0ecdfd095f99b11cfb28c4cef7705c1b564c7af644c5f19b45c14a413c4dd WHIRLPOOL 51fa0efc5dd14cf8364e9639375511fc3e716bd520a193e6c17a2fe3f02eebd1529eb98fd3b382a6386baa5b779ebd0327e8f141aee172d11d9548d9921c58e1
-DIST scala-2.10.6-ant-contrib.jar 224277 SHA256 be33a69818310b5c55e41dc11d48cd895f5f129da4b0d28c2f4c6c3e1cbcf3fc SHA512 5ec325a55bb213226c86faf8a99951839319e9579956ae58e2ccfe84f62d2742542998f98eed3f0dc8f8f94635d6dff1fe02e3c0f5289df1f09027ae2b9bee83 WHIRLPOOL aa713cc04b10c46adbbb8a5904e3fb34c6e32b67bb9a5f1a89768ceab8c31b977875c84434bc03c5b42105a4019f55cc10d806b0345c365a309e93d3f02e0a10
-DIST scala-2.10.6-ant-dotnet-1.0.jar 57795 SHA256 40c18fcfb8c28e4ee82e53f72a3257db43bcba01e16ebd5a4550fc419edf30c1 SHA512 72afc387cf9dbeb99e627ca7f35f919f627bbf3f072eb46036120695fb70311490593c255c2a2e79b684adb8f213d8ab591d4ceda5d5f2e6b6906a6977b38867 WHIRLPOOL 18aa33fe259bd52e2f37b903be39d462e8622ff744f990fc92871eaa4fe10ff69cd25b2c968cc353b3c5138cd3fffd755715aef6bb16c57b0b72e7e5fd1975e1
-DIST scala-2.10.6-ant.jar 1506140 SHA256 0251dbb938740ace07a53675113eee753ba389db65aebc814b175af50321620e SHA512 ddee72ca62adb20e700022609749a4d6cc848c94e597a7450226770c8b97aa2c1f7f23b7a1c6ac8acd63047101997ebd68c19b393ebffde9ff5c7bb1957cd18c WHIRLPOOL 1b2b7e0289cb16f5131a9c0b1b6eb1279011e7af79fc470dd6dc2047afc7fa99bdeec6d9db4f46adb83f6110593118d0909a4b1fa6b01dc56890bf6d2785373b
-DIST scala-2.10.6-code.jar 683 SHA256 4a03a08954e6b912a469b5e0db898247ea3ebc25b641f328e80f19163a0d908a SHA512 d963c186f3029858b1f6b53cf6e3470946365f13a6bcc334a7c959fd449dace10a953c496dbf3036828f2b5e5ad17d22f5e3912446bed14bd71b2f0de2f6c767 WHIRLPOOL 06e44b713306b3bdb7e878db1598546b45857091eb457c0fdba738d5f8c4de726920532e5cdf10260002c69299bd2756df52f407373053c5883e961899624d85
-DIST scala-2.10.6-enums.jar 1372 SHA256 95c53606c7113333ef95b4efbd3ae08af715ca49f71845a5d33150e6b7e9a072 SHA512 3d2356b9f610e98a03f64cbdd18ee36138b68ba5b170bb9b78bc7449439c3870f6f5bc795f3e1b8d325daf468ae85c581b60d1d360c1ae68c70792ad62b9c1dc WHIRLPOOL 30b26ba56a36272cf5973d3a89850cb3f5bff6c45a7a6bbd6ccf4ff342720bba89dfc0cdbe10058b770b7e73093ea948e574d5e081c36ab866f3bea9f0e14f95
-DIST scala-2.10.6-fjbg.jar 130039 SHA256 a5acb5ca309b764a72e436fc770103277f4151233519b9ce7074f8000d259d6b SHA512 68f0bf76337fb243b9ca901eab985cfeb897d79d07ba81aaae516c890bbfb600a370c1e1df505275a12c723212fd88b5a03e97c73013d912be1be860d214e5ea WHIRLPOOL c4390956a00fad5a16018d5d4747e8585ba707339738b3e0c304a7093c4c8fd11111349377951916cee78c312735e823ee5e4ced19a1f568598e8fd553952426
-DIST scala-2.10.6-forkjoin.jar 60850 SHA256 4007ca649f037ed5ecc87c74529f499b75ed1a0f3f78e8f82cd97a71f5d2d5c7 SHA512 702370f2654b1c06f340c100078c630a82808e56c4dcc323881d6547945ce028345a5ee3048cbb9502a3b340b1d84ab5a635f80dbb381fdd88cc25b60cad768f WHIRLPOOL 9d561c9872c140e266efefb1c1afe76a2754eda32357718d048ff0896d6a2d14f168e1e2eddfcb37bbd0ac07fb7a7079b63e0f512946a7e30ff62883ee8bfd84
-DIST scala-2.10.6-genericNest.jar 1136 SHA256 c2c23341eec9fb379b57d7bf1156fedb3e2b9f97d2d5729fbfc7d766fd390faa SHA512 32c3b3e14bc72db2572bf120c1fda49a369b27ff8ae6ae12f6d7b12fdffef4064b515671c8f1b6dbfd78209247f6a7b7b26e700dd70a105de3ca59f5185ff9d6 WHIRLPOOL 61b2d9f840fc0ed86a8207cf353a2f7b9bf8523d31b4e8f74eb21ecac1a405ed04c5a4a8e78a13d64b2dd186a7ec3885cd5e2514ad572e600e5744c3f15f74c5
-DIST scala-2.10.6-gentoo-binary.tar.bz2 59801146 SHA256 baa2a14984cb36406d777aa79a78035abb54e9b45b48fdf4adc7eb29c6ec192d SHA512 59d8d1129f74c6f1e9d5b664f8cd50209d8071da9b48be1990b288cc46038a6b420e46dc5b3ed1e60865966e6f5c82215249930f86e44208fa9b2d04742fe4c9 WHIRLPOOL aa6cd24b156f6a1d0cae635f5b7002680d998cff5ded0279adf2423760563327fef6d5cbab14c16d5bb3715382ec1cc3c2bef579b276c3bd1d456e8b44a331f3
-DIST scala-2.10.6-instrumented.jar 31725 SHA256 8a424c8bd5805ec429a9477cbd0f44bf65a2b79b720d438bfd347dba8da06484 SHA512 b1d77c4380a2b8ffe715ec106e58081e5c89e314c5a13071d627c3f974144ad453e79d405cd722d75095b62e8682b7414d40b691506c7d2f5dde62e2fce51e39 WHIRLPOOL 5ef8ee89b3fa66bf5025fd1b5db65d4d628b3452ba8530e3c3b1dd530fb5286fe3acee2cf56de09148cf2d37968626708690cc03da202cf3d58159cfd56fe8bc
-DIST scala-2.10.6-jline.jar 164623 SHA256 813f2bc34a096cc7780c6946acf401c82e739cf9d5359edf414f74662137d3b1 SHA512 2d97f0d1bc1df67423f54102f8b360a6dba0bfac67ba12673e781d9461485a6124cf985cbab96283af7b366a8fb53e526aa667ccec466aae7002d5030f2e1369 WHIRLPOOL a7c848acf502c2247d0a9c83fa45295e5ede7487ac2129e50d4bd05a0271050b274cd25af24fb4215dc20283ca7df750618b31fea8973fffa125a3fb37f33bf3
-DIST scala-2.10.6-jsr166_and_extra.jar 728574 SHA256 e33a59e291bae8dbd2b37c6a4d5eae459a313db3a588f42c59ac5fd8edf6e13b SHA512 40d949cfefc5111c79b79f085657d56aa046d1b318e6ad78de5869f61a6515c2076b70344be5ae3fb93a7b3f54f46a129e2536515b258e0d5bf2e670c5001306 WHIRLPOOL ef8414d7862736cf072ff60fff5008f38dadcf826364cf21929fdfca7d331872d8097e6a6907dd500ef5d5a68964d8c2ed9ebeedf6470dc25ede269c1a8172b5
-DIST scala-2.10.6-maven-ant-tasks-2.1.1.jar 1314262 SHA256 b8891b4a90aca2793ad385ab57216f51c4879c6ab7e927354f407b46510cab51 SHA512 e3f0ff1d41ec31b2b64acb2ebcc175709714033589cb8e763f94aa80359c84f5d960c46dae713c9e37e1a09b977e7da617f8fe10a5b6fb30c55efd19bc307e68 WHIRLPOOL 73c44ea6aba4a3c697f64d08475b4c17bdc929ac9f320a25714fbe7cdc2939ad334deb7a90eb6c950cce8ba402d19bc2615a104788bafed7d247b997d3146743
-DIST scala-2.10.6-maven-deps.tar.gz 35062417 SHA256 0405fb8251807e5d62048f9186e2f1aa8ec35bb469e5ba6179bf64ce0af10269 SHA512 7b0947ab9506308c6ef637af51eca2c3beb819d786c19c7fe0e840f6271c51d8a88a4220e1ac0f79fc492ff9d05ff9e362a3b5c185653b2fcb3ea101c937eebd WHIRLPOOL d4aeae97fdccb8a89c9e40493aca6d0dd8c3e77c711de6c5bdf234575c13d82dea830ca18e0568a89fd635ccda23cf53398dd97b6ac62feea6eb1430a5f280fb
-DIST scala-2.10.6-methvsfield.jar 609 SHA256 730b33d098319d969760f2250dc6924c9f85f94a8a2eb2b2a025dcf05378d9c6 SHA512 6db923ed7059bc91c8442d5804ccd8336e94f5202b3dcc348a4eb5026f09e1e86862f6e94818beae9ad42fcdc8e51df4d59a27109903a8ccb78054425ae47a71 WHIRLPOOL d5362d5fc2795ff0671f386429840bb4f84173f9308e34c2b0eb585fb7cacbd308ab87c42f2fd407597abc4f010e8ffde600dd30addcd63c2d71c2d5f22f1582
-DIST scala-2.10.6-msil.jar 298973 SHA256 5b9e6dc2f4dd79644a1480b7cb4db053d73fc5d0e41015b95f15ec4dacf2da0a SHA512 1e9be7bfea639cffd638c78b4368f599753e8bd4df8f9b3c192b72c2860d6f96002c94fcf751e9c6cdacfead1ae3bd851d61395ce83c49d66f801284bd2046dd WHIRLPOOL 3828f08bb47f038d3f6e52c0d077cdecd06195de3d29b326833f47a6713bbab644ddcd20b8d39aa814d25637dae31adc1d0f0aec6f489857d7b115aeab29a301
-DIST scala-2.10.6-nest.jar 2920 SHA256 3c7cf1a1b9fe9ad2abf3bfcedaa17a976c72f4bccb0e0c7dbcf7ecf27bc20aa5 SHA512 5eaaa870e06b5e00efb1f6ccced71343e8aa01578ea2b320b2d051f2df3713df9c500f074cc74a9e3c5cc509e03cf9c71265329bf2ddb3e82cb331524202fa38 WHIRLPOOL 1d73b612946a6a226841d3e0ad8cb3ebb06997c70e94feb1f9236e4e58a93c429cc7cdecaa4175fd5b78920253bcc157f798593b6a8eacb873b3d9a51284be34
-DIST scala-2.10.6-plugins.jar 4181 SHA256 13313e0c3a42bb401377ab4f228e3c81db482c8f33295c6a1d021fc3c9727871 SHA512 d44427df9acf4611acb492b6268b65f63a8be2d47ef29598bf5d242f702af57f0ee2eff52378b8371755d5ddf58c79d48b18a6a056ee9fee5091e478ce5ec1a2 WHIRLPOOL b2e846b5965ea7f04844b4c49e3fcc2f5b3f0e31669a662557bd36a113dd94372bae55d46f1986e03099c6f51217bf10986e5e265874854ba479c36d041a1e41
-DIST scala-2.10.6-push.jar 8886289 SHA256 58eb2b8c501bbff0e78074a058e3fc160012a80952c1cc96ed301d8a08d7e98d SHA512 b5539d381c8978ac57fc4258696e4cb552f47917178152b38b5683e42ed60da4d9da198a0344652f201541a71f92afd2ac8b3c3d3ec5266a8c222e9661d8a06a WHIRLPOOL 8fa6522a0fd9939f4ffd443b55e7a5adbb93a9dc5cbad569ccecd6be77ecd259eadbdb16c2c7eab6d9f175fbf33746faf9c41cf4d1050e7f576b86119301e126
-DIST scala-2.10.6-scala-compiler-src.jar 2462738 SHA256 ca43298237583dfd362ab4d773ef0f791a075d9187ecf30cc8ee4f4b7ae12e76 SHA512 a71eab8ada2fd23aa1408577dc3bde28847484643618a752ab68bbe5c8a4ef19ad852ace6f44c8e66668e6b6098de8b0cb3eb8d0c4674ed332562463b43a8a38 WHIRLPOOL 8cc711357fe2b393c1e28a3ebd0249fb633c1135c6c4d8819c6ab14081c9fbbb4c1e0a6b84eb9a5711c9874814e54676905da90a1d8d6c5e28213e189bb0f37b
-DIST scala-2.10.6-scala-compiler.jar 15095501 SHA256 dbad9d1e0e300c62945d8d8aa21ebfa614e1f7b1c8378550b0314aa006be21c0 SHA512 98588884da2a01af5df9898f5d3055cbf5fa04af7d5f87bd6076dbfca329a7f2fa5645fa87cc14720204e00dc540971f8c44b2233fd4706db0df00ce8978349f WHIRLPOOL 311db7bc73ac1584403b12ea8c712a4b6a0450c502328ac26d7d9e051db4f5dd185dfc1c7c8304d32991c374fc2ed3c89cf8cfd61759f9049e1b5e55f4a7c54c
-DIST scala-2.10.6-scala-library-src.jar 1378653 SHA256 4a347825a0856a14803ec2c9cc205e192f19f15e417d334f4d22276d898d0dfd SHA512 06b0944c53b145c71239ec5aa90a78fbdee8130508f02d6cecd4c6c5e26878f19751471ba5d54c80e8d1380645787512c6e7566471675f0c9e3f0c29e38b4ff7 WHIRLPOOL 27fcbc2e52d52b30a8d0f1d68caaf8fb0f201d1509609aa361aaae412f0ceb6d95e6c3c4210b60027eae1ebb406ba3bdad770a2b087145572255b452bf0028bc
-DIST scala-2.10.6-scala-library.jar 7113040 SHA256 66057366dc9c541d0fadb7f64a4e06f7c5c86a90b289d724e7db0153b7e92c2c SHA512 af8a57145c8bcac6f72abade3b21f066ae082c7ab858c3a7b0641240fb99fe24bac3c224b7b1418c47c852793cecc7e8f5838e0cf6ae2b78ee538839cebdffeb WHIRLPOOL 29cffc4e84730549ed25384411e1a9341f56d348800d1bbc04958d88071e0c36b7290969b8f9d6ea865d9c82fbb76b1727cf66b81e420950c7ad356f2bd02aea
-DIST scala-2.10.6-scala-reflect-src.jar 467879 SHA256 45846f176eba3e072282b597fbea58977e1ac08d7161571e2601a86adbff4e35 SHA512 c172be4d0ec724be4f62cbcaf848a71c99cffc706fcaa5b46fe2970088ba9a8f406d42728f64a0dfdef1cbe18e313b8be8142d68b9b3d7a592dec5e1fd7366b6 WHIRLPOOL 876bd9e3186d76d351e128cf990789459b51bca1ad6e4f51aa397d1941311ed51a1048188a4b94bd8709551c0cb3ab3985d3a1534594bb840082d0b555496d7c
-DIST scala-2.10.6-scala-reflect.jar 3307596 SHA256 910b58279250371e034859227fb5d9015297eb6bf607f9d3ec0836a822c1fff0 SHA512 466c55b8ce98e48f851c446b986388351ac4b0fb2b0cf6888d56fe2a4af1f5f3916e78f3fdea395ee18ef0a5128bc6b0d4cdcdce8f5b0f2fcc30c2bdbd41eb40 WHIRLPOOL 73a42b7b557bf29d14511f798e22f1ba8039e7c41bb165d9a4be7c66d393fa63c2836239fca56158eb2c5dd07567b1febb18d9f4f514de48e0c6ec5d155a46a2
-DIST scala-2.10.6-scalacheck.jar 763570 SHA256 96814bea5818186086473da5c657191d03145649eee0c300abec9c3380fdd418 SHA512 5383e80dbcb11cb3fba033bd6a0e8c220ec3dd6fc153062b9d44d346ff17bea014a8c7a412af85ff487a34011cdc2042191c4c4ad66ea44eb7eba139a0b358d4 WHIRLPOOL d6276010ce4d1bcc647e1d7673cc18f645ac92abf03c4aa5be03735853a33692763883fcd8e325d36b2a18cca758d6f1636294b182f247da1094c82476f36b58
-DIST scala-2.10.6-vizant.jar 15910 SHA256 a54e19093725d0d085544553246e48607c1e6ab65575ae0ff721b788118461d6 SHA512 4464d7349016f4999199e227e8eaf7bb3ef6b7e38ad0e8e710faad55df2e1243d99b53b9a789a1ffd3c39aef0d979dffc543f4691feae68cfa743e51bcf61390 WHIRLPOOL 1b957b8b850f79309c3577a2dcac52a620fa54f810f242a02c52bbcee1cc9c5818785baa7db8e2b82b850bcb56b528c4dd07cdfad2f991c0025293ca02c0dc99
-DIST scala-2.10.6.tar.gz 5527120 SHA256 06d7467ff628ebac615c5e60af155e0b4cbbf4c31d10c03a45e9615d5b1e0420 SHA512 d993ebfee84c4e4c220e15059992d8cb3807baff8df99535b5bd20f54d29ddd1f701bbf20ed286a96f08554591ffbe0d93d514513456bd32659c3ee9b15f343b WHIRLPOOL d206f0ede824c26b1d4d1f6447b63b9fbb95acea37e1911a49b77a2c7ff944330ad1e6df508a6e0642b6009f0a2da04c9d86dacf3aca4856bb75c2616f7733cd
 DIST scala-2.11.1-annotations.jar 2242 SHA256 f2d057a006bba4253d069795284a7610f1c837af6a80c0057736099962e24bcc SHA512 3ceee0b1361b9e0911c1ff060ad108a1d93f7ea3e82ef946401cd5f895cb06016ac0ecdfd095f99b11cfb28c4cef7705c1b564c7af644c5f19b45c14a413c4dd WHIRLPOOL 51fa0efc5dd14cf8364e9639375511fc3e716bd520a193e6c17a2fe3f02eebd1529eb98fd3b382a6386baa5b779ebd0327e8f141aee172d11d9548d9921c58e1
 DIST scala-2.11.1-ant-contrib.jar 224277 SHA256 be33a69818310b5c55e41dc11d48cd895f5f129da4b0d28c2f4c6c3e1cbcf3fc SHA512 5ec325a55bb213226c86faf8a99951839319e9579956ae58e2ccfe84f62d2742542998f98eed3f0dc8f8f94635d6dff1fe02e3c0f5289df1f09027ae2b9bee83 WHIRLPOOL aa713cc04b10c46adbbb8a5904e3fb34c6e32b67bb9a5f1a89768ceab8c31b977875c84434bc03c5b42105a4019f55cc10d806b0345c365a309e93d3f02e0a10
 DIST scala-2.11.1-ant-dotnet-1.0.jar 57795 SHA256 40c18fcfb8c28e4ee82e53f72a3257db43bcba01e16ebd5a4550fc419edf30c1 SHA512 72afc387cf9dbeb99e627ca7f35f919f627bbf3f072eb46036120695fb70311490593c255c2a2e79b684adb8f213d8ab591d4ceda5d5f2e6b6906a6977b38867 WHIRLPOOL 18aa33fe259bd52e2f37b903be39d462e8622ff744f990fc92871eaa4fe10ff69cd25b2c968cc353b3c5138cd3fffd755715aef6bb16c57b0b72e7e5fd1975e1
@@ -275,46 +184,6 @@ DIST scala-2.12.2-nest.jar 2920 SHA256 3c7cf1a1b9fe9ad2abf3bfcedaa17a976c72f4bcc
 DIST scala-2.12.2-sbt-deps.tar.xz 34841660 SHA256 018d9cab7712afeea9bf3fee5306224e4b8edba638afee850495ae3c94532982 SHA512 642bc1c2f94f7890548cc5b730cce4a4c214603c53eefaf12fbd709163feafbd319165a738fc4d3c349ae60ba276bc23333949b01835a2e7e7b767fa21baf96a WHIRLPOOL cfed944a585cddac3e5328c96e4f5facb2dcc3022a87c83cfd7525392da461039d7b9b1c732ff66c43a0bab1b0672a5a019cfce3ca37a7fdb798cea4af4948e1
 DIST scala-2.12.2-vizant.jar 15910 SHA256 a54e19093725d0d085544553246e48607c1e6ab65575ae0ff721b788118461d6 SHA512 4464d7349016f4999199e227e8eaf7bb3ef6b7e38ad0e8e710faad55df2e1243d99b53b9a789a1ffd3c39aef0d979dffc543f4691feae68cfa743e51bcf61390 WHIRLPOOL 1b957b8b850f79309c3577a2dcac52a620fa54f810f242a02c52bbcee1cc9c5818785baa7db8e2b82b850bcb56b528c4dd07cdfad2f991c0025293ca02c0dc99
 DIST scala-2.12.2.tar.gz 5935417 SHA256 822ef9c8077765cf558c1bbc88e957ccae77402ca02f432053f4f3bf4f91a2b1 SHA512 ab450e94fa79a9a0af238567b17537b12f23627eb066b84cd996a88422ec34ee8d26e09eca0416d49daccadaeb016ad6419d8022d471065389a26b024f2049b1 WHIRLPOOL 02a48ac6fb5d4befc3d91aef0b18d3729b7eadf52cfde11231432fa25c0e9fd60185a4d3d0e2095aed61e25a49c1f763a8922af65f5fbe5ff2960164da7f3fcb
-DIST scala-2.9.3-annotations.jar 2242 SHA256 f2d057a006bba4253d069795284a7610f1c837af6a80c0057736099962e24bcc SHA512 3ceee0b1361b9e0911c1ff060ad108a1d93f7ea3e82ef946401cd5f895cb06016ac0ecdfd095f99b11cfb28c4cef7705c1b564c7af644c5f19b45c14a413c4dd WHIRLPOOL 51fa0efc5dd14cf8364e9639375511fc3e716bd520a193e6c17a2fe3f02eebd1529eb98fd3b382a6386baa5b779ebd0327e8f141aee172d11d9548d9921c58e1
-DIST scala-2.9.3-ant-contrib.jar 224277 SHA256 be33a69818310b5c55e41dc11d48cd895f5f129da4b0d28c2f4c6c3e1cbcf3fc SHA512 5ec325a55bb213226c86faf8a99951839319e9579956ae58e2ccfe84f62d2742542998f98eed3f0dc8f8f94635d6dff1fe02e3c0f5289df1f09027ae2b9bee83 WHIRLPOOL aa713cc04b10c46adbbb8a5904e3fb34c6e32b67bb9a5f1a89768ceab8c31b977875c84434bc03c5b42105a4019f55cc10d806b0345c365a309e93d3f02e0a10
-DIST scala-2.9.3-ant-dotnet-1.0.jar 57795 SHA256 40c18fcfb8c28e4ee82e53f72a3257db43bcba01e16ebd5a4550fc419edf30c1 SHA512 72afc387cf9dbeb99e627ca7f35f919f627bbf3f072eb46036120695fb70311490593c255c2a2e79b684adb8f213d8ab591d4ceda5d5f2e6b6906a6977b38867 WHIRLPOOL 18aa33fe259bd52e2f37b903be39d462e8622ff744f990fc92871eaa4fe10ff69cd25b2c968cc353b3c5138cd3fffd755715aef6bb16c57b0b72e7e5fd1975e1
-DIST scala-2.9.3-ant.jar 1506140 SHA256 0251dbb938740ace07a53675113eee753ba389db65aebc814b175af50321620e SHA512 ddee72ca62adb20e700022609749a4d6cc848c94e597a7450226770c8b97aa2c1f7f23b7a1c6ac8acd63047101997ebd68c19b393ebffde9ff5c7bb1957cd18c WHIRLPOOL 1b2b7e0289cb16f5131a9c0b1b6eb1279011e7af79fc470dd6dc2047afc7fa99bdeec6d9db4f46adb83f6110593118d0909a4b1fa6b01dc56890bf6d2785373b
-DIST scala-2.9.3-enums.jar 1372 SHA256 95c53606c7113333ef95b4efbd3ae08af715ca49f71845a5d33150e6b7e9a072 SHA512 3d2356b9f610e98a03f64cbdd18ee36138b68ba5b170bb9b78bc7449439c3870f6f5bc795f3e1b8d325daf468ae85c581b60d1d360c1ae68c70792ad62b9c1dc WHIRLPOOL 30b26ba56a36272cf5973d3a89850cb3f5bff6c45a7a6bbd6ccf4ff342720bba89dfc0cdbe10058b770b7e73093ea948e574d5e081c36ab866f3bea9f0e14f95
-DIST scala-2.9.3-fjbg.jar 130721 SHA256 bb13e449a369966b8d9d423aa31a4f0b628316e3c97e01e557978f7d6cf105f4 SHA512 2e063d805452b060d638a4fa2fa1e636fa66c387dfad1d1bba9a58914111ff3534b447f7d4514cc6299c9233f568d97e5b69f0ab370aaba8e3a5255ab11cff63 WHIRLPOOL 89cf71f08232e33bfe49b80f64f7f1a6aa5221ce53d884f06c3e622e70737e76f5847abe21ca0c137259f14327e4f08bae7a3c30130a41a36bc00b57c9719e87
-DIST scala-2.9.3-forkjoin.jar 47215 SHA256 c655d86013a72e5878ccd3110f176ff549a5a62d609f29b7bdd623334e8db01d SHA512 c1cf920eeca924aaa6189b52719ff567967c696817fa75a28daea916c1f808f13c5402143c33fd6b21352ac41e38e2823ca56d4a949af047889eb6a6aae4b649 WHIRLPOOL 9cc002ea16cdde5ca4fa5aadc4359a416fe5aa07599c694ac99e4dbe4e9f3f438e6a3899157420a7cd74438ebff63a9d3721e4dd1f73fbda6143d633bc309645
-DIST scala-2.9.3-genericNest.jar 1136 SHA256 c2c23341eec9fb379b57d7bf1156fedb3e2b9f97d2d5729fbfc7d766fd390faa SHA512 32c3b3e14bc72db2572bf120c1fda49a369b27ff8ae6ae12f6d7b12fdffef4064b515671c8f1b6dbfd78209247f6a7b7b26e700dd70a105de3ca59f5185ff9d6 WHIRLPOOL 61b2d9f840fc0ed86a8207cf353a2f7b9bf8523d31b4e8f74eb21ecac1a405ed04c5a4a8e78a13d64b2dd186a7ec3885cd5e2514ad572e600e5744c3f15f74c5
-DIST scala-2.9.3-gentoo-binary.tar.bz2 34391262 SHA256 5510aa9170e60cb8f179be6dbcab872c20b23a199ffa20db3f21a5cc054ef13e SHA512 06beccc78f0d2bc4860cf429fd4af2781ae9ffa763af77068a00de5cb08b351eb92b2c7c17732a7ff4a52fca9cf699127ba3e331aceceb7c54d5c8b9f0c65021 WHIRLPOOL 5413692e3e54f6fab333ec2916a9863588bb06fce46f06af9c47a9d359f82a15834b1beef776f0f750a46ba0683ec871c723cae3799f8997a981075e377a0bef
-DIST scala-2.9.3-gnujaxp.jar 231445 SHA256 65e6146fbab44e1640d8a0da588dfdbb9c185853e70d8b8c0da6949937b6af8a SHA512 d632760bde6a761ae840a8cbde1f3b27da7a005408504085b5cfb6edd3e54b99924562ff464be55f2b89cf9617d9ec22d96625f71a805398d4125d3ab5ed7ea6 WHIRLPOOL d56a54dd3395a543e2a705342c1faf41e67aa8ac81a3fe9eddd3fbe42adf4af80d43ffe3a22a24c08468d756a7618a082b694981e1f29c443ff15638175742c7
-DIST scala-2.9.3-instrumented.jar 24221 SHA256 23a2118d0efc1f99e3f833340765cc28f09b8f24de18b064ea034813fb8cb51e SHA512 dbba981bc5cc6c336a9076d7baf9b868381b8d8472e043d5d2b28621faf0cf69a252815c949eac643f18041c485cea12d05ca3638c2d57020ea713180e34050b WHIRLPOOL 25193c7b18d8879388ef060048350498613aa50397f3bd62d99cc9a0e088b11b0170c311babd9a9661bd096482a7cc052ce785ee416fa8362ceaf5ead5cf43c9
-DIST scala-2.9.3-jline.jar 158705 SHA256 e8b020b08e68b0f0adf37a28fc5cce02270d8ab1f754d482732982a5f91a9918 SHA512 8776d2ed8725674a681dd27416847ea466013faf5120011169f7991d88be11431869fe9f26a91d10893544c116d00874a1ab6f639c6bdcdf58575a00e98b5aaa WHIRLPOOL 3e84b0e0edb32ed0797a6d59aea7042954b017e9348f7dbbe7c74e9acd92b62633b574e4c37ad59f4280357c29f4d4bd54db4fd13981842b4dd3a583bc12ca5b
-DIST scala-2.9.3-jsr166_and_extra.jar 728574 SHA256 e33a59e291bae8dbd2b37c6a4d5eae459a313db3a588f42c59ac5fd8edf6e13b SHA512 40d949cfefc5111c79b79f085657d56aa046d1b318e6ad78de5869f61a6515c2076b70344be5ae3fb93a7b3f54f46a129e2536515b258e0d5bf2e670c5001306 WHIRLPOOL ef8414d7862736cf072ff60fff5008f38dadcf826364cf21929fdfca7d331872d8097e6a6907dd500ef5d5a68964d8c2ed9ebeedf6470dc25ede269c1a8172b5
-DIST scala-2.9.3-maven-ant-tasks-2.1.1.jar 1314262 SHA256 b8891b4a90aca2793ad385ab57216f51c4879c6ab7e927354f407b46510cab51 SHA512 e3f0ff1d41ec31b2b64acb2ebcc175709714033589cb8e763f94aa80359c84f5d960c46dae713c9e37e1a09b977e7da617f8fe10a5b6fb30c55efd19bc307e68 WHIRLPOOL 73c44ea6aba4a3c697f64d08475b4c17bdc929ac9f320a25714fbe7cdc2939ad334deb7a90eb6c950cce8ba402d19bc2615a104788bafed7d247b997d3146743
-DIST scala-2.9.3-methvsfield.jar 609 SHA256 730b33d098319d969760f2250dc6924c9f85f94a8a2eb2b2a025dcf05378d9c6 SHA512 6db923ed7059bc91c8442d5804ccd8336e94f5202b3dcc348a4eb5026f09e1e86862f6e94818beae9ad42fcdc8e51df4d59a27109903a8ccb78054425ae47a71 WHIRLPOOL d5362d5fc2795ff0671f386429840bb4f84173f9308e34c2b0eb585fb7cacbd308ab87c42f2fd407597abc4f010e8ffde600dd30addcd63c2d71c2d5f22f1582
-DIST scala-2.9.3-midpapi10.jar 364901 SHA256 5c52910612714d5a0d090f1a1ad0dc9f9c77bfdc25fde8b84d9388bbcf42126b SHA512 5b2c9d4b2732c6eb74804e20f0e4315700ee18fa769a1bd9028ba0d742d71578e433dc0625ebd37c842e8f8f952c02c6f0d93a3e0c4b73e1c9d4fbf132839780 WHIRLPOOL 0d07e058b276c1f6db6405cea01a803e15999c198755cf778c63ecfb45223ca04faf4b88749be6bcdf7c4be45af2d1d7f3b072121b8a549543bf72daf28e5f91
-DIST scala-2.9.3-msil.jar 299354 SHA256 6be6c31b441205bcd9083a306803e99b459b215f939e412196ac10606e613bb4 SHA512 d09885a71b0010c0b08a15b625ce92dafe37e542e0e6413b88759d443e7bd6aedd4a0656d71ec262c54004ced38c4587e1ab2344db251b542c79d10c60e8e931 WHIRLPOOL e81b3cbd8403d78395f82ddba092bc54a5f5616dc8ecb6215e1e25c3cff7ed22fc73c4a19668f911b4954b1ddd00b9bbe0ec1addb7d1a1cd77aa460fb72a6ce8
-DIST scala-2.9.3-nest.jar 2920 SHA256 3c7cf1a1b9fe9ad2abf3bfcedaa17a976c72f4bccb0e0c7dbcf7ecf27bc20aa5 SHA512 5eaaa870e06b5e00efb1f6ccced71343e8aa01578ea2b320b2d051f2df3713df9c500f074cc74a9e3c5cc509e03cf9c71265329bf2ddb3e82cb331524202fa38 WHIRLPOOL 1d73b612946a6a226841d3e0ad8cb3ebb06997c70e94feb1f9236e4e58a93c429cc7cdecaa4175fd5b78920253bcc157f798593b6a8eacb873b3d9a51284be34
-DIST scala-2.9.3-plugins.jar 4181 SHA256 13313e0c3a42bb401377ab4f228e3c81db482c8f33295c6a1d021fc3c9727871 SHA512 d44427df9acf4611acb492b6268b65f63a8be2d47ef29598bf5d242f702af57f0ee2eff52378b8371755d5ddf58c79d48b18a6a056ee9fee5091e478ce5ec1a2 WHIRLPOOL b2e846b5965ea7f04844b4c49e3fcc2f5b3f0e31669a662557bd36a113dd94372bae55d46f1986e03099c6f51217bf10986e5e265874854ba479c36d041a1e41
-DIST scala-2.9.3-push.jar 8886289 SHA256 58eb2b8c501bbff0e78074a058e3fc160012a80952c1cc96ed301d8a08d7e98d SHA512 b5539d381c8978ac57fc4258696e4cb552f47917178152b38b5683e42ed60da4d9da198a0344652f201541a71f92afd2ac8b3c3d3ec5266a8c222e9661d8a06a WHIRLPOOL 8fa6522a0fd9939f4ffd443b55e7a5adbb93a9dc5cbad569ccecd6be77ecd259eadbdb16c2c7eab6d9f175fbf33746faf9c41cf4d1050e7f576b86119301e126
-DIST scala-2.9.3-scala-compiler.jar 11422560 SHA256 d574e8ebb7df50149f1d59d422bf555343e641be08a4f3953b836d2203a6d251 SHA512 37be543367ce402faf8145afbda579ada62c985103cba9aef8e0458c24af3a3ecbb307fc8f6c228f0e134df167a50ecbf67f30b00e03029afdcb527569d6da0d WHIRLPOOL ca03ef48b2b1b251e33337cdfac5c3d37f6e127f366d1d5432aae11fdb94cf0f855c17b87147f6c8d116d9ce0653c419289acfdd8783afb42d4882b58ebdf2a0
-DIST scala-2.9.3-scala-library-src.jar 1306388 SHA256 eda04ef8f04bd3f1fd676de51cad77874a88cdf49d867593a0d9a320c4cff523 SHA512 0d7f452e4c81ae7fdb236aac4261c876e73728b31e033fb5f055a4ede9b8b407d66f9c42e1d3b999b9cbb28300b9b49e475743f645dbb246a40d095dc5dd8f6b WHIRLPOOL 2080282277c3ceff176a5a9f5f815457ae9404fc1e0b38a087888ddf2510a2e5faaac0a596fa1e642b7c0e937b05ae109de2be19b112867766a2ca9870a01761
-DIST scala-2.9.3-scala-library.jar 9925007 SHA256 fd1302b17372f85a553f670145d15c5ac349b676518ecd739a467b467d40da60 SHA512 8cce84864aeb701143b20d27e0819bfa6bc3e2193aff7197ec8a16796c23a20a169c9ce57bea01ccd5a1c32066e6d4033d23dd7f3b26634a34881c0eab523c30 WHIRLPOOL 4250fa13103d89d6c43e6e0d75bea3e6d55d68658acee5f2569c1894cce68862faea5d2a9aa228c05a77021f1a966261ea3daf762c3b50df2d54fb5b60273176
-DIST scala-2.9.3-scalacheck.jar 746629 SHA256 342a299d74fed72353b75f1265d7252c0f8d57939fc09c1b966a73f4bf07289e SHA512 d7f4eceefb271215a4fa240b40d38261607bab8a30afd7459e6d7eb561146aaad0e746bddb6ff4d25233908fe0c95947558f850b81c223d6066f22095f30dd2e WHIRLPOOL 85088b00f1292891a9e8d6d9e4778d978398c7128500a7fc2d8cbd9e206f31e2c6df367fdc784730b47c2bc265dd7c77649dab9f3482b3ed4c7953f9bd74cb13
-DIST scala-2.9.3-scalatest.jar 1827900 SHA256 43869b4171972901bce5a89b1ba8b8474c7e75538321dcdfb41e37d089edbac8 SHA512 2d77d1239d544d572660d8b2a8355bf7a03137a3d05d41b5f2ab214edab05ef038d3e05082d5adafe16b6cda41440c075f49a130c3c7ff053c6d8844000d2f2b WHIRLPOOL 68d804ab21f3caa0e459d8d8b1c926b6f69140cb64a96b72d95605f9f04845510cd47b369b3d73d5e944912fa2f0d06cfb02c75f89087d8f27effbdfa4d9ccd1
-DIST scala-2.9.3-vizant.jar 15910 SHA256 a54e19093725d0d085544553246e48607c1e6ab65575ae0ff721b788118461d6 SHA512 4464d7349016f4999199e227e8eaf7bb3ef6b7e38ad0e8e710faad55df2e1243d99b53b9a789a1ffd3c39aef0d979dffc543f4691feae68cfa743e51bcf61390 WHIRLPOOL 1b957b8b850f79309c3577a2dcac52a620fa54f810f242a02c52bbcee1cc9c5818785baa7db8e2b82b850bcb56b528c4dd07cdfad2f991c0025293ca02c0dc99
-DIST scala-2.9.3.tar.gz 3973977 SHA256 5736497f84d375804eb6351a5e9db7cf8dad0861a5d4294fc7e8f741c840573e SHA512 896b04ffc5579f1f2a081c677da5c11bf163b89696d061e7c7404fbb684640dd78f7d88bdef89822dad6dfb20717d4b84da239a84c4b65bbdf84a604e1577e76 WHIRLPOOL 4812e6e844c169f187eb7802ec65f0d9b72efa62765f8113d351a2cdd8ab6ee7d8234b9def8643d91e80d04b4049d8793aec7d794af7e2845813488308d44614
-DIST scala-compiler-src.jar 2462738 SHA256 ca43298237583dfd362ab4d773ef0f791a075d9187ecf30cc8ee4f4b7ae12e76 SHA512 a71eab8ada2fd23aa1408577dc3bde28847484643618a752ab68bbe5c8a4ef19ad852ace6f44c8e66668e6b6098de8b0cb3eb8d0c4674ed332562463b43a8a38 WHIRLPOOL 8cc711357fe2b393c1e28a3ebd0249fb633c1135c6c4d8819c6ab14081c9fbbb4c1e0a6b84eb9a5711c9874814e54676905da90a1d8d6c5e28213e189bb0f37b
-DIST scala-compiler.jar 15095501 SHA256 dbad9d1e0e300c62945d8d8aa21ebfa614e1f7b1c8378550b0314aa006be21c0 SHA512 98588884da2a01af5df9898f5d3055cbf5fa04af7d5f87bd6076dbfca329a7f2fa5645fa87cc14720204e00dc540971f8c44b2233fd4706db0df00ce8978349f WHIRLPOOL 311db7bc73ac1584403b12ea8c712a4b6a0450c502328ac26d7d9e051db4f5dd185dfc1c7c8304d32991c374fc2ed3c89cf8cfd61759f9049e1b5e55f4a7c54c
-DIST scala-library-src.jar 1378653 SHA256 4a347825a0856a14803ec2c9cc205e192f19f15e417d334f4d22276d898d0dfd SHA512 06b0944c53b145c71239ec5aa90a78fbdee8130508f02d6cecd4c6c5e26878f19751471ba5d54c80e8d1380645787512c6e7566471675f0c9e3f0c29e38b4ff7 WHIRLPOOL 27fcbc2e52d52b30a8d0f1d68caaf8fb0f201d1509609aa361aaae412f0ceb6d95e6c3c4210b60027eae1ebb406ba3bdad770a2b087145572255b452bf0028bc
-DIST scala-library.jar 7113040 SHA256 66057366dc9c541d0fadb7f64a4e06f7c5c86a90b289d724e7db0153b7e92c2c SHA512 af8a57145c8bcac6f72abade3b21f066ae082c7ab858c3a7b0641240fb99fe24bac3c224b7b1418c47c852793cecc7e8f5838e0cf6ae2b78ee538839cebdffeb WHIRLPOOL 29cffc4e84730549ed25384411e1a9341f56d348800d1bbc04958d88071e0c36b7290969b8f9d6ea865d9c82fbb76b1727cf66b81e420950c7ad356f2bd02aea
-DIST scala-reflect-src.jar 467879 SHA256 45846f176eba3e072282b597fbea58977e1ac08d7161571e2601a86adbff4e35 SHA512 c172be4d0ec724be4f62cbcaf848a71c99cffc706fcaa5b46fe2970088ba9a8f406d42728f64a0dfdef1cbe18e313b8be8142d68b9b3d7a592dec5e1fd7366b6 WHIRLPOOL 876bd9e3186d76d351e128cf990789459b51bca1ad6e4f51aa397d1941311ed51a1048188a4b94bd8709551c0cb3ab3985d3a1534594bb840082d0b555496d7c
-DIST scala-reflect.jar 3307596 SHA256 910b58279250371e034859227fb5d9015297eb6bf607f9d3ec0836a822c1fff0 SHA512 466c55b8ce98e48f851c446b986388351ac4b0fb2b0cf6888d56fe2a4af1f5f3916e78f3fdea395ee18ef0a5128bc6b0d4cdcdce8f5b0f2fcc30c2bdbd41eb40 WHIRLPOOL 73a42b7b557bf29d14511f798e22f1ba8039e7c41bb165d9a4be7c66d393fa63c2836239fca56158eb2c5dd07567b1febb18d9f4f514de48e0c6ec5d155a46a2
-DIST scalacheck.jar 763570 SHA256 96814bea5818186086473da5c657191d03145649eee0c300abec9c3380fdd418 SHA512 5383e80dbcb11cb3fba033bd6a0e8c220ec3dd6fc153062b9d44d346ff17bea014a8c7a412af85ff487a34011cdc2042191c4c4ad66ea44eb7eba139a0b358d4 WHIRLPOOL d6276010ce4d1bcc647e1d7673cc18f645ac92abf03c4aa5be03735853a33692763883fcd8e325d36b2a18cca758d6f1636294b182f247da1094c82476f36b58
-DIST scalatest.jar 1827900 SHA256 43869b4171972901bce5a89b1ba8b8474c7e75538321dcdfb41e37d089edbac8 SHA512 2d77d1239d544d572660d8b2a8355bf7a03137a3d05d41b5f2ab214edab05ef038d3e05082d5adafe16b6cda41440c075f49a130c3c7ff053c6d8844000d2f2b WHIRLPOOL 68d804ab21f3caa0e459d8d8b1c926b6f69140cb64a96b72d95605f9f04845510cd47b369b3d73d5e944912fa2f0d06cfb02c75f89087d8f27effbdfa4d9ccd1
-DIST vizant.jar 15910 SHA256 a54e19093725d0d085544553246e48607c1e6ab65575ae0ff721b788118461d6 SHA512 4464d7349016f4999199e227e8eaf7bb3ef6b7e38ad0e8e710faad55df2e1243d99b53b9a789a1ffd3c39aef0d979dffc543f4691feae68cfa743e51bcf61390 WHIRLPOOL 1b957b8b850f79309c3577a2dcac52a620fa54f810f242a02c52bbcee1cc9c5818785baa7db8e2b82b850bcb56b528c4dd07cdfad2f991c0025293ca02c0dc99
-EBUILD scala-2.10.2-r3.ebuild 8539 SHA256 c49f6b5be008e2d5b1b3916a28465f7994d3848b2808b7c8150e78389c26b426 SHA512 55c0a16d28ee2d3c265d11562db3d510204273ab841eaa0ec5a9053b2672b7d6ce8b917fa42b63b97b9475f539cc53602708d256c604ad276ebffd2ea502f9ed WHIRLPOOL 91fbdb40ac906668f6076e7fa75b5fe3d73a1d44f73068abdb69e14dc658b5a07e9b67b49a4d6d0cf89ae4ac66b090864e2d6778a201f5e9742a34e7ab8a2639
-EBUILD scala-2.10.3-r2.ebuild 8374 SHA256 1c6847fc667eb51141ebd8e816b505a11cf541f616914c0b2d19fd00d3a79969 SHA512 ecaba6d5e9bbc543d250a08e6a1dec4a40511c26b85bdf1e64a277cf87e2b565cc54776094f38242695747250f35591ec67e3e9a7bee9fbe7252cedbd06425cb WHIRLPOOL d9fe00ef46c2ff3b4604bd20364fa69beeb131853e41948afcc0825b0dc3ee7c01171d05da1295cd9e78b75e344cc34a67fa109c97ffdbee052e4e597bd16469
-EBUILD scala-2.10.4-r2.ebuild 8969 SHA256 6487dd864c9794545c06862b0c41e14387cce664ffb3f28f3316186cf3cf74be SHA512 f40c3321f366b7aad4d5474d7dd1f9d59384c957abe804245ab62530845099388fe09172ce8ba624a913bcd9c02a29475f77f89277ef249b228435e23f6aa2e5 WHIRLPOOL 389c4e156c1684203a0a3ee53c364f14633d1c389ae771d69b0b7acda8ae172b43af4a912b875c01861b8be25f3eb199317b99c0d65badd94aec542da39bb78f
-EBUILD scala-2.10.6.ebuild 8967 SHA256 1f074c6eb64a03a62eb9b5bb4ad37b698b06630f3cf7c6db4e90d4ce93df05bb SHA512 bdf1ac5b1fb3c0b59f122f3df14835c9da692cde3fda3cfca23955224dfea4e5125bdc68ad0dac6334e19db5eced392b3950c7d1a319085045791882a56f8fd7 WHIRLPOOL a886bf979ec20d7020c56c4d0e617ce739cafdae317241ad54797cf09311aceb0b61190de1b7fd58b43a4efa2b72a3604f48b962a0b9d87197a13406fbe771e7
 EBUILD scala-2.11.1-r2.ebuild 7600 SHA256 3537b341286ca93ef0cc978bf7b0acac61ee2d81009706c23eabc1b6fc5d4c9f SHA512 79ed5258001cddc3abadd0ccde67f4c3dcfb03aa1d129e528799de4cae528037b251c8c7023de62af6d71771ae8e7f92b30a008d1169d5d14aaa842f4ec42cf5 WHIRLPOOL d8ff20803bcce0dfec0e2f0d7af01c38752a6c5183e368a1ac4277004608ae3474ddbc47b4e61cd29a4a923582cba5ff63697573562cd2c20eebc3e2ce52e410
 EBUILD scala-2.11.11.ebuild 7828 SHA256 1d9518ea82a591ece6ad78e9d1617699a5a9002914dbf5e831e0b7fb351d2629 SHA512 45e40934245da2d635ade9340e38c0998de039e5fdb4102ff65b344320bad84d8e2c7f81b737cd5fd986c3d3b53ddc62a38948deff8857a51afb449f515bf2ee WHIRLPOOL 253ea4d3eba6b1323d897dc994fe1033dbef3390efc5d116e3f518bead22984be1a903ce5ac46f1e412c110306fc3153721614704d811216e91a4144436c1e14
 EBUILD scala-2.11.2-r2.ebuild 7685 SHA256 134adf85077efd3ce98f43800be882fcbd345d5923b765bc4e67d41d99d0d5b1 SHA512 64d0ff156d537895167e431aff3d6a9a94f4f4ff6ce2eadbaa6bed3b3c3cd845c94f2b77af1b93be3535a7646748f649fba06fc1eca119a7a0c31c7a5669b601 WHIRLPOOL ab882190aea08595e1928c40372ca99c5bbd79d5515e33b8769a0b3c0863209fd58cbefed81c95b10ebeda58577876b82046bc08c48aa4db5a117b9be59c7d87
@@ -325,7 +194,6 @@ EBUILD scala-2.11.7-r1.ebuild 7839 SHA256 72a0e2feed18e3a77a3301541e652841763909
 EBUILD scala-2.11.8.ebuild 7839 SHA256 36bc4a27dfe8c2d8e68280931aa543b1674e132ea918fa9d323f85635547ae27 SHA512 3f934239ffb49faeb807fdc1a60a3e94997011879faa00a0f142494c6cf4d3352979f630c39956e9c7fecf6c6cbe9e5288e3d70460bc0b7ff039a063c3fed269 WHIRLPOOL e4c83f7b9cce6a3d18f2689d76f0fc6234fb2fb2dc4eeba7643d8402fb98b2583170048c4e375994ce3d85cbeebaf59b84b43e3060614b6ac70bd2b1ae45bc8e
 EBUILD scala-2.12.1.ebuild 7348 SHA256 46fc4851a8cb16c4fc54fa02d1daf2166a8117bc505c27c536158c6861e602b1 SHA512 7791ef4c03afba70dc92eb5d145931056145238b698b6fd4aed1328d9e153f15b196410014144e8c46dd211666e777ab4a91794102d6d04782cbdac7c1780c05 WHIRLPOOL ef45844478a8057ff4eb3b815907a0200edd13e0e1b8576e664b3de94c6c36f7c08124685f659591a44cba62671002709417b7f0732fd4c4c58f8dd8cf359de1
 EBUILD scala-2.12.2.ebuild 7260 SHA256 09aad73cfa31e437ed03ad25ae8854278f752a1bf9d29b83258dfb33acb79034 SHA512 014927e26a8f4d4a2b906fb1b920784ea0c627cfdedb72b528898c097498ccd65f6681f5314912c9feaee1ed56ff54ac6876938a56dfd076c8c48159b0d185f6 WHIRLPOOL b48ef101858db88d5a461fc340f71d7b7da373805b21420b8c5ef50b7d84bf949c05c1b12abe2a4b253637d20f62bac7ded8d0eacb9aa2799d1cbfa38f059305
-EBUILD scala-2.9.3.ebuild 8593 SHA256 e500e6621a2ee6d04992c95c2e9ea3885b520aed9bb0cb1eb27c6fe0ff171c3e SHA512 cd6da61a88fa8b11cce4f105df755830f43cfe51520c9f848af2059bf00c0b11016dbc2282b965b7242accef7d44a9d383780ca3082e5ed49928d76d879d9c98 WHIRLPOOL bd0bcf777cae5b04370d6b791a981bbe5a24e4688664ba25359cffee924b4744edadf7b9d6a616f9dc82e1b19f4d1e455f6952ca03667145a44b0fc0c6fcd4f5
 MISC ChangeLog 6120 SHA256 3e98f824f30ef01564e8ce5110244b4a1a5bac17ee095df230f0110f6bbfe957 SHA512 2634b79c48634f73688f5ea1b400d5091aba72d8a38b7fc5f71b47d6195ece48239a727664d60b44f120f5096b974d59df618055889949b104012181eac6dc46 WHIRLPOOL efdf221a9d363de35cb62b873ee8283cfa57cd2ad497ab946db9ed4bf68d57a5c19c0f2a5b344caf0d39f55d630ef631a4bef1776d24beaf264f83d8b677d275
 MISC ChangeLog-2015 11548 SHA256 bc528415fa2004fc10ff9716086279125ad03e5a73f82b3cf911e36c70c24e16 SHA512 6f1ecc363795e33f7301c6689e966b5761fbfb7e998f439bc5dd58976bd2c353513f6e588dcb7d7fcff6f79d83eb4a6e082b9704c73a90058536017ceee70b6e WHIRLPOOL a9f5846c514c57bada7c885f9d1b7f5bb301a305b9d721902c6be3ecc8c62bca2fa26ac05610b333a1621db47632ad882922c60e8b6ae7fc627a86af35bb961a
 MISC metadata.xml 478 SHA256 4e01bae8b52cdec13422442c3ada9808ca3fd39040f4d7b3f65e003710f94284 SHA512 cca0d7d9cb94bfaad3f93382456248626e83ed8358798ff4b11c600cadee3b88b28b89e914fe5d42c16e170969ded1b35efd1af61953476347f620b9a973d718 WHIRLPOOL ada7f68837a7d2c33989fe3ad054514d8963041e1b19f1b0aea95bc9b535be74481a9328e16a02b584cf7b8295286f69774b1ae42a9db6975ba5159a73f59802
diff --git a/dev-lang/scala/files/scala-2.10.2-jdk-1.7-swing-SI-7455.patch b/dev-lang/scala/files/scala-2.10.2-jdk-1.7-swing-SI-7455.patch
deleted file mode 100644
index 964b323d9b30..000000000000
--- a/dev-lang/scala/files/scala-2.10.2-jdk-1.7-swing-SI-7455.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-commit f3f1064c90371449949892f30de91cc1f2662c55
-Merge: 0b7dddb 050b4c9
-Author: Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com>
-Date:   Sat Jul 27 22:39:44 2013 -0700
-
-    Merge pull request #2750 from retronym/ticket/7455-2.10.x
-    
-    SI-7455 Drop dummy param for synthetic access constructor
-
-commit 050b4c951c838699c2fe30cbf01b63942c63a299
-Author: Jason Zaugg <jzaugg@gmail.com>
-Date:   Wed Jul 17 15:52:48 2013 +1000
-
-    SI-7455 Drop dummy param for synthetic access constructor
-    
-    Java synthesizes public constructors in private classes to
-    allow access from inner classes. The signature of
-    that synthetic constructor (known as a "access constructor")
-    has a dummy parameter appended to avoid overloading clashes.
-    javac chooses the type "Enclosing$1" for the dummy parameter
-    (called the "access constructor tag") which is either an
-    existing anonymous class or a synthesized class for this purpose.
-    
-    In OpenJDK, this transformation is performed in:
-    
-      langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java
-    
-    (Incidentally, scalac would just emits a byte-code public
-    constructor in this situation, rather than a private constructor /
-    access constructor pair.)
-    
-    Scala parses the signature of the access contructor, and drops
-    the $outer parameter, but retains the dummy parameter. This causes
-    havoc when it tries to parse the bytecode for that anonymous class;
-    the class file parser doesn't have the enclosing type parameters
-    of Vector in scope and crash ensues.
-    
-    In any case, we shouldn't allow user code to see that constructor;
-    it should only be called from within its own compilation unit.
-    
-    This commit drops the dummy parameter from access constructor
-    signatures in class file parsing.
-
-diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
-index da11754..4e5204f 100644
---- a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
-+++ b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
-@@ -626,7 +626,7 @@ abstract class ClassfileParser {
-         sawPrivateConstructor = true
-       in.skip(2); skipAttributes()
-     } else {
--      if ((sflags & PRIVATE) != 0L && global.settings.optimise.value) {
-+      if ((sflags & PRIVATE) != 0L && global.settings.optimise.value) { // TODO this should be !optimize, no? See c4181f656d.
-         in.skip(4); skipAttributes()
-       } else {
-         val name = pool.getName(in.nextChar)
-@@ -636,7 +636,7 @@ abstract class ClassfileParser {
-           info match {
-             case MethodType(params, restpe) =>
-               // if this is a non-static inner class, remove the explicit outer parameter
--              val newParams = innerClasses getEntry currentClass match {
-+              val paramsNoOuter = innerClasses getEntry currentClass match {
-                 case Some(entry) if !isScalaRaw && !isStatic(entry.jflags) =>
-                   /* About `clazz.owner.isPackage` below: SI-5957
-                    * For every nested java class A$B, there are two symbols in the scala compiler.
-@@ -650,6 +650,15 @@ abstract class ClassfileParser {
-                 case _ =>
-                   params
-               }
-+              val newParams = paramsNoOuter match {
-+                case (init :+ tail) if (jflags & JAVA_ACC_SYNTHETIC) != 0L =>
-+                  // SI-7455 strip trailing dummy argument ("access constructor tag") from synthetic constructors which
-+                  // are added when an inner class needs to access a private constructor.
-+                  init
-+                case _ =>
-+                  paramsNoOuter
-+              }
-+
-               info = MethodType(newParams, clazz.tpe)
-           }
-         sym.setInfo(info)
-diff --git a/test/files/run/t7455.check b/test/files/run/t7455.check
-new file mode 100644
-index 0000000..0eb9342
---- /dev/null
-+++ b/test/files/run/t7455.check
-@@ -0,0 +1,4 @@
-+private[package <empty>] def <init>(x$1: String): Outer[E]
-+private[package <empty>] def <init>(): Outer$PrivateInner
-+private[package <empty>] def <init>(): Outer$PrivateStaticInner
-+private[package <empty>] def <init>(x$2: String): Outer$PublicInner
-diff --git a/test/files/run/t7455/Outer.java b/test/files/run/t7455/Outer.java
-new file mode 100644
-index 0000000..10c97a9
---- /dev/null
-+++ b/test/files/run/t7455/Outer.java
-@@ -0,0 +1,31 @@
-+public class Outer<E> {
-+    public void elements() {
-+        new C<E>() {
-+        };
-+    }
-+
-+    private Outer(String a) {}
-+
-+    static class SubSelf extends Outer<String> {
-+        public SubSelf() { super(""); }
-+    }
-+
-+    private class PrivateInner {
-+    }
-+    class SubPrivateInner extends PrivateInner {
-+    }
-+
-+    private class PublicInner {
-+        private PublicInner(String a) {}
-+    }
-+    class SubPublicInner extends PublicInner {
-+        public SubPublicInner() { super(""); }
-+    }
-+
-+    private static class PrivateStaticInner {
-+    }
-+    public static class SubPrivateStaticInner extends PrivateStaticInner {
-+    }
-+}
-+
-+class C<E> {}
-diff --git a/test/files/run/t7455/Test.scala b/test/files/run/t7455/Test.scala
-new file mode 100644
-index 0000000..b23a724
---- /dev/null
-+++ b/test/files/run/t7455/Test.scala
-@@ -0,0 +1,30 @@
-+import scala.tools.partest._
-+
-+// javac adds dummy parameters of type Outer$1 to synthetic access constructors
-+// This test shows that we strip them from the signatures. If we don't, we trigger
-+// parsing of Outer$1 which can fail if it references type parameters of the Outer.
-+//
-+// OLD OUTPUT:
-+//  private[package <empty>] def <init>(x$2: Outer$1): Outer$PrivateInner
-+//  error: error while loading Outer$1, class file 't7455-run.obj/Outer$1.class' is broken
-+//  (class java.util.NoSuchElementException/key not found: E)
-+//  ...
-+object Test extends DirectTest {
-+  override def code = ""
-+
-+  def show {
-+    val classpath = List(sys.props("partest.lib"), testOutput.path) mkString sys.props("path.separator")
-+    val compiler = newCompiler("-cp", classpath, "-d", testOutput.path)
-+    import compiler._, definitions._
-+    new compiler.Run
-+
-+    for {
-+      name <- Seq("Outer", "Outer$PrivateInner", "Outer$PrivateStaticInner", "Outer$PublicInner")
-+      clazz = compiler.rootMirror.staticClass(name)
-+      constr <- clazz.info.member(nme.CONSTRUCTOR).alternatives
-+    } {
-+      println(constr.defString)
-+      fullyInitializeSymbol(constr)
-+    }
-+  }
-+}
-
diff --git a/dev-lang/scala/files/scala-2.10.2-jdk-1.7-swing.patch b/dev-lang/scala/files/scala-2.10.2-jdk-1.7-swing.patch
deleted file mode 100644
index a9614f3db2b3..000000000000
--- a/dev-lang/scala/files/scala-2.10.2-jdk-1.7-swing.patch
+++ /dev/null
@@ -1,236 +0,0 @@
---- scala-2.10.2-orig/build.xml	2013-05-31 00:44:27.000000000 +1000
-+++ scala-2.10.2/build.xml	2013-08-20 20:41:23.335756000 +1000
-@@ -343,6 +343,8 @@
-       <echo level="warning"> You are using JDK7 for this build.
-         While this will be able to build most of Scala, it will not build the Swing project.
-         You will be unable to create a distribution.
-+        ^ The above is a message from the scala 2.10.2 release, the Gentoo
-+        ebuild applies patches for jdk 1.7 swing.
-       </echo>
-     </then></if>
- 
-@@ -1153,7 +1155,7 @@
-   <target name="quick.partest"    depends="quick.scalap, quick.comp, asm.done">
-     <staged-build with="locker"   stage="quick" project="partest" version="partest"/> </target>
- 
--  <target name="quick.swing"      depends="quick.actors, quick.lib" if="has.java6">
-+  <target name="quick.swing"      depends="quick.actors, quick.lib">
-     <staged-build with="locker"   stage="quick" project="swing"/> </target>
- 
-   <target name="quick.plugins"    depends="quick.comp">
-@@ -1204,7 +1206,7 @@
-     <staged-pack project="library"/></target>
- 
-   <target name="pack.actors"  depends="quick.lib">                <staged-pack project="actors"/> </target>
--  <target name="pack.swing" if="has.java6" depends="quick.swing"> <staged-pack project="swing"/> </target>
-+  <target name="pack.swing" depends="quick.swing"> <staged-pack project="swing"/> </target>
-   <target name="pack.reflect" depends="quick.reflect">            <staged-pack project="reflect"/> </target>
- 
-   <target name="pack.comp"    depends="quick.comp, asm.done">
-@@ -1351,9 +1353,7 @@
-       <make-plugin-bundle name="continuations" version="${osgi.version.number}" />
-       <touch file="${build-osgi.dir}/bundles.complete" verbose="no"/>
- 
--      <if><isset property="has.java6"/><then>
--        <make-bundle name="scala-swing" version="${osgi.version.number}"/></then>
--      </if>
-+      <make-bundle name="scala-swing" version="${osgi.version.number}"/>
-       <stopwatch name="osgi.bundle.timer" action="total"/></then>
-     </if>
-   </target>
---- scala-2.10.2-orig/src/swing/scala/swing/ComboBox.scala	2013-05-31 00:44:27.000000000 +1000
-+++ scala-2.10.2/src/swing/scala/swing/ComboBox.scala	2013-08-20 20:26:48.334061000 +1000
-@@ -9,7 +9,7 @@
- package scala.swing
- 
- import event._
--import javax.swing.{JList, JComponent, JComboBox, JTextField, ComboBoxModel, AbstractListModel, ListCellRenderer}
-+import javax.swing.{ JComponent, JComboBox, JTextField, ComboBoxModel, AbstractListModel, ListCellRenderer }
- import java.awt.event.ActionListener
- 
- object ComboBox {
-@@ -118,10 +118,10 @@
-   implicit def floatEditor(c: ComboBox[Float]): Editor[Float] = new BuiltInEditor(c)(s => s.toFloat, s => s.toString)
-   implicit def doubleEditor(c: ComboBox[Double]): Editor[Double] = new BuiltInEditor(c)(s => s.toDouble, s => s.toString)
- 
--  def newConstantModel[A](items: Seq[A]): ComboBoxModel = {
--    new AbstractListModel with ComboBoxModel {
-+  def newConstantModel[A](items: Seq[A]): ComboBoxModel[A] = {
-+    new AbstractListModel[A] with ComboBoxModel[A] {
-       private var selected: A = if (items.isEmpty) null.asInstanceOf[A] else items(0)
--      def getSelectedItem: AnyRef = selected.asInstanceOf[AnyRef]
-+      def getSelectedItem = selected.asInstanceOf[AnyRef]
-       def setSelectedItem(a: Any) {
-         if ((selected != null && selected != a) ||
-             selected == null && a != null) {
-@@ -129,7 +129,7 @@
-           fireContentsChanged(this, -1, -1)
-         }
-       }
--      def getElementAt(n: Int) = items(n).asInstanceOf[AnyRef]
-+      def getElementAt(n: Int) = items(n).asInstanceOf[A]
-       def getSize = items.size
-     }
-   }
-@@ -157,7 +157,7 @@
-  * @see javax.swing.JComboBox
-  */
- class ComboBox[A](items: Seq[A]) extends Component with Publisher {
--  override lazy val peer: JComboBox = new JComboBox(ComboBox.newConstantModel(items)) with SuperMixin
-+  override lazy val peer: JComboBox[A] = new JComboBox(ComboBox.newConstantModel(items)) with SuperMixin
- 
-   object selection extends Publisher {
-     def index: Int = peer.getSelectedIndex
-@@ -182,7 +182,8 @@
-    * of the component to its own defaults _after_ the renderer has been
-    * configured. That's Swing's principle of most suprise.
-    */
--  def renderer: ListView.Renderer[A] = ListView.Renderer.wrap(peer.getRenderer)
-+  def renderer: ListView.Renderer[A] = ListView.Renderer.wrap[A](peer.getRenderer.asInstanceOf[ListCellRenderer[A]])
-+  // def renderer: ListView.Renderer[A] = ListView.Renderer.wrap(peer.getRenderer)
-   def renderer_=(r: ListView.Renderer[A]) { peer.setRenderer(r.peer) }
- 
-   /* XXX: currently not safe to expose:
-@@ -201,8 +202,8 @@
-     peer.setEditor(editor(this).comboBoxPeer)
-   }
- 
--  def prototypeDisplayValue: Option[A] = toOption[A](peer.getPrototypeDisplayValue)
-+  def prototypeDisplayValue: Option[A] = Option(peer.getPrototypeDisplayValue)
-   def prototypeDisplayValue_=(v: Option[A]) {
--    peer.setPrototypeDisplayValue((v map toAnyRef).orNull)
-+    peer.setPrototypeDisplayValue((v map toAnyRef).orNull.asInstanceOf[A])
-   }
- }
---- scala-2.10.2-orig/src/swing/scala/swing/ListView.scala	2013-05-31 00:44:27.000000000 +1000
-+++ scala-2.10.2/src/swing/scala/swing/ListView.scala	2013-08-20 20:26:48.334716000 +1000
-@@ -24,21 +24,21 @@
-     val MultiInterval = Value(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION)
-   }
- 
--  def wrap[A](c: JList) = new ListView[A] {
-+  def wrap[A](c: JList[A]) = new ListView[A] {
-     override lazy val peer = c
-   }
- 
-   object Renderer {
--    def wrap[A](r: ListCellRenderer): Renderer[A] = new Wrapped[A](r)
-+    def wrap[A](r: ListCellRenderer[A]): Renderer[A] = new Wrapped[A](r)
- 
-     /**
-      * Wrapper for <code>javax.swing.ListCellRenderer<code>s
-      */
--  	class Wrapped[A](override val peer: ListCellRenderer) extends Renderer[A] {
--  	  def componentFor(list: ListView[_], isSelected: Boolean, focused: Boolean, a: A, index: Int) = {
-+      class Wrapped[A](override val peer: ListCellRenderer[A]) extends Renderer[A] {
-+        def componentFor(list: ListView[_ <: A], isSelected: Boolean, focused: Boolean, a: A, index: Int) = {
-         Component.wrap(peer.getListCellRendererComponent(list.peer, a, index, isSelected, focused).asInstanceOf[JComponent])
-+        }
-       }
--  	}
- 
-     /**
-      * Returns a renderer for items of type <code>A</code>. The given function
-@@ -55,8 +55,8 @@
-      * </code>
-      */
-     def apply[A,B](f: A => B)(implicit renderer: Renderer[B]): Renderer[A] = new Renderer[A] {
--      def componentFor(list: ListView[_], isSelected: Boolean, focused: Boolean, a: A, index: Int): Component =
--        renderer.componentFor(list, isSelected, focused, f(a), index)
-+      def componentFor(list: ListView[_ <: A], isSelected: Boolean, focused: Boolean, a: A, index: Int): Component =
-+        renderer.componentFor(list.asInstanceOf[ListView[_ <: B]], isSelected, focused, f(a), index)
-     }
-   }
- 
-@@ -69,11 +69,11 @@
-    * @see javax.swing.ListCellRenderer
-    */
-   abstract class Renderer[-A] {
--    def peer: ListCellRenderer = new ListCellRenderer {
--      def getListCellRendererComponent(list: JList, a: Any, index: Int, isSelected: Boolean, focused: Boolean) =
--        componentFor(ListView.wrap[A](list), isSelected, focused, a.asInstanceOf[A], index).peer
-+    def peer: ListCellRenderer[_ >: A] = new ListCellRenderer[A] {
-+      def getListCellRendererComponent(list: JList[_ <: A], a: A, index: Int, isSelected: Boolean, focused: Boolean) =
-+        componentFor(ListView.wrap[A](list.asInstanceOf[JList[A]]), isSelected, focused, a, index).peer
-     }
--    def componentFor(list: ListView[_], isSelected: Boolean, focused: Boolean, a: A, index: Int): Component
-+    def componentFor(list: ListView[_ <: A], isSelected: Boolean, focused: Boolean, a: A, index: Int): Component
-   }
- 
-   /**
-@@ -110,7 +110,7 @@
-     /**
-      * Configures the component before returning it.
-      */
--    def componentFor(list: ListView[_], isSelected: Boolean, focused: Boolean, a: A, index: Int): Component = {
-+    def componentFor(list: ListView[_ <: A], isSelected: Boolean, focused: Boolean, a: A, index: Int): Component = {
-       preConfigure(list, isSelected, focused, a, index)
-       configure(list, isSelected, focused, a, index)
-       component
-@@ -123,10 +123,10 @@
-    * that renders the string returned from an item's <code>toString</code>.
-    */
-   implicit object GenericRenderer extends Renderer[Any] {
--    override lazy val peer: ListCellRenderer = new DefaultListCellRenderer
--    def componentFor(list: ListView[_], isSelected: Boolean, focused: Boolean, a: Any, index: Int): Component = {
--      val c = peer.getListCellRendererComponent(list.peer, a, index, isSelected, focused).asInstanceOf[JComponent]
--      Component.wrap(c)
-+    override lazy val peer: ListCellRenderer[Any] = (new DefaultListCellRenderer).asInstanceOf[ListCellRenderer[Any]]
-+    def componentFor(list: ListView[_ <: Any], isSelected: Boolean, focused: Boolean, a: Any, index: Int): Component = {
-+      val c = peer.getListCellRendererComponent(list.peer, a, index, isSelected, focused)
-+      Component.wrap(c.asInstanceOf[JComponent])
-     }
-   }
- }
-@@ -142,34 +142,34 @@
-  */
- class ListView[A] extends Component {
-   import ListView._
--  override lazy val peer: JList = new JList with SuperMixin
-+  override lazy val peer: JList[A] = new JList[A] with SuperMixin
- 
-   def this(items: Seq[A]) = {
-     this()
-     listData = items
-   }
- 
--  protected class ModelWrapper(val items: Seq[A]) extends AbstractListModel {
--    def getElementAt(n: Int) = items(n).asInstanceOf[AnyRef]
-+  protected class ModelWrapper[A](val items: Seq[A]) extends AbstractListModel[A] {
-+    def getElementAt(n: Int) = items(n)
-     def getSize = items.size
-   }
- 
-   def listData: Seq[A] = peer.getModel match {
--    case model: ModelWrapper => model.items
--    case model @ _ => new Seq[A] { selfSeq =>
-+    case model: ModelWrapper[a] => model.items
-+    case model => new Seq[A] { selfSeq =>
-      def length = model.getSize
-      def iterator = new Iterator[A] {
-        var idx = 0
-        def next = { idx += 1; apply(idx-1) }
-        def hasNext = idx < selfSeq.length
-      }
--     def apply(n: Int) = model.getElementAt(n).asInstanceOf[A]
-+     def apply(n: Int): A = model.getElementAt(n)
-     }
-   }
- 
-   def listData_=(items: Seq[A]) {
--    peer.setModel(new AbstractListModel {
--      def getElementAt(n: Int) = items(n).asInstanceOf[AnyRef]
-+    peer.setModel(new AbstractListModel[A] {
-+      def getElementAt(n: Int) = items(n)
-       def getSize = items.size
-     })
-   }
-@@ -216,7 +216,7 @@
-     def adjusting = peer.getSelectionModel.getValueIsAdjusting
-   }
- 
--  def renderer: ListView.Renderer[A] = ListView.Renderer.wrap(peer.getCellRenderer)
-+  def renderer: ListView.Renderer[A] = ListView.Renderer.wrap[A](peer.getCellRenderer.asInstanceOf[ListCellRenderer[A]])
-   def renderer_=(r: ListView.Renderer[A]) { peer.setCellRenderer(r.peer) }
- 
-   def fixedCellWidth = peer.getFixedCellWidth
diff --git a/dev-lang/scala/files/scala-2.10.2-maven-deps.patch b/dev-lang/scala/files/scala-2.10.2-maven-deps.patch
deleted file mode 100644
index 133a2a4f7576..000000000000
--- a/dev-lang/scala/files/scala-2.10.2-maven-deps.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- scala-2.10.2-orig/build.xml	2013-05-31 00:44:27.000000000 +1000
-+++ scala-2.10.2/build.xml	2013-08-30 22:48:11.727055000 +1000
-@@ -202,30 +202,19 @@
-          on repeated use of artifact:dependencies
-     -->
-     <if><not><isset property="maven-deps-done"></isset></not><then>
--      <mkdir dir="${user.home}/.m2/repository"/>
--      <!-- This task has an issue where if the user directory does not exist, so we create it above. UGH. -->
--      <artifact:dependencies pathId="extra.tasks.classpath" filesetId="extra.tasks.fileset">
--        <dependency groupId="biz.aQute" artifactId="bnd" version="1.50.0"/>
--      </artifact:dependencies>
-+      <path id="extra.tasks.classpath">
-+        <pathelement path="BNDLIB_CLASSPATH"></pathelement>
-+      </path>
- 
-       <!-- Pax runner -->
--      <property name="pax.exam.version" value="2.5.0"/>
--      <artifact:dependencies pathId="pax.exam.classpath" filesetId="pax.exam.fileset">
--        <dependency groupId="org.ops4j.pax.exam" artifactId="pax-exam-container-native" version="${pax.exam.version}"/>
--        <dependency groupId="org.ops4j.pax.exam" artifactId="pax-exam-junit4" version="${pax.exam.version}"/>
--        <dependency groupId="org.ops4j.pax.exam" artifactId="pax-exam-link-assembly" version="${pax.exam.version}"/>
--        <dependency groupId="org.ops4j.pax.url" artifactId="pax-url-aether" version="1.4.0"/>
--        <dependency groupId="org.ops4j.pax.swissbox" artifactId="pax-swissbox-framework" version="1.5.1"/>
--        <dependency groupId="ch.qos.logback" artifactId="logback-core" version="0.9.20"/>
--        <dependency groupId="ch.qos.logback" artifactId="logback-classic" version="0.9.20"/>
--        <dependency groupId="junit" artifactId="junit" version="4.10"/>
--        <dependency groupId="org.apache.felix" artifactId="org.apache.felix.framework" version="3.2.2"/>
--      </artifact:dependencies>
--
--      <artifact:dependencies pathId="partest.extras.classpath" filesetId="partest.extras.fileset" versionsId="partest.extras.versions">
--        <dependency groupId="com.googlecode.java-diff-utils" artifactId="diffutils" version="1.3.0"/>
--      </artifact:dependencies>
--
-+      <path id="pax.exam.classpath">
-+        <pathelement path="PAX_RUNNER_CLASSPATH"></pathelement>
-+      </path>
-+
-+      <path id="partest.extras.classpath">
-+        <pathelement path="DIFFUTILS_CLASSPATH"></pathelement>
-+      </path>
-+      <property name="partest.extras.versions" value="1.3.0"></property>
-       <!-- BND support -->
-       <typedef resource="aQute/bnd/ant/taskdef.properties" classpathref="extra.tasks.classpath" />
- 
-@@ -1247,10 +1236,8 @@
-   <!-- depend on quick.done so quick.bin is run when pack.done is -->
-   <target name="pack.done" depends="quick.done, pack.bin">
-     <!-- copy dependencies to build/pack/lib, it only takes a second so don't bother with uptodate checks -->
--    <copy todir="${build-pack.dir}/lib">
--      <resources refid="partest.extras.fileset"/>
--      <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper"
--              from="${partest.extras.versions}" to="flatten"/>
-+    <copy todir="${build-pack.dir}/lib" flatten="true">
-+      <path><path refid="partest.extras.classpath"/></path>
-     </copy>
- 
-     <taskdef resource="scala/tools/ant/antlib.xml" classpathref="pack.compiler.path"/>
-@@ -1769,10 +1756,8 @@
-       </fileset>
-     </copy>
- 
--    <copy todir="${dist.dir}/lib">
--      <resources refid="partest.extras.fileset"/>
--      <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper"
--              from="${partest.extras.versions}" to="flatten"/>
-+    <copy todir="${dist.dir}/lib" flatten="true">
-+      <path><path refid="partest.extras.classpath"/></path>
-     </copy>
- 
-     <mkdir dir="${dist.dir}/bin"/>
diff --git a/dev-lang/scala/files/scala-2.10.2-no-git.patch b/dev-lang/scala/files/scala-2.10.2-no-git.patch
deleted file mode 100644
index f1b83173036b..000000000000
--- a/dev-lang/scala/files/scala-2.10.2-no-git.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- scala-2.10.2-orig/tools/get-scala-commit-date	2013-05-31 00:44:27.000000000 +1000
-+++ scala-2.10.2/tools/get-scala-commit-date	2013-08-20 20:26:34.859699000 +1000
-@@ -10,8 +10,8 @@
- 
- [[ $# -eq 0 ]] || cd "$1"
- 
--lastcommitdate=$(git log --format="%ci" HEAD | head -n 1 | cut -d ' ' -f 1)
--lastcommithours=$(git log --format="%ci" HEAD | head -n 1 | cut -d ' ' -f 2)
-+lastcommitdate="2013-05-31"
-+lastcommithours="00:00:00"
- 
- # 20120324
- echo "${lastcommitdate//-/}-${lastcommithours//:/}"
---- scala-2.10.2-orig/tools/get-scala-commit-sha	2013-05-31 00:44:27.000000000 +1000
-+++ scala-2.10.2/tools/get-scala-commit-sha	2013-08-20 20:26:34.860152000 +1000
-@@ -12,7 +12,7 @@
- 
- # printf %016s is not portable for 0-padding, has to be a digit.
- # so we're stuck disassembling it.
--hash=$(git log -1 --format="%H" HEAD)
-+hash="60d462ef6e0dba5f9a7c4cc81255fcb9fba7939a"
- hash=${hash#g}
- hash=${hash:0:10}
- echo "$hash"
diff --git a/dev-lang/scala/files/scala-2.10.3-no-git.patch b/dev-lang/scala/files/scala-2.10.3-no-git.patch
deleted file mode 100644
index 8309cef7e3d2..000000000000
--- a/dev-lang/scala/files/scala-2.10.3-no-git.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- scala-2.10.3-orig/tools/get-scala-commit-date	2013-09-23 23:00:37.000000000 +1000
-+++ scala-2.10.3/tools/get-scala-commit-date	2014-02-09 14:14:29.132553839 +1100
-@@ -10,8 +10,8 @@
- 
- [[ $# -eq 0 ]] || cd "$1"
- 
--lastcommitdate=$(git log --format="%ci" HEAD | head -n 1 | cut -d ' ' -f 1)
--lastcommithours=$(git log --format="%ci" HEAD | head -n 1 | cut -d ' ' -f 2)
-+lastcommitdate="2013-09-23"
-+lastcommithours="00:00:00"
- 
- # 20120324
- echo "${lastcommitdate//-/}-${lastcommithours//:/}"
---- scala-2.10.3-orig/tools/get-scala-commit-sha	2013-09-23 23:00:37.000000000 +1000
-+++ scala-2.10.3/tools/get-scala-commit-sha	2014-02-09 14:08:46.878352444 +1100
-@@ -12,7 +12,7 @@
- 
- # printf %016s is not portable for 0-padding, has to be a digit.
- # so we're stuck disassembling it.
--hash=$(git log -1 --format="%H" HEAD)
-+hash="e2fec6b28dfd73482945ffab85d9b582d0cb9f17"
- hash=${hash#g}
- hash=${hash:0:10}
- echo "$hash"
diff --git a/dev-lang/scala/files/scala-2.10.4-no-git.patch b/dev-lang/scala/files/scala-2.10.4-no-git.patch
deleted file mode 100644
index 2efc8119015c..000000000000
--- a/dev-lang/scala/files/scala-2.10.4-no-git.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- scala-2.10.4-orig/tools/get-scala-commit-date	2014-02-10 04:00:20.000000000 +1100
-+++ scala-2.10.4/tools/get-scala-commit-date	2014-07-05 18:19:38.054864707 +1000
-@@ -10,8 +10,8 @@
- 
- [[ $# -eq 0 ]] || cd "$1"
- 
--lastcommitdate=$(git log --format="%ci" HEAD | head -n 1 | cut -d ' ' -f 1)
--lastcommithours=$(git log --format="%ci" HEAD | head -n 1 | cut -d ' ' -f 2)
-+lastcommitdate="2014-02-10"
-+lastcommithours="00:00:00"
- 
- # 20120324
- echo "${lastcommitdate//-/}-${lastcommithours//:/}"
---- scala-2.10.4-orig/tools/get-scala-commit-sha	2014-02-10 04:00:20.000000000 +1100
-+++ scala-2.10.4/tools/get-scala-commit-sha	2014-07-05 18:20:27.799470430 +1000
-@@ -12,7 +12,7 @@
- 
- # printf %016s is not portable for 0-padding, has to be a digit.
- # so we're stuck disassembling it.
--hash=$(git log -1 --format="%H" HEAD)
-+hash="b66a39653b9bccab72036ba58fec5fd7d596d313"
- hash=${hash#g}
- hash=${hash:0:10}
- echo "$hash"
diff --git a/dev-lang/scala/files/scala-2.10.6-no-git.patch b/dev-lang/scala/files/scala-2.10.6-no-git.patch
deleted file mode 100644
index 259ef787cf7c..000000000000
--- a/dev-lang/scala/files/scala-2.10.6-no-git.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- scala-2.10.6-orig/tools/get-scala-commit-date	2015-09-18 18:50:36.000000000 +1000
-+++ scala-2.10.6/tools/get-scala-commit-date	2016-01-29 18:53:09.874767271 +1100
-@@ -10,8 +10,8 @@
- 
- [[ $# -eq 0 ]] || cd "$1"
- 
--lastcommitdate=$(git log --format="%ci" HEAD | head -n 1 | cut -d ' ' -f 1)
--lastcommithours=$(git log --format="%ci" HEAD | head -n 1 | cut -d ' ' -f 2)
-+lastcommitdate="2015-09-18"
-+lastcommithours="00:00:00"
- 
- # 20120324
- echo "${lastcommitdate//-/}-${lastcommithours//:/}"
---- scala-2.10.6-orig/tools/get-scala-commit-sha	2015-09-18 18:50:36.000000000 +1000
-+++ scala-2.10.6/tools/get-scala-commit-sha	2016-01-29 18:53:44.097767230 +1100
-@@ -12,7 +12,7 @@
- 
- # printf %016s is not portable for 0-padding, has to be a digit.
- # so we're stuck disassembling it.
--hash=$(git log -1 --format="%H" HEAD)
-+hash="bda53196ebbeb1369c70f3d1ec066796c06a6409"
- hash=${hash#g}
- hash=${hash:0:10}
- echo "$hash"
diff --git a/dev-lang/scala/files/scala-2.9.2-java7.patch b/dev-lang/scala/files/scala-2.9.2-java7.patch
deleted file mode 100644
index 1cf8c8befe64..000000000000
--- a/dev-lang/scala/files/scala-2.9.2-java7.patch
+++ /dev/null
@@ -1,198 +0,0 @@
-diff -Nru scala-2.9.2-sources/src/swing/scala/swing/ComboBox.scala scala-2.9.2-sources-gil/src/swing/scala/swing/ComboBox.scala
---- scala-2.9.2-sources/src/swing/scala/swing/ComboBox.scala	2012-03-18 17:09:24.000000000 +0100
-+++ scala-2.9.2-sources-gil/src/swing/scala/swing/ComboBox.scala	2012-11-23 17:09:08.353124190 +0100
-@@ -11,7 +11,7 @@
- package scala.swing
- 
- import event._
--import javax.swing.{JList, JComponent, JComboBox, JTextField, ComboBoxModel, AbstractListModel, ListCellRenderer}
-+import javax.swing.{ JComponent, JComboBox, JTextField, ComboBoxModel, AbstractListModel, ListCellRenderer }
- import java.awt.event.ActionListener
- 
- object ComboBox {
-@@ -120,10 +120,10 @@
-   implicit def floatEditor(c: ComboBox[Float]): Editor[Float] = new BuiltInEditor(c)(s => s.toFloat, s => s.toString)
-   implicit def doubleEditor(c: ComboBox[Double]): Editor[Double] = new BuiltInEditor(c)(s => s.toDouble, s => s.toString)
- 
--  def newConstantModel[A](items: Seq[A]): ComboBoxModel = {
--    new AbstractListModel with ComboBoxModel {
-+  def newConstantModel[A](items: Seq[A]): ComboBoxModel[A] = {
-+    new AbstractListModel[A] with ComboBoxModel[A] {
-       private var selected: A = if (items.isEmpty) null.asInstanceOf[A] else items(0)
--      def getSelectedItem: AnyRef = selected.asInstanceOf[AnyRef]
-+      def getSelectedItem = selected.asInstanceOf[AnyRef]
-       def setSelectedItem(a: Any) {
-         if ((selected != null && selected != a) ||
-             selected == null && a != null) {
-@@ -131,7 +131,7 @@
-           fireContentsChanged(this, -1, -1)
-         }
-       }
--      def getElementAt(n: Int) = items(n).asInstanceOf[AnyRef]
-+      def getElementAt(n: Int) = items(n).asInstanceOf[A]
-       def getSize = items.size
-     }
-   }
-@@ -159,7 +159,7 @@
-  * @see javax.swing.JComboBox
-  */
- class ComboBox[A](items: Seq[A]) extends Component with Publisher {
--  override lazy val peer: JComboBox = new JComboBox(ComboBox.newConstantModel(items)) with SuperMixin
-+  override lazy val peer: JComboBox[A] = new JComboBox(ComboBox.newConstantModel(items)) with SuperMixin
- 
-   object selection extends Publisher {
-     def index: Int = peer.getSelectedIndex
-@@ -184,7 +184,8 @@
-    * of the component to its own defaults _after_ the renderer has been
-    * configured. That's Swing's principle of most suprise.
-    */
--  def renderer: ListView.Renderer[A] = ListView.Renderer.wrap(peer.getRenderer)
-+  def renderer: ListView.Renderer[A] = ListView.Renderer.wrap[A](peer.getRenderer.asInstanceOf[ListCellRenderer[A]])
-+  // def renderer: ListView.Renderer[A] = ListView.Renderer.wrap(peer.getRenderer)
-   def renderer_=(r: ListView.Renderer[A]) { peer.setRenderer(r.peer) }
- 
-   /* XXX: currently not safe to expose:
-@@ -203,8 +204,8 @@
-     peer.setEditor(editor(this).comboBoxPeer)
-   }
- 
--  def prototypeDisplayValue: Option[A] = toOption[A](peer.getPrototypeDisplayValue)
-+  def prototypeDisplayValue: Option[A] = Option(peer.getPrototypeDisplayValue)
-   def prototypeDisplayValue_=(v: Option[A]) {
--    peer.setPrototypeDisplayValue(v map toAnyRef orNull)
-+    peer.setPrototypeDisplayValue((v map toAnyRef).orNull.asInstanceOf[A])
-   }
- }
-diff -Nru scala-2.9.2-sources/src/swing/scala/swing/ListView.scala scala-2.9.2-sources-gil/src/swing/scala/swing/ListView.scala
---- scala-2.9.2-sources/src/swing/scala/swing/ListView.scala	2012-03-18 17:09:26.000000000 +0100
-+++ scala-2.9.2-sources-gil/src/swing/scala/swing/ListView.scala	2012-11-23 17:20:45.704030454 +0100
-@@ -24,21 +24,21 @@
-     val MultiInterval = Value(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION)
-   }
- 
--  def wrap[A](c: JList) = new ListView[A] {
-+  def wrap[A](c: JList[A]) = new ListView[A] {
-     override lazy val peer = c
-   }
- 
-   object Renderer {
--    def wrap[A](r: ListCellRenderer): Renderer[A] = new Wrapped[A](r)
-+    def wrap[A](r: ListCellRenderer[A]): Renderer[A] = new Wrapped[A](r)
- 
-     /**
-      * Wrapper for <code>javax.swing.ListCellRenderer<code>s
-      */
--  	class Wrapped[A](override val peer: ListCellRenderer) extends Renderer[A] {
--  	  def componentFor(list: ListView[_], isSelected: Boolean, focused: Boolean, a: A, index: Int) = {
-+      class Wrapped[A](override val peer: ListCellRenderer[A]) extends Renderer[A] {
-+        def componentFor(list: ListView[_ <: A], isSelected: Boolean, focused: Boolean, a: A, index: Int) = {
-         Component.wrap(peer.getListCellRendererComponent(list.peer, a, index, isSelected, focused).asInstanceOf[JComponent])
-+        }
-       }
--  	}
- 
-     /**
-      * Returns a renderer for items of type <code>A</code>. The given function
-@@ -55,8 +55,8 @@
-      * </code>
-      */
-     def apply[A,B](f: A => B)(implicit renderer: Renderer[B]): Renderer[A] = new Renderer[A] {
--      def componentFor(list: ListView[_], isSelected: Boolean, focused: Boolean, a: A, index: Int): Component =
--        renderer.componentFor(list, isSelected, focused, f(a), index)
-+      def componentFor(list: ListView[_ <: A], isSelected: Boolean, focused: Boolean, a: A, index: Int): Component =
-+        renderer.componentFor(list.asInstanceOf[ListView[_ <: B]], isSelected, focused, f(a), index)
-     }
-   }
- 
-@@ -69,11 +69,11 @@
-    * @see javax.swing.ListCellRenderer
-    */
-   abstract class Renderer[-A] {
--    def peer: ListCellRenderer = new ListCellRenderer {
--      def getListCellRendererComponent(list: JList, a: Any, index: Int, isSelected: Boolean, focused: Boolean) =
--        componentFor(ListView.wrap[A](list), isSelected, focused, a.asInstanceOf[A], index).peer
-+    def peer: ListCellRenderer[_ >: A] = new ListCellRenderer[A] {
-+      def getListCellRendererComponent(list: JList[_ <: A], a: A, index: Int, isSelected: Boolean, focused: Boolean) =
-+        componentFor(ListView.wrap[A](list.asInstanceOf[JList[A]]), isSelected, focused, a, index).peer
-     }
--    def componentFor(list: ListView[_], isSelected: Boolean, focused: Boolean, a: A, index: Int): Component
-+    def componentFor(list: ListView[_ <: A], isSelected: Boolean, focused: Boolean, a: A, index: Int): Component
-   }
- 
-   /**
-@@ -110,7 +110,7 @@
-     /**
-      * Configures the component before returning it.
-      */
--    def componentFor(list: ListView[_], isSelected: Boolean, focused: Boolean, a: A, index: Int): Component = {
-+    def componentFor(list: ListView[_ <: A], isSelected: Boolean, focused: Boolean, a: A, index: Int): Component = {
-       preConfigure(list, isSelected, focused, a, index)
-       configure(list, isSelected, focused, a, index)
-       component
-@@ -123,10 +123,10 @@
-    * that renders the string returned from an item's <code>toString</code>.
-    */
-   implicit object GenericRenderer extends Renderer[Any] {
--    override lazy val peer: ListCellRenderer = new DefaultListCellRenderer
--    def componentFor(list: ListView[_], isSelected: Boolean, focused: Boolean, a: Any, index: Int): Component = {
--      val c = peer.getListCellRendererComponent(list.peer, a, index, isSelected, focused).asInstanceOf[JComponent]
--      Component.wrap(c)
-+    override lazy val peer: ListCellRenderer[Any] = (new DefaultListCellRenderer).asInstanceOf[ListCellRenderer[Any]]
-+    def componentFor(list: ListView[_ <: Any], isSelected: Boolean, focused: Boolean, a: Any, index: Int): Component = {
-+      val c = peer.getListCellRendererComponent(list.peer, a, index, isSelected, focused)
-+      Component.wrap(c.asInstanceOf[JComponent])
-     }
-   }
- }
-@@ -142,34 +142,34 @@
-  */
- class ListView[A] extends Component {
-   import ListView._
--  override lazy val peer: JList = new JList with SuperMixin
-+  override lazy val peer: JList[A] = new JList[A] with SuperMixin
- 
-   def this(items: Seq[A]) = {
-     this()
-     listData = items
-   }
- 
--  protected class ModelWrapper(val items: Seq[A]) extends AbstractListModel {
--    def getElementAt(n: Int) = items(n).asInstanceOf[AnyRef]
-+  protected class ModelWrapper[A](val items: Seq[A]) extends AbstractListModel[A] {
-+    def getElementAt(n: Int) = items(n)
-     def getSize = items.size
-   }
- 
-   def listData: Seq[A] = peer.getModel match {
--    case model: ModelWrapper => model.items
--    case model @ _ => new Seq[A] { selfSeq =>
-+    case model: ModelWrapper[a] => model.items
-+    case model => new Seq[A] { selfSeq =>
-      def length = model.getSize
-      def iterator = new Iterator[A] {
-        var idx = 0
-        def next = { idx += 1; apply(idx-1) }
-        def hasNext = idx < selfSeq.length
-      }
--     def apply(n: Int) = model.getElementAt(n).asInstanceOf[A]
-+     def apply(n: Int): A = model.getElementAt(n)
-     }
-   }
- 
-   def listData_=(items: Seq[A]) {
--    peer.setModel(new AbstractListModel {
--      def getElementAt(n: Int) = items(n).asInstanceOf[AnyRef]
-+    peer.setModel(new AbstractListModel[A] {
-+      def getElementAt(n: Int) = items(n)
-       def getSize = items.size
-     })
-   }
-@@ -227,7 +227,7 @@
-     def adjusting = peer.getSelectionModel.getValueIsAdjusting
-   }
- 
--  def renderer: ListView.Renderer[A] = ListView.Renderer.wrap(peer.getCellRenderer)
-+  def renderer: ListView.Renderer[A] = ListView.Renderer.wrap[A](peer.getCellRenderer.asInstanceOf[ListCellRenderer[A]])
-   def renderer_=(r: ListView.Renderer[A]) { peer.setCellRenderer(r.peer) }
- 
-   def fixedCellWidth = peer.getFixedCellWidth
diff --git a/dev-lang/scala/scala-2.10.2-r3.ebuild b/dev-lang/scala/scala-2.10.2-r3.ebuild
deleted file mode 100644
index 819b19c36886..000000000000
--- a/dev-lang/scala/scala-2.10.2-r3.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source"
-WANT_ANT_TASKS="ant-nodeps"
-EANT_TEST_TARGET="test.suite"
-
-inherit eutils check-reqs java-pkg-2 java-ant-2 versionator
-
-MY_P="${PN}-sources-${PV}"
-SV="$(get_version_component_range 1-2)"
-
-# creating the binary:
-# JAVA_PKG_FORCE_VM="$available-1.6" USE="doc examples source" ebuild scala-*.ebuild compile
-# cd $WORDKIR
-# fix dist/latest link.
-# tar -cjf $DISTDIR/scala-$PN-gentoo-binary.tar.bz2 ${MY_P}/dists ${MY_P}/docs/TODO
-
-# in the pullJarFiles function in tools/binary-repo-lib.sh it executes find commands
-# to search for .desired.sha1 files, which contain sha1 hashes that are appended
-# to ${BURI} along with the subdirectory and filename to form the list of jar files
-# listed in SRC_URI.
-
-BURI="http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap"
-
-declare -a JURI=(${BURI}/8bdac1cdd60b73ff7e12fd2b556355fa10343e2d/lib/scala-library-src.jar \
-	${BURI}/ddd7d5398733c4fbbb8355c049e258d47af636cf/lib/forkjoin.jar \
-	${BURI}/d48cb950ceded82a5e0ffae8ef2c68d0923ed00c/lib/msil.jar \
-	${BURI}/d229f4c91ea8ab1a81559b5803efd9b0b1632f0b/lib/scala-reflect-src.jar \
-	${BURI}/3fc1e35ca8c991fc3488548f7a276bd9053c179d/lib/ant/ant-dotnet-1.0.jar \
-	${BURI}/2c61d6e9a912b3253194d5d6d3e1db7e2545ac4b/lib/ant/vizant.jar \
-	${BURI}/7b456ca6b93900f96e58cc8371f03d90a9c1c8d1/lib/ant/ant.jar \
-	${BURI}/943cd5c8802b2a3a64a010efb86ec19bac142e40/lib/ant/ant-contrib.jar \
-	${BURI}/7e50e3e227d834695f1e0bf018a7326e06ee4c86/lib/ant/maven-ant-tasks-2.1.1.jar \
-	${BURI}/cfa3ee21f76cd5c115bd3bc070a3b401587bafb5/lib/scala-compiler-src.jar \
-	${BURI}/1e0e39fae15b42e85998740511ec5a3830e26243/lib/scala-library.jar \
-	${BURI}/8acc87f222210b4a5eb2675477602fc1759e7684/lib/fjbg.jar \
-	${BURI}/288f47dbe1002653e030fd25ca500b9ffe1ebd64/lib/scala-reflect.jar \
-	${BURI}/a5261e70728c1847639e2b47d953441d0b217bcb/lib/jline.jar \
-	${BURI}/d54b99f215d4d42b3f0b3489fbb1081270700992/lib/scala-compiler.jar \
-	${BURI}/02fe2ed93766323a13f22c7a7e2ecdcd84259b6c/test/files/lib/annotations.jar \
-	${BURI}/b1ec8a095cec4902b3609d74d274c04365c59c04/test/files/lib/genericNest.jar \
-	${BURI}/981392dbd1f727b152cd1c908c5fce60ad9d07f7/test/files/lib/enums.jar \
-	${BURI}/cd33e0a0ea249eb42363a2f8ba531186345ff68c/test/files/lib/nest.jar \
-	${BURI}/be8454d5e7751b063ade201c225dcedefd252775/test/files/lib/methvsfield.jar \
-	${BURI}/b6f4dbb29f0c2ec1eba682414f60d52fea84f703/test/files/lib/scalacheck.jar \
-	${BURI}/e737b123d31eede5594ceda07caafed1673ec472/test/files/codelib/code.jar \
-	${BURI}/1b11ac773055c1e942c6b5eb4aabdf02292a7194/test/files/speclib/instrumented.jar \
-	${BURI}/a1883f4304d5aa65e1f6ee6aad5900c62dd81079/tools/push.jar)
-
-DESCRIPTION="The Scala Programming Language"
-HOMEPAGE="http://www.scala-lang.org/"
-SRC_URI="!binary?
-(	https://github.com/scala/scala/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${JURI[@]}
-	https://dev.gentoo.org/~gienah/snapshots/${P}-maven-deps.tar.gz
-)
-binary? ( https://dev.gentoo.org/~tomwij/files/dist/${P}-gentoo-binary.tar.bz2 )"
-
-LICENSE="BSD"
-SLOT="${SV}/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-
-IUSE="binary emacs"
-
-COMMON_DEP="dev-java/ant-core:0
-	dev-java/bndlib:0
-	dev-java/hawtjni-runtime:0
-	dev-java/junit:4"
-
-DEPEND="${COMMON_DEP}
-	=virtual/jdk-1.7*
-	!binary? (
-		dev-java/ant-contrib:0
-	)
-	app-arch/xz-utils:0"
-
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.7
-	app-eselect/eselect-scala
-	!dev-lang/scala-bin:0"
-
-PDEPEND="emacs? ( app-emacs/scala-mode:0 )"
-
-S="${WORKDIR}/${P}"
-
-CHECKREQS_MEMORY="1532M"
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-
-	if ! use binary; then
-		debug-print "Checking for sufficient physical RAM"
-
-		ewarn "This package can fail to build with memory allocation errors in some cases."
-		ewarn "If you are unable to build from sources, please try USE=binary"
-		ewarn "for this package. See bug #181390 for more information."
-
-		check-reqs_pkg_setup
-	fi
-}
-
-src_unpack() {
-	if use binary ; then
-		mkdir -p "${S}" || die
-		cd "${S}" || die
-	fi
-
-	# Unpack tar files only.
-	for f in ${A} ; do
-		[[ ${f} == *".tar."* ]] && unpack ${f}
-	done
-}
-
-java_prepare() {
-	java-pkg_getjars ant-core,bndlib,hawtjni-runtime,junit-4
-
-	if ! use binary; then
-		local j
-		for j in "${JURI[@]}"
-		do
-			cp -p "${DISTDIR}/${j##*/}" "${S}/${j#${BURI}/*/}" || die
-		done
-		# gentoo patch (by gienah) to stop it calling git log in the build
-		epatch "${FILESDIR}/${PN}-2.10.2-no-git.patch"
-		if has_version ">=virtual/jdk-1.7.0"; then
-			# This patch bumped to 2.10.2: http://pkgs.fedoraproject.org/cgit/scala.git/tree/scala-2.10.0-java7.patch
-			epatch "${FILESDIR}/${PN}-2.10.2-jdk-1.7-swing.patch"
-		fi
-		# https://issues.scala-lang.org/browse/SI-7455
-		epatch "${FILESDIR}/${PN}-2.10.2-jdk-1.7-swing-SI-7455.patch"
-		# Note: to bump scala, some things to try are:
-		# 1. update all the sha1s in JURI
-		# 2. comment out applying the maven-deps patch and all the stuff here up to and including the sed of build.xml
-		# 3. try emerge scala, it will likely download more stuff in src_compile to ${WORKDIR}/.m2
-		# 4. tar up the stuff in ${WORKDIR}/.m2 and change the ${P}-maven-deps.tar.gz in SRC_URI to point to it.
-		# 5. uncomment the maven-deps patch apply and all the stuff up to and including the sed of build.xml
-		# 6. the hash in ${P}-no-git.patch should be updated by searching for hash matching the scala release
-		# tag, so that the source code hyper-links in the scala documentation will point to the correct version of
-		# the source code.
-		# Bug 482192
-		epatch "${FILESDIR}/${PN}-2.10.2-maven-deps.patch"
-		# we have $(java-config -p bndlib) in portage, but not bnd.
-		local bnd_classpath=""
-		for i in $(find "${WORKDIR}/.m2/repository/biz/aQute/bnd" -type f -name *.jar -print)
-		do
-			if [ -z "${bnd_classpath}" ]
-			then
-				bnd_classpath="${i}"
-			else
-				bnd_classpath="${bnd_classpath}:${i}"
-			fi
-		done
-		bnd_classpath="${bnd_classpath}:$(java-config -p bndlib)"
-
-		# pax runner appears to only be used in the tests
-		local paxrunner_classpath=""
-		for i in $(find "${WORKDIR}/.m2/repository/org/ops4j/" -type f -name *.jar -print)
-		do
-			if [ -z "${paxrunner_classpath}" ]
-			then
-				paxrunner_classpath="${i}"
-			else
-				paxrunner_classpath="${paxrunner_classpath}:${i}"
-			fi
-		done
-		paxrunner_classpath="${paxrunner_classpath}:$(java-config -p junit-4)"
-
-		# DiffUtils does not appear to be in portage.  It is placed in ${partest.extras.classpath} and
-		# copied to ${build-pack.dir}/lib in ${PN}-2.10.2-maven-deps.patch.
-		local diffutils_classpath=""
-		for i in $(find "${WORKDIR}/.m2/repository/com/googlecode/java-diff-utils" -type f -name *.jar -print)
-		do
-			if [ -z "${diffutils_classpath}" ]
-			then
-				diffutils_classpath="${i}"
-			else
-				diffutils_classpath="${diffutils_classpath}:${i}"
-			fi
-		done
-
-		sed -e "s@BNDLIB_CLASSPATH@${bnd_classpath}@" \
-			-e "s@PAX_RUNNER_CLASSPATH@${paxrunner_classpath}@" \
-			-e "s@DIFFUTILS_CLASSPATH@${diffutils_classpath}@" \
-			-i "${S}/build.xml" \
-			|| die "could not sed classpaths in build.xml"
-	fi
-}
-
-src_compile() {
-	if ! use binary; then
-		#unset ANT_OPTS as this is set in the build.xml
-		#sets -X type variables which might come back to bite me
-		unset ANT_OPTS
-
-		# reported in bugzilla that multiple launches use less resources
-		# https://bugs.gentoo.org/show_bug.cgi?id=282023
-		eant all.clean
-		eant -Djavac.args="-encoding UTF-8" -Djava6.home=${JAVA_HOME} \
-			-Duser.home="${WORKDIR}" build-opt
-		eant dist.done
-	else
-		einfo "Skipping compilation, USE=binary is set."
-	fi
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	cd dists/latest || die
-
-	local SCALADIR="/usr/share/${PN}-${SV}"
-
-	exeinto "${SCALADIR}/bin"
-	doexe $(find bin/ -type f ! -iname '*.bat')
-
-	#sources are .scala so no use for java-pkg_dosrc
-	if use source; then
-		dodir "${SCALADIR}/src"
-		insinto "${SCALADIR}/src"
-		doins src/*-src.jar
-	fi
-
-	java-pkg_dojar lib/*.jar
-
-	pushd man/man1 || die
-	for i in *.1; do
-		newman "${i}" "${i/./-${SV}.}"
-	done
-	popd
-
-	#docs and examples are not contained in the binary tgz anymore
-	if ! use binary; then
-		local docdir="doc/${PN}-devel-docs"
-		dodoc doc/README ../../docs/TODO
-		if use doc; then
-			java-pkg_dojavadoc "${docdir}/api"
-			dohtml -r "${docdir}/tools"
-		fi
-
-		use examples && java-pkg_doexamples "${docdir}/examples"
-	fi
-
-	dodir /usr/bin
-	for b in $(find bin/ -type f ! -iname '*.bat'); do
-		local _name=$(basename "${b}")
-		dosym "/usr/share/${PN}-${SV}/bin/${_name}" "/usr/bin/${_name}-${SV}"
-	done
-}
diff --git a/dev-lang/scala/scala-2.10.3-r2.ebuild b/dev-lang/scala/scala-2.10.3-r2.ebuild
deleted file mode 100644
index 4318fb95cf71..000000000000
--- a/dev-lang/scala/scala-2.10.3-r2.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source"
-JAVA_ANT_DISABLE_ANT_CORE_DEP="yes"
-EANT_TEST_TARGET="test.suite"
-
-inherit eutils check-reqs java-pkg-2 java-ant-2 versionator
-
-MY_P="${PN}-sources-${PV}"
-SV="$(get_version_component_range 1-2)"
-
-# creating the binary:
-# JAVA_PKG_FORCE_VM="$available-1.6" USE="doc examples source" ebuild scala-*.ebuild compile
-# cd $WORDKIR
-# fix dist/latest link.
-# tar -cjf $DISTDIR/scala-$PN-gentoo-binary.tar.bz2 ${MY_P}/dists ${MY_P}/docs/TODO
-
-# In the pullJarFiles function in tools/binary-repo-lib.sh it executes find commands
-# to search for .desired.sha1 files, which contain sha1 hashes that are appended
-# to ${BURI} along with the subdirectory and filename to form the list of jar files
-# listed in SRC_URI.  The output of this find command can be hacked into the desired format:
-# find . -name \*.desired.sha1 -exec sed -e 's@\([0-9a-f]*\).*@\1@' {} \; -print
-# After editing it into the desired format: sort -t / -k 3 file
-
-BURI="http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap"
-
-declare -a JURI=( \
-	${BURI}/8b6ba65c8146217333f0762087fe2340d572e832/docs/examples/plugintemplate/lib/scalatest.jar \
-	${BURI}/943cd5c8802b2a3a64a010efb86ec19bac142e40/lib/ant/ant-contrib.jar \
-	${BURI}/3fc1e35ca8c991fc3488548f7a276bd9053c179d/lib/ant/ant-dotnet-1.0.jar \
-	${BURI}/7b456ca6b93900f96e58cc8371f03d90a9c1c8d1/lib/ant/ant.jar \
-	${BURI}/7e50e3e227d834695f1e0bf018a7326e06ee4c86/lib/ant/maven-ant-tasks-2.1.1.jar \
-	${BURI}/2c61d6e9a912b3253194d5d6d3e1db7e2545ac4b/lib/ant/vizant.jar \
-	${BURI}/8acc87f222210b4a5eb2675477602fc1759e7684/lib/fjbg.jar \
-	${BURI}/ddd7d5398733c4fbbb8355c049e258d47af636cf/lib/forkjoin.jar \
-	${BURI}/a5261e70728c1847639e2b47d953441d0b217bcb/lib/jline.jar \
-	${BURI}/d48cb950ceded82a5e0ffae8ef2c68d0923ed00c/lib/msil.jar \
-	${BURI}/cfa3ee21f76cd5c115bd3bc070a3b401587bafb5/lib/scala-compiler-src.jar \
-	${BURI}/d54b99f215d4d42b3f0b3489fbb1081270700992/lib/scala-compiler.jar \
-	${BURI}/8bdac1cdd60b73ff7e12fd2b556355fa10343e2d/lib/scala-library-src.jar \
-	${BURI}/1e0e39fae15b42e85998740511ec5a3830e26243/lib/scala-library.jar \
-	${BURI}/d229f4c91ea8ab1a81559b5803efd9b0b1632f0b/lib/scala-reflect-src.jar
-	${BURI}/288f47dbe1002653e030fd25ca500b9ffe1ebd64/lib/scala-reflect.jar \
-	${BURI}/0392ecdeb306263c471ce51fa368223388b82b61/test/benchmarks/lib/jsr166_and_extra.jar \
-	${BURI}/e737b123d31eede5594ceda07caafed1673ec472/test/files/codelib/code.jar \
-	${BURI}/02fe2ed93766323a13f22c7a7e2ecdcd84259b6c/test/files/lib/annotations.jar \
-	${BURI}/981392dbd1f727b152cd1c908c5fce60ad9d07f7/test/files/lib/enums.jar \
-	${BURI}/b1ec8a095cec4902b3609d74d274c04365c59c04/test/files/lib/genericNest.jar \
-	${BURI}/be8454d5e7751b063ade201c225dcedefd252775/test/files/lib/methvsfield.jar \
-	${BURI}/cd33e0a0ea249eb42363a2f8ba531186345ff68c/test/files/lib/nest.jar \
-	${BURI}/b6f4dbb29f0c2ec1eba682414f60d52fea84f703/test/files/lib/scalacheck.jar \
-	${BURI}/1b11ac773055c1e942c6b5eb4aabdf02292a7194/test/files/speclib/instrumented.jar \
-	${BURI}/f174c50c4363c492362a05c72dd45b0da18fdcd8/test/pending/neg/plugin-after-terminal/lib/plugins.jar \
-	${BURI}/d7b100ad483484b598b7cd643424bd2e33898a0d/test/pending/neg/plugin-before-parser/lib/plugins.jar \
-	${BURI}/7e6be9e33a87194e7061f94f6be115619f91ada2/test/pending/neg/plugin-cyclic-dependency/lib/plugins.jar \
-	${BURI}/2bda582b574287429ad5ee2e1d9a3effc88b0a5f/test/pending/neg/plugin-multiple-rafter/lib/plugins.jar \
-	${BURI}/af91fd67ccef349e7f8ea662615e17796a339485/test/pending/neg/plugin-rafter-before-1/lib/plugins.jar \
-	${BURI}/8cccde4914da2058dca893783c231cda23855603/test/pending/neg/plugin-rightafter-terminal/lib/plugins.jar \
-	${BURI}/a1883f4304d5aa65e1f6ee6aad5900c62dd81079/tools/push.jar \
-)
-
-DESCRIPTION="The Scala Programming Language"
-HOMEPAGE="http://www.scala-lang.org/"
-SRC_URI="!binary?
-(	https://github.com/scala/scala/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${JURI[@]}
-	https://dev.gentoo.org/~gienah/snapshots/${P}-maven-deps.tar.gz
-	https://dev.gentoo.org/~gienah/snapshots/${P}-maven-deps-2.tar.gz
-)
-binary? ( https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.bz2 )"
-
-LICENSE="BSD"
-SLOT="${SV}/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-
-IUSE="binary emacs"
-
-COMMON_DEP="dev-java/ant-core:0
-	dev-java/hawtjni-runtime:0"
-
-DEPEND="${COMMON_DEP}
-	=virtual/jdk-1.7*
-	!binary? (
-		dev-java/ant-core:0
-		dev-java/ant-contrib:0
-		dev-java/ant-nodeps:0
-	)
-	app-arch/xz-utils:0"
-
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.7
-	app-eselect/eselect-scala
-	!dev-lang/scala-bin:0"
-
-PDEPEND="emacs? ( app-emacs/scala-mode:0 )"
-
-S="${WORKDIR}/${P}"
-
-CHECKREQS_MEMORY="1532M"
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-
-	if ! use binary; then
-		debug-print "Checking for sufficient physical RAM"
-
-		ewarn "This package can fail to build with memory allocation errors in some cases."
-		ewarn "If you are unable to build from sources, please try USE=binary"
-		ewarn "for this package. See bug #181390 for more information."
-
-		check-reqs_pkg_setup
-	fi
-}
-
-src_unpack() {
-	if use binary ; then
-		mkdir -p "${S}" || die
-		cd "${S}" || die
-	fi
-
-	# Unpack tar files only.
-	for f in ${A} ; do
-		[[ ${f} == *".tar."* ]] && unpack ${f}
-	done
-}
-
-java_prepare() {
-	java-pkg_getjars ant-core,hawtjni-runtime
-
-	if ! use binary; then
-		local j
-		for j in "${JURI[@]}"
-		do
-			cp -p "${DISTDIR}/${j##*/}" "${S}/${j#${BURI}/*/}" || die
-		done
-		# gentoo patch (by gienah) to stop it calling git log in the build
-		epatch "${FILESDIR}/${P}-no-git.patch"
-		if java-pkg_is-vm-version-ge "1.7" ; then
-			# This patch bumped to 2.10.2: http://pkgs.fedoraproject.org/cgit/scala.git/tree/scala-2.10.0-java7.patch
-			epatch "${FILESDIR}/${PN}-2.10.2-jdk-1.7-swing.patch"
-			sed -e "s@above is a message from the scala 2.10.2 release@above is a message from the scala ${PV} release@" \
-				-i "${S}/build.xml" \
-				|| die "Could not correct scala version message"
-		fi
-		# Note: to bump scala, some things to try are:
-		# 1. update all the sha1s in JURI
-		# 2. remove the https://dev.gentoo.org/~gienah/snapshots/${P}-maven-deps.tar.gz from SRC_URI
-		# 3. try emerge scala.  Check if it downloads more stuff in src_compile to ${WORKDIR}/.m2
-		# or /var/tmp/portage/.m2 or /root/.m2
-		# 4. tar up all the .m2 junk into ${P}-maven-deps.tar.gz and add it to SRC_URI.
-		sed -e "s@\(<mkdir dir=\"\)\${user.home}\(/.m2/repository\"/>\)@\1${WORKDIR}\2\n      <artifact:localRepository id=\"localrepo\" path=\"${WORKDIR}/.m2/repository\" />@" \
-			-e "s@\${user.home}/.m2@${WORKDIR}/.m2@g" \
-			-e 's@\(<artifact:dependencies .*>\)@\1\n        <localRepository refid="localrepo" />@g' \
-			-i "${S}/build.xml" \
-			|| die "Could not change location of .m2 maven download directory in ${S}/build.xml"
-
-		# Remove this test as it fails.
-		#   [partest] testing: [...]/files/run/parserJavaIdent.scala                        [FAILED]
-		rm -f test/files/run/parserJavaIdent.scala
-	fi
-}
-
-src_compile() {
-	if ! use binary; then
-		#unset ANT_OPTS as this is set in the build.xml
-		#sets -X type variables which might come back to bite me
-		unset ANT_OPTS
-
-		# reported in bugzilla that multiple launches use less resources
-		# https://bugs.gentoo.org/show_bug.cgi?id=282023
-		eant all.clean
-		eant -Djavac.args="-encoding UTF-8" -Djava6.home=${JAVA_HOME} \
-			-Duser.home="${WORKDIR}" build-opt
-		eant dist.done
-	else
-		einfo "Skipping compilation, USE=binary is set."
-	fi
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	cd dists/latest || die
-
-	local SCALADIR="/usr/share/${PN}-${SV}"
-
-	exeinto "${SCALADIR}/bin"
-	doexe $(find bin/ -type f ! -iname '*.bat')
-
-	#sources are .scala so no use for java-pkg_dosrc
-	if use source; then
-		dodir "${SCALADIR}/src"
-		insinto "${SCALADIR}/src"
-		doins src/*-src.jar
-	fi
-
-	java-pkg_dojar lib/*.jar
-
-	pushd man/man1 || die
-	for i in *.1; do
-		newman "${i}" "${i/./-${SV}.}"
-	done
-	popd
-
-	local docdir="doc/${PN}-devel-docs"
-	dodoc doc/README ../../docs/TODO
-	if use doc; then
-		java-pkg_dojavadoc "${docdir}/api"
-		dohtml -r "${docdir}/tools"
-	fi
-
-	use examples && java-pkg_doexamples "${docdir}/examples"
-
-	dodir /usr/bin
-	for b in $(find bin/ -type f ! -iname '*.bat'); do
-		local _name=$(basename "${b}")
-		dosym "/usr/share/${PN}-${SV}/bin/${_name}" "/usr/bin/${_name}-${SV}"
-	done
-}
diff --git a/dev-lang/scala/scala-2.10.4-r2.ebuild b/dev-lang/scala/scala-2.10.4-r2.ebuild
deleted file mode 100644
index 34d9c84c03c8..000000000000
--- a/dev-lang/scala/scala-2.10.4-r2.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-JAVA_ANT_DISABLE_ANT_CORE_DEP="yes"
-EANT_TEST_TARGET="test.suite"
-
-inherit eutils check-reqs java-pkg-2 java-ant-2 versionator
-
-MY_P="${PN}-sources-${PV}"
-SV="$(get_version_component_range 1-2)"
-
-# creating the binary:
-# JAVA_PKG_FORCE_VM="$available-1.6" USE="doc source" ebuild scala-*.ebuild compile
-# cd $WORDKIR
-# fix dist/latest link.
-# tar -cjf $DISTDIR/scala-$PN-gentoo-binary.tar.bz2 ${MY_P}/dists ${MY_P}/docs/README ${MY_P}/docs/TODO ${MY_P}/build/scaladoc
-
-# In the pullJarFiles function in tools/binary-repo-lib.sh it executes find commands
-# to search for .desired.sha1 files, which contain sha1 hashes that are appended
-# to ${BURI} along with the subdirectory and filename to form the list of jar files
-# listed in SRC_URI.  The output of this find command can be hacked into the desired format:
-# find . -name \*.desired.sha1 -exec sed -e 's@\([0-9a-f]*\).*@\1@' {} \; -print
-# After editing it into the desired format: sort -t / -k 3 file
-
-BURI="http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap"
-
-declare -a JURI=( \
-	"${BURI}/943cd5c8802b2a3a64a010efb86ec19bac142e40/lib/ant/ant-contrib.jar -> ${P}-ant-contrib.jar" \
-	"${BURI}/3fc1e35ca8c991fc3488548f7a276bd9053c179d/lib/ant/ant-dotnet-1.0.jar -> ${P}-ant-dotnet-1.0.jar" \
-	"${BURI}/7b456ca6b93900f96e58cc8371f03d90a9c1c8d1/lib/ant/ant.jar -> ${P}-ant.jar" \
-	"${BURI}/7e50e3e227d834695f1e0bf018a7326e06ee4c86/lib/ant/maven-ant-tasks-2.1.1.jar -> ${P}-maven-ant-tasks-2.1.1.jar" \
-	"${BURI}/2c61d6e9a912b3253194d5d6d3e1db7e2545ac4b/lib/ant/vizant.jar -> ${P}-vizant.jar" \
-	"${BURI}/8acc87f222210b4a5eb2675477602fc1759e7684/lib/fjbg.jar -> ${P}-fjbg.jar" \
-	"${BURI}/ddd7d5398733c4fbbb8355c049e258d47af636cf/lib/forkjoin.jar -> ${P}-forkjoin.jar" \
-	"${BURI}/a5261e70728c1847639e2b47d953441d0b217bcb/lib/jline.jar -> ${P}-jline.jar" \
-	"${BURI}/d48cb950ceded82a5e0ffae8ef2c68d0923ed00c/lib/msil.jar -> ${P}-msil.jar" \
-	"${BURI}/cfa3ee21f76cd5c115bd3bc070a3b401587bafb5/lib/scala-compiler-src.jar -> ${P}-scala-compiler-src.jar" \
-	"${BURI}/d54b99f215d4d42b3f0b3489fbb1081270700992/lib/scala-compiler.jar -> ${P}-scala-compiler.jar" \
-	"${BURI}/8bdac1cdd60b73ff7e12fd2b556355fa10343e2d/lib/scala-library-src.jar -> ${P}-scala-library-src.jar" \
-	"${BURI}/1e0e39fae15b42e85998740511ec5a3830e26243/lib/scala-library.jar -> ${P}-scala-library.jar" \
-	"${BURI}/d229f4c91ea8ab1a81559b5803efd9b0b1632f0b/lib/scala-reflect-src.jar -> ${P}-scala-reflect-src.jar" \
-	"${BURI}/288f47dbe1002653e030fd25ca500b9ffe1ebd64/lib/scala-reflect.jar -> ${P}-scala-reflect.jar" \
-	"${BURI}/0392ecdeb306263c471ce51fa368223388b82b61/test/benchmarks/lib/jsr166_and_extra.jar -> ${P}-jsr166_and_extra.jar" \
-	"${BURI}/e737b123d31eede5594ceda07caafed1673ec472/test/files/codelib/code.jar -> ${P}-code.jar" \
-	"${BURI}/02fe2ed93766323a13f22c7a7e2ecdcd84259b6c/test/files/lib/annotations.jar -> ${P}-annotations.jar" \
-	"${BURI}/981392dbd1f727b152cd1c908c5fce60ad9d07f7/test/files/lib/enums.jar -> ${P}-enums.jar" \
-	"${BURI}/b1ec8a095cec4902b3609d74d274c04365c59c04/test/files/lib/genericNest.jar -> ${P}-genericNest.jar" \
-	"${BURI}/be8454d5e7751b063ade201c225dcedefd252775/test/files/lib/methvsfield.jar -> ${P}-methvsfield.jar" \
-	"${BURI}/cd33e0a0ea249eb42363a2f8ba531186345ff68c/test/files/lib/nest.jar -> ${P}-nest.jar" \
-	"${BURI}/b6f4dbb29f0c2ec1eba682414f60d52fea84f703/test/files/lib/scalacheck.jar -> ${P}-scalacheck.jar" \
-	"${BURI}/1b11ac773055c1e942c6b5eb4aabdf02292a7194/test/files/speclib/instrumented.jar -> ${P}-instrumented.jar" \
-	"${BURI}/f174c50c4363c492362a05c72dd45b0da18fdcd8/test/pending/neg/plugin-after-terminal/lib/plugins.jar -> ${P}-plugins.jar" \
-	"${BURI}/d7b100ad483484b598b7cd643424bd2e33898a0d/test/pending/neg/plugin-before-parser/lib/plugins.jar -> ${P}-plugins.jar" \
-	"${BURI}/7e6be9e33a87194e7061f94f6be115619f91ada2/test/pending/neg/plugin-cyclic-dependency/lib/plugins.jar -> ${P}-plugins.jar" \
-	"${BURI}/2bda582b574287429ad5ee2e1d9a3effc88b0a5f/test/pending/neg/plugin-multiple-rafter/lib/plugins.jar -> ${P}-plugins.jar" \
-	"${BURI}/af91fd67ccef349e7f8ea662615e17796a339485/test/pending/neg/plugin-rafter-before-1/lib/plugins.jar -> ${P}-plugins.jar" \
-	"${BURI}/8cccde4914da2058dca893783c231cda23855603/test/pending/neg/plugin-rightafter-terminal/lib/plugins.jar -> ${P}-plugins.jar" \
-	"${BURI}/a1883f4304d5aa65e1f6ee6aad5900c62dd81079/tools/push.jar -> ${P}-push.jar" \
-)
-
-DESCRIPTION="The Scala Programming Language"
-HOMEPAGE="http://www.scala-lang.org/"
-SRC_URI="!binary?
-(	https://github.com/scala/scala/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${JURI[@]}
-	https://dev.gentoo.org/~gienah/snapshots/${P}-maven-deps.tar.gz
-)
-binary? ( https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.bz2 )"
-
-LICENSE="BSD"
-SLOT="${SV}/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-
-IUSE="binary emacs"
-
-COMMON_DEP="dev-java/ant-core:0
-	dev-java/hawtjni-runtime:0"
-
-DEPEND="${COMMON_DEP}
-	!binary? (
-		=virtual/jdk-1.7*
-		dev-java/ant-core:0
-		dev-java/ant-contrib:0
-		dev-java/ant-nodeps:0
-		media-gfx/graphviz
-	)
-	binary? (
-		=virtual/jdk-1.7*
-	)
-	app-arch/xz-utils:0"
-
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.7
-	app-eselect/eselect-scala
-	!dev-lang/scala-bin:0"
-
-PDEPEND="emacs? ( app-emacs/scala-mode:0 )"
-
-S="${WORKDIR}/${P}"
-
-CHECKREQS_MEMORY="1532M"
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-
-	if ! use binary; then
-		debug-print "Checking for sufficient physical RAM"
-
-		ewarn "This package can fail to build with memory allocation errors in some cases."
-		ewarn "If you are unable to build from sources, please try USE=binary"
-		ewarn "for this package. See bug #181390 for more information."
-
-		check-reqs_pkg_setup
-	fi
-}
-
-src_unpack() {
-	# Unpack tar files only.
-	for f in ${A} ; do
-		[[ ${f} == *".tar."* ]] && unpack ${f}
-	done
-}
-
-java_prepare() {
-	java-pkg_getjars ant-core,hawtjni-runtime
-
-	if ! use binary; then
-		local a
-		for a in "${JURI[@]}"
-		do
-			echo "${a}"
-			local g="${a/* -> /}"
-			echo "${g}"
-			local j="${a/ -> */}"
-			echo "${j}"
-			cp -p "${DISTDIR}/${g}" "${S}/${j#${BURI}/*/}" || die
-		done
-		# gentoo patch (by gienah) to stop it calling git log in the build
-		epatch "${FILESDIR}/${P}-no-git.patch"
-		if java-pkg_is-vm-version-ge "1.7" ; then
-			# This patch bumped to 2.10.2: http://pkgs.fedoraproject.org/cgit/scala.git/tree/scala-2.10.0-java7.patch
-			epatch "${FILESDIR}/${PN}-2.10.2-jdk-1.7-swing.patch"
-			sed -e "s@above is a message from the scala 2.10.2 release@above is a message from the scala ${PV} release@" \
-				-i "${S}/build.xml" \
-				|| die "Could not correct scala version message"
-		fi
-		# Note: to bump scala, some things to try are:
-		# 1. update all the sha1s in JURI
-		# 2. remove the https://dev.gentoo.org/~gienah/snapshots/${P}-maven-deps.tar.gz from SRC_URI
-		# 3. try emerge scala.  Check if it downloads more stuff in src_compile to ${WORKDIR}/.m2
-		# or /var/tmp/portage/.m2 or /root/.m2
-		# 4. tar up all the .m2 junk into ${P}-maven-deps.tar.gz and add it to SRC_URI.
-		sed -e "s@\(<mkdir dir=\"\)\${user.home}\(/.m2/repository\"/>\)@\1${WORKDIR}\2\n      <artifact:localRepository id=\"localrepo\" path=\"${WORKDIR}/.m2/repository\" />@" \
-			-e "s@\${user.home}/.m2@${WORKDIR}/.m2@g" \
-			-e 's@\(<artifact:dependencies .*>\)@\1\n        <localRepository refid="localrepo" />@g' \
-			-i "${S}/build.xml" \
-			|| die "Could not change location of .m2 maven download directory in ${S}/build.xml"
-		# Remove this test as it fails.
-		#   [partest] testing: [...]/files/run/parserJavaIdent.scala                        [FAILED]
-		rm -f test/files/run/parserJavaIdent.scala
-	fi
-}
-
-src_compile() {
-	if ! use binary; then
-		#unset ANT_OPTS as this is set in the build.xml
-		#sets -X type variables which might come back to bite me
-		unset ANT_OPTS
-
-		# reported in bugzilla that multiple launches use less resources
-		# https://bugs.gentoo.org/show_bug.cgi?id=282023
-		eant all.clean
-		eant -Djavac.args="-encoding UTF-8" -Djava6.home=${JAVA_HOME} \
-			-Duser.home="${WORKDIR}" build-opt
-		eant dist.done
-	else
-		einfo "Skipping compilation, USE=binary is set."
-	fi
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	pushd dists/latest || die
-
-	local SCALADIR="/usr/share/${PN}-${SV}"
-
-	exeinto "${SCALADIR}/bin"
-	doexe $(find bin/ -type f ! -iname '*.bat')
-
-	#sources are .scala so no use for java-pkg_dosrc
-	if use source; then
-		dodir "${SCALADIR}/src"
-		insinto "${SCALADIR}/src"
-		doins src/*-src.jar
-	fi
-
-	java-pkg_dojar lib/*.jar
-
-	pushd man/man1 || die
-	for i in *.1; do
-		newman "${i}" "${i/./-${SV}.}"
-	done
-	popd
-
-	dodir /usr/bin
-	for b in $(find bin/ -type f ! -iname '*.bat'); do
-		local _name=$(basename "${b}")
-		dosym "/usr/share/${PN}-${SV}/bin/${_name}" "/usr/bin/${_name}-${SV}"
-	done
-
-	popd
-	local docdir="build/scaladoc"
-	dodoc docs/README docs/TODO
-	if use doc; then
-		dohtml -r "${docdir}"
-	fi
-}
diff --git a/dev-lang/scala/scala-2.10.6.ebuild b/dev-lang/scala/scala-2.10.6.ebuild
deleted file mode 100644
index 35b0806eeb1c..000000000000
--- a/dev-lang/scala/scala-2.10.6.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-JAVA_ANT_DISABLE_ANT_CORE_DEP="yes"
-EANT_TEST_TARGET="test.suite"
-
-inherit eutils check-reqs java-pkg-2 java-ant-2 versionator
-
-MY_P="${PN}-sources-${PV}"
-SV="$(get_version_component_range 1-2)"
-
-# creating the binary:
-# JAVA_PKG_FORCE_VM="$available-1.6" USE="doc source" ebuild scala-*.ebuild compile
-# cd $WORDKIR
-# fix dist/latest link.
-# tar -cjf $DISTDIR/scala-$PN-gentoo-binary.tar.bz2 ${MY_P}/dists ${MY_P}/docs/README ${MY_P}/docs/TODO ${MY_P}/build/scaladoc
-
-# In the pullJarFiles function in tools/binary-repo-lib.sh it executes find commands
-# to search for .desired.sha1 files, which contain sha1 hashes that are appended
-# to ${BURI} along with the subdirectory and filename to form the list of jar files
-# listed in SRC_URI.  The output of this find command can be hacked into the desired format:
-# find . -name \*.desired.sha1 -exec sed -e 's@\([0-9a-f]*\).*@\1@' {} \; -print
-# After editing it into the desired format: sort -t / -k 3 file
-
-BURI="http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap"
-
-declare -a JURI=( \
-	"${BURI}/02fe2ed93766323a13f22c7a7e2ecdcd84259b6c/test/files/lib/annotations.jar -> ${P}-annotations.jar" \
-	"${BURI}/0392ecdeb306263c471ce51fa368223388b82b61/test/benchmarks/lib/jsr166_and_extra.jar -> ${P}-jsr166_and_extra.jar" \
-	"${BURI}/1b11ac773055c1e942c6b5eb4aabdf02292a7194/test/files/speclib/instrumented.jar -> ${P}-instrumented.jar" \
-	"${BURI}/1e0e39fae15b42e85998740511ec5a3830e26243/lib/scala-library.jar -> ${P}-scala-library.jar" \
-	"${BURI}/288f47dbe1002653e030fd25ca500b9ffe1ebd64/lib/scala-reflect.jar -> ${P}-scala-reflect.jar" \
-	"${BURI}/2bda582b574287429ad5ee2e1d9a3effc88b0a5f/test/pending/neg/plugin-multiple-rafter/lib/plugins.jar -> ${P}-plugins.jar" \
-	"${BURI}/2c61d6e9a912b3253194d5d6d3e1db7e2545ac4b/lib/ant/vizant.jar -> ${P}-vizant.jar" \
-	"${BURI}/3fc1e35ca8c991fc3488548f7a276bd9053c179d/lib/ant/ant-dotnet-1.0.jar -> ${P}-ant-dotnet-1.0.jar" \
-	"${BURI}/7b456ca6b93900f96e58cc8371f03d90a9c1c8d1/lib/ant/ant.jar -> ${P}-ant.jar" \
-	"${BURI}/7e50e3e227d834695f1e0bf018a7326e06ee4c86/lib/ant/maven-ant-tasks-2.1.1.jar -> ${P}-maven-ant-tasks-2.1.1.jar" \
-	"${BURI}/7e6be9e33a87194e7061f94f6be115619f91ada2/test/pending/neg/plugin-cyclic-dependency/lib/plugins.jar -> ${P}-plugins.jar" \
-	"${BURI}/8acc87f222210b4a5eb2675477602fc1759e7684/lib/fjbg.jar -> ${P}-fjbg.jar" \
-	"${BURI}/8bdac1cdd60b73ff7e12fd2b556355fa10343e2d/lib/scala-library-src.jar -> ${P}-scala-library-src.jar" \
-	"${BURI}/8cccde4914da2058dca893783c231cda23855603/test/pending/neg/plugin-rightafter-terminal/lib/plugins.jar -> ${P}-plugins.jar" \
-	"${BURI}/943cd5c8802b2a3a64a010efb86ec19bac142e40/lib/ant/ant-contrib.jar -> ${P}-ant-contrib.jar" \
-	"${BURI}/981392dbd1f727b152cd1c908c5fce60ad9d07f7/test/files/lib/enums.jar -> ${P}-enums.jar" \
-	"${BURI}/a1883f4304d5aa65e1f6ee6aad5900c62dd81079/tools/push.jar -> ${P}-push.jar" \
-	"${BURI}/a5261e70728c1847639e2b47d953441d0b217bcb/lib/jline.jar -> ${P}-jline.jar" \
-	"${BURI}/af91fd67ccef349e7f8ea662615e17796a339485/test/pending/neg/plugin-rafter-before-1/lib/plugins.jar -> ${P}-plugins.jar" \
-	"${BURI}/b1ec8a095cec4902b3609d74d274c04365c59c04/test/files/lib/genericNest.jar -> ${P}-genericNest.jar" \
-	"${BURI}/b6f4dbb29f0c2ec1eba682414f60d52fea84f703/test/files/lib/scalacheck.jar -> ${P}-scalacheck.jar" \
-	"${BURI}/be8454d5e7751b063ade201c225dcedefd252775/test/files/lib/methvsfield.jar -> ${P}-methvsfield.jar" \
-	"${BURI}/cd33e0a0ea249eb42363a2f8ba531186345ff68c/test/files/lib/nest.jar -> ${P}-nest.jar" \
-	"${BURI}/cfa3ee21f76cd5c115bd3bc070a3b401587bafb5/lib/scala-compiler-src.jar -> ${P}-scala-compiler-src.jar" \
-	"${BURI}/d229f4c91ea8ab1a81559b5803efd9b0b1632f0b/lib/scala-reflect-src.jar -> ${P}-scala-reflect-src.jar" \
-	"${BURI}/d48cb950ceded82a5e0ffae8ef2c68d0923ed00c/lib/msil.jar -> ${P}-msil.jar" \
-	"${BURI}/d54b99f215d4d42b3f0b3489fbb1081270700992/lib/scala-compiler.jar -> ${P}-scala-compiler.jar" \
-	"${BURI}/d7b100ad483484b598b7cd643424bd2e33898a0d/test/pending/neg/plugin-before-parser/lib/plugins.jar -> ${P}-plugins.jar" \
-	"${BURI}/ddd7d5398733c4fbbb8355c049e258d47af636cf/lib/forkjoin.jar -> ${P}-forkjoin.jar" \
-	"${BURI}/e737b123d31eede5594ceda07caafed1673ec472/test/files/codelib/code.jar -> ${P}-code.jar" \
-	"${BURI}/f174c50c4363c492362a05c72dd45b0da18fdcd8/test/pending/neg/plugin-after-terminal/lib/plugins.jar -> ${P}-plugins.jar"
-)
-
-DESCRIPTION="The Scala Programming Language"
-HOMEPAGE="http://www.scala-lang.org/"
-SRC_URI="!binary?
-(	https://github.com/scala/scala/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${JURI[@]}
-	https://dev.gentoo.org/~gienah/snapshots/${P}-maven-deps.tar.gz
-)
-binary? ( https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.bz2 )"
-
-LICENSE="BSD"
-SLOT="${SV}/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-
-IUSE="binary emacs"
-
-COMMON_DEP="dev-java/ant-core:0
-	dev-java/hawtjni-runtime:0"
-
-DEPEND="${COMMON_DEP}
-	!binary? (
-		=virtual/jdk-1.7*
-		dev-java/ant-core:0
-		dev-java/ant-contrib:0
-		dev-java/ant-nodeps:0
-		media-gfx/graphviz
-	)
-	binary? (
-		=virtual/jdk-1.7*
-	)
-	app-arch/xz-utils:0"
-
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.7
-	app-eselect/eselect-scala
-	!dev-lang/scala-bin:0"
-
-PDEPEND="emacs? ( app-emacs/scala-mode:0 )"
-
-S="${WORKDIR}/${P}"
-
-CHECKREQS_MEMORY="1532M"
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-
-	if ! use binary; then
-		debug-print "Checking for sufficient physical RAM"
-
-		ewarn "This package can fail to build with memory allocation errors in some cases."
-		ewarn "If you are unable to build from sources, please try USE=binary"
-		ewarn "for this package. See bug #181390 for more information."
-
-		check-reqs_pkg_setup
-	fi
-}
-
-src_unpack() {
-	# Unpack tar files only.
-	for f in ${A} ; do
-		[[ ${f} == *".tar."* ]] && unpack ${f}
-	done
-}
-
-java_prepare() {
-	java-pkg_getjars ant-core,hawtjni-runtime
-
-	if ! use binary; then
-		local a
-		for a in "${JURI[@]}"
-		do
-			echo "${a}"
-			local g="${a/* -> /}"
-			echo "${g}"
-			local j="${a/ -> */}"
-			echo "${j}"
-			cp -p "${DISTDIR}/${g}" "${S}/${j#${BURI}/*/}" || die
-		done
-		# gentoo patch (by gienah) to stop it calling git log in the build
-		epatch "${FILESDIR}/${P}-no-git.patch"
-		if java-pkg_is-vm-version-ge "1.7" ; then
-			# This patch bumped to 2.10.2: http://pkgs.fedoraproject.org/cgit/scala.git/tree/scala-2.10.0-java7.patch
-			epatch "${FILESDIR}/${PN}-2.10.2-jdk-1.7-swing.patch"
-			sed -e "s@above is a message from the scala 2.10.2 release@above is a message from the scala ${PV} release@" \
-				-i "${S}/build.xml" \
-				|| die "Could not correct scala version message"
-		fi
-		# Note: to bump scala, some things to try are:
-		# 1. update all the sha1s in JURI
-		# 2. remove the https://dev.gentoo.org/~gienah/snapshots/${P}-maven-deps.tar.gz from SRC_URI
-		# 3. try emerge scala.  Check if it downloads more stuff in src_compile to ${WORKDIR}/.m2
-		# or /var/tmp/portage/.m2 or /root/.m2
-		# 4. tar up all the .m2 junk into ${P}-maven-deps.tar.gz and add it to SRC_URI.
-		sed -e "s@\(<mkdir dir=\"\)\${user.home}\(/.m2/repository\"/>\)@\1${WORKDIR}\2\n      <artifact:localRepository id=\"localrepo\" path=\"${WORKDIR}/.m2/repository\" />@" \
-			-e "s@\${user.home}/.m2@${WORKDIR}/.m2@g" \
-			-e 's@\(<artifact:dependencies .*>\)@\1\n        <localRepository refid="localrepo" />@g' \
-			-i "${S}/build.xml" \
-			|| die "Could not change location of .m2 maven download directory in ${S}/build.xml"
-		# Remove this test as it fails.
-		#   [partest] testing: [...]/files/run/parserJavaIdent.scala                        [FAILED]
-		rm -f test/files/run/parserJavaIdent.scala
-	fi
-}
-
-src_compile() {
-	if ! use binary; then
-		#unset ANT_OPTS as this is set in the build.xml
-		#sets -X type variables which might come back to bite me
-		unset ANT_OPTS
-
-		# reported in bugzilla that multiple launches use less resources
-		# https://bugs.gentoo.org/show_bug.cgi?id=282023
-		eant all.clean
-		eant -Djavac.args="-encoding UTF-8" -Djava6.home=${JAVA_HOME} \
-			-Duser.home="${WORKDIR}" build-opt
-		eant dist.done
-	else
-		einfo "Skipping compilation, USE=binary is set."
-	fi
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	pushd dists/latest || die
-
-	local SCALADIR="/usr/share/${PN}-${SV}"
-
-	exeinto "${SCALADIR}/bin"
-	doexe $(find bin/ -type f ! -iname '*.bat')
-
-	#sources are .scala so no use for java-pkg_dosrc
-	if use source; then
-		dodir "${SCALADIR}/src"
-		insinto "${SCALADIR}/src"
-		doins src/*-src.jar
-	fi
-
-	java-pkg_dojar lib/*.jar
-
-	pushd man/man1 || die
-	for i in *.1; do
-		newman "${i}" "${i/./-${SV}.}"
-	done
-	popd
-
-	dodir /usr/bin
-	for b in $(find bin/ -type f ! -iname '*.bat'); do
-		local _name=$(basename "${b}")
-		dosym "/usr/share/${PN}-${SV}/bin/${_name}" "/usr/bin/${_name}-${SV}"
-	done
-
-	popd
-	local docdir="build/scaladoc"
-	dodoc docs/README docs/TODO
-	if use doc; then
-		dohtml -r "${docdir}"
-	fi
-}
diff --git a/dev-lang/scala/scala-2.9.3.ebuild b/dev-lang/scala/scala-2.9.3.ebuild
deleted file mode 100644
index a284c1a1da17..000000000000
--- a/dev-lang/scala/scala-2.9.3.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-JAVA_ANT_DISABLE_ANT_CORE_DEP="yes"
-EANT_TEST_TARGET="test.suite"
-
-inherit eutils check-reqs java-pkg-2 java-ant-2 versionator
-
-MY_P="${PN}-sources-${PV}"
-SV="$(get_version_component_range 1-2)"
-
-# creating the binary:
-# JAVA_PKG_FORCE_VM="$available-1.7" USE="doc source" ebuild scala-*.ebuild compile
-# cd $WORDKIR
-# tar -cjf scala-2.9.3-gentoo-binary.tar.bz2 scala-2.9.3/dists \
-# scala-2.9.3//docs/TODO
-
-# In the pullJarFiles function in tools/binary-repo-lib.sh it executes find commands
-# to search for .desired.sha1 files, which contain sha1 hashes that are appended
-# to ${BURI} along with the subdirectory and filename to form the list of jar files
-# listed in SRC_URI.  The output of this find command can be hacked into the desired format:
-# find . -name \*.desired.sha1 -exec sed -e 's@\([0-9a-f]*\).*@\1@' {} \; -print
-# After editing it into the desired format: sort -t / -k 3 file
-
-BURI="http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap"
-
-declare -a JURI=(
-	"${BURI}/8b6ba65c8146217333f0762087fe2340d572e832/docs/examples/plugintemplate/lib/scalatest.jar -> ${P}-scalatest.jar"
-	"${BURI}/7b456ca6b93900f96e58cc8371f03d90a9c1c8d1/lib/ant/ant.jar -> ${P}-ant.jar"
-	"${BURI}/3fc1e35ca8c991fc3488548f7a276bd9053c179d/lib/ant/ant-dotnet-1.0.jar -> ${P}-ant-dotnet-1.0.jar"
-	"${BURI}/943cd5c8802b2a3a64a010efb86ec19bac142e40/lib/ant/ant-contrib.jar -> ${P}-ant-contrib.jar"
-	"${BURI}/7e50e3e227d834695f1e0bf018a7326e06ee4c86/lib/ant/maven-ant-tasks-2.1.1.jar -> ${P}-maven-ant-tasks-2.1.1.jar"
-	"${BURI}/2c61d6e9a912b3253194d5d6d3e1db7e2545ac4b/lib/ant/vizant.jar -> ${P}-vizant.jar"
-	"${BURI}/12c479a33ee283599fdb7aa91d6a1df0197a52cf/lib/forkjoin.jar -> ${P}-forkjoin.jar"
-	"${BURI}/bd8e22a955eeb82671c5fdb8a7a14bc7f25e9eb1/lib/fjbg.jar -> ${P}-fjbg.jar"
-	"${BURI}/545b37930819a1196705e582a232abfeb252cc8d/lib/jline.jar -> ${P}-jline.jar"
-	"${BURI}/6597e6f74113e952a4233c451c973f5ac7f2b705/lib/midpapi10.jar -> ${P}-midpapi10.jar"
-	"${BURI}/58f64cd00399c724e7d526e5bdcbce3e2b79f78b/lib/msil.jar -> ${P}-msil.jar"
-	"${BURI}/5f31fab985a3efc21229297810c625b0a2593757/lib/scala-compiler.jar -> ${P}-scala-compiler.jar"
-	"${BURI}/c52dbed261e4870a504cef24518484b335a38067/lib/scala-library.jar -> ${P}-scala-library.jar"
-	"${BURI}/364c3b992bdebeac9fafb187e1acbece45644de7/lib/scala-library-src.jar -> ${P}-scala-library-src.jar"
-	"${BURI}/0392ecdeb306263c471ce51fa368223388b82b61/test/benchmarks/lib/jsr166_and_extra.jar -> ${P}-jsr166_and_extra.jar"
-	"${BURI}/02fe2ed93766323a13f22c7a7e2ecdcd84259b6c/test/files/lib/annotations.jar -> ${P}-annotations.jar"
-	"${BURI}/981392dbd1f727b152cd1c908c5fce60ad9d07f7/test/files/lib/enums.jar -> ${P}-enums.jar"
-	"${BURI}/b1ec8a095cec4902b3609d74d274c04365c59c04/test/files/lib/genericNest.jar -> ${P}-genericNest.jar"
-	"${BURI}/be8454d5e7751b063ade201c225dcedefd252775/test/files/lib/methvsfield.jar -> ${P}-methvsfield.jar"
-	"${BURI}/cd33e0a0ea249eb42363a2f8ba531186345ff68c/test/files/lib/nest.jar -> ${P}-nest.jar"
-	"${BURI}/77dca656258fe983ec64461860ab1ca0f7e2fd65/test/files/lib/scalacheck.jar -> ${P}-scalacheck.jar"
-	"${BURI}/2546f965f6718b000c4e6ef73559c11084177bd8/test/files/speclib/instrumented.jar -> ${P}-instrumented.jar"
-	"${BURI}/f174c50c4363c492362a05c72dd45b0da18fdcd8/test/pending/neg/plugin-after-terminal/lib/plugins.jar -> ${P}-plugins.jar"
-	"${BURI}/d7b100ad483484b598b7cd643424bd2e33898a0d/test/pending/neg/plugin-before-parser/lib/plugins.jar -> ${P}-plugins.jar"
-	"${BURI}/7e6be9e33a87194e7061f94f6be115619f91ada2/test/pending/neg/plugin-cyclic-dependency/lib/plugins.jar -> ${P}-plugins.jar"
-	"${BURI}/2bda582b574287429ad5ee2e1d9a3effc88b0a5f/test/pending/neg/plugin-multiple-rafter/lib/plugins.jar -> ${P}-plugins.jar"
-	"${BURI}/af91fd67ccef349e7f8ea662615e17796a339485/test/pending/neg/plugin-rafter-before-1/lib/plugins.jar -> ${P}-plugins.jar"
-	"${BURI}/8cccde4914da2058dca893783c231cda23855603/test/pending/neg/plugin-rightafter-terminal/lib/plugins.jar -> ${P}-plugins.jar"
-	"${BURI}/ee000286d00c5209d5644462c1cfea87fc8b1342/test/pending/pos/t1380/gnujaxp.jar -> ${P}-gnujaxp.jar"
-	"${BURI}/a1883f4304d5aa65e1f6ee6aad5900c62dd81079/tools/push.jar -> ${P}-push.jar"
-)
-
-DESCRIPTION="The Scala Programming Language"
-HOMEPAGE="http://www.scala-lang.org/"
-SRC_URI="!binary?
-(	https://github.com/scala/scala/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${JURI[@]}
-)
-binary? ( https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.bz2 )"
-
-LICENSE="BSD"
-SLOT="${SV}/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-
-IUSE="binary emacs examples"
-
-COMMON_DEP="dev-java/ant-core:0
-	dev-java/hawtjni-runtime:0"
-
-DEPEND="${COMMON_DEP}
-	!binary? (
-		=virtual/jdk-1.7*
-		dev-java/ant-core:0
-		dev-java/ant-contrib:0
-		dev-java/ant-nodeps:0
-		media-gfx/graphviz
-	)
-	binary? (
-		|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
-	)
-	app-arch/xz-utils:0"
-
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.7
-	app-eselect/eselect-scala
-	!dev-lang/scala-bin:0"
-
-PDEPEND="emacs? ( app-emacs/scala-mode:0 )"
-
-S="${WORKDIR}/${P}"
-
-CHECKREQS_MEMORY="1536M"
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-
-	if ! use binary; then
-		debug-print "Checking for sufficient physical RAM"
-
-		ewarn "This package can fail to build with memory allocation errors in some cases."
-		ewarn "If you are unable to build from sources, please try USE=binary"
-		ewarn "for this package. See bug #181390 for more information."
-
-		check-reqs_pkg_setup
-	fi
-}
-
-src_unpack() {
-	# Unpack tar files only.
-	for f in ${A} ; do
-		[[ ${f} == *".tar."* ]] && unpack ${f}
-	done
-}
-
-java_prepare() {
-	java-pkg_getjars ant-core,hawtjni-runtime
-
-	if ! use binary; then
-		local a
-		for a in "${JURI[@]}"
-		do
-			echo "${a}"
-			local g="${a/* -> /}"
-			echo "${g}"
-			local j="${a/ -> */}"
-			echo "${j}"
-			cp -p "${DISTDIR}/${g}" "${S}/${j#${BURI}/*/}" || die
-		done
-		epatch "${FILESDIR}/${PN}-2.9.2-java7.patch"
-		# gentoo patch (by gienah) to stop it calling git log in the build
-		epatch "${FILESDIR}/${P}-no-git.patch"
-		# Note: to bump scala, some things to try are:
-		# 1. update all the sha1s in JURI
-		# 2. remove the https://dev.gentoo.org/~gienah/snapshots/${P}-maven-deps.tar.gz from SRC_URI
-		# 3. try emerge scala.  Check if it downloads more stuff in src_compile to ${WORKDIR}/.m2
-		# or /var/tmp/portage/.m2 or /root/.m2
-		# 4. tar up all the .m2 junk into ${P}-maven-deps.tar.gz and add it to SRC_URI.
-		sed -e 's@-Xmx1024M@-Xmx1536M@' \
-			-e 's@-XX:MaxPermSize=128M@-XX:MaxPermSize=256M@' \
-			-i "${S}/test/partest" \
-			|| die "Could not change increase memory size in ${S}/test/partest"
-	fi
-}
-
-src_compile() {
-	if ! use binary; then
-		#unset ANT_OPTS as this is set in the build.xml
-		#sets -X type variables which might come back to bite me
-		unset ANT_OPTS
-
-		# reported in bugzilla that multiple launches use less resources
-		# https://bugs.gentoo.org/show_bug.cgi?id=282023
-		eant all.clean
-		eant -Djavac.args="-encoding UTF-8" -Duser.home="${WORKDIR}" \
-			fastdist-opt
-		if use doc; then
-			# The separate build for doc is to workaround this problem that occurs
-			# with one "fastdist docscomp" build (still fails with MaxPermSize=384M)
-			# java.lang.OutOfMemoryError: PermGen space
-			eant -Djavac.args="-encoding UTF-8" -Duser.home="${WORKDIR}" \
-				docscomp
-			eant -Djavac.args="-encoding UTF-8" -Duser.home="${WORKDIR}" \
-				docs
-		fi
-	else
-		einfo "Skipping compilation, USE=binary is set."
-	fi
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	cd dists/latest || die
-	local SCALADIR="/usr/share/${PN}-${SV}"
-	exeinto "${SCALADIR}/bin"
-	doexe $(find bin/ -type f ! -iname '*.bat')
-	dodir "${SCALADIR}/lib"
-	insinto "${SCALADIR}/lib"
-	pushd lib || die
-	for j in *.jar; do
-		local i="$(echo "${j}" | sed -e "s@[_-][0-9.-]*\.jar@.jar@")"
-		newins "${j}" "${i}"
-		java-pkg_regjar "${ED}${SCALADIR}/lib/${i}"
-	done
-	popd
-
-	dodir /usr/bin
-	for b in $(find bin/ -type f ! -iname '*.bat'); do
-		local _name=$(basename "${b}")
-		dosym "${SCALADIR}/bin/${_name}" "/usr/bin/${_name}-${SV}"
-	done
-
-	pushd man/man1 || die
-	for i in *.1; do
-		newman "${i}" "${i/./-${SV}.}"
-	done
-	popd
-
-	#sources are .scala so no use for java-pkg_dosrc
-	if use source; then
-		dodir "${SCALADIR}/src"
-		insinto "${SCALADIR}/src"
-		doins src/*-src.jar
-	fi
-
-	local docdir="doc/${PN}-devel-docs"
-	dodoc doc/README ../../docs/TODO || die
-	if use doc; then
-		java-pkg_dojavadoc "${docdir}/api"
-		dohtml -r "${docdir}/tools" || die
-	fi
-
-	use examples && java-pkg_doexamples "${docdir}/examples"
-}