--- /usr/portage/dev-java/batik/batik-1.6-r3.ebuild	2007-11-11 07:05:51.000000000 +0000
+++ /usr/local/portage/dev-java/batik/batik-1.7.ebuild	2008-01-17 17:06:55.000000000 +0000
@@ -9,41 +9,38 @@
 SRC_URI="mirror://apache/xml/batik/${PN}-src-${PV}.zip"
 
 LICENSE="Apache-2.0"
-SLOT="1.6"
+SLOT="1.7"
 KEYWORDS="amd64 ~ia64 ppc ~ppc64 x86"
 IUSE="doc python tcl"
 
-CDEPEND="=dev-java/rhino-1.5*
+CDEPEND="=dev-java/rhino-1.6*
 	>=dev-java/xerces-2.7.1
+	dev-java/xalan
 	=dev-java/xml-commons-external-1.3*
 	python? ( dev-java/jython )
 	tcl? ( dev-java/jacl )"
-DEPEND="=virtual/jdk-1.4*
+DEPEND=">=virtual/jdk-1.4
 	dev-java/ant-core
 	app-arch/unzip
 	${CDEPEND}"
 RDEPEND=">=virtual/jre-1.4
 	${CDEPEND}"
 
-S="${WORKDIR}/xml-${PN}"
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch ${FILESDIR}/${P}-jikes.patch
-	epatch ${FILESDIR}/${P}-dont-copy-deps.patch
-
 	java-ant_ignore-system-classes
 
 	cd lib
 	rm -f *.jar build/*.jar
 
 	java-pkg_jar-from xml-commons-external-1.3
+	java-pkg_jar-from xalan
 	java-pkg_jar-from xerces-2
 	# Can't make rhino optional because
 	# apps/svgbrowser needs it
-	java-pkg_jar-from rhino-1.5
+	java-pkg_jar-from rhino-1.6
 	use python && java-pkg_jar-from jython
 	use tcl && java-pkg_jar-from jacl
 }