updated commons-beanutils dependency to reflect new slotting. see #71952

(Portage version: 2.0.51.21)

4 files changed, 16 insertions, 18 deletions

diff --git a/dev-java/poi/ChangeLog b/dev-java/poi/ChangeLog
index e3cf4ab9c3c2..8ad0eea75d20 100644
--- a/dev-java/poi/ChangeLog
+++ b/dev-java/poi/ChangeLog
@@ -1,6 +1,12 @@
 # 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.9 2005/05/04 20:27:19 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/poi/ChangeLog,v 1.10 2005/05/14 16:09:34 luckyduck Exp $
+
+*poi-2.5-r2 (14 May 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:
diff --git a/dev-java/poi/Manifest b/dev-java/poi/Manifest
index 772339895129..6f5c53241cba 100644
--- a/dev-java/poi/Manifest
+++ b/dev-java/poi/Manifest
@@ -1,15 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 85113a6dff61c8120fb665791d568945 poi-2.5-r1.ebuild 1897
-MD5 d1c52f228a52df57e2faf154b6cfb4b1 ChangeLog 1549
+MD5 0d6616c7288c77c1b913de33812a2d83 poi-2.5-r2.ebuild 1903
+MD5 a783043a53479aa073da1e4aa8c7526d ChangeLog 1746
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 34ac7de875dec815d44a2bdbf7f4a64f files/digest-poi-2.5-r1 79
+MD5 34ac7de875dec815d44a2bdbf7f4a64f files/digest-poi-2.5-r2 79
 MD5 bf71154ca919a88d8c12da29e33ef4d9 files/poi-2.5-jikes-fix.patch 1190
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCeTA+06ebR+OMO78RAt30AKCGnOc7hEcxibJfa90HVc58wygIUACfbyky
-2eDkqZJcE3L8nJOKlmqYhaA=
-=iZ1j
------END PGP SIGNATURE-----
diff --git a/dev-java/poi/files/digest-poi-2.5-r1 b/dev-java/poi/files/digest-poi-2.5-r2
index 1a3f8246b36e..1a3f8246b36e 100644
--- a/dev-java/poi/files/digest-poi-2.5-r1
+++ b/dev-java/poi/files/digest-poi-2.5-r2
diff --git a/dev-java/poi/poi-2.5-r1.ebuild b/dev-java/poi/poi-2.5-r2.ebuild
index 20abd81ebf72..3451eb88c8b1 100644
--- a/dev-java/poi/poi-2.5-r1.ebuild
+++ b/dev-java/poi/poi-2.5-r2.ebuild
@@ -1,23 +1,25 @@
 # 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-r1.ebuild,v 1.4 2005/05/04 20:27:19 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/poi/poi-2.5-r2.ebuild,v 1.1 2005/05/14 16:09:34 luckyduck 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-20040302.tar.gz"
-IUSE="jikes"
+
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="x86 ppc amd64"
+IUSE="jikes"
+
 DEPEND=">=virtual/jdk-1.2
 	>=dev-java/ant-1.4
 	jikes? ( dev-java/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-beanutils-1.6*
 	>=dev-java/commons-collections-2.1
 	>=dev-java/commons-lang-1.0
 	=dev-java/xerces-2.6*"
@@ -35,7 +37,7 @@ src_unpack() {
 	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 commons-beanutils.jar commons-beanutils-1.6.jar
+	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