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

(Portage version: 2.0.51.21)

4 files changed, 25 insertions, 19 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 8dbb249576a5..e904bb2801b5 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.28 2005/05/07 17:19:45 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.29 2005/05/14 16:13:34 luckyduck Exp $
+
+*tomcat-5.0.28-r3 (14 May 2005)
+
+  14 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  -tomcat-5.0.28-r2.ebuild, +tomcat-5.0.28-r3.ebuild:
+  updated commons-beanutils dependency to reflect new slotting. see #71952
 
   07 May 2005; Jason Wever <weeve@gentoo.org> tomcat-5.0.28-r2.ebuild:
   Added ~sparc keyword.
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 23e12ba8f814..2cbae80b6a5d 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,19 +1,19 @@
-MD5 3faf7cc105d1e9e577a622d657182496 ChangeLog 15768
-MD5 c11ce937193406815ff7a2b306784fd8 metadata.xml 555
+MD5 f1a3eea1dd34015ee185df16a62fe00d tomcat-5.0.28-r3.ebuild 9890
 MD5 f1fe88bfc0fcd20ac959642431e6ffc7 tomcat-5.0.27-r5.ebuild 3756
-MD5 57e6e2307405204a32e022edde98e0d1 tomcat-5.0.28-r2.ebuild 9884
+MD5 67d18dd74aad96a15bf375723ed16157 ChangeLog 15983
+MD5 c11ce937193406815ff7a2b306784fd8 metadata.xml 555
 MD5 d5a48abc8db5543a73abbbf151d0630e files/digest-tomcat-5.0.27-r5 75
-MD5 af26ca4772989a2090085a6e24b71628 files/digest-tomcat-5.0.28-r2 78
-MD5 6eaf54e60fd0b74ae37ec1dbd8540598 files/5.0.28/build.xml-01.patch 623
-MD5 744a9ce174144fc5689c1fabee527e55 files/5.0.28/build.xml-02.patch 3177
-MD5 987ddee3c5a93ccaa4311c85f5dfceb3 files/5.0.28/gentoo.diff 541
-MD5 98a29b32de00d97f156dc31dfe3cf472 files/5.0.28/jikes.diff 584
-MD5 d538c7caef4b5cecd6cc95ee1988bace files/5.0.28/tomcat.conf 2652
-MD5 c0d89ffb4276e8a6d0cf08fcad6517f9 files/5.0.28/tomcat.init 701
-MD5 0990cfa870b64034e742297c6be3634b files/5.0.28/scripts.patch 823
-MD5 286d3dcf80a376b72913412cec25e496 files/5.0.28/tomcat.env 34
+MD5 af26ca4772989a2090085a6e24b71628 files/digest-tomcat-5.0.28-r3 78
 MD5 cbb635ed31e3b7ddabe1db851a8b471e files/5.0.27/gentoo.diff 463
-MD5 c19b85e130d0e0a565eebc406d699965 files/5.0.27/jikes.diff 510
+MD5 38c130772e7d43dcdff78b3d94f96efd files/5.0.27/tomcat.env 27
 MD5 bf74c2bd8c21359ada1793cddfa95f37 files/5.0.27/tomcat.conf 2660
 MD5 d6b2ebda71fd769327f49bcb51f92db2 files/5.0.27/tomcat.init 636
-MD5 38c130772e7d43dcdff78b3d94f96efd files/5.0.27/tomcat.env 27
+MD5 c19b85e130d0e0a565eebc406d699965 files/5.0.27/jikes.diff 510
+MD5 0990cfa870b64034e742297c6be3634b files/5.0.28/scripts.patch 823
+MD5 987ddee3c5a93ccaa4311c85f5dfceb3 files/5.0.28/gentoo.diff 541
+MD5 286d3dcf80a376b72913412cec25e496 files/5.0.28/tomcat.env 34
+MD5 6eaf54e60fd0b74ae37ec1dbd8540598 files/5.0.28/build.xml-01.patch 623
+MD5 d538c7caef4b5cecd6cc95ee1988bace files/5.0.28/tomcat.conf 2652
+MD5 c0d89ffb4276e8a6d0cf08fcad6517f9 files/5.0.28/tomcat.init 701
+MD5 744a9ce174144fc5689c1fabee527e55 files/5.0.28/build.xml-02.patch 3177
+MD5 98a29b32de00d97f156dc31dfe3cf472 files/5.0.28/jikes.diff 584
diff --git a/www-servers/tomcat/files/digest-tomcat-5.0.28-r2 b/www-servers/tomcat/files/digest-tomcat-5.0.28-r3
index 38ec5031aa8e..38ec5031aa8e 100644
--- a/www-servers/tomcat/files/digest-tomcat-5.0.28-r2
+++ b/www-servers/tomcat/files/digest-tomcat-5.0.28-r3
diff --git a/www-servers/tomcat/tomcat-5.0.28-r2.ebuild b/www-servers/tomcat/tomcat-5.0.28-r3.ebuild
index ac835d53fba1..07b6f8246124 100644
--- a/www-servers/tomcat/tomcat-5.0.28-r2.ebuild
+++ b/www-servers/tomcat/tomcat-5.0.28-r3.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/www-servers/tomcat/tomcat-5.0.28-r2.ebuild,v 1.7 2005/05/07 17:19:45 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.0.28-r3.ebuild,v 1.1 2005/05/14 16:13:34 luckyduck Exp $
 
 inherit eutils java-pkg
 
@@ -15,7 +15,7 @@ DEPEND="sys-apps/sed
 	   >=virtual/jdk-1.4
 	   ${RDEPEND}"
 RDEPEND=">=virtual/jdk-1.4
-	   >=dev-java/commons-beanutils-1.7.0
+	   =dev-java/commons-beanutils-1.7*
 	   >=dev-java/commons-collections-3.1
 	   >=dev-java/commons-daemon-1.0
 	   >=dev-java/commons-dbcp-1.2.1
@@ -77,7 +77,7 @@ src_unpack() {
 	java-pkg_jar-from servletapi-2.4
 
 	mkdir -p ../../server/lib && cd ../../server/lib
-	java-pkg_jar-from commons-beanutils commons-beanutils.jar
+	java-pkg_jar-from commons-beanutils-1.7 commons-beanutils.jar
 	java-pkg_jar-from commons-digester
 	java-pkg_jar-from commons-fileupload
 	java-pkg_jar-from commons-modeler
@@ -102,7 +102,7 @@ src_compile(){
 	antflags="${antflags} -Dlog4j.jar=$(java-config -p log4j)"
 	antflags="${antflags} -Dregexp.jar=$(java-config -p jakarta-regexp-1.3)"
 	antflags="${antflags} -Dstruts.jar=$(java-pkg_getjar struts struts.jar)"
-	antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar	commons-beanutils commons-beanutils.jar)"
+	antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar commons-beanutils-1.7 commons-beanutils.jar)"
 	antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)"
 	antflags="${antflags} -Dcommons-logging-api.jar=$(java-pkg_getjar commons-logging commons-logging-api.jar)"
 	antflags="${antflags} -Djaxen.jar=$(java-pkg_getjar jaxen jaxen-full.jar)"