Fix: bug 482192 - thanks to Christian Strahl, Mike Limansky and Sumit Khanna for reporting; bug 482260 - thanks to Christoph Lange for reporting; bug 482286

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

4 files changed, 150 insertions, 18 deletions

diff --git a/dev-lang/scala/ChangeLog b/dev-lang/scala/ChangeLog
index 54d300196db6..4158a0921258 100644
--- a/dev-lang/scala/ChangeLog
+++ b/dev-lang/scala/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/scala
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v 1.32 2013/08/22 10:05:56 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v 1.33 2013/08/30 13:55:11 gienah Exp $
+
+  30 Aug 2013; Mark Wright <gienah@gentoo.org>
+  +files/scala-2.10.2-maven-deps.patch, scala-2.10.2.ebuild:
+  Fix: bug 482192 - thanks to Christian Strahl, Mike Limansky and Sumit Khanna
+  for reporting; bug 482260 - thanks to Christoph Lange for reporting; bug
+  482286
 
 *scala-2.10.2 (22 Aug 2013)
 
diff --git a/dev-lang/scala/Manifest b/dev-lang/scala/Manifest
index a2f23dd1ea93..64cf4b2b5a11 100644
--- a/dev-lang/scala/Manifest
+++ b/dev-lang/scala/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 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.7.3-build.xml.patch 417 SHA256 8b8db8fba952309a2446cbac2734ceec1f18c2d3407768c22cf3291a0a0ea211 SHA512 06a3dca92f75af0f7d11fac4835bc38149b48e92c570b4a9779bb71a6c0aac13b09c384832594b8b578e132d3707be4c57c22d28fcc2376ed0dff3715decc20f WHIRLPOOL 1073e3a70496555d562d77efc43a87f2fbdbc4a27dba0c1003e495dad6b8c1852d5c1b337a6e93fa2eb3e1c2acf364a37f6e25991ef7d30d2c4e783d3fae9002
 DIST annotations.jar 2242 SHA256 f2d057a006bba4253d069795284a7610f1c837af6a80c0057736099962e24bcc SHA512 3ceee0b1361b9e0911c1ff060ad108a1d93f7ea3e82ef946401cd5f895cb06016ac0ecdfd095f99b11cfb28c4cef7705c1b564c7af644c5f19b45c14a413c4dd WHIRLPOOL 51fa0efc5dd14cf8364e9639375511fc3e716bd520a193e6c17a2fe3f02eebd1529eb98fd3b382a6386baa5b779ebd0327e8f141aee172d11d9548d9921c58e1
@@ -21,6 +22,7 @@ DIST methvsfield.jar 609 SHA256 730b33d098319d969760f2250dc6924c9f85f94a8a2eb2b2
 DIST msil.jar 298973 SHA256 5b9e6dc2f4dd79644a1480b7cb4db053d73fc5d0e41015b95f15ec4dacf2da0a SHA512 1e9be7bfea639cffd638c78b4368f599753e8bd4df8f9b3c192b72c2860d6f96002c94fcf751e9c6cdacfead1ae3bd851d61395ce83c49d66f801284bd2046dd WHIRLPOOL 3828f08bb47f038d3f6e52c0d077cdecd06195de3d29b326833f47a6713bbab644ddcd20b8d39aa814d25637dae31adc1d0f0aec6f489857d7b115aeab29a301
 DIST nest.jar 2920 SHA256 3c7cf1a1b9fe9ad2abf3bfcedaa17a976c72f4bccb0e0c7dbcf7ecf27bc20aa5 SHA512 5eaaa870e06b5e00efb1f6ccced71343e8aa01578ea2b320b2d051f2df3713df9c500f074cc74a9e3c5cc509e03cf9c71265329bf2ddb3e82cb331524202fa38 WHIRLPOOL 1d73b612946a6a226841d3e0ad8cb3ebb06997c70e94feb1f9236e4e58a93c429cc7cdecaa4175fd5b78920253bcc157f798593b6a8eacb873b3d9a51284be34
 DIST push.jar 8886289 SHA256 58eb2b8c501bbff0e78074a058e3fc160012a80952c1cc96ed301d8a08d7e98d SHA512 b5539d381c8978ac57fc4258696e4cb552f47917178152b38b5683e42ed60da4d9da198a0344652f201541a71f92afd2ac8b3c3d3ec5266a8c222e9661d8a06a WHIRLPOOL 8fa6522a0fd9939f4ffd443b55e7a5adbb93a9dc5cbad569ccecd6be77ecd259eadbdb16c2c7eab6d9f175fbf33746faf9c41cf4d1050e7f576b86119301e126
