dep fixes + cleanup

(Portage version: 2.0.51.22-r1)

4 files changed, 54 insertions, 47 deletions

diff --git a/dev-java/struts/ChangeLog b/dev-java/struts/ChangeLog
index c4a63eb7c852..d047944814e4 100644
--- a/dev-java/struts/ChangeLog
+++ b/dev-java/struts/ChangeLog
@@ -1,6 +1,10 @@
 # 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.19 2005/06/18 14:52:47 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v 1.20 2005/07/10 15:26:13 axxo Exp $
+
+  10 Jul 2005; Thomas Matthijs <axxo@gentoo.org> struts-1.1-r3.ebuild,
+  struts-1.2.2-r2.ebuild, struts-1.2.4-r1.ebuild:
+  dep fixes + cleanup
 
   18 Jun 2005; Jan Brinkmann <luckyduck@gentoo.org> struts-1.2.4-r1.ebuild:
   The package.env file now contains DEPEND, fixes #96145. Introduced support
diff --git a/dev-java/struts/struts-1.1-r3.ebuild b/dev-java/struts/struts-1.1-r3.ebuild
index 0a3341f378d1..44b17fe78698 100644
--- a/dev-java/struts/struts-1.1-r3.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-r3.ebuild,v 1.3 2005/07/09 22:25:44 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.1-r3.ebuild,v 1.4 2005/07/10 15:26:13 axxo Exp $
 
 inherit java-pkg
 
@@ -9,9 +9,6 @@ SRC_URI="mirror://apache/jakarta/struts/source/jakarta-${P}-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*
 	>=dev-java/commons-collections-2.1
@@ -23,7 +20,12 @@ RDEPEND=">=virtual/jre-1.4
 	>=dev-java/commons-validator-1.0
 	=dev-java/jakarta-oro-2.0*
 	=dev-java/servletapi-2.3*"
-IUSE="doc jikes"
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}
+	>=dev-java/ant-1.5.4
+	source? ( app-arch/zip )
+	jikes? ( dev-java/jikes )"
+IUSE="doc jikes source"
 KEYWORDS="~amd64 ~ppc ppc64 ~sparc ~x86"
 
 S=${WORKDIR}/jakarta-${P}-src
@@ -33,21 +35,20 @@ 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-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`"
-	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`"
+	antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar commons-beanutils-1.6 commons-beanutils.jar)"
+	antflags="${antflags} -Dcommons-collections.jar=$(java-pkg_getjars commons-collections)"
+	antflags="${antflags} -Dstruts-legacy.jar=$(java-pkg_getjars struts-legacy)"
+	antflags="${antflags} -Dcommons-digester.jar=$(java-pkg_getjars commons-digester)"
+	antflags="${antflags} -Dcommons-fileupload.jar=$(java-pkg_getjars commons-fileupload)"
+	antflags="${antflags} -Djakarta-oro.jar=$(java-pkg_getjars jakarta-oro-2.0)"
+	antflags="${antflags} -Dservlet.jar=$(java-pkg_getjars servletapi-2.3)"
+	antflags="${antflags} -Dcommons-lang.jar=$(java-pkg_getjars commons-lang)"
+	antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)"
+	antflags="${antflags} -Dcommons-validator.jar=$(java-pkg_getjars commons-validator)"
 
 	ant ${antflags} || die "compile failed"
 }
 
