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

(Portage version: 2.0.51.21)

59 files changed, 192 insertions, 432 deletions

diff --git a/dev-java/ant-core/ChangeLog b/dev-java/ant-core/ChangeLog
index 7f6e220944df..c4216f5c9c56 100644
--- a/dev-java/ant-core/ChangeLog
+++ b/dev-java/ant-core/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/ant-core
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.21 2005/04/28 20:41:25 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.22 2005/05/14 16:09:55 luckyduck Exp $
+
+*ant-core-1.6.3-r1 (14 May 2005)
+*ant-core-1.6.2-r3 (14 May 2005)
+
+  14 May 2005; Jan Brinkmann <luckyduck@gentoo.org> files/1.6.2-ant,
+  files/1.6.3-ant, -ant-core-1.6.2-r2.ebuild, +ant-core-1.6.2-r3.ebuild,
+  -ant-core-1.6.3.ebuild, +ant-core-1.6.3-r1.ebuild:
+  updated commons-beanutils dependency to reflect new slotting. see #71952
 
 *ant-core-1.6.3 (28 Apr 2005)
 
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index 87967339a66e..ae7392cda0ba 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -1,24 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 3fc14c36e9ebd0c74a87e2560d6219f3 ant-core-1.6.2-r2.ebuild 2019
-MD5 5a75895ba30fb797cfa6b586bcf0594e ant-core-1.6.3.ebuild 1902
+MD5 4637b3d744387c7394719c90225ddc5c ant-core-1.6.3-r1.ebuild 1884
 MD5 e9577f39414ff99938fdadbd15ce5359 ant-core-1.5.4-r2.ebuild 3054
-MD5 fa5a700f09a765dca77b608ba681ab29 ChangeLog 16714
+MD5 13a8544496999ba0c7827e826b681949 ant-core-1.6.2-r3.ebuild 2001
+MD5 1ebf45744b67b92f1fd5a631a4e1ee0d ChangeLog 17052
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 MD5 d7186edf4c71dc0531330f90e2c08fe9 files/1.5.4-ant 2283
-MD5 668644917f8fddd4162667137cb53c85 files/1.6.2-ant 5062
-MD5 93c5b0cd15218723394245a54155ee5f files/1.6.3-ant 5057
+MD5 1b0c2d0981f992904c0b18a4b450b1dc files/1.6.2-ant 5066
+MD5 505824b938f7ea2c4394305676bbdb84 files/1.6.3-ant 5061
 MD5 4383441650437fec5622070e48e4324c files/build.sh-exit-fix.patch.gz 256
 MD5 55ece9ccf573b244b3dff966839528c5 files/rpmbuild.patch.gz 1164
 MD5 8d86f265f37d0d73cdd2e8a3fd2ff6eb files/digest-ant-core-1.5.4-r2 70
-MD5 aac477e88787ed6f0ad5cabe0f6a001a files/digest-ant-core-1.6.2-r2 74
+MD5 aac477e88787ed6f0ad5cabe0f6a001a files/digest-ant-core-1.6.2-r3 74
+MD5 4abd275148cde1e1c88e8ff4097cbcd8 files/digest-ant-core-1.6.3-r1 74
 MD5 8c69a473b88559829069ac80730f2f1b files/1.6.2-scp.patch 877
-MD5 4abd275148cde1e1c88e8ff4097cbcd8 files/digest-ant-core-1.6.3 74
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCcUql/rLF9B432nYRAsd/AKCmZeCpcTxl5CsgQZ0mkXTHYYwLqwCcCgTm
-oviTS7JmrJ6mi2RFap8hQCQ=
-=/3uH
------END PGP SIGNATURE-----
diff --git a/dev-java/ant-core/ant-core-1.6.2-r2.ebuild b/dev-java/ant-core/ant-core-1.6.2-r3.ebuild
index 0db13b1b492f..84d717a47078 100644
--- a/dev-java/ant-core/ant-core-1.6.2-r2.ebuild
+++ b/dev-java/ant-core/ant-core-1.6.2-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/dev-java/ant-core/ant-core-1.6.2-r2.ebuild,v 1.2 2005/04/03 20:29:22 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.6.2-r3.ebuild,v 1.1 2005/05/14 16:09:55 luckyduck Exp $
 
 inherit java-pkg eutils
 
