Install *.tld files

6 files changed, 139 insertions, 11 deletions

diff --git a/dev-java/struts/ChangeLog b/dev-java/struts/ChangeLog
index b0c7af57a24d..cd876dce76e0 100644
--- a/dev-java/struts/ChangeLog
+++ b/dev-java/struts/ChangeLog
@@ -1,6 +1,18 @@
 # 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.7 2004/09/12 17:11:13 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v 1.8 2004/10/08 17:05:43 axxo Exp $
+
+*struts-1.2.2-r1 (08 Oct 2004)
+
+  08 Oct 2004; Thomas Matthijs <axxo@gentoo.org> +struts-1.1-r2.ebuild,
+  +struts-1.2.2-r1.ebuild:
+  Install *.tld files
+
+*struts-1.2.2-r1 (08 Oct 2004)
+
+  08 Oct 2004; Thomas Matthijs <axxo@gentoo.org> +struts-1.1-r2.ebuild,
+  +struts-1.2.2-r1.ebuild:
+  Install *.tld files
 
   12 Sep 2004; Thomas Matthijs <axxo@gentoo.org> struts-1.1-r1.ebuild,
   struts-1.2.2.ebuild:
diff --git a/dev-java/struts/Manifest b/dev-java/struts/Manifest
index da54bb27f7d6..a6c206e3367b 100644
--- a/dev-java/struts/Manifest
+++ b/dev-java/struts/Manifest
@@ -1,18 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 8e234e7997540b79f1af05cd8d819ce3 struts-1.1.ebuild 2072
 MD5 c0b0c171994db8dc253231134be3bd8a struts-1.1-r1.ebuild 2105
+MD5 4449a7f833c1a9ffe52d8596e05f0450 struts-1.2.2-r1.ebuild 2179
 MD5 74b0fa91fccebd16808c92ac1b6a6492 struts-1.2.2.ebuild 2095
+MD5 2a4a4d6f105a5bd1505ad7066b73de91 struts-1.1-r2.ebuild 2190
 MD5 f8b928d5d76ed660ce076c94018bf54a ChangeLog 1016
 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 238ad3b803c15bc9e2598110b432335a files/digest-struts-1.1-r1 75
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBRIQx/rLF9B432nYRAoESAJ4wYCSH3zYmrs9w744kbiFqstLUGwCgnv2j
-v3kSjbaw4pnGY89qs4DQEes=
-=FM0Q
------END PGP SIGNATURE-----
+MD5 238ad3b803c15bc9e2598110b432335a files/digest-struts-1.1-r2 75
diff --git a/dev-java/struts/files/digest-struts-1.1-r2 b/dev-java/struts/files/digest-struts-1.1-r2
new file mode 100644
index 000000000000..71be52a0b597
--- /dev/null
+++ b/dev-java/struts/files/digest-struts-1.1-r2
@@ -0,0 +1 @@
+MD5 c21f443d145f5753d5b560a2d3c2d065 jakarta-struts-1.1-src.tar.gz 9944708
diff --git a/dev-java/struts/files/digest-struts-1.2.2-r1 b/dev-java/struts/files/digest-struts-1.2.2-r1
new file mode 100644
index 000000000000..0128ce1e30a0
--- /dev/null
+++ b/dev-java/struts/files/digest-struts-1.2.2-r1
@@ -0,0 +1 @@
+MD5 13de04190af306cffa3a829328a06325 jakarta-struts-1.2.2-src.tar.gz 5822503
diff --git a/dev-java/struts/struts-1.1-r2.ebuild b/dev-java/struts/struts-1.1-r2.ebuild
new file mode 100644
index 000000000000..a2b1aced5417
--- /dev/null
+++ b/dev-java/struts/struts-1.1-r2.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.1-r2.ebuild,v 1.1 2004/10/08 17:05:43 axxo 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/oro-2.0.6
+	=dev-java/servletapi-2.3*"
+IUSE="doc jikes"
+KEYWORDS="~x86 ~ppc"
+
+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 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
+	use doc && dohtml -r target/documentation/
+}
diff --git a/dev-java/struts/struts-1.2.2-r1.ebuild b/dev-java/struts/struts-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..409df3c8840f
--- /dev/null
+++ b/dev-java/struts/struts-1.2.2-r1.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.2-r1.ebuild,v 1.1 2004/10/08 17:05:43 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/
+}