diff options
| author |   William Thomson <wltjr@gentoo.org> | 2006-12-27 19:35:29 +0000 |
|---|---|---|
| committer | William Thomson <wltjr@gentoo.org> | 2006-12-27 19:35:29 +0000 |
| commit | 0d7ee636528161fc3f4203ee67a6402243965eb5 (patch) | |
| tree | d2806afbcce01bd005110c900658f2082f0037fb /www-servers | |
| parent | Add ~amd64 wrt bug #157428. (diff) | |
| download | gentoo-2-0d7ee636528161fc3f4203ee67a6402243965eb5.tar.gz gentoo-2-0d7ee636528161fc3f4203ee67a6402243965eb5.tar.bz2 gentoo-2-0d7ee636528161fc3f4203ee67a6402243965eb5.zip | |
Updated virtuals for 1.6
(Portage version: 2.1.1-r2)
Diffstat (limited to 'www-servers')
| -rw-r--r-- | www-servers/tomcat/ChangeLog | 6 | ||||
| -rw-r--r-- | www-servers/tomcat/tomcat-5.5.20-r5.ebuild | 6 | ||||
| -rw-r--r-- | www-servers/tomcat/tomcat-6.0.7_alpha.ebuild | 6 |
3 files changed, 11 insertions, 7 deletions
diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog index a8c7f392f92a..8f1a69ba85a5 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.94 2006/12/27 18:01:14 drizzt Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.95 2006/12/27 19:35:29 wltjr Exp $ + + 27 Dec 2006; William L. Thomson Jr. <wltjr@gentoo.org> + tomcat-5.5.20-r5.ebuild, tomcat-6.0.7_alpha.ebuild: + Updated virtuals for 1.6 27 Dec 2006; Timothy Redaelli <drizzt@gentoo.org> tomcat-5.5.20-r5.ebuild: Readded ~x86-fbsd keyword. diff --git a/www-servers/tomcat/tomcat-5.5.20-r5.ebuild b/www-servers/tomcat/tomcat-5.5.20-r5.ebuild index f1ba7b2d3636..b15e8026f6c1 100644 --- a/www-servers/tomcat/tomcat-5.5.20-r5.ebuild +++ b/www-servers/tomcat/tomcat-5.5.20-r5.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-r5.ebuild,v 1.7 2006/12/27 18:01:14 drizzt Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.20-r5.ebuild,v 1.8 2006/12/27 19:35:29 wltjr Exp $ inherit eutils java-pkg-2 java-ant-2 @@ -32,7 +32,7 @@ RDEPEND="=dev-java/eclipse-ecj-3.1* ~dev-java/servletapi-2.4 admin? ( =dev-java/struts-1.2* ) dev-java/sun-javamail - java5? ( >=virtual/jre-1.5 ) + java5? ( || ( >=virtual/jre-1.5 =virtual/jre-1.6 ) ) !java5? ( =virtual/jre-1.4* =dev-java/commons-httpclient-2.0* @@ -43,7 +43,7 @@ RDEPEND="=dev-java/eclipse-ecj-3.1* >=dev-java/xerces-2.7.1 =dev-java/xml-commons-external-1.3* )" -DEPEND="java5? ( >=virtual/jdk-1.5 ) +DEPEND="java5? ( || ( >=virtual/jdk-1.5 >=virtual/jdk-1.6 ) ) !java5? ( =virtual/jdk-1.4* ) ${RDEPEND} >=dev-java/java-config-2.0.31 diff --git a/www-servers/tomcat/tomcat-6.0.7_alpha.ebuild b/www-servers/tomcat/tomcat-6.0.7_alpha.ebuild index 7b8dee30143d..55b18c9f0363 100644 --- a/www-servers/tomcat/tomcat-6.0.7_alpha.ebuild +++ b/www-servers/tomcat/tomcat-6.0.7_alpha.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-6.0.7_alpha.ebuild,v 1.1 2006/12/27 17:16:09 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.7_alpha.ebuild,v 1.2 2006/12/27 19:35:29 wltjr Exp $ inherit eutils java-pkg-2 java-ant-2 @@ -16,7 +16,7 @@ LICENSE="Apache-2.0" IUSE="doc examples jni source test" -RDEPEND=">=virtual/jre-1.5 +RDEPEND="|| ( >=virtual/jre-1.5 >=virtual/jre-1.6 ) =dev-java/eclipse-ecj-3.2* >=dev-java/commons-daemon-1.0.1 >=dev-java/commons-dbcp-1.2.1 @@ -25,7 +25,7 @@ RDEPEND=">=virtual/jre-1.5 jni? ( dev-libs/apr dev-libs/openssl )" -DEPEND=">=virtual/jdk-1.5 +DEPEND="|| ( >=virtual/jdk-1.5 >=virtual/jdk-1.6 ) ${RDEPEND} test? ( dev-java/junit |