Added ant-trax to dep fix for bug #183849

Package-Manager: portage-2.1.2.9

4 files changed, 28 insertions, 31 deletions

diff --git a/www-servers/boa/Manifest b/www-servers/boa/Manifest
index 7bdc0e7ea6f0..3e12423e11f7 100644
--- a/www-servers/boa/Manifest
+++ b/www-servers/boa/Manifest
@@ -6,10 +6,10 @@ AUX boa-0.94.13-server_uid.patch 435 RMD160 3b97a612b46286c0bad314628cd2bc42a8e3
 MD5 8d078a074821ed86301936cdf0bf556b files/boa-0.94.13-server_uid.patch 435
 RMD160 3b97a612b46286c0bad314628cd2bc42a8e32d0f files/boa-0.94.13-server_uid.patch 435
 SHA256 c37a9d12719d4afe59fe3339c0c5983db5a0b5904ac1433605dc95fb11abe2f1 files/boa-0.94.13-server_uid.patch 435
-AUX boa-0.94.14_alpha20-64bit.patch 1820 RMD160 dcf3991301fa4342216da6aeb234c7321576d9ce SHA1 f6da1a846a62818e46b9d66e651c7b2d9e2ab98f SHA256 dc30d49d2684e7706d5728e475a30455cbc77196a3e0a46495fc281818e4c992
-MD5 689cf25a28e83fe31a31e58b0166a3b8 files/boa-0.94.14_alpha20-64bit.patch 1820
-RMD160 dcf3991301fa4342216da6aeb234c7321576d9ce files/boa-0.94.14_alpha20-64bit.patch 1820
-SHA256 dc30d49d2684e7706d5728e475a30455cbc77196a3e0a46495fc281818e4c992 files/boa-0.94.14_alpha20-64bit.patch 1820
+AUX boa-0.94.14_rc21-ENOSYS.patch 800 RMD160 5fef00ce265df4abc2bf09afdef0e1bf10ad1fd5 SHA1 47110bbab7c9a7a34793d5e5bd3990de10cc2d96 SHA256 2cc5662ae9ce9e41f51538c6f3c83462aa6768e93b949252283640b2fab49c38
+MD5 7206b342195961501ed1eae38486e5db files/boa-0.94.14_rc21-ENOSYS.patch 800
+RMD160 5fef00ce265df4abc2bf09afdef0e1bf10ad1fd5 files/boa-0.94.14_rc21-ENOSYS.patch 800
+SHA256 2cc5662ae9ce9e41f51538c6f3c83462aa6768e93b949252283640b2fab49c38 files/boa-0.94.14_rc21-ENOSYS.patch 800
 AUX boa-0.94.14_rc21-texi.patch 431 RMD160 782466abc7cfd6ea5226a2d32401da6e065d4022 SHA1 34cfcb2006731c914dff609930c084fe2d427a22 SHA256 e0c6a7746ed40d2b023716f2ccebda982f2e4765441a2cc69fe2f3838edd60cd
 MD5 5c8138b357fc62502d3117f3fcee7eee files/boa-0.94.14_rc21-texi.patch 431
 RMD160 782466abc7cfd6ea5226a2d32401da6e065d4022 files/boa-0.94.14_rc21-texi.patch 431
@@ -31,7 +31,6 @@ MD5 3e9e1f39e91126bfb472bf3fcdc7fae4 files/mime.types 5488
 RMD160 6a761cefc34ed650bcc25ef8fc025656a70845d1 files/mime.types 5488
 SHA256 6e1c21758dd18a914f69bcfff8d6c8de5ad4ae4ba68cab52eeea65ce0ce108e7 files/mime.types 5488
 DIST boa-0.94.13.tar.gz 122066 RMD160 00210b478eda27896873f106401cfb3c6362fd52 SHA1 7ce96f6d917baf328449be7f40783156afe634cb SHA256 e00bb50eb859c736f2afc913976e82e8fc68a1fbe34fa294e014aa95f4d87366