+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.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
@@ -36,16 +38,16 @@ DIST scala-reflect-src.jar 467879 SHA256 45846f176eba3e072282b597fbea58977e1ac08
 DIST scala-reflect.jar 3307596 SHA256 910b58279250371e034859227fb5d9015297eb6bf607f9d3ec0836a822c1fff0 SHA512 466c55b8ce98e48f851c446b986388351ac4b0fb2b0cf6888d56fe2a4af1f5f3916e78f3fdea395ee18ef0a5128bc6b0d4cdcdce8f5b0f2fcc30c2bdbd41eb40 WHIRLPOOL 73a42b7b557bf29d14511f798e22f1ba8039e7c41bb165d9a4be7c66d393fa63c2836239fca56158eb2c5dd07567b1febb18d9f4f514de48e0c6ec5d155a46a2
 DIST scalacheck.jar 763570 SHA256 96814bea5818186086473da5c657191d03145649eee0c300abec9c3380fdd418 SHA512 5383e80dbcb11cb3fba033bd6a0e8c220ec3dd6fc153062b9d44d346ff17bea014a8c7a412af85ff487a34011cdc2042191c4c4ad66ea44eb7eba139a0b358d4 WHIRLPOOL d6276010ce4d1bcc647e1d7673cc18f645ac92abf03c4aa5be03735853a33692763883fcd8e325d36b2a18cca758d6f1636294b182f247da1094c82476f36b58
 DIST vizant.jar 15910 SHA256 a54e19093725d0d085544553246e48607c1e6ab65575ae0ff721b788118461d6 SHA512 4464d7349016f4999199e227e8eaf7bb3ef6b7e38ad0e8e710faad55df2e1243d99b53b9a789a1ffd3c39aef0d979dffc543f4691feae68cfa743e51bcf61390 WHIRLPOOL 1b957b8b850f79309c3577a2dcac52a620fa54f810f242a02c52bbcee1cc9c5818785baa7db8e2b82b850bcb56b528c4dd07cdfad2f991c0025293ca02c0dc99
-EBUILD scala-2.10.2.ebuild 6328 SHA256 b68ded0e90e0fe3bdb6c6f0ee7fa5e159e1f6faf61855c7dece69deed328d5ca SHA512 9ad674cebf1073b9a497d380ae8574944a62cb76854c3cb71a9b3f03241a87687bf1bce26a1a318d6964de3b5ce6e86cc363a39a613739773ae34c1d6416fb64 WHIRLPOOL 590e02c79694e2ba79224d8d0c590db4b36fe1eac230b43b03be39b5674e3d2130b493502997da16cd7f144a66a43a2be74a80501199579c113bda494817f834
+EBUILD scala-2.10.2.ebuild 8498 SHA256 6d7eb7580e0e8676ba5d4b411629644e28b014c48da0c9addd73eca185172be4 SHA512 4cda91d784d7e127565475178fa0b1688dac3e634bbb177bcc3e2eed801f5ce48ea7cdc34c93dae329cd24dfecf3dfe7043be5c8f077ed060ad5ea10c53610a7 WHIRLPOOL f4c5eed99f7442fccb8d7497f2c75e2df12fd90c79b47970b4e749a142b9edd39ecbf1a9d9e1ab19bcebfee2ddec98ce9acbcabec77e06bcde1ee97aa9098748
 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 5739 SHA256 982e815975d0d59bdcac5a448c004a8e2efe777a1f3c2b7b751a50816f061963 SHA512 47f0dd330e3795c9b45670defe251a3e0be34e00691c58952e36be0bd0de30c628990dd666c760bc286e3d3d5a165b563d1c100a6d04459bfcb85276ae1bb993 WHIRLPOOL 3faa7cd5328bb85dd8c1fb887f521a02302dd2d8a496167a70dd6c6dc875fff7ffeec1dadbd26f61b64510c4269c939367805a8926b82956d0a2fcb035c837bd
+MISC ChangeLog 6011 SHA256 373d01e6fb851af9053b4c08ed446eea1ec06dc90d1c4485bafac34fadbad3d0 SHA512 9260b55592fb589e7857e2e5c59f6bcb4be6f7f25f7735200dd59e08eb1f5c725110e2d0cfec9e73336e1cf5ab98523cf30c9d9a78c6131d12cdeaa1ea0f78eb WHIRLPOOL 0cd6921a7d73fd620f724f74785c99850ef5314051264ed150bcf404b676ba72d76d78871a32ac9c1eb5d91233bab1f92ddedd1c66ca36413db78fa4ab0d5b97
 MISC metadata.xml 317 SHA256 9ec2b0918811b14be0850dabea428b6b976e7eae70e97f281f85533d4e66bc94 SHA512 38504fb1d7acf7cf794ab67864c2f4ef99d569d9981753415dc6bfe3128bcf31568f0134d56f115644e1dafc18d32c9d51de252cb49de842ea2a32d71225c088 WHIRLPOOL 4e11d4be40d7f37a3b775e5a89f901a8c44d4291411f98783669b3129e671294d103e45dbabef350cc4469aaef2567d3fc9fb27f99ed476cd07a416a4ede71a1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlIV4iQACgkQoBEVQmGOlx+pOgEAogXzG6fcSsDtaIcK57ztqH3v
