Tomcat needs a newer xml-apis.jar from xml-commons-external to work instead of the older version found in xml-commons.

Package-Manager: portage-2.0.53

4 files changed, 19 insertions, 12 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 5590d0e1832b..db61af64d313 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.44 2005/12/06 21:43:43 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.45 2005/12/14 00:29:21 betelgeuse Exp $
+
+*tomcat-5.0.28-r12 (14 Dec 2005)
+
+  14 Dec 2005; Petteri Räty <betelgeuse@gentoo.org>
+  -tomcat-5.0.28-r11.ebuild, +tomcat-5.0.28-r12.ebuild:
+  Tomcat needs a newer xml-apis.jar from xml-commons-external to work instead
+  of the older version found in xml-commons.
 
 *tomcat-5.0.28-r11 (06 Dec 2005)
 
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 8447beeac24e..699cb6be5237 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 05a057faa0c915872d9abeff2a21c0fb ChangeLog 19256
+MD5 df24acfe5e0a880d5f5e963c165d772c ChangeLog 19523
 MD5 cbb635ed31e3b7ddabe1db851a8b471e files/5.0.27/gentoo.diff 463
 MD5 c19b85e130d0e0a565eebc406d699965 files/5.0.27/jikes.diff 510
 MD5 bf74c2bd8c21359ada1793cddfa95f37 files/5.0.27/tomcat.conf 2660
@@ -20,17 +20,17 @@ MD5 286d3dcf80a376b72913412cec25e496 files/5.0.28/tomcat.env 34
 MD5 c84cd76463e0c773cc3c58f9d6ea7e92 files/5.0.28/tomcat.init 766
 MD5 d5a48abc8db5543a73abbbf151d0630e files/digest-tomcat-5.0.27-r6 75
 MD5 af26ca4772989a2090085a6e24b71628 files/digest-tomcat-5.0.28-r10 78
-MD5 af26ca4772989a2090085a6e24b71628 files/digest-tomcat-5.0.28-r11 78
+MD5 af26ca4772989a2090085a6e24b71628 files/digest-tomcat-5.0.28-r12 78
 MD5 af26ca4772989a2090085a6e24b71628 files/digest-tomcat-5.0.28-r9 78
 MD5 f994107ba9a296c7de72d951eb9ddb29 metadata.xml 454
 MD5 e35c5aa21003d0e3f61bfc44a59104fd tomcat-5.0.27-r6.ebuild 3886
 MD5 0834be3df6afbfaf96e457c19b6a2055 tomcat-5.0.28-r10.ebuild 11061
-MD5 a6a24d616de2452c5c77f0cf199a6dbe tomcat-5.0.28-r11.ebuild 11095
+MD5 a0951c6c7fb70822a6ba52f1d85596ec tomcat-5.0.28-r12.ebuild 11129
 MD5 a5e32b74350e806a25b4cd56a9fdd6d4 tomcat-5.0.28-r9.ebuild 10001
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDlgYdQiJ/wx066S4RAvxMAJ9E7k6j+d5aiawpWl+S7BGaoAxeIwCggmXR
-4xk/ZEcdp3RJOsuF6HYSzHI=
-=2xP+
+iD8DBQFDn2dvQiJ/wx066S4RAhojAJ9bdzhNRbObxgWr7aBQNIz8bGcuZwCbByH1
+CxTVRJQEYRtA8OqtEKJe1YM=
+=qOpn
 -----END PGP SIGNATURE-----
diff --git a/www-servers/tomcat/files/digest-tomcat-5.0.28-r11 b/www-servers/tomcat/files/digest-tomcat-5.0.28-r12
index 38ec5031aa8e..38ec5031aa8e 100644
--- a/www-servers/tomcat/files/digest-tomcat-5.0.28-r11
+++ b/www-servers/tomcat/files/digest-tomcat-5.0.28-r12
diff --git a/www-servers/tomcat/tomcat-5.0.28-r11.ebuild b/www-servers/tomcat/tomcat-5.0.28-r12.ebuild
index 98d9e845b8c8..e0c782e38fe5 100644
--- a/www-servers/tomcat/tomcat-5.0.28-r11.ebuild
+++ b/www-servers/tomcat/tomcat-5.0.28-r12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.0.28-r11.ebuild,v 1.1 2005/12/06 21:43:43 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.0.28-r12.ebuild,v 1.1 2005/12/14 00:29:21 betelgeuse Exp $
 
 inherit eutils java-pkg
 
@@ -9,7 +9,7 @@ DESCRIPTION="Apache Servlet-2.4/JSP-2.0 Container"
 SLOT="${PV/.*}"
 SRC_URI="mirror://apache/jakarta/tomcat-${SLOT}/v${PV}/src/jakarta-${P}-src.tar.gz"
 HOMEPAGE="http://jakarta.apache.org/tomcat"
-KEYWORDS="~x86 ~amd64 -ppc64 ~sparc"
+KEYWORDS="~x86 ~amd64 -ppc64"
 LICENSE="Apache-2.0"
 #only one accepted revision of struts to force upgrading because of slot changes
 RDEPEND=">=virtual/jdk-1.4
@@ -35,7 +35,7 @@ RDEPEND=">=virtual/jdk-1.4
 	=dev-java/struts-1.1-r4
 	dev-java/sun-jaf-bin
 	>=dev-java/xerces-2.6.2-r1
-	dev-java/xml-commons
+	=dev-java/xml-commons-external-1.3*
 	jikes? ( dev-java/jikes )"
 DEPEND=">=virtual/jdk-1.4
 	${RDEPEND}
@@ -77,7 +77,7 @@ src_unpack() {
 	java-pkg_jar-from commons-daemon
 
 	mkdir ../common/endorsed && cd ../common/endorsed
-	java-pkg_jar-from xml-commons xml-apis.jar
+	java-pkg_jar-from xml-commons-external-1.3 xml-apis.jar
 	java-pkg_jar-from xerces-2 xercesImpl.jar
 
 	mkdir ../lib && cd ../lib
@@ -123,7 +123,7 @@ src_compile(){
 	antflags="${antflags} -Djmx-tools.jar=$(java-pkg_getjar sun-jmx jmxtools.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 xml-commons xml-apis.jar)"
+	antflags="${antflags} -Dxml-apis.jar=$(java-pkg_getjar xml-commons-external-1.3 xml-apis.jar)"
 	antflags="${antflags} -Dstruts.home=/usr/share/struts-1.1/"
 
 	ant ${antflags} || die "compile failed"