Bump scala to 2.11.1, fixes Bug 508328 - dev-lang/scala-2.11.1 version bump, thanks to Joel for reporting.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x618E971F

4 files changed, 267 insertions, 5 deletions

diff --git a/dev-lang/scala/ChangeLog b/dev-lang/scala/ChangeLog
index 36d50ba39252..d4f4e13394af 100644
--- a/dev-lang/scala/ChangeLog
+++ b/dev-lang/scala/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/scala
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v 1.36 2014/07/06 10:39:35 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v 1.37 2014/07/08 15:17:10 gienah Exp $
+
+*scala-2.11.1 (08 Jul 2014)
+
+  08 Jul 2014; Mark Wright <gienah@gentoo.org> +files/scala-2.11.1-no-git.patch,
+  +scala-2.11.1.ebuild:
+  Bump scala to 2.11.1, fixes Bug 508328 - dev-lang/scala-2.11.1 version bump,
+  thanks to Joel for reporting.
 
 *scala-2.10.4 (06 Jul 2014)
 
diff --git a/dev-lang/scala/Manifest b/dev-lang/scala/Manifest
index e7490dfd74d7..be76c4fb121c 100644
--- a/dev-lang/scala/Manifest
+++ b/dev-lang/scala/Manifest
@@ -8,6 +8,7 @@ AUX scala-2.10.2-no-git.patch 919 SHA256 898ef449dc536e1809d1f16870398eb43fc947b
 AUX scala-2.10.3-maven-deps.patch 3988 SHA256 50dab36b376fc9476de3f34335b50253a2b48b8bc3acdd9d7bc504de91ac1475 SHA512 546b5ca04a6f5e2931995bb50dc2ba94ee2294ee6c0b9fe0b5ffdf17591100c4b99a025c0f32803ec4217258442dd2f73b3af324ab11ac54f78f73a558f4f636 WHIRLPOOL 9044f4d7047aa73af3562a0070bf180a070cd2e9fd26c674be46dc7b0a193fce848df396cb591f89aef3829b663977e69b1d3b31d9f9549e9dfb74584ee221d5
 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.11.1-no-git.patch 919 SHA256 27b64c79ab589788562fdb83ffdeef8a39eb7d96d7b163f72609833b05239a91 SHA512 b2ef4da42d192c95a1974ed0caba52b6530c7f77de35cd817520ced906ec72d578ff68212add7cc0f7ded6b2486b03aa0e5f52c094f326cfc017ecc1d97116be WHIRLPOOL ec6e2cce830b12ddfbafe3ff2202e63d79a70b8234f80acfca209b3493df3c23b794c5c0b4f18f6f05a116e7328a7d097d61c3626d7d84d962d03d1709077f33
 AUX scala-2.7.3-build.xml.patch 417 SHA256 8b8db8fba952309a2446cbac2734ceec1f18c2d3407768c22cf3291a0a0ea211 SHA512 06a3dca92f75af0f7d11fac4835bc38149b48e92c570b4a9779bb71a6c0aac13b09c384832594b8b578e132d3707be4c57c22d28fcc2376ed0dff3715decc20f WHIRLPOOL 1073e3a70496555d562d77efc43a87f2fbdbc4a27dba0c1003e495dad6b8c1852d5c1b337a6e93fa2eb3e1c2acf364a37f6e25991ef7d30d2c4e783d3fae9002
 DIST annotations.jar 2242 SHA256 f2d057a006bba4253d069795284a7610f1c837af6a80c0057736099962e24bcc SHA512 3ceee0b1361b9e0911c1ff060ad108a1d93f7ea3e82ef946401cd5f895cb06016ac0ecdfd095f99b11cfb28c4cef7705c1b564c7af644c5f19b45c14a413c4dd WHIRLPOOL 51fa0efc5dd14cf8364e9639375511fc3e716bd520a193e6c17a2fe3f02eebd1529eb98fd3b382a6386baa5b779ebd0327e8f141aee172d11d9548d9921c58e1
 DIST ant-contrib.jar 224277 SHA256 be33a69818310b5c55e41dc11d48cd895f5f129da4b0d28c2f4c6c3e1cbcf3fc SHA512 5ec325a55bb213226c86faf8a99951839319e9579956ae58e2ccfe84f62d2742542998f98eed3f0dc8f8f94635d6dff1fe02e3c0f5289df1f09027ae2b9bee83 WHIRLPOOL aa713cc04b10c46adbbb8a5904e3fb34c6e32b67bb9a5f1a89768ceab8c31b977875c84434bc03c5b42105a4019f55cc10d806b0345c365a309e93d3f02e0a10