-DIST boa-0.94.14rc20.tar.gz 200395 RMD160 60c2a6c28b7ca78552917de2d9557678d7413c39 SHA1 d6ea579e72705d9f0ed876ebea2af94b54f23cc8 SHA256 dfd0919e01a742a1da10f5a36a6753ec4ec49fad553bea1370d6938a381aae5a
 DIST boa-0.94.14rc21.tar.gz 199950 RMD160 e187a4e21a81a8454f6f08dc2372496e89963a0f SHA1 c801876113d31e45e2745c081ab7905fdc679236 SHA256 02c51bf25f29d56e641b662f0767759654c28d88ec31f55c5a73d57edfe13cf6
 EBUILD boa-0.94.13-r1.ebuild 1858 RMD160 6534aab4ddde61a41a4b2bf4b680db9c680f2ee2 SHA1 ffbf6a46da717ab00990445cbd4d93bfc30b3406 SHA256 9981af11219726812bb765b81f6096dad031e56774fc227793791dfc3b15c83e
 MD5 4e7982c9d48fbcae915db6be8a5056b9 boa-0.94.13-r1.ebuild 1858
@@ -41,18 +40,14 @@ EBUILD boa-0.94.13.ebuild 1632 RMD160 f4567b53a627077cd96cce677a8411f01787b9b4 S
 MD5 788ed0f415c64e4617d44f7e029ae72a boa-0.94.13.ebuild 1632
 RMD160 f4567b53a627077cd96cce677a8411f01787b9b4 boa-0.94.13.ebuild 1632
 SHA256 87722fecd613b3fd13d58f8d49e5d8859333af10e8d53d0526942b7fbc29adc4 boa-0.94.13.ebuild 1632
-EBUILD boa-0.94.14_alpha20.ebuild 1923 RMD160 5e1aecd8bdfff42ad863e0d9b3d7abc118e4a258 SHA1 f9c3992c07e7fd4c388dd64104ab346ff7622146 SHA256 640260ebfdf774830fcfeb355ff4ee62444238ee4747047bceacf42e68153baa
-MD5 521b844f6073e7f69c17aefc9f6e56dc boa-0.94.14_alpha20.ebuild 1923
-RMD160 5e1aecd8bdfff42ad863e0d9b3d7abc118e4a258 boa-0.94.14_alpha20.ebuild 1923
-SHA256 640260ebfdf774830fcfeb355ff4ee62444238ee4747047bceacf42e68153baa boa-0.94.14_alpha20.ebuild 1923
-EBUILD boa-0.94.14_rc21.ebuild 1515 RMD160 4566621b2f5807cbbaf587ed04b26037e63618d9 SHA1 e9e0ab90df8c8a28e17e44f5065d875553723b7f SHA256 f98f392e4b801c9437a5d75774cdf59dd8e521712334ec1c38f760e5a93ad5b4
-MD5 2f2a30f6ee680210c3b59858a1493195 boa-0.94.14_rc21.ebuild 1515
-RMD160 4566621b2f5807cbbaf587ed04b26037e63618d9 boa-0.94.14_rc21.ebuild 1515
-SHA256 f98f392e4b801c9437a5d75774cdf59dd8e521712334ec1c38f760e5a93ad5b4 boa-0.94.14_rc21.ebuild 1515
-MISC ChangeLog 5620 RMD160 3503afc03b2b6b57b661b0bc8c3df0650c93fc0b SHA1 b131696677777d70c5f14e751010def5419e93ac SHA256 d6e9c7f2f20a685755c794e3282c69bb0282e7bfbcbcbbcccb36ea3bc76aec3a
-MD5 6190e53b07ce82a05537542e05738385 ChangeLog 5620
-RMD160 3503afc03b2b6b57b661b0bc8c3df0650c93fc0b ChangeLog 5620
-SHA256 d6e9c7f2f20a685755c794e3282c69bb0282e7bfbcbcbbcccb36ea3bc76aec3a ChangeLog 5620
+EBUILD boa-0.94.14_rc21.ebuild 1335 RMD160 9e67c39ab69f1604c8ad8f58ebef8407c77068d9 SHA1 a0ccd03554c3ff7fe2c945d9b8c7099eac0dcba1 SHA256 ab1bd19671ef4489d95b9db7245e3aeddf21940ba3903956c824daea84d2faee
+MD5 af052579d11d698ada6a0c1e8c0cb3b3 boa-0.94.14_rc21.ebuild 1335
+RMD160 9e67c39ab69f1604c8ad8f58ebef8407c77068d9 boa-0.94.14_rc21.ebuild 1335
+SHA256 ab1bd19671ef4489d95b9db7245e3aeddf21940ba3903956c824daea84d2faee boa-0.94.14_rc21.ebuild 1335
+MISC ChangeLog 5902 RMD160 cd7971c48a2aff5983f22cffeddcd66cc16654d2 SHA1 2c2fc1b72769fd03639009dce34749532b9e51cd SHA256 285527f7414b77422235fe5ff8b2ead5cc3100a8d8632111e04bc17ddd2de4db
+MD5 0bdde39cf6b300ca05a1211238733c10 ChangeLog 5902
+RMD160 cd7971c48a2aff5983f22cffeddcd66cc16654d2 ChangeLog 5902
+SHA256 285527f7414b77422235fe5ff8b2ead5cc3100a8d8632111e04bc17ddd2de4db ChangeLog 5902
 MISC metadata.xml 351 RMD160 80899854570054d93c1cc5884cd9cb1eefa04e23 SHA1 508fd233cc38a1d4a3ecafb7afb0a8cdf5a6aca3 SHA256 7546ab03a6254d3a50c672527dc4f823ac6601fe75c113a9354df45f2794e650
 MD5 913b101a2df388a33178bc41817fa63e metadata.xml 351
 RMD160 80899854570054d93c1cc5884cd9cb1eefa04e23 metadata.xml 351
