From: Vlastimil Babka Date: Wed, 31 Jan 2007 10:31:50 +0000 (+0000) Subject: Fix tomcat-servlet-api deps for bug #164557. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=37ba668704a3f95ab2f8602de85a0cc21f16399d;p=gentoo.git Fix tomcat-servlet-api deps for bug #164557. Package-Manager: portage-2.1.2-r5 --- diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog index 16c2a503947a..0890c0288399 100644 --- a/www-servers/tomcat/ChangeLog +++ b/www-servers/tomcat/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-servers/tomcat # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.112 2007/01/30 06:20:11 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.113 2007/01/31 10:31:50 caster Exp $ + + 31 Jan 2007; Vlastimil Babka + tomcat-6.0.7_beta-r6.ebuild, tomcat-6.0.8_alpha-r3.ebuild: + Fix tomcat-servlet-api deps for bug #164557. 30 Jan 2007; Christian Faulhammer tomcat-5.5.20-r8.ebuild: diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index 2a8396f830f2..ebb2b87f0ee2 100644 --- 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 @@ -146,18 +143,18 @@ EBUILD tomcat-5.5.20-r8.ebuild 10297 RMD160 eb9916051e03d6a1785496201d9a94f1f28c MD5 7999dd74de5c51ec299703dfa6e90101 tomcat-5.5.20-r8.ebuild 10297 RMD160 eb9916051e03d6a1785496201d9a94f1f28c23dc tomcat-5.5.20-r8.ebuild 10297 SHA256 c50f9e6640bc19de53a1f31aed7500de36aef9b1282cf642950f36c097f4039c tomcat-5.5.20-r8.ebuild 10297 -EBUILD tomcat-6.0.7_beta-r6.ebuild 5067 RMD160 44ce9312389bdcafe32fc157348e8a2be8b2d365 SHA1 ff88a62d5bd89fa59c1d76c43d8b530e4c92998a SHA256 a917527477cdc9af5ea513012e77d7477665179911bdbac822736eedbbcbaa7b -MD5 df881beab94b9682804b8024e294018e tomcat-6.0.7_beta-r6.ebuild 5067 -RMD160 44ce9312389bdcafe32fc157348e8a2be8b2d365 tomcat-6.0.7_beta-r6.ebuild 5067 -SHA256 a917527477cdc9af5ea513012e77d7477665179911bdbac822736eedbbcbaa7b tomcat-6.0.7_beta-r6.ebuild 5067 -EBUILD tomcat-6.0.8_alpha-r3.ebuild 5069 RMD160 a8ed92456c4a466aa7dc441d49d4a404ad9f6c5e SHA1 2ad02d9c6f0a9e82de8e1be80a9a0eb12b152cc3 SHA256 5cef4eace55421d2e3ff692e21446f75a34825df5154c1b0a372133829dcb12e -MD5 f1d2a293f9b4f2325a6ead9973b4ccc7 tomcat-6.0.8_alpha-r3.ebuild 5069 -RMD160 a8ed92456c4a466aa7dc441d49d4a404ad9f6c5e tomcat-6.0.8_alpha-r3.ebuild 5069 -SHA256 5cef4eace55421d2e3ff692e21446f75a34825df5154c1b0a372133829dcb12e tomcat-6.0.8_alpha-r3.ebuild 5069 -MISC ChangeLog 36682 RMD160 8a6ee8bc24d4c1f978f5c79b5970e7d3ebeb63c8 SHA1 9f1f8c6c76db37bf5d26454d6305f4e437302e44 SHA256 a3ac10b624a87c71dda114f3bc8e09bfc38b73b85f4218e91877bb14179b9867 -MD5 df016aae48726c209d6accea8af166ef ChangeLog 36682 -RMD160 8a6ee8bc24d4c1f978f5c79b5970e7d3ebeb63c8 ChangeLog 36682 -SHA256 a3ac10b624a87c71dda114f3bc8e09bfc38b73b85f4218e91877bb14179b9867 ChangeLog 36682 +EBUILD tomcat-6.0.7_beta-r6.ebuild 5068 RMD160 17276cd9549c40e373156c8eb8df9aa7946f2393 SHA1 250de472d2d67111155e55ce504350ff24bdfeee SHA256 66dd3ec2ebe59c1a1bf497a0c289e95d32292fae903d69d983bb56907135e9fe +MD5 f81decfbb95ddf53af037d22aa1b3cf5 tomcat-6.0.7_beta-r6.ebuild 5068 +RMD160 17276cd9549c40e373156c8eb8df9aa7946f2393 tomcat-6.0.7_beta-r6.ebuild 5068 +SHA256 66dd3ec2ebe59c1a1bf497a0c289e95d32292fae903d69d983bb56907135e9fe tomcat-6.0.7_beta-r6.ebuild 5068 +EBUILD tomcat-6.0.8_alpha-r3.ebuild 5070 RMD160 f3810c7cc03346e6c25abbefcd5425fc548fb5dd SHA1 c6d7b220a68e2f79244d80fdf259a0846a99bf51 SHA256 e74842549ad1b9b1ce74232cfb2e8684accfc8809428b50f93ccdf0a2b98dfb9 +MD5 14cde4e706b8e59667ff316b9b9e6e59 tomcat-6.0.8_alpha-r3.ebuild 5070 +RMD160 f3810c7cc03346e6c25abbefcd5425fc548fb5dd tomcat-6.0.8_alpha-r3.ebuild 5070 +SHA256 e74842549ad1b9b1ce74232cfb2e8684accfc8809428b50f93ccdf0a2b98dfb9 tomcat-6.0.8_alpha-r3.ebuild 5070 +MISC ChangeLog 36843 RMD160 da4918875dcd8396b5044a248bd487106f557dee SHA1 6f612bbada8a3e934fbd8cb6132d97cba5c45d9c SHA256 0beff91cd92805fe1e09eade894e9930ba24230c47b9544a380d825c6d3d8627 +MD5 cb577a3947467d60d7260680d307c3d9 ChangeLog 36843 +RMD160 da4918875dcd8396b5044a248bd487106f557dee ChangeLog 36843 +SHA256 0beff91cd92805fe1e09eade894e9930ba24230c47b9544a380d825c6d3d8627 ChangeLog 36843 MISC metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 SHA1 e8dcd8204d0ea02558dd07e1aded5dc58ed1460c SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79 MD5 0609d3339e0b8d5a3b4707f6b02aad3a metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 metadata.xml 556 @@ -183,10 +180,3 @@ SHA256 8c88ae20979c83fd4529d2493cf5bfc63d86ff37cb46af296db58166d2e0ad3d files/di MD5 d42fe3d19844276dfb1df24bd3d29897 files/digest-tomcat-6.0.8_alpha-r3 274 RMD160 831d3266c513184c82d467da6933a289798935b6 files/digest-tomcat-6.0.8_alpha-r3 274 SHA256 74cd7a38575a75a9f68d2e6da21d94ec2ae7c729431ab90b89716d6a5dcf7374 files/digest-tomcat-6.0.8_alpha-r3 274 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) - -iD8DBQFFvuN2NQqtfCuFneMRAmm1AJ4yf6pWGi4GgPLOO7g3dqA3TkNTqQCghD31 -O2pIomL/GTZm0E0QPnioH1s= -=XwuS ------END PGP SIGNATURE----- diff --git a/www-servers/tomcat/tomcat-6.0.7_beta-r6.ebuild b/www-servers/tomcat/tomcat-6.0.7_beta-r6.ebuild index 3ba88460f260..1524cd31b63c 100644 --- a/www-servers/tomcat/tomcat-6.0.7_beta-r6.ebuild +++ b/www-servers/tomcat/tomcat-6.0.7_beta-r6.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/www-servers/tomcat/tomcat-6.0.7_beta-r6.ebuild,v 1.1 2007/01/28 23:00:55 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.7_beta-r6.ebuild,v 1.2 2007/01/31 10:31:50 caster Exp $ inherit eutils java-pkg-2 java-ant-2 @@ -21,7 +21,7 @@ RDEPEND="|| ( >=virtual/jre-1.5 >=virtual/jre-1.6 ) >=dev-java/commons-dbcp-1.2.1 >=dev-java/commons-logging-1.1 >=dev-java/commons-pool-1.2 - =dev-java/tomcat-servlet-api-${PV}" + ~dev-java/tomcat-servlet-api-${PV}" DEPEND="|| ( >=virtual/jdk-1.5 >=virtual/jdk-1.6 ) ${RDEPEND} diff --git a/www-servers/tomcat/tomcat-6.0.8_alpha-r3.ebuild b/www-servers/tomcat/tomcat-6.0.8_alpha-r3.ebuild index 41a8e3e7623a..d4e168f515eb 100644 --- a/www-servers/tomcat/tomcat-6.0.8_alpha-r3.ebuild +++ b/www-servers/tomcat/tomcat-6.0.8_alpha-r3.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/www-servers/tomcat/tomcat-6.0.8_alpha-r3.ebuild,v 1.1 2007/01/28 23:00:55 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.8_alpha-r3.ebuild,v 1.2 2007/01/31 10:31:50 caster Exp $ inherit eutils java-pkg-2 java-ant-2 @@ -21,7 +21,7 @@ RDEPEND="|| ( >=virtual/jre-1.5 >=virtual/jre-1.6 ) >=dev-java/commons-dbcp-1.2.1 >=dev-java/commons-logging-1.1 >=dev-java/commons-pool-1.2 - =dev-java/tomcat-servlet-api-${PV}" + ~dev-java/tomcat-servlet-api-${PV}" DEPEND="|| ( >=virtual/jdk-1.5 >=virtual/jdk-1.6 ) ${RDEPEND}