Revbump to remove dependency on 1.5 jdk - bug #292001.

(Portage version: 2.2_rc48/cvs/Linux x86_64)

2 files changed, 72 insertions, 2 deletions

diff --git a/dev-java/jakarta-jstl/ChangeLog b/dev-java/jakarta-jstl/ChangeLog
index bdcd1f9d9dc6..bb8567d2cf4e 100644
--- a/dev-java/jakarta-jstl/ChangeLog
+++ b/dev-java/jakarta-jstl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jakarta-jstl
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-jstl/ChangeLog,v 1.19 2008/03/10 11:24:32 betelgeuse Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-jstl/ChangeLog,v 1.20 2009/11/08 21:09:34 caster Exp $
+
+*jakarta-jstl-1.1.2-r2 (08 Nov 2009)
+
+  08 Nov 2009; Vlastimil Babka <caster@gentoo.org>
+  +jakarta-jstl-1.1.2-r2.ebuild:
+  Revbump to remove dependency on 1.5 jdk - bug #292001.
 
   10 Mar 2008; Petteri Räty <betelgeuse@gentoo.org>
   jakarta-jstl-1.1.2-r1.ebuild:
diff --git a/dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r2.ebuild b/dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r2.ebuild
new file mode 100644
index 000000000000..3357fb285a38
--- /dev/null
+++ b/dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r2.ebuild,v 1.1 2009/11/08 21:09:34 caster Exp $
+
+EAPI=2
+JAVA_PKG_IUSE="doc examples source"
+JAVA_PKG_WANT_BOOTCLASSPATH="1.5"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+MY_PN="jakarta-taglibs-standard"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="An implementation of the JSP Standard Tag Library (JSTL)"
+HOMEPAGE="http://jakarta.apache.org/taglibs/doc/standard-doc/intro.html"
+SRC_URI="mirror://apache/jakarta/taglibs/standard/source/${MY_P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+COMMON_DEP="dev-java/servletapi:2.4
+	dev-java/xalan"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+#	test? ( dev-java/ant-junit )
+DEPEND=">=virtual/jdk-1.5
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${MY_P}-src/standard"
+
+# Needs cactus packaged
+# http://bugs.gentoo.org/show_bug.cgi?id=212890
+RESTRICT="test"
+
+java_prepare() {
+	# put xalan from bootclasspath to classpath
+	epatch "${FILESDIR}/build-xml.patch"
+	# due to JDBC API changes
+	java-ant_rewrite-bootclasspath 1.5
+
+	echo -e "base.dir=..\n" \
+		"build.dir = \${base.dir}/build\n" \
+		"build.classes=\${build.dir}/standard/standard/classes\n" \
+		"dist.dir = \${base.dir}/dist\n" \
+		"servlet24.jar=$(java-pkg_getjar servletapi-2.4 servlet-api.jar)\n" \
+		"jsp20.jar=$(java-pkg_getjar servletapi-2.4 jsp-api.jar)\n" \
+		"xalan.jar=$(java-pkg_getjar xalan xalan.jar)" \
+		> build.properties
+	#use test && echo "junit.jar=$(java-pkg_getjars --build-only junit)" >> build.properties
+	java-pkg_filter-compiler jikes
+}
+
+EANT_BUILD_TARGET="build"
+EANT_DOC_TARGET="javadoc-dist"
+EANT_TEST_TARGET="run.junit"
+
+src_install() {
+	java-pkg_dojar "${S}"/../build/standard/standard/lib/*.jar
+
+	use doc && java-pkg_dohtml -r "${S}"/doc/web/* "${S}"/../dist/standard/javadoc/
+	use examples && java-pkg_doexamples examples
+	use source && java-pkg_dosrc "${S}"/src/*
+}