@@ -69,7 +69,7 @@ src_install() {
 	java-pkg_dojar build/lib/ant.jar
 	java-pkg_dojar build/lib/ant-launcher.jar
 
-	dodoc LICENSE LICENSE.* README WHATSNEW KEYS
+	dodoc README WHATSNEW KEYS
 	use doc && dohtml welcome.html
 	use doc && java-pkg_dohtml -r docs/*
 	use doc && java-pkg_dohtml -r dist/docs/manual/api/*
diff --git a/dev-java/ant-core/ant-core-1.6.3.ebuild b/dev-java/ant-core/ant-core-1.6.3-r1.ebuild
index 4015fc590bc3..a12d2a55cbdd 100644
--- a/dev-java/ant-core/ant-core-1.6.3.ebuild
+++ b/dev-java/ant-core/ant-core-1.6.3-r1.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/ant-core/ant-core-1.6.3.ebuild,v 1.1 2005/04/28 20:41:25 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.6.3-r1.ebuild,v 1.1 2005/05/14 16:09:55 luckyduck Exp $
 
 inherit java-pkg eutils
 
@@ -67,7 +67,7 @@ src_install() {
 	java-pkg_dojar build/lib/ant.jar
 	java-pkg_dojar build/lib/ant-launcher.jar
 
-	dodoc LICENSE LICENSE.* README WHATSNEW KEYS
+	dodoc README WHATSNEW KEYS
 	use doc && dohtml welcome.html
 	use doc && java-pkg_dohtml -r docs/*
 	use doc && java-pkg_dohtml -r dist/docs/manual/api/*
diff --git a/dev-java/ant-core/files/1.6.2-ant b/dev-java/ant-core/files/1.6.2-ant
index d527a359b3b5..62dce8689425 100644
--- a/dev-java/ant-core/files/1.6.2-ant
+++ b/dev-java/ant-core/files/1.6.2-ant
@@ -15,7 +15,7 @@
 #   limitations under the License.
 
 #   Edited for Gentoo Linux
-#   $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/files/1.6.2-ant,v 1.6 2005/04/02 23:32:24 luckyduck Exp $
+#   $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/files/1.6.2-ant,v 1.7 2005/05/14 16:09:55 luckyduck Exp $
 
 # Extract launch and ant arguments, (see details below).
 ant_exec_args=
@@ -105,7 +105,7 @@ else
 fi
 
 # add in the dependency .jar files
-LOCALCLASSPATH="${LOCALCLASSPATH}:`java-config --classpath=ant-core,ant-tasks,log4j,xerces-2,xalan,junit,antlr,bcel,bsh,commons-beanutils,commons-collections,commons-logging,commons-net,jakarta-oro-2.0,jdepend,jsch,jakarta-regexp-1.3,rhino-1.5,jython,jta,jaf,javamail 2> /dev/null`"
+LOCALCLASSPATH="${LOCALCLASSPATH}:`java-config --classpath=ant-core,ant-tasks,log4j,xerces-2,xalan,junit,antlr,bcel,bsh,commons-beanutils-1.6,commons-collections,commons-logging,commons-net,jakarta-oro-2.0,jdepend,jsch,jakarta-regexp-1.3,rhino-1.5,jython,jta,jaf,javamail 2> /dev/null`"
 
 if [ -n "$JAVA_HOME" ] ; then
   if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then
diff --git a/dev-java/ant-core/files/1.6.3-ant b/dev-java/ant-core/files/1.6.3-ant
index 920c4491ab51..ddab7a81f17d 100644
--- a/dev-java/ant-core/files/1.6.3-ant
+++ b/dev-java/ant-core/files/1.6.3-ant
@@ -15,7 +15,7 @@
 #   limitations under the License.
 
 #   Edited for Gentoo Linux
-#   $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/files/1.6.3-ant,v 1.2 2005/04/19 14:07:55 axxo Exp $
+#   $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/files/1.6.3-ant,v 1.3 2005/05/14 16:09:55 luckyduck Exp $
 
 # Extract launch and ant arguments, (see details below).
 ant_exec_args=
@@ -105,7 +105,7 @@ else
 fi
 
 # add in the dependency .jar files
-LOCALCLASSPATH="${LOCALCLASSPATH}:`java-config --classpath=ant-core,ant-tasks,log4j,xerces-2,xalan,junit,antlr,bcel,bsh,commons-beanutils,commons-collections,commons-logging,commons-net,jakarta-oro-2.0,jdepend,jsch,jakarta-regexp-1.3,rhino-1.5,jython,jta,jaf,javamail 2> /dev/null`"
+LOCALCLASSPATH="${LOCALCLASSPATH}:`java-config --classpath=ant-core,ant-tasks,log4j,xerces-2,xalan,junit,antlr,bcel,bsh,commons-beanutils-1.6,commons-collections,commons-logging,commons-net,jakarta-oro-2.0,jdepend,jsch,jakarta-regexp-1.3,rhino-1.5,jython,jta,jaf,javamail 2> /dev/null`"
 
 if [ -n "$JAVA_HOME" ] ; then
   if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then
diff --git a/dev-java/ant-core/files/digest-ant-core-1.6.2-r2 b/dev-java/ant-core/files/digest-ant-core-1.6.2-r3
index 511c4167d672..511c4167d672 100644
--- a/dev-java/ant-core/files/digest-ant-core-1.6.2-r2
+++ b/dev-java/ant-core/files/digest-ant-core-1.6.2-r3
diff --git a/dev-java/ant-core/files/digest-ant-core-1.6.3 b/dev-java/ant-core/files/digest-ant-core-1.6.3-r1
index 3028550c2577..3028550c2577 100644
--- a/dev-java/ant-core/files/digest-ant-core-1.6.3
+++ b/dev-java/ant-core/files/digest-ant-core-1.6.3-r1
diff --git a/dev-java/ant-tasks/ChangeLog b/dev-java/ant-tasks/ChangeLog
index d642ffac6f7a..058c3beff577 100644
--- a/dev-java/ant-tasks/ChangeLog
+++ b/dev-java/ant-tasks/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for dev-java/ant-tasks
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ChangeLog,v 1.23 2005/04/28 20:42:26 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ChangeLog,v 1.24 2005/05/14 16:10:22 luckyduck Exp $
+
+*ant-tasks-1.6.3-r1 (14 May 2005)
+*ant-tasks-1.6.2-r10 (14 May 2005)
+*ant-tasks-1.6.2-r9 (14 May 2005)
+*ant-tasks-1.6.2-r8 (14 May 2005)
+
+  14 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  -ant-tasks-1.6.2-r5.ebuild, -ant-tasks-1.6.2-r6.ebuild,
+  -ant-tasks-1.6.2-r7.ebuild, +ant-tasks-1.6.2-r8.ebuild,
+  +ant-tasks-1.6.2-r9.ebuild, +ant-tasks-1.6.2-r10.ebuild,
+  -ant-tasks-1.6.3.ebuild, +ant-tasks-1.6.3-r1.ebuild:
+  updated commons-beanutils dependency to reflect new slotting. see #71952
 
 *ant-tasks-1.6.3 (28 Apr 2005)
 
diff --git a/dev-java/ant-tasks/Manifest b/dev-java/ant-tasks/Manifest
index df7e0e7728c6..94de42f725b6 100644
--- a/dev-java/ant-tasks/Manifest
+++ b/dev-java/ant-tasks/Manifest
@@ -1,21 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 1dc53a49b786a68ef16b69657cf73409 ant-tasks-1.6.3.ebuild 3815
-MD5 84362fdbc884058b6b6b3339c02c6e41 ant-tasks-1.6.2-r5.ebuild 3765
-MD5 185ae5e90ccd3238e5e52c0a9279c484 ant-tasks-1.6.2-r7.ebuild 3835
-MD5 fd48d78ab0acd088cb10316fd11a8297 ant-tasks-1.6.2-r6.ebuild 3768
-MD5 1b0239320579f40234dc6c26562f2e1c ChangeLog 8631
+MD5 7a597553c8ab58aa9e55c8da7439fe46 ant-tasks-1.6.2-r8.ebuild 3767
+MD5 81ea44b2d3d86b62eb753c70b6f275e6 ant-tasks-1.6.2-r10.ebuild 3837
+MD5 ca6954664129e4f663885a655e890494 ant-tasks-1.6.3-r1.ebuild 3817
+MD5 7a597553c8ab58aa9e55c8da7439fe46 ant-tasks-1.6.2-r9.ebuild 3767
+MD5 ca7764832d346336792cb9d94824a363 ChangeLog 9127
 MD5 4dad079a28768d183022cff420f01281 metadata.xml 220
-MD5 4abd275148cde1e1c88e8ff4097cbcd8 files/digest-ant-tasks-1.6.3 74
-MD5 aac477e88787ed6f0ad5cabe0f6a001a files/digest-ant-tasks-1.6.2-r5 74
-MD5 aac477e88787ed6f0ad5cabe0f6a001a files/digest-ant-tasks-1.6.2-r6 74
-MD5 aac477e88787ed6f0ad5cabe0f6a001a files/digest-ant-tasks-1.6.2-r7 74
+MD5 aac477e88787ed6f0ad5cabe0f6a001a files/digest-ant-tasks-1.6.2-r10 74
+MD5 aac477e88787ed6f0ad5cabe0f6a001a files/digest-ant-tasks-1.6.2-r8 74
+MD5 aac477e88787ed6f0ad5cabe0f6a001a files/digest-ant-tasks-1.6.2-r9 74
+MD5 4abd275148cde1e1c88e8ff4097cbcd8 files/digest-ant-tasks-1.6.3-r1 74
 MD5 8c69a473b88559829069ac80730f2f1b files/1.6.2-scp.patch 877
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCcUrK/rLF9B432nYRAmZ0AKCqu9oQKufIbQhKn0tsjtil3i93LwCfWu1j
-KVqUi2BmEQMd+QjyCb29RAU=
-=SSB5
------END PGP SIGNATURE-----
diff --git a/dev-java/ant-tasks/ant-tasks-1.6.2-r7.ebuild b/dev-java/ant-tasks/ant-tasks-1.6.2-r10.ebuild
index ab2ba3f3d1e4..06fd0c13a003 100644
--- a/dev-java/ant-tasks/ant-tasks-1.6.2-r7.ebuild
+++ b/dev-java/ant-tasks/ant-tasks-1.6.2-r10.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/ant-tasks/ant-tasks-1.6.2-r7.ebuild,v 1.3 2005/04/10 19:23:32 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ant-tasks-1.6.2-r10.ebuild,v 1.1 2005/05/14 16:10:22 luckyduck Exp $
 
 inherit java-pkg eutils
 
@@ -23,7 +23,7 @@ DEPEND="=dev-java/ant-core-${PV}*
 	!nobsh? ( >=dev-java/bsh-1.2-r7 )
 	!nobsf? ( >=dev-java/bsf-2.3.0-r2 )
 	!noantlr? ( >=dev-java/antlr-2.7.2 )
-	!nobeanutils? ( >=dev-java/commons-beanutils-1.6.1 )
+	!nobeanutils? ( =dev-java/commons-beanutils-1.6* )
 	!nocommonslogging? ( >=dev-java/commons-logging-1.0.3 )
 	!nocommonsnet? ( >=dev-java/commons-net-1.1.0 )
 	!nobcel? ( >=dev-java/bcel-5.1 )
@@ -57,7 +57,7 @@ src_compile() {
 	local p="ant-core,junit"
 	use noantlr || p="${p},antlr"
 	use nobcel || p="${p},bcel"
-	use nobeanutils || p="${p},commons-beanutils"
+	use nobeanutils || p="${p},commons-beanutils-1.6"
 	use nobsh || p="${p},bsh"
 	use nobsf || p="${p},bsf-2.3"
 	use nocommonslogging || p="${p},commons-logging"
diff --git a/dev-java/ant-tasks/ant-tasks-1.6.2-r5.ebuild b/dev-java/ant-tasks/ant-tasks-1.6.2-r8.ebuild
index bf520fc68bd3..43a043f48902 100644
--- a/dev-java/ant-tasks/ant-tasks-1.6.2-r5.ebuild
+++ b/dev-java/ant-tasks/ant-tasks-1.6.2-r8.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/ant-tasks/ant-tasks-1.6.2-r5.ebuild,v 1.12 2005/04/18 17:06:38 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ant-tasks-1.6.2-r8.ebuild,v 1.1 2005/05/14 16:10:22 luckyduck Exp $
 
 inherit java-pkg eutils
 
@@ -22,7 +22,7 @@ DEPEND="=dev-java/ant-core-${PV}*
 	!noxalan? ( >=dev-java/xalan-2.5.2 )
 	!nobsh? ( >=dev-java/bsh-1.2-r7 )
 	!noantlr? ( >=dev-java/antlr-2.7.2 )
-	!nobeanutils? ( >=dev-java/commons-beanutils-1.6.1 )
+	!nobeanutils? ( =dev-java/commons-beanutils-1.6* )
 	!nocommonslogging? ( >=dev-java/commons-logging-1.0.3 )
 	!nocommonsnet? ( >=dev-java/commons-net-1.1.0 )
 	!nobcel? ( >=dev-java/bcel-5.1 )
@@ -56,7 +56,7 @@ src_compile() {
 	local p="ant-core,junit"
 	use noantlr || p="${p},antlr"
 	use nobcel || p="${p},bcel"
-	use nobeanutils || p="${p},commons-beanutils"
+	use nobeanutils || p="${p},commons-beanutils-1.6"
 	use nobsh || p="${p},bsh"
 	use nocommonslogging || p="${p},commons-logging"
 	use nocommonsnet || p="${p},commons-net"
diff --git a/dev-java/ant-tasks/ant-tasks-1.6.2-r6.ebuild b/dev-java/ant-tasks/ant-tasks-1.6.2-r9.ebuild
index a7d57a427fdb..b6759d283113 100644
--- a/dev-java/ant-tasks/ant-tasks-1.6.2-r6.ebuild
+++ b/dev-java/ant-tasks/ant-tasks-1.6.2-r9.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/ant-tasks/ant-tasks-1.6.2-r6.ebuild,v 1.4 2005/04/18 17:06:38 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ant-tasks-1.6.2-r9.ebuild,v 1.1 2005/05/14 16:10:22 luckyduck Exp $
 
 inherit java-pkg eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/ant/source/apache-ant-${PV}-src.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~ppc64"
+KEYWORDS="x86 amd64 ppc sparc ppc64"
 IUSE="javamail noantlr nobcel nobeanutils nobsh nocommonsnet nocommonslogging nojdepend nojsch nojython nolog4j nooro noregexp norhino noxalan noxerces"
 
 DEPEND="=dev-java/ant-core-${PV}*
@@ -22,7 +22,7 @@ DEPEND="=dev-java/ant-core-${PV}*
 	!noxalan? ( >=dev-java/xalan-2.5.2 )
 	!nobsh? ( >=dev-java/bsh-1.2-r7 )
 	!noantlr? ( >=dev-java/antlr-2.7.2 )
-	!nobeanutils? ( >=dev-java/commons-beanutils-1.6.1 )
+	!nobeanutils? ( =dev-java/commons-beanutils-1.6* )
 	!nocommonslogging? ( >=dev-java/commons-logging-1.0.3 )
 	!nocommonsnet? ( >=dev-java/commons-net-1.1.0 )
 	!nobcel? ( >=dev-java/bcel-5.1 )
@@ -30,7 +30,7 @@ DEPEND="=dev-java/ant-core-${PV}*
 	!norhino? ( =dev-java/rhino-1.5* )
 	!nojdepend? ( >=dev-java/jdepend-2.6 )
 	!nojsch? ( >=dev-java/jsch-0.1.12 )
-	!noregexp? ( =dev-java/jakarta-regexp-1.3-r2 )
+	!noregexp? ( >=dev-java/jakarta-regexp-1.3-r2 )
 	!nojython? ( >=dev-java/jython-2.1-r5 )
 	javamail? ( >=dev-java/sun-javamail-bin-1.3 )"
 RDEPEND="${DEPEND}"
@@ -56,7 +56,7 @@ src_compile() {
 	local p="ant-core,junit"
 	use noantlr || p="${p},antlr"
 	use nobcel || p="${p},bcel"
-	use nobeanutils || p="${p},commons-beanutils"
+	use nobeanutils || p="${p},commons-beanutils-1.6"
 	use nobsh || p="${p},bsh"
 	use nocommonslogging || p="${p},commons-logging"
 	use nocommonsnet || p="${p},commons-net"
@@ -64,8 +64,8 @@ src_compile() {
 	use nojsch || p="${p},jsch"
 	use nojython || p="${p},jython"
 	use nolog4j || p="${p},log4j"
-	use nooro || p="${p},jakarta-oro-2.0*"
-	use noregexp || p="${p},jakarta-regexp-1.3"
+	use nooro || p="${p},jakarta-oro-2.0"
+	use noregexp || p="${p},jakarta-regexp-1.3*"
 	use norhino || p="${p},rhino-1.5"
 	use noxalan || p="${p},xalan"
 	use noxerces || p="${p},xerces-2"
diff --git a/dev-java/ant-tasks/ant-tasks-1.6.3.ebuild b/dev-java/ant-tasks/ant-tasks-1.6.3-r1.ebuild
index e2452ba7311b..3133d809b9d4 100644
--- a/dev-java/ant-tasks/ant-tasks-1.6.3.ebuild
+++ b/dev-java/ant-tasks/ant-tasks-1.6.3-r1.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/ant-tasks/ant-tasks-1.6.3.ebuild,v 1.1 2005/04/28 20:42:26 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ant-tasks-1.6.3-r1.ebuild,v 1.1 2005/05/14 16:10:22 luckyduck Exp $
 
 inherit java-pkg eutils
 
@@ -26,7 +26,7 @@ DEPEND="=dev-java/ant-core-${PV}*
 	!nobsh? ( >=dev-java/bsh-1.2-r7 )
 	!nobsf? ( >=dev-java/bsf-2.3.0-r2 )
 	!noantlr? ( >=dev-java/antlr-2.7.2 )
-	!nobeanutils? ( >=dev-java/commons-beanutils-1.6.1 )
+	!nobeanutils? ( =dev-java/commons-beanutils-1.6* )
 	!nocommonslogging? ( >=dev-java/commons-logging-1.0.3 )
 	!nocommonsnet? ( >=dev-java/commons-net-1.1.0 )
 	!nobcel? ( >=dev-java/bcel-5.1 )
@@ -57,7 +57,7 @@ src_compile() {
 	local p="ant-core,junit"
 	use noantlr || p="${p},antlr"
 	use nobcel || p="${p},bcel"
-	use nobeanutils || p="${p},commons-beanutils"
+	use nobeanutils || p="${p},commons-beanutils-1.6"
 	use nobsh || p="${p},bsh"
 	use nobsf || p="${p},bsf-2.3"
 	use nocommonslogging || p="${p},commons-logging"
diff --git a/dev-java/ant-tasks/files/digest-ant-tasks-1.6.2-r5 b/dev-java/ant-tasks/files/digest-ant-tasks-1.6.2-r10
index 511c4167d672..511c4167d672 100644
--- a/dev-java/ant-tasks/files/digest-ant-tasks-1.6.2-r5
+++ b/dev-java/ant-tasks/files/digest-ant-tasks-1.6.2-r10
diff --git a/dev-java/ant-tasks/files/digest-ant-tasks-1.6.2-r6 b/dev-java/ant-tasks/files/digest-ant-tasks-1.6.2-r8
index 511c4167d672..511c4167d672 100644
--- a/dev-java/ant-tasks/files/digest-ant-tasks-1.6.2-r6
+++ b/dev-java/ant-tasks/files/digest-ant-tasks-1.6.2-r8
diff --git a/dev-java/ant-tasks/files/digest-ant-tasks-1.6.2-r7 b/dev-java/ant-tasks/files/digest-ant-tasks-1.6.2-r9
index 511c4167d672..511c4167d672 100644
--- a/dev-java/ant-tasks/files/digest-ant-tasks-1.6.2-r7
+++ b/dev-java/ant-tasks/files/digest-ant-tasks-1.6.2-r9
diff --git a/dev-java/ant-tasks/files/digest-ant-tasks-1.6.3 b/dev-java/ant-tasks/files/digest-ant-tasks-1.6.3-r1
index 3028550c2577..3028550c2577 100644
--- a/dev-java/ant-tasks/files/digest-ant-tasks-1.6.3
+++ b/dev-java/ant-tasks/files/digest-ant-tasks-1.6.3-r1
diff --git a/dev-java/commons-betwixt/ChangeLog b/dev-java/commons-betwixt/ChangeLog
index d6f7cea49c16..2525ff0224d4 100644
--- a/dev-java/commons-betwixt/ChangeLog
+++ b/dev-java/commons-betwixt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/commons-betwixt
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-betwixt/ChangeLog,v 1.2 2005/05/04 21:34:10 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-betwixt/ChangeLog,v 1.3 2005/05/14 16:10:36 luckyduck Exp $
+
+*commons-betwixt-0.6-r1 (14 May 2005)
+
+  14 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  -commons-betwixt-0.6.ebuild, +commons-betwixt-0.6-r1.ebuild:
+  updated commons-beanutils dependency to reflect new slotting. see #71952
 
   04 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
   commons-betwixt-0.6.ebuild:
diff --git a/dev-java/commons-betwixt/Manifest b/dev-java/commons-betwixt/Manifest
index 3d58cb6c4ea5..a4d77b4b267f 100644
--- a/dev-java/commons-betwixt/Manifest
+++ b/dev-java/commons-betwixt/Manifest
@@ -1,15 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 3f5d8e8fbd8c9bef7fde68ccd5381570 commons-betwixt-0.6.ebuild 1531
-MD5 7bd1c5304f38c5506557791589f1ca62 ChangeLog 628
+MD5 e1bdb1b729d2ea0dda9f7618b65bb653 commons-betwixt-0.6-r1.ebuild 1533
+MD5 94c5dce1d48b4af5c710240a4eb269ea ChangeLog 858
 MD5 1eb638c237e8835b9fe6b49a60e42d9d metadata.xml 739
+MD5 c4db26920b75dccce46c479139741605 files/digest-commons-betwixt-0.6-r1 75
 MD5 3b892742ca91101232da276492fa254c files/commons-betwixt-0.6-noget.patch 980
-MD5 c4db26920b75dccce46c479139741605 files/digest-commons-betwixt-0.6 75
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCeT/Y06ebR+OMO78RAg5aAJ9emx3OHhV4b1CxukOjEvySNXuARACfWC9t
-XSEL7bYrCZ0Aj9RAFcIJuuY=
-=fkhI
------END PGP SIGNATURE-----
diff --git a/dev-java/commons-betwixt/commons-betwixt-0.6.ebuild b/dev-java/commons-betwixt/commons-betwixt-0.6-r1.ebuild
index f07ba4a50cfe..8e0cd4773b26 100644
--- a/dev-java/commons-betwixt/commons-betwixt-0.6.ebuild
+++ b/dev-java/commons-betwixt/commons-betwixt-0.6-r1.ebuild
@@ -1,20 +1,20 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-betwixt/commons-betwixt-0.6.ebuild,v 1.2 2005/05/04 21:34:10 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-betwixt/commons-betwixt-0.6-r1.ebuild,v 1.1 2005/05/14 16:10:36 luckyduck Exp $
 
 inherit java-pkg eutils
 
 DESCRIPTION="Introspective Bean to XML mapper"
 HOMEPAGE="http://jakarta.apache.org/commons/betwixt/"
 SRC_URI="mirror://apache/jakarta/commons/betwixt/source/${PN}-${PV}-src.tar.gz"
+
 LICENSE="Apache-2.0"
 SLOT="0"
-
 KEYWORDS="amd64 x86 ~ppc"
 IUSE="doc jikes source"
 
 DEPEND=">=dev-java/commons-logging-1.0.2
-	>=dev-java/commons-beanutils-1.7.0
+	=dev-java/commons-beanutils-1.7*
 	>=dev-java/commons-digester-1.6
 	>=dev-java/ant-core-1.4
 	jikes? ( >=dev-java/jikes-1.21 )
@@ -27,7 +27,7 @@ src_unpack() {
 	unpack ${A} && cd $S
 	echo "commons-logging.jar=`java-config -p commons-logging`" \
 		> build.properties
-	echo "commons-beanutils.jar=`java-config -p commons-beanutils`" \
+	echo "commons-beanutils.jar=`java-config -p commons-beanutils-1.7`" \
 		>> build.properties
 	echo "commons-digester.jar=`java-config -p commons-digester`" \
 		>> build.properties
diff --git a/dev-java/commons-betwixt/files/digest-commons-betwixt-0.6 b/dev-java/commons-betwixt/files/digest-commons-betwixt-0.6-r1
index 9a1a8b4a6315..9a1a8b4a6315 100644
--- a/dev-java/commons-betwixt/files/digest-commons-betwixt-0.6
+++ b/dev-java/commons-betwixt/files/digest-commons-betwixt-0.6-r1
diff --git a/dev-java/commons-digester/ChangeLog b/dev-java/commons-digester/ChangeLog
index 498a7048e572..dbd4abcf1dc5 100644
--- a/dev-java/commons-digester/ChangeLog
+++ b/dev-java/commons-digester/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/commons-digester
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-digester/ChangeLog,v 1.23 2005/04/30 19:17:28 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-digester/ChangeLog,v 1.24 2005/05/14 16:10:48 luckyduck Exp $
+
+*commons-digester-1.6-r1 (14 May 2005)
+
+  14 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  -commons-digester-1.4.ebuild, -commons-digester-1.5.ebuild,
+  -commons-digester-1.6.ebuild, +commons-digester-1.6-r1.ebuild:
+  updated commons-beanutils dependency to reflect new slotting. see #71952
 
   30 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
   commons-digester-1.6.ebuild:
diff --git a/dev-java/commons-digester/Manifest b/dev-java/commons-digester/Manifest
index d3962446f13f..9c11f5938812 100644
--- a/dev-java/commons-digester/Manifest
+++ b/dev-java/commons-digester/Manifest
@@ -1,8 +1,4 @@
+MD5 5832a5aac788977d25cd68d775fdbe81 commons-digester-1.6-r1.ebuild 1575
+MD5 a9c17fc66825c5a411edeef467cbfc9e ChangeLog 3559
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 063af154c0cd7c71963bfdbf79441962 ChangeLog 3264
-MD5 9d28d7a15a90ae7bf5cd8d36e1d5f94a commons-digester-1.4.ebuild 1657
-MD5 5f48b4fa51b35541dd320131073d971f commons-digester-1.6.ebuild 1670
-MD5 b6e50d2ce9efb55832ed9c9e1a3866f9 commons-digester-1.5.ebuild 1660
-MD5 dffdbb44be5308d2e17beeea612d909d files/digest-commons-digester-1.6 76
-MD5 0009c9984a9616e76d3da160197d563a files/digest-commons-digester-1.4 76
-MD5 4deda928e1e4b664deb7b526e48632d6 files/digest-commons-digester-1.5 76
+MD5 dffdbb44be5308d2e17beeea612d909d files/digest-commons-digester-1.6-r1 76
diff --git a/dev-java/commons-digester/commons-digester-1.4.ebuild b/dev-java/commons-digester/commons-digester-1.4.ebuild
deleted file mode 100644
index fab6b21928d6..000000000000
--- a/dev-java/commons-digester/commons-digester-1.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-digester/commons-digester-1.4.ebuild,v 1.3 2005/01/20 19:27:43 luckyduck Exp $
-
-inherit java-pkg
-
-DESCRIPTION="Jarkata Digester component, XML to Java bindings for configuration"
-HOMEPAGE="http://jakarta.apache.org/commons/digester/"
-SRC_URI="mirror://apache/jakarta/commons/digester/source/${P}-src.tar.gz"
-LICENSE="Apache-1.1"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64"
-SLOT="0"
-
-IUSE="doc jikes junit"
-RDEPEND=">=virtual/jre-1.3
-	 >=dev-java/commons-beanutils-1.4
-	 >=dev-java/commons-collections-2.0
-	 >=dev-java/commons-logging-1.0
-	 jikes? ( dev-java/jikes )"
-DEPEND="${RDEPEND}
-	>=virtual/jdk-1.3
-	>=dev-java/ant-1.4
-	junit? ( >=dev-java/junit-3.7 )"
-
-S=${WORKDIR}/${P}-src
-
-src_compile() {
-	local antflags="all"
-
-	use doc && antflags="${antflags} javadoc"
-	use junit && antflags="${antflags} test -Djunit.jar=`java-config -p junit`"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-
-	antflags="${antflags} -Dcommons-beanutils.jar=`java-pkg_getjar commons-beanutils commons-beanutils.jar`"
-	antflags="${antflags} -Dcommons-collections.jar=`java-pkg_getjar commons-collections commons-collections.jar`"
-	antflags="${antflags} -Dcommons-logging.jar=`java-pkg_getjar commons-logging commons-logging.jar`"
-
-	ant ${antflags} || die "Compile Failed"
-	mkdir ${S}/dist
-	jar cfm ${S}/dist/${PN}.jar ${S}/target/conf/MANIFEST.MF -C ${S}/target/classes/ . \
-		|| die "Failed to create distributable"
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-	use doc && java-pkg_dohtml -r dist/docs/api/*
-}
diff --git a/dev-java/commons-digester/commons-digester-1.5.ebuild b/dev-java/commons-digester/commons-digester-1.5.ebuild
deleted file mode 100644
index b5e70c6c4754..000000000000
--- a/dev-java/commons-digester/commons-digester-1.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-digester/commons-digester-1.5.ebuild,v 1.8 2005/01/20 19:27:43 luckyduck Exp $
-
-inherit java-pkg
-
-S=${WORKDIR}/${PN}-${PV}-src
-DESCRIPTION="The Jakarta Digester component reads XML configuration files to provide initialization of various Java objects within the system."
-HOMEPAGE="http://jakarta.apache.org/commons/digester.html"
-SRC_URI="mirror://apache/jakarta/commons/digester/source/${P}-src.tar.gz"
-DEPEND=">=virtual/jdk-1.3
-	>=dev-java/ant-1.4
-	>=dev-java/commons-beanutils-1.5
-	>=dev-java/commons-collections-2.1
-	junit? ( >=dev-java/junit-3.7 )
-	jikes? ( dev-java/jikes )"
-RDEPEND=">=virtual/jdk-1.3
-	>=dev-java/commons-beanutils-1.5
-	>=dev-java/commons-collections-2.1
-	>=dev-java/commons-logging-1.0.2"
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="x86 ppc sparc"
-IUSE="doc jikes junit"
-
-src_compile() {
-	local antflags="dist"
-	use doc && antflags="${antflags} javadoc"
-	use junit && antflags="${antflags} test"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-
-	use junit && antflags="${antflags} -Djunit.jar=`java-config --classpath=junit`"
-	antflags="${antflags} -Dcommons-beanutils.jar=`java-config --classpath=commons-beanutils | sed s/:.*//`"
-	antflags="${antflags} -Dcommons-collections.jar=`java-config --classpath=commons-collections`"
-	antflags="${antflags} -Dcommons-logging.jar=/usr/share/commons-logging/lib/commons-logging.jar"
-	ant ${antflags} || die "compilation failed"
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-	use doc && java-pkg_dohtml -r dist/docs/api/*
-}
diff --git a/dev-java/commons-digester/commons-digester-1.6.ebuild b/dev-java/commons-digester/commons-digester-1.6-r1.ebuild
index 56e01e7f386c..0315d01ed941 100644
--- a/dev-java/commons-digester/commons-digester-1.6.ebuild
+++ b/dev-java/commons-digester/commons-digester-1.6-r1.ebuild
@@ -1,27 +1,27 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-digester/commons-digester-1.6.ebuild,v 1.9 2005/04/30 19:17:28 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-digester/commons-digester-1.6-r1.ebuild,v 1.1 2005/05/14 16:10:48 luckyduck Exp $
 
 inherit java-pkg
 
-S=${WORKDIR}/${PN}-${PV}-src
-DESCRIPTION="The Jakarta Digester component reads XML configuration files to provide initialization of various Java objects within the system."
+DESCRIPTION="Reads XML configuration files to provide initialization of various Java objects within the system."
 HOMEPAGE="http://jakarta.apache.org/commons/digester.html"
 SRC_URI="mirror://apache/jakarta/commons/digester/source/${P}-src.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="x86 ppc sparc amd64 ~ppc64"
+IUSE="doc jikes junit"
+
 DEPEND=">=virtual/jdk-1.3
 	>=dev-java/ant-1.4
-	>=dev-java/commons-beanutils-1.5
-	>=dev-java/commons-collections-2.1
 	junit? ( >=dev-java/junit-3.7 )
 	jikes? ( dev-java/jikes )"
 RDEPEND=">=virtual/jdk-1.3
-	>=dev-java/commons-beanutils-1.5
+	=dev-java/commons-beanutils-1.6*
 	>=dev-java/commons-collections-2.1
 	>=dev-java/commons-logging-1.0.2"
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="x86 ppc sparc amd64 ~ppc64"
-IUSE="doc jikes junit"
+S=${WORKDIR}/${PN}-${PV}-src
 
 src_compile() {
 	local antflags="dist"
@@ -30,7 +30,7 @@ src_compile() {
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 
 	use junit && antflags="${antflags} -Djunit.jar=`java-config --classpath=junit`"
-	antflags="${antflags} -Dcommons-beanutils.jar=`java-config --classpath=commons-beanutils | sed s/:.*//`"
+	antflags="${antflags} -Dcommons-beanutils.jar=`java-config --classpath=commons-beanutils-1.6 | sed s/:.*//`"
 	antflags="${antflags} -Dcommons-collections.jar=`java-config --classpath=commons-collections`"
 	antflags="${antflags} -Dcommons-logging.jar=/usr/share/commons-logging/lib/commons-logging.jar"
 	ant ${antflags} || die "compilation failed"
diff --git a/dev-java/commons-digester/files/digest-commons-digester-1.4 b/dev-java/commons-digester/files/digest-commons-digester-1.4
deleted file mode 100644
index acc2a7e16559..000000000000
--- a/dev-java/commons-digester/files/digest-commons-digester-1.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2ed4201484d925c0d4062fae25fb556c commons-digester-1.4-src.tar.gz 101261
diff --git a/dev-java/commons-digester/files/digest-commons-digester-1.5 b/dev-java/commons-digester/files/digest-commons-digester-1.5
deleted file mode 100644
index d53292ad0049..000000000000
--- a/dev-java/commons-digester/files/digest-commons-digester-1.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f678cc07c41c37b6ac4e63fe972f8364 commons-digester-1.5-src.tar.gz 130170
diff --git a/dev-java/commons-digester/files/digest-commons-digester-1.6 b/dev-java/commons-digester/files/digest-commons-digester-1.6-r1
index 379783f0e852..379783f0e852 100644
--- a/dev-java/commons-digester/files/digest-commons-digester-1.6
+++ b/dev-java/commons-digester/files/digest-commons-digester-1.6-r1
diff --git a/dev-java/commons-jxpath/ChangeLog b/dev-java/commons-jxpath/ChangeLog
index 4b1cc4c07543..44d67fcfb528 100644
--- a/dev-java/commons-jxpath/ChangeLog
+++ b/dev-java/commons-jxpath/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/commons-jxpath
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/ChangeLog,v 1.8 2005/02/06 01:51:52 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/ChangeLog,v 1.9 2005/05/14 16:10:09 luckyduck Exp $
+
+*commons-jxpath-1.1-r1 (14 May 2005)
+
+  14 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  -commons-jxpath-1.1.ebuild, +commons-jxpath-1.1-r1.ebuild:
+  updated commons-beanutils dependency to reflect new slotting. see #71952
 
   06 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> commons-jxpath-1.1.ebuild:
   stable on amd64
diff --git a/dev-java/commons-jxpath/Manifest b/dev-java/commons-jxpath/Manifest
index fa774c780083..1e51acdc4673 100644
--- a/dev-java/commons-jxpath/Manifest
+++ b/dev-java/commons-jxpath/Manifest
@@ -1,4 +1,4 @@
-MD5 c143f74e8b625582336179c6e770c7a9 ChangeLog 1026
+MD5 7c008188396f7d39df1ed88387c37333 commons-jxpath-1.1-r1.ebuild 1230
+MD5 f972e771f89a11031998c538e68728f3 ChangeLog 1253
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 192937b2cee3ab3736c159cd473598a6 commons-jxpath-1.1.ebuild 1188
-MD5 6bee458c65c0dad2d6afd4bb6c5464d7 files/digest-commons-jxpath-1.1 74
+MD5 6bee458c65c0dad2d6afd4bb6c5464d7 files/digest-commons-jxpath-1.1-r1 74
diff --git a/dev-java/commons-jxpath/commons-jxpath-1.1.ebuild b/dev-java/commons-jxpath/commons-jxpath-1.1-r1.ebuild
index 21fb0b1be2de..b6468ca30926 100644
--- a/dev-java/commons-jxpath/commons-jxpath-1.1.ebuild
+++ b/dev-java/commons-jxpath/commons-jxpath-1.1-r1.ebuild
@@ -1,34 +1,37 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/commons-jxpath-1.1.ebuild,v 1.9 2005/02/06 01:51:52 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/commons-jxpath-1.1-r1.ebuild,v 1.1 2005/05/14 16:10:09 luckyduck Exp $
 
 inherit java-pkg
 
-DESCRIPTION=" JXPath applies XPath expressions to graphs of objects of all kinds."
+DESCRIPTION="Applies XPath expressions to graphs of objects of all kinds."
 HOMEPAGE="http://jakarta.apache.org/commons/jxpath/"
 SRC_URI="mirror://apache/jakarta/commons/jxpath/source/${PN}-${PV}-src.tar.gz"
-DEPEND=">=virtual/jdk-1.3
-	=dev-java/servletapi-2.3*
-	~dev-java/jdom-1.0_beta9
-	>=dev-java/ant-1.4
-	junit? ( >=dev-java/junit-3.7 )"
-RDEPEND=">=virtual/jdk-1.3"
+
 LICENSE="Apache-1.1"
 SLOT="0"
 KEYWORDS="x86 amd64"
-IUSE="doc junit"
+IUSE="doc"
+
+DEPEND=">=virtual/jdk-1.3
+	dev-java/ant-core"
+RDEPEND=">=virtual/jdk-1.3
+	=dev-java/commons-beanutils-1.6*
+	=dev-java/servletapi-2.3*
+	~dev-java/jdom-1.0_beta9"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	echo "jdom.jar=`java-config -p jdom-1.0_beta9`" > build.properties
-	echo "servlet.jar=`java-config -p servletapi-2.3`" >> build.properties
+	echo "jdom.jar=$(java-config -p jdom-1.0_beta9)" > build.properties
+	echo "servlet.jar=$(java-config -p servletapi-2.3)" >> build.properties
+	echo "commons-beanutils.jar=$(java-config -p commons-beanutils-1.6)" \
+		>> build.properties
 }
 
 src_compile() {
 	local antflags="jar"
 	use doc && antflags="${antflags} javadoc"
-	use junit && antflags="${antflags} test"
 	ant ${antflags} || die "compile problem"
 }
 
