diff options
| author |   Thomas Matthijs <axxo@gentoo.org> | 2005-07-16 11:30:12 +0000 |
|---|---|---|
| committer | Thomas Matthijs <axxo@gentoo.org> | 2005-07-16 11:30:12 +0000 |
| commit | 66c246fd38992d89af897e15e4847816ab7c38a8 (patch) | |
| tree | 81c013f05d56559f0a34c39b899125184c95af34 /dev-java/jakarta-tomcat-jasper | |
| parent | Cleaning old ebuilds (diff) | |
| download | gentoo-2-66c246fd38992d89af897e15e4847816ab7c38a8.tar.gz gentoo-2-66c246fd38992d89af897e15e4847816ab7c38a8.tar.bz2 gentoo-2-66c246fd38992d89af897e15e4847816ab7c38a8.zip | |
dep fixes
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'dev-java/jakarta-tomcat-jasper')
| -rw-r--r-- | dev-java/jakarta-tomcat-jasper/jakarta-tomcat-jasper-2.ebuild | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/dev-java/jakarta-tomcat-jasper/jakarta-tomcat-jasper-2.ebuild b/dev-java/jakarta-tomcat-jasper/jakarta-tomcat-jasper-2.ebuild index 9989aa1b9bfa..c887ee0f475e 100644 --- a/dev-java/jakarta-tomcat-jasper/jakarta-tomcat-jasper-2.ebuild +++ b/dev-java/jakarta-tomcat-jasper/jakarta-tomcat-jasper-2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-tomcat-jasper/jakarta-tomcat-jasper-2.ebuild,v 1.2 2005/05/25 15:10:03 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-tomcat-jasper/jakarta-tomcat-jasper-2.ebuild,v 1.3 2005/07/16 11:30:12 axxo Exp $ inherit eutils java-pkg @@ -14,10 +14,6 @@ SLOT="2" KEYWORDS="~x86 ~amd64" IUSE="doc jikes source" -DEPEND=">=virtual/jdk-1.4 - dev-java/ant-core - jikes? ( dev-java/jikes ) - source? ( app-arch/zip )" RDEPEND=">=virtual/jdk-1.4 =dev-java/servletapi-2.4* =dev-java/xerces-1.3* @@ -28,6 +24,11 @@ RDEPEND=">=virtual/jdk-1.4 dev-java/commons-el dev-java/commons-logging dev-java/commons-launcher" +DEPEND=">=virtual/jdk-1.4 + ${RDEPEND} + dev-java/ant-core + jikes? ( dev-java/jikes ) + source? ( app-arch/zip )" S=${WORKDIR}/jakarta-tomcat-${TOMCAT_PV}-src/${PN}/jasper2 @@ -36,20 +37,13 @@ src_unpack() { cd ${S} # Setup build.properties - echo "servlet-api.jar=$(java-pkg_getjar servletapi-2.4 servlet-api.jar)" \ - >> build.properties - echo "jsp-api.jar=$(java-pkg_getjar servletapi-2.4 jsp-api.jar)" \ - >> build.properties - echo "ant.jar.jar=$(java-pkg_getjar ant-core ant.jar)" \ - >> build.properties - echo "xerces.jar=$(java-pkg_getjar xerces-1.3 xerces.jar)" \ - >> build.properties - echo "xercesImpl.jar=$(java-pkg_getjar xerces-2 xercesImpl.jar)" \ - >> build.properties - echo "xml-apis.jar=$(java-pkg_getjar xml-commons xml-apis.jar)" \ - >> build.properties - echo "commons-el.jar=$(java-pkg_getjar commons-el commons-el.jar)" \ - >> build.properties + echo "servlet-api.jar=$(java-pkg_getjar servletapi-2.4 servlet-api.jar)" >> build.properties + echo "jsp-api.jar=$(java-pkg_getjar servletapi-2.4 jsp-api.jar)" >> build.properties + echo "ant.jar.jar=$(java-pkg_getjar ant-core ant.jar)" >> build.properties + echo "xerces.jar=$(java-pkg_getjar xerces-1.3 xerces.jar)" >> build.properties + echo "xercesImpl.jar=$(java-pkg_getjar xerces-2 xercesImpl.jar)" >> build.properties + echo "xml-apis.jar=$(java-pkg_getjar xml-commons xml-apis.jar)" >> build.properties + echo "commons-el.jar=$(java-pkg_getjar commons-el commons-el.jar)" >> build.properties echo "commons-collections.jar=$(java-pkg_getjar commons-collections commons-collections.jar)" >> build.properties echo "commons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)" >> build.properties echo "commons-daemon-launcher=$(java-pkg_getjar commons-daemon commons-daemon.jar)" >> build.properties @@ -63,7 +57,7 @@ src_compile() { ant ${antflags} || die "compilation failed" } -src_install () { +src_install() { java-pkg_dojar ${S}/build/shared/lib/jasper-*.jar use doc && java-pkg_dohtml -r ${S}/build/javadoc |