Removed log4j dependency, as per bug #100275.

(Portage version: 2.0.53_rc7)

4 files changed, 9 insertions, 19 deletions

diff --git a/dev-java/poi/ChangeLog b/dev-java/poi/ChangeLog
index c8ca92fc4577..c998e76d5559 100644
--- a/dev-java/poi/ChangeLog
+++ b/dev-java/poi/ChangeLog
@@ -1,6 +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.13 2005/12/11 17:35:19 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/poi/ChangeLog,v 1.14 2005/12/15 05:32:50 nichoj Exp $
+
+  15 Dec 2005; Joshua Nichols <nichoj@gentoo.org> poi-2.5-r2.ebuild,
+  poi-2.5.1.ebuild:
+  Removed log4j dependency, as per bug #100275.
 
   11 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 401254e64a14..5919556b6547 100644
--- a/dev-java/poi/Manifest
+++ b/dev-java/poi/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 ce3f186e57e9132291f334516bdcfdc4 ChangeLog 2108
 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 91fc8d0c420647d14ec62badca3216b2 poi-2.5-r2.ebuild 1842
-MD5 01c7a94e0752c39d2aee4523682bdfed poi-2.5.1.ebuild 2034
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDnGOindWRXhKOboURAmDFAKDIQen164XDTbA0YgiPvj5o9QSxGwCaAu42
-xIn72hfnECT/fzExxezLbL0=
-=ixgF
------END PGP SIGNATURE-----
+MD5 abefd67b4ea42f221786381e16e14ca2 poi-2.5-r2.ebuild 1767
+MD5 6e7f763ac99459bd7c5747eef0e41fd3 poi-2.5.1.ebuild 1959
diff --git a/dev-java/poi/poi-2.5-r2.ebuild b/dev-java/poi/poi-2.5-r2.ebuild
index 1976c7c60ad3..4f9e3ef5ebef 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.4 2005/12/11 17:35:19 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/poi/poi-2.5-r2.ebuild,v 1.5 2005/12/15 05:32:50 nichoj Exp $
 
 inherit java-pkg eutils
 
@@ -15,7 +15,6 @@ 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,7 +34,6 @@ src_unpack() {
 	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
diff --git a/dev-java/poi/poi-2.5.1.ebuild b/dev-java/poi/poi-2.5.1.ebuild
index 08d85ae0dba9..7d79a9cb6a85 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.2 2005/12/11 17:35:19 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/poi/poi-2.5.1.ebuild,v 1.3 2005/12/15 05:32:50 nichoj Exp $
 
 inherit java-pkg eutils
 
@@ -15,7 +15,6 @@ 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,7 +35,6 @@ src_unpack() {
 
 	cd ${S}/lib
 	rm -f *.jar
-	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
 	rm -f *.jar