Revision bump to support new Java system.

Package-Manager: portage-2.1.1_pre1

6 files changed, 115 insertions, 16 deletions

diff --git a/dev-java/jaxen/ChangeLog b/dev-java/jaxen/ChangeLog
index 573096f766ed..69ed8b4fed9d 100644
--- a/dev-java/jaxen/ChangeLog
+++ b/dev-java/jaxen/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jaxen
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/ChangeLog,v 1.21 2006/03/11 20:06:09 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/ChangeLog,v 1.22 2006/07/04 18:40:50 nichoj Exp $
+
+*jaxen-1.1_beta7-r1 (04 Jul 2006)
+
+  04 Jul 2006; Joshua Nichols <nichoj@gentoo.org>
+  +jaxen-1.1_beta7-r1.ebuild:
+  Revision bump to support new Java system.
 
   11 Mar 2006; Michael Hanselmann <hansmi@gentoo.org>
   jaxen-1.1_beta2-r1.ebuild:
diff --git a/dev-java/jaxen/Manifest b/dev-java/jaxen/Manifest
index 34d0e5c0efea..f9e4e6c6d4a7 100644
--- a/dev-java/jaxen/Manifest
+++ b/dev-java/jaxen/Manifest
@@ -1,39 +1,59 @@
-MD5 e093027d109e79017bbf31d38932d5a3 ChangeLog 3015
-RMD160 cb59530b218a5bfbff728646b4849faf52556ff1 ChangeLog 3015
-SHA256 d52014117fa3dcdff0539fc3d3e41b779fb6a084b901d17315ccd95371d08b46 ChangeLog 3015
+AUX MANIFEST.MF 307 RMD160 5ea86bacf9c7970517fec106b82e6bf8636f7d85 SHA1 eb1790b6969977bc2625263b599532d78924efe8 SHA256 ce3b32e0966eb674c18fee3ed17d7567fc3e25c619af2c72612a0b728f20ddce
 MD5 18b53511f075c771c0b69c5bc0b65dba files/MANIFEST.MF 307
 RMD160 5ea86bacf9c7970517fec106b82e6bf8636f7d85 files/MANIFEST.MF 307
 SHA256 ce3b32e0966eb674c18fee3ed17d7567fc3e25c619af2c72612a0b728f20ddce files/MANIFEST.MF 307
+AUX build.xml.patch 1018 RMD160 f4bcfa42a1faba71d480263531f200b32f9001da SHA1 5a4cf1dc3be5ce674b6e7be5615fe52981455abf SHA256 9b77f759eb25ae6e8613c106d1cfb1306f1ea4ea30687d91f3e221e377937208
 MD5 316a481f610ecae9085418b487d1fe1b files/build.xml.patch 1018
 RMD160 f4bcfa42a1faba71d480263531f200b32f9001da files/build.xml.patch 1018
 SHA256 9b77f759eb25ae6e8613c106d1cfb1306f1ea4ea30687d91f3e221e377937208 files/build.xml.patch 1018
-MD5 16edfe03c1dcf95c79b4b815c1b273da files/digest-jaxen-1.0 66
-RMD160 d70fa41e84554da4189400c21724699c8f32bfd9 files/digest-jaxen-1.0 66
-SHA256 968595d9270c46fe7db00650f578e9e34bec1a66d67b68d74bfd85e2c9f0ffd3 files/digest-jaxen-1.0 66
-MD5 7155bee4486dae1d29f03ce768a5a36e files/digest-jaxen-1.1_beta2-r1 72
-RMD160 d1a5f2f1a56f7e84c22bec2d4b84d680ef1f78a6 files/digest-jaxen-1.1_beta2-r1 72
-SHA256 7dfd0ad3cdb89340711e7daa354eafed3a6e5054798645ba498560444bd6cda8 files/digest-jaxen-1.1_beta2-r1 72
-MD5 a6ab57e343fb58a0af99d74124df491d files/digest-jaxen-1.1_beta6 72
-RMD160 159e14619fcd1b3046f8f45f5b0fd2105b9a1075 files/digest-jaxen-1.1_beta6 72
-SHA256 5191f2b0724275382cc02c601cd436ea2d7cb83c0015b6c7457007456d795a12 files/digest-jaxen-1.1_beta6 72
-MD5 a1e39698b13f5388ba47d580378df4b6 files/digest-jaxen-1.1_beta7 72
-RMD160 d03ffc08397a4969e03449697c175cc7bcb321f8 files/digest-jaxen-1.1_beta7 72
-SHA256 0966e9a01d92f5957eb6b3367d50f82fdb75856cf7ae2179d0c7dbcd4e205ccf files/digest-jaxen-1.1_beta7 72
+AUX jaxen-1.1_beta2-gentoo.diff 1254 RMD160 cdf9573e0e767ed85705499df3d0a3f658bb2ff3 SHA1 c9a69a11b49b6800710073fcbe41035f447609b2 SHA256 0c97dd1c0a1605479882f5327f165aa5f939e32fe313d1b6691527b2f1683a25
 MD5 917b383454a8f38fb290d4a69ddb47ca files/jaxen-1.1_beta2-gentoo.diff 1254
 RMD160 cdf9573e0e767ed85705499df3d0a3f658bb2ff3 files/jaxen-1.1_beta2-gentoo.diff 1254
 SHA256 0c97dd1c0a1605479882f5327f165aa5f939e32fe313d1b6691527b2f1683a25 files/jaxen-1.1_beta2-gentoo.diff 1254
