Corrected invalid atom =dev-java/sun-jaf per bug # 149317. Also corrected the package xml-apis.jar comes from. Was changed to xml-commons-external-1.3 but was mistakenly changed back when updating the ebuild for java5 use flag and 1.5 jdks

Package-Manager: portage-2.1.2_pre1-r1

3 files changed, 19 insertions, 12 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index ab10d076c6f9..0547cb944424 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,13 @@
 # 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.67 2006/09/26 21:19:41 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.68 2006/09/27 16:54:26 wltjr Exp $
+
+  27 Sep 2006; William L. Thomson Jr. <wltjr@gentoo.org>
+  tomcat-5.5.17-r7.ebuild:
+  Corrected invalid atom =dev-java/sun-jaf per bug # 149317. Also corrected
+  the package xml-apis.jar comes from. Was changed to xml-commons-external-1.3
+  but was mistakenly changed back when updating the ebuild for java5 use flag
+  and 1.5 jdks
 
   26 Sep 2006; William L. Thomson Jr. <wltjr@gentoo.org>
   tomcat-5.5.17-r7.ebuild:
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 493676db3a90..f555b3e7fd3a 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -121,14 +121,14 @@ EBUILD tomcat-5.5.17-r6.ebuild 10024 RMD160 e97c1373f46501a034a06eaaf214f47961a6
 MD5 eaa1497616248ef70dd7419bd4b39d62 tomcat-5.5.17-r6.ebuild 10024
 RMD160 e97c1373f46501a034a06eaaf214f47961a64eb2 tomcat-5.5.17-r6.ebuild 10024
 SHA256 5fcb3706a2a5aa7fd3823b76d8ab57d84e448501c8bac8653b4d8dc14a90ac74 tomcat-5.5.17-r6.ebuild 10024
-EBUILD tomcat-5.5.17-r7.ebuild 10011 RMD160 5c1b71a8b51efc74566f2ba988d0f1ee69cf6193 SHA1 b9d0d3ce0cbfc4aff1fc7f3a19b8aaa570d2ad5a SHA256 5fa844d4c37027434ecb3758b1ad42dfc578a46e0a8fc668a317efba79170155
-MD5 2d97581c79d6bb3c4041f29bf5a26c62 tomcat-5.5.17-r7.ebuild 10011
-RMD160 5c1b71a8b51efc74566f2ba988d0f1ee69cf6193 tomcat-5.5.17-r7.ebuild 10011
-SHA256 5fa844d4c37027434ecb3758b1ad42dfc578a46e0a8fc668a317efba79170155 tomcat-5.5.17-r7.ebuild 10011
-MISC ChangeLog 24026 RMD160 a351cd1783bb1aa98f8b704458723b63a79dc711 SHA1 fd15c04c7596e88662878e4165ca4744807f02c5 SHA256 e6a7b24818fc79543f480f015300c2083433eee771483000aadd526005fc9e3b
-MD5 80b42d7336a22c4eb38a9a3a11b1f647 ChangeLog 24026
-RMD160 a351cd1783bb1aa98f8b704458723b63a79dc711 ChangeLog 24026
-SHA256 e6a7b24818fc79543f480f015300c2083433eee771483000aadd526005fc9e3b ChangeLog 24026
+EBUILD tomcat-5.5.17-r7.ebuild 10026 RMD160 c9ed391b49b799a3101326e9d3b5e0d71658d034 SHA1 0e7ee5cc9398575f4c5f64d8e15b828f97e19505 SHA256 1c0e5a968089d97216f51b985ee25e615845cd26a538734e0b4f616fa75c0ea6
+MD5 8371674bc81a3d62d335fb0c26037a1f tomcat-5.5.17-r7.ebuild 10026
+RMD160 c9ed391b49b799a3101326e9d3b5e0d71658d034 tomcat-5.5.17-r7.ebuild 10026
+SHA256 1c0e5a968089d97216f51b985ee25e615845cd26a538734e0b4f616fa75c0ea6 tomcat-5.5.17-r7.ebuild 10026
+MISC ChangeLog 24359 RMD160 94c713c6c805246bcc5341c497602b85e5cea212 SHA1 aebc65f291909c02cdd0a475e17bf4dffa0518cb SHA256 07d16600b39f566353874cb6e3287c688cd319ee1d6ba594d8a48884522cea3b
+MD5 aa5c9ea83499541c538f01bdc865f3e0 ChangeLog 24359
+RMD160 94c713c6c805246bcc5341c497602b85e5cea212 ChangeLog 24359
+SHA256 07d16600b39f566353874cb6e3287c688cd319ee1d6ba594d8a48884522cea3b ChangeLog 24359
 MISC metadata.xml 558 RMD160 f81f3d20ca526007bbd8f0f88deffb7a097334ea SHA1 6ab9eadb2a8f19b0d4ea1f02ba88315d49e61fb1 SHA256 d5b4cdcd581677edce5b62c586d618f4c95660127fcb2fb7157f83e6d0e35fce
 MD5 e26537a19167254676bb36654dc01f91 metadata.xml 558
 RMD160 f81f3d20ca526007bbd8f0f88deffb7a097334ea metadata.xml 558
diff --git a/www-servers/tomcat/tomcat-5.5.17-r7.ebuild b/www-servers/tomcat/tomcat-5.5.17-r7.ebuild
index 891d2cfc285c..12f6d2ca9b5b 100644
--- a/www-servers/tomcat/tomcat-5.5.17-r7.ebuild
+++ b/www-servers/tomcat/tomcat-5.5.17-r7.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.17-r7.ebuild,v 1.3 2006/09/26 21:19:41 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.17-r7.ebuild,v 1.4 2006/09/27 16:54:26 wltjr Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -33,7 +33,7 @@ RDEPEND="=dev-java/eclipse-ecj-3.1*
 	!java5? (
 		=virtual/jre-1.4*
 		>=dev-java/commons-httpclient-2.0
-		=dev-java/sun-jaf
+		dev-java/sun-jaf
 		~dev-java/jaxen-1.0
 		>=dev-java/junit-3.8.1
 		=dev-java/mx4j-3*
@@ -156,7 +156,7 @@ src_compile(){
 		antflags="${antflags} -Djmx-remote.jar=$(java-pkg_getjar mx4j-3.0 mx4j-rjmx.jar)"
 		antflags="${antflags} -Dsaxpath.jar=$(java-pkg_getjar saxpath saxpath.jar)"
 		antflags="${antflags} -DxercesImpl.jar=$(java-pkg_getjar xerces-2 xercesImpl.jar)"
-		antflags="${antflags} -Dxml-apis.jar=$(java-pkg_getjar xerces-2 xml-apis.jar)"
+		antflags="${antflags} -Dxml-apis.jar=$(java-pkg_getjar xml-commons-external-1.3 xml-apis.jar)"
 	fi
 
 	eant ${antflags}