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

Package-Manager: portage-2.1.2.7

6 files changed, 114 insertions, 30 deletions

diff --git a/dev-java/commons-dbcp/Manifest b/dev-java/commons-dbcp/Manifest
index 4ee79e25c372..622ee0990996 100644
--- a/dev-java/commons-dbcp/Manifest
+++ b/dev-java/commons-dbcp/Manifest
@@ -3,18 +3,18 @@ Hash: SHA1
 
 DIST commons-dbcp-1.2.1-src.tar.gz 578573 RMD160 397b1da0c870b6dc460a652c1cd695708f648719 SHA1 82db8bc09ab13b139c3ca3efffb223c8bc9c4a09 SHA256 31a2806955c667460222d2ebf3ec11f88181ccef7d4e10eb683cff55626a0061
 DIST commons-dbcp-1.2.2-src.tar.gz 641291 RMD160 271dcf459e2a4693f193481130bef67ac42e26ab SHA1 34ce36c8bb2f0e125e668066ae938bf9391e88b9 SHA256 62ba04a48f14cfe7d3aa415fb3a57547955a63a6f422ac79ca1da08f3660edd9
-EBUILD commons-dbcp-1.2.1-r1.ebuild 1261 RMD160 e93cb65fcba100f8c63add8750e6faac0bde7508 SHA1 cf94d41e202646e9765783baa0eea4bcdee64529 SHA256 bfce5ee7d0b871512d150e947587985899c10dd81d428493b71fbc9023154be2
-MD5 499d0c54d5cf668fa46260a0f81f377d commons-dbcp-1.2.1-r1.ebuild 1261
-RMD160 e93cb65fcba100f8c63add8750e6faac0bde7508 commons-dbcp-1.2.1-r1.ebuild 1261
-SHA256 bfce5ee7d0b871512d150e947587985899c10dd81d428493b71fbc9023154be2 commons-dbcp-1.2.1-r1.ebuild 1261
-EBUILD commons-dbcp-1.2.2.ebuild 1450 RMD160 986b5ce14ffe1a53e37cb5bb6171f4b8f75e8133 SHA1 adc3fa6ce76023ce956922d3a84f0fd4d5fc42b2 SHA256 56a6e5562dc52a6a78f817e3438561af9fb2ec8030270b6fb15baf8683af5e57
-MD5 5ab4474a39a4f8a6dd0571d8d1d725b9 commons-dbcp-1.2.2.ebuild 1450
-RMD160 986b5ce14ffe1a53e37cb5bb6171f4b8f75e8133 commons-dbcp-1.2.2.ebuild 1450
-SHA256 56a6e5562dc52a6a78f817e3438561af9fb2ec8030270b6fb15baf8683af5e57 commons-dbcp-1.2.2.ebuild 1450
-MISC ChangeLog 5074 RMD160 7c8b1670cf686aa0f20be07ce9dcc2b884ced970 SHA1 874594df1c720c452c4882a2f3826ea91e6d0fd3 SHA256 88968229409839322012185521f0a2ed937ab7971cdc8f542071b1c75c53b428
-MD5 93ddc2779ac27d9102bcbb58cbd7183e ChangeLog 5074
-RMD160 7c8b1670cf686aa0f20be07ce9dcc2b884ced970 ChangeLog 5074
-SHA256 88968229409839322012185521f0a2ed937ab7971cdc8f542071b1c75c53b428 ChangeLog 5074
+EBUILD commons-dbcp-1.2.1-r1.ebuild 1263 RMD160 e3ea0a7727575dbd0aa9369c55fde3cb1ace938a SHA1 07389bcebb66376bc0a5ccaf64ec016bdb32518c SHA256 351a850703d1c4fea8a879d178bb67e2146a1e89c54a5b5b720e343cf71d88e3
+MD5 20760645fdb0a43dd73e2d65c8200a01 commons-dbcp-1.2.1-r1.ebuild 1263
+RMD160 e3ea0a7727575dbd0aa9369c55fde3cb1ace938a commons-dbcp-1.2.1-r1.ebuild 1263
+SHA256 351a850703d1c4fea8a879d178bb67e2146a1e89c54a5b5b720e343cf71d88e3 commons-dbcp-1.2.1-r1.ebuild 1263
+EBUILD commons-dbcp-1.2.2.ebuild 1449 RMD160 1d736630b16bd255e59ac5693791e1c47d583b10 SHA1 71932d19b92d8460b46a6052787f882b0785807a SHA256 c31ba984e000b3929c047d87d7b8b6aa040bc71de713a2e21d7fa719d03d9403
+MD5 ae23b3cb6722893930c60be5f9609668 commons-dbcp-1.2.2.ebuild 1449
+RMD160 1d736630b16bd255e59ac5693791e1c47d583b10 commons-dbcp-1.2.2.ebuild 1449
+SHA256 c31ba984e000b3929c047d87d7b8b6aa040bc71de713a2e21d7fa719d03d9403 commons-dbcp-1.2.2.ebuild 1449
+MISC ChangeLog 5281 RMD160 5b1a06c56a752cc826da7370ecf7913af99b983b SHA1 a20532bbd24dc2aead94be09de25800f381c75d4 SHA256 c3f7c090f31751e8933765365d64692cd31aa252a6827b85d03bbaf8688c7145
+MD5 4d9b6911427b49b167ce5686794128a1 ChangeLog 5281
+RMD160 5b1a06c56a752cc826da7370ecf7913af99b983b ChangeLog 5281
+SHA256 c3f7c090f31751e8933765365d64692cd31aa252a6827b85d03bbaf8688c7145 ChangeLog 5281
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -26,9 +26,9 @@ MD5 ebc4b310cb485d4162e0484b4fed86d9 files/digest-commons-dbcp-1.2.2 268
 RMD160 7ae828c040e4232f4f2a0017e29ec3a65a20d734 files/digest-commons-dbcp-1.2.2 268
 SHA256 97af3a5716c35be3c4880c1b1f1b1df55455b4f78040259311eba32b420937a4 files/digest-commons-dbcp-1.2.2 268
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGSj74cxLzpIGCsLQRAmYdAJ9bbzt7L+rwGvUvGzfxruBPMh0f6QCdFpkv
-771zYD5Gz8mIy7y3Hb+7tu4=
-=lAi+
+iD8DBQFGVKnIAiZjviIA2XgRAmyQAKDztaXmcHDVF0A7NJOOmyyM8YKyrwCePjsh
+a+c6AI2TJDjnVn3Dm6LO/2E=
+=zAHA
 -----END PGP SIGNATURE-----
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/Manifest b/dev-java/poi/Manifest
index e6e2089d894b..92b887d69fb7 100644
--- a/dev-java/poi/Manifest
+++ b/dev-java/poi/Manifest
@@ -15,14 +15,18 @@ EBUILD poi-2.5.1-r1.ebuild 1624 RMD160 3f7f4af6ad9f1a41bc413c0dce075601e2496689
 MD5 c15dde6871548a1df7d54e18d4699153 poi-2.5.1-r1.ebuild 1624
 RMD160 3f7f4af6ad9f1a41bc413c0dce075601e2496689 poi-2.5.1-r1.ebuild 1624
 SHA256 f16f5b758d6a37c1b406587223a98f4ccb84417b8e537aa08eb082c16514595d poi-2.5.1-r1.ebuild 1624
