Migrated to generation 2 and fixed dependencies.

Package-Manager: portage-2.1.2_rc4-r1

6 files changed, 100 insertions, 13 deletions

diff --git a/dev-java/poi/ChangeLog b/dev-java/poi/ChangeLog
index 49bd0577e46d..836e08215658 100644
--- a/dev-java/poi/ChangeLog
+++ b/dev-java/poi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/poi
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/poi/ChangeLog,v 1.16 2006/11/30 15:52:35 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/poi/ChangeLog,v 1.17 2006/12/29 23:56:58 betelgeuse Exp $
+
+*poi-2.5.1-r1 (29 Dec 2006)
+
+  29 Dec 2006; Petteri Räty <betelgeuse@gentoo.org> +poi-2.5.1-r1.ebuild:
+  Migrated to generation 2 and fixed dependencies.
 
   30 Nov 2006; Vlastimil Babka <caster@gentoo.org> poi-2.5-r2.ebuild,
   poi-2.5.1.ebuild:
diff --git a/dev-java/poi/Manifest b/dev-java/poi/Manifest
index d4c2ea205635..fdd09611adc1 100644
--- a/dev-java/poi/Manifest
+++ b/dev-java/poi/Manifest
@@ -1,28 +1,49 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX poi-2.5-jikes-fix.patch 1190 RMD160 f7cf0f41d37e6010edd5ca081f0a7566862991bb SHA1 e525737b05fe8a84700bbe1cc677e1416d781843 SHA256 a786c5d718e3b934101607eeb7c76c2a5b5d8e245cde9e502d14cfecfc85bcf4
 MD5 bf71154ca919a88d8c12da29e33ef4d9 files/poi-2.5-jikes-fix.patch 1190
 RMD160 f7cf0f41d37e6010edd5ca081f0a7566862991bb files/poi-2.5-jikes-fix.patch 1190
 SHA256 a786c5d718e3b934101607eeb7c76c2a5b5d8e245cde9e502d14cfecfc85bcf4 files/poi-2.5-jikes-fix.patch 1190
-DIST poi-src-2.5-final-20040302.tar.gz 6878720
-DIST poi-src-2.5.1-final-20040804.tar.gz 6870414
+DIST poi-src-2.5-final-20040302.tar.gz 6878720 RMD160 06d52dd6ddca704732ff9a2d58816b40156c10b8 SHA1 8f9e88a78ce15ff68592754a482ba63065b3d3c6 SHA256 862e8a1e0b843d794efc69d0faedc3330704bf06df73097ae4be2fbb2ade1a37
+DIST poi-src-2.5.1-final-20040804.tar.gz 6870414 RMD160 47707ec7db9cb5b2650d6eddaf0f351fee3237f5 SHA1 3d7f211e47f58007c3d0bcf891adba33d25482d5 SHA256 783c6c36b9762aafd3386adcfbe71ad46aaa14d9fe20545c4a60eb591cfe0cc1
 EBUILD poi-2.5-r2.ebuild 1843 RMD160 f0ee2ab887478d51e486ddc60c12b7c1bb041533 SHA1 ea9fdce1ef560879ba043c041ae8fa3f3ba90f1b SHA256 ce2e996c5c3acc21aa5aa3191e296b154a10aaff8d30184f1608171e1940b9b9
 MD5 3d45ada2f6ba98361e138ebb917d55c4 poi-2.5-r2.ebuild 1843
 RMD160 f0ee2ab887478d51e486ddc60c12b7c1bb041533 poi-2.5-r2.ebuild 1843
 SHA256 ce2e996c5c3acc21aa5aa3191e296b154a10aaff8d30184f1608171e1940b9b9 poi-2.5-r2.ebuild 1843
