diff options
| -rw-r--r-- | www-servers/tomcat/ChangeLog | 6 | ||||
| -rw-r--r-- | www-servers/tomcat/tomcat-6.0.7_beta-r6.ebuild | 4 | ||||
| -rw-r--r-- | www-servers/tomcat/tomcat-6.0.8_alpha-r3.ebuild | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog index 16c2a503947a..0890c0288399 100644 --- a/www-servers/tomcat/ChangeLog +++ b/www-servers/tomcat/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-servers/tomcat # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.112 2007/01/30 06:20:11 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.113 2007/01/31 10:31:50 caster Exp $ + + 31 Jan 2007; Vlastimil Babka <caster@gentoo.org> + tomcat-6.0.7_beta-r6.ebuild, tomcat-6.0.8_alpha-r3.ebuild: + Fix tomcat-servlet-api deps for bug #164557. 30 Jan 2007; Christian Faulhammer <opfer@gentoo.org> tomcat-5.5.20-r8.ebuild: diff --git a/www-servers/tomcat/tomcat-6.0.7_beta-r6.ebuild b/www-servers/tomcat/tomcat-6.0.7_beta-r6.ebuild index 3ba88460f260..1524cd31b63c 100644 --- a/www-servers/tomcat/tomcat-6.0.7_beta-r6.ebuild +++ b/www-servers/tomcat/tomcat-6.0.7_beta-r6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.7_beta-r6.ebuild,v 1.1 2007/01/28 23:00:55 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.7_beta-r6.ebuild,v 1.2 2007/01/31 10:31:50 caster Exp $ inherit eutils java-pkg-2 java-ant-2 @@ -21,7 +21,7 @@ RDEPEND="|| ( >=virtual/jre-1.5 >=virtual/jre-1.6 ) >=dev-java/commons-dbcp-1.2.1 >=dev-java/commons-logging-1.1 >=dev-java/commons-pool-1.2 - =dev-java/tomcat-servlet-api-${PV}" + ~dev-java/tomcat-servlet-api-${PV}" DEPEND="|| ( >=virtual/jdk-1.5 >=virtual/jdk-1.6 ) ${RDEPEND} diff --git a/www-servers/tomcat/tomcat-6.0.8_alpha-r3.ebuild b/www-servers/tomcat/tomcat-6.0.8_alpha-r3.ebuild index 41a8e3e7623a..d4e168f515eb 100644 --- a/www-servers/tomcat/tomcat-6.0.8_alpha-r3.ebuild +++ b/www-servers/tomcat/tomcat-6.0.8_alpha-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.8_alpha-r3.ebuild,v 1.1 2007/01/28 23:00:55 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.8_alpha-r3.ebuild,v 1.2 2007/01/31 10:31:50 caster Exp $ inherit eutils java-pkg-2 java-ant-2 @@ -21,7 +21,7 @@ RDEPEND="|| ( >=virtual/jre-1.5 >=virtual/jre-1.6 ) >=dev-java/commons-dbcp-1.2.1 >=dev-java/commons-logging-1.1 >=dev-java/commons-pool-1.2 - =dev-java/tomcat-servlet-api-${PV}" + ~dev-java/tomcat-servlet-api-${PV}" DEPEND="|| ( >=virtual/jdk-1.5 >=virtual/jdk-1.6 ) ${RDEPEND} |