diff --git a/dev-java/commons-jxpath/files/digest-commons-jxpath-1.1 b/dev-java/commons-jxpath/files/digest-commons-jxpath-1.1-r1
index 0b74e49268cb..0b74e49268cb 100644
--- a/dev-java/commons-jxpath/files/digest-commons-jxpath-1.1
+++ b/dev-java/commons-jxpath/files/digest-commons-jxpath-1.1-r1
diff --git a/dev-java/commons-validator/ChangeLog b/dev-java/commons-validator/ChangeLog
index af693a1f72a8..6178f4306406 100644
--- a/dev-java/commons-validator/ChangeLog
+++ b/dev-java/commons-validator/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/commons-validator
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/ChangeLog,v 1.24 2005/04/22 08:23:00 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/ChangeLog,v 1.25 2005/05/14 16:10:40 luckyduck Exp $
+
+*commons-validator-1.1.3-r1 (14 May 2005)
+*commons-validator-1.0.2-r5 (14 May 2005)
+
+  14 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  -commons-validator-1.0.2-r4.ebuild, +commons-validator-1.0.2-r5.ebuild,
+  -commons-validator-1.1.3.ebuild, +commons-validator-1.1.3-r1.ebuild:
+  updated commons-beanutils dependency to reflect new slotting. see #71952
 
   22 Apr 2005; Simon Stelling <blubb@gentoo.org>
   commons-validator-1.0.2-r4.ebuild:
