diff options
| author |   William Thomson <wltjr@gentoo.org> | 2006-09-26 21:19:41 +0000 |
|---|---|---|
| committer | William Thomson <wltjr@gentoo.org> | 2006-09-26 21:19:41 +0000 |
| commit | a9b274bb3146ad5821a2cee4f0d28b87a081998b (patch) | |
| tree | 3c0de9344e8d4db7a8034c705fbf803f80aeb7c0 /www-servers/tomcat | |
| parent | Fixed DEPEND/RDEPEND. (diff) | |
| download | gentoo-2-a9b274bb3146ad5821a2cee4f0d28b87a081998b.tar.gz gentoo-2-a9b274bb3146ad5821a2cee4f0d28b87a081998b.tar.bz2 gentoo-2-a9b274bb3146ad5821a2cee4f0d28b87a081998b.zip | |
Changed sun-jaf-1 to sun-jaf since it's slotted 0 not 1
(Portage version: 2.1.2_pre1-r1)
Diffstat (limited to 'www-servers/tomcat')
| -rw-r--r-- | www-servers/tomcat/ChangeLog | 6 | ||||
| -rw-r--r-- | www-servers/tomcat/tomcat-5.5.17-r7.ebuild | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog index 4e39575c056e..ab10d076c6f9 100644 --- a/www-servers/tomcat/ChangeLog +++ b/www-servers/tomcat/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-servers/tomcat # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.66 2006/09/26 20:16:19 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.67 2006/09/26 21:19:41 wltjr Exp $ + + 26 Sep 2006; William L. Thomson Jr. <wltjr@gentoo.org> + tomcat-5.5.17-r7.ebuild: + Changed sun-jaf-1 to sun-jaf since it's slotted 0 not 1 26 Sep 2006; William L. Thomson Jr. <wltjr@gentoo.org> tomcat-5.5.17-r7.ebuild: diff --git a/www-servers/tomcat/tomcat-5.5.17-r7.ebuild b/www-servers/tomcat/tomcat-5.5.17-r7.ebuild index 6e81031d9cfd..891d2cfc285c 100644 --- a/www-servers/tomcat/tomcat-5.5.17-r7.ebuild +++ b/www-servers/tomcat/tomcat-5.5.17-r7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.17-r7.ebuild,v 1.2 2006/09/26 20:16:19 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.17-r7.ebuild,v 1.3 2006/09/26 21:19:41 wltjr Exp $ inherit eutils java-pkg-2 java-ant-2 @@ -33,7 +33,7 @@ RDEPEND="=dev-java/eclipse-ecj-3.1* !java5? ( =virtual/jre-1.4* >=dev-java/commons-httpclient-2.0 - =dev-java/sun-jaf-1* + =dev-java/sun-jaf ~dev-java/jaxen-1.0 >=dev-java/junit-3.8.1 =dev-java/mx4j-3* @@ -150,7 +150,7 @@ src_compile(){ antflags="${antflags} -Djasper.home=${S}/jasper" if ! use java5; then antflags="${antflags} -Dcommons-httpclient.jar=$(java-config -p commons-httpclient)" - antflags="${antflags} -Dactivation.jar=$(java-config -p sun-jaf-1)" + antflags="${antflags} -Dactivation.jar=$(java-config -p sun-jaf)" antflags="${antflags} -Djaxen.jar=$(java-pkg_getjar jaxen jaxen-full.jar)" antflags="${antflags} -Djmx.jar=$(java-pkg_getjar mx4j-3.0 mx4j.jar)" antflags="${antflags} -Djmx-remote.jar=$(java-pkg_getjar mx4j-3.0 mx4j-rjmx.jar)" |