Corrected virtual deps

Package-Manager: portage-2.1.2.2

diff --git a/dev-java/tomcat-servlet-api/ChangeLog b/dev-java/tomcat-servlet-api/ChangeLog
index b464cc7103d05cf98b45eaae3699d66faf35c175..85095f270feeb4bf49868a0b88294cdf4380774d 100644 (file)
--- a/dev-java/tomcat-servlet-api/ChangeLog
+++ b/dev-java/tomcat-servlet-api/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/tomcat-servlet-api
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.16 2007/03/09 17:13:22 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.17 2007/03/12 23:59:57 wltjr Exp $
+
+  12 Mar 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  tomcat-servlet-api-5.5.20.ebuild, tomcat-servlet-api-5.5.23.ebuild,
+  tomcat-servlet-api-6.0.10.ebuild:
+  Corrected virtual deps
 
 *tomcat-servlet-api-5.5.23 (09 Mar 2007)
 

diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 2cc01b5a406b49785ee277b68236d2f51354d64f..5a0a216204ceea442c43b20304420616f3be2eb9 100644 (file)
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -5,22 +5,22 @@ SHA256 b2cbb540ab2bfacc8044e0c6d67afbbd8c1e2e04a12a9c0f565902e1ef3c687a files/2.
 DIST apache-tomcat-5.5.20-src.tar.gz 4796377 RMD160 587590d2e272d1ede73501b62933f544cd969822 SHA1 cc416242d8c9e1978702a207e305ca97afe53d4d SHA256 19f24717fb3e2db902c33e21650dfa88bbf98428c15b1ed68ecaf7a9150e4a77
 DIST apache-tomcat-5.5.23-src.tar.gz 4895919 RMD160 fe669f6b864fd7dcf4ad74dad22a0256e5417005 SHA1 59272b5eedde9c32a126679ff9e1d2a5f56265c8 SHA256 e2f7ce250643349507b511a5ea96df7364030a061a8f4d5b71d8b5a099e2b6bd
 DIST apache-tomcat-6.0.10-src.tar.gz 3221070 RMD160 64762f16606645c6ef507906f2eb8eeb102173bb SHA1 4ec1acda174ab19082c4900c293d8bc7f9544a69 SHA256 54ae6b89a3ac3e3e33a580708403ca4ea0a449f287b91e6246bb6a6550e39199
