Use commons-lang-2.1 so that dependencies and ebuild usage are in sync.

(Portage version: 2.1.2.7)

4 files changed, 80 insertions, 3 deletions

diff --git a/dev-java/poi/ChangeLog b/dev-java/poi/ChangeLog
index 123f47f4ddba..9cbf4d3d3859 100644
--- a/dev-java/poi/ChangeLog
+++ b/dev-java/poi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/poi
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/poi/ChangeLog,v 1.29 2007/05/22 18:04:17 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/poi/ChangeLog,v 1.30 2007/05/23 20:51:25 betelgeuse Exp $
+
+*poi-3.0-r1 (23 May 2007)
+
+  23 May 2007; Petteri Räty <betelgeuse@gentoo.org> poi-3.0.ebuild,
+  +poi-3.0-r1.ebuild:
+  Use commons-lang-2.1 so that dependencies and ebuild usage are in sync.
 
   22 May 2007; Petteri Räty <betelgeuse@gentoo.org>
   +files/poi-3.0-src-isDateFormat.patch:
diff --git a/dev-java/poi/files/digest-poi-3.0-r1 b/dev-java/poi/files/digest-poi-3.0-r1
new file mode 100644
index 000000000000..28a8e3799ec4
--- /dev/null
+++ b/dev-java/poi/files/digest-poi-3.0-r1
@@ -0,0 +1,3 @@
+MD5 1fb488c4061256197a667f1c480ffc33 poi-src-3.0-FINAL-20070503.tar.gz 16284462
+RMD160 e4db3f249324ca84fb2b7b99d96c1879ebaf08ca poi-src-3.0-FINAL-20070503.tar.gz 16284462
+SHA256 48a5aabb873d4cc654c95acf6576868d7a8a3ee97e1c6418e1d716698b6efa76 poi-src-3.0-FINAL-20070503.tar.gz 16284462
diff --git a/dev-java/poi/poi-3.0-r1.ebuild b/dev-java/poi/poi-3.0-r1.ebuild
new file mode 100644
index 000000000000..034071be7613
--- /dev/null
+++ b/dev-java/poi/poi-3.0-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/poi/poi-3.0-r1.ebuild,v 1.1 2007/05/23 20:51:25 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc examples source"
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java API To Access Microsoft Format Files"
+HOMEPAGE="http://jakarta.apache.org/poi/"
+RELEASE_DATE="20070503"
+SRC_URI="mirror://apache/jakarta/poi/release/src/${PN}-src-${PV}-FINAL-${RELEASE_DATE}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+COMMON_DEPEND="
+	=dev-java/commons-beanutils-1.7*
+	=dev-java/commons-lang-2.1*
+	>=dev-java/commons-logging-1.1"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEPEND}"
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEPEND}
+	test? ( dev-java/ant-junit )"
+
+S=${WORKDIR}/${P}-rc4
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch ${FILESDIR}/${P}-src-isDateFormat.patch
+
+	find -name "*.jar" | xargs rm -v
+
+	cd "${S}/lib"
+	java-pkg_jar-from commons-logging commons-logging.jar commons-logging-1.1.jar
+	use test && java-pkg_jar-from --build-only junit junit.jar junit-3.8.1.jar
+
+	cd "${S}/src/contrib/lib"
+	java-pkg_jar-from commons-beanutils-1.7 commons-beanutils.jar commons-beanutils-1.7.0.jar
+	java-pkg_jar-from commons-lang-2.1 commons-lang.jar commons-lang-2.1.jar
+}
+
+src_compile() {
+	# the same target compiles the source and the test so we just mess with
+	# the source directory
+	eant jar $(use_doc javadocs) -Ddisconnected=true \
+		$(use !test && echo -Dmain.src.test=legal -Dscratchpad.src.test=legal)
+}
+
+src_test() {
+	ANT_TASKS="ant-junit" eant test -Ddisconnected=true
+}
+
+src_install() {
+	use doc && java-pkg_dojavadoc build/tmp/site/build/site/*
+	use examples && java-pkg_doexamples src/examples/* src/scratchpad/examples/*
+	use source && java-pkg_dosrc src/contrib/src/org src/java/org src/scratchpad/src/org
+
+	cd build/dist
+	local VERSION=$(get_version_component_range 1-2)
+	java-pkg_newjar poi-scratchpad-${VERSION}* ${PN}-scratchpad.jar
+	java-pkg_newjar poi-contrib-${VERSION}* ${PN}-contrib.jar
+	java-pkg_newjar poi-${VERSION}* ${PN}.jar
+}
diff --git a/dev-java/poi/poi-3.0.ebuild b/dev-java/poi/poi-3.0.ebuild
index 05c3eb80e929..2bfa5102e053 100644
--- a/dev-java/poi/poi-3.0.ebuild
+++ b/dev-java/poi/poi-3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/poi/poi-3.0.ebuild,v 1.1 2007/05/22 18:00:03 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/poi/poi-3.0.ebuild,v 1.2 2007/05/23 20:51:25 betelgeuse Exp $
 
 JAVA_PKG_IUSE="doc examples source"
 inherit java-pkg-2 java-ant-2
@@ -41,7 +41,7 @@ src_unpack() {
 
 	cd "${S}/src/contrib/lib"
 	java-pkg_jar-from commons-beanutils-1.7 commons-beanutils.jar commons-beanutils-1.7.0.jar
-	java-pkg_jar-from commons-lang commons-lang.jar commons-lang-2.1.jar
+	java-pkg_jar-from commons-lang-2.1 commons-lang.jar commons-lang-2.1.jar
 }
 
 src_compile() {