Changed dev-java/commons-httpclient dependency to only match one slot.

Package-Manager: portage-2.1.2_rc4-r1

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index d5fb28448bbded3128303acb84798e736dc30edb..2860a5928bdfbf4a107c711bfdf507e9c05331e3 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.91 2006/12/22 22:41:26 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.92 2006/12/26 18:47:20 betelgeuse Exp $
+
+  26 Dec 2006; Petteri Räty <betelgeuse@gentoo.org>
+  tomcat-5.5.20-r4.ebuild, tomcat-5.5.20-r5.ebuild:
+  Changed dev-java/commons-httpclient dependency to only match one slot.
 
   22 Dec 2006; Petteri Räty <betelgeuse@gentoo.org>
   tomcat-5.5.20-r5.ebuild:

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 0cce3dee0e35e263ebf317eb3d65c878cce4353c..bfd7d5526630b9a7a7b91759fa0b2808dce6cbf6 100644 (file)
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -121,22 +121,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 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 10246 RMD160 ce75bc8b0c25d5479eefb2ba83c14c90228cdc60 SHA1 e11aef4a90c6a388df9322632df34656b1c7171a SHA256 5929973f16e3ba10e4d998c2845cb4fba2da81068e1d22c72523b9eefa753e63
-MD5 4db83193a27784e565fae63fc775f4a7 tomcat-5.5.20-r5.ebuild 10246
-RMD160 ce75bc8b0c25d5479eefb2ba83c14c90228cdc60 tomcat-5.5.20-r5.ebuild 10246
-SHA256 5929973f16e3ba10e4d998c2845cb4fba2da81068e1d22c72523b9eefa753e63 tomcat-5.5.20-r5.ebuild 10246
+EBUILD tomcat-5.5.20-r4.ebuild 10287 RMD160 ed109116274dae6c54cc7267b5ceb0a3be4a6886 SHA1 daf2a2fa283919c5f239a58bf1c16dfbc602412a SHA256 a7e598213063d52d9f80a977774b4c6f6a42c255a72ba7902e56db56ab2f68aa
+MD5 b635b81d3b425e1cf1290152b978ef2a tomcat-5.5.20-r4.ebuild 10287
+RMD160 ed109116274dae6c54cc7267b5ceb0a3be4a6886 tomcat-5.5.20-r4.ebuild 10287
+SHA256 a7e598213063d52d9f80a977774b4c6f6a42c255a72ba7902e56db56ab2f68aa tomcat-5.5.20-r4.ebuild 10287
+EBUILD tomcat-5.5.20-r5.ebuild 10246 RMD160 71646b8a67f436cde0e449fff28c77de1d995012 SHA1 1ec2c2921b99518dda445a7324fa696264e6b647 SHA256 287446f4d2faca01a3e6aba1484522f0f0e8d343887e7b691fb9b91c2013b24c
+MD5 cf1f248cd77cad7f897bf5178d6839bf tomcat-5.5.20-r5.ebuild 10246
+RMD160 71646b8a67f436cde0e449fff28c77de1d995012 tomcat-5.5.20-r5.ebuild 10246
+SHA256 287446f4d2faca01a3e6aba1484522f0f0e8d343887e7b691fb9b91c2013b24c tomcat-5.5.20-r5.ebuild 10246
 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 30369 RMD160 be9cb861d94ce275d031b24a46cb3f9ade165375 SHA1 9b1ef5d33d937e911361762dd0a73eb5bfab502f SHA256 172ba450c9f923d0e691c9f19702f3307823c1126ed42f92c192225b7e2c40b6
-MD5 9939fad7b5b0f59f1cc4e5547017e119 ChangeLog 30369
-RMD160 be9cb861d94ce275d031b24a46cb3f9ade165375 ChangeLog 30369
-SHA256 172ba450c9f923d0e691c9f19702f3307823c1126ed42f92c192225b7e2c40b6 ChangeLog 30369
+MISC ChangeLog 30548 RMD160 77517f66659ddc80aa655d51b4e7820c16347926 SHA1 a7722ba5930a4fca35df9b97b83bc4e29278b239 SHA256 72b29ae24b440cef528f0dbabac51ee1ed4dbe5273ee91b247c586d0d1f9d8b5
+MD5 3d2dbc656c296d61e17dd2b43d4cccf3 ChangeLog 30548
+RMD160 77517f66659ddc80aa655d51b4e7820c16347926 ChangeLog 30548
+SHA256 72b29ae24b440cef528f0dbabac51ee1ed4dbe5273ee91b247c586d0d1f9d8b5 ChangeLog 30548
 MISC metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 SHA1 e8dcd8204d0ea02558dd07e1aded5dc58ed1460c SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79
 MD5 0609d3339e0b8d5a3b4707f6b02aad3a metadata.xml 556
 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 metadata.xml 556
@@ -159,7 +159,7 @@ SHA256 ea09af990170d2bcb09eb9d9c3adfec910e0428b33ea736c4afe80cbd5edd755 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFjF8qcxLzpIGCsLQRAhM2AJ4sn36PLj4ttK4p7vDJZDq/+JjYgQCcC7Aq
-0HmfrVsYvmppgJU/wqEO5JQ=
-=NVuC
+iD8DBQFFkW5EcxLzpIGCsLQRAl4AAKCLS672b4WMuhCwGwcjvnKgD/+BCQCeNmcv
+QkiQIbx15DnnnWzmJqrYRLs=
+=SUSB
 -----END PGP SIGNATURE-----

diff --git a/www-servers/tomcat/tomcat-5.5.20-r4.ebuild b/www-servers/tomcat/tomcat-5.5.20-r4.ebuild
index d20151d032cdfaacee73a4fa83e8b60e03d51360..585c716ff349ad59b4a8ad4ceee41de2ecd9dfd5 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.3 2006/12/22 00:58:23 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.20-r4.ebuild,v 1.4 2006/12/26 18:47:20 betelgeuse Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -35,7 +35,7 @@ RDEPEND="=dev-java/eclipse-ecj-3.1*
        java5? ( >=virtual/jre-1.5 )
        !java5? (
                =virtual/jre-1.4*
-               >=dev-java/commons-httpclient-2.0
+               =dev-java/commons-httpclient-2.0*
                dev-java/sun-jaf
                >=dev-java/junit-3.8.1
                =dev-java/mx4j-3*

diff --git a/www-servers/tomcat/tomcat-5.5.20-r5.ebuild b/www-servers/tomcat/tomcat-5.5.20-r5.ebuild
index 7ff53e7d88978ac235c1d551436586975505bcbc..42a8405b70a79b1ce6992eee4ec95ddb50a886ab 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.4 2006/12/22 22:41:27 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.20-r5.ebuild,v 1.5 2006/12/26 18:47:20 betelgeuse Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -35,7 +35,7 @@ RDEPEND="=dev-java/eclipse-ecj-3.1*
        java5? ( >=virtual/jre-1.5 )
        !java5? (
                =virtual/jre-1.4*
-               >=dev-java/commons-httpclient-2.0
+               =dev-java/commons-httpclient-2.0*
                dev-java/sun-jaf
                >=dev-java/junit-3.8.1
                =dev-java/mx4j-core-3*