Gentoo Archives: gentoo-commits

From: Mark Wright <gienah@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/scala/files/, dev-lang/scala/
Date: Sat, 30 Jan 2016 00:02:27
Message-Id: 1454112124.111a750cd312bb5f128cde6191be16a0b1fde13e.gienah@gentoo
1 commit: 111a750cd312bb5f128cde6191be16a0b1fde13e
2 Author: Mark Wright <gienah <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 30 00:02:04 2016 +0000
4 Commit: Mark Wright <gienah <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 30 00:02:04 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=111a750c
7
8 dev-lang/scala: Bump 2.10 slot to 2.10.6.
9
10 Gentoo-Bug: 559924
11
12 Package-Manager: portage-2.2.27
13
14 dev-lang/scala/Manifest | 29 ++++
15 dev-lang/scala/files/scala-2.10.6-no-git.patch | 24 +++
16 dev-lang/scala/scala-2.10.6.ebuild | 225 +++++++++++++++++++++++++
17 3 files changed, 278 insertions(+)
18
19 diff --git a/dev-lang/scala/Manifest b/dev-lang/scala/Manifest
20 index d84119a..c74a6d6 100644
21 --- a/dev-lang/scala/Manifest
22 +++ b/dev-lang/scala/Manifest
23 @@ -52,6 +52,35 @@ DIST scala-2.10.4-scala-reflect.jar 3307596 SHA256 910b58279250371e034859227fb5d
24 DIST scala-2.10.4-scalacheck.jar 763570 SHA256 96814bea5818186086473da5c657191d03145649eee0c300abec9c3380fdd418 SHA512 5383e80dbcb11cb3fba033bd6a0e8c220ec3dd6fc153062b9d44d346ff17bea014a8c7a412af85ff487a34011cdc2042191c4c4ad66ea44eb7eba139a0b358d4 WHIRLPOOL d6276010ce4d1bcc647e1d7673cc18f645ac92abf03c4aa5be03735853a33692763883fcd8e325d36b2a18cca758d6f1636294b182f247da1094c82476f36b58
25 DIST scala-2.10.4-vizant.jar 15910 SHA256 a54e19093725d0d085544553246e48607c1e6ab65575ae0ff721b788118461d6 SHA512 4464d7349016f4999199e227e8eaf7bb3ef6b7e38ad0e8e710faad55df2e1243d99b53b9a789a1ffd3c39aef0d979dffc543f4691feae68cfa743e51bcf61390 WHIRLPOOL 1b957b8b850f79309c3577a2dcac52a620fa54f810f242a02c52bbcee1cc9c5818785baa7db8e2b82b850bcb56b528c4dd07cdfad2f991c0025293ca02c0dc99
26 DIST scala-2.10.4.tar.gz 5510555 SHA256 d67ed8747bcdf5a598688d027be418790b59158c5dee5b46f51a88b067da59f3 SHA512 1d26d78d120377ba376b507ea484c245bfa289d55b6838211e8e7d2ca38fc7e6d6375e9467bad528d9d51a9eff9c766fbaf452a851e88f156295d89827514e26 WHIRLPOOL 0997c7c1489fa5438c54ffc4d44d32bdb4b6868455903448a6d9c5f9a3ee43fb1cd68ce00ecacacdaf667214cce6840054f3204647af391e48ae05dc5422ab3e
27 +DIST scala-2.10.6-annotations.jar 2242 SHA256 f2d057a006bba4253d069795284a7610f1c837af6a80c0057736099962e24bcc SHA512 3ceee0b1361b9e0911c1ff060ad108a1d93f7ea3e82ef946401cd5f895cb06016ac0ecdfd095f99b11cfb28c4cef7705c1b564c7af644c5f19b45c14a413c4dd WHIRLPOOL 51fa0efc5dd14cf8364e9639375511fc3e716bd520a193e6c17a2fe3f02eebd1529eb98fd3b382a6386baa5b779ebd0327e8f141aee172d11d9548d9921c58e1
28 +DIST scala-2.10.6-ant-contrib.jar 224277 SHA256 be33a69818310b5c55e41dc11d48cd895f5f129da4b0d28c2f4c6c3e1cbcf3fc SHA512 5ec325a55bb213226c86faf8a99951839319e9579956ae58e2ccfe84f62d2742542998f98eed3f0dc8f8f94635d6dff1fe02e3c0f5289df1f09027ae2b9bee83 WHIRLPOOL aa713cc04b10c46adbbb8a5904e3fb34c6e32b67bb9a5f1a89768ceab8c31b977875c84434bc03c5b42105a4019f55cc10d806b0345c365a309e93d3f02e0a10
29 +DIST scala-2.10.6-ant-dotnet-1.0.jar 57795 SHA256 40c18fcfb8c28e4ee82e53f72a3257db43bcba01e16ebd5a4550fc419edf30c1 SHA512 72afc387cf9dbeb99e627ca7f35f919f627bbf3f072eb46036120695fb70311490593c255c2a2e79b684adb8f213d8ab591d4ceda5d5f2e6b6906a6977b38867 WHIRLPOOL 18aa33fe259bd52e2f37b903be39d462e8622ff744f990fc92871eaa4fe10ff69cd25b2c968cc353b3c5138cd3fffd755715aef6bb16c57b0b72e7e5fd1975e1
30 +DIST scala-2.10.6-ant.jar 1506140 SHA256 0251dbb938740ace07a53675113eee753ba389db65aebc814b175af50321620e SHA512 ddee72ca62adb20e700022609749a4d6cc848c94e597a7450226770c8b97aa2c1f7f23b7a1c6ac8acd63047101997ebd68c19b393ebffde9ff5c7bb1957cd18c WHIRLPOOL 1b2b7e0289cb16f5131a9c0b1b6eb1279011e7af79fc470dd6dc2047afc7fa99bdeec6d9db4f46adb83f6110593118d0909a4b1fa6b01dc56890bf6d2785373b
31 +DIST scala-2.10.6-code.jar 683 SHA256 4a03a08954e6b912a469b5e0db898247ea3ebc25b641f328e80f19163a0d908a SHA512 d963c186f3029858b1f6b53cf6e3470946365f13a6bcc334a7c959fd449dace10a953c496dbf3036828f2b5e5ad17d22f5e3912446bed14bd71b2f0de2f6c767 WHIRLPOOL 06e44b713306b3bdb7e878db1598546b45857091eb457c0fdba738d5f8c4de726920532e5cdf10260002c69299bd2756df52f407373053c5883e961899624d85
32 +DIST scala-2.10.6-enums.jar 1372 SHA256 95c53606c7113333ef95b4efbd3ae08af715ca49f71845a5d33150e6b7e9a072 SHA512 3d2356b9f610e98a03f64cbdd18ee36138b68ba5b170bb9b78bc7449439c3870f6f5bc795f3e1b8d325daf468ae85c581b60d1d360c1ae68c70792ad62b9c1dc WHIRLPOOL 30b26ba56a36272cf5973d3a89850cb3f5bff6c45a7a6bbd6ccf4ff342720bba89dfc0cdbe10058b770b7e73093ea948e574d5e081c36ab866f3bea9f0e14f95
33 +DIST scala-2.10.6-fjbg.jar 130039 SHA256 a5acb5ca309b764a72e436fc770103277f4151233519b9ce7074f8000d259d6b SHA512 68f0bf76337fb243b9ca901eab985cfeb897d79d07ba81aaae516c890bbfb600a370c1e1df505275a12c723212fd88b5a03e97c73013d912be1be860d214e5ea WHIRLPOOL c4390956a00fad5a16018d5d4747e8585ba707339738b3e0c304a7093c4c8fd11111349377951916cee78c312735e823ee5e4ced19a1f568598e8fd553952426
34 +DIST scala-2.10.6-forkjoin.jar 60850 SHA256 4007ca649f037ed5ecc87c74529f499b75ed1a0f3f78e8f82cd97a71f5d2d5c7 SHA512 702370f2654b1c06f340c100078c630a82808e56c4dcc323881d6547945ce028345a5ee3048cbb9502a3b340b1d84ab5a635f80dbb381fdd88cc25b60cad768f WHIRLPOOL 9d561c9872c140e266efefb1c1afe76a2754eda32357718d048ff0896d6a2d14f168e1e2eddfcb37bbd0ac07fb7a7079b63e0f512946a7e30ff62883ee8bfd84
35 +DIST scala-2.10.6-genericNest.jar 1136 SHA256 c2c23341eec9fb379b57d7bf1156fedb3e2b9f97d2d5729fbfc7d766fd390faa SHA512 32c3b3e14bc72db2572bf120c1fda49a369b27ff8ae6ae12f6d7b12fdffef4064b515671c8f1b6dbfd78209247f6a7b7b26e700dd70a105de3ca59f5185ff9d6 WHIRLPOOL 61b2d9f840fc0ed86a8207cf353a2f7b9bf8523d31b4e8f74eb21ecac1a405ed04c5a4a8e78a13d64b2dd186a7ec3885cd5e2514ad572e600e5744c3f15f74c5
36 +DIST scala-2.10.6-gentoo-binary.tar.bz2 59801146 SHA256 baa2a14984cb36406d777aa79a78035abb54e9b45b48fdf4adc7eb29c6ec192d SHA512 59d8d1129f74c6f1e9d5b664f8cd50209d8071da9b48be1990b288cc46038a6b420e46dc5b3ed1e60865966e6f5c82215249930f86e44208fa9b2d04742fe4c9 WHIRLPOOL aa6cd24b156f6a1d0cae635f5b7002680d998cff5ded0279adf2423760563327fef6d5cbab14c16d5bb3715382ec1cc3c2bef579b276c3bd1d456e8b44a331f3
37 +DIST scala-2.10.6-instrumented.jar 31725 SHA256 8a424c8bd5805ec429a9477cbd0f44bf65a2b79b720d438bfd347dba8da06484 SHA512 b1d77c4380a2b8ffe715ec106e58081e5c89e314c5a13071d627c3f974144ad453e79d405cd722d75095b62e8682b7414d40b691506c7d2f5dde62e2fce51e39 WHIRLPOOL 5ef8ee89b3fa66bf5025fd1b5db65d4d628b3452ba8530e3c3b1dd530fb5286fe3acee2cf56de09148cf2d37968626708690cc03da202cf3d58159cfd56fe8bc
38 +DIST scala-2.10.6-jline.jar 164623 SHA256 813f2bc34a096cc7780c6946acf401c82e739cf9d5359edf414f74662137d3b1 SHA512 2d97f0d1bc1df67423f54102f8b360a6dba0bfac67ba12673e781d9461485a6124cf985cbab96283af7b366a8fb53e526aa667ccec466aae7002d5030f2e1369 WHIRLPOOL a7c848acf502c2247d0a9c83fa45295e5ede7487ac2129e50d4bd05a0271050b274cd25af24fb4215dc20283ca7df750618b31fea8973fffa125a3fb37f33bf3
39 +DIST scala-2.10.6-jsr166_and_extra.jar 728574 SHA256 e33a59e291bae8dbd2b37c6a4d5eae459a313db3a588f42c59ac5fd8edf6e13b SHA512 40d949cfefc5111c79b79f085657d56aa046d1b318e6ad78de5869f61a6515c2076b70344be5ae3fb93a7b3f54f46a129e2536515b258e0d5bf2e670c5001306 WHIRLPOOL ef8414d7862736cf072ff60fff5008f38dadcf826364cf21929fdfca7d331872d8097e6a6907dd500ef5d5a68964d8c2ed9ebeedf6470dc25ede269c1a8172b5
40 +DIST scala-2.10.6-maven-ant-tasks-2.1.1.jar 1314262 SHA256 b8891b4a90aca2793ad385ab57216f51c4879c6ab7e927354f407b46510cab51 SHA512 e3f0ff1d41ec31b2b64acb2ebcc175709714033589cb8e763f94aa80359c84f5d960c46dae713c9e37e1a09b977e7da617f8fe10a5b6fb30c55efd19bc307e68 WHIRLPOOL 73c44ea6aba4a3c697f64d08475b4c17bdc929ac9f320a25714fbe7cdc2939ad334deb7a90eb6c950cce8ba402d19bc2615a104788bafed7d247b997d3146743
41 +DIST scala-2.10.6-maven-deps.tar.gz 35062417 SHA256 0405fb8251807e5d62048f9186e2f1aa8ec35bb469e5ba6179bf64ce0af10269 SHA512 7b0947ab9506308c6ef637af51eca2c3beb819d786c19c7fe0e840f6271c51d8a88a4220e1ac0f79fc492ff9d05ff9e362a3b5c185653b2fcb3ea101c937eebd WHIRLPOOL d4aeae97fdccb8a89c9e40493aca6d0dd8c3e77c711de6c5bdf234575c13d82dea830ca18e0568a89fd635ccda23cf53398dd97b6ac62feea6eb1430a5f280fb
42 +DIST scala-2.10.6-methvsfield.jar 609 SHA256 730b33d098319d969760f2250dc6924c9f85f94a8a2eb2b2a025dcf05378d9c6 SHA512 6db923ed7059bc91c8442d5804ccd8336e94f5202b3dcc348a4eb5026f09e1e86862f6e94818beae9ad42fcdc8e51df4d59a27109903a8ccb78054425ae47a71 WHIRLPOOL d5362d5fc2795ff0671f386429840bb4f84173f9308e34c2b0eb585fb7cacbd308ab87c42f2fd407597abc4f010e8ffde600dd30addcd63c2d71c2d5f22f1582
43 +DIST scala-2.10.6-msil.jar 298973 SHA256 5b9e6dc2f4dd79644a1480b7cb4db053d73fc5d0e41015b95f15ec4dacf2da0a SHA512 1e9be7bfea639cffd638c78b4368f599753e8bd4df8f9b3c192b72c2860d6f96002c94fcf751e9c6cdacfead1ae3bd851d61395ce83c49d66f801284bd2046dd WHIRLPOOL 3828f08bb47f038d3f6e52c0d077cdecd06195de3d29b326833f47a6713bbab644ddcd20b8d39aa814d25637dae31adc1d0f0aec6f489857d7b115aeab29a301
44 +DIST scala-2.10.6-nest.jar 2920 SHA256 3c7cf1a1b9fe9ad2abf3bfcedaa17a976c72f4bccb0e0c7dbcf7ecf27bc20aa5 SHA512 5eaaa870e06b5e00efb1f6ccced71343e8aa01578ea2b320b2d051f2df3713df9c500f074cc74a9e3c5cc509e03cf9c71265329bf2ddb3e82cb331524202fa38 WHIRLPOOL 1d73b612946a6a226841d3e0ad8cb3ebb06997c70e94feb1f9236e4e58a93c429cc7cdecaa4175fd5b78920253bcc157f798593b6a8eacb873b3d9a51284be34
45 +DIST scala-2.10.6-plugins.jar 4181 SHA256 13313e0c3a42bb401377ab4f228e3c81db482c8f33295c6a1d021fc3c9727871 SHA512 d44427df9acf4611acb492b6268b65f63a8be2d47ef29598bf5d242f702af57f0ee2eff52378b8371755d5ddf58c79d48b18a6a056ee9fee5091e478ce5ec1a2 WHIRLPOOL b2e846b5965ea7f04844b4c49e3fcc2f5b3f0e31669a662557bd36a113dd94372bae55d46f1986e03099c6f51217bf10986e5e265874854ba479c36d041a1e41
46 +DIST scala-2.10.6-push.jar 8886289 SHA256 58eb2b8c501bbff0e78074a058e3fc160012a80952c1cc96ed301d8a08d7e98d SHA512 b5539d381c8978ac57fc4258696e4cb552f47917178152b38b5683e42ed60da4d9da198a0344652f201541a71f92afd2ac8b3c3d3ec5266a8c222e9661d8a06a WHIRLPOOL 8fa6522a0fd9939f4ffd443b55e7a5adbb93a9dc5cbad569ccecd6be77ecd259eadbdb16c2c7eab6d9f175fbf33746faf9c41cf4d1050e7f576b86119301e126
47 +DIST scala-2.10.6-scala-compiler-src.jar 2462738 SHA256 ca43298237583dfd362ab4d773ef0f791a075d9187ecf30cc8ee4f4b7ae12e76 SHA512 a71eab8ada2fd23aa1408577dc3bde28847484643618a752ab68bbe5c8a4ef19ad852ace6f44c8e66668e6b6098de8b0cb3eb8d0c4674ed332562463b43a8a38 WHIRLPOOL 8cc711357fe2b393c1e28a3ebd0249fb633c1135c6c4d8819c6ab14081c9fbbb4c1e0a6b84eb9a5711c9874814e54676905da90a1d8d6c5e28213e189bb0f37b
48 +DIST scala-2.10.6-scala-compiler.jar 15095501 SHA256 dbad9d1e0e300c62945d8d8aa21ebfa614e1f7b1c8378550b0314aa006be21c0 SHA512 98588884da2a01af5df9898f5d3055cbf5fa04af7d5f87bd6076dbfca329a7f2fa5645fa87cc14720204e00dc540971f8c44b2233fd4706db0df00ce8978349f WHIRLPOOL 311db7bc73ac1584403b12ea8c712a4b6a0450c502328ac26d7d9e051db4f5dd185dfc1c7c8304d32991c374fc2ed3c89cf8cfd61759f9049e1b5e55f4a7c54c
49 +DIST scala-2.10.6-scala-library-src.jar 1378653 SHA256 4a347825a0856a14803ec2c9cc205e192f19f15e417d334f4d22276d898d0dfd SHA512 06b0944c53b145c71239ec5aa90a78fbdee8130508f02d6cecd4c6c5e26878f19751471ba5d54c80e8d1380645787512c6e7566471675f0c9e3f0c29e38b4ff7 WHIRLPOOL 27fcbc2e52d52b30a8d0f1d68caaf8fb0f201d1509609aa361aaae412f0ceb6d95e6c3c4210b60027eae1ebb406ba3bdad770a2b087145572255b452bf0028bc
50 +DIST scala-2.10.6-scala-library.jar 7113040 SHA256 66057366dc9c541d0fadb7f64a4e06f7c5c86a90b289d724e7db0153b7e92c2c SHA512 af8a57145c8bcac6f72abade3b21f066ae082c7ab858c3a7b0641240fb99fe24bac3c224b7b1418c47c852793cecc7e8f5838e0cf6ae2b78ee538839cebdffeb WHIRLPOOL 29cffc4e84730549ed25384411e1a9341f56d348800d1bbc04958d88071e0c36b7290969b8f9d6ea865d9c82fbb76b1727cf66b81e420950c7ad356f2bd02aea
51 +DIST scala-2.10.6-scala-reflect-src.jar 467879 SHA256 45846f176eba3e072282b597fbea58977e1ac08d7161571e2601a86adbff4e35 SHA512 c172be4d0ec724be4f62cbcaf848a71c99cffc706fcaa5b46fe2970088ba9a8f406d42728f64a0dfdef1cbe18e313b8be8142d68b9b3d7a592dec5e1fd7366b6 WHIRLPOOL 876bd9e3186d76d351e128cf990789459b51bca1ad6e4f51aa397d1941311ed51a1048188a4b94bd8709551c0cb3ab3985d3a1534594bb840082d0b555496d7c
52 +DIST scala-2.10.6-scala-reflect.jar 3307596 SHA256 910b58279250371e034859227fb5d9015297eb6bf607f9d3ec0836a822c1fff0 SHA512 466c55b8ce98e48f851c446b986388351ac4b0fb2b0cf6888d56fe2a4af1f5f3916e78f3fdea395ee18ef0a5128bc6b0d4cdcdce8f5b0f2fcc30c2bdbd41eb40 WHIRLPOOL 73a42b7b557bf29d14511f798e22f1ba8039e7c41bb165d9a4be7c66d393fa63c2836239fca56158eb2c5dd07567b1febb18d9f4f514de48e0c6ec5d155a46a2
53 +DIST scala-2.10.6-scalacheck.jar 763570 SHA256 96814bea5818186086473da5c657191d03145649eee0c300abec9c3380fdd418 SHA512 5383e80dbcb11cb3fba033bd6a0e8c220ec3dd6fc153062b9d44d346ff17bea014a8c7a412af85ff487a34011cdc2042191c4c4ad66ea44eb7eba139a0b358d4 WHIRLPOOL d6276010ce4d1bcc647e1d7673cc18f645ac92abf03c4aa5be03735853a33692763883fcd8e325d36b2a18cca758d6f1636294b182f247da1094c82476f36b58
54 +DIST scala-2.10.6-vizant.jar 15910 SHA256 a54e19093725d0d085544553246e48607c1e6ab65575ae0ff721b788118461d6 SHA512 4464d7349016f4999199e227e8eaf7bb3ef6b7e38ad0e8e710faad55df2e1243d99b53b9a789a1ffd3c39aef0d979dffc543f4691feae68cfa743e51bcf61390 WHIRLPOOL 1b957b8b850f79309c3577a2dcac52a620fa54f810f242a02c52bbcee1cc9c5818785baa7db8e2b82b850bcb56b528c4dd07cdfad2f991c0025293ca02c0dc99
55 +DIST scala-2.10.6.tar.gz 5527120 SHA256 06d7467ff628ebac615c5e60af155e0b4cbbf4c31d10c03a45e9615d5b1e0420 SHA512 d993ebfee84c4e4c220e15059992d8cb3807baff8df99535b5bd20f54d29ddd1f701bbf20ed286a96f08554591ffbe0d93d514513456bd32659c3ee9b15f343b WHIRLPOOL d206f0ede824c26b1d4d1f6447b63b9fbb95acea37e1911a49b77a2c7ff944330ad1e6df508a6e0642b6009f0a2da04c9d86dacf3aca4856bb75c2616f7733cd
56 DIST scala-2.11.1-annotations.jar 2242 SHA256 f2d057a006bba4253d069795284a7610f1c837af6a80c0057736099962e24bcc SHA512 3ceee0b1361b9e0911c1ff060ad108a1d93f7ea3e82ef946401cd5f895cb06016ac0ecdfd095f99b11cfb28c4cef7705c1b564c7af644c5f19b45c14a413c4dd WHIRLPOOL 51fa0efc5dd14cf8364e9639375511fc3e716bd520a193e6c17a2fe3f02eebd1529eb98fd3b382a6386baa5b779ebd0327e8f141aee172d11d9548d9921c58e1
57 DIST scala-2.11.1-ant-contrib.jar 224277 SHA256 be33a69818310b5c55e41dc11d48cd895f5f129da4b0d28c2f4c6c3e1cbcf3fc SHA512 5ec325a55bb213226c86faf8a99951839319e9579956ae58e2ccfe84f62d2742542998f98eed3f0dc8f8f94635d6dff1fe02e3c0f5289df1f09027ae2b9bee83 WHIRLPOOL aa713cc04b10c46adbbb8a5904e3fb34c6e32b67bb9a5f1a89768ceab8c31b977875c84434bc03c5b42105a4019f55cc10d806b0345c365a309e93d3f02e0a10
58 DIST scala-2.11.1-ant-dotnet-1.0.jar 57795 SHA256 40c18fcfb8c28e4ee82e53f72a3257db43bcba01e16ebd5a4550fc419edf30c1 SHA512 72afc387cf9dbeb99e627ca7f35f919f627bbf3f072eb46036120695fb70311490593c255c2a2e79b684adb8f213d8ab591d4ceda5d5f2e6b6906a6977b38867 WHIRLPOOL 18aa33fe259bd52e2f37b903be39d462e8622ff744f990fc92871eaa4fe10ff69cd25b2c968cc353b3c5138cd3fffd755715aef6bb16c57b0b72e7e5fd1975e1
59
60 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
61 new file mode 100644
62 index 0000000..259ef78
63 --- /dev/null
64 +++ b/dev-lang/scala/files/scala-2.10.6-no-git.patch
65 @@ -0,0 +1,24 @@
66 +--- scala-2.10.6-orig/tools/get-scala-commit-date 2015-09-18 18:50:36.000000000 +1000
67 ++++ scala-2.10.6/tools/get-scala-commit-date 2016-01-29 18:53:09.874767271 +1100
68 +@@ -10,8 +10,8 @@
69 +
70 + [[ $# -eq 0 ]] || cd "$1"
71 +
72 +-lastcommitdate=$(git log --format="%ci" HEAD | head -n 1 | cut -d ' ' -f 1)
73 +-lastcommithours=$(git log --format="%ci" HEAD | head -n 1 | cut -d ' ' -f 2)
74 ++lastcommitdate="2015-09-18"
75 ++lastcommithours="00:00:00"
76 +
77 + # 20120324
78 + echo "${lastcommitdate//-/}-${lastcommithours//:/}"
79 +--- scala-2.10.6-orig/tools/get-scala-commit-sha 2015-09-18 18:50:36.000000000 +1000
80 ++++ scala-2.10.6/tools/get-scala-commit-sha 2016-01-29 18:53:44.097767230 +1100
81 +@@ -12,7 +12,7 @@
82 +
83 + # printf %016s is not portable for 0-padding, has to be a digit.
84 + # so we're stuck disassembling it.
85 +-hash=$(git log -1 --format="%H" HEAD)
86 ++hash="bda53196ebbeb1369c70f3d1ec066796c06a6409"
87 + hash=${hash#g}
88 + hash=${hash:0:10}
89 + echo "$hash"
90
91 diff --git a/dev-lang/scala/scala-2.10.6.ebuild b/dev-lang/scala/scala-2.10.6.ebuild
92 new file mode 100644
93 index 0000000..8bf584d
94 --- /dev/null
95 +++ b/dev-lang/scala/scala-2.10.6.ebuild
96 @@ -0,0 +1,225 @@
97 +# Copyright 1999-2016 Gentoo Foundation
98 +# Distributed under the terms of the GNU General Public License v2
99 +# $Id$
100 +
101 +EAPI="5"
102 +
103 +JAVA_PKG_IUSE="doc source"
104 +JAVA_ANT_DISABLE_ANT_CORE_DEP="yes"
105 +EANT_TEST_TARGET="test.suite"
106 +
107 +inherit eutils check-reqs java-pkg-2 java-ant-2 versionator
108 +
109 +MY_P="${PN}-sources-${PV}"
110 +SV="$(get_version_component_range 1-2)"
111 +
112 +# creating the binary:
113 +# JAVA_PKG_FORCE_VM="$available-1.6" USE="doc source" ebuild scala-*.ebuild compile
114 +# cd $WORDKIR
115 +# fix dist/latest link.
116 +# tar -cjf $DISTDIR/scala-$PN-gentoo-binary.tar.bz2 ${MY_P}/dists ${MY_P}/docs/README ${MY_P}/docs/TODO ${MY_P}/build/scaladoc
117 +
118 +# In the pullJarFiles function in tools/binary-repo-lib.sh it executes find commands
119 +# to search for .desired.sha1 files, which contain sha1 hashes that are appended
120 +# to ${BURI} along with the subdirectory and filename to form the list of jar files
121 +# listed in SRC_URI. The output of this find command can be hacked into the desired format:
122 +# find . -name \*.desired.sha1 -exec sed -e 's@\([0-9a-f]*\).*@\1@' {} \; -print
123 +# After editing it into the desired format: sort -t / -k 3 file
124 +
125 +BURI="http://repo.typesafe.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap"
126 +
127 +declare -a JURI=( \
128 + "${BURI}/02fe2ed93766323a13f22c7a7e2ecdcd84259b6c/test/files/lib/annotations.jar -> ${P}-annotations.jar" \
129 + "${BURI}/0392ecdeb306263c471ce51fa368223388b82b61/test/benchmarks/lib/jsr166_and_extra.jar -> ${P}-jsr166_and_extra.jar" \
130 + "${BURI}/1b11ac773055c1e942c6b5eb4aabdf02292a7194/test/files/speclib/instrumented.jar -> ${P}-instrumented.jar" \
131 + "${BURI}/1e0e39fae15b42e85998740511ec5a3830e26243/lib/scala-library.jar -> ${P}-scala-library.jar" \
132 + "${BURI}/288f47dbe1002653e030fd25ca500b9ffe1ebd64/lib/scala-reflect.jar -> ${P}-scala-reflect.jar" \
133 + "${BURI}/2bda582b574287429ad5ee2e1d9a3effc88b0a5f/test/pending/neg/plugin-multiple-rafter/lib/plugins.jar -> ${P}-plugins.jar" \
134 + "${BURI}/2c61d6e9a912b3253194d5d6d3e1db7e2545ac4b/lib/ant/vizant.jar -> ${P}-vizant.jar" \
135 + "${BURI}/3fc1e35ca8c991fc3488548f7a276bd9053c179d/lib/ant/ant-dotnet-1.0.jar -> ${P}-ant-dotnet-1.0.jar" \
136 + "${BURI}/7b456ca6b93900f96e58cc8371f03d90a9c1c8d1/lib/ant/ant.jar -> ${P}-ant.jar" \
137 + "${BURI}/7e50e3e227d834695f1e0bf018a7326e06ee4c86/lib/ant/maven-ant-tasks-2.1.1.jar -> ${P}-maven-ant-tasks-2.1.1.jar" \
138 + "${BURI}/7e6be9e33a87194e7061f94f6be115619f91ada2/test/pending/neg/plugin-cyclic-dependency/lib/plugins.jar -> ${P}-plugins.jar" \
139 + "${BURI}/8acc87f222210b4a5eb2675477602fc1759e7684/lib/fjbg.jar -> ${P}-fjbg.jar" \
140 + "${BURI}/8bdac1cdd60b73ff7e12fd2b556355fa10343e2d/lib/scala-library-src.jar -> ${P}-scala-library-src.jar" \
141 + "${BURI}/8cccde4914da2058dca893783c231cda23855603/test/pending/neg/plugin-rightafter-terminal/lib/plugins.jar -> ${P}-plugins.jar" \
142 + "${BURI}/943cd5c8802b2a3a64a010efb86ec19bac142e40/lib/ant/ant-contrib.jar -> ${P}-ant-contrib.jar" \
143 + "${BURI}/981392dbd1f727b152cd1c908c5fce60ad9d07f7/test/files/lib/enums.jar -> ${P}-enums.jar" \
144 + "${BURI}/a1883f4304d5aa65e1f6ee6aad5900c62dd81079/tools/push.jar -> ${P}-push.jar" \
145 + "${BURI}/a5261e70728c1847639e2b47d953441d0b217bcb/lib/jline.jar -> ${P}-jline.jar" \
146 + "${BURI}/af91fd67ccef349e7f8ea662615e17796a339485/test/pending/neg/plugin-rafter-before-1/lib/plugins.jar -> ${P}-plugins.jar" \
147 + "${BURI}/b1ec8a095cec4902b3609d74d274c04365c59c04/test/files/lib/genericNest.jar -> ${P}-genericNest.jar" \
148 + "${BURI}/b6f4dbb29f0c2ec1eba682414f60d52fea84f703/test/files/lib/scalacheck.jar -> ${P}-scalacheck.jar" \
149 + "${BURI}/be8454d5e7751b063ade201c225dcedefd252775/test/files/lib/methvsfield.jar -> ${P}-methvsfield.jar" \
150 + "${BURI}/cd33e0a0ea249eb42363a2f8ba531186345ff68c/test/files/lib/nest.jar -> ${P}-nest.jar" \
151 + "${BURI}/cfa3ee21f76cd5c115bd3bc070a3b401587bafb5/lib/scala-compiler-src.jar -> ${P}-scala-compiler-src.jar" \
152 + "${BURI}/d229f4c91ea8ab1a81559b5803efd9b0b1632f0b/lib/scala-reflect-src.jar -> ${P}-scala-reflect-src.jar" \
153 + "${BURI}/d48cb950ceded82a5e0ffae8ef2c68d0923ed00c/lib/msil.jar -> ${P}-msil.jar" \
154 + "${BURI}/d54b99f215d4d42b3f0b3489fbb1081270700992/lib/scala-compiler.jar -> ${P}-scala-compiler.jar" \
155 + "${BURI}/d7b100ad483484b598b7cd643424bd2e33898a0d/test/pending/neg/plugin-before-parser/lib/plugins.jar -> ${P}-plugins.jar" \
156 + "${BURI}/ddd7d5398733c4fbbb8355c049e258d47af636cf/lib/forkjoin.jar -> ${P}-forkjoin.jar" \
157 + "${BURI}/e737b123d31eede5594ceda07caafed1673ec472/test/files/codelib/code.jar -> ${P}-code.jar" \
158 + "${BURI}/f174c50c4363c492362a05c72dd45b0da18fdcd8/test/pending/neg/plugin-after-terminal/lib/plugins.jar -> ${P}-plugins.jar"
159 +)
160 +
161 +DESCRIPTION="The Scala Programming Language"
162 +HOMEPAGE="http://www.scala-lang.org/"
163 +SRC_URI="!binary?
164 +( https://github.com/scala/scala/archive/v${PV}.tar.gz -> ${P}.tar.gz
165 + ${JURI[@]}
166 + https://dev.gentoo.org/~gienah/snapshots/${P}-maven-deps.tar.gz
167 +)
168 +binary? ( https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.bz2 )"
169 +
170 +LICENSE="BSD"
171 +SLOT="${SV}/${PV}"
172 +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
173 +
174 +IUSE="binary emacs"
175 +
176 +COMMON_DEP="dev-java/ant-core:0
177 + dev-java/hawtjni-runtime:0"
178 +
179 +DEPEND="${COMMON_DEP}
180 + java-virtuals/jdk-with-com-sun:0
181 + !binary? (
182 + =virtual/jdk-1.7*
183 + dev-java/ant-core:0
184 + dev-java/ant-contrib:0
185 + dev-java/ant-nodeps:0
186 + media-gfx/graphviz
187 + )
188 + binary? (
189 + =virtual/jdk-1.7*
190 + )
191 + app-arch/xz-utils:0"
192 +
193 +RDEPEND="${COMMON_DEP}
194 + >=virtual/jre-1.7
195 + app-eselect/eselect-scala
196 + !dev-lang/scala-bin:0"
197 +
198 +PDEPEND="emacs? ( app-emacs/scala-mode:0 )"
199 +
200 +S="${WORKDIR}/${P}"
201 +
202 +CHECKREQS_MEMORY="1532M"
203 +
204 +pkg_setup() {
205 + java-pkg-2_pkg_setup
206 +
207 + if ! use binary; then
208 + debug-print "Checking for sufficient physical RAM"
209 +
210 + ewarn "This package can fail to build with memory allocation errors in some cases."
211 + ewarn "If you are unable to build from sources, please try USE=binary"
212 + ewarn "for this package. See bug #181390 for more information."
213 +
214 + check-reqs_pkg_setup
215 + fi
216 +}
217 +
218 +src_unpack() {
219 + # Unpack tar files only.
220 + for f in ${A} ; do
221 + [[ ${f} == *".tar."* ]] && unpack ${f}
222 + done
223 +}
224 +
225 +java_prepare() {
226 + java-pkg_getjars ant-core,hawtjni-runtime
227 +
228 + if ! use binary; then
229 + local a
230 + for a in "${JURI[@]}"
231 + do
232 + echo "${a}"
233 + local g="${a/* -> /}"
234 + echo "${g}"
235 + local j="${a/ -> */}"
236 + echo "${j}"
237 + cp -p "${DISTDIR}/${g}" "${S}/${j#${BURI}/*/}" || die
238 + done
239 + # gentoo patch (by gienah) to stop it calling git log in the build
240 + epatch "${FILESDIR}/${P}-no-git.patch"
241 + if java-pkg_is-vm-version-ge "1.7" ; then
242 + # This patch bumped to 2.10.2: http://pkgs.fedoraproject.org/cgit/scala.git/tree/scala-2.10.0-java7.patch
243 + epatch "${FILESDIR}/${PN}-2.10.2-jdk-1.7-swing.patch"
244 + sed -e "s@above is a message from the scala 2.10.2 release@above is a message from the scala ${PV} release@" \
245 + -i "${S}/build.xml" \
246 + || die "Could not correct scala version message"
247 + fi
248 + # Note: to bump scala, some things to try are:
249 + # 1. update all the sha1s in JURI
250 + # 2. remove the https://dev.gentoo.org/~gienah/snapshots/${P}-maven-deps.tar.gz from SRC_URI
251 + # 3. try emerge scala. Check if it downloads more stuff in src_compile to ${WORKDIR}/.m2
252 + # or /var/tmp/portage/.m2 or /root/.m2
253 + # 4. tar up all the .m2 junk into ${P}-maven-deps.tar.gz and add it to SRC_URI.
254 + sed -e "s@\(<mkdir dir=\"\)\${user.home}\(/.m2/repository\"/>\)@\1${WORKDIR}\2\n <artifact:localRepository id=\"localrepo\" path=\"${WORKDIR}/.m2/repository\" />@" \
255 + -e "s@\${user.home}/.m2@${WORKDIR}/.m2@g" \
256 + -e 's@\(<artifact:dependencies .*>\)@\1\n <localRepository refid="localrepo" />@g' \
257 + -i "${S}/build.xml" \
258 + || die "Could not change location of .m2 maven download directory in ${S}/build.xml"
259 + # Remove this test as it fails.
260 + # [partest] testing: [...]/files/run/parserJavaIdent.scala [FAILED]
261 + rm -f test/files/run/parserJavaIdent.scala
262 + fi
263 +}
264 +
265 +src_compile() {
266 + if ! use binary; then
267 + #unset ANT_OPTS as this is set in the build.xml
268 + #sets -X type variables which might come back to bite me
269 + unset ANT_OPTS
270 +
271 + # reported in bugzilla that multiple launches use less resources
272 + # https://bugs.gentoo.org/show_bug.cgi?id=282023
273 + eant all.clean
274 + eant -Djavac.args="-encoding UTF-8" -Djava6.home=${JAVA_HOME} \
275 + -Duser.home="${WORKDIR}" build-opt
276 + eant dist.done
277 + else
278 + einfo "Skipping compilation, USE=binary is set."
279 + fi
280 +}
281 +
282 +src_test() {
283 + java-pkg-2_src_test
284 +}
285 +
286 +src_install() {
287 + pushd dists/latest || die
288 +
289 + local SCALADIR="/usr/share/${PN}-${SV}"
290 +
291 + exeinto "${SCALADIR}/bin"
292 + doexe $(find bin/ -type f ! -iname '*.bat')
293 +
294 + #sources are .scala so no use for java-pkg_dosrc
295 + if use source; then
296 + dodir "${SCALADIR}/src"
297 + insinto "${SCALADIR}/src"
298 + doins src/*-src.jar
299 + fi
300 +
301 + java-pkg_dojar lib/*.jar
302 +
303 + pushd man/man1 || die
304 + for i in *.1; do
305 + newman "${i}" "${i/./-${SV}.}"
306 + done
307 + popd
308 +
309 + dodir /usr/bin
310 + for b in $(find bin/ -type f ! -iname '*.bat'); do
311 + local _name=$(basename "${b}")
312 + dosym "/usr/share/${PN}-${SV}/bin/${_name}" "/usr/bin/${_name}-${SV}"
313 + done
314 +
315 + popd
316 + local docdir="build/scaladoc"
317 + dodoc docs/README docs/TODO
318 + if use doc; then
319 + dohtml -r "${docdir}"
320 + fi
321 +}