diff --git a/dev-java/commons-validator/Manifest b/dev-java/commons-validator/Manifest
index 02865c426afc..fecc268a708c 100644
--- a/dev-java/commons-validator/Manifest
+++ b/dev-java/commons-validator/Manifest
@@ -1,6 +1,6 @@
-MD5 a64f9dc8fc02fb2f6402f4bd0000a134 ChangeLog 3997
-MD5 8cb2ee9b80b5df01bc956baea781de22 commons-validator-1.1.3.ebuild 2260
+MD5 ff95a7b8b9a1a3f5ec7df7ff424b4dd9 commons-validator-1.1.3-r1.ebuild 2264
+MD5 90e97f3f33f5e0e80f1c1cf89ca9247f commons-validator-1.0.2-r5.ebuild 2081
+MD5 b572c458f1acb1d4b8b365a26a3cf1b2 ChangeLog 4355
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 ea31da259ebc92f3cea894ab1bc48ae9 commons-validator-1.0.2-r4.ebuild 2076
-MD5 b4056d324a1cc96ca13a9f0c3e7c68fc files/digest-commons-validator-1.1.3 173
-MD5 3b4d11c72fe5990ec6689406240d3ef6 files/digest-commons-validator-1.0.2-r4 78
+MD5 3b4d11c72fe5990ec6689406240d3ef6 files/digest-commons-validator-1.0.2-r5 78
+MD5 b4056d324a1cc96ca13a9f0c3e7c68fc files/digest-commons-validator-1.1.3-r1 173
diff --git a/dev-java/commons-validator/commons-validator-1.0.2-r4.ebuild b/dev-java/commons-validator/commons-validator-1.0.2-r5.ebuild
index cc49ed4adbf4..9e0c55fdfda9 100644
--- a/dev-java/commons-validator/commons-validator-1.0.2-r4.ebuild
+++ b/dev-java/commons-validator/commons-validator-1.0.2-r5.ebuild
@@ -1,12 +1,17 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/commons-validator-1.0.2-r4.ebuild,v 1.3 2005/04/22 08:23:00 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/commons-validator-1.0.2-r5.ebuild,v 1.1 2005/05/14 16:10:40 luckyduck Exp $
 
 inherit java-pkg
 
 DESCRIPTION="Jakarta component to validate user input, or data input"
 HOMEPAGE="http://jakarta.apache.org/commons/validator/"
 SRC_URI="mirror://apache/jakarta/commons/validator/source/${PN}-${PV}-src.tar.gz"
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="x86 ~ppc ~sparc amd64"
+IUSE="doc examples jikes source"
+
 DEPEND=">=virtual/jdk-1.3
 	>=dev-java/ant-1.4
 	app-arch/zip
