Updated virtuals for 1.6

Package-Manager: portage-2.1.1-r2

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index a8c7f392f92a5447b44bc3ca18bc2251d41eab8e..8f1a69ba85a5362af17d069462a70e2ffeb27a53 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.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/Manifest b/www-servers/tomcat/Manifest
index 58e9078204f27602c3f4d06ed2c0677bc885b1ec..bef04de4e3a8893d4e4f671f1118c0bb97c3b63a 100644 (file)
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 5.0.27/gentoo.diff 463 RMD160 ace3fcd5d4d42e987840a0ba46c2f2e5db545dfc SHA1 2cac8406125e5bd360fed919eeb0d4685969462b SHA256 d8c9da161ae1274479f88f69821be780bd70ebfe7ad9c2f92db0f03f4b4c9401
 MD5 cbb635ed31e3b7ddabe1db851a8b471e files/5.0.27/gentoo.diff 463
 RMD160 ace3fcd5d4d42e987840a0ba46c2f2e5db545dfc files/5.0.27/gentoo.diff 463
@@ -125,18 +122,18 @@ EBUILD tomcat-5.5.20-r4.ebuild 10275 RMD160 dc6fa27938de9727f61eeb34aed286fc74f1
 MD5 14bc174c3ca92f03d2d3cf74ce12c405 tomcat-5.5.20-r4.ebuild 10275
 RMD160 dc6fa27938de9727f61eeb34aed286fc74f1e39f tomcat-5.5.20-r4.ebuild 10275
 SHA256 f5d6420cd9d389bb4c1ff77d290caa8a29812d9c2730f50e3126bffae6a3c742 tomcat-5.5.20-r4.ebuild 10275
-EBUILD tomcat-5.5.20-r5.ebuild 10235 RMD160 836c802549afa8e2f0c05a100ceaee2d9b6b70ff SHA1 682f1a40e608ccfa84475fdeda7f1d07c1419a51 SHA256 2fabc876cd07aff5c2c7accfd77dfd7b3aef53458c65fbb674af9704b566ae47
-MD5 7085bc32c27d02a8b4a82f1614aa2e68 tomcat-5.5.20-r5.ebuild 10235
-RMD160 836c802549afa8e2f0c05a100ceaee2d9b6b70ff tomcat-5.5.20-r5.ebuild 10235
-SHA256 2fabc876cd07aff5c2c7accfd77dfd7b3aef53458c65fbb674af9704b566ae47 tomcat-5.5.20-r5.ebuild 10235
-EBUILD tomcat-6.0.7_alpha.ebuild 4758 RMD160 d395e07d803c48f26798779d76865a162855b0b0 SHA1 b59e0aaabf881ec145758063e86820585d6ea59d SHA256 0b5dfb4451a1440e85d954bcb12c3dd0ebbe167e3a5774c8755ded544f2da711
-MD5 b8af73771d4b8fc79e21020b3b68de09 tomcat-6.0.7_alpha.ebuild 4758
-RMD160 d395e07d803c48f26798779d76865a162855b0b0 tomcat-6.0.7_alpha.ebuild 4758
-SHA256 0b5dfb4451a1440e85d954bcb12c3dd0ebbe167e3a5774c8755ded544f2da711 tomcat-6.0.7_alpha.ebuild 4758
-MISC ChangeLog 31034 RMD160 a28ef972a3684c7f3c891782d92c9893f7cee465 SHA1 398b3c0368021457ab43b6c70a11815a65466e7e SHA256 def22a162c53d1c97d4c54342526789a495518b83123d8881a6d3c6fa84ab889
-MD5 0280171bca3e0066acada45a64c81906 ChangeLog 31034
-RMD160 a28ef972a3684c7f3c891782d92c9893f7cee465 ChangeLog 31034
-SHA256 def22a162c53d1c97d4c54342526789a495518b83123d8881a6d3c6fa84ab889 ChangeLog 31034
+EBUILD tomcat-5.5.20-r5.ebuild 10283 RMD160 ea57a97815314755e57c2858a3206bcbd202759b SHA1 7056d24fccb2a5e4f9e7590612e94c0938ee3c47 SHA256 0b31cfb7a990a68439d196d5665063def25fcd7d3871c5f085b10ecb9f0ee978
+MD5 42f9db4da7fec019352a6dd3ddb2bc73 tomcat-5.5.20-r5.ebuild 10283
+RMD160 ea57a97815314755e57c2858a3206bcbd202759b tomcat-5.5.20-r5.ebuild 10283
+SHA256 0b31cfb7a990a68439d196d5665063def25fcd7d3871c5f085b10ecb9f0ee978 tomcat-5.5.20-r5.ebuild 10283
+EBUILD tomcat-6.0.7_alpha.ebuild 4808 RMD160 529ff75c9283396cd17810b2ac594c3b928ef630 SHA1 eca749cfec385ebdc7aca3f422e69e97b9c5210a SHA256 451d2c99c8f9532ac8653ed0fc85b38653af790909d71a2683ab55ac6ac5db4b
+MD5 c7e51ccdd4e00d177ebe5024d92b829b tomcat-6.0.7_alpha.ebuild 4808
+RMD160 529ff75c9283396cd17810b2ac594c3b928ef630 tomcat-6.0.7_alpha.ebuild 4808
+SHA256 451d2c99c8f9532ac8653ed0fc85b38653af790909d71a2683ab55ac6ac5db4b tomcat-6.0.7_alpha.ebuild 4808
+MISC ChangeLog 31172 RMD160 5ed60b490aab4076b479dc998cd841d1338b6a10 SHA1 6b1f6c8c7a183e627d88e6b24e20beb0e811734a SHA256 564b0cfb4029ba5d38e54d12b7ce3eea464fdeb9400465971678258e7e4e06dc
+MD5 318c889c64889ae6c36780d487da450b ChangeLog 31172
+RMD160 5ed60b490aab4076b479dc998cd841d1338b6a10 ChangeLog 31172
+SHA256 564b0cfb4029ba5d38e54d12b7ce3eea464fdeb9400465971678258e7e4e06dc ChangeLog 31172
 MISC metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 SHA1 e8dcd8204d0ea02558dd07e1aded5dc58ed1460c SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79
 MD5 0609d3339e0b8d5a3b4707f6b02aad3a metadata.xml 556
 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 metadata.xml 556
@@ -156,10 +153,3 @@ SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/di
 MD5 ae090639fc2a4b844084020e9fd68796 files/digest-tomcat-6.0.7_alpha 274
 RMD160 887290424c340b8a024770ae6ee2adeb0252b5ea files/digest-tomcat-6.0.7_alpha 274
 SHA256 8c88ae20979c83fd4529d2493cf5bfc63d86ff37cb46af296db58166d2e0ad3d files/digest-tomcat-6.0.7_alpha 274
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFFkrTwGDyatLGpTbYRAjf6AJ0f2cRS43fkxL373n8obVfRvt2MigCgjzbP
-DLZ+ij3mIAsRskVRXIPvb0Q=
-=f3jl
------END PGP SIGNATURE-----

diff --git a/www-servers/tomcat/tomcat-5.5.20-r5.ebuild b/www-servers/tomcat/tomcat-5.5.20-r5.ebuild
index f1ba7b2d3636b77065123a59ea35b6868bf7ef8d..b15e8026f6c1cb18fbe844e3ddcfd9daf6fe9368 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.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 7b8dee30143d99e73b57b443b3fabf9e931d7f04..55b18c9f0363467c9b5d16dc0a7b4926c6df1f8e 100644 (file)
--- 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