diff options
| author |   William Thomson <wltjr@gentoo.org> | 2006-09-27 16:54:26 +0000 |
|---|---|---|
| committer | William Thomson <wltjr@gentoo.org> | 2006-09-27 16:54:26 +0000 |
| commit | d78d2ce00365d972d680a9cb70f326387fcf4b69 (patch) | |
| tree | b5a5182b01523178738c5aac6dcd5e314d9c0824 /www-servers | |
| parent | net-ftp/jftpgw removal (was pending removal 27th September 2006), see #142753... (diff) | |
| download | gentoo-2-d78d2ce00365d972d680a9cb70f326387fcf4b69.tar.gz gentoo-2-d78d2ce00365d972d680a9cb70f326387fcf4b69.tar.bz2 gentoo-2-d78d2ce00365d972d680a9cb70f326387fcf4b69.zip | |
Corrected invalid atom =dev-java/sun-jaf per bug # 149317. Also corrected the package xml-apis.jar comes from. Was changed to xml-commons-external-1.3 but was mistakenly changed back when updating the ebuild for java5 use flag and 1.5 jdks
(Portage version: 2.1.2_pre1-r1)
Diffstat (limited to 'www-servers')
| -rw-r--r-- | www-servers/tomcat/ChangeLog | 9 | ||||
| -rw-r--r-- | www-servers/tomcat/tomcat-5.5.17-r7.ebuild | 6 |
2 files changed, 11 insertions, 4 deletions
diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog index ab10d076c6f9..0547cb944424 100644 --- a/www-servers/tomcat/ChangeLog +++ b/www-servers/tomcat/ChangeLog @@ -1,6 +1,13 @@ # 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.67 2006/09/26 21:19:41 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.68 2006/09/27 16:54:26 wltjr Exp $ + + 27 Sep 2006; William L. Thomson Jr. <wltjr@gentoo.org> + tomcat-5.5.17-r7.ebuild: + Corrected invalid atom =dev-java/sun-jaf per bug # 149317. Also corrected + the package xml-apis.jar comes from. Was changed to xml-commons-external-1.3 + but was mistakenly changed back when updating the ebuild for java5 use flag + and 1.5 jdks 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 891d2cfc285c..12f6d2ca9b5b 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.3 2006/09/26 21:19:41 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.17-r7.ebuild,v 1.4 2006/09/27 16:54:26 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 + dev-java/sun-jaf ~dev-java/jaxen-1.0 >=dev-java/junit-3.8.1 =dev-java/mx4j-3* @@ -156,7 +156,7 @@ src_compile(){ antflags="${antflags} -Djmx-remote.jar=$(java-pkg_getjar mx4j-3.0 mx4j-rjmx.jar)" antflags="${antflags} -Dsaxpath.jar=$(java-pkg_getjar saxpath saxpath.jar)" antflags="${antflags} -DxercesImpl.jar=$(java-pkg_getjar xerces-2 xercesImpl.jar)" - antflags="${antflags} -Dxml-apis.jar=$(java-pkg_getjar xerces-2 xml-apis.jar)" + antflags="${antflags} -Dxml-apis.jar=$(java-pkg_getjar xml-commons-external-1.3 xml-apis.jar)" fi eant ${antflags} |