Added java-pkg_jar-from calls for log4j back because poi directly uses log4j. The ebuilds worked because of LOCALCLASSPATH path in /usr/bin/ant.

Package-Manager: portage-2.0.53

4 files changed, 20 insertions, 9 deletions

diff --git a/dev-java/poi/ChangeLog b/dev-java/poi/ChangeLog
index c998e76d5559..3fbe8745cd60 100644
--- a/dev-java/poi/ChangeLog
+++ b/dev-java/poi/ChangeLog
@@ -1,6 +1,11 @@
 # 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.14 2005/12/15 05:32:50 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/poi/ChangeLog,v 1.15 2005/12/16 14:08:33 betelgeuse Exp $
+
+  16 Dec 2005; Petteri Räty <betelgeuse@gentoo.org> poi-2.5-r2.ebuild,
+  poi-2.5.1.ebuild:
+  Added java-pkg_jar-from calls for log4j back because poi directly uses
+  log4j. The ebuilds worked because of LOCALCLASSPATH path in /usr/bin/ant.
 
   15 Dec 2005; Joshua Nichols <nichoj@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 6e82b5171506..c3582f1c1df9 100644
--- a/dev-java/poi/Manifest
+++ b/dev-java/poi/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 f1454830d68e16b16d8a7b2d1ebdeb29 ChangeLog 2246
+MD5 89e0f8352b002748442d217bd949ca09 ChangeLog 2492
 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
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 b68b9602bb1a8abb0a4e3254cc2cbf4c poi-2.5-r2.ebuild 1767
-MD5 407e5d0e4d3e4015e0e5833e5b0f30c9 poi-2.5.1.ebuild 1959
+MD5 aa5948b2e91b384a44a3174db2156011 poi-2.5-r2.ebuild 1847
+MD5 b7d2fb806be4e5ec53b490ae9c414a98 poi-2.5.1.ebuild 2039
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDoQEindWRXhKOboURAsgTAKCMaw+gFo4T2Qr04WQnFmXPRl1ImgCfXp3r
-Yxd/Vo1ss8F7lVb9mQ+XJJQ=
-=NQe+
+iD8DBQFDospuQiJ/wx066S4RAvWIAJ9tsARhnkZKjkzN0jLn4/QS74ivhACffTAk
+WmWpvr9nfpE+cQ3eBxks11M=
+=DD3I
 -----END PGP SIGNATURE-----
diff --git a/dev-java/poi/poi-2.5-r2.ebuild b/dev-java/poi/poi-2.5-r2.ebuild
index 4f9e3ef5ebef..2b02e8fcc734 100644
--- a/dev-java/poi/poi-2.5-r2.ebuild
+++ b/dev-java/poi/poi-2.5-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r2.ebuild,v 1.5 2005/12/15 05:32:50 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/poi/poi-2.5-r2.ebuild,v 1.6 2005/12/16 14:08:33 betelgeuse Exp $
 
 inherit java-pkg eutils
 
@@ -15,6 +15,7 @@ IUSE="jikes"
 
 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*
@@ -35,6 +36,8 @@ src_unpack() {
 
 	cd ${S}/lib
 	java-pkg_jar-from commons-logging commons-logging.jar commons-logging-1.0.1.jar
+	java-pkg_jar-from log4j log4j.jar log4j-1.2.8.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
diff --git a/dev-java/poi/poi-2.5.1.ebuild b/dev-java/poi/poi-2.5.1.ebuild
index 7d79a9cb6a85..58391e3eed31 100644
--- a/dev-java/poi/poi-2.5.1.ebuild
+++ b/dev-java/poi/poi-2.5.1.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2005/12/15 05:32:50 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/poi/poi-2.5.1.ebuild,v 1.4 2005/12/16 14:08:33 betelgeuse Exp $
 
 inherit java-pkg eutils
 
@@ -15,6 +15,7 @@ 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*
@@ -36,6 +37,8 @@ src_unpack() {
 	cd ${S}/lib
 	rm -f *.jar
 	java-pkg_jar-from commons-logging commons-logging.jar commons-logging-1.0.1.jar
+	java-pkg_jar-from log4j log4j.jar log4j-1.2.8.jar
+
 	cd ${S}/src/contrib/lib
 	rm -f *.jar
 	java-pkg_jar-from commons-beanutils-1.6 commons-beanutils.jar commons-beanutils-1.6.jar