+DIST jaxen-1.0-FCS.tar.gz 3195819 RMD160 896f838c383b6a5d60c4c2fa1271a735992aaa4e SHA1 be658764988717d79b70ccafdd7955ccfba8a25f SHA256 ceb6997465e9de4efe6b4e8f0c421c12bd115b764f9633b9c8b80b95e3b76377
+DIST jaxen-1.1-beta-2-src.tar.gz 697184
+DIST jaxen-1.1-beta-6-src.tar.gz 243584
+DIST jaxen-1.1-beta-7-src.tar.gz 274435 RMD160 269b2503d0ea243e578b49ec64ae1b73e004ea60 SHA1 94aee495276c935d74b1b3d28142cd86b5f43e61 SHA256 df6ea55b4dc0ce009c6465e52cd762ba3fdc7a36d861ed78a86ea2db0386e3b5
+EBUILD jaxen-1.0.ebuild 1402 RMD160 cf89c061b0a73e3e7ec22b52a8f88ff3b2193304 SHA1 7b6f81c8a7b9bc2d969ae25b41c7b2db44242e36 SHA256 c34ca7368df7356e1f64e533d9cf5dd8cb082a98bcc7b892f827684a3c6dc6fa
 MD5 9a071b0e08942ac6d1ef8de29b2b9269 jaxen-1.0.ebuild 1402
 RMD160 cf89c061b0a73e3e7ec22b52a8f88ff3b2193304 jaxen-1.0.ebuild 1402
 SHA256 c34ca7368df7356e1f64e533d9cf5dd8cb082a98bcc7b892f827684a3c6dc6fa jaxen-1.0.ebuild 1402
+EBUILD jaxen-1.1_beta2-r1.ebuild 1374 RMD160 ef8935e8d8d19c35ff2cabb866a381caeb6fc12e SHA1 eb8c571b0970494f0b788d75a27d6146a8ba3931 SHA256 ebc92d9dd7ec29f38a2639a215e21eed9ccd2599f25c4ff126419fca408280aa
 MD5 db4546e860d4683f8a2725adad4e31cd jaxen-1.1_beta2-r1.ebuild 1374
 RMD160 ef8935e8d8d19c35ff2cabb866a381caeb6fc12e jaxen-1.1_beta2-r1.ebuild 1374
 SHA256 ebc92d9dd7ec29f38a2639a215e21eed9ccd2599f25c4ff126419fca408280aa jaxen-1.1_beta2-r1.ebuild 1374
+EBUILD jaxen-1.1_beta6.ebuild 1388 RMD160 f33653324f7e3f7d8513bbde3b43ba48940e29d1 SHA1 1a567215c1f8c4a725d8dc3b8d075c462e34f2b6 SHA256 80a0d7764bc2c23a59563850810db07a9b25b4dc8086c102dea8273d2301a082
 MD5 eecfe9dc7752506178a29f3bc6b9a0be jaxen-1.1_beta6.ebuild 1388
 RMD160 f33653324f7e3f7d8513bbde3b43ba48940e29d1 jaxen-1.1_beta6.ebuild 1388
 SHA256 80a0d7764bc2c23a59563850810db07a9b25b4dc8086c102dea8273d2301a082 jaxen-1.1_beta6.ebuild 1388