@@ -16,12 +21,8 @@ RDEPEND=">=virtual/jre-1.3
 	>=dev-java/commons-digester-1.0
 	>=dev-java/commons-collections-2.0
 	>=dev-java/commons-logging-1.0
-	>=dev-java/commons-beanutils-1.0
+	=dev-java/commons-beanutils-1.6*
 	>=dev-java/xerces-2.6.2-r1"
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc amd64"
-IUSE="doc examples jikes source"
 
 S="${WORKDIR}/${P}-src"
 
@@ -32,7 +33,7 @@ src_unpack() {
 	echo "commons-digester.jar=`java-config -p commons-digester`" >> build.properties
 	echo "commons-collections.jar=`java-config -p commons-collections`" >> build.properties
 	echo "commons-logging.jar=`java-config -p commons-logging | sed s/.*://`" >> build.properties
-	echo "commons-beanutils.jar=`java-config -p commons-beanutils`" >> build.properties
+	echo "commons-beanutils.jar=`java-config -p commons-beanutils-1.6`" >> build.properties
 	echo "xerces.jar=`java-config -p xerces-2`" >> build.properties
 }
 
diff --git a/dev-java/commons-validator/commons-validator-1.1.3.ebuild b/dev-java/commons-validator/commons-validator-1.1.3-r1.ebuild
index 4aa467018d4a..b141ec1888d0 100644
--- a/dev-java/commons-validator/commons-validator-1.1.3.ebuild
+++ b/dev-java/commons-validator/commons-validator-1.1.3-r1.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/commons-validator/commons-validator-1.1.3.ebuild,v 1.10 2005/04/09 16:03:28 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-validator/commons-validator-1.1.3-r1.ebuild,v 1.1 2005/05/14 16:10:40 luckyduck Exp $
 
 inherit java-pkg
 
