diff options
| author |   Joshua Nichols <nichoj@gentoo.org> | 2006-09-27 04:14:05 +0000 |
|---|---|---|
| committer | Joshua Nichols <nichoj@gentoo.org> | 2006-09-27 04:14:05 +0000 |
| commit | fdd34970c42624c086ff163a90d29b0aac48b08a (patch) | |
| tree | 4f315ae16c1d2ff9da49c941dd2d5dc3c7db4dde /dev-java | |
| parent | Stable x86 as well (diff) | |
| download | gentoo-2-fdd34970c42624c086ff163a90d29b0aac48b08a.tar.gz gentoo-2-fdd34970c42624c086ff163a90d29b0aac48b08a.tar.bz2 gentoo-2-fdd34970c42624c086ff163a90d29b0aac48b08a.zip | |
Added missing xalan dep. Force either 1.4 or 1.5, as it fails to compile with 1.6 because of changes in the JDBC API. Reported in bug #148410.
(Portage version: 2.1.2_pre1-r1)
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/jakarta-jstl/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r1.ebuild | 18 |
2 files changed, 18 insertions, 7 deletions
diff --git a/dev-java/jakarta-jstl/ChangeLog b/dev-java/jakarta-jstl/ChangeLog index 48817c373be3..c090c46aabd9 100644 --- a/dev-java/jakarta-jstl/ChangeLog +++ b/dev-java/jakarta-jstl/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-java/jakarta-jstl # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-jstl/ChangeLog,v 1.7 2006/09/18 01:25:07 nichoj Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-jstl/ChangeLog,v 1.8 2006/09/27 04:14:05 nichoj Exp $ + + 27 Sep 2006; Joshua Nichols <nichoj@gentoo.org> + jakarta-jstl-1.1.2-r1.ebuild: + Added missing xalan dep. Force either 1.4 or 1.5, as it fails to compile + with 1.6 because of changes in the JDBC API. Reported in bug #148410. *jakarta-jstl-1.1.2-r1 (18 Sep 2006) diff --git a/dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r1.ebuild b/dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r1.ebuild index 424689df4808..4884bd237b25 100644 --- a/dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r1.ebuild +++ b/dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r1.ebuild @@ -1,26 +1,31 @@ # Copyright 1999-2006 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-r1.ebuild,v 1.1 2006/09/18 01:25:07 nichoj Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r1.ebuild,v 1.2 2006/09/27 04:14:05 nichoj Exp $ 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/jakarta-taglibs-standard-${PV}-src.tar.gz" +SRC_URI="mirror://apache/jakarta/taglibs/standard/source/${MY_P}-src.tar.gz" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" IUSE="doc examples source" +COMMON_DEP="~dev-java/servletapi-2.4 + dev-java/xalan" RDEPEND=">=virtual/jre-1.4.2 - =dev-java/servletapi-2.4*" -DEPEND=">=virtual/jdk-1.4.2 - ${RDEPEND} + ${COMMON_DEP}" +# FIXME breaks due to new JDBC API in 1.6 +DEPEND="|| ( =virtual/jdk-1.4* =virtual/jdk-1.5* ) + ${COMMON_DEP} dev-java/ant-core source? ( app-arch/zip )" -S=${WORKDIR}/jakarta-taglibs-standard-${PV}-src/standard +S="${WORKDIR}/${MY_P}-src/standard" src_unpack() { unpack ${A} @@ -37,6 +42,7 @@ src_unpack() { "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 } |