version bump

5 files changed, 66 insertions, 13 deletions

diff --git a/dev-java/struts/ChangeLog b/dev-java/struts/ChangeLog
index 3d66585b780b..2e14a6283676 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.5 2004/07/26 10:47:57 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v 1.6 2004/09/10 13:33:30 axxo Exp $
+
+*struts-1.2.2 (10 Sep 2004)
+
+  10 Sep 2004; Thomas Matthijs <axxo@gentoo.org> +struts-1.2.2.ebuild:
+  version bump
 
   26 Jul 2004; Thomas Matthijs <axxo@gentoo.org> struts-1.1-r1.ebuild,
   struts-1.1.ebuild:
diff --git a/dev-java/struts/Manifest b/dev-java/struts/Manifest
index 1fd2d260052d..9aea2e868008 100644
--- a/dev-java/struts/Manifest
+++ b/dev-java/struts/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 8e234e7997540b79f1af05cd8d819ce3 struts-1.1.ebuild 2072
 MD5 f0f25f66efe7ee8d9d727a02a9ca7cbf struts-1.1-r1.ebuild 2099
+MD5 9112a22e50946714e800eb901c949aae struts-1.2.2.ebuild 2090
 MD5 99a04c3651f90e4ed147f93749c74aa0 ChangeLog 761
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 238ad3b803c15bc9e2598110b432335a files/digest-struts-1.1 75
+MD5 ca49a9860e1c5de4c613a8209e388c41 files/digest-struts-1.2.2 77
 MD5 238ad3b803c15bc9e2598110b432335a files/digest-struts-1.1-r1 75
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBPwbY/rLF9B432nYRAhW/AKDHicjvOxw7Qz04hbpPz3UB75INYwCghyMY
-cFWh2TNGv1anhGGaoaxjwuw=
-=h19E
------END PGP SIGNATURE-----
diff --git a/dev-java/struts/files/digest-struts-1.2.2 b/dev-java/struts/files/digest-struts-1.2.2
new file mode 100644
index 000000000000..0128ce1e30a0
--- /dev/null
+++ b/dev-java/struts/files/digest-struts-1.2.2
@@ -0,0 +1 @@
+MD5 13de04190af306cffa3a829328a06325 jakarta-struts-1.2.2-src.tar.gz 5822503
diff --git a/dev-java/struts/struts-1.1-r1.ebuild b/dev-java/struts/struts-1.1-r1.ebuild
index 707901b35b4a..088b03a332bf 100644
--- a/dev-java/struts/struts-1.1-r1.ebuild
+++ b/dev-java/struts/struts-1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.1-r1.ebuild,v 1.4 2004/09/08 13:17:44 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.1-r1.ebuild,v 1.5 2004/09/10 13:33:30 axxo Exp $
 
 inherit java-pkg
 
@@ -24,7 +24,7 @@ DEPEND=">=virtual/jre-1.4
 	>=dev-java/oro-2.0.6
 	=dev-java/servletapi-2.3*"
 IUSE="doc jikes"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 
 S=${WORKDIR}/jakarta-${PN}-${PV}-src
 
diff --git a/dev-java/struts/struts-1.2.2.ebuild b/dev-java/struts/struts-1.2.2.ebuild
new file mode 100644
index 000000000000..4bd72e9fa858
--- /dev/null
+++ b/dev-java/struts/struts-1.2.2.ebuild
@@ -0,0 +1,55 @@
+# 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.2.ebuild,v 1.1 2004/09/10 13:33:30 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.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-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
+	dodoc README STATUS.txt
+	use doc && dohtml -r target/documentation/
+}