-EBUILD tomcat-servlet-api-5.5.20.ebuild 1492 RMD160 9f526743a1a649d065428476c79208de7e90eb3d SHA1 30e2a13e2fcbdfface721c33f14cf61f3c131d05 SHA256 6f7be442373a9d6f88151d7fb90f056b275fc7d12e80a2c9ceb6855e78b5768f
-MD5 917bee4a85a6c9d7b80f720aa4702b40 tomcat-servlet-api-5.5.20.ebuild 1492
-RMD160 9f526743a1a649d065428476c79208de7e90eb3d tomcat-servlet-api-5.5.20.ebuild 1492
-SHA256 6f7be442373a9d6f88151d7fb90f056b275fc7d12e80a2c9ceb6855e78b5768f tomcat-servlet-api-5.5.20.ebuild 1492
-EBUILD tomcat-servlet-api-5.5.23.ebuild 1492 RMD160 9500566ff75778a3ebf3255308f9cc0327a8bb9b SHA1 5eb501d2c9ad8f744d4f12fbf1c3831144fdd3d0 SHA256 1fbe24ece6c37548ab4b8a1f85f1cae10d7010fcbdd35e04ca501997f82050a2
-MD5 7b0f12fb34f68dcd9e36f6163d204378 tomcat-servlet-api-5.5.23.ebuild 1492
-RMD160 9500566ff75778a3ebf3255308f9cc0327a8bb9b tomcat-servlet-api-5.5.23.ebuild 1492
-SHA256 1fbe24ece6c37548ab4b8a1f85f1cae10d7010fcbdd35e04ca501997f82050a2 tomcat-servlet-api-5.5.23.ebuild 1492
-EBUILD tomcat-servlet-api-6.0.10.ebuild 1184 RMD160 e9577b9bdf9132c63bb21bf9cce225d6894bdb46 SHA1 14289ee483acc253480893813e72c0401df617b0 SHA256 30749a255f9ee6840d80e0a96fc5b09cbdad9f3d23a0bcf583b9fd27136db945
-MD5 7bc85a916313fb6eb57711633f7986a7 tomcat-servlet-api-6.0.10.ebuild 1184
-RMD160 e9577b9bdf9132c63bb21bf9cce225d6894bdb46 tomcat-servlet-api-6.0.10.ebuild 1184
-SHA256 30749a255f9ee6840d80e0a96fc5b09cbdad9f3d23a0bcf583b9fd27136db945 tomcat-servlet-api-6.0.10.ebuild 1184
-MISC ChangeLog 3782 RMD160 71f9ef272720520995414b239be48c9670160ce5 SHA1 c56b8acb8e1e06831f6193a93cf0a15ce9c2c3b6 SHA256 5804b76d269d38d3cd3320280b5546b1cd08db478a0f02c71c9d7b7cec76506d
-MD5 750b6a8c87c23b7a8f937885d81a24ec ChangeLog 3782
-RMD160 71f9ef272720520995414b239be48c9670160ce5 ChangeLog 3782
-SHA256 5804b76d269d38d3cd3320280b5546b1cd08db478a0f02c71c9d7b7cec76506d ChangeLog 3782
+EBUILD tomcat-servlet-api-5.5.20.ebuild 1428 RMD160 a9a34ea036252ed40539209e6310688089e86b0c SHA1 26b20f9c957be709bff2f3cb81b32ea603202f15 SHA256 5390b3378af14532fb838e3d2d48ab19d6a09da3c8558c2be07c306e13724e97
+MD5 c3a9c70bd497ec64b16f6ec295a563c3 tomcat-servlet-api-5.5.20.ebuild 1428
+RMD160 a9a34ea036252ed40539209e6310688089e86b0c tomcat-servlet-api-5.5.20.ebuild 1428
+SHA256 5390b3378af14532fb838e3d2d48ab19d6a09da3c8558c2be07c306e13724e97 tomcat-servlet-api-5.5.20.ebuild 1428
+EBUILD tomcat-servlet-api-5.5.23.ebuild 1428 RMD160 2b53f4ee0d75c798b25945551bbb92171ddadb6e SHA1 c3c5e7443b229c88af35f9130361013306a04a77 SHA256 de2b5283b4de09826940702505fb47be0dbd7b1ef2a14121d0af190f26fff1b8
+MD5 18170ac61aa4432c4a07b39eacdf7e97 tomcat-servlet-api-5.5.23.ebuild 1428
+RMD160 2b53f4ee0d75c798b25945551bbb92171ddadb6e tomcat-servlet-api-5.5.23.ebuild 1428
+SHA256 de2b5283b4de09826940702505fb47be0dbd7b1ef2a14121d0af190f26fff1b8 tomcat-servlet-api-5.5.23.ebuild 1428
+EBUILD tomcat-servlet-api-6.0.10.ebuild 1134 RMD160 db21b5b27f06b51e4271432c19e055e2c6e49f92 SHA1 e37127425e52cbcdc05e994e75c0d883adc76fb2 SHA256 8867c2ad7ccfe214f1376d7b4ad4faf480f4d525452978d95e7470788c8b276c
+MD5 e23cf377ec67f360e6d5597e9ed0ba2b tomcat-servlet-api-6.0.10.ebuild 1134
+RMD160 db21b5b27f06b51e4271432c19e055e2c6e49f92 tomcat-servlet-api-6.0.10.ebuild 1134
+SHA256 8867c2ad7ccfe214f1376d7b4ad4faf480f4d525452978d95e7470788c8b276c tomcat-servlet-api-6.0.10.ebuild 1134
+MISC ChangeLog 3971 RMD160 4d34037ba09c775e45384bf8822a91a6d7246284 SHA1 a07ac2499c3c74f2db3c4f0021fb2f19bbb73c71 SHA256 56629cc1ad69a560dc5d5fbbc72322ae66427a6655184b11d1f022804228c39d
+MD5 94166db60d3064770d6415eb7a614bf6 ChangeLog 3971
+RMD160 4d34037ba09c775e45384bf8822a91a6d7246284 ChangeLog 3971
+SHA256 56629cc1ad69a560dc5d5fbbc72322ae66427a6655184b11d1f022804228c39d ChangeLog 3971
 MISC metadata.xml 370 RMD160 80f77811a1330480797cff01b1e90e883ecb4d51 SHA1 0d60a8ede5babbd15577612fe7b9e504e5a73689 SHA256 d82a36005520445f65916bb8e8e5a4e41c3af6cc5be87cb2263337074e39b704
 MD5 eab22d527a1a92afde250a0ff957b829 metadata.xml 370
 RMD160 80f77811a1330480797cff01b1e90e883ecb4d51 metadata.xml 370

diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.20.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.20.ebuild
index 6484e70611def32cc1021005599d5ff72f0eb1d3..2a0d81e189e290555e81648e70f1fc4b25618b71 100644 (file)
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.20.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.20.ebuild,v 1.5 2007/02/15 02:48:17 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.20.ebuild,v 1.6 2007/03/12 23:59:57 wltjr Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -14,11 +14,11 @@ SLOT="2.4"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 IUSE="doc java5 source"
 
-DEPEND="|| ( >=virtual/jdk-1.4 >=virtual/jdk-1.5 >=virtual/jdk-1.6 )
-       source? ( app-arch/zip )
-       >=dev-java/java-config-2.0.31"
-RDEPEND="|| ( >=virtual/jre-1.4 >=virtual/jre-1.5 >=virtual/jre-1.6 )
-       >=dev-java/java-config-2.0.31"
+DEPEND="java5? ( >=virtual/jdk-1.5 )
+       !java5? ( =virtual/jdk-1.4* )
+       source? ( app-arch/zip )"
+RDEPEND="java5? ( >=virtual/jre-1.5 )
+       !java5? ( =virtual/jdk-1.4* )"
 
 S="${WORKDIR}/${MY_P}/servletapi"
 

diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.23.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.23.ebuild
index b25fd3f935923562270fbf1aafd93451e4ad027e..ea72374805ed7fd0ea92e70a3fe0dd54b2407c2b 100644 (file)
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.23.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.23.ebuild,v 1.1 2007/03/09 17:13:22 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.23.ebuild,v 1.2 2007/03/12 23:59:57 wltjr Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -14,11 +14,11 @@ SLOT="2.4"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 IUSE="doc java5 source"
 
-DEPEND="|| ( >=virtual/jdk-1.4 >=virtual/jdk-1.5 >=virtual/jdk-1.6 )
-       source? ( app-arch/zip )
-       >=dev-java/java-config-2.0.31"
-RDEPEND="|| ( >=virtual/jre-1.4 >=virtual/jre-1.5 >=virtual/jre-1.6 )
-       >=dev-java/java-config-2.0.31"
+DEPEND="java5? ( >=virtual/jdk-1.5 )
+       !java5? ( =virtual/jdk-1.4* )
+       source? ( app-arch/zip )"
+RDEPEND="java5? ( >=virtual/jdk-1.5 )
+       !java5? ( =virtual/jdk-1.4* )"
 
 S="${WORKDIR}/${MY_P}/servletapi"
 

diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.10.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.10.ebuild
index 2353a6dc790b8d2a04f3b7e920189efba5a812e6..59debda74e975d7edbe26f2f19205ce1b353c8c5 100644 (file)
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.10.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.10.ebuild,v 1.1 2007/03/01 00:08:01 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.10.ebuild,v 1.2 2007/03/12 23:59:57 wltjr Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -15,9 +15,9 @@ SLOT="2.5"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 IUSE="source"
 
-DEPEND="|| ( >=virtual/jdk-1.5 >=virtual/jdk-1.6 )
+DEPEND=">=virtual/jdk-1.5
        source? ( app-arch/zip )"
-RDEPEND="|| ( >=virtual/jre-1.5 >=virtual/jre-1.6 )"
+RDEPEND=">=virtual/jre-1.5"
 
 S="${WORKDIR}/${MY_P}/"