diff options
| -rw-r--r-- | www-servers/tomcat/ChangeLog | 6 | ||||
| -rw-r--r-- | www-servers/tomcat/tomcat-5.5.27.ebuild | 11 |
2 files changed, 12 insertions, 5 deletions
diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog index 9cd2c788b0c7..19f7486b3d5b 100644 --- a/www-servers/tomcat/ChangeLog +++ b/www-servers/tomcat/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-servers/tomcat # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.191 2008/09/12 17:10:55 fordfrog Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.192 2008/09/12 21:41:10 betelgeuse Exp $ + + 12 Sep 2008; Petteri Räty <betelgeuse@gentoo.org> tomcat-5.5.27.ebuild: + Use jdk-with-com-sun:0 for java5 use flag and jdk-with-com-sun:1.4 without + it. 12 Sep 2008; Miroslav Šulc <fordfrog@gentoo.org> tomcat-5.5.27.ebuild: Fixed compilation so JDK with com.sun.* packages is used as tomcat needs diff --git a/www-servers/tomcat/tomcat-5.5.27.ebuild b/www-servers/tomcat/tomcat-5.5.27.ebuild index 9ee0f38e468c..148b6124562a 100644 --- a/www-servers/tomcat/tomcat-5.5.27.ebuild +++ b/www-servers/tomcat/tomcat-5.5.27.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.27.ebuild,v 1.2 2008/09/12 17:10:55 fordfrog Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.27.ebuild,v 1.3 2008/09/12 21:41:10 betelgeuse Exp $ EAPI=1 JAVA_PKG_IUSE="doc source" @@ -41,15 +41,18 @@ RDEPEND="dev-java/eclipse-ecj:3.3 dev-java/ant-core admin? ( dev-java/struts:1.2 ) dev-java/sun-javamail - java5? ( >=virtual/jre-1.5 ) + java5? ( + >=virtual/jre-1.5 + >=java-virtuals/jdk-with-com-sun-20080505-r1:0 + ) !java5? ( =virtual/jre-1.4* + java-virtuals/jdk-with-com-sun:1.4 dev-java/sun-jaf dev-java/mx4j-core:3.0 dev-java/xerces:2 dev-java/xml-commons-external:1.3 - ) - >=java-virtuals/jdk-with-com-sun-20080505-r1" + )" DEPEND="java5? ( >=virtual/jdk-1.5 ) !java5? ( =virtual/jdk-1.4* ) ${RDEPEND}" |