-wBZvAMEI/LxPI3nL1ooBAK7KZqX7a0Zlt7O8t29/MJuTLBa1GoLkRjeDYQKl4HA2
-=Lft4
+iF4EAREIAAYFAlIgo9IACgkQoBEVQmGOlx+PtgD/b7pPc30Py6upYZIq5AFhHanY
+cQTuUsKNgqLXLrS4w4UBANZV1ieAHCa793lOvANmGUoDkG6k3Qmj1ISMOX48WCS+
+=bI23
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..133a2a4f7576
--- /dev/null
+++ b/dev-lang/scala/files/scala-2.10.2-maven-deps.patch
@@ -0,0 +1,70 @@
+--- 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/scala-2.10.2.ebuild b/dev-lang/scala/scala-2.10.2.ebuild
index cf08c68714cb..c8e2a6645c8c 100644
--- a/dev-lang/scala/scala-2.10.2.ebuild
+++ b/dev-lang/scala/scala-2.10.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.10.2.ebuild,v 1.1 2013/08/22 10:05:56 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.10.2.ebuild,v 1.2 2013/08/30 13:55:11 gienah Exp $
 
 EAPI="5"
 JAVA_PKG_IUSE="doc examples source"
@@ -53,6 +53,7 @@ HOMEPAGE="http://www.scala-lang.org/"
 SRC_URI="!binary?
 (	https://github.com/scala/scala/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	${JURI[@]}
+	http://dev.gentoo.org/~gienah/snapshots/${P}-maven-deps.tar.gz
 )"
 #	binary? ( http://dev.gentoo.org/~ali_bush/distfiles/${P}-gentoo-binary.tar.bz2 )"
 LICENSE="BSD"
@@ -61,7 +62,9 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="binary emacs"
 
 COMMON_DEP="dev-java/ant-core
-	dev-java/hawtjni-runtime"
+	dev-java/bndlib
+	dev-java/hawtjni-runtime
+	dev-java/junit:4"
 DEPEND="${COMMON_DEP}
 	>=virtual/jdk-1.6.0
 	<virtual/jdk-1.8.0
@@ -78,7 +81,7 @@ PDEPEND="emacs? ( app-emacs/scala-mode )"
 
 S="${WORKDIR}/${P}"
 
-LIBRARY_PKGS="ant-core,hawtjni-runtime"
+LIBRARY_PKGS="ant-core,bndlib,hawtjni-runtime,junit-4"
 
 CHECKREQS_MEMORY="1532M"
 
@@ -100,12 +103,18 @@ src_unpack() {
 		unpack ${A}
 	else
 		unpack "${P}.tar.gz"
+		unpack "${P}-maven-deps.tar.gz"
 	fi
 }
 
 java_prepare() {
 	java-pkg_getjars ${LIBRARY_PKGS}
 	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
@@ -114,11 +123,61 @@ java_prepare() {
 		fi
 		# https://issues.scala-lang.org/browse/SI-7455
 		epatch "${FILESDIR}/${PN}-2.10.2-jdk-1.7-swing-SI-7455.patch"
-		local j
-		for j in "${JURI[@]}"
+		# 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 ${WORDIR}/.m2
+		# 4. tar up the stuff in ${WORDIR}/.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
-			cp -p "${DISTDIR}/${j##*/}" "${S}/${j#${BURI}/*/}" || die
+			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
 }
 
@@ -128,14 +187,11 @@ src_compile() {
 		#sets -X type variables which might come back to bite me
 		unset ANT_OPTS
 
-		# Thanks to Coy Barnes: https://bugs.gentoo.org/show_bug.cgi?id=450298#c13
-		export JAVA_OPTS="$JAVA_OPTS -Duser.home=${T}"
-
 		# 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} \
-			build-opt
+			-Duser.home="${WORKDIR}" build-opt
 		eant dist.done
 	else
 		einfo "Skipping compilation, USE=binary is set."
@@ -182,6 +238,4 @@ src_install() {
 		local _name=$(basename "${b}")
 		dosym "/usr/share/${PN}/bin/${_name}" "/usr/bin/${_name}"
 	done
-	dosym "/usr/share/${JAVA_PKG_NAME}/lib" "/usr/share/${PN}/lib"
-	dosym "/usr/share/${JAVA_PKG_NAME}/package.env" "/usr/share/${PN}/package.env"
 }