Revision bumps to support new Java system.

Package-Manager: portage-2.1.1_pre1

7 files changed, 168 insertions, 23 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/Manifest b/dev-java/saxon/Manifest
index e71e6aec7039..58beaa4e8676 100644
--- a/dev-java/saxon/Manifest
+++ b/dev-java/saxon/Manifest
@@ -1,37 +1,50 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 e39fe79e90eef54fcf2e2f114e83dc67 ChangeLog 1096
-RMD160 965a16c691d8260746ffd85f007c55bd0b45cf80 ChangeLog 1096
-SHA256 e5f2240610ec7cf54185601a8aab6c0b02d252dc7c1410e82c9c6d0e7dc698d3 ChangeLog 1096
+AUX build-6.5.2.xml 2394 RMD160 2540b4adff11c56d915cf563680caf23c656a583 SHA1 5e0fc0a0fe2c861dd7ac09543eb021e9c09fc558 SHA256 bc80a97b80b35e6105ab21b9894376efc0cf070f18532c193adb7f96591ececc
 MD5 d202789d6c409cdf9b7ff6598a412e6c files/build-6.5.2.xml 2394
 RMD160 2540b4adff11c56d915cf563680caf23c656a583 files/build-6.5.2.xml 2394
 SHA256 bc80a97b80b35e6105ab21b9894376efc0cf070f18532c193adb7f96591ececc files/build-6.5.2.xml 2394
+AUX build-8.4b.xml 4120 RMD160 9c54d11d4b6823856eea270112a3e55db7b0fc54 SHA1 5fec6438791922c41f034b1935a3a135c9051d68 SHA256 9b7e93133f66767a4dad3acc3cea45ba737aaf6ab1c01f7a5d1ed09b00c67910
 MD5 e858aa507902d409b110be423e735339 files/build-8.4b.xml 4120
 RMD160 9c54d11d4b6823856eea270112a3e55db7b0fc54 files/build-8.4b.xml 4120
 SHA256 9b7e93133f66767a4dad3acc3cea45ba737aaf6ab1c01f7a5d1ed09b00c67910 files/build-8.4b.xml 4120
-MD5 7f0f450984dbe5ec8405c18fbc85a242 files/digest-saxon-6.5.2 226
-RMD160 66795963592b18e282aeaf6810d3f1bc05288d3a files/digest-saxon-6.5.2 226
-SHA256 48d6647d73d446e2f7996c80c1d5b3b2929fa9533d9784d3c2ed67c2aa5a7daf files/digest-saxon-6.5.2 226
-MD5 10dc7b59a9361c2d721acb87e6882516 files/digest-saxon-8.4b 59
-RMD160 0d67fc053551ef76177c9ec2e8c853a6988255da files/digest-saxon-8.4b 59
-SHA256 eb0f024f11c80ab46c64d1b2643ff34490908819aaab69364fec8385b24e4a36 files/digest-saxon-8.4b 59
+AUX saxon-8.4b-jikes.patch 795 RMD160 8812654ba27cc693fd3182fea686d4b22115ed2d SHA1 b1b16a03f49ef4931d50c60a3210faf4aa3d4b4f SHA256 ae63fd5548fc4ceaa5bf34b8f5ad3602c6c272479fbc0903a1fb4a8000b374dd
 MD5 7bc2c04efaafba15df5fa9c221a00a29 files/saxon-8.4b-jikes.patch 795
 RMD160 8812654ba27cc693fd3182fea686d4b22115ed2d files/saxon-8.4b-jikes.patch 795
 SHA256 ae63fd5548fc4ceaa5bf34b8f5ad3602c6c272479fbc0903a1fb4a8000b374dd files/saxon-8.4b-jikes.patch 795
-MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
-SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata.xml 157
+DIST saxon6_5_2.zip 3088550 RMD160 305ee63424bc3ef41482cf5f041b17088deb6bce SHA1 49ee6facfcf186dec246ca514fc782469bc40cf3 SHA256 194a933b48fde79d83609b69d06acd181c1432d437a65fbc267ed0172a15e956
+DIST saxonb8-4.zip 7266831 RMD160 9da35b8bdc632f1e758bdc101110ebe06b66f4f9 SHA1 a2a411f91bcfd054bfc7dfe4a59f20e4edb4fda7 SHA256 c47f0f88c765d246a3e6666228db050fba5089bc8eff426d1b23ef807d1c7ff0
+EBUILD saxon-6.5.2-r1.ebuild 1385 RMD160 67c9cf60e622c22f5f264433429ead5ab44b0fc6 SHA1 2dc65db97eaa3c6957166615d799c55143c22cc9 SHA256 fb138ab4ba8bba8c70b9aedb9babfdf1fdff4fdf32066d43d9c348e630f68f36
+MD5 ffe8791d2e3e7b335aa35f3f2a413485 saxon-6.5.2-r1.ebuild 1385
+RMD160 67c9cf60e622c22f5f264433429ead5ab44b0fc6 saxon-6.5.2-r1.ebuild 1385
+SHA256 fb138ab4ba8bba8c70b9aedb9babfdf1fdff4fdf32066d43d9c348e630f68f36 saxon-6.5.2-r1.ebuild 1385
+EBUILD saxon-6.5.2.ebuild 1333 RMD160 a514b2e38dfd125b55229d4bc9212bdb24e0f1f5 SHA1 15c50d79c0f9554a7ad3df57e41064a7b7e6fc1d SHA256 3d6e75f19600c797715b596fab3d0b8b0ea2f6e86a5e36e980b381e9aac1eb55
 MD5 da5ae620009fc2f1b1e8ca9fee8501a8 saxon-6.5.2.ebuild 1333
 RMD160 a514b2e38dfd125b55229d4bc9212bdb24e0f1f5 saxon-6.5.2.ebuild 1333
 SHA256 3d6e75f19600c797715b596fab3d0b8b0ea2f6e86a5e36e980b381e9aac1eb55 saxon-6.5.2.ebuild 1333