@@ -61,6 +62,25 @@ DIST scala-2.10.4-scala-reflect.jar 3307596 SHA256 910b58279250371e034859227fb5d
 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.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
+DIST scala-2.11.1-ant.jar 1506140 SHA256 0251dbb938740ace07a53675113eee753ba389db65aebc814b175af50321620e SHA512 ddee72ca62adb20e700022609749a4d6cc848c94e597a7450226770c8b97aa2c1f7f23b7a1c6ac8acd63047101997ebd68c19b393ebffde9ff5c7bb1957cd18c WHIRLPOOL 1b2b7e0289cb16f5131a9c0b1b6eb1279011e7af79fc470dd6dc2047afc7fa99bdeec6d9db4f46adb83f6110593118d0909a4b1fa6b01dc56890bf6d2785373b
+DIST scala-2.11.1-code.jar 683 SHA256 4a03a08954e6b912a469b5e0db898247ea3ebc25b641f328e80f19163a0d908a SHA512 d963c186f3029858b1f6b53cf6e3470946365f13a6bcc334a7c959fd449dace10a953c496dbf3036828f2b5e5ad17d22f5e3912446bed14bd71b2f0de2f6c767 WHIRLPOOL 06e44b713306b3bdb7e878db1598546b45857091eb457c0fdba738d5f8c4de726920532e5cdf10260002c69299bd2756df52f407373053c5883e961899624d85
+DIST scala-2.11.1-enums.jar 1372 SHA256 95c53606c7113333ef95b4efbd3ae08af715ca49f71845a5d33150e6b7e9a072 SHA512 3d2356b9f610e98a03f64cbdd18ee36138b68ba5b170bb9b78bc7449439c3870f6f5bc795f3e1b8d325daf468ae85c581b60d1d360c1ae68c70792ad62b9c1dc WHIRLPOOL 30b26ba56a36272cf5973d3a89850cb3f5bff6c45a7a6bbd6ccf4ff342720bba89dfc0cdbe10058b770b7e73093ea948e574d5e081c36ab866f3bea9f0e14f95
+DIST scala-2.11.1-forkjoin.jar 60850 SHA256 4007ca649f037ed5ecc87c74529f499b75ed1a0f3f78e8f82cd97a71f5d2d5c7 SHA512 702370f2654b1c06f340c100078c630a82808e56c4dcc323881d6547945ce028345a5ee3048cbb9502a3b340b1d84ab5a635f80dbb381fdd88cc25b60cad768f WHIRLPOOL 9d561c9872c140e266efefb1c1afe76a2754eda32357718d048ff0896d6a2d14f168e1e2eddfcb37bbd0ac07fb7a7079b63e0f512946a7e30ff62883ee8bfd84
+DIST scala-2.11.1-genericNest.jar 1136 SHA256 c2c23341eec9fb379b57d7bf1156fedb3e2b9f97d2d5729fbfc7d766fd390faa SHA512 32c3b3e14bc72db2572bf120c1fda49a369b27ff8ae6ae12f6d7b12fdffef4064b515671c8f1b6dbfd78209247f6a7b7b26e700dd70a105de3ca59f5185ff9d6 WHIRLPOOL 61b2d9f840fc0ed86a8207cf353a2f7b9bf8523d31b4e8f74eb21ecac1a405ed04c5a4a8e78a13d64b2dd186a7ec3885cd5e2514ad572e600e5744c3f15f74c5
+DIST scala-2.11.1-gentoo-binary.tar.bz2 29582640 SHA256 d8238e2be80b1f95c488909b81aa9614ffd03ade9145e67e3fe0260fa4e2df93 SHA512 c03b92a15ee080a7049ffa8502d73caff6495f30bbbc0cee7975530cd15c767c4b1c4e189aede0a67bd575c0be2de5c19e907a85aee0b8cf9f76fa41ad45e8d8 WHIRLPOOL 11b4c94bc11d2f766d5198a54e687508a2587486608aadb3b84d0e5ebe7cc5c912b95290ef5b5d78c074093e2f20bb87b74d3365cd10322ff89e28b0a67482ed
+DIST scala-2.11.1-instrumented.jar 31725 SHA256 8a424c8bd5805ec429a9477cbd0f44bf65a2b79b720d438bfd347dba8da06484 SHA512 b1d77c4380a2b8ffe715ec106e58081e5c89e314c5a13071d627c3f974144ad453e79d405cd722d75095b62e8682b7414d40b691506c7d2f5dde62e2fce51e39 WHIRLPOOL 5ef8ee89b3fa66bf5025fd1b5db65d4d628b3452ba8530e3c3b1dd530fb5286fe3acee2cf56de09148cf2d37968626708690cc03da202cf3d58159cfd56fe8bc
+DIST scala-2.11.1-jsoup-1.3.1.jar 133835 SHA256 5695a4351412dbb21cfc9f09a31d66df5da94bd9bf2777325ff22916bbb32cb0 SHA512 365e43b6d8ba14ae32607241481f7c0e6393268f5c3faef860be7674150edece2c30376108e54f307df6a266a91100a1c7dbc2f28b4207b5227bc1bec6e1106d WHIRLPOOL 5b8ecbd677722e59642b630257748260dad0ad2e04b78b4472022729554d3984805dc02214cc983cacb76b0a526b062937074d3122a804e97e3e772e8c2e003c
+DIST scala-2.11.1-jsr166_and_extra.jar 728574 SHA256 e33a59e291bae8dbd2b37c6a4d5eae459a313db3a588f42c59ac5fd8edf6e13b SHA512 40d949cfefc5111c79b79f085657d56aa046d1b318e6ad78de5869f61a6515c2076b70344be5ae3fb93a7b3f54f46a129e2536515b258e0d5bf2e670c5001306 WHIRLPOOL ef8414d7862736cf072ff60fff5008f38dadcf826364cf21929fdfca7d331872d8097e6a6907dd500ef5d5a68964d8c2ed9ebeedf6470dc25ede269c1a8172b5
+DIST scala-2.11.1-macro210.jar 2065 SHA256 c0796c2defec3dcf2f786945fbdced0448a958bb68eaef71efcf5c14184f28ff SHA512 13c119afc4400f1531cad0cf38ab1652fce641090c11bff8f044a0d7f99df90412241ae78d5c623b7ecff1ce4720ae51fca4324f51bde0331e12f2e6e9898dd0 WHIRLPOOL 33b843583c02bd25db09df595026822f4e81d6a80c2cce3a7099dfb77dda80f595e5392e843c786a63b8d430d8acf53c20bc669ec1272b0f58c52cb0b67408b5
+DIST scala-2.11.1-maven-ant-tasks-2.1.1.jar 1314262 SHA256 b8891b4a90aca2793ad385ab57216f51c4879c6ab7e927354f407b46510cab51 SHA512 e3f0ff1d41ec31b2b64acb2ebcc175709714033589cb8e763f94aa80359c84f5d960c46dae713c9e37e1a09b977e7da617f8fe10a5b6fb30c55efd19bc307e68 WHIRLPOOL 73c44ea6aba4a3c697f64d08475b4c17bdc929ac9f320a25714fbe7cdc2939ad334deb7a90eb6c950cce8ba402d19bc2615a104788bafed7d247b997d3146743
+DIST scala-2.11.1-methvsfield.jar 609 SHA256 730b33d098319d969760f2250dc6924c9f85f94a8a2eb2b2a025dcf05378d9c6 SHA512 6db923ed7059bc91c8442d5804ccd8336e94f5202b3dcc348a4eb5026f09e1e86862f6e94818beae9ad42fcdc8e51df4d59a27109903a8ccb78054425ae47a71 WHIRLPOOL d5362d5fc2795ff0671f386429840bb4f84173f9308e34c2b0eb585fb7cacbd308ab87c42f2fd407597abc4f010e8ffde600dd30addcd63c2d71c2d5f22f1582
+DIST scala-2.11.1-nest.jar 2920 SHA256 3c7cf1a1b9fe9ad2abf3bfcedaa17a976c72f4bccb0e0c7dbcf7ecf27bc20aa5 SHA512 5eaaa870e06b5e00efb1f6ccced71343e8aa01578ea2b320b2d051f2df3713df9c500f074cc74a9e3c5cc509e03cf9c71265329bf2ddb3e82cb331524202fa38 WHIRLPOOL 1d73b612946a6a226841d3e0ad8cb3ebb06997c70e94feb1f9236e4e58a93c429cc7cdecaa4175fd5b78920253bcc157f798593b6a8eacb873b3d9a51284be34
+DIST scala-2.11.1-push.jar 8886289 SHA256 58eb2b8c501bbff0e78074a058e3fc160012a80952c1cc96ed301d8a08d7e98d SHA512 b5539d381c8978ac57fc4258696e4cb552f47917178152b38b5683e42ed60da4d9da198a0344652f201541a71f92afd2ac8b3c3d3ec5266a8c222e9661d8a06a WHIRLPOOL 8fa6522a0fd9939f4ffd443b55e7a5adbb93a9dc5cbad569ccecd6be77ecd259eadbdb16c2c7eab6d9f175fbf33746faf9c41cf4d1050e7f576b86119301e126
+DIST scala-2.11.1-vizant.jar 15910 SHA256 a54e19093725d0d085544553246e48607c1e6ab65575ae0ff721b788118461d6 SHA512 4464d7349016f4999199e227e8eaf7bb3ef6b7e38ad0e8e710faad55df2e1243d99b53b9a789a1ffd3c39aef0d979dffc543f4691feae68cfa743e51bcf61390 WHIRLPOOL 1b957b8b850f79309c3577a2dcac52a620fa54f810f242a02c52bbcee1cc9c5818785baa7db8e2b82b850bcb56b528c4dd07cdfad2f991c0025293ca02c0dc99
+DIST scala-2.11.1.tar.gz 5633076 SHA256 868a009c89a331ec05914faa204f865d09f2b7b35eabdb41e7f43e8734e0abf5 SHA512 bde7a8fae9fa570df392a70aa06f901bc4987703fadf1e7ad9f090f3b3c9a2ff1bbe055a401b0d851193b5ddcd8b0536c4916f79ae4c63b74c31695de6e651b2 WHIRLPOOL 4f153b829efe7e3435bab5fca27a0e52c94aa8f50f2078cee082575bb8f7677b4e0a70c49a92060c3509cc009f3586ff592c2b332a4c78bb57bcb9973328e6d1
 DIST scala-2.9.0.1-gentoo-binary.tar.bz2 33234044 SHA256 e44fbdace22ecf09aad8d10975c42758cc94e7d3caef9a30fe921b05188b8282 SHA512 1499ac0c2cc916ae0108dd3560e769e40441622580cbbeb32aa37048e6818499d3240f6045f4adeacf7e86a8d45582ea548bb37acc2070d12a2f15f9a25f722c WHIRLPOOL 03548a939001427f024e218c686dd859d94e73ecabeae6462c9e6e451457621be9bdb46c91c43653eacc7892bfbffcd37fb2a3421a8a9c25aae18d9297eeba01
 DIST scala-2.9.0.1.tar.xz 29707920 SHA256 97e0d2262e4df8f936c70670849299deba69e981f783250d819733e52dbe7f96 SHA512 be1ab7589125b994e6512b38d7e5fe4c07e9f2c614ee41662a75ac4c8666faefa46e525681fbca9509b1d1db86c51f25d1a98ac67739de077b3a54adb4baf441 WHIRLPOOL 05abba93be924972d8acf76b720feb0534af0650d05bc71a7439242314c16b66c03eca05c6b00d229725239d1bbb01d1a7fd1470284c2bccac5cf0e78e930b4b
 DIST scala-2.9.1-gentoo-binary.tar.bz2 33266793 SHA256 b118c285ba6655974a647a5a82e3e655487e55aff6a5b89ddf5295595d6c822a SHA512 08b9354cdc542e52b4cab2b5e67131757f635a1da8118d5c8dd015f49d9f84f1647a60a9ff5936e49441fbec71596fc8616aa494ca9cc9da851acd3ab1b5210e WHIRLPOOL 47561a90d5af3c93e17ff1cb5c9f601deb1156303a7c0ec53c43838e3f62a229e1a5c10c108fb29fdfab4d3e4c8160b02147ec3d9656ff5567b50bc75cfa00b0
