summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Thomson <wltjr@gentoo.org>2006-09-26 20:16:19 +0000
committerWilliam Thomson <wltjr@gentoo.org>2006-09-26 20:16:19 +0000
commit74c99dd3d3e2ef6338db1fd9bde8fa02aabc018a (patch)
tree48ac1dbf587e327c76aac8f5ca87514e6bdeb174 /www-servers/tomcat
parentStable on sparc wrt #127592 (diff)
downloadgentoo-2-74c99dd3d3e2ef6338db1fd9bde8fa02aabc018a.tar.gz
gentoo-2-74c99dd3d3e2ef6338db1fd9bde8fa02aabc018a.tar.bz2
gentoo-2-74c99dd3d3e2ef6338db1fd9bde8fa02aabc018a.zip
Forgot to apply sun-javamail-bin -> sun-javamail and gnu-jaf -> sun-jaf changes with jars passed to ant
(Portage version: 2.1.2_pre1-r1)
Diffstat (limited to 'www-servers/tomcat')
-rw-r--r--www-servers/tomcat/ChangeLog7
-rw-r--r--www-servers/tomcat/tomcat-5.5.17-r7.ebuild6
2 files changed, 9 insertions, 4 deletions
diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 8494e272aa62..4e39575c056e 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,11 @@
# 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.65 2006/09/26 19:48:17 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.66 2006/09/26 20:16:19 wltjr Exp $
+
+ 26 Sep 2006; William L. Thomson Jr. <wltjr@gentoo.org>
+ tomcat-5.5.17-r7.ebuild:
+ Forgot to apply sun-javamail-bin -> sun-javamail and gnu-jaf -> sun-jaf
+ changes with jars passed to ant
*tomcat-5.5.17-r7 (26 Sep 2006)
diff --git a/www-servers/tomcat/tomcat-5.5.17-r7.ebuild b/www-servers/tomcat/tomcat-5.5.17-r7.ebuild
index 9fd38f61683c..6e81031d9cfd 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.1 2006/09/26 19:48:17 wltjr Exp $
+# $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 $
inherit eutils java-pkg-2 java-ant-2
@@ -145,12 +145,12 @@ src_compile(){
antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar commons-beanutils-1.7 commons-beanutils.jar)"
antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)"
antflags="${antflags} -Dcommons-logging-api.jar=$(java-pkg_getjar commons-logging commons-logging-api.jar)"
- antflags="${antflags} -Dmail.jar=$(java-pkg_getjar sun-javamail-bin mail.jar)"
+ antflags="${antflags} -Dmail.jar=$(java-pkg_getjar sun-javamail mail.jar)"
antflags="${antflags} -Dstruts.home=/usr/share/struts"
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 gnu-jaf-1)"
+ antflags="${antflags} -Dactivation.jar=$(java-config -p sun-jaf-1)"
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)"