Added ~amd64 keyword to 5.5.20-r5. Dropped * from 1.5 virtuals

Package-Manager: portage-2.1.2_rc3-r6

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 640821a9d283d7a0c5bbaef7f0228006f9bee165..e4cb1ebaf3b19af8d76971872202278c08597197 100644 (file)
--- 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/Manifest b/www-servers/tomcat/Manifest
index 62697083b4c689af9c5848210bfb5fd3cb39db2e..d437b4a7acd29197a1601667be465cb555f5bd33 100644 (file)
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -118,22 +118,22 @@ EBUILD tomcat-5.0.28-r14.ebuild 9357 RMD160 a9a37ab6ec5479ff613eb071548285d62597
 MD5 0bf6de6439b6a7f67509fe51bedbefab tomcat-5.0.28-r14.ebuild 9357
 RMD160 a9a37ab6ec5479ff613eb071548285d62597e183 tomcat-5.0.28-r14.ebuild 9357
 SHA256 a107e5be63f23f54b0664bcc71db4c825683aa18e2a9badfe3cd97805667dcfc tomcat-5.0.28-r14.ebuild 9357
-EBUILD tomcat-5.5.20-r4.ebuild 10283 RMD160 0e3bb754048993a5fac0e03134d460dfba2158c0 SHA1 72d2a6226bce74da00321bc69e4161b5945228c0 SHA256 e45aab993f811bec6f8808a684b0b1b329f4d1ed91472597f30a84c477381878
-MD5 5df8530f5e6c4f584d72bb55c2367318 tomcat-5.5.20-r4.ebuild 10283
-RMD160 0e3bb754048993a5fac0e03134d460dfba2158c0 tomcat-5.5.20-r4.ebuild 10283
-SHA256 e45aab993f811bec6f8808a684b0b1b329f4d1ed91472597f30a84c477381878 tomcat-5.5.20-r4.ebuild 10283
-EBUILD tomcat-5.5.20-r5.ebuild 10313 RMD160 b94eb10ed54db7fb038469640350069c9ad91dbc SHA1 4784daeaa3d6c68032c3a24179ec060da4ed5159 SHA256 957e3d4502fe7864136643d804a923bcc7ed03b793ee34cecf014c4441a97b4d
-MD5 a5ed201c0985083dd85164054bee3d2c tomcat-5.5.20-r5.ebuild 10313
-RMD160 b94eb10ed54db7fb038469640350069c9ad91dbc tomcat-5.5.20-r5.ebuild 10313
-SHA256 957e3d4502fe7864136643d804a923bcc7ed03b793ee34cecf014c4441a97b4d tomcat-5.5.20-r5.ebuild 10313
+EBUILD tomcat-5.5.20-r4.ebuild 10282 RMD160 8198f751ee6f585b0819f2e01886f0bf7c331d33 SHA1 97943e6716f22d4ca372b85a67aa17937bf83649 SHA256 739feba841bda684a2e3b32797eba995443f78cf3a76ad37503bc791072f3e8d
+MD5 da40c6eef1749b4103ec533c58888f4d tomcat-5.5.20-r4.ebuild 10282
+RMD160 8198f751ee6f585b0819f2e01886f0bf7c331d33 tomcat-5.5.20-r4.ebuild 10282
+SHA256 739feba841bda684a2e3b32797eba995443f78cf3a76ad37503bc791072f3e8d tomcat-5.5.20-r4.ebuild 10282
+EBUILD tomcat-5.5.20-r5.ebuild 10319 RMD160 00226abaf64b9c71625d45c76b5376fdc2d27a0f SHA1 9ec4bee67a649481809b02a23b4bf42a08fc7ef0 SHA256 33e219ce28089507419467def942b335f0a9946c2d6f65d4486fce7c0422e430
+MD5 19720ee7e0e0e945892e33a26557e0e4 tomcat-5.5.20-r5.ebuild 10319
+RMD160 00226abaf64b9c71625d45c76b5376fdc2d27a0f tomcat-5.5.20-r5.ebuild 10319
+SHA256 33e219ce28089507419467def942b335f0a9946c2d6f65d4486fce7c0422e430 tomcat-5.5.20-r5.ebuild 10319
 EBUILD tomcat-6.0.6.ebuild 4715 RMD160 da719bb505293b8280db45c82e84a454a82ae98a SHA1 223cd5c4535630d7918f947e45b083e150326387 SHA256 88da5fa96e0e911853b8264d1fd24dd92200ce263a5f201d1fc546e039185acd
 MD5 5e13c46eed44f09d62d4a5208b13caac tomcat-6.0.6.ebuild 4715
 RMD160 da719bb505293b8280db45c82e84a454a82ae98a tomcat-6.0.6.ebuild 4715
 SHA256 88da5fa96e0e911853b8264d1fd24dd92200ce263a5f201d1fc546e039185acd tomcat-6.0.6.ebuild 4715
-MISC ChangeLog 30017 RMD160 79d9791f92b86bfba005a2418a390cb6119fb0e0 SHA1 652323ae3a705e72eb78ce2afb66f8d1cbf2ffd2 SHA256 7c1c2356b7182cb396d099945ff2067b487363fb12fc634e9f868b97a211c9f2
-MD5 4eba32874c609184b6c0a7ee7b7a8cf0 ChangeLog 30017
-RMD160 79d9791f92b86bfba005a2418a390cb6119fb0e0 ChangeLog 30017
-SHA256 7c1c2356b7182cb396d099945ff2067b487363fb12fc634e9f868b97a211c9f2 ChangeLog 30017
+MISC ChangeLog 30192 RMD160 79ce64604f8dd5b9f9a406413255db056d1c8096 SHA1 565ca5391502186885c7578832dcf57e91593e31 SHA256 727c7464d4591cd44c8e31e4fc6b2e81eb33eaa57258e7b84e9da959efc9803d
+MD5 dcd460c740c022eeefecc71f9731690b ChangeLog 30192
+RMD160 79ce64604f8dd5b9f9a406413255db056d1c8096 ChangeLog 30192
+SHA256 727c7464d4591cd44c8e31e4fc6b2e81eb33eaa57258e7b84e9da959efc9803d ChangeLog 30192
 MISC metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 SHA1 e8dcd8204d0ea02558dd07e1aded5dc58ed1460c SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79
 MD5 0609d3339e0b8d5a3b4707f6b02aad3a metadata.xml 556
 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 metadata.xml 556

diff --git a/www-servers/tomcat/tomcat-5.5.20-r4.ebuild b/www-servers/tomcat/tomcat-5.5.20-r4.ebuild
index e2fdbc3512f5f00b377b41b0c6ab6e496b0d34d5..d20151d032cdfaacee73a4fa83e8b60e03d51360 100644 (file)
--- 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 ab52ff1036dcff5a59f77be88fc77c747b298e85..21952a2ccd895f101a937db4ca12cdbe802bb34c 100644 (file)
--- 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}