+EBUILD poi-2.5.1-r1.ebuild 1560 RMD160 95b8a41271cbc305028fb49f5e12ae927db40335 SHA1 c787a4348d8a7ddea911a33e490042492d1f73ef SHA256 34d31d990f015788e8a362a2a3cb29bf889b3cf78115631960417f0fc2ceec29
+MD5 4a21a309076b213b7ce4f080c2af1bcc poi-2.5.1-r1.ebuild 1560
+RMD160 95b8a41271cbc305028fb49f5e12ae927db40335 poi-2.5.1-r1.ebuild 1560
+SHA256 34d31d990f015788e8a362a2a3cb29bf889b3cf78115631960417f0fc2ceec29 poi-2.5.1-r1.ebuild 1560
 EBUILD poi-2.5.1.ebuild 2035 RMD160 fb800b54007494e0c9f1ac326c0b01f7b7eea430 SHA1 c1b3578e4a20dbbe7604749c1a6158c25950a1e9 SHA256 d91010dd3d7bba3a1ef41404d69cafe4bda7d8a259fbea0941b008c9a9399687
 MD5 82d2169d91d4def1c02e747117cf9a51 poi-2.5.1.ebuild 2035
 RMD160 fb800b54007494e0c9f1ac326c0b01f7b7eea430 poi-2.5.1.ebuild 2035
 SHA256 d91010dd3d7bba3a1ef41404d69cafe4bda7d8a259fbea0941b008c9a9399687 poi-2.5.1.ebuild 2035
-MISC ChangeLog 2626 RMD160 41789bcf58a7d13317e2142c2859c75828d68ec4 SHA1 a0f116ecd140f3db1d34dde2031ad3c90be65af5 SHA256 5642d8f558afba6f455b4836c2de5fd90acd786f559bd2511f795c7b2465a222
-MD5 b0ec172948c56d0babe52904912fe78f ChangeLog 2626
-RMD160 41789bcf58a7d13317e2142c2859c75828d68ec4 ChangeLog 2626
-SHA256 5642d8f558afba6f455b4836c2de5fd90acd786f559bd2511f795c7b2465a222 ChangeLog 2626
+MISC .poi-2.5.1-r1.ebuild.swp 12288 RMD160 c6ded66b918bfabffbe6be08dfb31d14962c4e98 SHA1 43be5acde261b8a2a3dba48444952bc0551a707b SHA256 c816caee95810d4a897fb063db6b5e0a925a760e8079e34fac8ff18e69c7e3fd
+MD5 4aba01cf39ff28806500e92801f7d159 .poi-2.5.1-r1.ebuild.swp 12288
+RMD160 c6ded66b918bfabffbe6be08dfb31d14962c4e98 .poi-2.5.1-r1.ebuild.swp 12288
+SHA256 c816caee95810d4a897fb063db6b5e0a925a760e8079e34fac8ff18e69c7e3fd .poi-2.5.1-r1.ebuild.swp 12288
+MISC ChangeLog 2786 RMD160 50a2864720783fa42ae00c8970d1755ad76f5033 SHA1 389922914b277374c9a8ff8c8b4a512034f7bf53 SHA256 bfcb7c6ff1ecb716434de8845de3564d88e0adc7f2fe4134a778f166f932b02d
+MD5 808f84f480cb04a623672794701a0cdf ChangeLog 2786
+RMD160 50a2864720783fa42ae00c8970d1755ad76f5033 ChangeLog 2786
+SHA256 bfcb7c6ff1ecb716434de8845de3564d88e0adc7f2fe4134a778f166f932b02d ChangeLog 2786
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata.xml 157
-MD5 34ac7de875dec815d44a2bdbf7f4a64f files/digest-poi-2.5-r2 79
-RMD160 ef646bd118913e1c40bd526e502e3c561599539d files/digest-poi-2.5-r2 79
-SHA256 21493dd767c6f6806d416a390b3ef67fbb4521f956f0e140cd979abd4c5ad338 files/digest-poi-2.5-r2 79
-MD5 2e7d58ced4af69ab26ddf0bf76cb173f files/digest-poi-2.5.1 81
-RMD160 072da248836c37914e059b4d046aafe70b2a763d files/digest-poi-2.5.1 81
-SHA256 67a2b1d52e60e1f391c49744c4324b50e2f68ee00c20799ba82d4b8c64b18fc9 files/digest-poi-2.5.1 81
+MD5 52403408346cf24e26749a44fc23b1e8 files/digest-poi-2.5-r2 283
+RMD160 654b273321c53ed3665c859ef12a289d04951393 files/digest-poi-2.5-r2 283
+SHA256 792e4869ab25b456b5f59cda0572fdf8a88a3a17dc53dd03653bd2ecc4e59116 files/digest-poi-2.5-r2 283
+MD5 dc268d3c0bfdbd437b92674b5acb87fc files/digest-poi-2.5.1 289
+RMD160 26e2aefebb6a47a977170b40c36d4200fd959b11 files/digest-poi-2.5.1 289
+SHA256 f35e533477f27bb7a77aa9cee9a58abbc90eafddd334b0b1364237733110ec44 files/digest-poi-2.5.1 289
+MD5 dc268d3c0bfdbd437b92674b5acb87fc files/digest-poi-2.5.1-r1 289
+RMD160 26e2aefebb6a47a977170b40c36d4200fd959b11 files/digest-poi-2.5.1-r1 289
+SHA256 f35e533477f27bb7a77aa9cee9a58abbc90eafddd334b0b1364237733110ec44 files/digest-poi-2.5.1-r1 289
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFFlatYcxLzpIGCsLQRAlW+AJ9BVVjqFzox0bPY0yRz585QmkgsVwCfa8jr
+EL2YOrCRdkk9bivgRxZyFKE=
+=WjeM
+-----END PGP SIGNATURE-----
diff --git a/dev-java/poi/files/digest-poi-2.5-r2 b/dev-java/poi/files/digest-poi-2.5-r2
index 1a3f8246b36e..7e81e4483003 100644
--- a/dev-java/poi/files/digest-poi-2.5-r2
+++ b/dev-java/poi/files/digest-poi-2.5-r2
@@ -1 +1,3 @@
 MD5 b45cd066ff4a8ca4a9555839722e7f80 poi-src-2.5-final-20040302.tar.gz 6878720