@@ -16,7 +16,7 @@ RDEPEND=">=virtual/jre-1.3
 	>=dev-java/commons-digester-1.5
 	>=dev-java/commons-collections-2.1
 	>=dev-java/commons-logging-1.0.3
-	>=dev-java/commons-beanutils-1.6
+	=dev-java/commons-beanutils-1.6*
 	>=dev-java/xerces-2.6.2-r1"
 LICENSE="Apache-1.1"
 SLOT="0"
@@ -33,7 +33,7 @@ src_unpack() {
 	echo "commons-digester.jar=`java-config --classpath=commons-digester`" >> build.properties
 	echo "commons-collections.jar=`java-config --classpath=commons-collections`" >> build.properties
 	echo "commons-logging.jar=`java-config --classpath=commons-logging | sed s/.*://`" >> build.properties
-	echo "commons-beanutils.jar=`java-config --classpath=commons-beanutils | sed s/.*://`" >> build.properties
+	echo "commons-beanutils.jar=`java-config --classpath=commons-beanutils-1.6 | sed s/.*://`" >> build.properties
 	echo "xerces.jar=`java-config --classpath=xerces-2`" >> build.properties
 }
 
diff --git a/dev-java/commons-validator/files/digest-commons-validator-1.0.2-r4 b/dev-java/commons-validator/files/digest-commons-validator-1.0.2-r5
index f6bd8c581e2d..f6bd8c581e2d 100644
--- a/dev-java/commons-validator/files/digest-commons-validator-1.0.2-r4
+++ b/dev-java/commons-validator/files/digest-commons-validator-1.0.2-r5
diff --git a/dev-java/commons-validator/files/digest-commons-validator-1.1.3 b/dev-java/commons-validator/files/digest-commons-validator-1.1.3-r1
index 14da3e258aa4..14da3e258aa4 100644
--- a/dev-java/commons-validator/files/digest-commons-validator-1.1.3
+++ b/dev-java/commons-validator/files/digest-commons-validator-1.1.3-r1
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
diff --git a/dev-java/struts/ChangeLog b/dev-java/struts/ChangeLog
index 932792edfe5e..481dd0e8f7be 100644
--- a/dev-java/struts/ChangeLog
+++ b/dev-java/struts/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-java/struts
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v 1.15 2005/05/07 17:17:39 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v 1.16 2005/05/14 16:14:02 luckyduck Exp $
+
+*struts-1.2.4-r1 (14 May 2005)
+*struts-1.2.2-r2 (14 May 2005)
+*struts-1.1-r3 (14 May 2005)
+
+  14 May 2005; Jan Brinkmann <luckyduck@gentoo.org> -struts-1.1.ebuild,
+  -struts-1.1-r1.ebuild, -struts-1.1-r2.ebuild, +struts-1.1-r3.ebuild,
+  -struts-1.2.2.ebuild, -struts-1.2.2-r1.ebuild, +struts-1.2.2-r2.ebuild,
+  -struts-1.2.4.ebuild, +struts-1.2.4-r1.ebuild:
+  updated commons-beanutils dependency to reflect new slotting. see #71952
 
   07 May 2005; Jason Wever <weeve@gentoo.org> struts-1.1-r2.ebuild:
   Added ~sparc keyword.