@@ -80,15 +100,16 @@ EBUILD scala-2.10.2-r1.ebuild 8549 SHA256 469d65299edb517545f1af2769a6c76b8eaa5d
 EBUILD scala-2.10.2.ebuild 8497 SHA256 f124567a162ac34ebe2fab041c8cc8dd7cb2383e2fa186b5b02ffe4287b47d94 SHA512 6efde5fee8653752982a099ec9bc4b8d8edad5123e534ea76a8cfe44577719a8cb224ec8e031d3517f7cf9631c6fd2890351dc015ca9c33e5b2fcafced6b1795 WHIRLPOOL 1268e2184073f78e1ae7833df8ca9fee40a986972f222994c54e74876e56369d54cfdebec27cfb3af4841d9f41916ed4f23f171ca34a57c7f4157e6b1b82a89e
 EBUILD scala-2.10.3.ebuild 10092 SHA256 a313ad020e3473f46b5ab6f9f294758791886e3652d323cf0f3653042ac0d535 SHA512 92614c4759b0dd9cf4deff67501132a5aeecd68ea61c266fcefc14789c52835a930b72e8976cd739643bc30973c3ff5e519e140254c40a31bb1231b1c5f89f2b WHIRLPOOL 19015dae9764e80eaa5fc4f389815948ff91ade0428f1591dbaf342c99943be6f0ed09237da12e9ad0eab3384fd7034a1989a63d8da6c79ac7e90179058aeb85
 EBUILD scala-2.10.4.ebuild 8472 SHA256 3356f1d9eb3520a5d6a9c80637d31aec95bdad44090d9a3b758ac7a4bc87bd17 SHA512 b8208169a775d665bb156580be7d6d047c86ae7314487eae4484b9ac01298fd0c1d0b9088ef61b95d16a6817c99d889ac4454ccef8f0c2af0a76af168983c9b6 WHIRLPOOL 251a81d0644fc8bdff14b66678e06f421c3d0354e156fce469d54ae3ef1841bcbb86e2815ab8287936d5d4955e4af2a79616bcd6e4fabfa9a00a88e878accb95