-EBUILD poi-3.0.ebuild 2104 RMD160 51402913f997402cd5499fc5a114704dc8d55972 SHA1 08f88956667e7fb0ab9a550484210118a350d77b SHA256 9273727da8934975bddca1a5ba0a0d0cdcf91e76062e83757cdf9c936b6dab05
-MD5 5d6282e8114e23a78d5ca1a18313ceda poi-3.0.ebuild 2104
-RMD160 51402913f997402cd5499fc5a114704dc8d55972 poi-3.0.ebuild 2104
-SHA256 9273727da8934975bddca1a5ba0a0d0cdcf91e76062e83757cdf9c936b6dab05 poi-3.0.ebuild 2104
-MISC ChangeLog 4052 RMD160 84a12cc94cb85eed31e3f673520b5c51a47be46c SHA1 645d561282dee8e7c74bacc9ff4d447d5832a1e8 SHA256 32bdfcdb29b5f689f60ab7225f48ba3ce41876b42b4f9c442f799ee24e4778e0
-MD5 490b002a67ed85dfd0737c0b7fa8dacf ChangeLog 4052
-RMD160 84a12cc94cb85eed31e3f673520b5c51a47be46c ChangeLog 4052
-SHA256 32bdfcdb29b5f689f60ab7225f48ba3ce41876b42b4f9c442f799ee24e4778e0 ChangeLog 4052
+EBUILD poi-3.0-r1.ebuild 2111 RMD160 edc7276904d52ddf239fd96057de200f59a33f7a SHA1 54ee87e66dc2a6175b12de6f5fc5ae227ce3d8b9 SHA256 724c8a429c17426459aedf139185eada5a3cd032b875ae6cdc4cd2f4abf98f10
+MD5 f925e498bdba6cd5256fa0fb73f77de5 poi-3.0-r1.ebuild 2111
+RMD160 edc7276904d52ddf239fd96057de200f59a33f7a poi-3.0-r1.ebuild 2111
+SHA256 724c8a429c17426459aedf139185eada5a3cd032b875ae6cdc4cd2f4abf98f10 poi-3.0-r1.ebuild 2111
+EBUILD poi-3.0.ebuild 2108 RMD160 b6a16f05c12dc4d0ec70a77878be7459e3115c15 SHA1 0da1c108efc452390d8e0ed40135d87415b7da72 SHA256 af6faae28928dd8e153499ca416c6f4c1bb1e0b67c02880638995d2d6aaf4df1
+MD5 54288c6cb1948daf2c54f15e05547df0 poi-3.0.ebuild 2108
+RMD160 b6a16f05c12dc4d0ec70a77878be7459e3115c15 poi-3.0.ebuild 2108
+SHA256 af6faae28928dd8e153499ca416c6f4c1bb1e0b67c02880638995d2d6aaf4df1 poi-3.0.ebuild 2108
+MISC ChangeLog 4245 RMD160 4a0520d48fcd7540593083e59a13985bfe2dedc2 SHA1 04fe1bf7a469db616e837891002a9eab953f7c82 SHA256 141f41706c3da6f361d67f8f2847b964c43c3e3ae02f38f408b37e1c2294179d
+MD5 290fdfaac22d38e7384f574c232a1886 ChangeLog 4245
+RMD160 4a0520d48fcd7540593083e59a13985bfe2dedc2 ChangeLog 4245
+SHA256 141f41706c3da6f361d67f8f2847b964c43c3e3ae02f38f408b37e1c2294179d ChangeLog 4245
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -33,10 +37,13 @@ SHA256 f35e533477f27bb7a77aa9cee9a58abbc90eafddd334b0b1364237733110ec44 files/di
 MD5 ea8f76271c168dac230c84b92a4fee0b files/digest-poi-3.0 286
 RMD160 37a83c503a01666940229bf98551953704c1b2ea files/digest-poi-3.0 286
 SHA256 2c25f03585175e624b8a3abbcdd873cb6a7d129bc96fcc9bebc09126c4359530 files/digest-poi-3.0 286
+MD5 ea8f76271c168dac230c84b92a4fee0b files/digest-poi-3.0-r1 286
+RMD160 37a83c503a01666940229bf98551953704c1b2ea files/digest-poi-3.0-r1 286
+SHA256 2c25f03585175e624b8a3abbcdd873cb6a7d129bc96fcc9bebc09126c4359530 files/digest-poi-3.0-r1 286
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGUzCncxLzpIGCsLQRAmwhAJ0V+Y56poZR1cYaU48kdUxYvx+0FgCdF0md
-uHaZaq2PRDLq+uPSva74Kn4=
-=ev/k
+iD8DBQFGVKlUcxLzpIGCsLQRAm7NAKCFA6KzLe4/Gl/E6668akQ2CmrCHwCeNjFU
+wNRxAD47gwq2Py1EpNoVCII=
+=g5zB
 -----END PGP SIGNATURE-----
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() {