+EBUILD saxon-8.4b-r1.ebuild 1262 RMD160 c541c1f79739aa66c286fff435f92a50a8685934 SHA1 d737127d4a2f243840831fd99d8fa6f9fbc8bb0d SHA256 4af844c3d28395542e63e21435687f7c03bf1d62be68920170396003a573c99f
+MD5 d3426b70324e7ae289b2886a9d5ac1ec saxon-8.4b-r1.ebuild 1262
+RMD160 c541c1f79739aa66c286fff435f92a50a8685934 saxon-8.4b-r1.ebuild 1262
+SHA256 4af844c3d28395542e63e21435687f7c03bf1d62be68920170396003a573c99f saxon-8.4b-r1.ebuild 1262
+EBUILD saxon-8.4b.ebuild 1402 RMD160 62d92525b5df18efdaf9cfb7b3fc9a22e54ce023 SHA1 79f7127e6afa2dc7243bfc24137591d175419ff2 SHA256 02a50bf4396812e275fd5a2aa6ea2aa943d91b5bce66f41773a4bc507d3c7e54
 MD5 d0897bcc3230f7d5f2251f84423dc2f2 saxon-8.4b.ebuild 1402
 RMD160 62d92525b5df18efdaf9cfb7b3fc9a22e54ce023 saxon-8.4b.ebuild 1402
 SHA256 02a50bf4396812e275fd5a2aa6ea2aa943d91b5bce66f41773a4bc507d3c7e54 saxon-8.4b.ebuild 1402
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD6qonndWRXhKOboURAqxpAKDSlpLP5VDsUy+M/uoZDmlFUsR+WwCguWXY
-weScN1ipffGSMkjoRENeTzc=
-=5a5p
------END PGP SIGNATURE-----
+MISC ChangeLog 1241 RMD160 f195febc86a6a324d83a9066cee1f66eb9bf1059 SHA1 a8435ece7071fbbabcad1252565b06fa94e719e3 SHA256 1d78465dea7280c14c6997787ea28d512821e5e232a3b1c0d1649508de8507a7
+MD5 eaae8bedefc8f84e3c145a77c9ae5dcd ChangeLog 1241
+RMD160 f195febc86a6a324d83a9066cee1f66eb9bf1059 ChangeLog 1241
+SHA256 1d78465dea7280c14c6997787ea28d512821e5e232a3b1c0d1649508de8507a7 ChangeLog 1241
+MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
+MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
+SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata.xml 157
+MD5 7f0f450984dbe5ec8405c18fbc85a242 files/digest-saxon-6.5.2 226
+RMD160 66795963592b18e282aeaf6810d3f1bc05288d3a files/digest-saxon-6.5.2 226
+SHA256 48d6647d73d446e2f7996c80c1d5b3b2929fa9533d9784d3c2ed67c2aa5a7daf files/digest-saxon-6.5.2 226
+MD5 7f0f450984dbe5ec8405c18fbc85a242 files/digest-saxon-6.5.2-r1 226
+RMD160 66795963592b18e282aeaf6810d3f1bc05288d3a files/digest-saxon-6.5.2-r1 226
+SHA256 48d6647d73d446e2f7996c80c1d5b3b2929fa9533d9784d3c2ed67c2aa5a7daf files/digest-saxon-6.5.2-r1 226
+MD5 0249583313057b14bce360f34ddb31f6 files/digest-saxon-8.4b 223
+RMD160 f8dc83e6238296315d8f9f5ae96aaa6ae21dfca7 files/digest-saxon-8.4b 223
+SHA256 0e7c55d12f005735bc8294c07c6388403ac5e3fa0736695cd96e34a2cfdfcd94 files/digest-saxon-8.4b 223
+MD5 0249583313057b14bce360f34ddb31f6 files/digest-saxon-8.4b-r1 223
+RMD160 f8dc83e6238296315d8f9f5ae96aaa6ae21dfca7 files/digest-saxon-8.4b-r1 223
+SHA256 0e7c55d12f005735bc8294c07c6388403ac5e3fa0736695cd96e34a2cfdfcd94 files/digest-saxon-8.4b-r1 223
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/*
+}