Migrated to Generation 2.

Package-Manager: portage-2.1.1_pre3-r3

78 files changed, 1261 insertions, 36 deletions

diff --git a/dev-java/commons-codec/ChangeLog b/dev-java/commons-codec/ChangeLog
index ed367a8a7a2a..dc904dc2aa0b 100644
--- a/dev-java/commons-codec/ChangeLog
+++ b/dev-java/commons-codec/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/commons-codec
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-codec/ChangeLog,v 1.17 2005/07/10 13:07:12 axxo Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-codec/ChangeLog,v 1.18 2006/07/22 22:29:27 nelchael Exp $
+
+*commons-codec-1.3-r1 (22 Jul 2006)
+
+  22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +commons-codec-1.3-r1.ebuild:
+  Migrated to Generation 2.
 
   10 Jul 2005; Thomas Matthijs <axxo@gentoo.org> commons-codec-1.3.ebuild:
   fix deps, cleanup
diff --git a/dev-java/commons-codec/commons-codec-1.3-r1.ebuild b/dev-java/commons-codec/commons-codec-1.3-r1.ebuild
new file mode 100644
index 000000000000..314a888ceb08
--- /dev/null
+++ b/dev-java/commons-codec/commons-codec-1.3-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-codec/commons-codec-1.3-r1.ebuild,v 1.1 2006/07/22 22:29:27 nelchael Exp $
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Common Codecs provides implementations of common encoders and decoders such as Base64, Hex, various phonetic encodings, and URLs"
+HOMEPAGE="http://jakarta.apache.org/commons/codec/"
+SRC_URI="mirror://apache/jakarta/commons/codec/source/${P}-src.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="doc source"
+
+RDEPEND=">=virtual/jre-1.3
+	=dev-java/avalon-logkit-1.2*
+	dev-java/log4j"
+
+DEPEND=">=virtual/jdk-1.3
+	${RDEPEND}
+	dev-java/ant-core
+	source? ( app-arch/zip )"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i "s_../LICENSE_LICENSE.txt_" build.xml  || die "sed failed"
+	echo "conf.home=./src/conf" >> build.properties
+	echo "source.home=./src/java" >> build.properties
+	echo "build.home=./output" >> build.properties
+	echo "dist.home=./output/dist" >> build.properties
+	echo "test.home=./src/test" >> build.properties
+	echo "final.name=commons-codec" >> build.properties
+}
+
+src_compile() {
+	local antflags="compile"
+	use doc && antflags="${antflags} javadoc"
+	eant ${antflags} jar || die "compile problem"
+}
+
+src_install() {
+	java-pkg_dojar output/dist/${PN}.jar
+
+	dodoc RELEASE-NOTES.txt
+	use doc && java-pkg_dohtml -r output/dist/docs/
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/commons-codec/files/digest-commons-codec-1.3 b/dev-java/commons-codec/files/digest-commons-codec-1.3
index 83534fa668fb..88533316f5a8 100644
--- a/dev-java/commons-codec/files/digest-commons-codec-1.3
+++ b/dev-java/commons-codec/files/digest-commons-codec-1.3
@@ -1 +1,3 @@
 MD5 ac19a5dc22b1293b39d0445ad08c4ce7 commons-codec-1.3-src.tar.gz 88242
+RMD160 84cfc6f02d991b5a7013902637aec5caaa29c823 commons-codec-1.3-src.tar.gz 88242
+SHA256 47e485a942e1f6f3f2a2b526e77667cbccbf507aeb63e129f54dfc77b5b645f4 commons-codec-1.3-src.tar.gz 88242
diff --git a/dev-java/commons-codec/files/digest-commons-codec-1.3-r1 b/dev-java/commons-codec/files/digest-commons-codec-1.3-r1
new file mode 100644
index 000000000000..88533316f5a8
--- /dev/null
+++ b/dev-java/commons-codec/files/digest-commons-codec-1.3-r1
@@ -0,0 +1,3 @@
+MD5 ac19a5dc22b1293b39d0445ad08c4ce7 commons-codec-1.3-src.tar.gz 88242
+RMD160 84cfc6f02d991b5a7013902637aec5caaa29c823 commons-codec-1.3-src.tar.gz 88242
+SHA256 47e485a942e1f6f3f2a2b526e77667cbccbf507aeb63e129f54dfc77b5b645f4 commons-codec-1.3-src.tar.gz 88242
diff --git a/dev-java/commons-daemon/ChangeLog b/dev-java/commons-daemon/ChangeLog
index 26cceec0c99a..95c0b38cdd4f 100644
--- a/dev-java/commons-daemon/ChangeLog
+++ b/dev-java/commons-daemon/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/commons-daemon
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-daemon/ChangeLog,v 1.18 2006/07/04 19:00:27 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-daemon/ChangeLog,v 1.19 2006/07/22 22:32:40 nelchael Exp $
+
+*commons-daemon-1.0.1-r1 (22 Jul 2006)
+
+  22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +commons-daemon-1.0.1-r1.ebuild:
+  Migrated to Generation 2.
 
   04 Jul 2006; Markus Rothe <corsair@gentoo.org>
   commons-daemon-1.0.1.ebuild:
diff --git a/dev-java/commons-daemon/commons-daemon-1.0.1-r1.ebuild b/dev-java/commons-daemon/commons-daemon-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..73a35d77c4c5
--- /dev/null
+++ b/dev-java/commons-daemon/commons-daemon-1.0.1-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-daemon/commons-daemon-1.0.1-r1.ebuild,v 1.1 2006/07/22 22:32:40 nelchael Exp $
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="Tools to allow java programs to run as unix daemons"
+SRC_URI="mirror://apache/jakarta/commons/daemon/source/daemon-${PV}.tar.gz"
+HOMEPAGE="http://jakarta.apache.org/commons/daemon/"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc examples source"
+
+DEPEND=">=virtual/jdk-1.4
+	dev-java/ant-core
+	source? ( app-arch/zip )"
+RDEPEND=">=virtual/jre-1.4"
+
+S=${WORKDIR}/daemon-${PV}
+
+src_unpack() {
+	unpack ${A}
+
+	# Submitted upstream to http://bugs.gentoo.org/show_bug.cgi?id=132563
+	epatch "${FILESDIR}/1.0.1-as-needed.patch"
+
+	cd ${S}/src/native/unix
+	sed -e "s/powerpc/powerpc|powerpc64/g" -i support/apsupport.m4
+	export WANT_AUTOCONF="2.5"
+	autoconf
+}
+
+src_compile() {
+	# compile native stuff
+	cd ${S}/src/native/unix
+	econf || die "configure failed"
+	emake || die "make failed"
+
+	# compile java stuff
+	cd ${S}
+	local antflags="jar"
+	use doc && antflags="${antflags} javadoc"
+	eant ${antflags} || die "compilation problem"
+}
+
+src_install() {
+	dobin src/native/unix/jsvc
+	java-pkg_dojar dist/${PN}.jar || die "Unable to install"
+
+	dodoc README RELEASE-NOTES.txt *.html
+	use doc && java-pkg_dohtml -r dist/docs/*
+	if use examples; then
+		dodir /usr/share/doc/${PF}/examples
+		cp -R src/samples/* ${D}/usr/share/doc/${PF}/examples
+	fi
+	use source && java-pkg_dosrc src/java/* src/native/unix/native
+}
diff --git a/dev-java/commons-daemon/files/digest-commons-daemon-1.0.1-r1 b/dev-java/commons-daemon/files/digest-commons-daemon-1.0.1-r1
new file mode 100644
index 000000000000..3e3fd1923d9c
--- /dev/null
+++ b/dev-java/commons-daemon/files/digest-commons-daemon-1.0.1-r1
@@ -0,0 +1,3 @@
+MD5 df3eb5aafa53ca530843a09d40b8a1c0 daemon-1.0.1.tar.gz 301023
+RMD160 b77ffd3dbc40d18d867afd62015ba1aa05bd9c65 daemon-1.0.1.tar.gz 301023
+SHA256 177107b8d99cabdbcda58cec284a2e2ccb5063113cc1fdb1b672754d4652848c daemon-1.0.1.tar.gz 301023
diff --git a/dev-java/commons-dbcp/ChangeLog b/dev-java/commons-dbcp/ChangeLog
index e21f69bd0a8c..cfe25e0f868b 100644
--- a/dev-java/commons-dbcp/ChangeLog
+++ b/dev-java/commons-dbcp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/commons-dbcp
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/ChangeLog,v 1.22 2005/12/08 14:02:41 nichoj Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/ChangeLog,v 1.23 2006/07/22 22:36:41 nelchael Exp $
+
+*commons-dbcp-1.2.1-r1 (22 Jul 2006)
+
+  22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +commons-dbcp-1.2.1-r1.ebuild:
+  Migrated to Generation 2.
 
   08 Dec 2005; Joshua Nichols <nichoj@gentoo.org> commons-dbcp-1.2.1.ebuild:
   Changed ant dependency to just ant-core.
diff --git a/dev-java/commons-dbcp/commons-dbcp-1.2.1-r1.ebuild b/dev-java/commons-dbcp/commons-dbcp-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..5140ab4f05c5
--- /dev/null
+++ b/dev-java/commons-dbcp/commons-dbcp-1.2.1-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/commons-dbcp-1.2.1-r1.ebuild,v 1.1 2006/07/22 22:36:41 nelchael Exp $
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Jakarta component providing database connection pooling API"
+HOMEPAGE="http://jakarta.apache.org/commons/dbcp/"
+SRC_URI="mirror://apache/jakarta/commons/dbcp/source/${P}-src.tar.gz"
+RDEPEND=">=virtual/jre-1.3
+		>=dev-java/commons-collections-2.0
+		>=dev-java/commons-pool-1.1"
+DEPEND=">=virtual/jdk-1.3
+		>=dev-java/ant-core-1.4
+		${RDEPEND}
+		source? ( app-arch/zip )"
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc source"
+
+src_compile() {
+	local antflags="build-jar"
+	echo "commons-collections.jar=$(java-pkg_getjars commons-collections)" > build.properties
+	echo "commons-pool.jar=$(java-pkg_getjars commons-pool)" >> build.properties
+	use doc && antflags="${antflags} javadoc"
+	eant ${antflags} || die "Compilation failed"
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}*.jar || die "Unable to install"
+	dodoc README.txt
+	dohtml PROPOSAL.html STATUS.html
+	use doc && java-pkg_dohtml -r dist/docs/*
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/commons-dbcp/files/digest-commons-dbcp-1.2.1 b/dev-java/commons-dbcp/files/digest-commons-dbcp-1.2.1
index bd74543e91e7..8061cd957ff2 100644
--- a/dev-java/commons-dbcp/files/digest-commons-dbcp-1.2.1
+++ b/dev-java/commons-dbcp/files/digest-commons-dbcp-1.2.1
@@ -1 +1,3 @@
 MD5 b7336a1d34ea0e8e9c39b67af510c46d commons-dbcp-1.2.1-src.tar.gz 578573
+RMD160 397b1da0c870b6dc460a652c1cd695708f648719 commons-dbcp-1.2.1-src.tar.gz 578573
+SHA256 31a2806955c667460222d2ebf3ec11f88181ccef7d4e10eb683cff55626a0061 commons-dbcp-1.2.1-src.tar.gz 578573
diff --git a/dev-java/commons-dbcp/files/digest-commons-dbcp-1.2.1-r1 b/dev-java/commons-dbcp/files/digest-commons-dbcp-1.2.1-r1
new file mode 100644
index 000000000000..8061cd957ff2
--- /dev/null
+++ b/dev-java/commons-dbcp/files/digest-commons-dbcp-1.2.1-r1
@@ -0,0 +1,3 @@
+MD5 b7336a1d34ea0e8e9c39b67af510c46d commons-dbcp-1.2.1-src.tar.gz 578573
+RMD160 397b1da0c870b6dc460a652c1cd695708f648719 commons-dbcp-1.2.1-src.tar.gz 578573
+SHA256 31a2806955c667460222d2ebf3ec11f88181ccef7d4e10eb683cff55626a0061 commons-dbcp-1.2.1-src.tar.gz 578573
diff --git a/dev-java/commons-discovery/ChangeLog b/dev-java/commons-discovery/ChangeLog
index 63a7a451cf07..f2fd3a5c675e 100644
--- a/dev-java/commons-discovery/ChangeLog
+++ b/dev-java/commons-discovery/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/commons-discovery
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-discovery/ChangeLog,v 1.14 2005/10/21 14:52:12 betelgeuse Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-discovery/ChangeLog,v 1.15 2006/07/22 22:41:34 nelchael Exp $
+
+*commons-discovery-0.2-r3 (22 Jul 2006)
+
+  22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +commons-discovery-0.2-r3.ebuild:
+  Migrated to Generation 2.
 
   21 Oct 2005; Petteri Räty <betelgeuse@gentoo.org>
   commons-discovery-0.2-r2.ebuild:
diff --git a/dev-java/commons-discovery/commons-discovery-0.2-r3.ebuild b/dev-java/commons-discovery/commons-discovery-0.2-r3.ebuild
new file mode 100644
index 000000000000..3d9f90800f36
--- /dev/null
+++ b/dev-java/commons-discovery/commons-discovery-0.2-r3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-discovery/commons-discovery-0.2-r3.ebuild,v 1.1 2006/07/22 22:41:34 nelchael Exp $
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="Commons Discovery: Service Discovery component"
+HOMEPAGE="http://jakarta.apache.org/commons/discovery"
+SRC_URI="mirror://apache/jakarta/commons/discovery/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="source junit doc"
+
+RDEPEND=">=virtual/jre-1.4
+	dev-java/commons-logging"
+
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}
+	dev-java/ant-core
+	source? ( app-arch/zip )
+	junit? ( >=dev-java/junit-3.8 )"
+
+S="${WORKDIR}/${P}-src/discovery"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	chmod u+w ${S}/../discovery
+	epatch ${FILESDIR}/${P}-gentoo.diff
+
+	mkdir -p ${S}/target/lib && cd ${S}/target/lib
+	use junit && java-pkg_jar-from junit junit.jar
+	java-pkg_jar-from commons-logging
+}
+
+src_compile() {
+	local antflags="dist"
+	use doc && antflags="${antflags} javadoc"
+	use junit && antflags="${antflags} test.discovery"
+	eant ${antflags} || die "compile problem"
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+
+	if use doc; then
+		java-pkg_dohtml PROPOSAL.html STATUS.html usersguide.html
+		java-pkg_dohtml -r ${S}/dist/docs/api
+	fi
+
+	use source && java-pkg_dosrc ${S}/src/java/*
+}
diff --git a/dev-java/commons-discovery/files/digest-commons-discovery-0.2-r2 b/dev-java/commons-discovery/files/digest-commons-discovery-0.2-r2
index 2db042643727..21902d5ae390 100644
--- a/dev-java/commons-discovery/files/digest-commons-discovery-0.2-r2
+++ b/dev-java/commons-discovery/files/digest-commons-discovery-0.2-r2
@@ -1 +1,3 @@
 MD5 57968a150ea9b7158ac0e995c8f24080 commons-discovery-0.2-src.tar.gz 72783
+RMD160 521a0439dd8f92d44dcf434abc0e3b6681c38048 commons-discovery-0.2-src.tar.gz 72783
+SHA256 4c3d87c991ae2079a71b428077b1276de4fc68d7b5dd2bc2f6e084b3f286f22a commons-discovery-0.2-src.tar.gz 72783
diff --git a/dev-java/commons-discovery/files/digest-commons-discovery-0.2-r3 b/dev-java/commons-discovery/files/digest-commons-discovery-0.2-r3
new file mode 100644
index 000000000000..21902d5ae390
--- /dev/null
+++ b/dev-java/commons-discovery/files/digest-commons-discovery-0.2-r3
@@ -0,0 +1,3 @@
+MD5 57968a150ea9b7158ac0e995c8f24080 commons-discovery-0.2-src.tar.gz 72783
+RMD160 521a0439dd8f92d44dcf434abc0e3b6681c38048 commons-discovery-0.2-src.tar.gz 72783
+SHA256 4c3d87c991ae2079a71b428077b1276de4fc68d7b5dd2bc2f6e084b3f286f22a commons-discovery-0.2-src.tar.gz 72783
diff --git a/dev-java/commons-fileupload/ChangeLog b/dev-java/commons-fileupload/ChangeLog
index 141b89e3edae..195c58df7745 100644
--- a/dev-java/commons-fileupload/ChangeLog
+++ b/dev-java/commons-fileupload/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/commons-fileupload
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-fileupload/ChangeLog,v 1.21 2005/11/05 11:31:43 betelgeuse Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-fileupload/ChangeLog,v 1.22 2006/07/22 22:44:28 nelchael Exp $
+
+*commons-fileupload-1.0-r1 (22 Jul 2006)
+
+  22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +commons-fileupload-1.0-r1.ebuild:
+  Migrated to Generation 2.
 
   05 Nov 2005; Petteri Räty <betelgeuse@gentoo.org>
   commons-fileupload-1.0.ebuild:
diff --git a/dev-java/commons-fileupload/commons-fileupload-1.0-r1.ebuild b/dev-java/commons-fileupload/commons-fileupload-1.0-r1.ebuild
new file mode 100644
index 000000000000..1162642b40e9
--- /dev/null
+++ b/dev-java/commons-fileupload/commons-fileupload-1.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-fileupload/commons-fileupload-1.0-r1.ebuild,v 1.1 2006/07/22 22:44:28 nelchael Exp $
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="The Commons FileUpload package makes it easy to add robust, high-performance, file upload capability to your servlets and web applications."
+HOMEPAGE="http://jakarta.apache.org/commons/fileupload/"
+SRC_URI="mirror://apache/jakarta/commons/fileupload/source/${P}-src.tar.gz"
+DEPEND=">=virtual/jdk-1.3
+		>=dev-java/ant-core-1.5
+		=dev-java/servletapi-2.4*
+		source? ( app-arch/unzip )"
+RDEPEND=">=virtual/jre-1.3"
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc source"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/build.xml.patch
+	echo "servlet-api.jar = $(java-pkg_getjar servletapi-2.4 servlet-api.jar)" >> build.properties
+}
+
+src_compile() {
+	local antflags="jar"
+	use doc && antflags="${antflags} javadoc"
+	eant ${antflags} || die "compilation error"
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.jar ${PN}.jar
+	use doc && java-pkg_dohtml -r dist/docs/
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/commons-fileupload/files/digest-commons-fileupload-1.0 b/dev-java/commons-fileupload/files/digest-commons-fileupload-1.0
index 76e12dbc3556..e0a627495cc2 100644
--- a/dev-java/commons-fileupload/files/digest-commons-fileupload-1.0
+++ b/dev-java/commons-fileupload/files/digest-commons-fileupload-1.0
@@ -1 +1,3 @@
 MD5 c6fa0cc10e18cffa8c479c6cb61914b8 commons-fileupload-1.0-src.tar.gz 29737
+RMD160 3a7f64ab21e38ed8166f059f5770f89da1f0cf26 commons-fileupload-1.0-src.tar.gz 29737
+SHA256 4cfe77bd744c7dddc45e32262a4995bf855f146549d7b3ca4bbdb385599cc14a commons-fileupload-1.0-src.tar.gz 29737
diff --git a/dev-java/commons-fileupload/files/digest-commons-fileupload-1.0-r1 b/dev-java/commons-fileupload/files/digest-commons-fileupload-1.0-r1
new file mode 100644
index 000000000000..e0a627495cc2
--- /dev/null
+++ b/dev-java/commons-fileupload/files/digest-commons-fileupload-1.0-r1
@@ -0,0 +1,3 @@
+MD5 c6fa0cc10e18cffa8c479c6cb61914b8 commons-fileupload-1.0-src.tar.gz 29737
+RMD160 3a7f64ab21e38ed8166f059f5770f89da1f0cf26 commons-fileupload-1.0-src.tar.gz 29737
+SHA256 4cfe77bd744c7dddc45e32262a4995bf855f146549d7b3ca4bbdb385599cc14a commons-fileupload-1.0-src.tar.gz 29737
diff --git a/dev-java/commons-grant/ChangeLog b/dev-java/commons-grant/ChangeLog
index a1129e10395d..df49a8bd138a 100644
--- a/dev-java/commons-grant/ChangeLog
+++ b/dev-java/commons-grant/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/commons-grant
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-grant/ChangeLog,v 1.1 2005/12/27 01:48:56 nichoj Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-grant/ChangeLog,v 1.2 2006/07/22 22:46:32 nelchael Exp $
+
+*commons-grant-1.0_beta5-r1 (22 Jul 2006)
+
+  22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +commons-grant-1.0_beta5-r1.ebuild:
+  Migrated to Generation 2.
 
 *commons-grant-1.0_beta5 (27 Dec 2005)
 
diff --git a/dev-java/commons-grant/commons-grant-1.0_beta5-r1.ebuild b/dev-java/commons-grant/commons-grant-1.0_beta5-r1.ebuild
new file mode 100644
index 000000000000..f8c6ee1ca3ff
--- /dev/null
+++ b/dev-java/commons-grant/commons-grant-1.0_beta5-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-grant/commons-grant-1.0_beta5-r1.ebuild,v 1.1 2006/07/22 22:46:32 nelchael Exp $
+
+# Note: Upstream is dead... only place to find is on the ibiblio maven repo
+# and on jpackage.org
+inherit java-pkg-2 java-ant-2 eutils rpm
+MY_PN="jakarta-${PN}"
+SNAPSHOT_DATE="20040118"
+MY_PV="${PV%%_*}.b5.cvs${SNAPSHOT_DATE}"
+MY_PV="${MY_PV//_beta/.b}"
+MY_P="${MY_PN}-${MY_PV}"
+JPACKAGE_REVISION="4"
+
+DESCRIPTION="A small collection of hacks to make using Ant in an embedded envinronment much easier."
+# This link seems dead, but I don't have anywhere else to turn
+HOMEPAGE="http://jakarta.apache.org/commons/sandbox/grant/"
+SRC_URI="mirror://jpackage/1.6/generic/free/SRPMS/${MY_P}-${JPACKAGE_REVISION}jpp.src.rpm"
+DEPEND=">=virtual/jdk-1.3
+	source? ( app-arch/zip )
+	dev-java/ant-core
+	dev-java/junit"
+RDEPEND=">=virtual/jre-1.3"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc source"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_unpack(){
+	rpm_src_unpack
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.diff
+	mkdir -p target/lib
+	cd target/lib
+	java-pkg_jar-from junit
+}
+
+src_compile(){
+	local antflags="jar"
+	use doc && antflags="${antflags} javadoc"
+	eant ${antflags} || die "compile failed"
+}
+
+src_install(){
+	java-pkg_newjar target/${PN}-1.0-beta-4.jar ${PN}.jar
+	use doc && java-pkg_dohtml -r dist/docs/api
+	use source && java-pkg_dosrc src/java/*
+}
+
+src_test() {
+	eant test || die "Test failed"
+}
diff --git a/dev-java/commons-grant/files/digest-commons-grant-1.0_beta5 b/dev-java/commons-grant/files/digest-commons-grant-1.0_beta5
index 2e21d904a8e0..60a7a4508f72 100644
--- a/dev-java/commons-grant/files/digest-commons-grant-1.0_beta5
+++ b/dev-java/commons-grant/files/digest-commons-grant-1.0_beta5
@@ -1 +1,3 @@
 MD5 7eedc9fd3bd3f744fc82584acb3697f2 jakarta-commons-grant-1.0.b5.cvs20040118-4jpp.src.rpm 11651
+RMD160 983860d8e513c8b0e8b7d1032d04230902a4f883 jakarta-commons-grant-1.0.b5.cvs20040118-4jpp.src.rpm 11651
+SHA256 c6cc1cd6b51668ba18f6fab17863d4f3bc9889a20a0f70261dbf00fd08ec482d jakarta-commons-grant-1.0.b5.cvs20040118-4jpp.src.rpm 11651
diff --git a/dev-java/commons-grant/files/digest-commons-grant-1.0_beta5-r1 b/dev-java/commons-grant/files/digest-commons-grant-1.0_beta5-r1
new file mode 100644
index 000000000000..60a7a4508f72
--- /dev/null
+++ b/dev-java/commons-grant/files/digest-commons-grant-1.0_beta5-r1
@@ -0,0 +1,3 @@
+MD5 7eedc9fd3bd3f744fc82584acb3697f2 jakarta-commons-grant-1.0.b5.cvs20040118-4jpp.src.rpm 11651
+RMD160 983860d8e513c8b0e8b7d1032d04230902a4f883 jakarta-commons-grant-1.0.b5.cvs20040118-4jpp.src.rpm 11651
+SHA256 c6cc1cd6b51668ba18f6fab17863d4f3bc9889a20a0f70261dbf00fd08ec482d jakarta-commons-grant-1.0.b5.cvs20040118-4jpp.src.rpm 11651
diff --git a/dev-java/commons-graph/ChangeLog b/dev-java/commons-graph/ChangeLog
index ce2b9e1b9903..520cec49a883 100644
--- a/dev-java/commons-graph/ChangeLog
+++ b/dev-java/commons-graph/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/commons-graph
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-graph/ChangeLog,v 1.4 2005/12/04 23:17:04 nichoj Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-graph/ChangeLog,v 1.5 2006/07/22 22:48:22 nelchael Exp $
+
+*commons-graph-0.8.1_p20040118-r1 (22 Jul 2006)
+
+  22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +commons-graph-0.8.1_p20040118-r1.ebuild:
+  Migrated to Generation 2.
 
   04 Dec 2005; Joshua Nichols <nichoj@gentoo.org>
   commons-graph-0.8.1_p20040118.ebuild:
diff --git a/dev-java/commons-graph/commons-graph-0.8.1_p20040118-r1.ebuild b/dev-java/commons-graph/commons-graph-0.8.1_p20040118-r1.ebuild
new file mode 100644
index 000000000000..265aa38850c7
--- /dev/null
+++ b/dev-java/commons-graph/commons-graph-0.8.1_p20040118-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-graph/commons-graph-0.8.1_p20040118-r1.ebuild,v 1.1 2006/07/22 22:48:22 nelchael Exp $
+
+inherit java-pkg-2 java-ant-2 eutils
+MY_PN=graph2
+MY_PV=${PV%%_*}.cvs${PV##*_p}
+MY_P=${MY_PN}-${MY_PV}
+API_PV=${PV%%_*}
+DESCRIPTION="A toolkit for managing graphs and graph based data structures"
+# There doesn't seem to be a real home page, so we'll point to a viewcvs
+HOMEPAGE="http://cvs.apache.org/viewcvs/jakarta-commons-sandbox/graph2/"
+# this was extracted from a source rpm at jpackage
+SRC_URI="mirror://gentoo/distfiles/${MY_P}.tar.gz"
+COMMON_DEP="dev-java/log4j
+	dev-java/commons-collections
+	dev-java/xml-commons"
+DEPEND=">=virtual/jdk-1.3
+	dev-java/ant-core
+	test? ( dev-java/ant-tasks )
+	${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.3
+	${COMMON_DEP}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+S=${WORKDIR}/${MY_P}
+
+src_unpack(){
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.diff
+	mkdir -p target/lib
+	cd target/lib
+	java-pkg_jar-from log4j
+	java-pkg_jar-from commons-collections
+	java-pkg_jar-from xml-commons xml-apis.jar
+
+}
+
+src_compile(){
+	local antflags="jar -Dnoget=true"
+	use doc && antflags="${antflags} javadoc"
+	eant ${antflags} || die "compile failed"
+}
+
+src_install(){
+	java-pkg_newjar target/${PN}-${API_PV}.jar ${PN}.jar
+	use doc && java-pkg_dohtml -r dist/docs/api
+}
+
+src_test() {
+	if use test; then
+		local antflags="test -Dnoget=true"
+		eant ${antflags} || die "test failed"
+	else
+		ewarn "You must include 'test' in your use flags in order to"
+		ewarn "get the dependencies needed to run unit tests"
+		ewarn "Skipping unit tests"
+	fi
+}
diff --git a/dev-java/commons-graph/files/digest-commons-graph-0.8.1_p20040118 b/dev-java/commons-graph/files/digest-commons-graph-0.8.1_p20040118
index 9434bdca5399..071634f706c7 100644
--- a/dev-java/commons-graph/files/digest-commons-graph-0.8.1_p20040118
+++ b/dev-java/commons-graph/files/digest-commons-graph-0.8.1_p20040118
@@ -1 +1,3 @@
 MD5 2f0b4b570e383321675e56d3a2bbfa08 graph2-0.8.1.cvs20040118.tar.gz 42653
+RMD160 cd5cf77dfcc90ca5b0b05279c4e6492a6aed3c38 graph2-0.8.1.cvs20040118.tar.gz 42653
+SHA256 916e3ca83376acd9ca64ee87988c8a19dc86c6468d087ede82d1e05c14a5a142 graph2-0.8.1.cvs20040118.tar.gz 42653
diff --git a/dev-java/commons-graph/files/digest-commons-graph-0.8.1_p20040118-r1 b/dev-java/commons-graph/files/digest-commons-graph-0.8.1_p20040118-r1
new file mode 100644
index 000000000000..071634f706c7
--- /dev/null
+++ b/dev-java/commons-graph/files/digest-commons-graph-0.8.1_p20040118-r1
@@ -0,0 +1,3 @@
+MD5 2f0b4b570e383321675e56d3a2bbfa08 graph2-0.8.1.cvs20040118.tar.gz 42653
+RMD160 cd5cf77dfcc90ca5b0b05279c4e6492a6aed3c38 graph2-0.8.1.cvs20040118.tar.gz 42653
+SHA256 916e3ca83376acd9ca64ee87988c8a19dc86c6468d087ede82d1e05c14a5a142 graph2-0.8.1.cvs20040118.tar.gz 42653
diff --git a/dev-java/commons-httpclient/ChangeLog b/dev-java/commons-httpclient/ChangeLog
index f435bb987066..920db840e045 100644
--- a/dev-java/commons-httpclient/ChangeLog
+++ b/dev-java/commons-httpclient/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/commons-httpclient
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/ChangeLog,v 1.28 2005/12/21 02:24:37 nichoj Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/ChangeLog,v 1.29 2006/07/22 22:51:23 nelchael Exp $
+
+*commons-httpclient-3.0-r1 (22 Jul 2006)
+*commons-httpclient-2.0.2-r1 (22 Jul 2006)
+
+  22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +commons-httpclient-2.0.2-r1.ebuild, +commons-httpclient-3.0-r1.ebuild:
+  Migrated to Generation 2.
 
 *commons-httpclient-3.0 (21 Dec 2005)
 
diff --git a/dev-java/commons-httpclient/commons-httpclient-2.0.2-r1.ebuild b/dev-java/commons-httpclient/commons-httpclient-2.0.2-r1.ebuild
new file mode 100644
index 000000000000..d254eeb05f2b
--- /dev/null
+++ b/dev-java/commons-httpclient/commons-httpclient-2.0.2-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/commons-httpclient-2.0.2-r1.ebuild,v 1.1 2006/07/22 22:51:23 nelchael Exp $
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="The Jakarta Commons HttpClient provides an efficient, up-to-date, and feature-rich package implementing the client side of the most recent HTTP standards and recommendations."
+HOMEPAGE="http://jakarta.apache.org/commons/httpclient/index.html"
+SRC_URI="mirror://apache/jakarta/commons/httpclient/source/${P/_/-}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc source"
+
+RDEPEND=">=virtual/jre-1.3
+	dev-java/commons-logging"
+
+DEPEND=">=virtual/jdk-1.3
+	${RDEPEND}
+	sys-apps/sed
+	>=dev-java/ant-core-1.4
+	source? ( app-arch/zip )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	#make jikes happy
+	#if use jikes; then
+	#	sed '837 s/ConnectionPool/org.apache.commons.httpclient.MultiThreadedHttpConnectionManager.ConnectionPool/' \
+	#		-i src/java/org/apache/commons/httpclient/MultiThreadedHttpConnectionManager.java \
+	#		|| die "failed to sed"
+	#fi
+
+	epatch ${FILESDIR}/gentoo.diff || die "patching failed"
+	echo "commons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)" >> build.properties
+}
+
+src_compile() {
+	local antflags="dist"
+	use doc && antflags="${antflags} javadoc"
+	eant ${antflags} || die "compilation failed"
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+	use doc && java-pkg_dohtml -r dist/docs/*
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/commons-httpclient/commons-httpclient-3.0-r1.ebuild b/dev-java/commons-httpclient/commons-httpclient-3.0-r1.ebuild
new file mode 100644
index 000000000000..d39ad79cde44
--- /dev/null
+++ b/dev-java/commons-httpclient/commons-httpclient-3.0-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/commons-httpclient-3.0-r1.ebuild,v 1.1 2006/07/22 22:51:23 nelchael Exp $
+
+inherit java-pkg-2 java-ant-2 eutils
+
+MY_P=${P/_/-}
+DESCRIPTION="The Jakarta Commons HttpClient provides an efficient, up-to-date, and feature-rich package implementing the client side of the most recent HTTP standards and recommendations."
+HOMEPAGE="http://jakarta.apache.org/commons/httpclient/index.html"
+SRC_URI="mirror://apache/jakarta/commons/httpclient/source/${MY_P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="doc junit source"
+
+RDEPEND=">=virtual/jre-1.3
+	dev-java/commons-logging
+	dev-java/commons-codec"
+
+DEPEND=">=virtual/jdk-1.3
+	sys-apps/sed
+	>=dev-java/ant-core-1.4
+	junit? ( dev-java/junit )
+	source? ( app-arch/zip )
+	${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	mkdir lib && cd lib
+	java-pkg_jar-from commons-logging
+	java-pkg_jar-from commons-codec
+	use junit && java-pkg_jar-from junit
+}
+
+src_compile() {
+	local antflags="dist"
+	use junit && antflags="${antflags} test"
+	use doc && antflags="${antflags} javadoc"
+	eant ${antflags} || die "compilation failed"
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+	use doc && java-pkg_dohtml -r dist/docs/*
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/commons-httpclient/files/digest-commons-httpclient-2.0.2 b/dev-java/commons-httpclient/files/digest-commons-httpclient-2.0.2
index 3c685d62670c..545cd53a1c27 100644
--- a/dev-java/commons-httpclient/files/digest-commons-httpclient-2.0.2
+++ b/dev-java/commons-httpclient/files/digest-commons-httpclient-2.0.2
@@ -1 +1,3 @@
 MD5 f3ae7736fbfb559cb228291427f22c2d commons-httpclient-2.0.2-src.tar.gz 1447937
+RMD160 82c5637e06fc96f2db4ee14ad6fc158ea5f297ed commons-httpclient-2.0.2-src.tar.gz 1447937
+SHA256 279ee55c339e512e6a9ecefe52170c8f65e0d532c3a71cfc7ad5c5cdf964a102 commons-httpclient-2.0.2-src.tar.gz 1447937
diff --git a/dev-java/commons-httpclient/files/digest-commons-httpclient-2.0.2-r1 b/dev-java/commons-httpclient/files/digest-commons-httpclient-2.0.2-r1
new file mode 100644
index 000000000000..545cd53a1c27
--- /dev/null
+++ b/dev-java/commons-httpclient/files/digest-commons-httpclient-2.0.2-r1
@@ -0,0 +1,3 @@
+MD5 f3ae7736fbfb559cb228291427f22c2d commons-httpclient-2.0.2-src.tar.gz 1447937
+RMD160 82c5637e06fc96f2db4ee14ad6fc158ea5f297ed commons-httpclient-2.0.2-src.tar.gz 1447937
+SHA256 279ee55c339e512e6a9ecefe52170c8f65e0d532c3a71cfc7ad5c5cdf964a102 commons-httpclient-2.0.2-src.tar.gz 1447937
diff --git a/dev-java/commons-httpclient/files/digest-commons-httpclient-3.0 b/dev-java/commons-httpclient/files/digest-commons-httpclient-3.0
index ff770c7c29c9..885e7ae97b81 100644
--- a/dev-java/commons-httpclient/files/digest-commons-httpclient-3.0
+++ b/dev-java/commons-httpclient/files/digest-commons-httpclient-3.0
@@ -1 +1,3 @@
 MD5 e440ab39e3103f7e47adfaed17e365e3 commons-httpclient-3.0-src.tar.gz 1903528
+RMD160 3ade2b18683bc9899b240101898ebd34d9e1dbf7 commons-httpclient-3.0-src.tar.gz 1903528
+SHA256 84bae36abcc01d3f706d17fefefd4b81ceebfaccd2ff08511b4805ba3b5d88d3 commons-httpclient-3.0-src.tar.gz 1903528
diff --git a/dev-java/commons-httpclient/files/digest-commons-httpclient-3.0-r1 b/dev-java/commons-httpclient/files/digest-commons-httpclient-3.0-r1
new file mode 100644
index 000000000000..885e7ae97b81
--- /dev/null
+++ b/dev-java/commons-httpclient/files/digest-commons-httpclient-3.0-r1
@@ -0,0 +1,3 @@
+MD5 e440ab39e3103f7e47adfaed17e365e3 commons-httpclient-3.0-src.tar.gz 1903528
+RMD160 3ade2b18683bc9899b240101898ebd34d9e1dbf7 commons-httpclient-3.0-src.tar.gz 1903528
+SHA256 84bae36abcc01d3f706d17fefefd4b81ceebfaccd2ff08511b4805ba3b5d88d3 commons-httpclient-3.0-src.tar.gz 1903528
diff --git a/dev-java/commons-io/ChangeLog b/dev-java/commons-io/ChangeLog
index 1a53bcd0b2a6..4b3fa57b8430 100644
--- a/dev-java/commons-io/ChangeLog
+++ b/dev-java/commons-io/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/commons-io
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-io/ChangeLog,v 1.3 2005/12/04 18:38:25 nichoj Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-io/ChangeLog,v 1.4 2006/07/22 22:53:27 nelchael Exp $
+
+*commons-io-1.1-r1 (22 Jul 2006)
+
+  22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +commons-io-1.1-r1.ebuild:
+  Migrated to Generation 2.
 
 *commons-io-1.1 (04 Dec 2005)
 
diff --git a/dev-java/commons-io/commons-io-1.1-r1.ebuild b/dev-java/commons-io/commons-io-1.1-r1.ebuild
new file mode 100644
index 000000000000..d2740fc834ed
--- /dev/null
+++ b/dev-java/commons-io/commons-io-1.1-r1.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-io/commons-io-1.1-r1.ebuild,v 1.1 2006/07/22 22:53:27 nelchael Exp $
+
+inherit java-pkg-2 java-ant-2 eutils
+
+MY_P="${P}-src"
+DESCRIPTION="Commons-IO contains utility classes  , stream implementations, file filters  , and endian classes."
+HOMEPAGE="http://jakarta.apache.org/commons/io"
+SRC_URI="mirror://apache/jakarta/commons/io/source/${MY_P}.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="1"
+KEYWORDS="~x86 ~amd64 ~ppc"
+IUSE="doc source"
+
+DEPEND="dev-java/ant-core
+	source? ( app-arch/zip )
+	>=virtual/jdk-1.3"
+RDEPEND=">=virtual/jre-1.3"
+
+S="${WORKDIR}/${MY_P}"
+
+# junit tests are disabled for now.
+# one of the tests (FileUtilsCleanDirectoryTestCase) always fails when run as
+# root.
+# TODO report upstream
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.diff
+
+	mkdir -p build/lib
+	cd build/lib
+#	use junit && java-pkg_jar-from junit
+}
+
+src_compile() {
+	local antflags="jar -Dlibdir=build/lib"
+	use doc && antflags="${antflags} javadoc -Djavadocdir=dist/docs/api"
+#	use junit && antflags="${antflags} test"
+	eant ${antflags} || die "compile problem"
+}
+
+src_install() {
+	java-pkg_newjar build/${P}.jar ${PN}.jar
+
+	dodoc RELEASE-NOTES.txt NOTICE.txt
+	dohtml PROPOSAL.html STATUS.html usersguide.html
+	use doc && java-pkg_dohtml -r dist/docs/api
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/commons-io/files/digest-commons-io-1.1 b/dev-java/commons-io/files/digest-commons-io-1.1
index be3229d48ab8..4d76588f0172 100644
--- a/dev-java/commons-io/files/digest-commons-io-1.1
+++ b/dev-java/commons-io/files/digest-commons-io-1.1
@@ -1 +1,3 @@
 MD5 0a39b54885b86dc42169ffd761caf414 commons-io-1.1-src.tar.gz 197922
+RMD160 ad7be482ee4eebcdc193fe78497ed17394309ab1 commons-io-1.1-src.tar.gz 197922
+SHA256 375983a026c86afee9b07405a616b3614de3f844b2530d54a5f12c06a666b92c commons-io-1.1-src.tar.gz 197922
diff --git a/dev-java/commons-io/files/digest-commons-io-1.1-r1 b/dev-java/commons-io/files/digest-commons-io-1.1-r1
new file mode 100644
index 000000000000..4d76588f0172
--- /dev/null
+++ b/dev-java/commons-io/files/digest-commons-io-1.1-r1
@@ -0,0 +1,3 @@
+MD5 0a39b54885b86dc42169ffd761caf414 commons-io-1.1-src.tar.gz 197922
+RMD160 ad7be482ee4eebcdc193fe78497ed17394309ab1 commons-io-1.1-src.tar.gz 197922
+SHA256 375983a026c86afee9b07405a616b3614de3f844b2530d54a5f12c06a666b92c commons-io-1.1-src.tar.gz 197922
diff --git a/dev-java/commons-jelly/ChangeLog b/dev-java/commons-jelly/ChangeLog
index 32f6523f441a..2fa761cf053a 100644
--- a/dev-java/commons-jelly/ChangeLog
+++ b/dev-java/commons-jelly/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/commons-jelly
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jelly/ChangeLog,v 1.2 2006/06/07 18:49:09 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jelly/ChangeLog,v 1.3 2006/07/22 22:54:58 nelchael Exp $
+
+*commons-jelly-1.0-r1 (22 Jul 2006)
+
+  22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +commons-jelly-1.0-r1.ebuild:
+  Migrated to Generation 2.
 
   07 Jun 2006; Joshua Nichols <jnichols@gentoo.org>
   commons-jelly-1.0.ebuild:
diff --git a/dev-java/commons-jelly/commons-jelly-1.0-r1.ebuild b/dev-java/commons-jelly/commons-jelly-1.0-r1.ebuild
new file mode 100644
index 000000000000..fd759a148c30
--- /dev/null
+++ b/dev-java/commons-jelly/commons-jelly-1.0-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jelly/commons-jelly-1.0-r1.ebuild,v 1.1 2006/07/22 22:54:58 nelchael Exp $
+
+inherit java-pkg-2 java-ant-2 eutils
+
+MY_P="${P}-src"
+DESCRIPTION="A Java and XML based scripting and processing engine"
+HOMEPAGE="http://jakarta.apache.org/commons/jelly/"
+SRC_URI="mirror://apache/jakarta/commons/jelly/source/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~x86"
+IUSE="doc test source"
+
+RDEPEND=">=virtual/jre-1.4
+	~dev-java/servletapi-2.3
+	=dev-java/commons-cli-1*
+	dev-java/commons-lang
+	dev-java/commons-discovery
+	dev-java/forehead
+	dev-java/jakarta-jstl
+	=dev-java/commons-jexl-1.0*
+	=dev-java/commons-beanutils-1.6*
+	dev-java/commons-collections
+	=dev-java/dom4j-1*
+	=dev-java/jaxen-1.1*
+	=dev-java/xerces-2*"
+
+DEPEND=">=virtual/jdk-1.4
+	dev-java/ant-core
+	test? (
+		dev-java/junit
+		dev-java/ant-tasks
+		dev-java/commons-logging
+	)
+	${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# disables dependency fetching, and remove tests as a dependency of jar
+	epatch ${FILESDIR}/${P}-gentoo.patch
+
+	mkdir -p ${S}/lib
+	cd ${S}/lib
+	java-pkg_jar-from servletapi-2.3,commons-cli-1,commons-lang
+	java-pkg_jar-from commons-discovery,forehead,jakarta-jstl,commons-jexl-1.0
+	java-pkg_jar-from commons-beanutils-1.6,commons-collections
+	java-pkg_jar-from dom4j-1,jaxen-1.1,xerces-2
+
+	if use test; then
+		java-pkg_jar-from commons-logging
+	fi
+}
+
+src_compile() {
+	local antflags="-Dlibdir=lib jar"
+	use doc && antflags="${antflags} javadoc"
+	use test && antflags="${antflags} test"
+
+	eant ${antflags} || die "Ant failed"
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.jar ${PN}.jar
+
+	dodoc NOTICE.txt README.txt RELEASE-NOTES.txt
+
+	use doc && java-pkg_dohtml -r dist/docs/api
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/commons-jelly/files/digest-commons-jelly-1.0-r1 b/dev-java/commons-jelly/files/digest-commons-jelly-1.0-r1
new file mode 100644
index 000000000000..c5964f16afb6
--- /dev/null
+++ b/dev-java/commons-jelly/files/digest-commons-jelly-1.0-r1
@@ -0,0 +1,3 @@
+MD5 d8c62cf844ca7ad8b6f34366eb2233c1 commons-jelly-1.0-src.tar.gz 174769
+RMD160 c273e80fb10327a833d192e89500a08302d68c58 commons-jelly-1.0-src.tar.gz 174769
+SHA256 113d606361845d08dab69f187690bf5dcfb5e9ca8fab780135898eb6d0a8d7d1 commons-jelly-1.0-src.tar.gz 174769
diff --git a/dev-java/commons-jexl/ChangeLog b/dev-java/commons-jexl/ChangeLog
index a1f639ceea70..1a87bb150990 100644
--- a/dev-java/commons-jexl/ChangeLog
+++ b/dev-java/commons-jexl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/commons-jexl
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jexl/ChangeLog,v 1.2 2005/05/18 20:20:30 luckyduck Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jexl/ChangeLog,v 1.3 2006/07/22 22:56:35 nelchael Exp $
+
+*commons-jexl-1.0-r1 (22 Jul 2006)
+
+  22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +commons-jexl-1.0-r1.ebuild:
+  Migrated to Generation 2.
 
   18 May 2005; Jan Brinkmann <luckyduck@gentoo.org> commons-jexl-1.0.ebuild:
   stable on amd64 and x86, added ~ppc to KEYWORDS
diff --git a/dev-java/commons-jexl/commons-jexl-1.0-r1.ebuild b/dev-java/commons-jexl/commons-jexl-1.0-r1.ebuild
new file mode 100644
index 000000000000..f7a365967813
--- /dev/null
+++ b/dev-java/commons-jexl/commons-jexl-1.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jexl/commons-jexl-1.0-r1.ebuild,v 1.1 2006/07/22 22:56:35 nelchael Exp $
+
+inherit java-pkg-2 java-ant-2 eutils
+DESCRIPTION="Expression language engine, can be embedded in applications and frameworks."
+HOMEPAGE="http://jakarta.apache.org/commons/jexl"
+SRC_URI="mirror://apache/java-repository/${PN}/distributions/${P}-src.tar.gz"
+RDEPEND=">=virtual/jre-1.4
+	dev-java/commons-logging"
+DEPEND="${RDEPEND}
+	junit? ( dev-java/ant >=dev-java/junit-3.8 >=virtual/jdk-1.4 )
+	!junit? ( dev-java/ant-core >=virtual/jdk-1.3 )"
+
+LICENSE="Apache-2.0"
+SLOT="1.0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc junit source"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.diff
+
+	mkdir -p target/lib && cd target/lib
+	use junit && java-pkg_jar-from junit junit.jar
+	java-pkg_jar-from commons-logging
+}
+
+src_compile() {
+	local antflags="jar"
+	use doc && antflags="${antflags} javadoc"
+	use junit && antflags="${antflags} test"
+	eant ${antflags} || die "compile problem"
+}
+
+src_install() {
+	java-pkg_newjar target/${P}*.jar ${PN}.jar
+
+	if use doc; then
+		dodoc RELEASE-NOTES.txt
+		java-pkg_dohtml PROPOSAL.html STATUS.html usersguide.html
+		java-pkg_dohtml -r dist/docs/
+	fi
+	use source && java-pkg_dosrc ${S}/src/java/*
+}
diff --git a/dev-java/commons-jexl/files/digest-commons-jexl-1.0 b/dev-java/commons-jexl/files/digest-commons-jexl-1.0
index 0581b2cb0479..4a66b61c9dc6 100644
--- a/dev-java/commons-jexl/files/digest-commons-jexl-1.0
+++ b/dev-java/commons-jexl/files/digest-commons-jexl-1.0
@@ -1 +1,3 @@
 MD5 a925ed8d07a1cbc12be78ce821f18f8e commons-jexl-1.0-src.tar.gz 72093
+RMD160 36e44c95bb6fdb3abdd6df0ea7d09340f7a8947a commons-jexl-1.0-src.tar.gz 72093
+SHA256 9e1036e1f333af1f4c065fabb14720d671c20d867e689dd454bde181be3bcade commons-jexl-1.0-src.tar.gz 72093
diff --git a/dev-java/commons-jexl/files/digest-commons-jexl-1.0-r1 b/dev-java/commons-jexl/files/digest-commons-jexl-1.0-r1
new file mode 100644
index 000000000000..4a66b61c9dc6
--- /dev/null
+++ b/dev-java/commons-jexl/files/digest-commons-jexl-1.0-r1
@@ -0,0 +1,3 @@
+MD5 a925ed8d07a1cbc12be78ce821f18f8e commons-jexl-1.0-src.tar.gz 72093
+RMD160 36e44c95bb6fdb3abdd6df0ea7d09340f7a8947a commons-jexl-1.0-src.tar.gz 72093
+SHA256 9e1036e1f333af1f4c065fabb14720d671c20d867e689dd454bde181be3bcade commons-jexl-1.0-src.tar.gz 72093
diff --git a/dev-java/commons-jxpath/ChangeLog b/dev-java/commons-jxpath/ChangeLog
index 44d67fcfb528..21529c65c373 100644
--- a/dev-java/commons-jxpath/ChangeLog
+++ b/dev-java/commons-jxpath/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/commons-jxpath
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/ChangeLog,v 1.9 2005/05/14 16:10:09 luckyduck Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/ChangeLog,v 1.10 2006/07/22 22:58:20 nelchael Exp $
+
+*commons-jxpath-1.1-r2 (22 Jul 2006)
+
+  22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +commons-jxpath-1.1-r2.ebuild:
+  Migrated to Generation 2.
 
 *commons-jxpath-1.1-r1 (14 May 2005)
 
diff --git a/dev-java/commons-jxpath/commons-jxpath-1.1-r2.ebuild b/dev-java/commons-jxpath/commons-jxpath-1.1-r2.ebuild
new file mode 100644
index 000000000000..f704ba298527
--- /dev/null
+++ b/dev-java/commons-jxpath/commons-jxpath-1.1-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/commons-jxpath-1.1-r2.ebuild,v 1.1 2006/07/22 22:58:20 nelchael Exp $
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Applies XPath expressions to graphs of objects of all kinds."
+HOMEPAGE="http://jakarta.apache.org/commons/jxpath/"
+SRC_URI="mirror://apache/jakarta/commons/jxpath/source/${P}-src.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=virtual/jre-1.3
+	=dev-java/commons-beanutils-1.6*
+	=dev-java/servletapi-2.3*
+	~dev-java/jdom-1.0_beta9"
+DEPEND=">=virtual/jdk-1.3
+	${RDEPEND}
+	dev-java/ant-core"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	echo "jdom.jar=$(java-pkg_getjar jdom-1.0_beta9 jdom.jar)" > build.properties
+	echo "servlet.jar=$(java-pkg_getjar servletapi-2.3 servlet.jar)" >> build.properties
+	echo "commons-beanutils.jar=$(java-pkg_getjar commons-beanutils-1.6 commons-beanutils.jar)" >> build.properties
+}
+
+src_compile() {
+	local antflags="jar"
+	use doc && antflags="${antflags} javadoc"
+	eant ${antflags} || die "compile problem"
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+
+	dohtml PROPOSAL.html STATUS.html usersguide.html
+	use doc && java-pkg_dohtml -r dist/docs/
+}
diff --git a/dev-java/commons-jxpath/files/digest-commons-jxpath-1.1-r1 b/dev-java/commons-jxpath/files/digest-commons-jxpath-1.1-r1
index 0b74e49268cb..76e048ed9096 100644
--- a/dev-java/commons-jxpath/files/digest-commons-jxpath-1.1-r1
+++ b/dev-java/commons-jxpath/files/digest-commons-jxpath-1.1-r1
@@ -1 +1,3 @@
 MD5 ec32e3521572ca678e4862892389bc5b commons-jxpath-1.1-src.tar.gz 181809
+RMD160 052ae221c9ed249e20654da1573bf80a09cd1d10 commons-jxpath-1.1-src.tar.gz 181809
+SHA256 cecfe01d7e78303ea00c1decfceffaa3ee775a3581557154b06f5007e316cf46 commons-jxpath-1.1-src.tar.gz 181809
diff --git a/dev-java/commons-jxpath/files/digest-commons-jxpath-1.1-r2 b/dev-java/commons-jxpath/files/digest-commons-jxpath-1.1-r2
new file mode 100644
index 000000000000..76e048ed9096
--- /dev/null
+++ b/dev-java/commons-jxpath/files/digest-commons-jxpath-1.1-r2
@@ -0,0 +1,3 @@
+MD5 ec32e3521572ca678e4862892389bc5b commons-jxpath-1.1-src.tar.gz 181809
+RMD160 052ae221c9ed249e20654da1573bf80a09cd1d10 commons-jxpath-1.1-src.tar.gz 181809
+SHA256 cecfe01d7e78303ea00c1decfceffaa3ee775a3581557154b06f5007e316cf46 commons-jxpath-1.1-src.tar.gz 181809
diff --git a/dev-java/commons-launcher/ChangeLog b/dev-java/commons-launcher/ChangeLog
index e13e53948b61..b0bcb5ccfb86 100644
--- a/dev-java/commons-launcher/ChangeLog
+++ b/dev-java/commons-launcher/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/commons-launcher
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-launcher/ChangeLog,v 1.11 2005/05/29 15:42:25 corsair Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-launcher/ChangeLog,v 1.12 2006/07/22 22:59:45 nelchael Exp $
+
+*commons-launcher-0.9-r1 (22 Jul 2006)
+
+  22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +commons-launcher-0.9-r1.ebuild:
+  Migrated to Generation 2.
 
   29 May 2005; Markus Rothe <corsair@gentoo.org>
   commons-launcher-0.9.ebuild:
diff --git a/dev-java/commons-launcher/commons-launcher-0.9-r1.ebuild b/dev-java/commons-launcher/commons-launcher-0.9-r1.ebuild
new file mode 100644
index 000000000000..501e866ba231
--- /dev/null
+++ b/dev-java/commons-launcher/commons-launcher-0.9-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-launcher/commons-launcher-0.9-r1.ebuild,v 1.1 2006/07/22 22:59:45 nelchael Exp $
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Commons-launcher eliminates the need for a batch or shell script to launch a Java class."
+HOMEPAGE="http://jakarta.apache.org/commons/launcher/"
+SRC_URI="ftp://ftp.ibiblio.org/pub/mirrors/apache/jakarta/commons/launcher/source/launcher-0.9-src.tar.gz"
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc source"
+DEPEND=">=virtual/jdk-1.4
+	>=dev-java/ant-core-1.4
+	source? ( app-arch/zip )"
+RDEPEND=">=virtual/jre-1.4"
+S=${WORKDIR}/${PN}
+
+src_compile() {
+	local antflags="jar"
+	use doc && antflags="${antflags} javadoc"
+	eant ${antflags} || die "compilation problem"
+}
+
+src_install() {
+	java-pkg_dojar dist/bin/*.jar || die "java-pkg_dojar died"
+	dohtml *.html
+	use doc && java-pkg_dohtml -r dist/docs/*
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/commons-launcher/files/digest-commons-launcher-0.9 b/dev-java/commons-launcher/files/digest-commons-launcher-0.9
index e0d53edefeab..bbc4650bec0e 100644
--- a/dev-java/commons-launcher/files/digest-commons-launcher-0.9
+++ b/dev-java/commons-launcher/files/digest-commons-launcher-0.9
@@ -1 +1,3 @@
 MD5 781e74002a40aa797c5c1f1758252ffe launcher-0.9-src.tar.gz 41418
+RMD160 6c4d7be5baae414eaca213fb8676bfb67c494011 launcher-0.9-src.tar.gz 41418
+SHA256 192bfa82624f3ebc2e8c27753698ff7d8075801bc833333fa54a4e1126fbefdc launcher-0.9-src.tar.gz 41418
diff --git a/dev-java/commons-launcher/files/digest-commons-launcher-0.9-r1 b/dev-java/commons-launcher/files/digest-commons-launcher-0.9-r1
new file mode 100644
index 000000000000..bbc4650bec0e
--- /dev/null
+++ b/dev-java/commons-launcher/files/digest-commons-launcher-0.9-r1
@@ -0,0 +1,3 @@
+MD5 781e74002a40aa797c5c1f1758252ffe launcher-0.9-src.tar.gz 41418
+RMD160 6c4d7be5baae414eaca213fb8676bfb67c494011 launcher-0.9-src.tar.gz 41418
+SHA256 192bfa82624f3ebc2e8c27753698ff7d8075801bc833333fa54a4e1126fbefdc launcher-0.9-src.tar.gz 41418
diff --git a/dev-java/commons-modeler/ChangeLog b/dev-java/commons-modeler/ChangeLog
index f43ecfd97ac1..c542e24afe9f 100644
--- a/dev-java/commons-modeler/ChangeLog
+++ b/dev-java/commons-modeler/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/commons-modeler
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-modeler/ChangeLog,v 1.13 2005/10/15 11:42:40 axxo Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-modeler/ChangeLog,v 1.14 2006/07/22 23:01:24 nelchael Exp $
+
+*commons-modeler-1.1-r1 (22 Jul 2006)
+
+  22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +commons-modeler-1.1-r1.ebuild:
+  Migrated to Generation 2.
 
   15 Oct 2005; Thomas Matthijs <axxo@gentoo.org> commons-modeler-1.1.ebuild:
   move dev-java/jmx dev-java/sun-jmx
diff --git a/dev-java/commons-modeler/commons-modeler-1.1-r1.ebuild b/dev-java/commons-modeler/commons-modeler-1.1-r1.ebuild
new file mode 100644
index 000000000000..f3c8bfca39b5
--- /dev/null
+++ b/dev-java/commons-modeler/commons-modeler-1.1-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-modeler/commons-modeler-1.1-r1.ebuild,v 1.1 2006/07/22 23:01:24 nelchael Exp $
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A lib to make the setup of Java Management Extensions easier"
+SRC_URI="mirror://apache/jakarta/commons/modeler/source/modeler-1.1-src.tar.gz"
+HOMEPAGE="http://jakarta.apache.org/commons/modeler/"
+LICENSE="Apache-1.1"
+SLOT="0"
+RDEPEND=">=virtual/jre-1.4
+	>=dev-java/sun-jmx-1.2.1
+	>=dev-java/commons-logging-1.0.3
+	>=dev-java/commons-digester-1.4.1
+	>=dev-java/xalan-2.5.1"
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}
+	source? ( app-arch/zip )"
+
+KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
+IUSE="doc source"
+
+S=${WORKDIR}/${P}-src
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Setup the build environment
+	echo "commons-digester.jar=$(java-pkg_getjar commons-digester commons-digester.jar)" >> build.properties
+	echo "commons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)" >> build.properties
+	echo "jmx.jar=$(java-pkg_getjar sun-jmx jmxri.jar)" >> build.properties
+	echo "jmxtools.jar=$(java-pkg_getjar sun-jmx jmxtools.jar)" >> build.properties
+	echo "jaxp.xalan.jar=$(java-pkg_getjars xalan)" >> build.properties
+	echo "junit.jar=$(java-pkg_getjars junit)" >> build.properties
+	mkdir dist
+}
+
+src_compile() {
+	local antflags="prepare jar"
+	use doc && antflags="${antflags} javadoc"
+	eant ${antflags} || die "compile problem"
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+	dodoc RELEASE-NOTES-1.1.txt RELEASE-NOTES.txt
+	use doc && java-pkg_dohtml -r docs/*
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/commons-modeler/files/digest-commons-modeler-1.1 b/dev-java/commons-modeler/files/digest-commons-modeler-1.1
index c54f1a021080..29c15fe941b8 100644
--- a/dev-java/commons-modeler/files/digest-commons-modeler-1.1
+++ b/dev-java/commons-modeler/files/digest-commons-modeler-1.1
@@ -1 +1,3 @@
 MD5 6de043186a348758c845f1a2321e8308 modeler-1.1-src.tar.gz 92211
+RMD160 dd1d1548784ff4fbc5549294b7a6bed16e319803 modeler-1.1-src.tar.gz 92211
+SHA256 41146b9e3614eda22064fbdde457750608b0cbc0ff2d904a39c5938b165fc2e7 modeler-1.1-src.tar.gz 92211
diff --git a/dev-java/commons-modeler/files/digest-commons-modeler-1.1-r1 b/dev-java/commons-modeler/files/digest-commons-modeler-1.1-r1
new file mode 100644
index 000000000000..29c15fe941b8
--- /dev/null
+++ b/dev-java/commons-modeler/files/digest-commons-modeler-1.1-r1
@@ -0,0 +1,3 @@
+MD5 6de043186a348758c845f1a2321e8308 modeler-1.1-src.tar.gz 92211
+RMD160 dd1d1548784ff4fbc5549294b7a6bed16e319803 modeler-1.1-src.tar.gz 92211
+SHA256 41146b9e3614eda22064fbdde457750608b0cbc0ff2d904a39c5938b165fc2e7 modeler-1.1-src.tar.gz 92211
diff --git a/dev-java/commons-pool/ChangeLog b/dev-java/commons-pool/ChangeLog
index 5d2bd721aaac..e1c202d1d2ba 100644
--- a/dev-java/commons-pool/ChangeLog
+++ b/dev-java/commons-pool/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/commons-pool
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-pool/ChangeLog,v 1.31 2005/12/24 21:25:53 axxo Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-pool/ChangeLog,v 1.32 2006/07/22 23:03:16 nelchael Exp $
+
+*commons-pool-1.2-r2 (22 Jul 2006)
+
+  22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +commons-pool-1.2-r2.ebuild:
+  Migrated to Generation 2.
 
   24 Dec 2005; Thomas Matthijs <axxo@gentoo.org>
   -files/commons-pool-1.2-java5.patch, commons-pool-1.2-r1.ebuild:
diff --git a/dev-java/commons-pool/commons-pool-1.2-r2.ebuild b/dev-java/commons-pool/commons-pool-1.2-r2.ebuild
new file mode 100644
index 000000000000..3adc9f602011
--- /dev/null
+++ b/dev-java/commons-pool/commons-pool-1.2-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-pool/commons-pool-1.2-r2.ebuild,v 1.1 2006/07/22 23:03:16 nelchael Exp $
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="Jakarta-Commons component providing general purpose object pooling API"
+HOMEPAGE="http://jakarta.apache.org/commons/pool/"
+SRC_URI="mirror://apache/jakarta/commons/pool/source/${P}-src.tar.gz"
+RDEPEND=">=virtual/jre-1.3
+	>=dev-java/commons-collections-2.0"
+DEPEND=">=virtual/jdk-1.3
+	>=dev-java/ant-core-1.4
+	${RDEPEND}
+	junit? ( >=dev-java/junit-3.7 )"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="junit doc"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	echo "commons-collections.jar=$(java-pkg_getjars commons-collections)" > build.properties
+	use junit && echo "junit.jar=$(java-pkg_getjars junit)" >> build.properties
+}
+
+src_compile() {
+	local antflags="build-jar"
+	# TODO move unit tests to src_test
+	use junit && antflags="${antflags} test"
+	use doc && antflags="${antflags} javadoc"
+
+	eant ${antflags} || die "Compilation Failed"
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+	dodoc README.txt
+	dohtml STATUS.html PROPOSAL.html
+
+	use doc && java-pkg_dohtml -r dist/docs/*
+}
diff --git a/dev-java/commons-pool/files/digest-commons-pool-1.2 b/dev-java/commons-pool/files/digest-commons-pool-1.2
index 6c74ccf46989..2234d8c03aa3 100644
--- a/dev-java/commons-pool/files/digest-commons-pool-1.2
+++ b/dev-java/commons-pool/files/digest-commons-pool-1.2
@@ -1 +1,3 @@
 MD5 e7dc9f479c6a4260f84f6751b434295a commons-pool-1.2-src.tar.gz 269500
+RMD160 281e734b82027ba7b7fb481105c7dd1a5a1defb3 commons-pool-1.2-src.tar.gz 269500
+SHA256 4c1d9b8ac0268be8ca6a12976d5ea009dbdd2bc9093b401e81e78de1e85e3d5e commons-pool-1.2-src.tar.gz 269500
diff --git a/dev-java/commons-pool/files/digest-commons-pool-1.2-r1 b/dev-java/commons-pool/files/digest-commons-pool-1.2-r1
index 6c74ccf46989..2234d8c03aa3 100644
--- a/dev-java/commons-pool/files/digest-commons-pool-1.2-r1
+++ b/dev-java/commons-pool/files/digest-commons-pool-1.2-r1
@@ -1 +1,3 @@
 MD5 e7dc9f479c6a4260f84f6751b434295a commons-pool-1.2-src.tar.gz 269500
+RMD160 281e734b82027ba7b7fb481105c7dd1a5a1defb3 commons-pool-1.2-src.tar.gz 269500
+SHA256 4c1d9b8ac0268be8ca6a12976d5ea009dbdd2bc9093b401e81e78de1e85e3d5e commons-pool-1.2-src.tar.gz 269500
diff --git a/dev-java/commons-pool/files/digest-commons-pool-1.2-r2 b/dev-java/commons-pool/files/digest-commons-pool-1.2-r2
new file mode 100644
index 000000000000..2234d8c03aa3
--- /dev/null
+++ b/dev-java/commons-pool/files/digest-commons-pool-1.2-r2
@@ -0,0 +1,3 @@
+MD5 e7dc9f479c6a4260f84f6751b434295a commons-pool-1.2-src.tar.gz 269500
+RMD160 281e734b82027ba7b7fb481105c7dd1a5a1defb3 commons-pool-1.2-src.tar.gz 269500
+SHA256 4c1d9b8ac0268be8ca6a12976d5ea009dbdd2bc9093b401e81e78de1e85e3d5e commons-pool-1.2-src.tar.gz 269500
diff --git a/dev-java/commons-primitives/ChangeLog b/dev-java/commons-primitives/ChangeLog
index 161c01d064a2..8f2b8566a1a8 100644
--- a/dev-java/commons-primitives/ChangeLog
+++ b/dev-java/commons-primitives/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/commons-primitives
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-primitives/ChangeLog,v 1.12 2005/07/13 09:15:02 dholm Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-primitives/ChangeLog,v 1.13 2006/07/22 23:04:39 nelchael Exp $
+
+*commons-primitives-1.0-r2 (22 Jul 2006)
+
+  22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +commons-primitives-1.0-r2.ebuild:
+  Migrated to Generation 2.
 
   13 Jul 2005; David Holm <dholm@gentoo.org>
   commons-primitives-1.0-r1.ebuild:
diff --git a/dev-java/commons-primitives/commons-primitives-1.0-r2.ebuild b/dev-java/commons-primitives/commons-primitives-1.0-r2.ebuild
new file mode 100644
index 000000000000..83c047a28510
--- /dev/null
+++ b/dev-java/commons-primitives/commons-primitives-1.0-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-primitives/commons-primitives-1.0-r2.ebuild,v 1.1 2006/07/22 23:04:39 nelchael Exp $
+
+inherit java-pkg-2
+
+DESCRIPTION="The Jakarta-Commons Primitives Component"
+HOMEPAGE="http://jakarta.apache.org/commons/primitives/"
+SRC_URI="mirror://apache/jakarta/commons/primitives/source/${P}-src.tar.gz"
+DEPEND=">=virtual/jdk-1.3
+	dev-java/ant-core"
+RDEPEND=">=virtual/jre-1.3"
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc source"
+
+src_compile() {
+	local antflags="compile"
+	use doc && antflags="${antflags} javadoc"
+	eant ${antflags} jar || die "compile problem"
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.jar ${PN}.jar
+
+	use doc && java-pkg_dohtml -r target/docs/api/*
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/commons-primitives/files/digest-commons-primitives-1.0-r1 b/dev-java/commons-primitives/files/digest-commons-primitives-1.0-r1
index 818681ba35d1..547bd1f38a69 100644
--- a/dev-java/commons-primitives/files/digest-commons-primitives-1.0-r1
+++ b/dev-java/commons-primitives/files/digest-commons-primitives-1.0-r1
@@ -1 +1,3 @@
 MD5 cc561194b876a797fe4ebef473a91764 commons-primitives-1.0-src.tar.gz 172369
+RMD160 1b5145feddd8fc043cb27549fafecb636b83063e commons-primitives-1.0-src.tar.gz 172369
+SHA256 96927b484b8cac7e33612469099e7bbd7139cbc79666d5612a32c997fa671ac4 commons-primitives-1.0-src.tar.gz 172369
diff --git a/dev-java/commons-primitives/files/digest-commons-primitives-1.0-r2 b/dev-java/commons-primitives/files/digest-commons-primitives-1.0-r2
new file mode 100644
index 000000000000..547bd1f38a69
--- /dev/null
+++ b/dev-java/commons-primitives/files/digest-commons-primitives-1.0-r2
@@ -0,0 +1,3 @@
+MD5 cc561194b876a797fe4ebef473a91764 commons-primitives-1.0-src.tar.gz 172369
+RMD160 1b5145feddd8fc043cb27549fafecb636b83063e commons-primitives-1.0-src.tar.gz 172369
+SHA256 96927b484b8cac7e33612469099e7bbd7139cbc79666d5612a32c997fa671ac4 commons-primitives-1.0-src.tar.gz 172369
diff --git a/dev-java/commons-transaction/ChangeLog b/dev-java/commons-transaction/ChangeLog
index 12126a76f3c6..c9e5447e779e 100644
--- a/dev-java/commons-transaction/ChangeLog
+++ b/dev-java/commons-transaction/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/commons-transaction
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-transaction/ChangeLog,v 1.2 2005/07/12 13:29:02 axxo Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-transaction/ChangeLog,v 1.3 2006/07/22 23:06:08 nelchael Exp $
+
+*commons-transaction-1.0.1-r1 (22 Jul 2006)
+
+  22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +commons-transaction-1.0.1-r1.ebuild:
+  Migrated to Generation 2.
 
   12 Jul 2005; Thomas Matthijs <axxo@gentoo.org>
   commons-transaction-1.0.1.ebuild:
diff --git a/dev-java/commons-transaction/commons-transaction-1.0.1-r1.ebuild b/dev-java/commons-transaction/commons-transaction-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..b694f2fdc0e8
--- /dev/null
+++ b/dev-java/commons-transaction/commons-transaction-1.0.1-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-transaction/commons-transaction-1.0.1-r1.ebuild,v 1.1 2006/07/22 23:06:08 nelchael Exp $
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Commons Transaction aims at providing lightweight, standardized, well tested and efficient implementations of utility classes commonly used in transactional Java programming."
+HOMEPAGE="http://jakarta.apache.org/commons/transaction/"
+SRC_URI="mirror://apache/jakarta/commons/transaction/source/${P}-src.tgz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc source"
+
+RDEPEND=">=virtual/jre-1.4
+	dev-java/commons-codec
+	dev-java/jta
+	dev-java/log4j"
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}
+	dev-java/ant-core
+	source? ( app-arch/zip )"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}/lib
+	rm -f *.jar
+	java-pkg_jar-from commons-codec
+	java-pkg_jar-from log4j
+	java-pkg_jar-from jta
+}
+
+src_compile() {
+	local antflags="jar"
+	use doc && antflags="${antflags} javadocs"
+	eant ${antflags} jar || die "Compilation failed"
+}
+
+src_install() {
+	java-pkg_newjar dist/lib/${P}.jar ${PN}.jar
+
+	dodoc NOTICE.txt REAME.txt RELEASE-NOTES.txt
+	java-pkg_dohtml -r build/doc/* xdocs
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/commons-transaction/files/digest-commons-transaction-1.0.1 b/dev-java/commons-transaction/files/digest-commons-transaction-1.0.1
index c352f68cd146..202726bf9a61 100644
--- a/dev-java/commons-transaction/files/digest-commons-transaction-1.0.1
+++ b/dev-java/commons-transaction/files/digest-commons-transaction-1.0.1
@@ -1 +1,3 @@
 MD5 2ec968e144f84e8d0ab193757bd4e306 commons-transaction-1.0.1-src.tgz 849934
+RMD160 9852690c3a78fc9e4998cc99862553dbe0985f24 commons-transaction-1.0.1-src.tgz 849934
+SHA256 2840697b784ae544de00e3b4876b34a1cef2a869e17d0397cf2087fa5d0b8882 commons-transaction-1.0.1-src.tgz 849934
diff --git a/dev-java/commons-transaction/files/digest-commons-transaction-1.0.1-r1 b/dev-java/commons-transaction/files/digest-commons-transaction-1.0.1-r1
new file mode 100644
index 000000000000..202726bf9a61
--- /dev/null
+++ b/dev-java/commons-transaction/files/digest-commons-transaction-1.0.1-r1
@@ -0,0 +1,3 @@
+MD5 2ec968e144f84e8d0ab193757bd4e306 commons-transaction-1.0.1-src.tgz 849934
+RMD160 9852690c3a78fc9e4998cc99862553dbe0985f24 commons-transaction-1.0.1-src.tgz 849934
+SHA256 2840697b784ae544de00e3b4876b34a1cef2a869e17d0397cf2087fa5d0b8882 commons-transaction-1.0.1-src.tgz 849934
diff --git a/dev-java/commons-validator/ChangeLog b/dev-java/commons-validator/ChangeLog
index c04959d5781e..58bdd9424682 100644
--- a/dev-java/commons-validator/ChangeLog
+++ b/dev-java/commons-validator/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/commons-validator
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/ChangeLog,v 1.28 2005/11/26 13:36:10 betelgeuse Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/ChangeLog,v 1.29 2006/07/22 23:08:18 nelchael Exp $
+
+*commons-validator-1.1.4-r1 (22 Jul 2006)
+
+  22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +commons-validator-1.1.4-r1.ebuild:
+  Migrated to Generation 2.
 
 *commons-validator-1.1.4 (26 Nov 2005)
 
diff --git a/dev-java/commons-validator/commons-validator-1.1.4-r1.ebuild b/dev-java/commons-validator/commons-validator-1.1.4-r1.ebuild
new file mode 100644
index 000000000000..ccbdcdc31abe
--- /dev/null
+++ b/dev-java/commons-validator/commons-validator-1.1.4-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/commons-validator-1.1.4-r1.ebuild,v 1.1 2006/07/22 23:08:18 nelchael Exp $
+
+inherit java-pkg-2 java-ant-2
+
+MY_P=${P}-src
+DESCRIPTION="Jakarta component to validate user input, or data input"
+HOMEPAGE="http://jakarta.apache.org/commons/validator/"
+SRC_URI="mirror://apache/jakarta/commons/validator/source/${MY_P}.tar.gz
+		 mirror://gentoo/${P}-gentoo-missingfiles.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="doc examples source"
+
+# Was not able to test on 1.3 jdk at this point. Feel free to to lower this
+# back to 1.3 if you have tested it on one and proved working. Then you
+# probably need to bring the xerces dependency back.
+
+RDEPEND=">=virtual/jre-1.4
+	=dev-java/jakarta-oro-2.0*
+	>=dev-java/commons-digester-1.5
+	>=dev-java/commons-collections-3.1
+	>=dev-java/commons-logging-1.0.3
+	=dev-java/commons-beanutils-1.6*"
+
+DEPEND=">=virtual/jdk-1.4
+	>=dev-java/ant-1.4
+	${RDEPEND}
+	source? ( app-arch/zip )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	rm *.jar
+	#dirty hack
+	sed -e 's:target name="compile" depends="static":target name="compile" depends="prepare":' -i build.xml \
+		|| die "Failed to sed build.xml"
+
+	echo "oro.jar=$(java-pkg_getjars jakarta-oro-2.0)" >> build.properties
+	echo "commons-digester.jar=$(java-pkg_getjars commons-digester)" >> build.properties
+	echo "commons-beanutils.jar=$(java-pkg_getjars commons-beanutils-1.6)" >> build.properties
+}
+
+src_compile() {
+	local antflags="compile"
+
+	# Because the build.xml file uses <pathelement location=""> 
+	# we can only have only have one jar per property
+	antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)"
+	antflags="${antflags} -Dcommons-collections.jar=$(java-pkg_getjars commons-collections)"
+
+	use doc && antflags="${antflags} javadoc"
+
+	eant ${antflags} || die "build failed"
+	jar -cf ${PN}.jar -C target/classes/ . || die "could not create jar"
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+
+	if use doc; then
+		java-pkg_dohtml -r dist/docs/
+		java-pkg_dohtml PROPOSAL.html STATUS.html
+	fi
+
+	if use examples; then
+		dodir /usr/share/doc/${PF}/examples
+		cp -r src/example/* ${D}/usr/share/doc/${PF}/examples
+	fi
+
+	use source && java-pkg_dosrc src/share/*
+}
diff --git a/dev-java/commons-validator/files/digest-commons-validator-1.1.4 b/dev-java/commons-validator/files/digest-commons-validator-1.1.4
index 2e6415ae09aa..f946d7fddab8 100644
--- a/dev-java/commons-validator/files/digest-commons-validator-1.1.4
+++ b/dev-java/commons-validator/files/digest-commons-validator-1.1.4
@@ -1,2 +1,6 @@
 MD5 62aa855c6c61dce1e5e3e94f0dbb911f commons-validator-1.1.4-gentoo-missingfiles.tar.bz2 4161
+RMD160 cde4c6187078fbae86d0d05ccd2d15561efcf55c commons-validator-1.1.4-gentoo-missingfiles.tar.bz2 4161
+SHA256 40e6ec6f1856e2340bf86f331d4a628c0045f025645ba79dc2ce660132fab1bc commons-validator-1.1.4-gentoo-missingfiles.tar.bz2 4161
 MD5 6a4ef07da77dd86223e80870999448e8 commons-validator-1.1.4-src.tar.gz 181446
+RMD160 d9067980087e963083f96506319fb5f1a53549dd commons-validator-1.1.4-src.tar.gz 181446
+SHA256 02a46f9f3cd654d68471a62094b3bf1edc26f43e7fd4a2174fbcd30d49676844 commons-validator-1.1.4-src.tar.gz 181446
diff --git a/dev-java/commons-validator/files/digest-commons-validator-1.1.4-r1 b/dev-java/commons-validator/files/digest-commons-validator-1.1.4-r1
new file mode 100644
index 000000000000..f946d7fddab8
--- /dev/null
+++ b/dev-java/commons-validator/files/digest-commons-validator-1.1.4-r1
@@ -0,0 +1,6 @@
+MD5 62aa855c6c61dce1e5e3e94f0dbb911f commons-validator-1.1.4-gentoo-missingfiles.tar.bz2 4161
+RMD160 cde4c6187078fbae86d0d05ccd2d15561efcf55c commons-validator-1.1.4-gentoo-missingfiles.tar.bz2 4161
+SHA256 40e6ec6f1856e2340bf86f331d4a628c0045f025645ba79dc2ce660132fab1bc commons-validator-1.1.4-gentoo-missingfiles.tar.bz2 4161
+MD5 6a4ef07da77dd86223e80870999448e8 commons-validator-1.1.4-src.tar.gz 181446
+RMD160 d9067980087e963083f96506319fb5f1a53549dd commons-validator-1.1.4-src.tar.gz 181446
+SHA256 02a46f9f3cd654d68471a62094b3bf1edc26f43e7fd4a2174fbcd30d49676844 commons-validator-1.1.4-src.tar.gz 181446
diff --git a/dev-java/xml-commons/ChangeLog b/dev-java/xml-commons/ChangeLog
index 051a01b778c7..501f7c584344 100644
--- a/dev-java/xml-commons/ChangeLog
+++ b/dev-java/xml-commons/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/xml-commons
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-commons/ChangeLog,v 1.12 2005/11/29 18:31:08 betelgeuse Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-commons/ChangeLog,v 1.13 2006/07/22 23:10:19 nelchael Exp $
+
+*xml-commons-1.0_beta2-r1 (22 Jul 2006)
+
+  22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +xml-commons-1.0_beta2-r1.ebuild:
+  Migrated to Generation 2.
 
   29 Nov 2005; Petteri Räty <betelgeuse@gentoo.org>
   xml-commons-1.0_beta2.ebuild:
diff --git a/dev-java/xml-commons/files/digest-xml-commons-1.0_beta2 b/dev-java/xml-commons/files/digest-xml-commons-1.0_beta2
index c3f557fc91c2..86439ff51227 100644
--- a/dev-java/xml-commons/files/digest-xml-commons-1.0_beta2
+++ b/dev-java/xml-commons/files/digest-xml-commons-1.0_beta2
@@ -1 +1,3 @@
 MD5 6c6551ece56948ee535d5f5014489b8d xml-commons-1.0.b2.tar.gz 1821110
+RMD160 eef68ff81875db60993ee09a5c7c034075f75426 xml-commons-1.0.b2.tar.gz 1821110
+SHA256 22b9e53919e4aa15fdd074a515c8a8dc9823a91d72eb91fbb3e1bd8cfc488375 xml-commons-1.0.b2.tar.gz 1821110
diff --git a/dev-java/xml-commons/files/digest-xml-commons-1.0_beta2-r1 b/dev-java/xml-commons/files/digest-xml-commons-1.0_beta2-r1
new file mode 100644
index 000000000000..86439ff51227
--- /dev/null
+++ b/dev-java/xml-commons/files/digest-xml-commons-1.0_beta2-r1
@@ -0,0 +1,3 @@
+MD5 6c6551ece56948ee535d5f5014489b8d xml-commons-1.0.b2.tar.gz 1821110
+RMD160 eef68ff81875db60993ee09a5c7c034075f75426 xml-commons-1.0.b2.tar.gz 1821110
+SHA256 22b9e53919e4aa15fdd074a515c8a8dc9823a91d72eb91fbb3e1bd8cfc488375 xml-commons-1.0.b2.tar.gz 1821110
diff --git a/dev-java/xml-commons/xml-commons-1.0_beta2-r1.ebuild b/dev-java/xml-commons/xml-commons-1.0_beta2-r1.ebuild
new file mode 100644
index 000000000000..488adddc6eca
--- /dev/null
+++ b/dev-java/xml-commons/xml-commons-1.0_beta2-r1.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/xml-commons/xml-commons-1.0_beta2-r1.ebuild,v 1.1 2006/07/22 23:10:19 nelchael Exp $
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_PV=${PV/_beta/.b}
+MY_P=${PN}-${MY_PV}
+DESCRIPTION="Jakarta project for for XML bindings for java"
+HOMEPAGE="http://xml.apache.org/commons/"
+SRC_URI="mirror://apache/xml/commons/${MY_P}.tar.gz"
+
+# Resolver is under Apache-1.1
+# SAX2 is public-domain
+# DOM documentation is under W3C-document
+# DOM software is under W3C
+# See ${S}/java/external for the license files
+LICENSE="Apache-1.1 public-domain W3C-document W3C"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc source"
+
+DEPEND=">=virtual/jdk-1.4
+	dev-java/ant-core
+	source? ( app-arch/zip )"
+RDEPEND=">=virtual/jre-1.4"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${PV}-jdk15.patch
+}
+
+src_compile() {
+	local antflags="jar"
+	use doc && antflags="${antflags} javadocs"
+
+	cd ${S}/java
+	eant -f resolver.xml ${antflags} || die "XML-Resolver Compile failed"
+	eant -f which.xml ${antflags} || die "XML-Which Compile failed"
+}
+
+src_install() {
+	java-pkg_dojar java/build/which.jar
+	java-pkg_dojar java/build/resolver.jar
+	java-pkg_dojar java/external/build/xml-apis.jar
+
+	dodoc README.html
+	use doc && java-pkg_dohtml -r java/build/docs/*
+	use source && java-pkg_dosrc java/src/org
+}