@@ -63,9 +58,6 @@ SHA256 66390bf8b4e5287ae5c6bc16a42d5bdcdd21ab96026320f2459dcaa0e05d4b6d files/di
 MD5 8257a6f9f02cc1e935d573c12536f93c files/digest-boa-0.94.13-r1 235
 RMD160 310d4b8d2b95db09d6cbc056cba2f354e197f683 files/digest-boa-0.94.13-r1 235
 SHA256 66390bf8b4e5287ae5c6bc16a42d5bdcdd21ab96026320f2459dcaa0e05d4b6d files/digest-boa-0.94.13-r1 235
-MD5 b8edfd2438f162c409a78aae7faf99f3 files/digest-boa-0.94.14_alpha20 247
-RMD160 25f3cefc25eb98842041fe44c80c6ae23f3311aa files/digest-boa-0.94.14_alpha20 247
-SHA256 ec04a3653d646818981827ee1181cfdabe80e4b04f7acff1c06f0e5a8a1fa98d files/digest-boa-0.94.14_alpha20 247
 MD5 99734b930ab5908d83984d5b36204774 files/digest-boa-0.94.14_rc21 247
 RMD160 343d4b6b0e8c5a749f090d5817ecf5d72c399d46 files/digest-boa-0.94.14_rc21 247
 SHA256 6dddef120c853f9a644ca3144b03bd36c44bd97d1aaa80274fc5f596d89f27d9 files/digest-boa-0.94.14_rc21 247
diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index e9155b8d6c0d..677782b37aa1 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.150 2007/06/17 15:53:56 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.151 2007/07/01 17:07:07 wltjr Exp $
+
+  01 Jul 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  tomcat-5.5.23-r6.ebuild:
+  Added ant-trax to dep fix for bug #183849
 
   17 Jun 2007; William L. Thomson Jr. <wltjr@gentoo.org>
   tomcat-5.5.23-r1.ebuild, tomcat-5.5.23-r6.ebuild,
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index dc95d379abaf..6c30e4a42cf1 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -64,18 +64,18 @@ EBUILD tomcat-5.5.23-r1.ebuild 10930 RMD160 3eccd694f37bebd9b8f827a3446eb59df1a2
 MD5 9b53dd2cac285f9e9682b90a0e920b53 tomcat-5.5.23-r1.ebuild 10930
 RMD160 3eccd694f37bebd9b8f827a3446eb59df1a2889e tomcat-5.5.23-r1.ebuild 10930
 SHA256 b9f02c81150d88932f35db49158fbdd1fcf13de8cc0336ed33b75cf2a22748f1 tomcat-5.5.23-r1.ebuild 10930
