--- scala-2.9.1.ebuild	2012-02-29 11:28:06.634841658 -0800
+++ scala-2.9.2.ebuild	2012-05-01 15:27:36.439029165 -0700
@@ -7,7 +7,7 @@
 JAVA_ANT_DISABLE_ANT_CORE_DEP=yes
 inherit eutils check-reqs java-pkg-2 java-ant-2 versionator
 
-MY_P="${P}.final"
+MY_P="${P}"
 
 # creating the binary:
 # JAVA_PKG_FORCE_VM="$available-1.5" USE="doc examples source" ebuild scala-*.ebuild compile
@@ -17,7 +17,7 @@
 
 DESCRIPTION="The Scala Programming Language"
 HOMEPAGE="http://www.scala-lang.org/"
-SRC_URI="!binary? ( ${HOMEPAGE}downloads/distrib/files/${MY_P}-sources.txz -> ${P}.tar.xz )
+SRC_URI="!binary? ( ${HOMEPAGE}downloads/distrib/files/${PN}-sources-${PV}.tgz -> ${P}.tar.gz )
 	binary? ( ${HOMEPAGE}downloads/distrib/files/${MY_P}.tgz )"
 LICENSE="BSD"
 SLOT="0"
@@ -31,7 +31,6 @@
 		dev-java/ant-core:0
 		dev-java/ant-contrib:0
 		dev-java/ant-nodeps:0
-		app-arch/xz-utils
 	)"
 RDEPEND=">=virtual/jre-1.6
 	!dev-java/scala-bin"