+RMD160 06d52dd6ddca704732ff9a2d58816b40156c10b8 poi-src-2.5-final-20040302.tar.gz 6878720
+SHA256 862e8a1e0b843d794efc69d0faedc3330704bf06df73097ae4be2fbb2ade1a37 poi-src-2.5-final-20040302.tar.gz 6878720
diff --git a/dev-java/poi/files/digest-poi-2.5.1 b/dev-java/poi/files/digest-poi-2.5.1
index ccb928e0bfc7..cf60ff5e150b 100644
--- a/dev-java/poi/files/digest-poi-2.5.1
+++ b/dev-java/poi/files/digest-poi-2.5.1
@@ -1 +1,3 @@
 MD5 d80052119b2d6746f103d49f915b0ad8 poi-src-2.5.1-final-20040804.tar.gz 6870414
+RMD160 47707ec7db9cb5b2650d6eddaf0f351fee3237f5 poi-src-2.5.1-final-20040804.tar.gz 6870414
+SHA256 783c6c36b9762aafd3386adcfbe71ad46aaa14d9fe20545c4a60eb591cfe0cc1 poi-src-2.5.1-final-20040804.tar.gz 6870414
diff --git a/dev-java/poi/files/digest-poi-2.5.1-r1 b/dev-java/poi/files/digest-poi-2.5.1-r1
new file mode 100644
index 000000000000..cf60ff5e150b
--- /dev/null
+++ b/dev-java/poi/files/digest-poi-2.5.1-r1
@@ -0,0 +1,3 @@
+MD5 d80052119b2d6746f103d49f915b0ad8 poi-src-2.5.1-final-20040804.tar.gz 6870414
+RMD160 47707ec7db9cb5b2650d6eddaf0f351fee3237f5 poi-src-2.5.1-final-20040804.tar.gz 6870414
+SHA256 783c6c36b9762aafd3386adcfbe71ad46aaa14d9fe20545c4a60eb591cfe0cc1 poi-src-2.5.1-final-20040804.tar.gz 6870414
diff --git a/dev-java/poi/poi-2.5.1-r1.ebuild b/dev-java/poi/poi-2.5.1-r1.ebuild
new file mode 100644
index 000000000000..1ee7d78078b9
--- /dev/null
+++ b/dev-java/poi/poi-2.5.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/poi/poi-2.5.1-r1.ebuild,v 1.1 2006/12/29 23:56:58 betelgeuse Exp $
+
+inherit eutils java-pkg-2 java-ant-2
+
+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 source"
+
+RDEPEND=">=virtual/jre-1.4
+	dev-java/xalan
+	>=dev-java/commons-logging-1.0
+	>=dev-java/log4j-1.2.8
+	=dev-java/commons-beanutils-1.6*
+	=dev-java/commons-lang-2.0*"
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}
+	>=dev-java/ant-core-1.4"
+
+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
+	java-ant_rewrite-classpath build.xml
+}
+
+src_compile() {
+	# prepackaged docs
+	local deps="xalan,commons-logging,junit,commons-beanutils-1.6"
+	deps="${deps},commons-lang,log4j"
+	eant jar \
+		-Dgentoo.classpath=$(java-pkg_getjars ${deps} )
+}
+
+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
+}