From: William Thomson <wltjr@gentoo.org>
Date: Tue, 10 Oct 2006 20:43:38 +0000 (+0000)
Subject: Made new patch that adds xalan to classpath, since previous patch was removing boot... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=25d8f3deec76c32a15c5908cc5716f7961c73c5e;p=gentoo.git

Made new patch that adds xalan to classpath, since previous patch was removing boot classpath. This one does both. Removed previous ebuild and patch.
Package-Manager: portage-2.1.2_pre2-r6
---

diff --git a/dev-java/jakarta-jstl/ChangeLog b/dev-java/jakarta-jstl/ChangeLog
index c090c46aabd9..9f088ef4cc77 100644
--- a/dev-java/jakarta-jstl/ChangeLog
+++ b/dev-java/jakarta-jstl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/jakarta-jstl
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-jstl/ChangeLog,v 1.8 2006/09/27 04:14:05 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-jstl/ChangeLog,v 1.9 2006/10/10 20:43:38 wltjr Exp $
+
+  10 Oct 2006; William L. Thomson Jr. <wltjr@gentoo.org>
+  -files/jakarta-jstl-1.1.2-remove-bootclasspath.patch,
+  +files/build-xml.patch, -jakarta-jstl-1.1.2.ebuild,
+  jakarta-jstl-1.1.2-r1.ebuild:
+  Made new patch that adds xalan to classpath, since previous patch was
+  removing boot classpath. This one does both. Removed previous ebuild and
+  patch.
 
   27 Sep 2006; Joshua Nichols <nichoj@gentoo.org>
   jakarta-jstl-1.1.2-r1.ebuild:
diff --git a/dev-java/jakarta-jstl/files/build-xml.patch b/dev-java/jakarta-jstl/files/build-xml.patch
new file mode 100644
index 000000000000..85e5e1041582
--- /dev/null
+++ b/dev-java/jakarta-jstl/files/build-xml.patch
@@ -0,0 +1,12 @@
+--- jakarta-taglibs-standard-1.1.2-src/standard/build.xml	2004-10-25 16:26:23.000000000 -0400
++++ build.xml	2006-10-10 16:33:05.000000000 -0400
+@@ -170,8 +170,7 @@
+     <javac 
+       srcdir="${library.src}" 
+       destdir="${build.library}/classes"
+-      bootclasspath="${xalan.jar}:${java.home}/lib/rt.jar"
+-      classpath="${servlet24.jar}:${jsp20.jar}:${jdbc2_0-stdext.jar}:${jaxp-api.jar}:${dom.jar}:${sax.jar}"
++      classpath="${servlet24.jar}:${jsp20.jar}:${jdbc2_0-stdext.jar}:${jaxp-api.jar}:${dom.jar}:${sax.jar}:${xalan.jar}"
+       excludes="org/apache/taglibs/standard/lang/jstl/parser/jsp20/* org/apache/taglibs/standard/lang/jpath/** org/apache/taglibs/standard/lang/spel/**"
+       debug="${compile.debug}"
+       deprecation="${compile.deprecation}"
diff --git a/dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r1.ebuild b/dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r1.ebuild
index 4884bd237b25..79aa1abee763 100644
--- a/dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r1.ebuild
+++ b/dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r1.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/dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r1.ebuild,v 1.2 2006/09/27 04:14:05 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r1.ebuild,v 1.3 2006/10/10 20:43:38 wltjr Exp $
 
 inherit java-pkg-2 java-ant-2 eutils
 
@@ -34,7 +34,7 @@ src_unpack() {
 	# This allows compilation with  non-Sun JDKs
 	# See bug #134206
 	# TODO file upstream
-	epatch ${FILESDIR}/${P}-remove-bootclasspath.patch
+	epatch ${FILESDIR}/build-xml.patch
 
 	echo -e "base.dir=..\n" \
 		"build.dir = \${base.dir}/build\n" \