diff options
| author |   William Thomson <wltjr@gentoo.org> | 2006-12-22 00:58:23 +0000 |
|---|---|---|
| committer | William Thomson <wltjr@gentoo.org> | 2006-12-22 00:58:23 +0000 |
| commit | bd4c87029111af92f20acb1ad4ac8a0b0ffb4602 (patch) | |
| tree | 6c5f5eb05fba083bca7d870ae334536dab96c644 /www-servers | |
| parent | Added ~amd64 keyword (diff) | |
| download | gentoo-2-bd4c87029111af92f20acb1ad4ac8a0b0ffb4602.tar.gz gentoo-2-bd4c87029111af92f20acb1ad4ac8a0b0ffb4602.tar.bz2 gentoo-2-bd4c87029111af92f20acb1ad4ac8a0b0ffb4602.zip | |
Added ~amd64 keyword to 5.5.20-r5. Dropped * from 1.5 virtuals
(Portage version: 2.1.2_rc3-r6)
Diffstat (limited to 'www-servers')
| -rw-r--r-- | www-servers/tomcat/ChangeLog | 6 | ||||
| -rw-r--r-- | www-servers/tomcat/tomcat-5.5.20-r4.ebuild | 4 | ||||
| -rw-r--r-- | www-servers/tomcat/tomcat-5.5.20-r5.ebuild | 6 |
3 files changed, 10 insertions, 6 deletions
diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog index 640821a9d283..e4cb1ebaf3b1 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.89 2006/12/18 14:35:24 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.90 2006/12/22 00:58:23 wltjr Exp $ + + 22 Dec 2006; William L. Thomson Jr. <wltjr@gentoo.org> + tomcat-5.5.20-r4.ebuild, tomcat-5.5.20-r5.ebuild: + Added ~amd64 keyword to 5.5.20-r5. Dropped * from 1.5 virtuals *tomcat-6.0.6 (18 Dec 2006) diff --git a/www-servers/tomcat/tomcat-5.5.20-r4.ebuild b/www-servers/tomcat/tomcat-5.5.20-r4.ebuild index e2fdbc3512f5..d20151d032cd 100644 --- a/www-servers/tomcat/tomcat-5.5.20-r4.ebuild +++ b/www-servers/tomcat/tomcat-5.5.20-r4.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-r4.ebuild,v 1.2 2006/12/13 03:13:45 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.20-r4.ebuild,v 1.3 2006/12/22 00:58:23 wltjr Exp $ inherit eutils java-pkg-2 java-ant-2 @@ -51,7 +51,7 @@ DEPEND="java5? ( >=virtual/jdk-1.5 ) if ! use java5; then JAVA_PKG_NV_DEPEND="=virtual/jdk-1.4*" else - JAVA_PKG_NV_DEPEND="=virtual/jdk-1.5*" + JAVA_PKG_NV_DEPEND="=virtual/jdk-1.5" fi S=${WORKDIR}/${MY_P} diff --git a/www-servers/tomcat/tomcat-5.5.20-r5.ebuild b/www-servers/tomcat/tomcat-5.5.20-r5.ebuild index ab52ff1036dc..21952a2ccd89 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.2 2006/12/13 03:13:45 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.20-r5.ebuild,v 1.3 2006/12/22 00:58:23 wltjr Exp $ inherit eutils java-pkg-2 java-ant-2 @@ -10,7 +10,7 @@ MY_P="apache-${P}-src" SLOT="5.5" SRC_URI="mirror://apache/${PN}/${PN}-5/v${PV}/src/${MY_P}.tar.gz" HOMEPAGE="http://jakarta.apache.org/tomcat" -KEYWORDS="-ppc -ppc64 ~x86 ~x86-fbsd" +KEYWORDS="~amd64 -ppc -ppc64 ~x86 ~x86-fbsd" LICENSE="Apache-2.0" IUSE="admin java5 doc examples source test" @@ -51,7 +51,7 @@ DEPEND="java5? ( >=virtual/jdk-1.5 ) if ! use java5; then JAVA_PKG_NV_DEPEND="=virtual/jdk-1.4*" else - JAVA_PKG_NV_DEPEND="=virtual/jdk-1.5*" + JAVA_PKG_NV_DEPEND="=virtual/jdk-1.5" fi S=${WORKDIR}/${MY_P} |