-
 src_install() {
 	java-pkg_dojar target/library/struts.jar
 
@@ -57,4 +58,5 @@ src_install() {
 
 	dodoc README STATUS
 	use doc && java-pkg_dohtml -r target/documentation/
+	use source && java-pkg_dosrc src/*/*
 }
diff --git a/dev-java/struts/struts-1.2.2-r2.ebuild b/dev-java/struts/struts-1.2.2-r2.ebuild
index 1505b71cc524..44fec6e80b2f 100644
--- a/dev-java/struts/struts-1.2.2-r2.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-r2.ebuild,v 1.2 2005/07/09 22:25:44 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.2.2-r2.ebuild,v 1.3 2005/07/10 15:26:13 axxo Exp $
 
 inherit java-pkg
 
@@ -9,9 +9,6 @@ SRC_URI="mirror://apache/struts/source/jakarta-${P}-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*
 	>=dev-java/commons-collections-2.1
@@ -23,6 +20,10 @@ RDEPEND=">=virtual/jre-1.4
 	>=dev-java/commons-validator-1.1.3
 	=dev-java/jakarta-oro-2.0*
 	=dev-java/servletapi-2.3*"
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}
+	>=dev-java/ant-1.6.0
+	jikes? ( dev-java/jikes )"
 IUSE="doc jikes"
 KEYWORDS="~x86 ~ppc ~amd64"
 
@@ -33,16 +34,16 @@ 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-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`"
-	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`"
+	antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar commons-beanutils-1.6 commons-beanutils.jar)"
+	antflags="${antflags} -Dcommons-collections.jar=$(java-pkg_getjars commons-collections)"
+	antflags="${antflags} -Dstruts-legacy.jar=$(java-pkg_getjars struts-legacy)"
+	antflags="${antflags} -Dcommons-digester.jar=$(java-pkg_getjars commons-digester)"
+	antflags="${antflags} -Dcommons-fileupload.jar=$(java-pkg_getjars commons-fileupload)"
+	antflags="${antflags} -Djakarta-oro.jar=$(java-pkg_getjars jakarta-oro-2.0)"
+	antflags="${antflags} -Dservlet.jar=$(java-pkg_getjars servletapi-2.3)"
+	antflags="${antflags} -Dcommons-lang.jar=$(java-pkg_getjars commons-lang)"
+	antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)"
+	antflags="${antflags} -Dcommons-validator.jar=$(java-pkg_getjars commons-validator)"
 
 	ant ${antflags} || die "compile failed"
 }
diff --git a/dev-java/struts/struts-1.2.4-r1.ebuild b/dev-java/struts/struts-1.2.4-r1.ebuild
index 66d2ffc01901..97776b182ab8 100644
--- a/dev-java/struts/struts-1.2.4-r1.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-r1.ebuild,v 1.3 2005/07/09 22:25:44 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.2.4-r1.ebuild,v 1.4 2005/07/10 15:26:13 axxo Exp $
 
 inherit java-pkg
 
@@ -9,10 +9,6 @@ SRC_URI="mirror://apache/struts/source/jakarta-${P}-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 )
-	source? ( app-arch/zip )"
 RDEPEND=">=virtual/jre-1.4
 	=dev-java/commons-beanutils-1.6*
 	>=dev-java/commons-collections-2.1
@@ -24,6 +20,11 @@ RDEPEND=">=virtual/jre-1.4
 	>=dev-java/commons-validator-1.1.3
 	=dev-java/jakarta-oro-2.0*
 	=dev-java/servletapi-2.3*"
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}
+	>=dev-java/ant-1.6.0
+	jikes? ( dev-java/jikes )
+	source? ( app-arch/zip )"
 IUSE="doc examples jikes source"
 KEYWORDS="~x86 ~ppc ~amd64"
 
@@ -34,21 +35,20 @@ src_compile() {
 	use doc && antflags="${antflags} compile.javadoc"
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 
-	antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar	commons-beanutils-1.6 commons-beanutils.jar | sed s/:.*// )"
-	antflags="${antflags} -Dcommons-collections.jar=$(java-pkg_getjar commons-collections commons-collections.jar)"
-	antflags="${antflags} -Dstruts-legacy.jar=$(java-pkg_getjar struts-legacy struts-legacy.jar)"
-	antflags="${antflags} -Dcommons-digester.jar=$(java-pkg_getjar commons-digester commons-digester.jar)"
-	antflags="${antflags} -Dcommons-fileupload.jar=$(java-pkg_getjar commons-fileupload commons-fileupload.jar)"
-	antflags="${antflags} -Djakarta-oro.jar=$(java-pkg_getjar jakarta-oro-2.0 jakarta-oro.jar)"
-	antflags="${antflags} -Dservlet.jar=$(java-pkg_getjar servletapi-2.3 servlet.jar)"
-	antflags="${antflags} -Dcommons-lang.jar=$(java-pkg_getjar commons-lang commons-lang.jar)"
-	antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar | sed 's/.*://')"
-	antflags="${antflags} -Dcommons-validator.jar=$(java-pkg_getjar commons-validator commons-validator.jar)"
+	antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar commons-beanutils-1.6 commons-beanutils.jar)"
+	antflags="${antflags} -Dcommons-collections.jar=$(java-pkg_getjars commons-collections)"
+	antflags="${antflags} -Dstruts-legacy.jar=$(java-pkg_getjars struts-legacy)"
+	antflags="${antflags} -Dcommons-digester.jar=$(java-pkg_getjars commons-digester)"
+	antflags="${antflags} -Dcommons-fileupload.jar=$(java-pkg_getjars commons-fileupload)"
+	antflags="${antflags} -Djakarta-oro.jar=$(java-pkg_getjars jakarta-oro-2.0)"
+	antflags="${antflags} -Dservlet.jar=$(java-pkg_getjars servletapi-2.3)"
+	antflags="${antflags} -Dcommons-lang.jar=$(java-pkg_getjars commons-lang)"
+	antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)"
+	antflags="${antflags} -Dcommons-validator.jar=$(java-pkg_getjars commons-validator)"
 
 	ant ${antflags} || die "compile failed"
 }
 
-
 src_install() {
 	java-pkg_dojar target/library/struts.jar