diff options
author | William Thomson <wltjr@gentoo.org> | 2006-12-07 00:11:15 +0000 |
---|---|---|
committer | William Thomson <wltjr@gentoo.org> | 2006-12-07 00:11:15 +0000 |
commit | be30ef30a905ba8ad39254aac1ebc6a77da741d5 (patch) | |
tree | 39a2da315a7130461a9b506a403be15c9f262e1e /www-servers/tomcat | |
parent | Make acpid more robust for start-stop-daemon. (diff) | |
download | gentoo-2-be30ef30a905ba8ad39254aac1ebc6a77da741d5.tar.gz gentoo-2-be30ef30a905ba8ad39254aac1ebc6a77da741d5.tar.bz2 gentoo-2-be30ef30a905ba8ad39254aac1ebc6a77da741d5.zip |
Removed false dep on jaxen from 5.5.20.
(Portage version: 2.1.2_rc2-r4)
Diffstat (limited to 'www-servers/tomcat')
-rw-r--r-- | www-servers/tomcat/ChangeLog | 6 | ||||
-rw-r--r-- | www-servers/tomcat/tomcat-5.5.20-r2.ebuild | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog index f2b9fcfd6736..3ac26b008833 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.82 2006/12/06 14:43:49 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.83 2006/12/07 00:11:15 wltjr Exp $ + + 07 Dec 2006; William L. Thomson Jr. <wltjr@gentoo.org> + tomcat-5.5.20-r2.ebuild: + Removed false dep on jaxen from 5.5.20. 06 Dec 2006; Petteri Räty <betelgeuse@gentoo.org> tomcat-5.5.20-r2.ebuild: diff --git a/www-servers/tomcat/tomcat-5.5.20-r2.ebuild b/www-servers/tomcat/tomcat-5.5.20-r2.ebuild index 8cf101325a83..a5e27d7fb4fb 100644 --- a/www-servers/tomcat/tomcat-5.5.20-r2.ebuild +++ b/www-servers/tomcat/tomcat-5.5.20-r2.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.20-r2.ebuild,v 1.6 2006/12/06 14:43:49 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.20-r2.ebuild,v 1.7 2006/12/07 00:11:15 wltjr Exp $ inherit eutils java-pkg-2 java-ant-2 @@ -36,7 +36,6 @@ RDEPEND="=dev-java/eclipse-ecj-3.1* =virtual/jre-1.4* >=dev-java/commons-httpclient-2.0 dev-java/sun-jaf - ~dev-java/jaxen-1.0 >=dev-java/junit-3.8.1 =dev-java/mx4j-3* >=dev-java/saxpath-1.0 @@ -157,7 +156,6 @@ src_compile(){ if ! use java5; then antflags="${antflags} -Dcommons-httpclient.jar=$(java-config -p commons-httpclient)" 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)" antflags="${antflags} -Dsaxpath.jar=$(java-pkg_getjar saxpath saxpath.jar)" |