+EBUILD scala-2.11.1.ebuild 7072 SHA256 ccd197b8e5da49ad2a16138c88377cd5ac7624fefcd555b04d9120597f7512ce SHA512 14706326cba8067f92f5953a8a799064e88c64208ea8f1f3b560064b959abe6e085e0d48a749cfa169d6f3e3f52e637ca0ae7fea75d2fb4a14058f14746e2a9b WHIRLPOOL 76a7b74a62322ae9c4d5a9c6950558a9a539d8402f59967489c1378e4fd65cc022e13ddd95f7a7eab67136dd4786ce5ceea293086ae4e9e5e90cd7f29527bdc5
 EBUILD scala-2.9.0.1.ebuild 3889 SHA256 4193799a5ee6b63411c20a99c4d7422d5a596d795236a508fe536a316ac2013d SHA512 924bcd7d1f180b57607579e265fa945ac80c7bb18ecf394c432c21e62dee970c868651363eaa3f49465c1d6334df8314c77761ea46e1f9d1f43b2b7537108ded WHIRLPOOL bb2ec1cc4015241fb91b4612cde5f1b36c10aadc5f44390bbf2b579f6044fad112c6794504d84d2aca565843271951aeb37a3230e314d9bec458ee4841bdf03c
 EBUILD scala-2.9.1.ebuild 3902 SHA256 5850b0694255b672412d830f6bcabda4eb3506ad78a5cd6fc58c974606024fcb SHA512 e11f585934b7e51439b9a033b74a6f20dd090dcab6956838c0fcb85b00e81e980aa7496dfa20b2c9fdd1247838323e9d3392f391716dec320a5e4deaa70f1c45 WHIRLPOOL aa1de98a6582bc466b60445deb44363aa3d1a392dce18419c2524375aaec0f60263a24ed8e15ef8f3c8fc00f87172dc017cdec1d3edb69681906c646dc81903e
 EBUILD scala-2.9.2.ebuild 3962 SHA256 e810798955120343c29b7e92fbca46c0da311472533a23cb7a2e85e408111259 SHA512 6109c0722859a29910525cfbeae2ea665f50931e05268e2891e3bd56665d71a6a697fdb1fc8e6038df0359bace8ae9d80358f2742edb995bcd3cf388e25d5264 WHIRLPOOL 29ec1f92755b0894077db0f24bb4bffc6ad5915b203b4786deb59b7fa86ece7ae7ffc6f18c2540f9cb72e6a627c495ab5fd79273b38173d9293eb43db48d57c2