diff --git a/dev-java/struts/Manifest b/dev-java/struts/Manifest
index 6f29f8e8d210..5c2389c2a007 100644
--- a/dev-java/struts/Manifest
+++ b/dev-java/struts/Manifest
@@ -1,14 +1,8 @@
-MD5 3e8d87527c5511136dd9f5e994bfaf21 ChangeLog 2550
+MD5 0b67da273e374af0168250b6fb7b97f3 struts-1.1-r3.ebuild 2241
+MD5 7e5f65e67e36d6a14e5f9eb456443a45 struts-1.2.4-r1.ebuild 2222
+MD5 e28ee9736e8534d621a6dadc74ae9184 struts-1.2.2-r2.ebuild 2223
+MD5 3af4563ef4ea695406c65afabf5ee314 ChangeLog 2984
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 014a9043553baf5da587c0be9fb9a981 struts-1.1.ebuild 2111
-MD5 b5f44fec42381317a6fe6571674c26c5 struts-1.1-r1.ebuild 2144
-MD5 ec2dbba4e26a4a56e59a65b19d04ad14 struts-1.2.2.ebuild 2134
-MD5 8037ab9e9045c191177dbe8420fadcd6 struts-1.1-r2.ebuild 2239
-MD5 464a2df179f626dd99944dfecd9df710 struts-1.2.2-r1.ebuild 2221
-MD5 f66dc0b19fcf42de31b74db14933e658 struts-1.2.4.ebuild 2220
-MD5 238ad3b803c15bc9e2598110b432335a files/digest-struts-1.1 75
-MD5 238ad3b803c15bc9e2598110b432335a files/digest-struts-1.1-r1 75
-MD5 ca49a9860e1c5de4c613a8209e388c41 files/digest-struts-1.2.2 77
-MD5 238ad3b803c15bc9e2598110b432335a files/digest-struts-1.1-r2 75
-MD5 ca49a9860e1c5de4c613a8209e388c41 files/digest-struts-1.2.2-r1 77
-MD5 762b50289a349b2d9dad8b763f5186a0 files/digest-struts-1.2.4 78
+MD5 ca49a9860e1c5de4c613a8209e388c41 files/digest-struts-1.2.2-r2 77
+MD5 9f357ece2d86be3e4d8eb920833501d2 files/digest-struts-1.2.4-r1 77
+MD5 238ad3b803c15bc9e2598110b432335a files/digest-struts-1.1-r3 75
diff --git a/dev-java/struts/files/digest-struts-1.1-r1 b/dev-java/struts/files/digest-struts-1.1-r1
deleted file mode 100644
index 71be52a0b597..000000000000
--- a/dev-java/struts/files/digest-struts-1.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c21f443d145f5753d5b560a2d3c2d065 jakarta-struts-1.1-src.tar.gz 9944708
diff --git a/dev-java/struts/files/digest-struts-1.1-r2 b/dev-java/struts/files/digest-struts-1.1-r2
deleted file mode 100644
index 71be52a0b597..000000000000
--- a/dev-java/struts/files/digest-struts-1.1-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c21f443d145f5753d5b560a2d3c2d065 jakarta-struts-1.1-src.tar.gz 9944708
diff --git a/dev-java/struts/files/digest-struts-1.1 b/dev-java/struts/files/digest-struts-1.1-r3
index 71be52a0b597..71be52a0b597 100644
--- a/dev-java/struts/files/digest-struts-1.1
+++ b/dev-java/struts/files/digest-struts-1.1-r3
diff --git a/dev-java/struts/files/digest-struts-1.2.2-r1 b/dev-java/struts/files/digest-struts-1.2.2-r1
deleted file mode 100644
index 0128ce1e30a0..000000000000
--- a/dev-java/struts/files/digest-struts-1.2.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 13de04190af306cffa3a829328a06325 jakarta-struts-1.2.2-src.tar.gz 5822503
diff --git a/dev-java/struts/files/digest-struts-1.2.2 b/dev-java/struts/files/digest-struts-1.2.2-r2
index 0128ce1e30a0..0128ce1e30a0 100644
--- a/dev-java/struts/files/digest-struts-1.2.2
+++ b/dev-java/struts/files/digest-struts-1.2.2-r2
diff --git a/dev-java/struts/files/digest-struts-1.2.4 b/dev-java/struts/files/digest-struts-1.2.4
deleted file mode 100644
index 2c7e22cd0fa7..000000000000
--- a/dev-java/struts/files/digest-struts-1.2.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 136539476afecd9fbd3a1f26255aef88 jakarta-struts-1.2.4-src.tar.gz 10502335
diff --git a/dev-java/struts/files/digest-struts-1.2.4-r1 b/dev-java/struts/files/digest-struts-1.2.4-r1
new file mode 100644
index 000000000000..546178c35980
--- /dev/null
+++ b/dev-java/struts/files/digest-struts-1.2.4-r1
@@ -0,0 +1 @@
+MD5 312658b62b8af0558719d13f15556d86 jakarta-struts-1.2.4-src.tar.gz 1925840
diff --git a/dev-java/struts/struts-1.1-r1.ebuild b/dev-java/struts/struts-1.1-r1.ebuild
deleted file mode 100644
index 04775127f23e..000000000000
--- a/dev-java/struts/struts-1.1-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.1-r1.ebuild,v 1.9 2005/03/29 16:36:54 luckyduck Exp $
-
-inherit java-pkg
-
-DESCRIPTION="A powerful Model View Controller Framework for JSP/Servlets"
-SRC_URI="mirror://apache/jakarta/struts/source/jakarta-${PN}-${PV}-src.tar.gz"
-HOMEPAGE="http://jakarta.apache.org/struts/index.html"
-LICENSE="Apache-1.1"
-SLOT="0"
-DEPEND=">=virtual/jdk-1.4
-	>=dev-java/ant-1.5.4
-	jikes? ( dev-java/jikes )"
-RDEPEND=">=virtual/jre-1.4
-	>=dev-java/commons-beanutils-1.6.1
-	>=dev-java/commons-collections-2.1
-	dev-java/struts-legacy
-	>=dev-java/commons-digester-1.5
-	>=dev-java/commons-fileupload-1.0
-	>=dev-java/commons-lang-1.0
-	>=dev-java/commons-logging-1.0
-	>=dev-java/commons-validator-1.0
-	=dev-java/jakarta-oro-2.0*
-	=dev-java/servletapi-2.3*"
-IUSE="doc jikes"
-KEYWORDS="~x86 ~ppc ~amd64"
-
-S=${WORKDIR}/jakarta-${PN}-${PV}-src
-
-src_compile() {
-	local antflags="compile.library"
-	use doc && antflags="${antflags} compile.javadoc"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-
-	antflags="${antflags} -Dcommons-beanutils.jar=`java-config -p commons-beanutils | sed s/:.*// `"
-	antflags="${antflags} -Dcommons-collections.jar=`java-config -p commons-collections`"
-	antflags="${antflags} -Dstruts-legacy.jar=`java-config -p struts-legacy`"
-	antflags="${antflags} -Dcommons-digester.jar=`java-config -p commons-digester`"
-	antflags="${antflags} -Dcommons-fileupload.jar=`java-config -p commons-fileupload`"
-	antflags="${antflags} -Djakarta-oro.jar=`java-config -p jakarta-oro-2.0`"
-	antflags="${antflags} -Dservlet.jar=`java-config -p servletapi-2.3`"
-	antflags="${antflags} -Dcommons-lang.jar=`java-config -p commons-lang`"
-	antflags="${antflags} -Dcommons-logging.jar=`java-config -p commons-logging | sed 's/.*://'`"
-	antflags="${antflags} -Dcommons-validator.jar=`java-config -p commons-validator`"
-
-	ant ${antflags} || die "compile failed"
-}
-
-
-src_install() {
-	java-pkg_dojar target/library/struts.jar
-	dodoc README STATUS
-	use doc && java-pkg_dohtml -r target/documentation/
-}
diff --git a/dev-java/struts/struts-1.1-r2.ebuild b/dev-java/struts/struts-1.1-r3.ebuild
index 909cc688a3de..3bb5cd5c76c7 100644
--- a/dev-java/struts/struts-1.1-r2.ebuild
+++ b/dev-java/struts/struts-1.1-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/dev-java/struts/struts-1.1-r2.ebuild,v 1.6 2005/05/07 17:17:39 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.1-r3.ebuild,v 1.1 2005/05/14 16:14:02 luckyduck Exp $
 
 inherit java-pkg
 
@@ -13,7 +13,7 @@ DEPEND=">=virtual/jdk-1.4
 	>=dev-java/ant-1.5.4
 	jikes? ( dev-java/jikes )"
 RDEPEND=">=virtual/jre-1.4
-	>=dev-java/commons-beanutils-1.6.1
+	=dev-java/commons-beanutils-1.6*
 	>=dev-java/commons-collections-2.1
 	dev-java/struts-legacy
 	>=dev-java/commons-digester-1.5
