Revision bump. Made binary tarball for bug #485206. Slotted dependencies. Small reorganization. Made unpack function more generic and fix it to work with the binary tarball.

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

3 files changed, 269 insertions, 6 deletions

diff --git a/dev-lang/scala/ChangeLog b/dev-lang/scala/ChangeLog
index 4158a0921258..1cb7c96477c5 100644
--- a/dev-lang/scala/ChangeLog
+++ b/dev-lang/scala/ChangeLog
@@ -1,6 +1,13 @@
 # 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.33 2013/08/30 13:55:11 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v 1.34 2013/09/20 23:17:14 tomwij Exp $
+
+*scala-2.10.2-r1 (20 Sep 2013)
+
+  20 Sep 2013; Tom Wijsman <TomWij@gentoo.org> +scala-2.10.2-r1.ebuild:
+  Revision bump. Made binary tarball for bug #485206. Slotted dependencies.
+  Small reorganization. Made unpack function more generic and fix it to work
+  with the binary tarball.
 
   30 Aug 2013; Mark Wright <gienah@gentoo.org>
   +files/scala-2.10.2-maven-deps.patch, scala-2.10.2.ebuild:
diff --git a/dev-lang/scala/Manifest b/dev-lang/scala/Manifest
index 64cf4b2b5a11..d86db951b76c 100644
--- a/dev-lang/scala/Manifest
+++ b/dev-lang/scala/Manifest
@@ -22,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-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.9.0.1-gentoo-binary.tar.bz2 33234044 SHA256 e44fbdace22ecf09aad8d10975c42758cc94e7d3caef9a30fe921b05188b8282 SHA512 1499ac0c2cc916ae0108dd3560e769e40441622580cbbeb32aa37048e6818499d3240f6045f4adeacf7e86a8d45582ea548bb37acc2070d12a2f15f9a25f722c WHIRLPOOL 03548a939001427f024e218c686dd859d94e73ecabeae6462c9e6e451457621be9bdb46c91c43653eacc7892bfbffcd37fb2a3421a8a9c25aae18d9297eeba01
@@ -38,16 +39,21 @@ 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-r1.ebuild 8549 SHA256 469d65299edb517545f1af2769a6c76b8eaa5da2f1f0fc0f7a8379fd0192c6c3 SHA512 d6a465f872b71f9fc729bdf4d4bab4e84c54a52c6efe681cf25368ae4f67f6b06517ccf279ca186e8a08e5160741a1e1505e972825131554fdc566ed14c23e3a WHIRLPOOL d86bd45e5922e49bf77c5c543de3448a87d6a7f337fef9a52edf2b1816eb1edba0434819525e4746fd8f8ec4530c3c45bca476b8fff71c8349d2e48f9dd5db3f
 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 6011 SHA256 373d01e6fb851af9053b4c08ed446eea1ec06dc90d1c4485bafac34fadbad3d0 SHA512 9260b55592fb589e7857e2e5c59f6bcb4be6f7f25f7735200dd59e08eb1f5c725110e2d0cfec9e73336e1cf5ab98523cf30c9d9a78c6131d12cdeaa1ea0f78eb WHIRLPOOL 0cd6921a7d73fd620f724f74785c99850ef5314051264ed150bcf404b676ba72d76d78871a32ac9c1eb5d91233bab1f92ddedd1c66ca36413db78fa4ab0d5b97
+MISC ChangeLog 6296 SHA256 3bf0766e566c6b1cc62c050b0df2eab1e6de74a132897c28df65021697032f59 SHA512 e1596f060f16e5884ec056687e8c95ba903fe62b99d83db460bd71e737890d90c63d9e73497dd6b3c4866931738775d5d26d43452a1de99018d546b5ee79157c WHIRLPOOL 91ee644214621d323fb51ebdabe27ca32a068013018f9851cc021bd1cccf80f74c1f050dbdde7e737a55b8395b33974c43f55b0e5b34d6c036a0d9842348613d
 MISC metadata.xml 317 SHA256 9ec2b0918811b14be0850dabea428b6b976e7eae70e97f281f85533d4e66bc94 SHA512 38504fb1d7acf7cf794ab67864c2f4ef99d569d9981753415dc6bfe3128bcf31568f0134d56f115644e1dafc18d32c9d51de252cb49de842ea2a32d71225c088 WHIRLPOOL 4e11d4be40d7f37a3b775e5a89f901a8c44d4291411f98783669b3129e671294d103e45dbabef350cc4469aaef2567d3fc9fb27f99ed476cd07a416a4ede71a1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iF4EAREIAAYFAlIgo9IACgkQoBEVQmGOlx+PtgD/b7pPc30Py6upYZIq5AFhHanY
-cQTuUsKNgqLXLrS4w4UBANZV1ieAHCa793lOvANmGUoDkG6k3Qmj1ISMOX48WCS+
-=bI23
+iQEcBAEBCAAGBQJSPNd/AAoJEJWyH81tNOV9WYoH/j1FQaMP2e1law50cBL4qy/W
+n4PFke1cTdjgS3+hOtdA02tA8NftsRgurrTy6JZNGkav6n2N850RfX4JKucjUC9B
+dB49Hq1za5OeWM0bhwuCLbAiCLrLdXkiimegPU6VpgJzHT8irJfVX/Z2YRx6wls6
+kMS5mGljVhKleYEO0lHyFZfttwWda96QLwAR8ImpbhoUEnW/C9cSFR++FVF7CysV
+BwGLY/LkDZTxvBT9oZt58or9cMOIkO0j5flMTW29qSXpWYH2rcWUMRXJ5B1DMNT0
+Dy584E8kgrqDWtJhT/KO3FB3cDoaZBmUC2rDX4SDJa+psQ323ppFBi43EBfqrnU=
+=5pNV
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/scala/scala-2.10.2-r1.ebuild b/dev-lang/scala/scala-2.10.2-r1.ebuild
new file mode 100644
index 000000000000..42d5d0270244
--- /dev/null
+++ b/dev-lang/scala/scala-2.10.2-r1.ebuild
@@ -0,0 +1,250 @@
+# 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-r1.ebuild,v 1.1 2013/09/20 23:17:14 tomwij Exp $
+
+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}"
+
+# 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[@]}
+	http://dev.gentoo.org/~gienah/snapshots/${P}-maven-deps.tar.gz
+)
+binary? ( http://dev.gentoo.org/~tomwij/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}
+	>=virtual/jdk-1.7.0
+	<virtual/jdk-1.8.0
+	java-virtuals/jdk-with-com-sun:0
+	!binary? (
+		dev-java/ant-contrib:0
+	)
+	app-arch/xz-utils:0"
+
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.7
+	!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() {
+	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 ${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
+			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}/"
+
+	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
+
+	doman man/man1/*.1
+
+	#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}/bin/${_name}" "/usr/bin/${_name}"
+	done
+}