--- /usr/portage/dev-lang/scala/scala-2.9.1.ebuild	2012-01-31 01:22:41.000000000 -0800
+++ /usr/local/portage/dev-lang/scala/scala-2.9.1.ebuild	2012-02-29 11:26:58.658850622 -0800
@@ -4,10 +4,10 @@
 
 EAPI="3"
 JAVA_PKG_IUSE="doc examples source"
-WANT_ANT_TASKS="ant-nodeps"
+JAVA_ANT_DISABLE_ANT_CORE_DEP=yes
 inherit eutils check-reqs java-pkg-2 java-ant-2 versionator
 
-MY_P="${P}.final-sources"
+MY_P="${P}.final"
 
 # creating the binary:
 # JAVA_PKG_FORCE_VM="$available-1.5" USE="doc examples source" ebuild scala-*.ebuild compile
@@ -17,8 +17,8 @@
 
 DESCRIPTION="The Scala Programming Language"
 HOMEPAGE="http://www.scala-lang.org/"
-SRC_URI="!binary? ( ${HOMEPAGE}downloads/distrib/files/${MY_P}.txz -> ${P}.tar.xz )
-	binary? ( http://dev.gentoo.org/~ali_bush/distfiles/${P}-gentoo-binary.tar.bz2 )"
+SRC_URI="!binary? ( ${HOMEPAGE}downloads/distrib/files/${MY_P}-sources.txz -> ${P}.tar.xz )
+	binary? ( ${HOMEPAGE}downloads/distrib/files/${MY_P}.tgz )"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -29,9 +29,11 @@
 DEPEND="virtual/jdk:1.6
 	java-virtuals/jdk-with-com-sun
 	!binary? (
+		dev-java/ant-core:0
 		dev-java/ant-contrib:0
-	)
-	app-arch/xz-utils"
+		dev-java/ant-nodeps:0
+		app-arch/xz-utils
+	)"
 RDEPEND=">=virtual/jre-1.6
 	!dev-java/scala-bin"
 
@@ -95,7 +97,9 @@
 #}
 
 src_install() {
-	cd dists/latest || die
+	if ! use binary; then
+		cd dists/latest || die
+	fi
 
 	local SCALADIR="/usr/share/${PN}/"