4 files changed, 73 insertions, 57 deletions
diff --git a/dev-java/poi/ChangeLog b/dev-java/poi/ChangeLog
index 8ad0eea75d20..1cd2162774a3 100644
--- a/dev-java/poi/ChangeLog
+++ b/dev-java/poi/ChangeLog
@@ -1,49 +1,10 @@
 # ChangeLog for dev-java/poi
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/poi/ChangeLog,v 1.10 2005/05/14 16:09:34 luckyduck Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/poi/ChangeLog,v 1.11 2005/10/07 20:42:09 betelgeuse Exp $
 
-*poi-2.5-r2 (14 May 2005)
+*poi-2.5.1 (07 Oct 2005)
 
-  14 May 2005; Jan Brinkmann <luckyduck@gentoo.org> -poi-2.5-r1.ebuild,
-  +poi-2.5-r2.ebuild:
-  updated commons-beanutils dependency to reflect new slotting. see #71952
-
-  04 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
-  -files/poi-2.0-jikes-fix.patch, -poi-2.0.ebuild, poi-2.5-r1.ebuild:
-  stable on ppc
-
-  06 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> poi-2.5-r1.ebuild,
-  -poi-2.5.ebuild:
-  latest revision stable on x86 and amd64, removed old version.
-
-  22 Oct 2004; Dylan Carlson <absinthe@gentoo.org> poi-2.0.ebuild,
-  poi-2.5-r1.ebuild, poi-2.5.ebuild:
-  Keywords ~amd64.
-
-*poi-2.5-r1 (19 Sep 2004)
-
-  19 Sep 2004; Thomas Matthijs <axxo@gentoo.org> +poi-2.5-r1.ebuild:
-  Doesn't use packed jars anymore, thanks too Mark Wolfe
-  <mwolfe@netspace.net.au>. The ebuild also evilly fetched other jars it then
-  used, i corrected those. closes #63263
-
-*poi-2.5 (22 Jul 2004)
-
-  22 Jul 2004; Thomas Matthijs <axxo@gentoo.org>
-  +files/poi-2.0-jikes-fix.patch, +files/poi-2.5-jikes-fix.patch,
-  poi-2.0.ebuild, +poi-2.5.ebuild:
-  added junit use flag: run junit tests
-  new upstream version + patch to fix compilation with jikes (closes 57863)
-  added depend on jikes
-
-  20 Apr 2004; Martin Holzer <mholzer@gentoo.org> poi-2.0.ebuild:
-  src_uri now uses mirror://apache
-
-  22 Mar 2004; Chris Aniszczyk <zx@gentoo.org> poi-2.0.ebuild:
-  Stable on x86. Fixes according to #45398
-
-*poi-2.0 (27 Feb 2004)
-
-  27 Feb 2004; Chris Aniszczyk <zx@gentoo.org> metadata.xml, poi-2.0.ebuild:
-  Initial Import. Closes #41175
+  07 Oct 2005; Petteri Räty <betelgeuse@gentoo.org> +poi-2.5.1.ebuild:
+  Version bump with added support for doc and source use flags. Also, poi now
+  only depends on ant-core instead of full ant.
 
diff --git a/dev-java/poi/Manifest b/dev-java/poi/Manifest
index 4325e8a037b6..00c4009f28e1 100644
--- a/dev-java/poi/Manifest
+++ b/dev-java/poi/Manifest
@@ -1,15 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 d46f736bccdce71619e63b4bd8acbe92 poi-2.5-r2.ebuild 1910
 MD5 03e6fd2d325b9e014aa6abd0b1c67e20 ChangeLog 1747
-MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 34ac7de875dec815d44a2bdbf7f4a64f files/digest-poi-2.5-r2 79
+MD5 2e7d58ced4af69ab26ddf0bf76cb173f files/digest-poi-2.5.1 81
 MD5 bf71154ca919a88d8c12da29e33ef4d9 files/poi-2.5-jikes-fix.patch 1190
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDPkZq/rLF9B432nYRAsPiAKCm18r2cX24vi52QuU1zN63UN3YGACeNoJz
-IF4KKVD9MhgckT3QVzukyt8=
-=Q7wE
------END PGP SIGNATURE-----
+MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 4c69ee3be9303d417654cae682838931 poi-2.5-r2.ebuild 1915
+MD5 ee2db078f3a05b1258e3419a03e87d20 poi-2.5.1.ebuild 2077
diff --git a/dev-java/poi/files/digest-poi-2.5.1 b/dev-java/poi/files/digest-poi-2.5.1
new file mode 100644
index 000000000000..ccb928e0bfc7
--- /dev/null
+++ b/dev-java/poi/files/digest-poi-2.5.1
@@ -0,0 +1 @@
+MD5 d80052119b2d6746f103d49f915b0ad8 poi-src-2.5.1-final-20040804.tar.gz 6870414
diff --git a/dev-java/poi/poi-2.5.1.ebuild b/dev-java/poi/poi-2.5.1.ebuild
new file mode 100644
index 000000000000..00b2d3c63b9e
--- /dev/null
+++ b/dev-java/poi/poi-2.5.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/poi/poi-2.5.1.ebuild,v 1.1 2005/10/07 20:42:09 betelgeuse Exp $
+
+inherit java-pkg eutils
+
+DESCRIPTION="Java API To Access Microsoft Format Files"
+HOMEPAGE="http://jakarta.apache.org/poi/"
+SRC_URI="mirror://apache/jakarta/poi/release/src/${PN}-src-${PV}-final-20040804.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc jikes source"
+
+RDEPEND=">=virtual/jre-1.2
+	>=dev-java/commons-logging-1.0
+	>=dev-java/log4j-1.2.8
+	=dev-java/commons-beanutils-1.6*
+	>=dev-java/commons-collections-2.1
+	=dev-java/commons-lang-2.0*
+	=dev-java/xerces-2.6*"
+DEPEND=">=virtual/jdk-1.2
+	${RDEPEND}
+	>=dev-java/ant-core-1.4
+	jikes? ( dev-java/jikes )"
+S=${WORKDIR}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	rm -f src/contrib/lib/*.jar lib/*.jar
+
+	epatch ${FILESDIR}/${PN}-2.5-jikes-fix.patch
+	sed -e 's:<target name="init" depends="check-jars,fetch-jars">:<target name="init" depends="check-jars">:' -i build.xml
+
+	cd ${S}/lib
+	java-pkg_jar-from log4j log4j.jar log4j-1.2.8.jar
+	java-pkg_jar-from commons-logging commons-logging.jar commons-logging-1.0.1.jar
+	cd ${S}/src/contrib/lib
+	java-pkg_jar-from commons-beanutils-1.6 commons-beanutils.jar commons-beanutils-1.6.jar
+	java-pkg_jar-from commons-collections commons-collections.jar commons-collections-2.1.jar
+	java-pkg_jar-from commons-lang commons-lang.jar commons-lang-1.0-b1.jar
+	java-pkg_jar-from xerces-2 xmlParserAPIs.jar xmlParserAPIs-2.2.1.jar
+	java-pkg_jar-from xerces-2 xercesImpl.jar xercesImpl-2.4.0.jar
+}
+
+src_compile() {
+	local antflags="jar"
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+	ant ${antflags} || die "compile problem"
+}
+
+src_install() {
+	use doc && java-pkg_dohtml -r docs/*
+	use source && java-pkg_dosrc src/contrib/src/org src/java/org/ src/scratchpad/src/org
+
+	cd build/dist/
+	java-pkg_newjar poi-scratchpad-${PV}* ${PN}-scratchpad.jar
+	java-pkg_newjar poi-contrib-${PV}* ${PN}-contrib.jar
+	java-pkg_newjar poi-${PV}* ${PN}.jar
+}