-MISC ChangeLog 7090 SHA256 5bb21e91ddca832c35125cceb5fa3a8ed37ce976423112cf30c00a1c786617a9 SHA512 1019ef711d77227ea0ad993b96ed6778f5d0051f14afd11c80578c27033db6d2ef5292436806ee6db18291e126a4287ee8f4528a6650c14b19c921c221c7dc86 WHIRLPOOL 208910280dab93802e09ebf9718b3483f402a4c0ca5a0b32c287cefc5ef5f89a0d318682daf7d6d403e922751968cdc348deb8e20e50c3c8b1a13364521bcd3c
+MISC ChangeLog 7336 SHA256 40ff5e63432a025984078e2b2df330f9cc70b603355c69467da1fb5aa36ae052 SHA512 70891d234af848fbd934dc6d5e31f6c97edb065b7de05c67806fb984c01759d7f889f516cd050045389a74e81c6e939f9ac35ece5c72902b6db003f4b19fa7a5 WHIRLPOOL 574bdd4f755064a73116a0c40b9add8caf0636aab0d66a6356f6097c3a525faf020781baec474a3621be1a762baae9e5ed71419a385b8f991dc13a044155b137
 MISC metadata.xml 317 SHA256 9ec2b0918811b14be0850dabea428b6b976e7eae70e97f281f85533d4e66bc94 SHA512 38504fb1d7acf7cf794ab67864c2f4ef99d569d9981753415dc6bfe3128bcf31568f0134d56f115644e1dafc18d32c9d51de252cb49de842ea2a32d71225c088 WHIRLPOOL 4e11d4be40d7f37a3b775e5a89f901a8c44d4291411f98783669b3129e671294d103e45dbabef350cc4469aaef2567d3fc9fb27f99ed476cd07a416a4ede71a1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlO5J3EACgkQoBEVQmGOlx/exQD9GRCLn0p0sbYEQ1k1AmSqt8oD
