Removed false dep on jaxen from 5.5.20.

Package-Manager: portage-2.1.2_rc2-r4

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index f2b9fcfd67362b92290993cebd902ca7d988029f..3ac26b00883380ec05438a5205e9b77670cded0b 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.82 2006/12/06 14:43:49 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.83 2006/12/07 00:11:15 wltjr Exp $
+
+  07 Dec 2006; William L. Thomson Jr. <wltjr@gentoo.org>
+  tomcat-5.5.20-r2.ebuild:
+  Removed false dep on jaxen from 5.5.20.
 
   06 Dec 2006; Petteri Räty <betelgeuse@gentoo.org>
   tomcat-5.5.20-r2.ebuild:

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index cd1da5bea2c118b0f2a09e459f3169b069fb1b2a..524527c8044da9892e0bc9aab59f7e0e53527339 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
@@ -165,18 +162,18 @@ EBUILD tomcat-5.0.28-r14.ebuild 9396 RMD160 266effb829b70d11022216a8d479898d0e9a
 MD5 c4a7c24e9d21a98c54b824bbc37b636f tomcat-5.0.28-r14.ebuild 9396
 RMD160 266effb829b70d11022216a8d479898d0e9a526c tomcat-5.0.28-r14.ebuild 9396
 SHA256 729243dac70cf13b8d27cef8d74d86f6e695cf10e00399d7908d930f5e42671d tomcat-5.0.28-r14.ebuild 9396
-EBUILD tomcat-5.5.20-r2.ebuild 10281 RMD160 85675aba68256ebb92633ea4a8e5a63df16dcb98 SHA1 3655fa8e009474b98613185345afc85dc7222b9e SHA256 4d7230f19cb7394079df15c2bc859d1dbd3b0a04019d29bf1a4753f6d9cdf573
-MD5 082c6f46056351c7e86f16888b7af2e5 tomcat-5.5.20-r2.ebuild 10281
-RMD160 85675aba68256ebb92633ea4a8e5a63df16dcb98 tomcat-5.5.20-r2.ebuild 10281
-SHA256 4d7230f19cb7394079df15c2bc859d1dbd3b0a04019d29bf1a4753f6d9cdf573 tomcat-5.5.20-r2.ebuild 10281
+EBUILD tomcat-5.5.20-r2.ebuild 10177 RMD160 33a47ba1a347bc913278eea38a6194051cb8094b SHA1 c387d81d7601c30e23b19d138de92d65b7f22a29 SHA256 249959923f28a2a213180cfa69172211f5c0e5eecb8e3d5e755b0f31293efe2d
+MD5 8f2de90288b7661deeda91757afb2a10 tomcat-5.5.20-r2.ebuild 10177
+RMD160 33a47ba1a347bc913278eea38a6194051cb8094b tomcat-5.5.20-r2.ebuild 10177
+SHA256 249959923f28a2a213180cfa69172211f5c0e5eecb8e3d5e755b0f31293efe2d tomcat-5.5.20-r2.ebuild 10177
 EBUILD tomcat-6.0.2.ebuild 4710 RMD160 9cb4194bba00500f1a03f1b5355a5c9fac26637b SHA1 b5c58296f5a115d95fcb21110f0f57ae2ae50020 SHA256 6aa88555628381bf226f9e1321b31ad4b71f87c56b974ffbc0653b7d5db43869
 MD5 694e0ad892fa9963ff56d030127f1858 tomcat-6.0.2.ebuild 4710
 RMD160 9cb4194bba00500f1a03f1b5355a5c9fac26637b tomcat-6.0.2.ebuild 4710
 SHA256 6aa88555628381bf226f9e1321b31ad4b71f87c56b974ffbc0653b7d5db43869 tomcat-6.0.2.ebuild 4710