+EBUILD jaxen-1.1_beta7-r1.ebuild 1513 RMD160 639db22c4bb27e677c885f3b72ae12883bac26cc SHA1 2366dbb517e5e8cf15488c2ecf58302ff2579992 SHA256 c1ebb33b91ba3fb3224cd56ed9e921d2bf43c96f35b6ff558302a7afbd5647dd
+MD5 4051b89193cfcef07c7ecd456bf91fed jaxen-1.1_beta7-r1.ebuild 1513
+RMD160 639db22c4bb27e677c885f3b72ae12883bac26cc jaxen-1.1_beta7-r1.ebuild 1513
+SHA256 c1ebb33b91ba3fb3224cd56ed9e921d2bf43c96f35b6ff558302a7afbd5647dd jaxen-1.1_beta7-r1.ebuild 1513
+EBUILD jaxen-1.1_beta7.ebuild 1664 RMD160 22f08b16355e7026fd4be41ff6881070af2d74d5 SHA1 1f1973d9b1739b7933d011ecdf58615e8f8564a2 SHA256 32c2517f9fc9afe00c32e591c1397ef81a14d2c19a0812439f022f7db2fcaa26
 MD5 adfaa75a24f8a22c45b93020fcbd92f9 jaxen-1.1_beta7.ebuild 1664
 RMD160 22f08b16355e7026fd4be41ff6881070af2d74d5 jaxen-1.1_beta7.ebuild 1664
 SHA256 32c2517f9fc9afe00c32e591c1397ef81a14d2c19a0812439f022f7db2fcaa26 jaxen-1.1_beta7.ebuild 1664
+MISC ChangeLog 3175 RMD160 04962223f5c98b7534a0c106c438d5dcbf4bae1f SHA1 f463f0f95c145771aa5636b530fae81c6c9169e7 SHA256 debcb8eb211efed6817f1840636f34bfaf3a8e778b3e893e7644fcda19488823
+MD5 175f76447c850afce66ba76991555bc4 ChangeLog 3175
+RMD160 04962223f5c98b7534a0c106c438d5dcbf4bae1f ChangeLog 3175
+SHA256 debcb8eb211efed6817f1840636f34bfaf3a8e778b3e893e7644fcda19488823 ChangeLog 3175
+MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb metadata.xml 158
+MD5 784c991595b0627aba6f093e232e6afe files/digest-jaxen-1.0 244
+RMD160 b0af8dd47351eb1dfac2acfe8770036c4f9355c4 files/digest-jaxen-1.0 244
+SHA256 795494b6d600e313c902d66354a0c912edf141aad66bc1ea1cd1b79226d8dc2c files/digest-jaxen-1.0 244
+MD5 7155bee4486dae1d29f03ce768a5a36e files/digest-jaxen-1.1_beta2-r1 72
+RMD160 d1a5f2f1a56f7e84c22bec2d4b84d680ef1f78a6 files/digest-jaxen-1.1_beta2-r1 72
+SHA256 7dfd0ad3cdb89340711e7daa354eafed3a6e5054798645ba498560444bd6cda8 files/digest-jaxen-1.1_beta2-r1 72
+MD5 a6ab57e343fb58a0af99d74124df491d files/digest-jaxen-1.1_beta6 72
+RMD160 159e14619fcd1b3046f8f45f5b0fd2105b9a1075 files/digest-jaxen-1.1_beta6 72
+SHA256 5191f2b0724275382cc02c601cd436ea2d7cb83c0015b6c7457007456d795a12 files/digest-jaxen-1.1_beta6 72
+MD5 d2a450356a590d9faf42b0dc513039b6 files/digest-jaxen-1.1_beta7 262
+RMD160 9de7cd1a94ff911c0f08329daa54c34b2db6f706 files/digest-jaxen-1.1_beta7 262
+SHA256 da127b213944d1a75ee7891c77879bd4f46e3acbb71173aa50c0bdc5defb9420 files/digest-jaxen-1.1_beta7 262
+MD5 d2a450356a590d9faf42b0dc513039b6 files/digest-jaxen-1.1_beta7-r1 262
+RMD160 9de7cd1a94ff911c0f08329daa54c34b2db6f706 files/digest-jaxen-1.1_beta7-r1 262
+SHA256 da127b213944d1a75ee7891c77879bd4f46e3acbb71173aa50c0bdc5defb9420 files/digest-jaxen-1.1_beta7-r1 262
diff --git a/dev-java/jaxen/files/digest-jaxen-1.0 b/dev-java/jaxen/files/digest-jaxen-1.0
index e9236c60c789..8346ef88bf96 100644
--- a/dev-java/jaxen/files/digest-jaxen-1.0
+++ b/dev-java/jaxen/files/digest-jaxen-1.0
@@ -1 +1,3 @@
 MD5 c0baf972b669579aff40ca7fdb9a90d0 jaxen-1.0-FCS.tar.gz 3195819