@@ -33,7 +33,7 @@ src_compile() {
 	use doc && antflags="${antflags} compile.javadoc"
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 
-	antflags="${antflags} -Dcommons-beanutils.jar=`java-config -p commons-beanutils | sed s/:.*// `"
+	antflags="${antflags} -Dcommons-beanutils.jar=`java-config -p commons-beanutils-1.6 | sed s/:.*// `"
 	antflags="${antflags} -Dcommons-collections.jar=`java-config -p commons-collections`"
 	antflags="${antflags} -Dstruts-legacy.jar=`java-config -p struts-legacy`"
 	antflags="${antflags} -Dcommons-digester.jar=`java-config -p commons-digester`"
diff --git a/dev-java/struts/struts-1.1.ebuild b/dev-java/struts/struts-1.1.ebuild
deleted file mode 100644
index 717b6bf8a2e1..000000000000
--- a/dev-java/struts/struts-1.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.1.ebuild,v 1.8 2005/03/29 16:36:54 luckyduck Exp $
-
-inherit java-pkg
-
-DESCRIPTION="A powerful Model View Controller Framework for JSP/Servlets"
-SRC_URI="mirror://apache/jakarta/struts/source/jakarta-${PN}-${PV}-src.tar.gz"
-HOMEPAGE="http://jakarta.apache.org/struts/index.html"
-LICENSE="Apache-1.1"
-SLOT="0"
-DEPEND=">=virtual/jdk-1.4
-		>=dev-java/ant-1.5.4
-		>=dev-java/commons-beanutils-1.6.1
-		>=dev-java/commons-collections-2.1
-		dev-java/struts-legacy
-		>=dev-java/commons-digester-1.5
-		>=dev-java/commons-fileupload-1.0
-		>=dev-java/commons-lang-1.0
-		>=dev-java/commons-logging-1.0
-		>=dev-java/commons-validator-1.0
-		=dev-java/jakarta-oro-2.0*
-		=dev-java/servletapi-2.3*
-		jikes? ( dev-java/jikes )"
-
-IUSE="doc jikes"
-KEYWORDS="~x86 ~ppc ~amd64"
-
-S=${WORKDIR}/jakarta-${PN}-${PV}-src
-
-src_compile() {
-	local antflags="compile.library"
-	use doc && antflags="${antflags} compile.javadoc"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-
-	antflags="${antflags} -Dcommons-beanutils.jar=`java-config -p commons-beanutils`"
-	antflags="${antflags} -Dcommons-collections.jar=`java-config -p commons-collections`"
-	antflags="${antflags} -Dstruts-legacy.jar=`java-config -p struts-legacy`"
-	antflags="${antflags} -Dcommons-digester.jar=`java-config -p commons-digester`"
-	antflags="${antflags} -Dcommons-fileupload.jar=`java-config -p commons-fileupload`"
-	antflags="${antflags} -Djakarta-oro.jar=`java-config -p jakarta-oro-2.0`"
-	antflags="${antflags} -Dservlet.jar=`java-config -p servletapi-2.3`"
-	antflags="${antflags} -Dcommons-lang.jar=`java-config -p commons-lang`"
-	antflags="${antflags} -Dcommons-logging.jar=`java-config -p commons-logging | sed 's/.*://'`"
-	antflags="${antflags} -Dcommons-validator.jar=`java-config -p commons-validator`"
-
-	ant ${antflags} || die "compile failed"
-}
-
-
-src_install() {
-	java-pkg_dojar target/library/struts.jar
-	dodoc README STATUS
-	use doc && java-pkg_dohtml -r target/documentation/
-}
diff --git a/dev-java/struts/struts-1.2.2-r1.ebuild b/dev-java/struts/struts-1.2.2-r2.ebuild
index 6159b1a7c916..07e2f9664b61 100644
--- a/dev-java/struts/struts-1.2.2-r1.ebuild
+++ b/dev-java/struts/struts-1.2.2-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/struts/struts-1.2.2-r1.ebuild,v 1.5 2005/03/29 16:36:54 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.2.2-r2.ebuild,v 1.1 2005/05/14 16:14:02 luckyduck Exp $
 
 inherit java-pkg
 
@@ -13,7 +13,7 @@ DEPEND=">=virtual/jdk-1.4
 	>=dev-java/ant-1.6.0
 	jikes? ( dev-java/jikes )"
 RDEPEND=">=virtual/jre-1.4
-	>=dev-java/commons-beanutils-1.6.1
+	=dev-java/commons-beanutils-1.6*
 	>=dev-java/commons-collections-2.1
 	dev-java/struts-legacy
 	>=dev-java/commons-digester-1.5
@@ -33,7 +33,7 @@ src_compile() {
 	use doc && antflags="${antflags} compile.javadoc"
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 
-	antflags="${antflags} -Dcommons-beanutils.jar=`java-config -p commons-beanutils | sed s/:.*// `"
+	antflags="${antflags} -Dcommons-beanutils.jar=`java-config -p commons-beanutils-1.6 | sed s/:.*// `"
 	antflags="${antflags} -Dcommons-collections.jar=`java-config -p commons-collections`"
 	antflags="${antflags} -Dstruts-legacy.jar=`java-config -p struts-legacy`"
 	antflags="${antflags} -Dcommons-digester.jar=`java-config -p commons-digester`"
diff --git a/dev-java/struts/struts-1.2.2.ebuild b/dev-java/struts/struts-1.2.2.ebuild
deleted file mode 100644
index c9b435c4f98c..000000000000
--- a/dev-java/struts/struts-1.2.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.2.2.ebuild,v 1.6 2005/03/29 16:36:54 luckyduck Exp $
-
-inherit java-pkg
-
-DESCRIPTION="A powerful Model View Controller Framework for JSP/Servlets"
-SRC_URI="mirror://apache/struts/source/jakarta-${PN}-${PV}-src.tar.gz"
-HOMEPAGE="http://jakarta.apache.org/struts/index.html"
-LICENSE="Apache-2.0"
-SLOT="0"
-DEPEND=">=virtual/jdk-1.4
-	>=dev-java/ant-1.6.0
-	jikes? ( dev-java/jikes )"
-RDEPEND=">=virtual/jre-1.4
-	>=dev-java/commons-beanutils-1.6.1
-	>=dev-java/commons-collections-2.1
-	dev-java/struts-legacy
-	>=dev-java/commons-digester-1.5
-	>=dev-java/commons-fileupload-1.0
-	>=dev-java/commons-lang-2.0
-	>=dev-java/commons-logging-1.0.4
-	>=dev-java/commons-validator-1.1.3
-	=dev-java/jakarta-oro-2.0*
-	=dev-java/servletapi-2.3*"
-IUSE="doc jikes"
-KEYWORDS="~x86 ~ppc ~amd64"
-
-S=${WORKDIR}/jakarta-struts
-
-src_compile() {
-	local antflags="compile.library"
-	use doc && antflags="${antflags} compile.javadoc"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-
-	antflags="${antflags} -Dcommons-beanutils.jar=`java-config -p commons-beanutils | sed s/:.*// `"
-	antflags="${antflags} -Dcommons-collections.jar=`java-config -p commons-collections`"
-	antflags="${antflags} -Dstruts-legacy.jar=`java-config -p struts-legacy`"
-	antflags="${antflags} -Dcommons-digester.jar=`java-config -p commons-digester`"
-	antflags="${antflags} -Dcommons-fileupload.jar=`java-config -p commons-fileupload`"
-	antflags="${antflags} -Djakarta-oro.jar=`java-config -p jakarta-oro-2.0`"
-	antflags="${antflags} -Dservlet.jar=`java-config -p servletapi-2.3`"
-	antflags="${antflags} -Dcommons-lang.jar=`java-config -p commons-lang`"
-	antflags="${antflags} -Dcommons-logging.jar=`java-config -p commons-logging | sed 's/.*://'`"
-	antflags="${antflags} -Dcommons-validator.jar=`java-config -p commons-validator`"
-
-	ant ${antflags} || die "compile failed"
-}
-
-
-src_install() {
-	java-pkg_dojar target/library/struts.jar
-	dodoc README STATUS.txt
-	use doc && java-pkg_dohtml -r target/documentation/
-}
diff --git a/dev-java/struts/struts-1.2.4.ebuild b/dev-java/struts/struts-1.2.4-r1.ebuild
index 82e16e9523ba..737e333bd9f4 100644
--- a/dev-java/struts/struts-1.2.4.ebuild
+++ b/dev-java/struts/struts-1.2.4-r1.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/struts/struts-1.2.4.ebuild,v 1.6 2005/03/29 16:36:54 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.2.4-r1.ebuild,v 1.1 2005/05/14 16:14:02 luckyduck Exp $
 
 inherit java-pkg
 
@@ -13,7 +13,7 @@ DEPEND=">=virtual/jdk-1.4
 	>=dev-java/ant-1.6.0
 	jikes? ( dev-java/jikes )"
 RDEPEND=">=virtual/jre-1.4
-	>=dev-java/commons-beanutils-1.6.1
+	=dev-java/commons-beanutils-1.6*
 	>=dev-java/commons-collections-2.1
 	dev-java/struts-legacy
 	>=dev-java/commons-digester-1.5
@@ -33,7 +33,7 @@ src_compile() {
 	use doc && antflags="${antflags} compile.javadoc"
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 
-	antflags="${antflags} -Dcommons-beanutils.jar=`java-config -p commons-beanutils | sed s/:.*// `"
+	antflags="${antflags} -Dcommons-beanutils.jar=`java-config -p commons-beanutils-1.6 | sed s/:.*// `"
 	antflags="${antflags} -Dcommons-collections.jar=`java-config -p commons-collections`"
 	antflags="${antflags} -Dstruts-legacy.jar=`java-config -p struts-legacy`"
 	antflags="${antflags} -Dcommons-digester.jar=`java-config -p commons-digester`"