Switched to java-virtuals/servlet-api and EAPI=1 slots

(Portage version: 2.1.4.1)

2 files changed, 90 insertions, 1 deletions

diff --git a/dev-java/struts/ChangeLog b/dev-java/struts/ChangeLog
index b973a6e154d2..974d581cd6c0 100644
--- a/dev-java/struts/ChangeLog
+++ b/dev-java/struts/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/struts
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v 1.37 2008/02/08 15:23:39 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v 1.38 2008/03/22 21:36:01 wltjr Exp $
+
+*struts-1.2.9-r2 (22 Mar 2008)
+
+  22 Mar 2008; William L. Thomson Jr. <wltjr@gentoo.org>
+  +struts-1.2.9-r2.ebuild:
+  Switched to java-virtuals/servlet-api and EAPI=1 slots
 
   08 Feb 2008; Petteri Räty <betelgeuse@gentoo.org> -struts-1.1-r5.ebuild:
   struts:1.1 moved to java overlay as nothing in the main tree needs it
diff --git a/dev-java/struts/struts-1.2.9-r2.ebuild b/dev-java/struts/struts-1.2.9-r2.ebuild
new file mode 100644
index 000000000000..d84a4d6f5ae8
--- /dev/null
+++ b/dev-java/struts/struts-1.2.9-r2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2008 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-r2.ebuild,v 1.1 2008/03/22 21:36:01 wltjr Exp $
+
+EAPI=1
+JAVA_PKG_IUSE="doc examples source"
+WANT_ANT_TASKS="ant-trax"
+
+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
+	java-virtuals/servlet-api:2.3"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEPS}"
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEPS}"
+IUSE=""
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+
+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"
+
+	# 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 servlet-api-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} $(use_doc compile.javadoc)
+}
+
+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 || die
+	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/*
+}