+RMD160 896f838c383b6a5d60c4c2fa1271a735992aaa4e jaxen-1.0-FCS.tar.gz 3195819
+SHA256 ceb6997465e9de4efe6b4e8f0c421c12bd115b764f9633b9c8b80b95e3b76377 jaxen-1.0-FCS.tar.gz 3195819
diff --git a/dev-java/jaxen/files/digest-jaxen-1.1_beta7 b/dev-java/jaxen/files/digest-jaxen-1.1_beta7
index ff16a613fd29..a562287121e5 100644
--- a/dev-java/jaxen/files/digest-jaxen-1.1_beta7
+++ b/dev-java/jaxen/files/digest-jaxen-1.1_beta7
@@ -1 +1,3 @@
 MD5 2e90bb426e52984f4dc942427015a757 jaxen-1.1-beta-7-src.tar.gz 274435
+RMD160 269b2503d0ea243e578b49ec64ae1b73e004ea60 jaxen-1.1-beta-7-src.tar.gz 274435
+SHA256 df6ea55b4dc0ce009c6465e52cd762ba3fdc7a36d861ed78a86ea2db0386e3b5 jaxen-1.1-beta-7-src.tar.gz 274435
diff --git a/dev-java/jaxen/files/digest-jaxen-1.1_beta7-r1 b/dev-java/jaxen/files/digest-jaxen-1.1_beta7-r1
new file mode 100644
index 000000000000..a562287121e5
--- /dev/null
+++ b/dev-java/jaxen/files/digest-jaxen-1.1_beta7-r1
@@ -0,0 +1,3 @@
+MD5 2e90bb426e52984f4dc942427015a757 jaxen-1.1-beta-7-src.tar.gz 274435
+RMD160 269b2503d0ea243e578b49ec64ae1b73e004ea60 jaxen-1.1-beta-7-src.tar.gz 274435
+SHA256 df6ea55b4dc0ce009c6465e52cd762ba3fdc7a36d861ed78a86ea2db0386e3b5 jaxen-1.1-beta-7-src.tar.gz 274435
diff --git a/dev-java/jaxen/jaxen-1.1_beta7-r1.ebuild b/dev-java/jaxen/jaxen-1.1_beta7-r1.ebuild
new file mode 100644
index 000000000000..dc4de8a1c759
--- /dev/null
+++ b/dev-java/jaxen/jaxen-1.1_beta7-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/jaxen-1.1_beta7-r1.ebuild,v 1.1 2006/07/04 18:40:50 nichoj Exp $
+
+inherit java-pkg-2 eutils java-ant-2
+
+MY_P=${P/_beta/-beta-}
+DESCRIPTION="A Java XPath Engine"
+HOMEPAGE="http://jaxen.org/"
+SRC_URI="http://dist.codehaus.org/${PN}/distributions/${MY_P}-src.tar.gz"
+
+LICENSE="jaxen"
+SLOT="1.1"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="doc source test"
+
+RDEPEND="|| ( =virtual/jre-1.3* =virtual/jre-1.4* )
+	~dev-java/jdom-1.0
+	=dev-java/dom4j-1*
+	>=dev-java/xerces-2.6
+	dev-java/xom"
+
+DEPEND="|| ( =virtual/jdk-1.3* =virtual/jdk-1.4* )
+	dev-java/ant-core
+	test? ( dev-java/ant-tasks )
+	source? ( app-arch/zip )
+	${RDEPEND}"
+
+
+S=${WORKDIR}/${MY_P}
+
+ant_src_unpack() {
+	unpack ${A}
+
+	mkdir -p ${S}/target/lib
+	cd ${S}/target/lib
+	java-pkg_jar-from xerces-2
+	java-pkg_jar-from dom4j-1
+	java-pkg_jar-from jdom-1.0
+	java-pkg_jar-from xom
+
+	cd ${S}
+	# Make tests non-compuslatory
+	sed -i 's/depends="compile,test"/depends="compile"/' build.xml
+}
+
+src_compile() {
+	eant jar -Dnoget=1 $(use_doc)
+}
+
+src_install() {
+	java-pkg_newjar target/${MY_P}-SNAPSHOT.jar ${PN}.jar
+
+	use doc && java-pkg_dohtml -r dist/docs/*
+	use source && java-pkg_dosrc src/java/main/*
+}
+
+src_test() {
+	if ! use test; then
+		ewarn "You must be using the 'test' USE flag in order to"
+		ewarn "get the dependencies to run tests."
+		ewarn "Skipping tests..."
+	else
+		eant test -Dnoget=true
+	fi
+}