-P8xHDYNzRWmWaelA00wBAKrhHHKmhMNs1nOdNJUmBVLkQycKif//pOfy1FMOXlqd
-=VSM1
+iF4EAREIAAYFAlO8C34ACgkQoBEVQmGOlx/yBQD+P9F+eAgh/vGFHo9oyaacAELO
+Wb4Bdr19Cm6uSB4SS/EA+wR7wzcT/HFuhYUuPYdRxWk9wIdjFqBsQUyymLo11RHq
+=WvKk
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/scala/files/scala-2.11.1-no-git.patch b/dev-lang/scala/files/scala-2.11.1-no-git.patch
new file mode 100644
index 000000000000..fbec47cd6c69
--- /dev/null
+++ b/dev-lang/scala/files/scala-2.11.1-no-git.patch
@@ -0,0 +1,24 @@
+--- scala-2.11.1-orig/tools/get-scala-commit-date	2014-05-19 21:01:18.000000000 +1000
++++ scala-2.11.1/tools/get-scala-commit-date	2014-07-06 16:47:04.772397561 +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-05-19"
++lastcommithours="00:00:00"
+ 
+ # 20120324
+ echo "${lastcommitdate//-/}-${lastcommithours//:/}"
+--- scala-2.11.1-orig/tools/get-scala-commit-sha	2014-05-19 21:01:18.000000000 +1000
++++ scala-2.11.1/tools/get-scala-commit-sha	2014-07-06 16:47:25.704741601 +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="1e1defd99c4b8874c517daf877b583a81e056c15"
+ hash=${hash#g}
+ hash=${hash:0:10}
+ echo "$hash"
diff --git a/dev-lang/scala/scala-2.11.1.ebuild b/dev-lang/scala/scala-2.11.1.ebuild
new file mode 100644
index 000000000000..abc7a284b310
--- /dev/null
+++ b/dev-lang/scala/scala-2.11.1.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.11.1.ebuild,v 1.1 2014/07/08 15:17:10 gienah Exp $
+
+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}"
+
+# creating the binary:
+# JAVA_PKG_FORCE_VM="$available-1.6" USE="doc source" ebuild scala-*.ebuild compile
+# cd $WORDKIR
+# tar -cjf scala-2.11.1-gentoo-binary.tar.bz2 scala-2.11.1/build/pack/bin \
+# scala-2.11.1/build/pack/lib/ scala-2.11.1/build/pack/man \
+# scala-2.11.1/src/actors/ scala-2.11.1/src/forkjoin/ \
+# scala-2.11.1/src/library scala-2.11.1/src/library-aux/ \
+# scala-2.11.1/src/reflect/ scala-2.11.1/docs/TODO \
+# scala-2.11.1/doc/README scala-2.11.1/build/scaladoc/compiler
+
+# 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}/ddd7d5398733c4fbbb8355c049e258d47af636cf/lib/forkjoin.jar -> ${P}-forkjoin.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}/346d3dff4088839d6b4d163efa2892124039d216/test/files/lib/jsoup-1.3.1.jar -> ${P}-jsoup-1.3.1.jar" \
+	"${BURI}/3794ec22d9b27f2b179bd34e9b46db771b934ec3/test/files/lib/macro210.jar -> ${P}-macro210.jar" \
+	"${BURI}/be8454d5e7751b063ade201c225dcedefd252775/test/files/lib/methvsfield.jar -> ${P}-methvsfield.jar" \
+	"${BURI}/cd33e0a0ea249eb42363a2f8ba531186345ff68c/test/files/lib/nest.jar -> ${P}-nest.jar" \
+	"${BURI}/1b11ac773055c1e942c6b5eb4aabdf02292a7194/test/files/speclib/instrumented.jar -> ${P}-instrumented.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? ( http://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.bz2 )"
+
+LICENSE="BSD"
+SLOT="0/${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}
+	java-virtuals/jdk-with-com-sun:0
+	!binary? (
+		>=virtual/jdk-1.6.0
+		<virtual/jdk-1.9.0
+		dev-java/ant-core:0
+		dev-java/ant-contrib:0
+		dev-java/ant-nodeps:0
+		media-gfx/graphviz
+	)
+	binary? (
+		>=virtual/jdk-1.7.0
+		<virtual/jdk-1.9.0
+	)
+	app-arch/xz-utils:0"
+
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.6
+	!dev-java/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,bndlib,hawtjni-runtime,junit-4
+
+	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"
+		# Note: to bump scala, some things to try are:
+		# 1. update all the sha1s in JURI
+		# 2. try emerge scala.  Check if it downloads more stuff in src_compile to ${WORDIR}/.m2
+		# 3. If it does download more stuff to ${WORDIR}/.m2, then there was some stuff to handle that in
+		# the scala-2.10.3 ebuild.
+	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
+		fi
+	else
+		einfo "Skipping compilation, USE=binary is set."
+	fi
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	pushd build/pack || die
+	local SCALADIR="/usr/share/${PN}/"
+	exeinto "${SCALADIR}/bin"
+	doexe $(find bin/ -type f ! -iname '*.bat')
+	dodir "${SCALADIR}/lib"
+	insinto "${SCALADIR}/lib"
+	local maj_min=$(get_version_component_range 2)
+	pushd lib || die
+	for j in *.jar; do
+		local i="${j%${maj_min}*}"
+		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}"
+	done
+
+	doman man/man1/*.1
+	popd
+
+	#sources are .scala so no use for java-pkg_dosrc
+	pushd src || die
+	if use source; then
+		dodir "${SCALADIR}/src"
+		insinto "${SCALADIR}/src"
+		doins -r actors forkjoin library library-aux reflect
+	fi
+	popd
+
+	local docdir="build/scaladoc/compiler"
+	dodoc docs/TODO doc/README
+	if use doc; then
+		dohtml -r "${docdir}"
+	fi
+}