version bump

4 files changed, 73 insertions, 5 deletions

diff --git a/dev-java/struts/ChangeLog b/dev-java/struts/ChangeLog
index cd876dce76e0..f0bda85f3fd4 100644
--- a/dev-java/struts/ChangeLog
+++ b/dev-java/struts/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/struts
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v 1.8 2004/10/08 17:05:43 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v 1.9 2004/10/12 17:06:35 axxo Exp $
+
+*struts-1.2.4 (12 Oct 2004)
+
+  12 Oct 2004; Thomas Matthijs <axxo@gentoo.org> +struts-1.2.4.ebuild:
+  version bump
 
 *struts-1.2.2-r1 (08 Oct 2004)
 
diff --git a/dev-java/struts/Manifest b/dev-java/struts/Manifest
index 68ddbc31bbfd..e950c325246a 100644
--- a/dev-java/struts/Manifest
+++ b/dev-java/struts/Manifest
@@ -5,18 +5,20 @@ MD5 8e234e7997540b79f1af05cd8d819ce3 struts-1.1.ebuild 2072
 MD5 c0b0c171994db8dc253231134be3bd8a struts-1.1-r1.ebuild 2105
 MD5 d371b5b0d666df83165af65959f9e601 struts-1.2.2-r1.ebuild 2182
 MD5 74b0fa91fccebd16808c92ac1b6a6492 struts-1.2.2.ebuild 2095
+MD5 9ec5a2ba4288ae79124933aa42a6a8b1 struts-1.2.4.ebuild 2179
 MD5 67d39ee1c9e9c9149da244989cafc361 struts-1.1-r2.ebuild 2190
-MD5 7cbe6bb424b4ea2209fce8a81a7640b6 ChangeLog 1324
+MD5 82b9fe80cc4e12e922aa957a3988f4c7 ChangeLog 1440
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 238ad3b803c15bc9e2598110b432335a files/digest-struts-1.1 75
 MD5 ca49a9860e1c5de4c613a8209e388c41 files/digest-struts-1.2.2-r1 77
 MD5 ca49a9860e1c5de4c613a8209e388c41 files/digest-struts-1.2.2 77
+MD5 762b50289a349b2d9dad8b763f5186a0 files/digest-struts-1.2.4 78
 MD5 238ad3b803c15bc9e2598110b432335a files/digest-struts-1.1-r1 75
 MD5 238ad3b803c15bc9e2598110b432335a files/digest-struts-1.1-r2 75
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBZskM/rLF9B432nYRAh4/AKDCXAzKG1JEe7yw/CU8O0DPpDXAgQCfbonH
-X1TZc0e1Wn+1VO+WGyktp7U=
-=z8at
+iD8DBQFBbA8p/rLF9B432nYRAtK7AKC2MWwPFBRiNhUKQJAll6+nBmsZgQCgpQqx
+i5+b6IoNMxjKHA9aMNOT1rs=
+=fWTC
 -----END PGP SIGNATURE-----
diff --git a/dev-java/struts/files/digest-struts-1.2.4 b/dev-java/struts/files/digest-struts-1.2.4
new file mode 100644
index 000000000000..2c7e22cd0fa7
--- /dev/null
+++ b/dev-java/struts/files/digest-struts-1.2.4
@@ -0,0 +1 @@
+MD5 136539476afecd9fbd3a1f26255aef88 jakarta-struts-1.2.4-src.tar.gz 10502335
diff --git a/dev-java/struts/struts-1.2.4.ebuild b/dev-java/struts/struts-1.2.4.ebuild
new file mode 100644
index 000000000000..ee4bb3c32a5f
--- /dev/null
+++ b/dev-java/struts/struts-1.2.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2004 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.1 2004/10/12 17:06:35 axxo 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-1.1"
+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/oro-2.0.7
+	=dev-java/servletapi-2.3*"
+IUSE="doc jikes"
+KEYWORDS="~x86 ~ppc"
+
+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 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
+
+	#install the tld files
+	insinto /usr/share/${PN}/lib
+	doins target/library/*.tld
+
+	dodoc README STATUS.txt
+	use doc && dohtml -r target/documentation/
+}