Fixes #45402.

3 files changed, 62 insertions, 1 deletions

diff --git a/dev-java/struts/ChangeLog b/dev-java/struts/ChangeLog
index df9d48a60fdb..7df9de3cdab1 100644
--- a/dev-java/struts/ChangeLog
+++ b/dev-java/struts/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/struts
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v 1.1 2004/03/18 05:03:12 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v 1.2 2004/06/21 20:02:12 karltk Exp $
+
+*struts-1.1-r1 (21 Jun 2004)
+
+  21 Jun 2004; Karl Trygve Kalleberg <karltk@gentoo.org> struts-1.1-r1.ebuild:
+  Fixed to more suitable runtime dependencies, fixes #45402.
 
 *struts-1.1 (18 Mar 2004)
 
diff --git a/dev-java/struts/files/digest-struts-1.1-r1 b/dev-java/struts/files/digest-struts-1.1-r1
new file mode 100644
index 000000000000..71be52a0b597
--- /dev/null
+++ b/dev-java/struts/files/digest-struts-1.1-r1
@@ -0,0 +1 @@
+MD5 c21f443d145f5753d5b560a2d3c2d065 jakarta-struts-1.1-src.tar.gz 9944708
diff --git a/dev-java/struts/struts-1.1-r1.ebuild b/dev-java/struts/struts-1.1-r1.ebuild
new file mode 100644
index 000000000000..305bf29434ab
--- /dev/null
+++ b/dev-java/struts/struts-1.1-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# 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.1 2004/06/21 20:02:12 karltk 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 )"
+DEPEND=">=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/oro-2.0.6
+	=dev-java/servletapi-2.3*"
+IUSE="doc jikes"
+KEYWORDS="~x86"
+
+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 oro`"
+	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 && dohtml -r target/documentation/
+}