Revision bumps to support new Java system.

(Portage version: 2.1.1_pre2-r4)

7 files changed, 139 insertions, 2 deletions

diff --git a/dev-java/commons-betwixt/ChangeLog b/dev-java/commons-betwixt/ChangeLog
index 2a66caf98b42..6487f00d5be8 100644
--- a/dev-java/commons-betwixt/ChangeLog
+++ b/dev-java/commons-betwixt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/commons-betwixt
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-betwixt/ChangeLog,v 1.5 2005/12/15 05:20:14 nichoj Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-betwixt/ChangeLog,v 1.6 2006/07/13 21:59:14 nichoj Exp $
+
+*commons-betwixt-0.7-r1 (13 Jul 2006)
+*commons-betwixt-0.6-r2 (13 Jul 2006)
+
+  13 Jul 2006; Joshua Nichols <jnichols@gentoo.org>
+  +commons-betwixt-0.6-r2.ebuild, +commons-betwixt-0.7-r1.ebuild:
+  Revision bumps to support new Java system.
 
 *commons-betwixt-0.7 (15 Dec 2005)
 
diff --git a/dev-java/commons-betwixt/commons-betwixt-0.6-r2.ebuild b/dev-java/commons-betwixt/commons-betwixt-0.6-r2.ebuild
new file mode 100644
index 000000000000..677231b3b134
--- /dev/null
+++ b/dev-java/commons-betwixt/commons-betwixt-0.6-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-betwixt/commons-betwixt-0.6-r2.ebuild,v 1.1 2006/07/13 21:59:14 nichoj Exp $
+
+inherit java-pkg-2 eutils java-ant-2
+
+DESCRIPTION="Introspective Bean to XML mapper"
+HOMEPAGE="http://jakarta.apache.org/commons/betwixt/"
+SRC_URI="mirror://apache/jakarta/commons/betwixt/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc"
+IUSE="doc source"
+
+COMMON_DEP="
+	>=dev-java/commons-logging-1.0.2
+	=dev-java/commons-beanutils-1.7*
+	>=dev-java/commons-digester-1.6"
+RDEPEND=">=virtual/jre-1.3
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.3
+	${COMMON_DEP}
+	dev-java/ant-core
+	source? ( app-arch/zip )"
+
+S="${WORKDIR}/${P}-src/"
+
+ant_src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-noget.patch
+
+	mkdir -p ${S}/target/lib && cd ${S}/target/lib
+	java-pkg_jar-from commons-beanutils-1.7
+	java-pkg_jar-from commons-digester
+	java-pkg_jar-from commons-logging
+}
+
+src_compile() {
+	eant init jar $(use_doc)
+}
+
+src_install() {
+	java-pkg_newjar target/${PN}*.jar ${PN}.jar
+
+	dodoc RELEASE-NOTES.txt
+	if use doc; then
+		java-pkg_dohtml PROPOSAL.html STATUS.html userguide.html
+		java-pkg_dohtml -r dist/docs/
+	fi
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/commons-betwixt/commons-betwixt-0.7-r1.ebuild b/dev-java/commons-betwixt/commons-betwixt-0.7-r1.ebuild
new file mode 100644
index 000000000000..d0282be62070
--- /dev/null
+++ b/dev-java/commons-betwixt/commons-betwixt-0.7-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/commons-betwixt/commons-betwixt-0.7-r1.ebuild,v 1.1 2006/07/13 21:59:14 nichoj Exp $
+
+inherit java-pkg-2 eutils java-ant-2
+
+DESCRIPTION="Introspective Bean to XML mapper"
+HOMEPAGE="http://jakarta.apache.org/commons/betwixt/"
+SRC_URI="mirror://apache/jakarta/commons/betwixt/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0.7"
+KEYWORDS="~amd64 ~x86 ~ppc"
+IUSE="doc test source"
+
+COMMON_DEP="
+	>=dev-java/commons-logging-1.0.2
+	=dev-java/commons-beanutils-1.7*
+	>=dev-java/commons-digester-1.6"
+RDEPEND=">=virtual/jre-1.3
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.3
+	${COMMON_DEP}
+	dev-java/ant-core
+	test? ( dev-java/ant-tasks >=dev-java/xerces-2.6 )
+	source? ( app-arch/zip )"
+
+S="${WORKDIR}/${P}-src/"
+
+ant_src_unpack() {
+	unpack ${A}
+
+	epatch ${FILESDIR}/${P}-notests.patch
+
+	cd ${S}
+	mkdir -p ${S}/target/lib && cd ${S}/target/lib
+	java-pkg_jar-from commons-beanutils-1.7
+	java-pkg_jar-from commons-digester
+	java-pkg_jar-from commons-logging
+	use test && java-pkg_jar-from xerces-2
+}
+
+src_compile() {
+	eant init jar $(use_doc) -Dnoget=true -Dnotest=true
+}
+
+src_install() {
+	java-pkg_newjar target/${PN}*.jar ${PN}.jar
+
+	dodoc RELEASE-NOTES.txt README.txt
+	if use doc; then
+		java-pkg_dohtml PROPOSAL.html STATUS.html userguide.html
+		java-pkg_dohtml -r dist/docs/
+	fi
+	use source && java-pkg_dosrc src/java/*
+}
+
+src_test() {
+	if ! use test; then
+		ewarn "You must USE=test in order to get the dependencies needed"
+		ewarn "to run tests"
+		ewarn "Skipping the tests"
+	else
+		eant test -Dnoget=true
+	fi
+}
diff --git a/dev-java/commons-betwixt/files/digest-commons-betwixt-0.6-r1 b/dev-java/commons-betwixt/files/digest-commons-betwixt-0.6-r1
index 9a1a8b4a6315..6d8e41438696 100644
--- a/dev-java/commons-betwixt/files/digest-commons-betwixt-0.6-r1
+++ b/dev-java/commons-betwixt/files/digest-commons-betwixt-0.6-r1
@@ -1 +1,3 @@
 MD5 04889f2408c93998dbea1631b60ffa97 commons-betwixt-0.6-src.tar.gz 292694
+RMD160 260a8b4e0eb2e0c2ebec2b02a4ea45e295eba55f commons-betwixt-0.6-src.tar.gz 292694
+SHA256 528fe562148ad6956f2dbd6a21f9b6011184765fe0b0f569dec591e30e5e4e4d commons-betwixt-0.6-src.tar.gz 292694
diff --git a/dev-java/commons-betwixt/files/digest-commons-betwixt-0.6-r2 b/dev-java/commons-betwixt/files/digest-commons-betwixt-0.6-r2
new file mode 100644
index 000000000000..6d8e41438696
--- /dev/null
+++ b/dev-java/commons-betwixt/files/digest-commons-betwixt-0.6-r2
@@ -0,0 +1,3 @@
+MD5 04889f2408c93998dbea1631b60ffa97 commons-betwixt-0.6-src.tar.gz 292694
+RMD160 260a8b4e0eb2e0c2ebec2b02a4ea45e295eba55f commons-betwixt-0.6-src.tar.gz 292694
+SHA256 528fe562148ad6956f2dbd6a21f9b6011184765fe0b0f569dec591e30e5e4e4d commons-betwixt-0.6-src.tar.gz 292694
diff --git a/dev-java/commons-betwixt/files/digest-commons-betwixt-0.7 b/dev-java/commons-betwixt/files/digest-commons-betwixt-0.7
index c634f7d48822..861939cd0330 100644
--- a/dev-java/commons-betwixt/files/digest-commons-betwixt-0.7
+++ b/dev-java/commons-betwixt/files/digest-commons-betwixt-0.7
@@ -1 +1,3 @@
 MD5 fcaa0e85a10f395128093095e778a3f2 commons-betwixt-0.7-src.tar.gz 278140
+RMD160 f101052ed9851ab5284751ed76d8f2cc7f929185 commons-betwixt-0.7-src.tar.gz 278140
+SHA256 6b1adcfb0f573fe29b2440e87733ef176c07c0193f3f69587481772b3af148e4 commons-betwixt-0.7-src.tar.gz 278140
diff --git a/dev-java/commons-betwixt/files/digest-commons-betwixt-0.7-r1 b/dev-java/commons-betwixt/files/digest-commons-betwixt-0.7-r1
new file mode 100644
index 000000000000..861939cd0330
--- /dev/null
+++ b/dev-java/commons-betwixt/files/digest-commons-betwixt-0.7-r1
@@ -0,0 +1,3 @@
+MD5 fcaa0e85a10f395128093095e778a3f2 commons-betwixt-0.7-src.tar.gz 278140
+RMD160 f101052ed9851ab5284751ed76d8f2cc7f929185 commons-betwixt-0.7-src.tar.gz 278140
+SHA256 6b1adcfb0f573fe29b2440e87733ef176c07c0193f3f69587481772b3af148e4 commons-betwixt-0.7-src.tar.gz 278140