-EBUILD tomcat-5.5.23-r6.ebuild 11205 RMD160 55e12cf2c49734c1b9dd936229c6bd5b1c893181 SHA1 d366584706e9e8e681b08c48da929f201fb7c493 SHA256 510082f2ac2d7a2bf159ca137ddbd8dbe83a973cd27a41bb2d8b4d0f6162594f
-MD5 fee3e34c3a82848a79a6e4591dc10317 tomcat-5.5.23-r6.ebuild 11205
-RMD160 55e12cf2c49734c1b9dd936229c6bd5b1c893181 tomcat-5.5.23-r6.ebuild 11205
-SHA256 510082f2ac2d7a2bf159ca137ddbd8dbe83a973cd27a41bb2d8b4d0f6162594f tomcat-5.5.23-r6.ebuild 11205
+EBUILD tomcat-5.5.23-r6.ebuild 11251 RMD160 719ac317403fc73aeb1a850ec6da9b490734a9cf SHA1 f2feb28aa1256e661c8e6d8763c9af9a7e91ca17 SHA256 dffe68a98938c183df6748125fb40bb1885aa39fa86f413bbf451e2c83d27c26
+MD5 05f0bbb3f53047f3fe22e6001741ad29 tomcat-5.5.23-r6.ebuild 11251
+RMD160 719ac317403fc73aeb1a850ec6da9b490734a9cf tomcat-5.5.23-r6.ebuild 11251
+SHA256 dffe68a98938c183df6748125fb40bb1885aa39fa86f413bbf451e2c83d27c26 tomcat-5.5.23-r6.ebuild 11251
 EBUILD tomcat-6.0.13-r3.ebuild 6214 RMD160 8cfb412e68750b6c608b38a008b3f7e997fd2ab3 SHA1 f62103a7319cdcb63c5b41d11a4f4362177cee59 SHA256 a3aec0f7eca5c0caefe72eecad8df50ec8fe50ab922f180f9835c9765685e64a
 MD5 585c348fcc49dd62185e7d73db418756 tomcat-6.0.13-r3.ebuild 6214
 RMD160 8cfb412e68750b6c608b38a008b3f7e997fd2ab3 tomcat-6.0.13-r3.ebuild 6214
 SHA256 a3aec0f7eca5c0caefe72eecad8df50ec8fe50ab922f180f9835c9765685e64a tomcat-6.0.13-r3.ebuild 6214
-MISC ChangeLog 47226 RMD160 c85525728e21818e36fc2caf4620c3bc2a6f9e68 SHA1 744fcc8dfca15ac3e7848e6e6fb3c484bfe7e5a9 SHA256 6691c75b3eafe0dca318fd55ee831aacb3be22786e171ba06f83340b8fb800fe
-MD5 1fdc2edf9d6ee196565dd2ebe48cc874 ChangeLog 47226
-RMD160 c85525728e21818e36fc2caf4620c3bc2a6f9e68 ChangeLog 47226
-SHA256 6691c75b3eafe0dca318fd55ee831aacb3be22786e171ba06f83340b8fb800fe ChangeLog 47226
+MISC ChangeLog 47355 RMD160 e1f9fe35e689fac3d5d08f17d79fdac6532f7c6e SHA1 b499f42cbddaf2bbbb3a92ebbb4f970f9d6ba5fc SHA256 07addb34a800588172848d94201339bbb6338d89cff209f67a8a0094a39b1108
+MD5 7a752a8109c465bbb67dac7636966b90 ChangeLog 47355
+RMD160 e1f9fe35e689fac3d5d08f17d79fdac6532f7c6e ChangeLog 47355
+SHA256 07addb34a800588172848d94201339bbb6338d89cff209f67a8a0094a39b1108 ChangeLog 47355
 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.23-r6.ebuild b/www-servers/tomcat/tomcat-5.5.23-r6.ebuild
index f1ae8b34c38c..c28057de4160 100644
--- a/www-servers/tomcat/tomcat-5.5.23-r6.ebuild
+++ b/www-servers/tomcat/tomcat-5.5.23-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-5.5.23-r6.ebuild,v 1.2 2007/06/17 15:53:56 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.23-r6.ebuild,v 1.3 2007/07/01 17:07:07 wltjr Exp $
 
 #WANT_ANT_TASKS="ant-trax"
 
@@ -48,7 +48,8 @@ RDEPEND="=dev-java/eclipse-ecj-3.2*
 	   )"
 DEPEND="java5? ( >=virtual/jdk-1.5 )
 	!java5? ( =virtual/jdk-1.4* )
-	${RDEPEND}"
+	${RDEPEND}
+	|| ( dev-java/ant-trax dev-java/ant-tasks ) "
 
 S=${WORKDIR}/${MY_P}