6 files changed, 133 insertions, 1 deletions
diff --git a/dev-java/saxon/ChangeLog b/dev-java/saxon/ChangeLog
index 79c4799d72cf..e68faf3942c1 100644
--- a/dev-java/saxon/ChangeLog
+++ b/dev-java/saxon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/saxon
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/saxon/ChangeLog,v 1.15 2006/02/09 02:34:00 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/saxon/ChangeLog,v 1.16 2006/07/02 19:37:47 nichoj Exp $
+
+  02 Jul 2006; Joshua Nichols <nichoj@gentoo.org> +saxon-6.5.2-r1.ebuild,
+  +saxon-8.4b-r1.ebuild:
+  Revision bumps to support new Java system.
 
   09 Feb 2006; Joshua Nichols <nichoj@gentoo.org> saxon-6.5.2.ebuild:
   Stable on x86.
diff --git a/dev-java/saxon/files/digest-saxon-6.5.2-r1 b/dev-java/saxon/files/digest-saxon-6.5.2-r1
new file mode 100644
index 000000000000..9e96224aca24
--- /dev/null
+++ b/dev-java/saxon/files/digest-saxon-6.5.2-r1
@@ -0,0 +1,3 @@
+MD5 6a822530943cc9ddff45ed4d77413d89 saxon6_5_2.zip 3088550
+RMD160 305ee63424bc3ef41482cf5f041b17088deb6bce saxon6_5_2.zip 3088550
+SHA256 194a933b48fde79d83609b69d06acd181c1432d437a65fbc267ed0172a15e956 saxon6_5_2.zip 3088550
diff --git a/dev-java/saxon/files/digest-saxon-8.4b b/dev-java/saxon/files/digest-saxon-8.4b
index fca13204aba8..0a0ed4b5b587 100644
--- a/dev-java/saxon/files/digest-saxon-8.4b
+++ b/dev-java/saxon/files/digest-saxon-8.4b
@@ -1 +1,3 @@
 MD5 3ca4ece454bcc7980693a76870a82a3f saxonb8-4.zip 7266831
+RMD160 9da35b8bdc632f1e758bdc101110ebe06b66f4f9 saxonb8-4.zip 7266831
+SHA256 c47f0f88c765d246a3e6666228db050fba5089bc8eff426d1b23ef807d1c7ff0 saxonb8-4.zip 7266831
diff --git a/dev-java/saxon/files/digest-saxon-8.4b-r1 b/dev-java/saxon/files/digest-saxon-8.4b-r1
new file mode 100644
index 000000000000..0a0ed4b5b587
--- /dev/null
+++ b/dev-java/saxon/files/digest-saxon-8.4b-r1
@@ -0,0 +1,3 @@
+MD5 3ca4ece454bcc7980693a76870a82a3f saxonb8-4.zip 7266831
+RMD160 9da35b8bdc632f1e758bdc101110ebe06b66f4f9 saxonb8-4.zip 7266831
+SHA256 c47f0f88c765d246a3e6666228db050fba5089bc8eff426d1b23ef807d1c7ff0 saxonb8-4.zip 7266831
diff --git a/dev-java/saxon/saxon-6.5.2-r1.ebuild b/dev-java/saxon/saxon-6.5.2-r1.ebuild
new file mode 100644
index 000000000000..71b3cc6e65ac
--- /dev/null
+++ b/dev-java/saxon/saxon-6.5.2-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/saxon/saxon-6.5.2-r1.ebuild,v 1.1 2006/07/02 19:37:47 nichoj Exp $
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="The SAXON package is a collection of tools for processing XML documents: XSLT processor, XSL library, parser."
+# TODO use versionator?
+SRC_URI="mirror://sourceforge/saxon/saxon${PV//./_}.zip"
+HOMEPAGE="http://saxon.sourceforge.net/"
+
+LICENSE="MPL-1.1"
+SLOT="6.5"
+KEYWORDS="~ppc ~x86"
+
+IUSE="doc source"
+
+COMMOND_DEP=">=dev-java/gnu-jaxp-1.3
+	dev-java/xom
+	~dev-java/jdom-1.0
+	dev-java/fop"
+RDEPEND=">=virtual/jre-1.3
+	${COMMON_DEP}"
+
+DEPEND="=virtual/jdk-1.4*
+	app-arch/unzip
+	dev-java/ant-core
+	source? ( app-arch/zip )
+	${COMMON_DEP}"
+
+S="${WORKDIR}"
+
+ant_src_unpack() {
+	unpack ${A}
+
+	unzip -qq source.zip -d src || die "failed to unpack"
+
+	# TODO update patch for 6.5.2
+	#epatch ${FILESDIR}/${P}-jikes.patch
+
+	cp ${FILESDIR}/build-${PV}.xml build.xml
+
+	rm  *.jar
+	mkdir lib && cd lib
+	java-pkg_jarfrom gnu-jaxp
+	java-pkg_jarfrom jdom-1.0
+	java-pkg_jarfrom xom
+	java-pkg_jarfrom fop
+}
+
+src_compile() {
+	java-pkg_filter-compiler jikes
+
+	eant jar -Dproject.name=${PN} $(use_doc)
+}
+
+src_install() {
+	java-pkg_dojar dist/*.jar
+
+	use doc && java-pkg_dohtml -r dist/doc/api doc/*
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/saxon/saxon-8.4b-r1.ebuild b/dev-java/saxon/saxon-8.4b-r1.ebuild
new file mode 100644
index 000000000000..737f580edef4
--- /dev/null
+++ b/dev-java/saxon/saxon-8.4b-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/saxon/saxon-8.4b-r1.ebuild,v 1.1 2006/07/02 19:37:47 nichoj Exp $
+
+inherit java-pkg-2 eutils java-ant-2
+
+DESCRIPTION="The SAXON package is a collection of tools for processing XML documents: XSLT processor, XSL library, parser."
+MyPV=${PV%b}
+SRC_URI="mirror://sourceforge/saxon/saxonb${MyPV/./-}.zip"
+HOMEPAGE="http://saxon.sourceforge.net/"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+IUSE="doc source"
+
+COMMON_DEP=">=dev-java/gnu-jaxp-1.3
+	dev-java/xom
+	~dev-java/jdom-1.0"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
+DEPEND="=virtual/jdk-1.4*
+	app-arch/unzip
+	dev-java/ant-core
+	source? ( app-arch/zip )
+	${COMMON_DEP}"
+
+S=${WORKDIR}
+
+ant_src_unpack() {
+	unpack ${A}
+
+	unzip -q source.zip || die "failed to unpack"
+	mkdir src
+	mv net src
+
+	epatch ${FILESDIR}/${P}-jikes.patch
+
+	cp ${FILESDIR}/build-${PV}.xml build.xml
+
+	rm  *.jar
+	mkdir lib && cd lib
+	java-pkg_jarfrom gnu-jaxp
+	java-pkg_jarfrom jdom-1.0
+	java-pkg_jarfrom xom
+}
+
+src_compile() {
+	eant jar $(use_doc)
+}
+
+src_install() {
+	java-pkg_dojar dist/*.jar
+
+	use doc && java-pkg_dohtml -r dist/doc/api doc/*
+	use source && java-pkg_dosrc src/*
+}