Forgot to apply sun-javamail-bin -> sun-javamail and gnu-jaf -> sun-jaf changes with jars passed to ant

Package-Manager: portage-2.1.2_pre1-r1

3 files changed, 17 insertions, 12 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 8494e272aa62..4e39575c056e 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,11 @@
 # 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.65 2006/09/26 19:48:17 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.66 2006/09/26 20:16:19 wltjr Exp $
+
+  26 Sep 2006; William L. Thomson Jr. <wltjr@gentoo.org>
+  tomcat-5.5.17-r7.ebuild:
+  Forgot to apply sun-javamail-bin -> sun-javamail and gnu-jaf -> sun-jaf
+  changes with jars passed to ant
 
 *tomcat-5.5.17-r7 (26 Sep 2006)
 
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 435c40daabf4..36586157ab2f 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 10020 RMD160 ada2120adfce01c89052998a0bb1fb49d9a6230f SHA1 c8f635f25a46191c27b3bd2327c68f3c122ac9cb SHA256 7fe4263021eba71d8ecdc7e99aba6e3a3c9da157457e31ae731a4b3dd6f79279
-MD5 ff8e8c292de1172b9bb2d2ea698b7837 tomcat-5.5.17-r7.ebuild 10020
-RMD160 ada2120adfce01c89052998a0bb1fb49d9a6230f tomcat-5.5.17-r7.ebuild 10020
-SHA256 7fe4263021eba71d8ecdc7e99aba6e3a3c9da157457e31ae731a4b3dd6f79279 tomcat-5.5.17-r7.ebuild 10020
-MISC ChangeLog 23690 RMD160 07d4f79b8e73a296fd209e24443ceb52d26cb6cf SHA1 5d7b12f8288ec83dd45d4482dc254fa449e2d7ea SHA256 e99e7fbac7846fd7cf1fbc072eb5bf8bb4cb1583714a286d580f2d2f3764ae9f
-MD5 65e76bd53fd3577229328064beb0b8b4 ChangeLog 23690
-RMD160 07d4f79b8e73a296fd209e24443ceb52d26cb6cf ChangeLog 23690
-SHA256 e99e7fbac7846fd7cf1fbc072eb5bf8bb4cb1583714a286d580f2d2f3764ae9f ChangeLog 23690
+EBUILD tomcat-5.5.17-r7.ebuild 10016 RMD160 245c11558297b0b618abfd6bdc4f88e15bff931a SHA1 00a40afe067c05640c49ffae46fd7fdd53dc3528 SHA256 3b38d3975e08618bba23dd525670904fe77c2acac0489ff49be5e0456bbf1353
+MD5 0e20a0de6c42459a669aeceb52d57fff tomcat-5.5.17-r7.ebuild 10016
+RMD160 245c11558297b0b618abfd6bdc4f88e15bff931a tomcat-5.5.17-r7.ebuild 10016
+SHA256 3b38d3975e08618bba23dd525670904fe77c2acac0489ff49be5e0456bbf1353 tomcat-5.5.17-r7.ebuild 10016
+MISC ChangeLog 23883 RMD160 2e20997242a9c76a0721ff9a2839069d1e86d74d SHA1 0140423e86bcfd76b1ae4d627236be8cb0e77bdb SHA256 7314928a6c50ca85ac0fd47d014b872338cee99b77951a26e15199990923bb0b
+MD5 45af2fe4c1c8b3786c0db4795a551b40 ChangeLog 23883
+RMD160 2e20997242a9c76a0721ff9a2839069d1e86d74d ChangeLog 23883
+SHA256 7314928a6c50ca85ac0fd47d014b872338cee99b77951a26e15199990923bb0b ChangeLog 23883
 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 9fd38f61683c..6e81031d9cfd 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.1 2006/09/26 19:48:17 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.17-r7.ebuild,v 1.2 2006/09/26 20:16:19 wltjr Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -145,12 +145,12 @@ src_compile(){
 	antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar commons-beanutils-1.7 commons-beanutils.jar)"
 	antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)"
 	antflags="${antflags} -Dcommons-logging-api.jar=$(java-pkg_getjar commons-logging commons-logging-api.jar)"
-	antflags="${antflags} -Dmail.jar=$(java-pkg_getjar sun-javamail-bin mail.jar)"
+	antflags="${antflags} -Dmail.jar=$(java-pkg_getjar sun-javamail mail.jar)"
 	antflags="${antflags} -Dstruts.home=/usr/share/struts"
 	antflags="${antflags} -Djasper.home=${S}/jasper"
 	if ! use java5; then
 		antflags="${antflags} -Dcommons-httpclient.jar=$(java-config -p commons-httpclient)"
-		antflags="${antflags} -Dactivation.jar=$(java-config -p gnu-jaf-1)"
+		antflags="${antflags} -Dactivation.jar=$(java-config -p sun-jaf-1)"
 		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)"