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

(Portage version: 2.0.51.21)

15 files changed, 28 insertions, 192 deletions

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`"