Revision bump to support the new Java system.

Package-Manager: portage-2.1.1

5 files changed, 97 insertions, 4 deletions

diff --git a/dev-java/struts/ChangeLog b/dev-java/struts/ChangeLog
index c3d0aa3ab615..b7db5b974e3e 100644
--- a/dev-java/struts/ChangeLog
+++ b/dev-java/struts/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/struts
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v 1.24 2006/03/31 15:49:34 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v 1.25 2006/09/17 20:08:39 nichoj Exp $
+
+*struts-1.2.9-r1 (17 Sep 2006)
+
+  17 Sep 2006; Joshua Nichols <nichoj@gentoo.org> metadata.xml,
+  +struts-1.2.9-r1.ebuild:
+  Revision bump to support the new Java system.
 
 *struts-1.2.9 (31 Mar 2006)
 
diff --git a/dev-java/struts/files/digest-struts-1.2.9 b/dev-java/struts/files/digest-struts-1.2.9
index 4df023f97317..a98f89af53d1 100644
--- a/dev-java/struts/files/digest-struts-1.2.9
+++ b/dev-java/struts/files/digest-struts-1.2.9
@@ -1 +1,3 @@
 MD5 63ff6e570410876412f8fd97749b2415 struts-1.2.9-src.tar.gz 5754377
+RMD160 da420cc0991a3f9056005d977ce1c46325aa9ea9 struts-1.2.9-src.tar.gz 5754377
+SHA256 7354437d04b666fc6d302b0fd14a3bb971a6389085d9f7a5ea4b25eed289400e struts-1.2.9-src.tar.gz 5754377
diff --git a/dev-java/struts/files/digest-struts-1.2.9-r1 b/dev-java/struts/files/digest-struts-1.2.9-r1
new file mode 100644
index 000000000000..a98f89af53d1
--- /dev/null
+++ b/dev-java/struts/files/digest-struts-1.2.9-r1
@@ -0,0 +1,3 @@
+MD5 63ff6e570410876412f8fd97749b2415 struts-1.2.9-src.tar.gz 5754377
+RMD160 da420cc0991a3f9056005d977ce1c46325aa9ea9 struts-1.2.9-src.tar.gz 5754377
+SHA256 7354437d04b666fc6d302b0fd14a3bb971a6389085d9f7a5ea4b25eed289400e struts-1.2.9-src.tar.gz 5754377
diff --git a/dev-java/struts/metadata.xml b/dev-java/struts/metadata.xml
index 4d4606073c0e..815c326402df 100644
--- a/dev-java/struts/metadata.xml
+++ b/dev-java/struts/metadata.xml
@@ -3,9 +3,9 @@
 <pkgmetadata>
 <herd>java</herd>
 <longdescription>
-The Struts framework provides the invisible underpinnings every professional 
-web application needs to survive. Struts helps you create an extensible 
-development environment for your application, based on published standards 
+The Struts framework provides the invisible underpinnings every professional
+web application needs to survive. Struts helps you create an extensible
+development environment for your application, based on published standards
 and proven design patterns.
 </longdescription>
 </pkgmetadata>
diff --git a/dev-java/struts/struts-1.2.9-r1.ebuild b/dev-java/struts/struts-1.2.9-r1.ebuild
new file mode 100644
index 000000000000..394b49dff243
--- /dev/null
+++ b/dev-java/struts/struts-1.2.9-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.2.9-r1.ebuild,v 1.1 2006/09/17 20:08:39 nichoj Exp $
+
+inherit java-pkg-2 java-ant-2
+
+MY_P="${P}-src"
+DESCRIPTION="A powerful Model View Controller Framework for JSP/Servlets"
+SRC_URI="mirror://apache/struts/source/${MY_P}.tar.gz"
+HOMEPAGE="http://jakarta.apache.org/struts/index.html"
+LICENSE="Apache-2.0"
+SLOT="1.2"
+COMMON_DEPS="
+	dev-java/antlr
+	=dev-java/commons-beanutils-1.7*
+	>=dev-java/commons-collections-2.1
+	>=dev-java/commons-digester-1.5
+	>=dev-java/commons-fileupload-1.0
+	>=dev-java/commons-logging-1.0.4
+	~dev-java/commons-validator-1.1.4
+	=dev-java/jakarta-oro-2.0*
+	=dev-java/servletapi-2.3*"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEPS}"
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEPS}
+	>=dev-java/ant-1.6.0
+	source? ( app-arch/zip )"
+IUSE="doc examples source"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+
+	# the build.xml expects this directory to exist
+	mkdir ${S}/lib
+	cd ${S}/lib
+
+	# No property exists for this
+	java-pkg_jar-from commons-collections
+}
+
+src_compile() {
+	local antflags="compile.library"
+	use doc && antflags="${antflags} compile.javadoc"
+
+	# In the order the build process asks for these
+	# They are copied in the build.xml to ${S}/target/library/
+	antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar commons-beanutils-1.7 commons-beanutils.jar)"
+	antflags="${antflags} -Dcommons-digester.jar=$(java-pkg_getjars commons-digester)"
+	antflags="${antflags} -Dcommons-fileupload.jar=$(java-pkg_getjars commons-fileupload)"
+	antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)"
+	antflags="${antflags} -Dcommons-validator.jar=$(java-pkg_getjars commons-validator)"
+	antflags="${antflags} -Djakarta-oro.jar=$(java-pkg_getjars jakarta-oro-2.0)"
+
+	# Needed to compile
+	antflags="${antflags} -Dservlet.jar=$(java-pkg_getjars servletapi-2.3)"
+	antflags="${antflags} -Dantlr.jar=$(java-pkg_getjars antlr)"
+
+	# only needed for contrib stuff which we don't currently build
+#	antflags="${antflags} -Dstruts-legacy.jar=$(java-pkg_getjars struts-legacy)"
+
+	eant ${antflags}
+}
+
+src_install() {
+	java-pkg_dojar target/library/${PN}.jar
+
+	#install the tld files
+	insinto /usr/share/${PN}-${SLOT}/lib
+	doins target/library/*.tld
+
+	dodoc README STATUS.txt
+	use doc && java-pkg_dohtml -r target/documentation/
+	if use examples; then
+		dodir /usr/share/doc/${PF}/examples
+		cp -r src/example*/* ${D}/usr/share/doc/${PF}/examples
+	fi
+	use source && java-pkg_dosrc src/share/*
+}