Migrated to Generation 2.

Package-Manager: portage-2.1.1_pre3-r1

16 files changed, 223 insertions, 7 deletions

diff --git a/dev-java/commons-cli/ChangeLog b/dev-java/commons-cli/ChangeLog
index 4aa83c71b578..db795a0b5792 100644
--- a/dev-java/commons-cli/ChangeLog
+++ b/dev-java/commons-cli/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/commons-cli
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-cli/ChangeLog,v 1.20 2005/09/21 07:00:00 betelgeuse Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-cli/ChangeLog,v 1.21 2006/07/20 11:18:02 nelchael Exp $
+
+*commons-cli-1.0-r5 (20 Jul 2006)
+
+  20 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +commons-cli-1.0-r5.ebuild:
+  Migrated to Generation 2.
 
   21 Sep 2005; Petteri Räty <betelgeuse@gentoo.org>
   commons-cli-1.0-r4.ebuild:
diff --git a/dev-java/commons-cli/commons-cli-1.0-r5.ebuild b/dev-java/commons-cli/commons-cli-1.0-r5.ebuild
new file mode 100644
index 000000000000..0997ed3225b1
--- /dev/null
+++ b/dev-java/commons-cli/commons-cli-1.0-r5.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-cli/commons-cli-1.0-r5.ebuild,v 1.1 2006/07/20 11:18:02 nelchael Exp $
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="The CLI library provides a simple and easy to use API for working with the command line arguments and options."
+HOMEPAGE="http://jakarta.apache.org/commons/cli/"
+SRC_URI="mirror://apache/jakarta/commons/cli/source/cli-${PV}-src.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="1"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc junit source"
+
+RDEPEND=">=virtual/jre-1.3
+	>=dev-java/commons-logging-1.0
+	=dev-java/commons-lang-2.0*"
+DEPEND=">=virtual/jdk-1.3
+	${RDEPEND}
+	junit? ( >=dev-java/junit-3.7  >=dev-java/ant-tasks-1.6.2 )
+	source? ( app-arch/zip )
+	>=dev-java/ant-core-1.6.2"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-gentoo.diff
+	echo "commons-logging.jar=$(java-pkg_getjar commons-logging	commons-logging.jar)" >> build.properties
+	echo "commons-lang.jar=$(java-pkg_getjars commons-lang)" >> build.properties
+	use junit && echo "junit.jar=$(java-pkg_getjars junit)" >> build.properties
+}
+
+src_compile() {
+	local antflags="jar"
+	use doc && antflags="${antflags} javadoc"
+	use junit && antflags="${antflags} test"
+	eant ${antflags} || die "compilation failed"
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.jar ${PN}.jar
+
+	dodoc README.txt
+	use doc && java-pkg_dohtml -r target/docs/
+	use source && java-pkg_dosrc src/java/*
+}
+
diff --git a/dev-java/commons-cli/files/digest-commons-cli-1.0-r4 b/dev-java/commons-cli/files/digest-commons-cli-1.0-r4
index 9fa950d9ac6b..5e7e22c5da3b 100644
--- a/dev-java/commons-cli/files/digest-commons-cli-1.0-r4
+++ b/dev-java/commons-cli/files/digest-commons-cli-1.0-r4
@@ -1 +1,3 @@
 MD5 ba34d585046b1f17dacbb13b377f4255 cli-1.0-src.tar.gz 37046
+RMD160 85404f803751f50e980c4cd976cd930f6be0ef9f cli-1.0-src.tar.gz 37046
+SHA256 fa4bf0850c896a9d5679f30d9921a98b3d262678019433f36ef810235ae58ec8 cli-1.0-src.tar.gz 37046
diff --git a/dev-java/commons-cli/files/digest-commons-cli-1.0-r5 b/dev-java/commons-cli/files/digest-commons-cli-1.0-r5
new file mode 100644
index 000000000000..5e7e22c5da3b
--- /dev/null
+++ b/dev-java/commons-cli/files/digest-commons-cli-1.0-r5
@@ -0,0 +1,3 @@
+MD5 ba34d585046b1f17dacbb13b377f4255 cli-1.0-src.tar.gz 37046
+RMD160 85404f803751f50e980c4cd976cd930f6be0ef9f cli-1.0-src.tar.gz 37046
+SHA256 fa4bf0850c896a9d5679f30d9921a98b3d262678019433f36ef810235ae58ec8 cli-1.0-src.tar.gz 37046
diff --git a/dev-java/commons-logging/ChangeLog b/dev-java/commons-logging/ChangeLog
index 30f9eaffc78f..9e61e9f94fc6 100644
--- a/dev-java/commons-logging/ChangeLog
+++ b/dev-java/commons-logging/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/commons-logging
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v 1.36 2005/12/25 13:10:07 betelgeuse Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v 1.37 2006/07/20 11:21:37 nelchael Exp $
+
+*commons-logging-1.0.4-r2 (20 Jul 2006)
+
+  20 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +commons-logging-1.0.4-r2.ebuild:
+  Migrated to Generation 2.
 
   25 Dec 2005; Petteri Räty <betelgeuse@gentoo.org>
   commons-logging-1.0.4-r1.ebuild:
diff --git a/dev-java/commons-logging/commons-logging-1.0.4-r2.ebuild b/dev-java/commons-logging/commons-logging-1.0.4-r2.ebuild
new file mode 100644
index 000000000000..1942243364bf
--- /dev/null
+++ b/dev-java/commons-logging/commons-logging-1.0.4-r2.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-logging/commons-logging-1.0.4-r2.ebuild,v 1.1 2006/07/20 11:21:37 nelchael Exp $
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="The Jakarta-Commons Logging package is an ultra-thin bridge between different logging libraries."
+HOMEPAGE="http://jakarta.apache.org/commons/logging/"
+SRC_URI="mirror://apache/jakarta/commons/logging/source/${P}-src.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="avalon doc source"
+
+RDEPEND=">=virtual/jre-1.3
+	=dev-java/avalon-logkit-1.2*
+	dev-java/log4j
+	avalon? ( =dev-java/avalon-framework-4.2* )"
+DEPEND=">=virtual/jdk-1.3
+	dev-java/ant-core
+	source? ( app-arch/zip )
+	${RDEPEND}"
+
+S="${WORKDIR}/${P}-src/"
+
+ant_src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	echo "log4j.jar=$(java-pkg_getjars log4j)" > build.properties
+	echo "logkit.jar=$(java-pkg_getjars avalon-logkit-1.2)" >> build.properties
+	use avalon && echo "avalon-framework.jar=$(java-pkg_getjars avalon-framework-4.2)" >> build.properties
+}
+
+src_compile() {
+	local antflags="compile"
+	use doc && antflags="${antflags} javadoc"
+	eant ${antflags} || die "compile problem"
+}
+
+src_install() {
+	java-pkg_dojar target/${PN}-api.jar target/${PN}.jar
+
+	dodoc RELEASE-NOTES.txt
+	dohtml PROPOSAL.html STATUS.html
+	use doc && java-pkg_dohtml -r dist/docs/
+	use source && java-pkg_dosrc src/java/org
+}
diff --git a/dev-java/commons-logging/files/digest-commons-logging-1.0.4-r1 b/dev-java/commons-logging/files/digest-commons-logging-1.0.4-r1
index f624da15c5f7..2e608f379dca 100644
--- a/dev-java/commons-logging/files/digest-commons-logging-1.0.4-r1
+++ b/dev-java/commons-logging/files/digest-commons-logging-1.0.4-r1
@@ -1 +1,3 @@
 MD5 db5dc75c89e794f794be92d10df6be1b commons-logging-1.0.4-src.tar.gz 101017
+RMD160 9d92e16433e858fc1c2db7b9c65b07ed11ad28fc commons-logging-1.0.4-src.tar.gz 101017
+SHA256 0752546b1c60e42c4d98cf36354872e22626368bfce252625ea91f1885aa9482 commons-logging-1.0.4-src.tar.gz 101017
diff --git a/dev-java/commons-logging/files/digest-commons-logging-1.0.4-r2 b/dev-java/commons-logging/files/digest-commons-logging-1.0.4-r2
new file mode 100644
index 000000000000..2e608f379dca
--- /dev/null
+++ b/dev-java/commons-logging/files/digest-commons-logging-1.0.4-r2
@@ -0,0 +1,3 @@
+MD5 db5dc75c89e794f794be92d10df6be1b commons-logging-1.0.4-src.tar.gz 101017
+RMD160 9d92e16433e858fc1c2db7b9c65b07ed11ad28fc commons-logging-1.0.4-src.tar.gz 101017
+SHA256 0752546b1c60e42c4d98cf36354872e22626368bfce252625ea91f1885aa9482 commons-logging-1.0.4-src.tar.gz 101017
diff --git a/dev-java/concurrent-util/ChangeLog b/dev-java/concurrent-util/ChangeLog
index d4cd253940f5..622b649fa69d 100644
--- a/dev-java/concurrent-util/ChangeLog
+++ b/dev-java/concurrent-util/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/concurrent-util
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/concurrent-util/ChangeLog,v 1.10 2006/01/08 09:05:32 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/concurrent-util/ChangeLog,v 1.11 2006/07/20 11:23:33 nelchael Exp $
+
+*concurrent-util-1.3.4-r1 (20 Jul 2006)
+
+  20 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +concurrent-util-1.3.4-r1.ebuild:
+  Migrated to Generation 2.
 
   08 Jan 2006; Joseph Jezak <josejx@gentoo.org>
   concurrent-util-1.3.4.ebuild:
diff --git a/dev-java/concurrent-util/concurrent-util-1.3.4-r1.ebuild b/dev-java/concurrent-util/concurrent-util-1.3.4-r1.ebuild
new file mode 100644
index 000000000000..ef396f694dc6
--- /dev/null
+++ b/dev-java/concurrent-util/concurrent-util-1.3.4-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/concurrent-util/concurrent-util-1.3.4-r1.ebuild,v 1.1 2006/07/20 11:23:33 nelchael Exp $
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Doug Lea's concurrency utilities provide standardized, efficient versions of utility classes commonly encountered in concurrent Java programming."
+SRC_URI="mirror://gentoo/gentoo-concurrent-util-1.3.4.tar.bz2"
+HOMEPAGE="http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html"
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+RDEPEND=">=virtual/jre-1.2"
+DEPEND=">=virtual/jdk-1.2
+	>=dev-java/ant-core-1.5
+	source? ( app-arch/zip )"
+IUSE="doc source"
+
+src_compile() {
+	local antflags="jar"
+	use doc && antflags="${antflags} doc"
+	eant ${antflags} || die "failed to build"
+}
+
+src_install() {
+	java-pkg_dojar build/lib/concurrent.jar
+	use source && java-pkg_dosrc src/java/*
+
+	if use doc ; then
+		cd build
+		java-pkg_dohtml -r javadoc
+		insinto /usr/share/doc/${PF}/demo
+		doins demo/*
+	fi
+}
diff --git a/dev-java/concurrent-util/files/digest-concurrent-util-1.3.4 b/dev-java/concurrent-util/files/digest-concurrent-util-1.3.4
index bd5858c37d8f..3a7e5689d9af 100644
--- a/dev-java/concurrent-util/files/digest-concurrent-util-1.3.4
+++ b/dev-java/concurrent-util/files/digest-concurrent-util-1.3.4
@@ -1 +1,3 @@
 MD5 c514558da800e625a0cac4237107b8d7 gentoo-concurrent-util-1.3.4.tar.bz2 136648
+RMD160 ebf8dd66a5ba43b7a6da69f4c8c74c1ee768bc3b gentoo-concurrent-util-1.3.4.tar.bz2 136648
+SHA256 3cf419c3eeb6623fd189c24d005c61edde4d7f6350599e5837de879a0fd95f62 gentoo-concurrent-util-1.3.4.tar.bz2 136648
diff --git a/dev-java/concurrent-util/files/digest-concurrent-util-1.3.4-r1 b/dev-java/concurrent-util/files/digest-concurrent-util-1.3.4-r1
new file mode 100644
index 000000000000..3a7e5689d9af
--- /dev/null
+++ b/dev-java/concurrent-util/files/digest-concurrent-util-1.3.4-r1
@@ -0,0 +1,3 @@
+MD5 c514558da800e625a0cac4237107b8d7 gentoo-concurrent-util-1.3.4.tar.bz2 136648
+RMD160 ebf8dd66a5ba43b7a6da69f4c8c74c1ee768bc3b gentoo-concurrent-util-1.3.4.tar.bz2 136648
+SHA256 3cf419c3eeb6623fd189c24d005c61edde4d7f6350599e5837de879a0fd95f62 gentoo-concurrent-util-1.3.4.tar.bz2 136648
diff --git a/dev-java/jakarta-regexp/ChangeLog b/dev-java/jakarta-regexp/ChangeLog
index f08010fdae38..81f25197b476 100644
--- a/dev-java/jakarta-regexp/ChangeLog
+++ b/dev-java/jakarta-regexp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jakarta-regexp
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-regexp/ChangeLog,v 1.7 2005/08/07 12:42:13 betelgeuse Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-regexp/ChangeLog,v 1.8 2006/07/20 11:25:52 nelchael Exp $
+
+*jakarta-regexp-1.3-r3 (20 Jul 2006)
+
+  20 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +jakarta-regexp-1.3-r3.ebuild:
+  Migrated to Generation 2.
 
   07 Aug 2005; Petteri Räty <betelgeuse@gentoo.org>
   -jakarta-regexp-1.3-r1.ebuild, jakarta-regexp-1.3-r2.ebuild:
diff --git a/dev-java/jakarta-regexp/files/digest-jakarta-regexp-1.3-r2 b/dev-java/jakarta-regexp/files/digest-jakarta-regexp-1.3-r2
index 804595133e20..7d8e27ca3759 100644
--- a/dev-java/jakarta-regexp/files/digest-jakarta-regexp-1.3-r2
+++ b/dev-java/jakarta-regexp/files/digest-jakarta-regexp-1.3-r2
@@ -1 +1,3 @@
 MD5 4322f82bea908ca4a7db270f7fa4850d jakarta-regexp-1.3.tar.gz 127069
+RMD160 1327fe8d1534849c2150dbb0a3bbd9b6455d0165 jakarta-regexp-1.3.tar.gz 127069
+SHA256 4cff646b26b258897bf0bafe64dfb6d1422611ecbfaf4787a78f2e042be1366e jakarta-regexp-1.3.tar.gz 127069
diff --git a/dev-java/jakarta-regexp/files/digest-jakarta-regexp-1.3-r3 b/dev-java/jakarta-regexp/files/digest-jakarta-regexp-1.3-r3
new file mode 100644
index 000000000000..7d8e27ca3759
--- /dev/null
+++ b/dev-java/jakarta-regexp/files/digest-jakarta-regexp-1.3-r3
@@ -0,0 +1,3 @@
+MD5 4322f82bea908ca4a7db270f7fa4850d jakarta-regexp-1.3.tar.gz 127069
+RMD160 1327fe8d1534849c2150dbb0a3bbd9b6455d0165 jakarta-regexp-1.3.tar.gz 127069
+SHA256 4cff646b26b258897bf0bafe64dfb6d1422611ecbfaf4787a78f2e042be1366e jakarta-regexp-1.3.tar.gz 127069
diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r3.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.3-r3.ebuild
new file mode 100644
index 000000000000..6ab3645cc814
--- /dev/null
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.3-r3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-regexp/jakarta-regexp-1.3-r3.ebuild,v 1.1 2006/07/20 11:25:52 nelchael Exp $
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="100% Pure Java Regular Expression package"
+SRC_URI="mirror://apache/jakarta/regexp/source/${P}.tar.gz"
+HOMEPAGE="http://jakarta.apache.org/"
+SLOT="1.3"
+IUSE="doc source"
+LICENSE="Apache-1.1"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+DEPEND=">=virtual/jdk-1.4
+	dev-java/ant-core
+	source? ( app-arch/zip )"
+RDEPEND=">=virtual/jre-1.3"
+
+ant_src_unpack() {
+	unpack ${A}
+	cd ${S}
+	rm *.jar
+	mkdir lib
+	sed -i 's:./jakarta-site2::' build.xml || die "sed failed"
+}
+
+src_compile() {
+	local antflags="jar"
+	use doc && antflags="${antflags} javadocs"
+	eant ${antflags} || die "compile problem"
+}
+
+src_install() {
+	cd ${S}/build
+	java-pkg_newjar ${P}.jar ${PN}.jar
+
+	use doc && java-pkg_dohtml -r docs/api/*
+	use source && java-pkg_dosrc ${S}/src/java/*
+}