-MISC ChangeLog 27655 RMD160 328f2bc40749c4b7d447d7770aadbe7f6dc23242 SHA1 30dee9e3632d104eef607c45cc6465595c551ed4 SHA256 216bac1472bdcaef95cc45b30f6b580f552231c2b551a959e7df0447c7b790b3
-MD5 3fbb4db3fc0a0d4496375e1fe9af4fcc ChangeLog 27655
-RMD160 328f2bc40749c4b7d447d7770aadbe7f6dc23242 ChangeLog 27655
-SHA256 216bac1472bdcaef95cc45b30f6b580f552231c2b551a959e7df0447c7b790b3 ChangeLog 27655
+MISC ChangeLog 27777 RMD160 672f24ba9facef184d0bdeaf36161276d7144f71 SHA1 2c33a6032a97c63d415b0f61c771910ff5fcef4c SHA256 b0524863fdcb7e2bb7081973e9fa9cbab80eb251a72878bbfc9f8058dd941283
+MD5 53ff2c8e9184fdc88da6f0c3274b7e76 ChangeLog 27777
+RMD160 672f24ba9facef184d0bdeaf36161276d7144f71 ChangeLog 27777
+SHA256 b0524863fdcb7e2bb7081973e9fa9cbab80eb251a72878bbfc9f8058dd941283 ChangeLog 27777
 MISC metadata.xml 558 RMD160 f81f3d20ca526007bbd8f0f88deffb7a097334ea SHA1 6ab9eadb2a8f19b0d4ea1f02ba88315d49e61fb1 SHA256 d5b4cdcd581677edce5b62c586d618f4c95660127fcb2fb7157f83e6d0e35fce
 MD5 e26537a19167254676bb36654dc01f91 metadata.xml 558
 RMD160 f81f3d20ca526007bbd8f0f88deffb7a097334ea metadata.xml 558
@@ -193,10 +190,3 @@ SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/di
 MD5 b8faa06ed7ce8aac00eaf7c6cfc18afc files/digest-tomcat-6.0.2 274
 RMD160 46958bfcb35d84de3df9249238b99faa12fb79ae files/digest-tomcat-6.0.2 274
 SHA256 da0e2d6c74a9b909142a5296d92d688ea4b25f1bc21227da983206f5d2b7c924 files/digest-tomcat-6.0.2 274
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFdtcvcxLzpIGCsLQRAgZQAJ9a/8x9zd0huFzio91tivQCFDQ5+wCfdALW
-aeQaqT5BX2dd0s7EHPfGIQQ=
-=ch2a
------END PGP SIGNATURE-----

diff --git a/www-servers/tomcat/tomcat-5.5.20-r2.ebuild b/www-servers/tomcat/tomcat-5.5.20-r2.ebuild
index 8cf101325a83d0302f824202c026d7ad81e54de6..a5e27d7fb4fba9fbe5f546dd7f3f25af11cf0494 100644 (file)
--- a/www-servers/tomcat/tomcat-5.5.20-r2.ebuild
+++ b/www-servers/tomcat/tomcat-5.5.20-r2.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-r2.ebuild,v 1.6 2006/12/06 14:43:49 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.20-r2.ebuild,v 1.7 2006/12/07 00:11:15 wltjr Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -36,7 +36,6 @@ RDEPEND="=dev-java/eclipse-ecj-3.1*
                =virtual/jre-1.4*
                >=dev-java/commons-httpclient-2.0
                dev-java/sun-jaf
-               ~dev-java/jaxen-1.0
                >=dev-java/junit-3.8.1
                =dev-java/mx4j-3*
                >=dev-java/saxpath-1.0
@@ -157,7 +156,6 @@ src_compile(){
        if ! use java5; then
                antflags="${antflags} -Dcommons-httpclient.jar=$(java-config -p commons-httpclient)"
                antflags="${antflags} -Dactivation.jar=$(java-config -p sun-jaf)"
-               antflags="${antflags} -Djaxen.jar=$(java-pkg_getjar jaxen jaxen-full.jar)"
                antflags="${antflags} -Djmx.jar=$(java-pkg_getjar mx4j-3.0 mx4j.jar)"
                antflags="${antflags} -Djmx-remote.jar=$(java-pkg_getjar mx4j-3.0 mx4j-rjmx.jar)"
                antflags="${antflags} -Dsaxpath.jar=$(java-pkg_getjar saxpath saxpath.jar)"